Index: archivers/rpm4/Makefile =================================================================== diff -u -N -r706c8fb16cb05fc0399315089b9b42a1cf51de09 -r4822d5a6ab2ec7b0e40dd99ee0d4c8dc362007be --- archivers/rpm4/Makefile (.../Makefile) (revision 706c8fb16cb05fc0399315089b9b42a1cf51de09) +++ archivers/rpm4/Makefile (.../Makefile) (revision 4822d5a6ab2ec7b0e40dd99ee0d4c8dc362007be) @@ -1,13 +1,14 @@ # $MidnightBSD$ PORTNAME= rpm -PORTVERSION= 4.10.2 +PORTVERSION= 4.11.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/ MAINTAINER= ports@MidnightBSD.org COMMENT= The RPM Package Manager + LICENSE= gpl2 LIB_DEPENDS= popt:${PORTSDIR}/devel/popt \ @@ -17,8 +18,7 @@ OPTIONS= PYTHON "Build Python rpm module" On USE_AUTOTOOLS= libtool -USE_BZIP2= yes -USE_GMAKE= yes +USES= gmake tar:bzip2 USE_LUA= 5.1+ USE_BDB= 46+ INVALID_BDB_VER=51 @@ -45,10 +45,6 @@ .include -.if (${OSVERSION} < 4005) -LIB_DEPENDS+= lzma.5:${PORTSDIR}/archivers/xz -.endif - .ifndef WITHOUT_PYTHON CONFIGURE_ARGS+=--enable-python USE_PYTHON= 2.6+ @@ -87,10 +83,6 @@ .include .if ${OSVERSION} < 4005 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-rpmio_rpmsq.c -.endif - -.if ${OSVERSION} < 4005 LIB_DEPENDS+= lzma:${PORTSDIR}/archivers/xz .endif Index: archivers/rpm4/distinfo =================================================================== diff -u -N -rebef4cfe05d9c0b1a9e22d65c52f183452a60af9 -r4822d5a6ab2ec7b0e40dd99ee0d4c8dc362007be --- archivers/rpm4/distinfo (.../distinfo) (revision ebef4cfe05d9c0b1a9e22d65c52f183452a60af9) +++ archivers/rpm4/distinfo (.../distinfo) (revision 4822d5a6ab2ec7b0e40dd99ee0d4c8dc362007be) @@ -1,3 +1,2 @@ -SHA256 (rpm-4.10.2.tar.bz2) = e9278a2b40f08bae5a9592b9b42f11f88b2e880cc34e57113d53461ed7de6e7b -RMD160 (rpm-4.10.2.tar.bz2) = e29a8cbe9f003b113d68da6ef75c3f60cc072319 -SIZE (rpm-4.10.2.tar.bz2) = 3545536 +SHA256 (rpm-4.11.2.tar.bz2) = 403f8de632b33846ce5746f429c21a60f40dff9dcb56f1b4118f37a0652a48d4 +SIZE (rpm-4.11.2.tar.bz2) = 3988837 Index: archivers/rpm4/files/extra-patch-rpmio_rpmsq.c =================================================================== diff -u -N --- archivers/rpm4/files/extra-patch-rpmio_rpmsq.c (revision d6ec1151f087165926fe3e39d83d0129466cbe60) +++ archivers/rpm4/files/extra-patch-rpmio_rpmsq.c (revision 0) @@ -1,28 +0,0 @@ ---- 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-lib_backend_db3.c =================================================================== diff -u -N -r08703f4fa626d8fa7c2b79d807d212e78b2fc16b -r4822d5a6ab2ec7b0e40dd99ee0d4c8dc362007be --- archivers/rpm4/files/patch-lib_backend_db3.c (.../patch-lib_backend_db3.c) (revision 08703f4fa626d8fa7c2b79d807d212e78b2fc16b) +++ archivers/rpm4/files/patch-lib_backend_db3.c (.../patch-lib_backend_db3.c) (revision 4822d5a6ab2ec7b0e40dd99ee0d4c8dc362007be) @@ -9,12 +9,3 @@ #include #include -@@ -213,7 +215,7 @@ errxit: - - void dbSetFSync(void *dbenv, int enable) - { -- db_env_set_func_fsync(enable ? fdatasync : fsync_disable); -+ db_env_set_func_fsync(enable ? fsync : fsync_disable); - } - - int dbiSync(dbiIndex dbi, unsigned int flags) Index: archivers/rpm4/files/patch-misc_glob.c =================================================================== diff -u -N --- archivers/rpm4/files/patch-misc_glob.c (revision 08703f4fa626d8fa7c2b79d807d212e78b2fc16b) +++ archivers/rpm4/files/patch-misc_glob.c (revision 0) @@ -1,14 +0,0 @@ ---- misc/glob.c.orig 2010-12-03 13:11:57.000000000 +0100 -+++ misc/glob.c 2011-03-03 19:12:51.000000000 +0100 -@@ -907,6 +907,11 @@ prefix_array (const char *dirname, char - return 0; - } - -+int -+glob_pattern_p (const char *pattern, int quote) -+{ -+ return __glob_pattern_p(pattern, quote); -+} - - /* We must not compile this function twice. */ - #if !defined _LIBC || !defined NO_GLOB_PATTERN_P Index: archivers/rpm4/files/patch-misc_glob.h =================================================================== diff -u -N --- archivers/rpm4/files/patch-misc_glob.h (revision 08703f4fa626d8fa7c2b79d807d212e78b2fc16b) +++ archivers/rpm4/files/patch-misc_glob.h (revision 0) @@ -1,18 +0,0 @@ ---- misc/glob.h.orig 2011-11-14 22:06:03.000000000 +0100 -+++ misc/glob.h 2011-11-14 22:07:01.000000000 +0100 -@@ -110,10 +110,11 @@ - #endif - typedef struct - { -- __size_t gl_pathc; /* Count of paths matched by the pattern. */ -- char **gl_pathv; /* List of matched pathnames. */ -- __size_t gl_offs; /* Slots to reserve in `gl_pathv'. */ -- int gl_flags; /* Set to FLAGS, maybe | GLOB_MAGCHAR. */ -+ __size_t gl_pathc; /* Count of total paths so far. */ -+ __size_t gl_matchc; /* Count of paths matching pattern. */ -+ __size_t gl_offs; /* Reserved at beginning of gl_pathv. */ -+ int gl_flags; /* Copy of flags parameter to glob. */ -+ char **gl_pathv; /* List of paths matching pattern. */ - - /* If the GLOB_ALTDIRFUNC flag is set, the following functions - are used instead of the normal file access functions. */ Index: archivers/rpm4/files/patch-system.h =================================================================== diff -u -N -rd6ec1151f087165926fe3e39d83d0129466cbe60 -r4822d5a6ab2ec7b0e40dd99ee0d4c8dc362007be --- archivers/rpm4/files/patch-system.h (.../patch-system.h) (revision d6ec1151f087165926fe3e39d83d0129466cbe60) +++ archivers/rpm4/files/patch-system.h (.../patch-system.h) (revision 4822d5a6ab2ec7b0e40dd99ee0d4c8dc362007be) @@ -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,14 @@ char * stpncpy(char * dest, const char * +@@ -39,6 +39,13 @@ char * stpncpy(char * dest, const char * #define getenv(_s) __secure_getenv(_s) #endif @@ -10,7 +10,6 @@ +#include +#include +#include -+#include + #ifdef HAVE_FCNTL_H #include Index: archivers/rpm4/pkg-plist =================================================================== diff -u -N -rd6ec1151f087165926fe3e39d83d0129466cbe60 -r4822d5a6ab2ec7b0e40dd99ee0d4c8dc362007be --- archivers/rpm4/pkg-plist (.../pkg-plist) (revision d6ec1151f087165926fe3e39d83d0129466cbe60) +++ archivers/rpm4/pkg-plist (.../pkg-plist) (revision 4822d5a6ab2ec7b0e40dd99ee0d4c8dc362007be) @@ -33,6 +33,7 @@ include/rpm/rpmpol.h include/rpm/rpmps.h include/rpm/rpmprob.h +include/rpm/rpmstrpool.h include/rpm/rpmtag.h include/rpm/rpmtd.h include/rpm/rpmte.h @@ -43,22 +44,18 @@ include/rpm/rpmbuild.h include/rpm/rpmfc.h include/rpm/rpmspec.h -lib/librpm.a -lib/librpm.la lib/librpm.so lib/librpm.so.3 -lib/librpmbuild.a -lib/librpmbuild.la +lib/librpm.so.3.2.1 lib/librpmbuild.so lib/librpmbuild.so.3 -lib/librpmio.a -lib/librpmio.la +lib/librpmbuild.so.3.2.1 lib/librpmio.so lib/librpmio.so.3 -lib/librpmsign.a -lib/librpmsign.la +lib/librpmio.so.3.2.1 lib/librpmsign.so lib/librpmsign.so.1 +lib/librpmsign.so.1.2.1 lib/rpm/rpm.daily lib/rpm/rpm.log lib/rpm/macros.perl @@ -97,17 +94,18 @@ lib/rpm/rpm2cpio.sh lib/rpm/rpm.supp lib/rpm/tgpg +lib/rpm/fileattrs/appdata.attr lib/rpm/fileattrs/desktop.attr lib/rpm/fileattrs/elf.attr lib/rpm/fileattrs/font.attr lib/rpm/fileattrs/libtool.attr +lib/rpm/fileattrs/mono.attr +lib/rpm/fileattrs/ocaml.attr lib/rpm/fileattrs/perl.attr lib/rpm/fileattrs/perllib.attr lib/rpm/fileattrs/pkgconfig.attr lib/rpm/fileattrs/python.attr -lib/rpm/fileattrs/ocaml.attr lib/rpm/fileattrs/script.attr -lib/rpm/fileattrs/mono.attr lib/rpm/rpmdeps lib/rpm/rpmrc lib/rpm/macros @@ -117,6 +115,7 @@ lib/rpm/mkinstalldirs lib/rpm/config.guess lib/rpm/config.sub +lib/rpm/platform/aarch64-freebsd/macros lib/rpm/platform/noarch-freebsd/macros lib/rpm/platform/athlon-freebsd/macros lib/rpm/platform/geode-freebsd/macros @@ -158,6 +157,7 @@ lib/rpm/platform/s390-freebsd/macros lib/rpm/platform/s390x-freebsd/macros lib/rpm/platform/ppc64-freebsd/macros +lib/rpm/platform/ppc64le-freebsd/macros lib/rpm/platform/ppc64pseries-freebsd/macros lib/rpm/platform/ppc64iseries-freebsd/macros lib/rpm/platform/ppc64p7-freebsd/macros @@ -166,22 +166,42 @@ 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 +man/fr/man8/rpm.8.gz +man/ja/man8/rpm.8.gz +man/ja/man8/rpm2cpio.8.gz +man/ja/man8/rpmbuild.8.gz +man/ja/man8/rpmgraph.8.gz +man/ko/man8/rpm.8.gz +man/ko/man8/rpm2cpio.8.gz +man/man1/gendiff.1.gz +man/man8/rpm.8.gz +man/man8/rpm2cpio.8.gz +man/man8/rpmbuild.8.gz +man/man8/rpmdb.8.gz +man/man8/rpmdeps.8.gz +man/man8/rpmgraph.8.gz +man/man8/rpmkeys.8.gz +man/man8/rpmsign.8.gz +man/man8/rpmspec.8.gz +man/pl/man1/gendiff.1.gz +man/pl/man8/rpm.8.gz +man/pl/man8/rpm2cpio.8.gz +man/pl/man8/rpmbuild.8.gz +man/pl/man8/rpmdeps.8.gz +man/pl/man8/rpmgraph.8.gz +man/ru/man8/rpm.8.gz +man/ru/man8/rpm2cpio.8.gz +man/sk/man8/rpm.8.gz +%%NLS%%share/locale/br/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 @@ -200,19 +220,18 @@ %%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/uk/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 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpmmodule.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpmbmodule.la %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpmbmodule.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpmsmodule.la %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpmsmodule.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/transaction.py libdata/pkgconfig/rpm.pc @dirrm lib/rpm/fileattrs @dirrm lib/rpm-plugins +@dirrm lib/rpm/platform/aarch64-freebsd @dirrm lib/rpm/platform/noarch-freebsd @dirrm lib/rpm/platform/athlon-freebsd @dirrm lib/rpm/platform/geode-freebsd @@ -256,6 +275,7 @@ @dirrm lib/rpm/platform/ppc64-freebsd @dirrm lib/rpm/platform/ppc64pseries-freebsd @dirrm lib/rpm/platform/ppc64iseries-freebsd +@dirrm lib/rpm/platform/ppc64le-freebsd @dirrm lib/rpm/platform/ppc64p7-freebsd @dirrm lib/rpm/platform/sh-freebsd @dirrm lib/rpm/platform/sh3-freebsd @@ -264,35 +284,19 @@ @dirrm lib/rpm/platform @dirrm lib/rpm @dirrm include/rpm -@dirrmtry src/portbld/SRPMS -@dirrmtry src/portbld/SPECS -@dirrmtry src/portbld/SOURCES -@dirrmtry src/portbld/RPMS/x86_64 -@dirrmtry src/portbld/RPMS/sparcv9 -@dirrmtry src/portbld/RPMS/sparc64 -@dirrmtry src/portbld/RPMS/sparc -@dirrmtry src/portbld/RPMS/ppc64 -@dirrmtry src/portbld/RPMS/ppc -@dirrmtry src/portbld/RPMS/noarch -@dirrmtry src/portbld/RPMS/ia64 -@dirrmtry src/portbld/RPMS/i686 -@dirrmtry src/portbld/RPMS/i586 -@dirrmtry src/portbld/RPMS/i486 -@dirrmtry src/portbld/RPMS/i386 -@dirrmtry src/portbld/RPMS/athlon -@dirrmtry src/portbld/RPMS/amd64 -@dirrmtry src/portbld/RPMS/alphaev6 -@dirrmtry src/portbld/RPMS/alpha -@dirrmtry src/portbld/RPMS -@dirrmtry src/portbld/BUILD -@dirrmtry src/portbld -@dirrmtry src +@dirrmtry man/sk/man8 +@dirrmtry man/sk +@dirrmtry man/ru/man8 +@dirrmtry man/ru +@dirrmtry man/pl/man8 +@dirrmtry man/pl/man1 +@dirrmtry man/pl +@dirrmtry man/ko/man8 +@dirrmtry man/ko +@dirrmtry man/fr/man8 +@dirrmtry man/fr %%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