- Make plugins optional

- Switch to options helpers
- Cosmetic fixes
- Remove obsolete conflicts
- Fix COMMENT

2 files changed, 37 insertions, 33 deletions

diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile
index 82edc452199c..91907f007d81 100644
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@@ -3,36 +3,23 @@
 
 PORTNAME=	rpm
 PORTVERSION=	4.12.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	archivers
 MASTER_SITES=	http://rpm.org/releases/rpm-${PORTVERSION:R:R}.x/
 PKGNAMESUFFIX=	4
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The RPM Package Manager
+COMMENT=	Red Hat Package Manager
 
 LIB_DEPENDS=	libpopt.so:devel/popt \
-		libnss3.so:security/nss \
-		libdbus-1.so:devel/dbus
+		libnss3.so:security/nss
 BUILD_DEPENDS=	${LOCALBASE}/bin/gsed:textproc/gsed
 
-OPTIONS_DEFINE=	PYTHON NLS DOCS
-OPTIONS_DEFAULT=PYTHON
-OPTIONS_SUB=	yes
-PYTHON_CONFIGURE_ENABLE=python
-PYTHON_USES=	python:2.7
-NLS_CONFIGURE_ENABLE=nls
-NLS_USES=	gettext
-NLS_LIBS=	-lintl
-PORTDOCS=	*
-
 USES=		alias bdb gmake libarchive libtool lua:51 pathfix pkgconfig \
 		shebangfix tar:bzip2
 INVALID_BDB_VER=51
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-INSTALL_TARGET=	install-strip
-CONFLICTS_INSTALL=	rpm-[35].* rpm5-*
 SHEBANG_FILES=	scripts/brp-python-bytecompile scripts/check-prereqs \
 		scripts/check-rpaths-worker scripts/pythondeps.sh \
 		scripts/mono-find-requires scripts/mono-find-provides \
@@ -41,32 +28,49 @@ SHEBANG_FILES=	scripts/brp-python-bytecompile scripts/check-prereqs \
 		scripts/perl.prov scripts/perl.req scripts/perldeps.pl \
 		scripts/osgideps.pl scripts/tcl.req \
 		python/rpm/transaction.py
-
-CPPFLAGS+=	-I${LOCALBASE}/include \
-		-I${LOCALBASE}/include/nspr -I${LOCALBASE}/include/nss/nss \
-		-I${BDB_INCLUDE_DIR} -I${LUA_INCDIR}
-LDFLAGS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib/nss \
-		-L${BDB_LIB_DIR} -L${LUA_LIBDIR}
-CONFIGURE_ARGS+=--with-external-db \
+CONFIGURE_ARGS=	--with-external-db \
 		--without-db \
 		--with-popt-prefix="${LOCALBASE}" \
 		--sysconfdir=${PREFIX}/etc \
 		--localstatedir=/var \
 		--without-javaglue
-CONFIGURE_ENV+=	LUA_CFLAGS=-I${LUA_INCDIR} \
+CONFIGURE_ENV=	LUA_CFLAGS=-I${LUA_INCDIR} \
 		LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER} -lm"
-PLIST_SUB+=	VERSION=${PORTVERSION}
+INSTALL_TARGET=	install-strip
+
+CPPFLAGS+=	-I${LOCALBASE}/include \
+		-I${LOCALBASE}/include/nspr -I${LOCALBASE}/include/nss/nss \
+		-I${BDB_INCLUDE_DIR} -I${LUA_INCDIR}
+LDFLAGS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib/nss \
+		-L${BDB_LIB_DIR} -L${LUA_LIBDIR}
+
+PLIST_SUB=	VERSION=${PORTVERSION}
+
+PORTDOCS=	*
+
+OPTIONS_DEFINE=	PYTHON PLUGINS NLS DOCS
+OPTIONS_DEFAULT=PYTHON PLUGINS
+OPTIONS_SUB=	yes
+
+PYTHON_CONFIGURE_ENABLE=python
+PYTHON_USES=		python:2.7
+
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext
+NLS_LIBS=		-lintl
+
+PLUGINS_CONFIGURE_ENABLE=plugins
+PLUGINS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 
 post-patch:
-	${REINPLACE_CMD} -e 's:\.\./\.\./bin/::' ${WRKSRC}/Makefile.in
-	${REINPLACE_CMD} -e 's/(hpux)/& || defined(__FreeBSD__)/' \
+	@${REINPLACE_CMD} -e 's:\.\./\.\./bin/::' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's/(hpux)/& || defined(__FreeBSD__)/' \
 		${WRKSRC}/misc/fts.?
-	${REINPLACE_CMD} -e 's/ __GLIBC__.*/& || defined(__FreeBSD__)/' \
+	@${REINPLACE_CMD} -e 's/ __GLIBC__.*/& || defined(__FreeBSD__)/' \
 		${WRKSRC}/system.h
 
-post-install:
-	# Install documentation
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} librpm/html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/archivers/rpm4/pkg-plist b/archivers/rpm4/pkg-plist
index cf948a3c2bb5..9e61bb2fdce7 100644
--- a/archivers/rpm4/pkg-plist
+++ b/archivers/rpm4/pkg-plist
@@ -64,8 +64,8 @@ lib/librpmsign.so.3.3.1
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpmb.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpms.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/transaction.py
-lib/rpm-plugins/syslog.so
-lib/rpm-plugins/systemd_inhibit.so
+%%PLUGINS%%lib/rpm-plugins/syslog.so
+%%PLUGINS%%lib/rpm-plugins/systemd_inhibit.so
 lib/rpm/appdata.prov
 lib/rpm/brp-compress
 lib/rpm/brp-java-gcjcompile