diff options
author | Yukihiro Nakai <nakai@FreeBSD.org> | 2000-10-20 04:33:40 +0000 |
---|---|---|
committer | Yukihiro Nakai <nakai@FreeBSD.org> | 2000-10-20 04:33:40 +0000 |
commit | 97d3d35641fa51eb1d8635b9564024b4c6a7eff9 (patch) | |
tree | 76dc9188c4009738c4a225f288d7c86dde1a55ff /archivers/rpm | |
parent | Fix for INSTALLS_SHLIB (diff) |
Fix about
- Add patch to refer /usr/ports/popt
- etc
PR: ports/22046
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Notes
Notes:
svn path=/head/; revision=34010
Diffstat (limited to 'archivers/rpm')
-rw-r--r-- | archivers/rpm/Makefile | 18 | ||||
-rw-r--r-- | archivers/rpm/files/patch-bd | 26 | ||||
-rw-r--r-- | archivers/rpm/files/patch-be | 11 | ||||
-rw-r--r-- | archivers/rpm/files/patch-bf | 20 | ||||
-rw-r--r-- | archivers/rpm/files/patch-bg | 24 | ||||
-rw-r--r-- | archivers/rpm/pkg-plist | 7 |
6 files changed, 90 insertions, 16 deletions
diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile index c7edf7c6b47a..7ae189d8867c 100644 --- a/archivers/rpm/Makefile +++ b/archivers/rpm/Makefile @@ -7,14 +7,15 @@ PORTNAME= rpm PORTVERSION= 3.0.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/ MAINTAINER= nakai@FreeBSD.org LIB_DEPENDS= bz2.1:${PORTSDIR}/archivers/bzip2 \ - intl.1:${PORTSDIR}/devel/gettext + intl.1:${PORTSDIR}/devel/gettext \ + popt.0:${PORTSDIR}/devel/popt USE_GMAKE= yes USE_AUTOMAKE= yes @@ -24,18 +25,17 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" INSTALLS_SHLIB= yes -MANLANG= "" ja pl ru - MAN1= gendiff.1 -MAN3= popt.3 MAN8= rpm.8 rpm2cpio.8 -post-configure: - ( WRKSRC=${WRKSRC}/popt make do-configure ) - post-patch: .for file in rpm.c doc/rpm.8 lib/macro.c lib/rpmrc.c - @${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file} + @${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file} .endfor +post-install: + ${INSTALL_MAN} ${WRKSRC}/doc/gendiff.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/rpm.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/doc/rpm2cpio.8 ${PREFIX}/man/man8 + .include <bsd.port.mk> diff --git a/archivers/rpm/files/patch-bd b/archivers/rpm/files/patch-bd new file mode 100644 index 000000000000..5d3992602259 --- /dev/null +++ b/archivers/rpm/files/patch-bd @@ -0,0 +1,26 @@ +--- Makefile.am.orig Thu Sep 14 02:36:40 2000 ++++ Makefile.am Wed Oct 4 06:08:38 2000 +@@ -11,19 +11,19 @@ + rpm.magic rpmpopt rpm.spec installplatform + + # XXX TODO: python perl +-SUBDIRS = intl po popt lib build misc tools scripts tests doc . ++SUBDIRS = intl po lib build misc tools scripts tests . + +-INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/popt \ ++INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib \ + @INCPATH@ + +-myldflags= -L$(top_builddir)/build -L$(top_builddir)/lib -L$(top_builddir)/popt ++myldflags= -L$(top_builddir)/build -L$(top_builddir)/lib + + # XXX libtool can/should generate dependent libs. + # XXX solaris2.6 cannot use *.la with --all-static (downrev binutils/egcs?) + myldadd= \ + $(top_builddir)/build/.libs/librpmbuild.a \ + $(top_builddir)/lib/.libs/librpm.a \ +- $(top_builddir)/popt/.libs/libpopt.a \ ++ -lpopt \ + @INTLLIBS@ @LIBMISC@ + + LDFLAGS = @LDFLAGS_STATIC@ $(myldflags) diff --git a/archivers/rpm/files/patch-be b/archivers/rpm/files/patch-be new file mode 100644 index 000000000000..5c34517e9088 --- /dev/null +++ b/archivers/rpm/files/patch-be @@ -0,0 +1,11 @@ +--- build/Makefile.am.orig Wed Jun 14 21:34:28 2000 ++++ build/Makefile.am Wed Oct 4 05:02:45 2000 +@@ -2,7 +2,7 @@ + + AUTOMAKE_OPTIONS = 1.4 foreign + +-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/popt \ ++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib \ + @INCPATH@ + + pkgincdir = $(pkgincludedir) diff --git a/archivers/rpm/files/patch-bf b/archivers/rpm/files/patch-bf new file mode 100644 index 000000000000..e7fa9954a817 --- /dev/null +++ b/archivers/rpm/files/patch-bf @@ -0,0 +1,20 @@ +--- lib/Makefile.am.orig Mon Jul 17 03:49:43 2000 ++++ lib/Makefile.am Wed Oct 4 05:32:09 2000 +@@ -2,7 +2,7 @@ + + AUTOMAKE_OPTIONS = 1.4 foreign + +-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build -I$(top_srcdir)/popt @INCPATH@ ++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build @INCPATH@ + + pkgincdir = $(pkgincludedir) + pkginc_HEADERS = \ +@@ -12,7 +12,7 @@ + lookup.h md5.h rpm_malloc.h \ + rpmdb.h rpmlead.h signature.h + +-mylibpaths= -L$(top_builddir)/lib -L$(top_builddir)/popt ++mylibpaths= -L$(top_builddir)/lib + mylibs= -lrpm -lpopt @INTLLIBS@ @LIBMISC@ + + lib_LTLIBRARIES = librpm.la diff --git a/archivers/rpm/files/patch-bg b/archivers/rpm/files/patch-bg new file mode 100644 index 000000000000..c3968cf1ce7f --- /dev/null +++ b/archivers/rpm/files/patch-bg @@ -0,0 +1,24 @@ +--- tools/Makefile.am.orig Wed Jun 14 21:34:51 2000 ++++ tools/Makefile.am Wed Oct 4 05:34:26 2000 +@@ -3,18 +3,18 @@ + AUTOMAKE_OPTIONS = 1.4 foreign + + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build \ +- -I$(top_srcdir)/lib -I$(top_srcdir)/popt \ ++ -I$(top_srcdir)/lib \ + @INCPATH@ -I$(top_srcdir)/misc + + EXTRA_DIST = fstrcmp.c message.c str-list.c rpmchecksig.c + + EXTRA_PROGRAMS = rpmgettext rpmputtext rpminject + +-myldflags= -L$(top_builddir)/build -L$(top_builddir)/lib -L$(top_builddir)/popt ++myldflags= -L$(top_builddir)/build -L$(top_builddir)/lib + # XXX should libtool generate dependent libs? + myldadd= $(top_builddir)/build/librpmbuild.la \ + $(top_builddir)/lib/librpm.la \ +- $(top_builddir)/popt/libpopt.la \ ++ -lpopt \ + @INTLLIBS@ @LIBMISC@ + + LDFLAGS = $(myldflags) diff --git a/archivers/rpm/pkg-plist b/archivers/rpm/pkg-plist index 1fe0d1d9abbb..17db8f9f87ec 100644 --- a/archivers/rpm/pkg-plist +++ b/archivers/rpm/pkg-plist @@ -1,7 +1,6 @@ bin/gendiff bin/rpm bin/rpm2cpio -include/popt.h include/rpm/dbindex.h include/rpm/header.h include/rpm/misc.h @@ -18,10 +17,6 @@ lib/librpm.so.0 lib/librpmbuild.a lib/librpmbuild.so lib/librpmbuild.so.0 -lib/libpopt.a -lib/libpopt.la -lib/libpopt.so -lib/libpopt.so.0 lib/rpm/brp-compress lib/rpm/brp-redhat lib/rpm/brp-sparc64-linux @@ -66,9 +61,7 @@ share/locale/fr/LC_MESSAGES/rpm.mo share/locale/ja/LC_MESSAGES/rpm.mo share/locale/pl/LC_MESSAGES/rpm.mo share/locale/pt_BR/LC_MESSAGES/rpm.mo -share/locale/ro/LC_MESSAGES/popt.mo share/locale/ru/LC_MESSAGES/rpm.mo -share/locale/sk/LC_MESSAGES/popt.mo share/locale/sk/LC_MESSAGES/rpm.mo share/locale/sl/LC_MESSAGES/rpm.mo share/locale/sr/LC_MESSAGES/rpm.mo |