- Update to rpm-4.8.1 (previous version was nearly 10yrs old)

- Grab maintainership

Feature safe:	yes

21 files changed, 168 insertions, 958 deletions

diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile
index 878cfca33a9f..acb2af54c2ae 100644
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@@ -5,33 +5,35 @@
 # $FreeBSD$
 
 PORTNAME=	rpm
-PORTVERSION=	4.0.4
-PORTREVISION=	10
+PORTVERSION=	4.8.1
 CATEGORIES=	archivers
-MASTER_SITES=	http://rpm.org/releases/historical/rpm-4.0.x/ \
-		ftp://ftp.mirrorservice.org/sites/ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/
+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@FreeBSD.org
+MAINTAINER=	johans@FreeBSD.org
 COMMENT=	The RPM Package Manager
 
-LIB_DEPENDS=	db3.3:${PORTSDIR}/databases/db3 \
-		popt.0:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
+		nss3:${PORTSDIR}/security/nss \
+		lzma:${PORTSDIR}/archivers/xz
 BUILD_DEPENDS=	${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
-.if !defined(NOPORTDOCS)
-BUILD_DEPENDS+=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
-.endif
 
 USE_AUTOTOOLS=	libtool:22
-LIBTOOLFILES=	configure db3/configure db/dist/configure popt/configure \
-		beecrypt/configure
+USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
-USE_ICONV=	yes
+USE_LUA=	5.1+
+USE_BDB=	45+
+GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 LATEST_LINK=	rpm4
-CONFLICTS=	beecrypt-* rpm-3.*
+CONFLICTS=	rpm-3.*
+
+CPPFLAGS+=	-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}
+CONFIGURE_ARGS+=--with-external-db
 
-.if defined(WITH_PYTHON)
+.ifdef	WITH_PYTHON
 CONFIGURE_ARGS+=--with-python=auto
 USE_PYTHON=	yes
 PLIST_SUB+=	PYTHON=""
@@ -42,6 +44,15 @@ CONFIGURE_ARGS+=--without-python
 PLIST_SUB+=	PYTHON="@comment "
 .endif
 
+.ifdef	WITHOUT_NLS
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+USE_ICONV=	yes
+PLIST_SUB+=	NLS=""
+.endif
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -51,8 +62,15 @@ CONFIGURE_ARGS+=--without-db \
 		--sysconfdir=${PREFIX}/etc \
 		--without-javaglue
 
-MAN1=	gendiff.1
-MAN8=	rpm.8 rpm2cpio.8 rpmbuild.8
+MANLANG=	"" ja fr pl ru ko sk
+MAN1_EN=	gendiff.1
+MAN8_EN=	rpm.8 rpm2cpio.8 rpmbuild.8 rpmdeps.8 rpmgraph.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
+MAN8_RU=	rpm.8 rpm2cpio.8
+MAN8_KO=	rpm.8 rpm2cpio.8
+MAN8_SK=	rpm.8
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
@@ -60,21 +78,23 @@ PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "amd64"
-CFLAGS+=	-fPIC
+.if ${OSVERSION} < 800502
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-rpmio_rpmsq.c
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e 's:%%LOCALBASE%%:${LOCALBASE}:' \
-		${WRKSRC}/configure ${WRKSRC}/beecrypt/configure
+	${REINPLACE_CMD} -e '/^pkgconfigdir/s:/:data/:' \
+		-e 's:\.\./\.\./bin/::' ${WRKSRC}/Makefile.in
+	${REINPLACE_CMD} -e 's/(hpux)/& || defined(__FreeBSD__)/' \
+		${WRKSRC}/rpmio/fts.?
 
 post-install:
 .if !defined(NOPORTDOCS)
 	# Install documentation
-	${MKDIR} ${DOCSDIR}/apidocs/html
-	cd ${WRKSRC}/apidocs/html && ${FIND} . \
+	${MKDIR} ${DOCSDIR}/librpm/html
+	cd ${WRKSRC}/doc/librpm/html && ${FIND} . \
 		| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} \
-			${DOCSDIR}/apidocs/html/
+			${DOCSDIR}/librpm/html/
 .endif
 	# Run package installation script
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL
diff --git a/archivers/rpm4/distinfo b/archivers/rpm4/distinfo
index d7714151c080..dde7ce8712ed 100644
--- a/archivers/rpm4/distinfo
+++ b/archivers/rpm4/distinfo
@@ -1,3 +1,3 @@
-MD5 (rpm-4.0.4.tar.gz) = b0c3093d2f0d850760e59ac1db9bf152
-SHA256 (rpm-4.0.4.tar.gz) = caf7ddc0b107d492d1af3d8706d263c825c09e5983f5b78342bb8f91c3f707ac
-SIZE (rpm-4.0.4.tar.gz) = 5865692
+MD5 (rpm-4.8.1.tar.bz2) = 85b9cabd384ffe47b7c3ffb396133fb1
+SHA256 (rpm-4.8.1.tar.bz2) = 43ca026dd2b80e339066d12422f67d213dde9f1869a56b0b95aa0091a834c8fa
+SIZE (rpm-4.8.1.tar.bz2) = 3714502
diff --git a/archivers/rpm4/files/extra-patch-rpmio_rpmsq.c b/archivers/rpm4/files/extra-patch-rpmio_rpmsq.c
new file mode 100644
index 000000000000..0902283897f6
--- /dev/null
+++ b/archivers/rpm4/files/extra-patch-rpmio_rpmsq.c
@@ -0,0 +1,28 @@
+--- 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
diff --git a/archivers/rpm4/files/patch-Makefile.in b/archivers/rpm4/files/patch-Makefile.in
deleted file mode 100644
index 5a1a4ce6d989..000000000000
--- a/archivers/rpm4/files/patch-Makefile.in
+++ /dev/null
@@ -1,99 +0,0 @@
---- Makefile.in.orig	Thu Feb 14 16:58:07 2002
-+++ Makefile.in	Thu Mar  4 11:29:06 2004
-@@ -195,7 +195,7 @@
- 	rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
- 
- 
--SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_DB_SUBDIR@ popt beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
-+SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_DB_SUBDIR@ beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
- 
- INCLUDES = \
- 	-I$(top_srcdir)/build \
-@@ -203,12 +203,14 @@
- 	-I$(top_srcdir)/rpmdb \
- 	-I$(top_srcdir)/rpmio \
- 	-I$(top_srcdir)/beecrypt \
--	-I$(top_srcdir)/popt \
- 	@WITH_ZLIB_INCLUDE@ \
-+	@WITH_POPT_INCLUDE@ \
- 	@INCPATH@
- 
- 
--LIBS = -lrt -lpthread
-+LIBS =	@WITH_POPT_LIB@ \
-+	@WITH_ZLIB_LIB@ \
-+	@INTLLIBS@
- 
- myLDFLAGS = @LDFLAGS_STATIC@
- 
-@@ -220,9 +222,7 @@
- 	$(top_builddir)/lib/librpm.la \
- 	$(top_builddir)/rpmdb/librpmdb.la \
- 	$(top_builddir)/rpmio/librpmio.la \
--	$(top_builddir)/popt/libpopt.la \
--	@WITH_ZLIB_LIB@ \
--	@INTLLIBS@ @LIBMISC@
-+	@LIBMISC@
- 
- 
- rpmbindir = `echo $(bindir) | sed -e s,usr/bin,bin,`
-@@ -294,31 +294,31 @@
- rpm2cpio_OBJECTS =  rpm2cpio.$(OBJEXT)
- rpm2cpio_DEPENDENCIES =  $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
-+$(top_builddir)/rpmio/librpmio.la
- rpmb_OBJECTS =  build.$(OBJEXT)
- rpmb_DEPENDENCIES =  rpmb.o $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
-+$(top_builddir)/rpmio/librpmio.la
- rpmd_OBJECTS = 
- rpmd_DEPENDENCIES =  rpmd.o $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
-+$(top_builddir)/rpmio/librpmio.la
- rpmi_OBJECTS = 
- rpmi_DEPENDENCIES =  rpmi.o $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
-+$(top_builddir)/rpmio/librpmio.la
- rpmk_OBJECTS = 
- rpmk_DEPENDENCIES =  rpmk.o $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
-+$(top_builddir)/rpmio/librpmio.la
- rpmq_OBJECTS = 
- rpmq_DEPENDENCIES =  rpmq.o $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
-+$(top_builddir)/rpmio/librpmio.la
- rpm_OBJECTS = 
- rpm_DEPENDENCIES =  rpm.o $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
-+$(top_builddir)/rpmio/librpmio.la
- SCRIPTS =  $(bin_SCRIPTS) $(pkglib_SCRIPTS)
- 
- CFLAGS = @CFLAGS@
-@@ -887,11 +887,9 @@
- 		`make -s sources -C lib` \
- 		`make -s sources -C rpmdb` \
- 		`make -s sources -C rpmio` \
--		`make -s sources -C beecrypt` \
--		`make -s sources -C popt`
-+		`make -s sources -C beecrypt`
- 
- install-data-local:
--	@$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/rpm
- 	@rm -f $(DESTDIR)$(libdir)/rpmrc
- 	@@LN_S@ rpm/rpmrc $(DESTDIR)$(libdir)/rpmrc
- 	@rm -f $(DESTDIR)$(libdir)/rpmpopt
-@@ -946,7 +944,6 @@
- 	solaris*|linux*) \
- 	   chmod u+x ./installplatform; DESTDIR="$(DESTDIR)" pkglibdir="$(pkglibdir)" ./installplatform rpmrc macros platform ;; \
- 	esac
--	@$(mkinstalldirs) $(DESTDIR)/var/tmp
- 
- .PHONY:	setperms
- setperms:
diff --git a/archivers/rpm4/files/patch-beecrypt::Makefile.in b/archivers/rpm4/files/patch-beecrypt::Makefile.in
deleted file mode 100644
index cfa8d3d2f612..000000000000
--- a/archivers/rpm4/files/patch-beecrypt::Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- beecrypt/Makefile.in.orig	Wed Feb 13 16:03:22 2002
-+++ beecrypt/Makefile.in	Wed Mar  3 11:14:53 2004
-@@ -243,8 +243,8 @@
- 	$(mkinstalldirs) $(DESTDIR)$(libdir)
- 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
-+	    echo "$(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
-+	    $(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
- 	  else :; fi; \
- 	done
- 
-@@ -478,7 +478,7 @@
- install-exec-am: install-libLTLIBRARIES
- install-exec: install-exec-recursive
- 
--install-data-am: install-pkgincludeHEADERS
-+install-data-am:
- install-data: install-data-recursive
- 
- install-am: all-am
diff --git a/archivers/rpm4/files/patch-beecrypt::configure b/archivers/rpm4/files/patch-beecrypt::configure
deleted file mode 100644
index acc7080ab270..000000000000
--- a/archivers/rpm4/files/patch-beecrypt::configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- beecrypt/configure.orig	Wed Feb 13 16:03:22 2002
-+++ beecrypt/configure	Thu Mar  4 14:49:35 2004
-@@ -6914,7 +6914,7 @@
-   fi
- else
-   if test "$ac_cv_prog_gcc" = yes; then
--    CFLAGS="$CFLAGS -O3 -g"
-+    CFLAGS="$CFLAGS -O2 -g"
-     if test "$ac_enable_optimized" = yes; then
-       case $target_cpu in
- # XXX these need checking with versions of gcc
diff --git a/archivers/rpm4/files/patch-build::Makefile.in b/archivers/rpm4/files/patch-build::Makefile.in
deleted file mode 100644
index ba338cf2085a..000000000000
--- a/archivers/rpm4/files/patch-build::Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- build/Makefile.in.orig	Thu Feb 14 16:58:40 2002
-+++ build/Makefile.in	Thu Mar  4 01:07:04 2004
-@@ -194,7 +194,7 @@
- 	-I$(top_srcdir)/rpmdb \
- 	-I$(top_srcdir)/rpmio \
- 	-I$(top_srcdir)/beecrypt \
--	-I$(top_srcdir)/popt \
-+	@WITH_POPT_INCLUDE@ \
- 	@INCPATH@
- 
- 
-@@ -395,7 +395,7 @@
- 	../beecrypt/mp32opt.h ../beecrypt/rsa.h ../beecrypt/rsakp.h \
- 	../beecrypt/rsapk.h rpmbuild.h ../lib/rpmcli.h ../lib/rpmlib.h \
- 	../rpmio/rpmmessages.h ../rpmio/rpmlog.h ../rpmio/rpmerr.h \
--	../lib/header.h ../lib/hdrinline.h ../popt/popt.h \
-+	../lib/header.h ../lib/hdrinline.h \
- 	../rpmio/rpmmacro.h ../lib/stringbuf.h ../lib/misc.h rpmspec.h \
- 	buildio.h ../lib/psm.h ../lib/fsm.h ../lib/cpio.h \
- 	../lib/depends.h myftw.h ../beecrypt/md5.h ../debug.h
-@@ -411,7 +411,7 @@
- install-exec-am: install-libLTLIBRARIES
- install-exec: install-exec-am
- 
--install-data-am: install-pkgincHEADERS install-data-local
-+install-data-am: install-pkgincHEADERS
- install-data: install-data-am
- 
- install-am: all-am
diff --git a/archivers/rpm4/files/patch-configure b/archivers/rpm4/files/patch-configure
deleted file mode 100644
index 27b2a46bbf76..000000000000
--- a/archivers/rpm4/files/patch-configure
+++ /dev/null
@@ -1,309 +0,0 @@
-$FreeBSD$
-
---- configure.orig	Thu Feb 14 02:03:27 2002
-+++ configure	Tue Sep 12 10:54:53 2006
-@@ -186,6 +186,8 @@
- ac_help="$ac_help
-   --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib"
- ac_help="$ac_help
-+  --with-popt-prefix=DIR  search for popt in DIR/include and DIR/lib"
-+ac_help="$ac_help
-   --disable-nls           do not use Native Language Support"
- ac_help="$ac_help
-   --with-included-gettext use the GNU gettext library included here"
-@@ -7381,6 +7383,8 @@
- #  AC_DEFINE(HAVE_GZSEEK)
- #fi
- 
-+WITH_POPT_INCLUDE=$ac_default_prefix/include
-+WITH_POPT_LIB=-L$ac_default_prefix/lib -lpopt
- 
- 
- 
-@@ -8335,6 +8339,47 @@
-   DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb"
- else
-   echo "$ac_t""no" 1>&6
-+echo $ac_n "checking for db_create in -ldb3""... $ac_c" 1>&6
-+echo "configure:8188: checking for db_create in -ldb3" >&5
-+ac_lib_var=`echo db3'_'db_create | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-ldb3 $libthread $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 8196 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char db_create();
-+
-+int main() {
-+db_create()
-+; return 0; }
-+EOF
-+if { (eval echo configure:8207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb3"
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+
- fi
- 
-       
-@@ -8659,6 +8704,100 @@
- 
- fi
- 
-+# Check whether --with-popt-prefix or --without-popt-prefix was given.
-+if test "${with_popt_prefix+set}" = set; then
-+  withval="$with_popt_prefix"
-+  
-+    for dir in `echo "$withval" | tr : ' '`; do
-+      if test -d $dir/include; then
-+        CPPFLAGS="$CPPFLAGS -I$dir/include";
-+        WITH_POPT_INCLUDE="-I$dir/include";
-+      fi
-+      if test -d $dir/lib; then
-+        LDFLAGS="$LDFLAGS -L$dir/lib";
-+        WITH_POPT_LIB="-L$dir/lib -lpopt";
-+      fi
-+    done
-+fi
-+
-+echo $ac_n "checking for popt.h""... $ac_c" 1>&6
-+echo "configure:8724: checking for popt.h" >&5
-+ac_lib_var=`echo popt'_'h | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_CPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="${WITH_POPT_INCLUDE}  $CPPFLAGS"
-+cat > conftest.$ac_ext <<EOF
-+#line 8494 "configure"
-+#include "confdefs.h"
-+#include <popt.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+
-+int main() {
-+return 0; }
-+EOF
-+if { (eval echo configure:8505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+CPPFLAGS="$ac_save_CPPFLAGS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+  echo "configure: error: sorry rpm requires popt.h" 1>&2; exit 1;
-+fi
-+
-+echo $ac_n "checking for poptGetOptArg in -lpopt""... $ac_c" 1>&6
-+echo "configure:8724: checking for poptGetOptArg in -lpopt" >&5
-+ac_lib_var=`echo popt'_'poptGetOptArg | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="${WITH_POPT_LIB}  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 8494 "configure"
-+#include "confdefs.h"
-+#include <popt.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+
-+int main() {
-+const char *foo = poptGetNextOpt(NULL);
-+return 0; }
-+EOF
-+if { (eval echo configure:8505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+  echo "configure: error: sorry rpm requires libpopt" 1>&2; exit 1;
-+fi
- 
- 
- for ac_func in personality
-@@ -12512,6 +12651,68 @@
- WITH_PYTHON_VERSION=
- if test $withval = auto ; then
- 
-+  echo $ac_n "checking for python 2.4""... $ac_c" 1>&6
-+echo "configure:12517: checking for python 2.4" >&5
-+  if test "$cross_compiling" = yes; then
-+  withval=yes
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 12522 "configure"
-+#include "confdefs.h"
-+
-+#include <python2.4/Python.h>
-+main() {
-+  exit(strncmp("2.4", PY_VERSION, 3));
-+} 
-+EOF
-+if { (eval echo configure:12530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+then
-+  withval=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -fr conftest*
-+  withval=no
-+fi
-+rm -fr conftest*
-+fi
-+
-+  echo "$ac_t""$withval" 1>&6
-+  if test $withval = yes ; then
-+    WITH_PYTHON_VERSION="2.4"
-+  else
-+
-+  echo $ac_n "checking for python 2.3""... $ac_c" 1>&6
-+echo "configure:12517: checking for python 2.3" >&5
-+  if test "$cross_compiling" = yes; then
-+  withval=yes
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 12522 "configure"
-+#include "confdefs.h"
-+
-+#include <python2.3/Python.h>
-+main() {
-+  exit(strncmp("2.3", PY_VERSION, 3));
-+} 
-+EOF
-+if { (eval echo configure:12530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+then
-+  withval=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -fr conftest*
-+  withval=no
-+fi
-+rm -fr conftest*
-+fi
-+
-+  echo "$ac_t""$withval" 1>&6
-+  if test $withval = yes ; then
-+    WITH_PYTHON_VERSION="2.3"
-+  else
-+
-   echo $ac_n "checking for python 2.2""... $ac_c" 1>&6
- echo "configure:12517: checking for python 2.2" >&5
-   if test "$cross_compiling" = yes; then
-@@ -12577,6 +12778,10 @@
- 
- fi
- 
-+fi
-+
-+fi
-+
- if test -n "$WITH_PYTHON_VERSION" ; then
-   WITH_PYTHON_SUBDIR=python
-   WITH_PYTHON_SUBPACKAGE=1
-@@ -13130,21 +13335,7 @@
- 
- echo "$ac_t""$ROOT_GROUP" 1>&6
- 
--
--if test "x$varprefix" = "x"; then
--    # For /usr and /usr/local, we want the 'var' directory to go
--    # in /var and /var/local respectively. For everything else, 
--    # just put the 'var' directory in prefix/var.
--    case $prefix in
--	/usr | /usr/local )
--	    varprefix=`echo $prefix | sed 's/usr/var/'` ;;
--	NONE)
-- 	    varprefix=`echo $ac_default_prefix | sed 's/usr/var/'` ;;
--	*) 
--	    varprefix=$prefix/var ;;
--    esac	
--fi
--
-+varprefix=/var
- 
- if test "x$tmpdir" = "x"; then
-     if test -d $varprefix/tmp; then
-@@ -13349,7 +13540,7 @@
- 
- 
- 
--subdirs="popt beecrypt zlib $WITH_DB_SUBDIR"
-+subdirs="beecrypt $WITH_DB_SUBDIR"
- 
- 
- trap '' 1 2 15
-@@ -13578,6 +13769,8 @@
- s%@WITH_ZLIB_SUBDIR@%$WITH_ZLIB_SUBDIR%g
- s%@WITH_ZLIB_INCLUDE@%$WITH_ZLIB_INCLUDE%g
- s%@WITH_ZLIB_LIB@%$WITH_ZLIB_LIB%g
-+s%@WITH_POPT_INCLUDE@%$WITH_POPT_INCLUDE%g
-+s%@WITH_POPT_LIB@%$WITH_POPT_LIB%g
- s%@WITH_DB_SUBDIR@%$WITH_DB_SUBDIR%g
- s%@WITH_INTERNAL_DB@%$WITH_INTERNAL_DB%g
- s%@DBLIBSRCS@%$DBLIBSRCS%g
-@@ -13889,7 +14082,6 @@
-           ;;
-         esac
-       done
--	echo timestamp > popt/stamp-h.in
- 	echo timestamp > beecrypt/stamp-h.in
- 	echo timestamp > stamp-h.in
-   
-@@ -13925,7 +14117,7 @@
-     esac
-   done
- 
--  for ac_config_dir in popt beecrypt zlib $WITH_DB_SUBDIR; do
-+  for ac_config_dir in beecrypt $WITH_DB_SUBDIR; do
- 
-     # Do not complain, so a configure script can configure whichever
-     # parts of a large source tree are present.
diff --git a/archivers/rpm4/files/patch-db3::configure b/archivers/rpm4/files/patch-db3::configure
deleted file mode 100644
index fd38117a999b..000000000000
--- a/archivers/rpm4/files/patch-db3::configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- db3/configure	Fri Jul 27 10:20:43 2001
-+++ db3/configure	Wed Mar 27 10:04:21 2002
-@@ -15,7 +15,7 @@
- rm -f $db_dist/../db/dist $db_dist/dist
- 
- mv Makefile Makefile.orig
--cat Makefile.orig | sed -e 's/ -g$/ -g -O2/' -e '/^install:/c\
-+cat Makefile.orig | gsed -e 's/ -g$/ -g -O2/' -e '/^install:/c\
- .PHONY: listobjs\
- listobjs:\
- 	@echo $(OBJS) $(C_OBJS) \
diff --git a/archivers/rpm4/files/patch-doc::Makefile.in b/archivers/rpm4/files/patch-doc::Makefile.in
deleted file mode 100644
index 9601ee90143e..000000000000
--- a/archivers/rpm4/files/patch-doc::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	Thu Mar  4 10:28:04 2004
-+++ doc/Makefile.in	Thu Mar  4 10:28:18 2004
-@@ -185,7 +185,7 @@
- tmpdir = @tmpdir@
- varprefix = @varprefix@
- 
--SUBDIRS = manual ja pl ru sk
-+SUBDIRS = manual
- 
- man_MANS = gendiff.1 rpm.8 rpmbuild.8 rpm2cpio.8
- 
diff --git a/archivers/rpm4/files/patch-lib::Makefile.in b/archivers/rpm4/files/patch-lib::Makefile.in
deleted file mode 100644
index 0d15a5707976..000000000000
--- a/archivers/rpm4/files/patch-lib::Makefile.in
+++ /dev/null
@@ -1,34 +0,0 @@
---- lib/Makefile.in.orig	Thu Feb 14 16:58:39 2002
-+++ lib/Makefile.in	Thu Mar  4 01:03:02 2004
-@@ -194,7 +194,7 @@
- 	-I$(top_srcdir)/rpmdb \
- 	-I$(top_srcdir)/rpmio \
- 	-I$(top_srcdir)/beecrypt \
--	-I$(top_srcdir)/popt \
-+	@WITH_POPT_INCLUDE@ \
- 	@INCPATH@
- 
- 
-@@ -214,11 +214,10 @@
- mylibpaths = \
- 	-L$(top_builddir)/lib/.libs \
- 	-L$(top_builddir)/rpmdb/.libs \
--	-L$(top_builddir)/rpmio/.libs \
--	-L$(top_builddir)/popt/.libs
-+	-L$(top_builddir)/rpmio/.libs
- 
- 
--mylibs = -lrpm -lrpmdb -lrpmio -lpopt @LIBS@ @INTLLIBS@ @LIBMISC@
-+mylibs = -lrpm -lrpmdb -lrpmio @WITH_POPT_LIB@ @LIBS@ @INTLLIBS@ @LIBMISC@
- LIBS = 
- 
- lib_LTLIBRARIES = librpm.la
-@@ -421,7 +420,7 @@
- install-exec-am: install-libLTLIBRARIES
- install-exec: install-exec-am
- 
--install-data-am: install-pkgincHEADERS install-data-local
-+install-data-am: install-pkgincHEADERS
- install-data: install-data-am
- 
- install-am: all-am
diff --git a/archivers/rpm4/files/patch-lib::signature.c b/archivers/rpm4/files/patch-lib::signature.c
deleted file mode 100644
index ffaef839096a..000000000000
--- a/archivers/rpm4/files/patch-lib::signature.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/signature.c	Sat Feb  2 13:55:49 2002
-+++ lib/signature.c	Wed Mar 27 10:21:31 2002
-@@ -11,6 +11,10 @@
-  * size key you like).  We also honor PGPPATH finally.
-  */
- 
-+#ifdef __FreeBSD__
-+extern char **environ;
-+#endif
-+
- #include "system.h"
- 
- #include "rpmio_internal.h"
diff --git a/archivers/rpm4/files/patch-macros.in b/archivers/rpm4/files/patch-macros.in
deleted file mode 100644
index 12ed6de7e6ed..000000000000
--- a/archivers/rpm4/files/patch-macros.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- macros.in.orig	Tue Feb 15 16:35:27 2005
-+++ macros.in	Tue Feb 15 16:36:14 2005
-@@ -163,7 +163,7 @@
- %_tmppath		%{_var}/tmp
- 
- #	Path to top of build area.
--%_topdir		%{_usrsrc}/redhat
-+%_topdir		%{_usrsrc}/%{_vendor}
- 
- #	The path to the unzip executable (legacy, use %{__unzip} instead).
- %_unzipbin		%{__unzip}
diff --git a/archivers/rpm4/files/patch-misc_glob.c b/archivers/rpm4/files/patch-misc_glob.c
new file mode 100644
index 000000000000..3325ea1f3534
--- /dev/null
+++ b/archivers/rpm4/files/patch-misc_glob.c
@@ -0,0 +1,14 @@
+--- misc/glob.c.orig	2010-07-02 09:52:38.000000000 +0200
++++ misc/glob.c	2010-07-02 09:52:10.000000000 +0200
+@@ -903,6 +903,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
diff --git a/archivers/rpm4/files/patch-python::Makefile.in b/archivers/rpm4/files/patch-python::Makefile.in
deleted file mode 100644
index 7104dfb89e2c..000000000000
--- a/archivers/rpm4/files/patch-python::Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- python/Makefile.in.orig	Thu Feb 14 16:58:41 2002
-+++ python/Makefile.in	Fri Mar 19 15:10:25 2004
-@@ -197,7 +197,7 @@
- 	-I$(top_srcdir)/rpmdb \
- 	-I$(top_srcdir)/rpmio \
- 	-I$(top_srcdir)/beecrypt \
--	-I$(top_srcdir)/popt \
-+	@WITH_POPT_INCLUDE@ \
- 	-I/usr/include/python${PYVER} \
- 	@INCPATH@
- 
-@@ -207,7 +207,8 @@
- 	$(top_builddir)/lib/librpm.la \
- 	$(top_builddir)/rpmdb/librpmdb.la \
- 	$(top_builddir)/rpmio/librpmio.la \
--	$(top_builddir)/popt/libpopt.la
-+	@WITH_POPT_LIB@ \
-+	$(INTLLIBS)
- 
- 
- LDADD = 
diff --git a/archivers/rpm4/files/patch-python::rpmmodule.c b/archivers/rpm4/files/patch-python::rpmmodule.c
deleted file mode 100644
index 181636323965..000000000000
--- a/archivers/rpm4/files/patch-python::rpmmodule.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- python/rpmmodule.c	Sun Feb  3 16:59:57 2002
-+++ python/rpmmodule.c	Wed Mar 27 10:25:35 2002
-@@ -2,7 +2,6 @@
-  * \file python/rpmmodule.c
-  */
- 
--#include <alloca.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <time.h>
diff --git a/archivers/rpm4/files/patch-rpmdb::Makefile.in b/archivers/rpm4/files/patch-rpmdb::Makefile.in
deleted file mode 100644
index ea423fa2c615..000000000000
--- a/archivers/rpm4/files/patch-rpmdb::Makefile.in
+++ /dev/null
@@ -1,34 +0,0 @@
---- rpmdb/Makefile.in.orig	Thu Feb 14 16:58:38 2002
-+++ rpmdb/Makefile.in	Thu Mar  4 00:59:48 2004
-@@ -194,7 +194,7 @@
- 	-I$(top_srcdir)/lib \
- 	-I$(top_srcdir)/rpmio \
- 	-I$(top_srcdir)/beecrypt \
--	-I$(top_srcdir)/popt \
-+	@WITH_POPT_INCLUDE@ \
- 	@INCPATH@
- 
- 
-@@ -206,11 +206,10 @@
- 
- mylibpaths = \
- 	-L$(top_builddir)/lib/.libs \
--	-L$(top_builddir)/rpmio/.libs \
--	-L$(top_builddir)/popt/.libs
-+	-L$(top_builddir)/rpmio/.libs
- 
- 
--mylibs = -lrpm -lrpmio -lpopt @LIBS@ @INTLLIBS@ @LIBMISC@
-+mylibs = -lrpm -lrpmio @WITH_POPT_LIB@ @LIBS@ @INTLLIBS@ @LIBMISC@
- LIBS = 
- 
- DB3LOBJS = $(shell cat $(top_builddir)/$(WITH_DB_SUBDIR)/db3lobjs)
-@@ -404,7 +403,7 @@
- install-exec-am: install-libLTLIBRARIES
- install-exec: install-exec-am
- 
--install-data-am: install-pkgincHEADERS install-data-local
-+install-data-am: install-pkgincHEADERS
- install-data: install-data-am
- 
- install-am: all-am
diff --git a/archivers/rpm4/files/patch-rpmio::Makefile.in b/archivers/rpm4/files/patch-rpmio::Makefile.in
deleted file mode 100644
index 54ce4ee11346..000000000000
--- a/archivers/rpm4/files/patch-rpmio::Makefile.in
+++ /dev/null
@@ -1,71 +0,0 @@
---- rpmio/Makefile.in.orig	Thu Feb 14 23:58:37 2002
-+++ rpmio/Makefile.in	Wed Jan 25 01:44:09 2006
-@@ -199,3 +199,3 @@
- 	-I$(top_srcdir)/beecrypt \
--	-I$(top_srcdir)/popt \
-+	@WITH_POPT_INCLUDE@ \
- 	@WITH_ZLIB_INCLUDE@ \
-@@ -211,5 +211,6 @@
- 
--LIBS = @LIBS@ @WITH_ZLIB_LIB@ -lrt -lpthread
-+LIBS = @LIBS@ @WITH_ZLIB_LIB@
- 
- BEECRYPTLOBJS = $(shell cat $(top_builddir)/beecrypt/listobjs)
-+BEECRYPTOBJS = $(BEECRYPTLOBJS:.lo=.o)
- 
-@@ -224,6 +225,6 @@
- tdigest_SOURCES = tdigest.c
--tdigest_LDADD =  librpmio.la $(top_builddir)/popt/libpopt.la
-+tdigest_LDADD =  librpmio.la @WITH_POPT_LIB@
- 
- trpmio_SOURCES = trpmio.c
--trpmio_LDADD =  librpmio.la $(top_builddir)/popt/libpopt.la
-+trpmio_LDADD =  librpmio.la @WITH_POPT_LIB@
- 
-@@ -231,3 +232,3 @@
- tkey_LDFLAGS = -all-static
--tkey_LDADD =  librpmio.la $(top_builddir)/popt/libpopt.la
-+tkey_LDADD =  librpmio.la @WITH_POPT_LIB@
- 
-@@ -235,3 +236,3 @@
- tring_LDFLAGS = -all-static
--tring_LDADD =  librpmio.la $(top_builddir)/popt/libpopt.la
-+tring_LDADD =  librpmio.la @WITH_POPT_LIB@
- 
-@@ -250,11 +251,13 @@
- tdigest_OBJECTS =  tdigest.$(OBJEXT)
--tdigest_DEPENDENCIES =  librpmio.la $(top_builddir)/popt/libpopt.la
--tdigest_LDFLAGS = 
-+tdigest_DEPENDENCIES =  librpmio.la
-+tdigest_LDFLAGS = @WITH_POPT_LIB@
- tkey_OBJECTS =  tkey.$(OBJEXT)
--tkey_DEPENDENCIES =  librpmio.la $(top_builddir)/popt/libpopt.la
-+tkey_DEPENDENCIES =  librpmio.la
-+tkey_LDFLAGS = @WITH_POPT_LIB@
- tring_OBJECTS =  tring.$(OBJEXT)
--tring_DEPENDENCIES =  librpmio.la $(top_builddir)/popt/libpopt.la
-+tring_DEPENDENCIES =  librpmio.la
-+tring_LDFLAGS = @WITH_POPT_LIB@
- trpmio_OBJECTS =  trpmio.$(OBJEXT)
--trpmio_DEPENDENCIES =  librpmio.la $(top_builddir)/popt/libpopt.la
--trpmio_LDFLAGS = 
-+trpmio_DEPENDENCIES =  librpmio.la
-+trpmio_LDFLAGS = @WITH_POPT_LIB@
- dumpasn1_OBJECTS =  dumpasn1.$(OBJEXT)
-@@ -463,3 +466,3 @@
- 
--install-data-am: install-pkgincHEADERS install-data-local
-+install-data-am: install-pkgincHEADERS
- install-data: install-data-am
-@@ -537,3 +540,3 @@
- $(top_builddir)/beecrypt/listobjs:
--	make -C $(top_builddir)/beecrypt listobjs
-+	$(MAKE) -C $(top_builddir)/beecrypt listobjs
- 
-@@ -542,2 +545,6 @@
- 	  [ -f $$lo ] || $(LN_S) $(top_builddir)/beecrypt/$$lo $$lo ; \
-+	done
-+	for o in $(BEECRYPTOBJS); do \
-+	  $(LN_S) ../../beecrypt/.libs/$$o .libs/$$o ; \
-+	  $(LN_S) ../beecrypt/$$o $$o ; \
- 	done
diff --git a/archivers/rpm4/files/patch-rpmrc.in b/archivers/rpm4/files/patch-rpmrc.in
deleted file mode 100644
index 810927e1c52b..000000000000
--- a/archivers/rpm4/files/patch-rpmrc.in
+++ /dev/null
@@ -1,53 +0,0 @@
---- rpmrc.in.orig	Wed May 25 11:34:33 2005
-+++ rpmrc.in	Wed May 25 11:44:51 2005
-@@ -19,6 +19,7 @@
- optflags: i686 -O2 -march=i686
- optflags: athlon -O2 -march=athlon
- optflags: ia64 -O2
-+optflags: amd64 -O2
- 
- # XXX Please note that -mieee has been added in rpm-3.0.5.
- optflags: alpha -O2 -mieee
-@@ -71,6 +72,9 @@
- arch_canon:	i586:	i586	1
- arch_canon:	i486:	i486	1
- arch_canon:	i386:	i386	1
-+arch_canon:	amd64:	amd64	1
-+arch_canon:	x86_64:	x86_64	1
-+arch_canon:	ia32e:	ia32e	1
- 
- arch_canon:	alpha:	alpha	2
- arch_canon:	alphaev5: alphaev5	2
-@@ -195,6 +199,10 @@
- buildarchtranslate: s390: s390
- buildarchtranslate: s390x: s390x
- 
-+buildarchtranslate: amd64: amd64
-+buildarchtranslate: x86_64: amd64
-+buildarchtranslate: ia32e: amd64
-+
- #############################################################
- # Architecture compatibility
- 
-@@ -260,6 +268,10 @@
- 
- arch_compat: ia64: i686 noarch
- 
-+arch_compat: amd64: athlon noarch
-+arch_compat: x86_64: amd64 athlon noarch
-+arch_compat: ia32e: amd64 athlon noarch
-+
- os_compat:   IRIX64: IRIX
- os_compat: solaris2.7: solaris2.3 solaris2.4 solaris2.5 solaris2.6
- os_compat: solaris2.6: solaris2.3 solaris2.4 solaris2.5
-@@ -342,6 +354,10 @@
- 
- buildarch_compat: s390: noarch
- buildarch_compat: s390x: noarch
-+
-+buildarch_compat: amd64: noarch
-+buildarch_compat: x86_64: amd64
-+buildarch_compat: ia32e: amd64
- 
- macrofiles:	@RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/%{_target}/macros:@SYSCONFIGDIR@/macros.specspo:@SYSCONFIGDIR@/macros.db1:@SYSCONFIGDIR@/macros.cdb:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros
- 
diff --git a/archivers/rpm4/files/patch-tools::Makefile.in b/archivers/rpm4/files/patch-tools::Makefile.in
deleted file mode 100644
index 511ce7dbe768..000000000000
--- a/archivers/rpm4/files/patch-tools::Makefile.in
+++ /dev/null
@@ -1,98 +0,0 @@
---- tools/Makefile.in.orig	Thu Feb 14 16:58:42 2002
-+++ tools/Makefile.in	Sun Sep  7 00:49:29 2003
-@@ -194,7 +194,7 @@
- 	-I$(top_srcdir)/lib \
- 	-I$(top_srcdir)/rpmdb \
- 	-I$(top_srcdir)/rpmio \
--	-I$(top_srcdir)/popt \
-+	@WITH_POPT_INCLUDE@ \
- 	@WITH_ZLIB_INCLUDE@ \
- 	@INCPATH@ \
- 	-I$(top_srcdir)/misc
-@@ -212,7 +212,6 @@
- 	$(top_builddir)/lib/librpm.la \
- 	$(top_builddir)/rpmdb/librpmdb.la \
- 	$(top_builddir)/rpmio/librpmio.la \
--	$(top_builddir)/popt/libpopt.la \
- 	@WITH_ZLIB_LIB@ \
- 	@INTLLIBS@
- 
-@@ -249,61 +248,61 @@
- rpminject_LDADD = $(LDADD)
- rpminject_DEPENDENCIES =  $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
--rpminject_LDFLAGS = 
-+$(top_builddir)/rpmio/librpmio.la
-+rpminject_LDFLAGS = @WITH_POPT_LIB@
- rpmsort_OBJECTS =  rpmsort.$(OBJEXT)
- rpmsort_LDADD = $(LDADD)
- rpmsort_DEPENDENCIES =  $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
-+$(top_builddir)/rpmio/librpmio.la
- dump_SOURCES = dump.c
- dump_OBJECTS =  dump.$(OBJEXT)
- dump_LDADD = $(LDADD)
- dump_DEPENDENCIES =  $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
--dump_LDFLAGS = 
-+$(top_builddir)/rpmio/librpmio.la
-+dump_LDFLAGS = @WITH_POPT_LIB@
- dumpdb_SOURCES = dumpdb.c
- dumpdb_OBJECTS =  dumpdb.$(OBJEXT)
- dumpdb_LDADD = $(LDADD)
- dumpdb_DEPENDENCIES =  $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
--dumpdb_LDFLAGS = 
-+$(top_builddir)/rpmio/librpmio.la
-+dumpdb_LDFLAGS = @WITH_POPT_LIB@
- rpmarchive_SOURCES = rpmarchive.c
- rpmarchive_OBJECTS =  rpmarchive.$(OBJEXT)
- rpmarchive_LDADD = $(LDADD)
- rpmarchive_DEPENDENCIES =  $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
--rpmarchive_LDFLAGS = 
-+$(top_builddir)/rpmio/librpmio.la
-+rpmarchive_LDFLAGS = @WITH_POPT_LIB@
- rpmheader_SOURCES = rpmheader.c
- rpmheader_OBJECTS =  rpmheader.$(OBJEXT)
- rpmheader_LDADD = $(LDADD)
- rpmheader_DEPENDENCIES =  $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
--rpmheader_LDFLAGS = 
-+$(top_builddir)/rpmio/librpmio.la
-+rpmheader_LDFLAGS = @WITH_POPT_LIB@
- rpmlead_SOURCES = rpmlead.c
- rpmlead_OBJECTS =  rpmlead.$(OBJEXT)
- rpmlead_LDADD = $(LDADD)
- rpmlead_DEPENDENCIES =  $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
--rpmlead_LDFLAGS = 
-+$(top_builddir)/rpmio/librpmio.la
-+rpmlead_LDFLAGS = @WITH_POPT_LIB@
- rpmsignature_SOURCES = rpmsignature.c
- rpmsignature_OBJECTS =  rpmsignature.$(OBJEXT)
- rpmsignature_LDADD = $(LDADD)
- rpmsignature_DEPENDENCIES =  $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
--rpmsignature_LDFLAGS = 
-+$(top_builddir)/rpmio/librpmio.la
-+rpmsignature_LDFLAGS = @WITH_POPT_LIB@
- javadeps_OBJECTS =  javadeps.$(OBJEXT)
- javadeps_LDADD = $(LDADD)
- javadeps_DEPENDENCIES =  $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
--javadeps_LDFLAGS = 
-+$(top_builddir)/rpmio/librpmio.la
-+javadeps_LDFLAGS = @WITH_POPT_LIB@
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/archivers/rpm4/pkg-plist b/archivers/rpm4/pkg-plist
index cebf1002cd2f..dc306f0be20c 100644
--- a/archivers/rpm4/pkg-plist
+++ b/archivers/rpm4/pkg-plist
@@ -3,138 +3,127 @@ bin/rpm
 bin/rpm2cpio
 bin/rpmbuild
 bin/rpmdb
-bin/rpme
-bin/rpmi
+bin/rpmgraph
 bin/rpmquery
 bin/rpmsign
-bin/rpmu
 bin/rpmverify
-include/rpm/hdrinline.h
+include/rpm/argv.h
 include/rpm/header.h
-include/rpm/misc.h
 include/rpm/rpmbuild.h
+include/rpm/rpmcallback.h
 include/rpm/rpmcli.h
 include/rpm/rpmdb.h
-include/rpm/rpmerr.h
+include/rpm/rpmds.h
+include/rpm/rpmfc.h
+include/rpm/rpmfi.h
+include/rpm/rpmfileutil.h
+include/rpm/rpmgi.h
 include/rpm/rpmio.h
+include/rpm/rpmkeyring.h
+include/rpm/rpmlegacy.h
 include/rpm/rpmlib.h
 include/rpm/rpmlog.h
 include/rpm/rpmmacro.h
-include/rpm/rpmmessages.h
+include/rpm/rpmpgp.h
+include/rpm/rpmps.h
 include/rpm/rpmspec.h
+include/rpm/rpmsq.h
+include/rpm/rpmstring.h
+include/rpm/rpmsw.h
+include/rpm/rpmtag.h
+include/rpm/rpmtd.h
+include/rpm/rpmte.h
+include/rpm/rpmts.h
+include/rpm/rpmtypes.h
 include/rpm/rpmurl.h
-include/rpm/stringbuf.h
-include/rpm/ugid.h
-lib/libbeecrypt.a
-lib/libbeecrypt.la
-lib/libbeecrypt.so
-lib/libbeecrypt.so.4
-lib/librpm-4.0.4.so
+include/rpm/rpmutil.h
+include/rpm/rpmvf.h
 lib/librpm.a
 lib/librpm.la
 lib/librpm.so
-lib/librpmbuild-4.0.4.so
+lib/librpm.so.1
 lib/librpmbuild.a
 lib/librpmbuild.la
 lib/librpmbuild.so
-lib/librpmdb-4.0.4.so
-lib/librpmdb.a
-lib/librpmdb.la
-lib/librpmdb.so
-lib/librpmio-4.0.4.so
+lib/librpmbuild.so.1
 lib/librpmio.a
 lib/librpmio.la
 lib/librpmio.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/poptmodule.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpmmodule.so
-lib/rpm/Specfile.pm
+lib/librpmio.so.1
 lib/rpm/brp-compress
-lib/rpm/brp-redhat
-lib/rpm/brp-sparc64-linux
+lib/rpm/brp-java-gcjcompile
+lib/rpm/brp-python-bytecompile
 lib/rpm/brp-strip
 lib/rpm/brp-strip-comment-note
 lib/rpm/brp-strip-shared
+lib/rpm/brp-strip-static-archive
+lib/rpm/check-buildroot
+lib/rpm/check-files
 lib/rpm/check-prereqs
+lib/rpm/check-rpaths
+lib/rpm/check-rpaths-worker
 lib/rpm/config.guess
-lib/rpm/config.site
 lib/rpm/config.sub
-lib/rpm/convertrpmrc.sh
-lib/rpm/cpanflute
-lib/rpm/cpanflute2
-lib/rpm/cross-build
+lib/rpm/desktop-file.prov
 lib/rpm/find-lang.sh
-lib/rpm/find-prov.pl
 lib/rpm/find-provides
-lib/rpm/find-provides.perl
-lib/rpm/find-req.pl
 lib/rpm/find-requires
-lib/rpm/find-requires.perl
-lib/rpm/get_magic.pl
-lib/rpm/getpo.sh
-lib/rpm/http.req
+lib/rpm/fontconfig.prov
 lib/rpm/javadeps
+lib/rpm/libtooldeps.sh
 lib/rpm/macros
-lib/rpm/magic.prov
-lib/rpm/magic.req
+lib/rpm/macros.perl
+lib/rpm/macros.php
+lib/rpm/macros.python
 lib/rpm/mkinstalldirs
+lib/rpm/mono-find-provides
+lib/rpm/mono-find-requires
+lib/rpm/ocaml-find-provides.sh
+lib/rpm/ocaml-find-requires.sh
+lib/rpm/osgideps.pl
 lib/rpm/perl.prov
 lib/rpm/perl.req
+lib/rpm/perldeps.pl
+lib/rpm/pkgconfigdeps.sh
+lib/rpm/pythondeps.sh
 lib/rpm/rpm.daily
 lib/rpm/rpm.log
 lib/rpm/rpm.xinetd
 lib/rpm/rpm2cpio.sh
-lib/rpm/rpmb
-lib/rpm/rpmd
+lib/rpm/rpmdb_loadcvt
+lib/rpm/rpmdeps
 lib/rpm/rpmdiff
 lib/rpm/rpmdiff.cgi
-lib/rpm/rpme
-lib/rpm/rpmi
-lib/rpm/rpmk
-lib/rpm/rpmpopt-4.0.4
-lib/rpm/rpmq
+lib/rpm/rpmpopt-4.8.1
 lib/rpm/rpmrc
-lib/rpm/rpmt
-lib/rpm/rpmu
-lib/rpm/rpmv
-lib/rpm/sql.prov
-lib/rpm/sql.req
 lib/rpm/tcl.req
-lib/rpm/trpm
-lib/rpm/u_pkg.sh
-lib/rpm/vpkg-provides.sh
-lib/rpm/vpkg-provides2.sh
-lib/rpmpopt
-lib/rpmrc
-share/locale/cs/LC_MESSAGES/rpm.mo
-share/locale/da/LC_MESSAGES/rpm.mo
-share/locale/de/LC_MESSAGES/rpm.mo
-share/locale/en_RN/LC_MESSAGES/rpm.mo
-share/locale/es/LC_MESSAGES/rpm.mo
-share/locale/eu_ES/LC_MESSAGES/rpm.mo
-share/locale/fi/LC_MESSAGES/rpm.mo
-share/locale/fr/LC_MESSAGES/rpm.mo
-share/locale/gl/LC_MESSAGES/rpm.mo
-share/locale/hu/LC_MESSAGES/rpm.mo
-share/locale/id/LC_MESSAGES/rpm.mo
-share/locale/is/LC_MESSAGES/rpm.mo
-share/locale/it/LC_MESSAGES/rpm.mo
-share/locale/ja/LC_MESSAGES/rpm.mo
-share/locale/ko/LC_MESSAGES/rpm.mo
-share/locale/no/LC_MESSAGES/rpm.mo
-share/locale/pl/LC_MESSAGES/rpm.mo
-share/locale/pt/LC_MESSAGES/rpm.mo
-share/locale/pt_BR/LC_MESSAGES/rpm.mo
-share/locale/ro/LC_MESSAGES/rpm.mo
-share/locale/ru/LC_MESSAGES/rpm.mo
-share/locale/sk/LC_MESSAGES/rpm.mo
-share/locale/sl/LC_MESSAGES/rpm.mo
-share/locale/sr/LC_MESSAGES/rpm.mo
-share/locale/sv/LC_MESSAGES/rpm.mo
-share/locale/tr/LC_MESSAGES/rpm.mo
-share/locale/uk/LC_MESSAGES/rpm.mo
-share/locale/wa/LC_MESSAGES/rpm.mo
-share/locale/zh/LC_MESSAGES/rpm.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/rpm.mo
+lib/rpm/tgpg
+%%NLS%%share/locale/ca/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/da/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/de/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/is/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/it/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/rpm.mo
+%%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/tr/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/rpm.mo
+libdata/pkgconfig/rpm.pc
 @dirrm lib/rpm
 @dirrm include/rpm
 @dirrmtry src/portbld/SRPMS
@@ -160,7 +149,5 @@ share/locale/zh_CN.GB2312/LC_MESSAGES/rpm.mo
 @dirrmtry src/portbld/BUILD
 @dirrmtry src/portbld
 @dirrmtry src
-@dirrmtry share/locale/en_RN/LC_MESSAGES
-@dirrmtry share/locale/en_RN
-@dirrmtry share/locale/eu_ES/LC_MESSAGES
-@dirrmtry share/locale/eu_ES
+%%NLS%%@dirrmtry share/locale/sr@latin/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sr@latin