[Midnightbsd-cvs] mports [17701] trunk/security/xmlsec1/Makefile: use new options framework setup

[laffer1 at midnightbsd.org]

Revision: 17701
          http://svnweb.midnightbsd.org/mports/?rev=17701
Author:   laffer1
Date:     2014-10-08 22:53:58 -0400 (Wed, 08 Oct 2014)
Log Message:
-----------
use new options framework setup

Modified Paths:
--------------
    trunk/security/xmlsec1/Makefile

Modified: trunk/security/xmlsec1/Makefile
===================================================================
--- trunk/security/xmlsec1/Makefile	2014-10-09 02:51:16 UTC (rev 17700)
+++ trunk/security/xmlsec1/Makefile	2014-10-09 02:53:58 UTC (rev 17701)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xmlsec1
 PORTVERSION=	1.2.20
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.aleksey.com/xmlsec/download/ \
 		ftp://ftp.aleksey.com/pub/xmlsec/releases/ \
@@ -13,57 +14,44 @@
 
 LICENSE=	mit
 
-BUILD_DEPENDS=	${RUN_DEPENDS}
+LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
 
-OPTIONS=	GNUTLS	"Enable GNUTLS support"	off	\
-		NSS	"Enable Mozilla's NSS support"	off
+OPTIONS_DEFINE=	DOCS GNUTLS NSS
+OPTIONS_SUB=	yes
+GNUTLS_DESC=		Enable GNUTLS support
+GNUTLS_CONFIGURE_WITH=	gnutls="${LOCALBASE}"
+GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+NSS_DESC=		Enable Mozilla's NSS support
+NSS_CONFIGURE_WITH=	nss="${LOCALBASE}" nspr="${LOCALBASE}"
+NSS_LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss
 
+GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
+USES=		libtool:oldver pathfix pkgconfig
 USE_OPENSSL=	yes
-USE_GNOME=	gnomehack lthack libxslt 
-GNU_CONFIGURE=	yes
-USE_PKG_CONFIG=	yes
+USE_GNOME=	libxml2 libxslt
 USE_LDCONFIG=	yes
 
-MAN1=	xmlsec1.1 xmlsec1-config.1
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-MAKE_ENV+=	ABS_BUILDDIR=${WRKSRC} TMPFOLDER=${WRKSRC}
+MAKE_ENV+=	ABS_BUILDDIR=${WRKSRC} TMPFOLDER=${WRKSRC} DOCS=docs
+CONFIGURE_ARGS+=--with-openssl="${OPENSSLBASE}"
+
+.if !defined(.PARSEDIR)
 MAKE_ARGS+=	-EABS_BUILDDIR
-USE_AUTOTOOLS=	libltdl
-
-.if !defined(NOPORTDOCS)
-PORTDOCS=	*
-MAKE_ENV+=	DOCS=docs
 .endif
 
-.include <bsd.port.pre.mk>
+.include <bsd.mport.options.mk>
 
-.if defined(WITH_GNUTLS)
-CONFIGURE_ARGS+=	--with-gnutls="${LOCALBASE}"
-LIB_DEPENDS+=		gnutls:${PORTSDIR}/security/gnutls
-PLIST_SUB+=		GNUTLS=""
-.else
-CONFIGURE_ARGS+=	--without-gnutls
-PLIST_SUB+=		GNUTLS="@comment "
-.endif
+# avoid --without-opt=PATH constructs
+CONFIGURE_ARGS:=${CONFIGURE_ARGS:C/without-([a-z]*)=.*/without-\1/}
 
-.if defined(WITH_NSS)
-CONFIGURE_ARGS+=	--with-nss="${LOCALBASE}" --with-nspr="${LOCALBASE}"
-LIB_DEPENDS+=		nss3:${PORTSDIR}/security/nss
-PLIST_SUB+=		NSS=""
-.else
-CONFIGURE_ARGS+=	--without-nss
-PLIST_SUB+=		NSS="@comment "
-.endif
-
-CONFIGURE_ARGS+=	--with-openssl="${OPENSSLBASE}"
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|src apps man docs|src apps man \$${DOCS}|g' \
 	    -e 's|^confexecdir =.*$$|confexecdir = \$$(sysconfdir)|g' \
 	    -e 's|/tmp/\*\.log|${WRKSRC}/*.log|g' \
 		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e '/objformat=/s|=`[^`]*`|=elf|' \
+	@${REINPLACE_CMD} \
 	    -e '/^XMLSEC_SHLIBSFX="/s|"[^"]*"|".so"|' \
 	    -e 's|openssl_exlibs=-ldl|openssl_exlibs=|' \
 	    -e 's|-ldl"|"|' \
@@ -79,13 +67,13 @@
 	    -e 's,total_time.*/ 1000),total_time*1000/CLOCKS_PER_SEC,' \
 		${WRKSRC}/apps/xmlsec.c
 	@${REINPLACE_CMD} -e 's,\\\\\\,\\,g' ${WRKSRC}/*.pc.in
-.if defined(WITH_GNUTLS)
+.if ${PORT_OPTIONS:MGNUTLS}
 # Don't rely on broken autodetection
 	@${REINPLACE_CMD} -e '/^GNUTLS_FOUND/s/no/yes/' \
 	    -e '/^GNUTLS_LIBS=/s,"","-L${LOCALBASE}/lib -lgnutls",' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 .endif
-.if defined(WITH_NSS)
+.if ${PORT_OPTIONS:MNSS}
 # Makeing the xmlsec1 executable multi-threaded to let load -lnss,
 # when needed.
 	@${REINPLACE_CMD} -e 's,^\(xmlsec1_LDADD = \)\\$$,\1 -L${LOCALBASE}/lib ${PTHREAD_LIBS}\\,' \
@@ -92,4 +80,4 @@
 		${WRKSRC}/apps/Makefile.in
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>