update to 0.9.3 and convert options to new style

1 files changed, 35 insertions, 29 deletions

diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index f7e43c5c11e0..670dbfc5e445 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gnunet
-DISTVERSION=	0.9.2
-PORTREVISION=	2
+DISTVERSION=	0.9.3
 CATEGORIES=	net-p2p ipv6 security
 MASTER_SITES=	GNU
 
@@ -24,11 +23,17 @@ LIB_DEPENDS=	unistring:${PORTSDIR}/devel/libunistring \
 		gcrypt:${PORTSDIR}/security/libgcrypt \
 		extractor:${PORTSDIR}/textproc/libextractor
 
-OPTIONS=	HTTP	"Enable HTTP transport via libmicrohttpd" off \
-		MYSQL	"Use MySQL for the datastore and datacache" off \
-		NLS	"Enable Native Language support" on \
-		PGSQL	"Use PostgreSQL for the datastore and datacache" off \
-		SQLITE	"Use SQLite for the datastore and datacache" on
+OPTIONS_DEFINE =	HTTP
+
+HTTP_DESC=	Enable HTTP transport via libmicrohttpd
+MYSQL_DESC=	Use MySQL for the data store and cache
+PGSQL_DESC=	Use PostgreSQL for the data store and cache
+SQLITE_DESC=	Use SQLite for the data store and cache
+
+OPTIONS_MULTI=		DB
+OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE
+
+OPTIONS_DEFAULT=	SQLITE
 
 USE_AUTOTOOLS=	libltdl libtool
 USE_GMAKE=	yes
@@ -47,11 +52,11 @@ CONFIGURE_ARGS =	--with-daemon-home-dir=${GNUNET_DAEMON_DIR} \
 GROUPS =	gnunet
 USERS=		gnunet
 
-MAN1=	gnunet-arm.1 gnunet-directory.1 gnunet-download.1 \
-	gnunet-download-manager.1 gnunet-fs.1 gnunet-nat-server.1 \
-	gnunet-peerinfo.1 gnunet-pseudonym.1 gnunet-publish.1 \
-	gnunet-search.1 gnunet-statistics.1 gnunet-transport.1 \
-	gnunet-unindex.1 gnunet-vpn.1
+MAN1=	gnunet-arm.1 gnunet-core.1 gnunet-directory.1 gnunet-download.1 \
+	gnunet-download-manager.1 gnunet-fs.1 gnunet-gns.1 gnunet-namestore.1 \
+	gnunet-nat-server.1 gnunet-peerinfo.1 gnunet-pseudonym.1 \
+	gnunet-publish.1 gnunet-rsa.1 gnunet-search.1 gnunet-statistics.1 \
+	gnunet-transport.1 gnunet-unindex.1 gnunet-vpn.1
 
 #If a non-default GNUNET_DAEMON_DIR is defined, the home directory
 #of the gnunet user may need to be adjusted -- e.g., via:
@@ -60,18 +65,18 @@ GNUNET_DAEMON_DIR?=		/var/lib/gnunet
 PLIST_SUB=	GNUNET_DAEMON_DIR=${GNUNET_DAEMON_DIR}
 SUB_FILES=	pkg-message
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README
 .endif
 
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 PORTEXAMPLES=	gnunet_janitor.py gnunet_pyexpect.py hostlist.cgi hostlist.php \
 report.sh
 .endif
 
-.if defined(WITH_HTTP)
+.if ${PORT_OPTIONS:MHTTP}
 BROKEN =	WITH_HTTP requires libmicrohttpd 0.9.18 or higher
 LIB_DEPENDS+=		microhttpd:${PORTSDIR}/www/libmicrohttpd
 CONFIGURE_ARGS+=	--with-microhttpd=${LOCALBASE}
@@ -81,19 +86,16 @@ CONFIGURE_ARGS+=	--without-microhttpd
 PLIST_SUB+=		HTTP="@comment "
 .endif
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
 PLIST_SUB+=		MYSQL=""
 .else
-.if !(defined(WITH_PGSQL) || defined(WITH_SQLITE))
-IGNORE =	define at least one of WITH_MYSQL, WITH_PGSQL, and WITH_SQLITE
-.endif
 CONFIGURE_ARGS+=	--without-mysql
 PLIST_SUB+=		MYSQL="@comment "
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=	--with-libintl-prefix=${LOCALBASE}
 PLIST_SUB+=		NLS=""
@@ -102,7 +104,7 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--with-postgres=${LOCALBASE}
 PLIST_SUB+=		PGSQL=""
@@ -111,7 +113,7 @@ CONFIGURE_ARGS+=	--without-postgres
 PLIST_SUB+=		PGSQL="@comment "
 .endif
 
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 USE_SQLITE=		yes
 CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE}
 PLIST_SUB+=		SQLITE=""
@@ -123,15 +125,19 @@ PLIST_SUB+=		SQLITE="@comment "
 post-patch:
 	@${REINPLACE_CMD} -e 's|postgresql/||g' \
 		${WRKSRC}/configure \
+		${WRKSRC}/gnunet_config.h \
 		${WRKSRC}/src/datacache/plugin_datacache_postgres.c \
-		${WRKSRC}/src/datastore/plugin_datastore_postgres.c
+		${WRKSRC}/src/datastore/plugin_datastore_postgres.c \
+		${WRKSRC}/src/include/gnunet_postgres_lib.h
 	@${REINPLACE_CMD} \
 	-e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
 		${WRKSRC}/pkgconfig/Makefile.in
 
 post-install:
-	@${PRINTF} "%s\n%s\n%s\n" "[PATHS]" "SERVICEHOME = ${GNUNET_DAEMON_DIR}" \
-	"DEFAULTCONFIG = ${PREFIX}/etc/gnunet.conf" > ${PREFIX}/etc/gnunet.conf.sample
+	@${PRINTF} "%s\n%s\n%s\n" "[PATHS]" \
+	"SERVICEHOME = ${GNUNET_DAEMON_DIR}" \
+	"DEFAULTCONFIG = ${PREFIX}/etc/gnunet.conf" \
+	> ${PREFIX}/etc/gnunet.conf.sample
 .if !exists(${PREFIX}/etc/gnunet.conf)
 	@${CP} ${PREFIX}/etc/gnunet.conf.sample ${PREFIX}/etc/gnunet.conf
 .endif
@@ -139,11 +145,11 @@ post-install:
 	@${INSTALL} -d -o gnunet -g gnunet -m 700 ${GNUNET_DAEMON_DIR}
 .endif
 	@${INSTALL_PROGRAM} ${WRKSRC}/contrib/timeout_watchdog ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	@cd ${WRKSRC}/contrib; ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}
 .endif
@@ -151,4 +157,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD} ""
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>