From 8503536d3896846d823f7f76be54e0a99da8d8b6 Mon Sep 17 00:00:00 2001 From: Ade Lovett Date: Thu, 23 Feb 2006 10:40:44 +0000 Subject: Conversion to a single libtool environment. Approved by: portmgr (kris) --- archivers/rpm5/Makefile | 14 ++++++-- archivers/rpm5/files/patch-beecrypt::configure | 9 ----- archivers/rpm5/files/patch-configure | 9 ----- archivers/rpm5/files/patch-rpmio::Makefile.in | 50 ++++++++++---------------- archivers/rpm5/pkg-plist | 1 - 5 files changed, 29 insertions(+), 54 deletions(-) (limited to 'archivers/rpm5') diff --git a/archivers/rpm5/Makefile b/archivers/rpm5/Makefile index 89bf9a688ba0..f49f8ffb6c7a 100644 --- a/archivers/rpm5/Makefile +++ b/archivers/rpm5/Makefile @@ -6,7 +6,7 @@ PORTNAME= rpm PORTVERSION= 4.0.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= archivers MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/ \ ftp://ftp.mirrorservice.org/sites/ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/ @@ -21,7 +21,9 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed BUILD_DEPENDS+= ${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen .endif -USE_AUTOTOOLS= libtool:13 +GNU_CONFIGURE= yes +LIBTOOLFILES= configure db3/configure db/dist/configure popt/configure \ + beecrypt/configure USE_GMAKE= yes USE_GETTEXT= yes USE_ICONV= yes @@ -56,6 +58,12 @@ MAN8= rpm.8 rpm2cpio.8 rpmbuild.8 PORTDOCS= * .endif +.include + +.if ${ARCH} == "amd64" +CFLAGS+= -fPIC +.endif + post-patch: ${REINPLACE_CMD} -e 's:%%LOCALBASE%%:${LOCALBASE}:' \ ${WRKSRC}/configure ${WRKSRC}/beecrypt/configure @@ -71,4 +79,4 @@ post-install: # Run package installation script ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL -.include +.include diff --git a/archivers/rpm5/files/patch-beecrypt::configure b/archivers/rpm5/files/patch-beecrypt::configure index 70c915421668..acc7080ab270 100644 --- a/archivers/rpm5/files/patch-beecrypt::configure +++ b/archivers/rpm5/files/patch-beecrypt::configure @@ -1,14 +1,5 @@ --- beecrypt/configure.orig Wed Feb 13 16:03:22 2002 +++ beecrypt/configure Thu Mar 4 14:49:35 2004 -@@ -5473,7 +5473,7 @@ - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='%%LOCALBASE%%/bin/libtool13' - - # Prevent multiple expansion - @@ -6914,7 +6914,7 @@ fi else diff --git a/archivers/rpm5/files/patch-configure b/archivers/rpm5/files/patch-configure index 71cbc7092215..17275f7357dd 100644 --- a/archivers/rpm5/files/patch-configure +++ b/archivers/rpm5/files/patch-configure @@ -9,15 +9,6 @@ --disable-nls do not use Native Language Support" ac_help="$ac_help --with-included-gettext use the GNU gettext library included here" -@@ -6138,7 +6140,7 @@ - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='%%LOCALBASE%%/bin/libtool13' - - # Prevent multiple expansion - @@ -7381,6 +7383,8 @@ # AC_DEFINE(HAVE_GZSEEK) #fi diff --git a/archivers/rpm5/files/patch-rpmio::Makefile.in b/archivers/rpm5/files/patch-rpmio::Makefile.in index 87671759506e..54ce4ee11346 100644 --- a/archivers/rpm5/files/patch-rpmio::Makefile.in +++ b/archivers/rpm5/files/patch-rpmio::Makefile.in @@ -1,26 +1,19 @@ ---- rpmio/Makefile.in.orig Thu Feb 14 16:58:37 2002 -+++ rpmio/Makefile.in Thu Mar 4 00:55:37 2004 -@@ -197,7 +197,7 @@ - -I$(top_srcdir)/build \ - -I$(top_srcdir)/lib \ +--- rpmio/Makefile.in.orig Thu Feb 14 23:58:37 2002 ++++ rpmio/Makefile.in Wed Jan 25 01:44:09 2006 +@@ -199,3 +199,3 @@ -I$(top_srcdir)/beecrypt \ - -I$(top_srcdir)/popt \ + @WITH_POPT_INCLUDE@ \ @WITH_ZLIB_INCLUDE@ \ - @INCPATH@ - -@@ -209,7 +209,7 @@ - - noinst_HEADERS = rpmio_internal.h rpmpgp.h +@@ -211,5 +211,6 @@ -LIBS = @LIBS@ @WITH_ZLIB_LIB@ -lrt -lpthread +LIBS = @LIBS@ @WITH_ZLIB_LIB@ BEECRYPTLOBJS = $(shell cat $(top_builddir)/beecrypt/listobjs) ++BEECRYPTOBJS = $(BEECRYPTLOBJS:.lo=.o) -@@ -222,18 +222,18 @@ - librpmio_la_DEPENDENCIES = .created - +@@ -224,6 +225,6 @@ tdigest_SOURCES = tdigest.c -tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +tdigest_LDADD = librpmio.la @WITH_POPT_LIB@ @@ -29,21 +22,17 @@ -trpmio_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +trpmio_LDADD = librpmio.la @WITH_POPT_LIB@ - tkey_SOURCES = tkey.c +@@ -231,3 +232,3 @@ tkey_LDFLAGS = -all-static -tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +tkey_LDADD = librpmio.la @WITH_POPT_LIB@ - tring_SOURCES = tring.c +@@ -235,3 +236,3 @@ tring_LDFLAGS = -all-static -tring_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +tring_LDADD = librpmio.la @WITH_POPT_LIB@ - dumpasn1_SOURCES = dumpasn1.c - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -248,15 +248,17 @@ - librpmio_la_OBJECTS = digest.lo macro.lo rpmio.lo rpmlog.lo \ - rpmmalloc.lo rpmpgp.lo rpmrpc.lo strcasecmp.lo stubs.lo url.lo ugid.lo +@@ -250,11 +251,13 @@ tdigest_OBJECTS = tdigest.$(OBJEXT) -tdigest_DEPENDENCIES = librpmio.la $(top_builddir)/popt/libpopt.la -tdigest_LDFLAGS = @@ -63,23 +52,20 @@ +trpmio_DEPENDENCIES = librpmio.la +trpmio_LDFLAGS = @WITH_POPT_LIB@ dumpasn1_OBJECTS = dumpasn1.$(OBJEXT) - dumpasn1_LDADD = $(LDADD) - dumpasn1_DEPENDENCIES = -@@ -461,7 +463,7 @@ - install-exec-am: install-libLTLIBRARIES - install-exec: install-exec-am +@@ -463,3 +466,3 @@ -install-data-am: install-pkgincHEADERS install-data-local +install-data-am: install-pkgincHEADERS install-data: install-data-am - - install-am: all-am -@@ -535,7 +537,7 @@ - mv .librpmio.la librpmio.la - +@@ -537,3 +540,3 @@ $(top_builddir)/beecrypt/listobjs: - make -C $(top_builddir)/beecrypt listobjs + $(MAKE) -C $(top_builddir)/beecrypt listobjs - .created: $(top_builddir)/beecrypt/listobjs - for lo in $(BEECRYPTLOBJS); do \ +@@ -542,2 +545,6 @@ + [ -f $$lo ] || $(LN_S) $(top_builddir)/beecrypt/$$lo $$lo ; \ ++ done ++ for o in $(BEECRYPTOBJS); do \ ++ $(LN_S) ../../beecrypt/.libs/$$o .libs/$$o ; \ ++ $(LN_S) ../beecrypt/$$o $$o ; \ + done diff --git a/archivers/rpm5/pkg-plist b/archivers/rpm5/pkg-plist index 04dbc75f46eb..3eda18f8814b 100644 --- a/archivers/rpm5/pkg-plist +++ b/archivers/rpm5/pkg-plist @@ -25,7 +25,6 @@ include/rpm/rpmspec.h 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 -- cgit v1.2.3