- Update rpm to 4.10

  http://rpm.org/wiki/Releases/4.10.0
- Remove unneeded library version numbers
- Remove patch file that's no longer relevant
- Register conflict with rpm 5.x
- Convert to new options framework
- Note: shared library version got bumped

4 files changed, 131 insertions, 29 deletions

diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile
index d10a639962f3..36e9d3e0734f 100644
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@@ -5,19 +5,20 @@
 # $FreeBSD$
 
 PORTNAME=	rpm
-PORTVERSION=	4.9.1.3
+PORTVERSION=	4.10.0
 CATEGORIES=	archivers
-MASTER_SITES=	http://rpm.org/releases/rpm-${PORTVERSION:R:R}.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=	johans@FreeBSD.org
 COMMENT=	The RPM Package Manager
 
-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
 
-OPTIONS=	PYTHON "Build Python rpm module" On
+OPTIONS_DEFINE=	PYTHON
+OPTIONS_DEFAULT=PYTHON
 
 USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
@@ -28,7 +29,7 @@ INVALID_BDB_VER=51
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 LATEST_LINK=	rpm4
-CONFLICTS=	rpm-3.*
+CONFLICTS_INSTALL=	rpm-[35].*
 
 CPPFLAGS+=	-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/nspr -I${LOCALBASE}/include/nss/nss \
@@ -48,10 +49,10 @@ PLIST_SUB+=	VERSION=${PORTVERSION}
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
-LIB_DEPENDS+=	lzma.5:${PORTSDIR}/archivers/xz
+LIB_DEPENDS+=	lzma:${PORTSDIR}/archivers/xz
 .endif
 
-.ifndef	WITHOUT_PYTHON
+.if ${PORT_OPTIONS:MPYTHON}
 CONFIGURE_ARGS+=--enable-python
 USE_PYTHON=	2.6+
 PLIST_SUB+=	PYTHON=""
@@ -62,13 +63,13 @@ CONFIGURE_ARGS+=--disable-python
 PLIST_SUB+=	PYTHON="@comment "
 .endif
 
-.ifdef	WITHOUT_NLS
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.else
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
 .endif
 
 MANLANG=	"" ja fr pl ru ko sk
diff --git a/archivers/rpm4/distinfo b/archivers/rpm4/distinfo
index 88ee48d204ce..4d42a18548f6 100644
--- a/archivers/rpm4/distinfo
+++ b/archivers/rpm4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rpm-4.9.1.3.tar.bz2) = 531894301e1a9891baf356fb32f732b10d1b313f5c5875a47fdcbdc0c3f67883
-SIZE (rpm-4.9.1.3.tar.bz2) = 3485850
+SHA256 (rpm-4.10.0.tar.bz2) = 0e2e237235b64c07ee4a4152e4eb77aad4eb559737eac9b6713c5e1bcabfe4a9
+SIZE (rpm-4.10.0.tar.bz2) = 3530378
diff --git a/archivers/rpm4/files/patch-tools_javadeps.c b/archivers/rpm4/files/patch-tools_javadeps.c
deleted file mode 100644
index 77a06f2e7d78..000000000000
--- a/archivers/rpm4/files/patch-tools_javadeps.c
+++ /dev/null
@@ -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 <netdb.h>
- #include <rpm/rpmutil.h>
- #include <ctype.h>
-+#include <netinet/in.h>
- #include "debug.h"
- 
- /*---------typedefs---------*/
diff --git a/archivers/rpm4/pkg-plist b/archivers/rpm4/pkg-plist
index d37a0ffbd6b7..b09c6c2bd20b 100644
--- a/archivers/rpm4/pkg-plist
+++ b/archivers/rpm4/pkg-plist
@@ -10,6 +10,7 @@ bin/rpmsign
 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 @@ include/rpm/rpmspec.h
 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
@@ -106,7 +107,6 @@ lib/rpm/fileattrs/python.attr
 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 +116,71 @@ lib/rpm/find-requires
 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 +197,9 @@ lib/rpm-plugins/sepolicy.la
 %%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 +211,57 @@ lib/rpm-plugins/sepolicy.la
 %%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 +288,10 @@ libdata/pkgconfig/rpm.pc
 @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