From d81073ea690aa00639c34abb12bb709124c4b616 Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Sun, 5 Oct 2014 21:10:47 +0000 Subject: [PATCH] Remove USES=pathfix and add USES=libtool and INSTALL_TARGET=install-strip --- databases/dbh/Makefile | 7 +++---- databases/dbh/files/patch-ltmain.sh | 15 --------------- databases/dbh/pkg-plist | 1 + 3 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 databases/dbh/files/patch-ltmain.sh diff --git a/databases/dbh/Makefile b/databases/dbh/Makefile index 6e113da6f76b..005040a21403 100644 --- a/databases/dbh/Makefile +++ b/databases/dbh/Makefile @@ -3,6 +3,7 @@ PORTNAME= dbh PORTVERSION= 5.0.15 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= SF DISTNAME= libdbh2-${PORTVERSION} @@ -14,8 +15,9 @@ LICENSE= GPLv3 CONFLICTS= dbh-[0-4]* -USES= pathfix pkgconfig GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip +USES= libtool pkgconfig USE_LDCONFIG= yes OPTIONS_DEFINE= GTKDOC @@ -43,7 +45,4 @@ post-patch: @${REINPLACE_CMD} -e 's|^\(SUBDIRS = src man\).*|\1|' ${WRKSRC}/Makefile.in .endif -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libdbh.so.2 - .include diff --git a/databases/dbh/files/patch-ltmain.sh b/databases/dbh/files/patch-ltmain.sh deleted file mode 100644 index 246ab504a085..000000000000 --- a/databases/dbh/files/patch-ltmain.sh +++ /dev/null @@ -1,15 +0,0 @@ ---- ltmain.sh.orig 2010-08-20 10:37:34.875162866 +0200 -+++ ltmain.sh 2010-08-20 10:38:15.964421976 +0200 -@@ -2077,10 +2077,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false ; then - func_basename "$file" - name="$func_basename_result" - instname="$dir/$name"i - func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/databases/dbh/pkg-plist b/databases/dbh/pkg-plist index 25a57e83758e..80ef40fd9e65 100644 --- a/databases/dbh/pkg-plist +++ b/databases/dbh/pkg-plist @@ -2,6 +2,7 @@ include/dbh/dbh.h lib/libdbh.a lib/libdbh.so lib/libdbh.so.2 +lib/libdbh.so.2.0.1 libdata/pkgconfig/dbh2.pc man/man3/dbh.3.gz man/man3/dbh.h.3.gz