diff options
| -rw-r--r-- | archivers/rpm/Makefile | 4 | ||||
| -rw-r--r-- | archivers/rpm/files/patch-bc | 24 |
2 files changed, 18 insertions, 10 deletions
diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile index f309f07615ea..225b5b413d45 100644 --- a/archivers/rpm/Makefile +++ b/archivers/rpm/Makefile @@ -7,12 +7,12 @@ PORTNAME= rpm PORTVERSION= 3.0.6 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= archivers MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/ \ ftp://ftp.mirror.ac.uk/sites/ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/ -MAINTAINER= nakai@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= The Red Hat Package Manager LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext \ diff --git a/archivers/rpm/files/patch-bc b/archivers/rpm/files/patch-bc index 6fc9d18c80f8..d64e9940f513 100644 --- a/archivers/rpm/files/patch-bc +++ b/archivers/rpm/files/patch-bc @@ -1,6 +1,14 @@ ---- configure.in.orig Wed Sep 13 15:39:40 2000 -+++ configure.in Tue Oct 15 12:58:08 2002 -@@ -367,9 +367,8 @@ +--- configure.in.orig Thu Sep 14 04:39:40 2000 ++++ configure.in Sat Jul 12 04:48:16 2003 +@@ -41,6 +41,7 @@ + case "$target" in + *-*-solaris*) LDFLAGS_STATIC="";; + *-*-hpux*) LDFLAGS_STATIC="";; ++ *-*-freebsd*) LDFLAGS_STATIC="";; + *-*-*) LDFLAGS_STATIC="-all";; + esac + elif test X"$CC" = Xcc ; then +@@ -367,9 +368,8 @@ AC_CHECK_HEADERS(sys/mman.h sys/resource.h sys/utsname.h sys/wait.h) AC_CHECK_HEADERS(netinet/in_systm.h) @@ -11,7 +19,7 @@ AC_CHECK_HEADERS(bzlib.h libio.h zlib.h) AC_CHECK_HEADERS(err.h mcheck.h) -@@ -431,6 +430,9 @@ +@@ -431,6 +431,9 @@ #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif @@ -21,7 +29,7 @@ #include <sys/mount.h> ], [struct statfs sfs;], [AC_MSG_RESULT(in sys/mount.h) -@@ -744,7 +746,7 @@ +@@ -744,7 +747,7 @@ AC_SUBST(ROOT_GROUP) if test "x$varprefix" = "x"; then @@ -30,7 +38,7 @@ test "x$prefix" = xNONE && varprefix=`echo $ac_default_prefix | sed 's/usr/var/'` fi AC_SUBST(varprefix) -@@ -872,7 +874,7 @@ +@@ -872,7 +875,7 @@ RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`" AC_DEFINE_UNQUOTED(RPMCONFIGDIR, "$RPMCONFIGDIR") AC_SUBST(RPMCONFIGDIR) @@ -39,7 +47,7 @@ AC_DEFINE_UNQUOTED(SYSCONFIGDIR, "$SYSCONFIGDIR") AC_SUBST(SYSCONFIGDIR) LIBRPMRC_FILENAME="${RPMCONFIGDIR}/rpmrc" -@@ -911,7 +913,6 @@ +@@ -911,7 +914,6 @@ dnl # XXX Propagate -lucb to popt ... dnl export LIBS INCPATH CONFIG_SITE @@ -47,7 +55,7 @@ AC_OUTPUT([Doxyfile Makefile rpmrc macros platform rpmpopt scripts/brp-redhat lib/Makefile build/Makefile tools/Makefile scripts/Makefile tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile -@@ -919,8 +920,7 @@ +@@ -919,8 +921,7 @@ doc/Makefile doc/manual/Makefile doc/ja/Makefile doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile python/Makefile perl/Makefile perl/Makefile.PL], |