Index: archivers/rpm4/Makefile =================================================================== diff -u -N -rd16799814fb4f932c9d1f79bb9ee67cb412c961d -rd6ec1151f087165926fe3e39d83d0129466cbe60 --- archivers/rpm4/Makefile (.../Makefile) (revision d16799814fb4f932c9d1f79bb9ee67cb412c961d) +++ archivers/rpm4/Makefile (.../Makefile) (revision d6ec1151f087165926fe3e39d83d0129466cbe60) @@ -1,8 +1,7 @@ -# $MidnightBSD: mports/archivers/rpm4/Makefile,v 1.5 2012/02/24 16:15:52 laffer1 Exp $ +# $MidnightBSD: mports/archivers/rpm4/Makefile,v 1.6 2012/02/28 14:09:09 laffer1 Exp $ PORTNAME= rpm -PORTVERSION= 4.9.1 -PORTREVISION= 0 +PORTVERSION= 4.10.2 CATEGORIES= archivers MASTER_SITES= http://rpm.org/releases/rpm-${PORTVERSION:R}.x/ \ ftp://ftp.mirrorservice.org/sites/ftp.rpm.org/pub/rpm/dist/rpm-${PORTVERSION:E}.x/ @@ -11,7 +10,7 @@ COMMENT= The RPM Package Manager LICENSE= gpl2 -LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ +LIB_DEPENDS= popt:${PORTSDIR}/devel/popt \ nss3:${PORTSDIR}/security/nss BUILD_DEPENDS= ${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed @@ -21,19 +20,27 @@ USE_BZIP2= yes USE_GMAKE= yes USE_LUA= 5.1+ -USE_BDB= 45+ +USE_BDB= 46+ +INVALID_BDB_VER=51 GNU_CONFIGURE= yes USE_LDCONFIG= yes LATEST_LINK= rpm4 CONFLICTS= rpm-3.* -CPPFLAGS+= -I${LOCALBASE}/include/nspr -I${LOCALBASE}/include/nss/nss \ +CPPFLAGS+= -I${LOCALBASE}/include \ + -I${LOCALBASE}/include/nspr -I${LOCALBASE}/include/nss/nss \ -I${BDB_INCLUDE_DIR} -I${LUA_INCDIR} -LDFLAGS+= -L${LOCALBASE}/lib/nss -L${BDB_LIB_DIR} -L${LUA_LIBDIR} +LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/nss \ + -L${BDB_LIB_DIR} -L${LUA_LIBDIR} CONFIGURE_ARGS+=--with-external-db \ + --without-db \ + --with-popt-prefix="${LOCALBASE}" \ + --sysconfdir=${PREFIX}/etc \ + --localstatedir=/var \ + --without-javaglue \ LUA_CFLAGS=-I${LUA_INCDIR} \ LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER} -lm" -PLIST_SUB+= VERSION=${PORTVERSION} +PLIST_SUB+= VERSION=${PORTVERSION} .include @@ -62,19 +69,10 @@ PLIST_SUB+= NLS="" .endif -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS+=--without-db \ - --with-popt-prefix="${LOCALBASE}" \ - --sysconfdir=${PREFIX}/etc \ - --localstatedir=/var \ - --without-javaglue - MANLANG= "" ja fr pl ru ko sk MAN1_EN= gendiff.1 -MAN8_EN= rpm.8 rpm2cpio.8 rpmbuild.8 rpmdeps.8 rpmgraph.8 +MAN8_EN= rpm.8 rpm2cpio.8 rpmbuild.8 rpmdeps.8 rpmgraph.8 \ + rpmdb.8 rpmkeys.8 rpmsign.8 rpmspec.8 MAN8_JA= rpm.8 rpm2cpio.8 rpmbuild.8 rpmgraph.8 MAN8_FR= rpm.8 MAN8_PL= rpm.8 rpm2cpio.8 rpmbuild.8 rpmdeps.8 rpmgraph.8 @@ -89,14 +87,20 @@ .include .if ${OSVERSION} < 4005 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-rpmio_rpmsq.c +.endif + +.if ${OSVERSION} < 4005 LIB_DEPENDS+= lzma:${PORTSDIR}/archivers/xz .endif post-patch: ${REINPLACE_CMD} -e '/^pkgconfigdir/s:/:data/:' \ -e 's:\.\./\.\./bin/::' ${WRKSRC}/Makefile.in ${REINPLACE_CMD} -e 's/(hpux)/& || defined(__FreeBSD__)/' \ - ${WRKSRC}/rpmio/fts.? + ${WRKSRC}/misc/fts.? + ${REINPLACE_CMD} -e 's/ __GLIBC__.*/& || defined(__FreeBSD__)/' \ + ${WRKSRC}/system.h post-install: .if !defined(NOPORTDOCS) Index: archivers/rpm4/distinfo =================================================================== diff -u -N -r08703f4fa626d8fa7c2b79d807d212e78b2fc16b -rd6ec1151f087165926fe3e39d83d0129466cbe60 --- archivers/rpm4/distinfo (.../distinfo) (revision 08703f4fa626d8fa7c2b79d807d212e78b2fc16b) +++ archivers/rpm4/distinfo (.../distinfo) (revision d6ec1151f087165926fe3e39d83d0129466cbe60) @@ -1,3 +1,2 @@ -SHA256 (rpm-4.9.1.tar.bz2) = b85f6c7c17ef1810362110779a198e25f81c0f683470e9ab21d4d2fdd48ee899 -RMD160 (rpm-4.9.1.tar.bz2) = 4df4b5d36a41dd21a06da58adc2668dc59fbadfd -SIZE (rpm-4.9.1.tar.bz2) = 3497021 +SHA256 (rpm-4.10.2.tar.bz2) = de1b50433ca887170570e5d610e151d5b77957a4122561c59979069ae8eb5d58 +SIZE (rpm-4.10.2.tar.bz2) = 3545289 Index: archivers/rpm4/files/extra-patch-rpmio_rpmsq.c =================================================================== diff -u -N --- archivers/rpm4/files/extra-patch-rpmio_rpmsq.c (revision 0) +++ archivers/rpm4/files/extra-patch-rpmio_rpmsq.c (revision d6ec1151f087165926fe3e39d83d0129466cbe60) @@ -0,0 +1,28 @@ +--- rpmio/rpmsq.c.orig 2012-06-17 22:38:37.000000000 +0200 ++++ rpmio/rpmsq.c 2012-06-17 22:38:29.000000000 +0200 +@@ -39,6 +39,25 @@ + { -1, NULL }, + }; + ++int ++sighold(int sig) ++{ ++ sigset_t set; ++ ++ sigemptyset(&set); ++ sigaddset(&set, sig); ++ return (_sigprocmask(SIG_BLOCK, &set, NULL)); ++} ++int ++sigrelse(int sig) ++{ ++ sigset_t set; ++ ++ sigemptyset(&set); ++ sigaddset(&set, sig); ++ return (_sigprocmask(SIG_UNBLOCK, &set, NULL)); ++} ++ + int rpmsqIsCaught(int signum) + { + return sigismember(&rpmsqCaught, signum); Index: archivers/rpm4/files/patch-misc_fts.c =================================================================== diff -u -N --- archivers/rpm4/files/patch-misc_fts.c (revision 0) +++ archivers/rpm4/files/patch-misc_fts.c (revision d6ec1151f087165926fe3e39d83d0129466cbe60) @@ -0,0 +1,30 @@ +--- misc/fts.c 2012-04-03 15:53:59.000000000 +0200 ++++ misc/fts.c 2012-05-30 14:07:33.000000000 +0200 +@@ -31,13 +31,14 @@ + static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94"; + #endif /* LIBC_SCCS and not lint */ + ++#include "system.h" ++#include "misc/fts.h" + #if defined(_LIBC) + #include + #include + #include + #include + #include +-#include "misc/fts.h" + #include + #include + #include +@@ -61,11 +62,9 @@ + # define _STAT_VER 0 + # define __fxstat64(_stat_ver, _fd, _sbp) fstat64((_fd), (_sbp)) + #endif +-#include "system.h" + #include + #include + #include +-#include "misc/fts.h" + # define __set_errno(val) (*__errno_location ()) = (val) + # define __open open + # define __close close Index: archivers/rpm4/files/patch-rpmio_rpmsq.c =================================================================== diff -u -N --- archivers/rpm4/files/patch-rpmio_rpmsq.c (revision 81527badc3e2f3812416bf11d919c087c8241b81) +++ archivers/rpm4/files/patch-rpmio_rpmsq.c (revision 0) @@ -1,28 +0,0 @@ ---- rpmio/rpmsq.c.orig 2010-07-02 12:27:50.000000000 +0200 -+++ rpmio/rpmsq.c 2010-07-02 12:27:53.000000000 +0200 -@@ -75,6 +75,25 @@ static struct rpmsqElem rpmsqRock; - - static rpmsq rpmsqQueue = &rpmsqRock; - -+int -+sighold(int sig) -+{ -+ sigset_t set; -+ -+ sigemptyset(&set); -+ sigaddset(&set, sig); -+ return (_sigprocmask(SIG_BLOCK, &set, NULL)); -+} -+int -+sigrelse(int sig) -+{ -+ sigset_t set; -+ -+ sigemptyset(&set); -+ sigaddset(&set, sig); -+ return (_sigprocmask(SIG_UNBLOCK, &set, NULL)); -+} -+ - /** \ingroup rpmsq - * Insert node into from queue. - * @param elem node to link Index: archivers/rpm4/files/patch-system.h =================================================================== diff -u -N -r08703f4fa626d8fa7c2b79d807d212e78b2fc16b -rd6ec1151f087165926fe3e39d83d0129466cbe60 --- archivers/rpm4/files/patch-system.h (.../patch-system.h) (revision 08703f4fa626d8fa7c2b79d807d212e78b2fc16b) +++ archivers/rpm4/files/patch-system.h (.../patch-system.h) (revision d6ec1151f087165926fe3e39d83d0129466cbe60) @@ -1,6 +1,6 @@ --- system.h.orig 2011-06-10 15:27:05.000000000 +0200 +++ system.h 2011-06-10 15:27:09.000000000 +0200 -@@ -39,6 +39,13 @@ char * stpncpy(char * dest, const char * +@@ -39,6 +39,14 @@ char * stpncpy(char * dest, const char * #define getenv(_s) __secure_getenv(_s) #endif @@ -10,6 +10,7 @@ +#include +#include +#include ++#include + #ifdef HAVE_FCNTL_H #include Index: archivers/rpm4/files/patch-tools_javadeps.c =================================================================== diff -u -N --- archivers/rpm4/files/patch-tools_javadeps.c (revision 08703f4fa626d8fa7c2b79d807d212e78b2fc16b) +++ archivers/rpm4/files/patch-tools_javadeps.c (revision 0) @@ -1,10 +0,0 @@ ---- tools/javadeps.c.orig 2011-09-14 23:09:48.000000000 +0200 -+++ tools/javadeps.c 2011-09-14 23:09:50.000000000 +0200 -@@ -57,6 +57,7 @@ - #include - #include - #include -+#include - #include "debug.h" - - /*---------typedefs---------*/ Index: archivers/rpm4/pkg-plist =================================================================== diff -u -N -r08703f4fa626d8fa7c2b79d807d212e78b2fc16b -rd6ec1151f087165926fe3e39d83d0129466cbe60 --- archivers/rpm4/pkg-plist (.../pkg-plist) (revision 08703f4fa626d8fa7c2b79d807d212e78b2fc16b) +++ archivers/rpm4/pkg-plist (.../pkg-plist) (revision d6ec1151f087165926fe3e39d83d0129466cbe60) @@ -10,6 +10,7 @@ bin/rpmspec bin/rpmverify include/rpm/argv.h +include/rpm/rpmbase64.h include/rpm/rpmio.h include/rpm/rpmurl.h include/rpm/rpmmacro.h @@ -45,19 +46,19 @@ lib/librpm.a lib/librpm.la lib/librpm.so -lib/librpm.so.2 +lib/librpm.so.3 lib/librpmbuild.a lib/librpmbuild.la lib/librpmbuild.so -lib/librpmbuild.so.2 +lib/librpmbuild.so.3 lib/librpmio.a lib/librpmio.la lib/librpmio.so -lib/librpmio.so.2 +lib/librpmio.so.3 lib/librpmsign.a lib/librpmsign.la lib/librpmsign.so -lib/librpmsign.so.0 +lib/librpmsign.so.1 lib/rpm/rpm.daily lib/rpm/rpm.log lib/rpm/macros.perl @@ -94,6 +95,7 @@ lib/rpm/script.req lib/rpm/rpmdb_loadcvt lib/rpm/rpm2cpio.sh +lib/rpm/rpm.supp lib/rpm/tgpg lib/rpm/fileattrs/desktop.attr lib/rpm/fileattrs/elf.attr @@ -106,7 +108,6 @@ lib/rpm/fileattrs/ocaml.attr lib/rpm/fileattrs/script.attr lib/rpm/fileattrs/mono.attr -lib/rpm/javadeps lib/rpm/rpmdeps lib/rpm/rpmrc lib/rpm/macros @@ -116,17 +117,71 @@ lib/rpm/mkinstalldirs lib/rpm/config.guess lib/rpm/config.sub +lib/rpm/platform/noarch-freebsd/macros +lib/rpm/platform/athlon-freebsd/macros +lib/rpm/platform/geode-freebsd/macros +lib/rpm/platform/pentium4-freebsd/macros +lib/rpm/platform/pentium3-freebsd/macros +lib/rpm/platform/i686-freebsd/macros +lib/rpm/platform/i586-freebsd/macros +lib/rpm/platform/i486-freebsd/macros +lib/rpm/platform/i386-freebsd/macros +lib/rpm/platform/x86_64-freebsd/macros +lib/rpm/platform/amd64-freebsd/macros +lib/rpm/platform/ia32e-freebsd/macros +lib/rpm/platform/alpha-freebsd/macros +lib/rpm/platform/alphaev5-freebsd/macros +lib/rpm/platform/alphaev56-freebsd/macros +lib/rpm/platform/alphapca56-freebsd/macros +lib/rpm/platform/alphaev6-freebsd/macros +lib/rpm/platform/alphaev67-freebsd/macros +lib/rpm/platform/sparc64-freebsd/macros +lib/rpm/platform/sparc64v-freebsd/macros +lib/rpm/platform/sparc-freebsd/macros +lib/rpm/platform/sparcv8-freebsd/macros +lib/rpm/platform/sparcv9-freebsd/macros +lib/rpm/platform/sparcv9v-freebsd/macros +lib/rpm/platform/ppc-freebsd/macros +lib/rpm/platform/ppc8260-freebsd/macros +lib/rpm/platform/ppc8560-freebsd/macros +lib/rpm/platform/ppc32dy4-freebsd/macros +lib/rpm/platform/ppciseries-freebsd/macros +lib/rpm/platform/ppcpseries-freebsd/macros +lib/rpm/platform/ia64-freebsd/macros +lib/rpm/platform/armv3l-freebsd/macros +lib/rpm/platform/armv4b-freebsd/macros +lib/rpm/platform/armv4l-freebsd/macros +lib/rpm/platform/armv5tel-freebsd/macros +lib/rpm/platform/armv5tejl-freebsd/macros +lib/rpm/platform/armv6l-freebsd/macros +lib/rpm/platform/armv7l-freebsd/macros +lib/rpm/platform/s390-freebsd/macros +lib/rpm/platform/s390x-freebsd/macros +lib/rpm/platform/ppc64-freebsd/macros +lib/rpm/platform/ppc64pseries-freebsd/macros +lib/rpm/platform/ppc64iseries-freebsd/macros +lib/rpm/platform/ppc64p7-freebsd/macros +lib/rpm/platform/sh-freebsd/macros +lib/rpm/platform/sh3-freebsd/macros +lib/rpm/platform/sh4-freebsd/macros +lib/rpm/platform/sh4a-freebsd/macros lib/rpm-plugins/exec.so lib/rpm-plugins/exec.la lib/rpm-plugins/sepolicy.so lib/rpm-plugins/sepolicy.la +%%NLS%%share/locale/bn_IN/LC_MESSAGES/rpm.mo %%NLS%%share/locale/ca/LC_MESSAGES/rpm.mo %%NLS%%share/locale/cs/LC_MESSAGES/rpm.mo +%%NLS%%share/locale/cs_CZ/LC_MESSAGES/rpm.mo %%NLS%%share/locale/da/LC_MESSAGES/rpm.mo %%NLS%%share/locale/de/LC_MESSAGES/rpm.mo +%%NLS%%share/locale/el/LC_MESSAGES/rpm.mo +%%NLS%%share/locale/eo/LC_MESSAGES/rpm.mo %%NLS%%share/locale/es/LC_MESSAGES/rpm.mo %%NLS%%share/locale/fi/LC_MESSAGES/rpm.mo %%NLS%%share/locale/fr/LC_MESSAGES/rpm.mo +%%NLS%%share/locale/gu/LC_MESSAGES/rpm.mo +%%NLS%%share/locale/id/LC_MESSAGES/rpm.mo %%NLS%%share/locale/is/LC_MESSAGES/rpm.mo %%NLS%%share/locale/it/LC_MESSAGES/rpm.mo %%NLS%%share/locale/ja/LC_MESSAGES/rpm.mo @@ -143,7 +198,9 @@ %%NLS%%share/locale/sr/LC_MESSAGES/rpm.mo %%NLS%%share/locale/sr@latin/LC_MESSAGES/rpm.mo %%NLS%%share/locale/sv/LC_MESSAGES/rpm.mo +%%NLS%%share/locale/te/LC_MESSAGES/rpm.mo %%NLS%%share/locale/tr/LC_MESSAGES/rpm.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/rpm.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/rpm.mo %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/__init__.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpmmodule.la @@ -155,8 +212,57 @@ %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/transaction.py libdata/pkgconfig/rpm.pc @dirrm lib/rpm/fileattrs -@dirrm lib/rpm @dirrm lib/rpm-plugins +@dirrm lib/rpm/platform/noarch-freebsd +@dirrm lib/rpm/platform/athlon-freebsd +@dirrm lib/rpm/platform/geode-freebsd +@dirrm lib/rpm/platform/pentium4-freebsd +@dirrm lib/rpm/platform/pentium3-freebsd +@dirrm lib/rpm/platform/i686-freebsd +@dirrm lib/rpm/platform/i586-freebsd +@dirrm lib/rpm/platform/i486-freebsd +@dirrm lib/rpm/platform/i386-freebsd +@dirrm lib/rpm/platform/x86_64-freebsd +@dirrm lib/rpm/platform/amd64-freebsd +@dirrm lib/rpm/platform/ia32e-freebsd +@dirrm lib/rpm/platform/alpha-freebsd +@dirrm lib/rpm/platform/alphaev5-freebsd +@dirrm lib/rpm/platform/alphaev56-freebsd +@dirrm lib/rpm/platform/alphapca56-freebsd +@dirrm lib/rpm/platform/alphaev6-freebsd +@dirrm lib/rpm/platform/alphaev67-freebsd +@dirrm lib/rpm/platform/sparc64-freebsd +@dirrm lib/rpm/platform/sparc64v-freebsd +@dirrm lib/rpm/platform/sparc-freebsd +@dirrm lib/rpm/platform/sparcv8-freebsd +@dirrm lib/rpm/platform/sparcv9-freebsd +@dirrm lib/rpm/platform/sparcv9v-freebsd +@dirrm lib/rpm/platform/ppc-freebsd +@dirrm lib/rpm/platform/ppc8260-freebsd +@dirrm lib/rpm/platform/ppc8560-freebsd +@dirrm lib/rpm/platform/ppc32dy4-freebsd +@dirrm lib/rpm/platform/ppciseries-freebsd +@dirrm lib/rpm/platform/ppcpseries-freebsd +@dirrm lib/rpm/platform/ia64-freebsd +@dirrm lib/rpm/platform/armv3l-freebsd +@dirrm lib/rpm/platform/armv4b-freebsd +@dirrm lib/rpm/platform/armv4l-freebsd +@dirrm lib/rpm/platform/armv5tel-freebsd +@dirrm lib/rpm/platform/armv5tejl-freebsd +@dirrm lib/rpm/platform/armv6l-freebsd +@dirrm lib/rpm/platform/armv7l-freebsd +@dirrm lib/rpm/platform/s390-freebsd +@dirrm lib/rpm/platform/s390x-freebsd +@dirrm lib/rpm/platform/ppc64-freebsd +@dirrm lib/rpm/platform/ppc64pseries-freebsd +@dirrm lib/rpm/platform/ppc64iseries-freebsd +@dirrm lib/rpm/platform/ppc64p7-freebsd +@dirrm lib/rpm/platform/sh-freebsd +@dirrm lib/rpm/platform/sh3-freebsd +@dirrm lib/rpm/platform/sh4-freebsd +@dirrm lib/rpm/platform/sh4a-freebsd +@dirrm lib/rpm/platform +@dirrm lib/rpm @dirrm include/rpm @dirrmtry src/portbld/SRPMS @dirrmtry src/portbld/SPECS @@ -183,4 +289,10 @@ @dirrmtry src %%NLS%%@dirrmtry share/locale/sr@latin/LC_MESSAGES %%NLS%%@dirrmtry share/locale/sr@latin +%%NLS%%@dirrmtry share/locale/bn_IN/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/bn_IN +%%NLS%%@dirrmtry share/locale/cs_CZ/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/cs_CZ +%%NLS%%@dirrmtry share/locale/te/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/te %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/rpm