1 files changed, 28 insertions, 35 deletions

diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 49d968503b93..beeefd6b966f 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	syslog-ng
-# Date created:		10 November 2006
-# Whom:			Ivan Lago <ivan.lago@ifom-ieo-campus.it>
-#
+# Created by: Ivan Lago <ivan.lago@ifom-ieo-campus.it>
 # $FreeBSD$
-#
 
 PORTNAME=	syslog-ng
 PORTVERSION=	3.3.9
@@ -18,16 +14,21 @@ CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
 		syslog-ng-devel-[0-9]*
 WRKSRC=		$(WRKDIR)/$(PORTNAME)-$(PORTVERSION)
 
-OPTIONS=	SYS_SSL "Build with OpenSSL support (from system)" off \
-		PORTS_SSL "Build with OpenSSL support (from ports)" on \
-		TCP_WRAPPERS "Build with TCP Wrappers" off \
-		SQL "Build with database (libdbi) support" off \
-		SPOOF "Build with spoof source support" off \
-		IPV6 "Build with IPV6 support" on \
-		PCRE "Build with PCRE support" on \
-		JSON_C "Build with JSON-C support" off \
-		JSON_GLIB "Build with JSON-GLIB support" off \
-		SYSLOG2NG "Install syslog2ng script" off
+OPTIONS_RADIO=	SSL JSON
+OPTIONS_RADIO_SSL=	SYS_SSL PORTS_SSL
+OPTIONS_RADIO_JSON=	JSON_C JSON_GLIB
+OPTIONS_DEFINE=	TCP_WRAPPERS SQL SPOOF IPV6 PCRE SYSLOG2NG DOCS
+OPTIONS_DEFAULT=	PORTS_SSL PCRE
+SYS_SSL_DESC=		Build with OpenSSL support (from system)
+PORTS_SSL_DESC=		Build with OpenSSL support (from ports)
+TCP_WRAPPERS_DESC=	Build with TCP Wrappers
+SQL_DESC=		Build with database (libdbi) support
+SPOOF_DESC=		Build with spoof source support
+IPV6_DESC=		Build with IPV6 support
+PCRE_DESC=		Build with PCRE support
+JSON_C_DESC=		Build with JSON-C support
+JSON_GLIB_DESC=		Build with JSON-GLIB support
+SYSLOG2NG_DESC=		Install syslog2ng script
 
 .include <bsd.port.options.mk>
 
@@ -47,11 +48,7 @@ SUB_FILES=	pkg-message
 CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
 		--enable-dynamic-linking
 
-.if defined(WITH_SYS_SSL) && defined(WITH_PORTS_SSL)
-BROKEN=		SYS_SSL and PORTS_SSL are mutually exclusive
-.endif
-
-.if defined(WITH_SYS_SSL) || defined(WITH_PORTS_SSL)
+.if ${PORT_OPTIONS:MSYS_SSL} || ${PORT_OPTIONS:MPORTS_SSL}
 USE_OPENSSL=		yes
 CONFIGURE_ARGS+=	--enable-ssl
 CONFIGURE_ENV+=		OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \
@@ -61,19 +58,19 @@ PLIST_FILES+=		lib/syslog-ng/libafsocket-tls.la lib/syslog-ng/libafsocket-tls.so
 CONFIGURE_ARGS+=	--disable-ssl
 .endif
 
-.if defined(WITH_PORTS_SSL)
+.if ${PORT_OPTIONS:MPORTS_SSL}
 WITH_OPENSSL_PORT=	yes
 .endif
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_TCP_WRAPPERS)
+.if ${PORT_OPTIONS:MTCP_WRAPPERS}
 CONFIGURE_ARGS+=	--enable-tcp-wrapper
 .else
 CONFIGURE_ARGS+=	--disable-tcp-wrapper
 .endif
 
-.if defined(WITH_SPOOF)
+.if ${PORT_OPTIONS:MSPOOF}
 LIB_DEPENDS+=		net:${PORTSDIR}/net/libnet
 LIBNET_CONFIG?=		${LOCALBASE}/bin/libnet11-config
 CONFIGURE_ARGS+=	--enable-spoof-source --with-libnet=${LOCALBASE}/bin
@@ -83,20 +80,20 @@ LDFLAGS+=		-g `${LIBNET_CONFIG} --libs`
 CONFIGURE_ARGS+=	--disable-spoof-source
 .endif
 
-.if defined(WITH_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--enable-ipv6
 .else
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
-.if defined(WITH_PCRE)
+.if ${PORT_OPTIONS:MPCRE}
 CONFIGURE_ARGS+=	--enable-pcre
 LIB_DEPENDS+=		pcre:${PORTSDIR}/devel/pcre
 .else
 CONFIGURE_ARGS+=	--disable-pcre
 .endif
 
-.if defined(WITH_SQL)
+.if ${PORT_OPTIONS:MSQL}
 LIB_DEPENDS+=		dbi.1:${PORTSDIR}/databases/libdbi
 CONFIGURE_ENV+=		LIBDBI_LIBS="-ldbi"
 CONFIGURE_ARGS+=	--enable-sql
@@ -105,15 +102,11 @@ PLIST_FILES+=		lib/syslog-ng/libafsql.la lib/syslog-ng/libafsql.so
 CONFIGURE_ARGS+=	--disable-sql
 .endif
 
-.if defined(WITH_JSON_C) && defined(WITH_JSON_GLIB)
-BROKEN=		JSON_C and JSON_GLIB are mutually exclusive
-.endif
-
-.if defined(WITH_JSON_GLIB)
+.if ${PORT_OPTIONS:MJSON_GLIB}
 LIB_DEPENDS+=		json-glib-1.0.0:${PORTSDIR}/devel/json-glib
 CONFIGURE_ARGS+=	--enable-json --with-json=json-glib
 PLIST_FILES+=		lib/syslog-ng/libtfjson.la lib/syslog-ng/libtfjson.so
-.elif defined(WITH_JSON_C)
+.elif ${PORT_OPTIONS:MJSON_C}
 LIB_DEPENDS+=		json.0:${PORTSDIR}/devel/json-c
 CONFIGURE_ARGS+=	--enable-json --with-json=json-c
 PLIST_FILES+=		lib/syslog-ng/libtfjson.la lib/syslog-ng/libtfjson.so
@@ -125,7 +118,7 @@ CONFIGURE_ARGS+=	--disable-json
 CONFIGURE_ARGS+=        --disable-linux-caps
 .endif
 
-.if defined(WITH_SYSLOG2NG)
+.if ${PORT_OPTIONS:MSYSLOG2NG}
 PLIST_FILES+=		sbin/syslog2ng
 .endif
 
@@ -135,10 +128,10 @@ post-patch:
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
 
 post-install:
-.if defined(WITH_SYSLOG2NG)
+.if ${PORT_OPTIONS:MSYSLOG2NG}
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/syslog2ng ${PREFIX}/sbin
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} \
 			${PREFIX}/share/doc/syslog-ng
 	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${PREFIX}/share/doc/syslog-ng