[Midnightbsd-cvs] mports [16661] trunk/archivers/rpm4/pkg-plist: 4.11.2

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Aug 27 20:11:08 EDT 2014 

Revision: 16661
          http://svnweb.midnightbsd.org/mports/?rev=16661
Author:   laffer1
Date:     2014-08-27 20:11:06 -0400 (Wed, 27 Aug 2014)
Log Message:
-----------
4.11.2

Modified Paths:
--------------
    trunk/archivers/rpm4/Makefile
    trunk/archivers/rpm4/distinfo
    trunk/archivers/rpm4/files/patch-lib_backend_db3.c
    trunk/archivers/rpm4/files/patch-system.h
    trunk/archivers/rpm4/pkg-plist

Removed Paths:
-------------
    trunk/archivers/rpm4/files/extra-patch-rpmio_rpmsq.c
    trunk/archivers/rpm4/files/patch-misc_glob.c
    trunk/archivers/rpm4/files/patch-misc_glob.h

Property Changed:
----------------
    trunk/archivers/rpm4/files/patch-lib_backend_db3.c
    trunk/archivers/rpm4/files/patch-misc_fts.c
    trunk/archivers/rpm4/files/patch-system.h

Modified: trunk/archivers/rpm4/Makefile
===================================================================
--- trunk/archivers/rpm4/Makefile	2014-08-27 11:52:58 UTC (rev 16660)
+++ trunk/archivers/rpm4/Makefile	2014-08-28 00:11:06 UTC (rev 16661)
@@ -1,7 +1,7 @@
 # $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/
@@ -8,6 +8,7 @@
 
 MAINTAINER=	ports at 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 <bsd.mport.options.mk>
 
-.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 <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 4005
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-rpmio_rpmsq.c
-.endif
-
-.if ${OSVERSION} < 4005
 LIB_DEPENDS+=	lzma:${PORTSDIR}/archivers/xz
 .endif
 

Modified: trunk/archivers/rpm4/distinfo
===================================================================
--- trunk/archivers/rpm4/distinfo	2014-08-27 11:52:58 UTC (rev 16660)
+++ trunk/archivers/rpm4/distinfo	2014-08-28 00:11:06 UTC (rev 16661)
@@ -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

Deleted: trunk/archivers/rpm4/files/extra-patch-rpmio_rpmsq.c
===================================================================
--- trunk/archivers/rpm4/files/extra-patch-rpmio_rpmsq.c	2014-08-27 11:52:58 UTC (rev 16660)
+++ trunk/archivers/rpm4/files/extra-patch-rpmio_rpmsq.c	2014-08-28 00:11:06 UTC (rev 16661)
@@ -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);

Modified: trunk/archivers/rpm4/files/patch-lib_backend_db3.c
===================================================================
--- trunk/archivers/rpm4/files/patch-lib_backend_db3.c	2014-08-27 11:52:58 UTC (rev 16660)
+++ trunk/archivers/rpm4/files/patch-lib_backend_db3.c	2014-08-28 00:11:06 UTC (rev 16661)
@@ -9,12 +9,3 @@
  
  #include <rpm/rpmtypes.h>
  #include <rpm/rpmmacro.h>
-@@ -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)


Property changes on: trunk/archivers/rpm4/files/patch-lib_backend_db3.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/archivers/rpm4/files/patch-misc_fts.c
===================================================================
--- trunk/archivers/rpm4/files/patch-misc_fts.c	2014-08-27 11:52:58 UTC (rev 16660)
+++ trunk/archivers/rpm4/files/patch-misc_fts.c	2014-08-28 00:11:06 UTC (rev 16661)

Property changes on: trunk/archivers/rpm4/files/patch-misc_fts.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/archivers/rpm4/files/patch-misc_glob.c
===================================================================
--- trunk/archivers/rpm4/files/patch-misc_glob.c	2014-08-27 11:52:58 UTC (rev 16660)
+++ trunk/archivers/rpm4/files/patch-misc_glob.c	2014-08-28 00:11:06 UTC (rev 16661)
@@ -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

Deleted: trunk/archivers/rpm4/files/patch-misc_glob.h
===================================================================
--- trunk/archivers/rpm4/files/patch-misc_glob.h	2014-08-27 11:52:58 UTC (rev 16660)
+++ trunk/archivers/rpm4/files/patch-misc_glob.h	2014-08-28 00:11:06 UTC (rev 16661)
@@ -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.  */

Modified: trunk/archivers/rpm4/files/patch-system.h
===================================================================
--- trunk/archivers/rpm4/files/patch-system.h	2014-08-27 11:52:58 UTC (rev 16660)
+++ trunk/archivers/rpm4/files/patch-system.h	2014-08-28 00:11:06 UTC (rev 16661)
@@ -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 <libgen.h>
 +#include <sys/wait.h>
 +#include <netinet/in.h>
-+#include <errno.h>
 +
  #ifdef HAVE_FCNTL_H
  #include <fcntl.h>


Property changes on: trunk/archivers/rpm4/files/patch-system.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/archivers/rpm4/pkg-plist
===================================================================
--- trunk/archivers/rpm4/pkg-plist	2014-08-27 11:52:58 UTC (rev 16660)
+++ trunk/archivers/rpm4/pkg-plist	2014-08-28 00:11:06 UTC (rev 16661)
@@ -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,13 +166,35 @@
 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
@@ -180,8 +202,6 @@
 %%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
+ at 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
+ at 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
- at dirrmtry src/portbld/SRPMS
- at dirrmtry src/portbld/SPECS
- at dirrmtry src/portbld/SOURCES
- at dirrmtry src/portbld/RPMS/x86_64
- at dirrmtry src/portbld/RPMS/sparcv9
- at dirrmtry src/portbld/RPMS/sparc64
- at dirrmtry src/portbld/RPMS/sparc
- at dirrmtry src/portbld/RPMS/ppc64
- at dirrmtry src/portbld/RPMS/ppc
- at dirrmtry src/portbld/RPMS/noarch
- at dirrmtry src/portbld/RPMS/ia64
- at dirrmtry src/portbld/RPMS/i686
- at dirrmtry src/portbld/RPMS/i586
- at dirrmtry src/portbld/RPMS/i486
- at dirrmtry src/portbld/RPMS/i386
- at dirrmtry src/portbld/RPMS/athlon
- at dirrmtry src/portbld/RPMS/amd64
- at dirrmtry src/portbld/RPMS/alphaev6
- at dirrmtry src/portbld/RPMS/alpha
- at dirrmtry src/portbld/RPMS
- at dirrmtry src/portbld/BUILD
- at dirrmtry src/portbld
- at dirrmtry src
+ at dirrmtry man/sk/man8
+ at dirrmtry man/sk
+ at dirrmtry man/ru/man8
+ at dirrmtry man/ru
+ at dirrmtry man/pl/man8
+ at dirrmtry man/pl/man1
+ at dirrmtry man/pl
+ at dirrmtry man/ko/man8
+ at dirrmtry man/ko
+ at dirrmtry man/fr/man8
+ at dirrmtry man/fr
 %%NLS%%@dirrmtry share/locale/sr at latin/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/sr at 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

More information about the Midnightbsd-cvs mailing list