diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2004-06-09 21:07:42 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2004-06-09 21:07:42 +0000 |
| commit | f9e82daec6c6b72b258792632a2822e65db3266b (patch) | |
| tree | 9bc1623564cd7be4fb12b7d1ab42324abdfa42d1 /archivers/rpm5 | |
| parent | - Flip default dependency to CEDET, add WITHOUT_CEDET knob for enabling (diff) | |
. Use libtool 1.3.x rather than 1.4.x (thus removing the last port
dependency on libtool14).
Submitted by: ade
Notes
Notes:
svn path=/head/; revision=111181
Diffstat (limited to 'archivers/rpm5')
| -rw-r--r-- | archivers/rpm5/Makefile | 2 | ||||
| -rw-r--r-- | archivers/rpm5/files/patch-beecrypt::configure | 2 | ||||
| -rw-r--r-- | archivers/rpm5/files/patch-configure | 2 | ||||
| -rw-r--r-- | archivers/rpm5/pkg-plist | 6 |
4 files changed, 9 insertions, 3 deletions
diff --git a/archivers/rpm5/Makefile b/archivers/rpm5/Makefile index 11e185c0c1fd..074331644c24 100644 --- a/archivers/rpm5/Makefile +++ b/archivers/rpm5/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/rpm5/files/patch-beecrypt::configure b/archivers/rpm5/files/patch-beecrypt::configure index e6085300e17d..70c915421668 100644 --- a/archivers/rpm5/files/patch-beecrypt::configure +++ b/archivers/rpm5/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/rpm5/files/patch-configure b/archivers/rpm5/files/patch-configure index d487f9391d4c..71cbc7092215 100644 --- a/archivers/rpm5/files/patch-configure +++ b/archivers/rpm5/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/rpm5/pkg-plist b/archivers/rpm5/pkg-plist index 3596f6f5e6da..8568027115ff 100644 --- a/archivers/rpm5/pkg-plist +++ b/archivers/rpm5/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 |