aboutsummaryrefslogtreecommitdiffstats
path: root/archivers/rpm4
diff options
context:
space:
mode:
authorglewis <glewis@FreeBSD.org>2004-06-10 05:07:42 +0800
committerglewis <glewis@FreeBSD.org>2004-06-10 05:07:42 +0800
commit398b0b590f2e94b56f67e2344d0f5a994b7b410e (patch)
tree168715027ef5e53aee07d68f84e8754ced10cd80 /archivers/rpm4
parent522e275573cafce31836656773a336a548dba962 (diff)
downloadfreebsd-ports-graphics-398b0b590f2e94b56f67e2344d0f5a994b7b410e.tar.gz
freebsd-ports-graphics-398b0b590f2e94b56f67e2344d0f5a994b7b410e.tar.zst
freebsd-ports-graphics-398b0b590f2e94b56f67e2344d0f5a994b7b410e.zip
. Use libtool 1.3.x rather than 1.4.x (thus removing the last port
dependency on libtool14). Submitted by: ade
Diffstat (limited to 'archivers/rpm4')
-rw-r--r--archivers/rpm4/Makefile2
-rw-r--r--archivers/rpm4/files/patch-beecrypt::configure2
-rw-r--r--archivers/rpm4/files/patch-configure2
-rw-r--r--archivers/rpm4/pkg-plist6
4 files changed, 9 insertions, 3 deletions
diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile
index 11e185c0c1f..074331644c2 100644
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
BUILD_DEPENDS+= ${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
.endif
-USE_LIBTOOL_VER=14
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
USE_GETTEXT= yes
USE_ICONV= yes
diff --git a/archivers/rpm4/files/patch-beecrypt::configure b/archivers/rpm4/files/patch-beecrypt::configure
index e6085300e17..70c91542166 100644
--- a/archivers/rpm4/files/patch-beecrypt::configure
+++ b/archivers/rpm4/files/patch-beecrypt::configure
@@ -5,7 +5,7 @@
# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='%%LOCALBASE%%/bin/libtool14'
++LIBTOOL='%%LOCALBASE%%/bin/libtool13'
# Prevent multiple expansion
diff --git a/archivers/rpm4/files/patch-configure b/archivers/rpm4/files/patch-configure
index d487f9391d4..71cbc709221 100644
--- a/archivers/rpm4/files/patch-configure
+++ b/archivers/rpm4/files/patch-configure
@@ -14,7 +14,7 @@
# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='%%LOCALBASE%%/bin/libtool14'
++LIBTOOL='%%LOCALBASE%%/bin/libtool13'
# Prevent multiple expansion
diff --git a/archivers/rpm4/pkg-plist b/archivers/rpm4/pkg-plist
index 3596f6f5e6d..8568027115f 100644
--- a/archivers/rpm4/pkg-plist
+++ b/archivers/rpm4/pkg-plist
@@ -26,19 +26,24 @@ include/rpm/rpmurl.h
include/rpm/stringbuf.h
include/rpm/ugid.h
lib/libbeecrypt.a
+lib/libbeecrypt.la
lib/libbeecrypt.so
lib/libbeecrypt.so.4
lib/librpm-4.0.4.so
lib/librpm.a
+lib/librpm.la
lib/librpm.so
lib/librpmbuild-4.0.4.so
lib/librpmbuild.a
+lib/librpmbuild.la
lib/librpmbuild.so
lib/librpmdb-4.0.4.so
lib/librpmdb.a
+lib/librpmdb.la
lib/librpmdb.so
lib/librpmio-4.0.4.so
lib/librpmio.a
+lib/librpmio.la
lib/librpmio.so
%%PYTHON%%%%PYTHON_SITELIBDIR%%/poptmodule.so
%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpmmodule.so
@@ -147,6 +152,7 @@ share/locale/zh_CN.GB2312/LC_MESSAGES/rpm.mo
@unexec rmdir %D/src/portbld/RPMS/i586 2>/dev/null || true
@unexec rmdir %D/src/portbld/RPMS/i486 2>/dev/null || true
@unexec rmdir %D/src/portbld/RPMS/i386 2>/dev/null || true
+@unexec rmdir %D/src/portbld/RPMS/athlon 2>/dev/null || true
@unexec rmdir %D/src/portbld/RPMS/amd64 2>/dev/null || true
@unexec rmdir %D/src/portbld/RPMS/alphaev6 2>/dev/null || true
@unexec rmdir %D/src/portbld/RPMS/alpha 2>/dev/null || true