From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Oct 9 22:30:26 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CCC6D351 for ; Tue, 9 Oct 2012 22:30:26 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [8.8.178.135]) by mx1.freebsd.org (Postfix) with ESMTP id A57E28FC23 for ; Tue, 9 Oct 2012 22:30:26 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q99MUQbQ043710 for ; Tue, 9 Oct 2012 22:30:26 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q99MUQD4043709; Tue, 9 Oct 2012 22:30:26 GMT (envelope-from gnats) Resent-Date: Tue, 9 Oct 2012 22:30:26 GMT Resent-Message-Id: <201210092230.q99MUQD4043709@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Gabor Pali Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 207DDA7D for ; Tue, 9 Oct 2012 18:45:53 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 0ADDC8FC14 for ; Tue, 9 Oct 2012 18:45:53 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q99Ijqwg073912 for ; Tue, 9 Oct 2012 18:45:52 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id q99Ijq7J073911; Tue, 9 Oct 2012 18:45:52 GMT (envelope-from nobody) Message-Id: <201210091845.q99Ijq7J073911@red.freebsd.org> Date: Tue, 9 Oct 2012 18:45:52 GMT From: Gabor Pali To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/172549: [net-p2p/jigdo] OptionsNG Conversion X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Oct 2012 22:30:27 -0000 X-List-Received-Date: Tue, 09 Oct 2012 22:30:27 -0000 >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 +GUI_DESC= Build the gtk2 gui +BDB_DESC= Build with Berkeley DB support (for jigdo-file cache) -.if defined(WITH_GUI) +.include + +.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 +.include >Release-Note: >Audit-Trail: >Unformatted: