Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 9 Oct 2012 18:45:52 GMT
From:      Gabor Pali <pgj@FreeBSD.org>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/172549: [net-p2p/jigdo] OptionsNG Conversion
Message-ID:  <201210091845.q99Ijq7J073911@red.freebsd.org>
Resent-Message-ID: <201210092230.q99MUQD4043709@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         172549
>Category:       ports
>Synopsis:       [net-p2p/jigdo] OptionsNG Conversion
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 09 22:30:26 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Gabor Pali
>Release:        n/a
>Organization:
The FreeBSD Project
>Environment:
n/a
>Description:
- Convert options to OptionsNG format

>How-To-Repeat:

>Fix:
See the attached patch.


Patch attached with submission follows:

diff --git a/net-p2p/jigdo/Makefile b/net-p2p/jigdo/Makefile
index e97bff6..e6198c2 100644
--- a/net-p2p/jigdo/Makefile
+++ b/net-p2p/jigdo/Makefile
@@ -26,13 +26,15 @@ WITH_BDB_VER?=	43
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 
-OPTIONS=	GUI "Build the gtk2 gui" off \
-		BDB "Build with Berkeley DB support (for jigdo-file cache)" on \
-		NLS "Native Language Support" on
+OPTIONS_DEFINE=		GUI BDB NLS
+OPTIONS_DEFAULT=	BDB NLS
 
-.include <bsd.port.pre.mk>
+GUI_DESC=		Build the gtk2 gui
+BDB_DESC=		Build with Berkeley DB support (for jigdo-file cache)
 
-.if defined(WITH_GUI)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MGUI}
 CONFIGURE_ARGS+=	--with-gui
 LIB_DEPENDS+=	gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20 \
 		curl:${PORTSDIR}/ftp/curl
@@ -43,7 +45,7 @@ CONFIGURE_ARGS+=--without-gui
 PLIST_SUB+=	GUI="@comment "
 .endif
 
-.if !defined(WITHOUT_BDB)
+.if ${PORT_OPTIONS:MBDB}
 CONFIGURE_ENV+=	LIBS=-L${BDB_LIB_DIR}
 CPPFLAGS+=	-I${BDB_INCLUDE_DIR}
 CONFIGURE_ARGS+=--with-libdb=-l${BDB_LIB_CXX_NAME}
@@ -52,7 +54,7 @@ USE_BDB=	${WITH_BDB_VER}
 CONFIGURE_ARGS+=--without-libdb
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
@@ -64,4 +66,4 @@ PLIST_SUB+=	NLS="@comment "
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/jigdo-file
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210091845.q99Ijq7J073911>