diff options
Diffstat (limited to 'source/ap/dmapi')
| -rwxr-xr-x | source/ap/dmapi/dmapi.SlackBuild | 8 | ||||
| -rw-r--r-- | source/ap/dmapi/dmapi.destdir.diff | 36 |
2 files changed, 3 insertions, 41 deletions
diff --git a/source/ap/dmapi/dmapi.SlackBuild b/source/ap/dmapi/dmapi.SlackBuild index 6efdfa771..63de8c275 100755 --- a/source/ap/dmapi/dmapi.SlackBuild +++ b/source/ap/dmapi/dmapi.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2013 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=2.2.10 +VERSION=2.2.12 BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -59,9 +59,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Add DESTDIR support and improve docs install location: -zcat $CWD/dmapi.destdir.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 - # Make sure you have the same version of autoconf as the # developers did... ;-) autoconf @@ -101,6 +98,7 @@ if [ -f $PKG/lib${LIBDIRSUFFIX}/libdm.so.0 ]; then ( cd $PKG/usr/lib${LIBDIRSUFFIX} ; rm -f libdm.so ; ln -sf /lib${LIBDIRSUFFIX}/libdm.so.0 libdm.so ) else exit 1 + echo "and fix yer script!!!" # and fix yer script!!! fi # Fix shared library perms: diff --git a/source/ap/dmapi/dmapi.destdir.diff b/source/ap/dmapi/dmapi.destdir.diff deleted file mode 100644 index 829d14e7f..000000000 --- a/source/ap/dmapi/dmapi.destdir.diff +++ /dev/null @@ -1,36 +0,0 @@ ---- ./include/buildmacros.orig 2007-01-22 23:56:41.000000000 -0600 -+++ ./include/buildmacros 2008-04-01 00:04:57.000000000 -0500 -@@ -26,7 +26,7 @@ - $(LFILES:.l=.o) \ - $(YFILES:%.y=%.tab.o) - --INSTALL = $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP) -+INSTALL = $(TOPDIR)/install-sh - - SHELL = /bin/sh - IMAGES_DIR = $(TOPDIR)/all-images ---- ./include/builddefs.in.orig 2007-05-28 02:00:24.000000000 -0500 -+++ ./include/builddefs.in 2008-04-01 00:04:57.000000000 -0500 -@@ -23,14 +23,14 @@ - PKG_VERSION = @pkg_version@ - PKG_PLATFORM = @pkg_platform@ - PKG_DISTRIBUTION= @pkg_distribution@ --PKG_BIN_DIR = @bindir@ --PKG_SBIN_DIR = @sbindir@ --PKG_LIB_DIR = @libdir@@libdirsuffix@ --PKG_DEVLIB_DIR = @libexecdir@@libdirsuffix@ --PKG_INC_DIR = @includedir@/xfs --PKG_MAN_DIR = @mandir@ --PKG_DOC_DIR = @datadir@/doc/@pkg_name@ --PKG_LOCALE_DIR = @datadir@/locale -+PKG_BIN_DIR = $(DESTDIR)@bindir@ -+PKG_SBIN_DIR = $(DESTDIR)@sbindir@ -+PKG_LIB_DIR = $(DESTDIR)@libdir@@libdirsuffix@ -+PKG_DEVLIB_DIR = $(DESTDIR)@libexecdir@@libdirsuffix@ -+PKG_INC_DIR = $(DESTDIR)@includedir@/xfs -+PKG_MAN_DIR = $(DESTDIR)@mandir@ -+PKG_DOC_DIR = $(DESTDIR)@datadir@/doc/@pkg_name@ -+PKG_LOCALE_DIR = $(DESTDIR)@datadir@/locale - - CC = @cc@ - AWK = @awk@ |