From owner-svn-ports-all@FreeBSD.ORG Thu Oct 4 10:48:51 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0FF8F106564A; Thu, 4 Oct 2012 10:48:51 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E88568FC0A; Thu, 4 Oct 2012 10:48:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q94AmoNH034978; Thu, 4 Oct 2012 10:48:50 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q94AmoVO034966; Thu, 4 Oct 2012 10:48:50 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201210041048.q94AmoVO034966@svn.freebsd.org> From: Baptiste Daroussin Date: Thu, 4 Oct 2012 10:48:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r305249 - in head: palm/barry polish/ekg security/aimsniff security/bsp_upektfmess security/cfv security/libprelude security/libtomcrypt security/openfwtk security/pear-File_Passwd secu... X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Oct 2012 10:48:51 -0000 Author: bapt Date: Thu Oct 4 10:48:50 2012 New Revision: 305249 URL: http://svn.freebsd.org/changeset/ports/305249 Log: Convert to new options framework Modified: head/palm/barry/Makefile head/polish/ekg/Makefile head/security/aimsniff/Makefile head/security/bsp_upektfmess/Makefile head/security/cfv/Makefile head/security/libprelude/Makefile head/security/libtomcrypt/Makefile head/security/openfwtk/Makefile head/security/pear-File_Passwd/Makefile head/security/trousers/Makefile Modified: head/palm/barry/Makefile ============================================================================== --- head/palm/barry/Makefile Thu Oct 4 10:27:32 2012 (r305248) +++ head/palm/barry/Makefile Thu Oct 4 10:48:50 2012 (r305249) @@ -21,11 +21,11 @@ CONFIGURE_ENV= OPENSSL_CFLAGS=-I/usr/inc MAN1= bcharge.1 bidentify.1 bs11nread.1 btool.1 -OPTIONS= GUI "Build the GUI" On \ - OPENSYNC "Build the OpenSync plugin" On \ - DOXYGEN "Build API documentation" Off +OPTIONS_DEFINE= GUI OPENSYNC DOXYGEN DOCS +OPTIONS_DEFAULT= GUI OPENSYNC +OPENSYNC_DESC= Build the OpenSync plugin -.include +.include .if ${OSVERSION} < 800069 LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb @@ -34,7 +34,7 @@ CONFIGURE_ENV+= LIBUSB_LIBS="-lusb" LIBU BROKEN= does not configure .endif -.if defined(WITH_GUI) +.if ${PORT_OPTIONS:MGUI} LIB_DEPENDS+= glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \ tar.0:${PORTSDIR}/devel/libtar CONFIGURE_ARGS+= --enable-gui @@ -43,7 +43,7 @@ PLIST_SUB+= GUI="" PLIST_SUB+= GUI="@comment " .endif -.if defined(WITH_OPENSYNC) +.if ${PORT_OPTIONS:MOPENSYNC} LIB_DEPENDS+= opensync.0:${PORTSDIR}/devel/libopensync022 CONFIGURE_ARGS+= --enable-opensync-plugin PLIST_SUB+= OPENSYNC="" @@ -51,7 +51,7 @@ PLIST_SUB+= OPENSYNC="" PLIST_SUB+= OPENSYNC="@comment " .endif -.if defined(WITH_DOXYGEN) +.if ${PORT_OPTIONS:MDOXYGEN} BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen PLIST_SUB+= DOXYGEN="" .else @@ -63,14 +63,14 @@ post-patch: @${REINPLACE_CMD} -e 's| -Werror||' ${WRKSRC}/opensync-plugin/src/Makefile.in post-build: -.if defined(WITH_DOXYGEN) +.if ${PORT_OPTIONS:MDOXYGEN} @(cd ${WRKSRC}/src && ${LOCALBASE}/bin/doxygen) .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${CP} -R ${WRKSRC}/doc/ ${DOCSDIR} .endif -.include +.include Modified: head/polish/ekg/Makefile ============================================================================== --- head/polish/ekg/Makefile Thu Oct 4 10:27:32 2012 (r305248) +++ head/polish/ekg/Makefile Thu Oct 4 10:48:50 2012 (r305249) @@ -27,17 +27,17 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo ${PTHREAD_LIBS} CFLAGS+= -I${LOCALBASE}/include -OPTIONS= ASPELL "Build with ASPELL support" off \ - OPENSSL "Build with OPENSSL support" on +OPTIONS_DEFINE= ASPELL OPENSSL +OPTIONS_DEFAULT= OPENSSL -.include +.include -.if defined(WITH_ASPELL) +.if ${PORT_OPTIONS:MASPELL} LIB_DEPENDS+= aspell.16:${PORTSDIR}/polish/aspell CONFIGURE_ARGS+= --enable-aspell .endif -.if defined(WITHOUT_OPENSSL) +.if empty(PORT_OPTIONS:MOPENSSL) CONFIGURE_ARGS+= --without-openssl .endif @@ -50,4 +50,4 @@ MANCOMPRESSED= no post-install: ${STRIP_CMD} ${PREFIX}/bin/ekg -.include +.include Modified: head/security/aimsniff/Makefile ============================================================================== --- head/security/aimsniff/Makefile Thu Oct 4 10:27:32 2012 (r305248) +++ head/security/aimsniff/Makefile Thu Oct 4 10:48:50 2012 (r305249) @@ -1,7 +1,4 @@ -# New ports collection makefile for: aimsniff -# Date created: 4 December 2004 -# Whom: Andrew Marks (andrew@amrx.net) -# +# Created by: Andrew Marks # $FreeBSD$ PORTNAME= aimsniff @@ -20,7 +17,8 @@ RUN_DEPENDS= p5-Net-Pcap>=0:${PORTSDIR}/ p5-Proc-Simple>=0:${PORTSDIR}/devel/p5-Proc-Simple\ p5-Unix-Syslog>=0:${PORTSDIR}/sysutils/p5-Unix-Syslog -OPTIONS= SUID_ROOT "Install aimsniff with set-uid bit" off +OPTIONS_DEFINE= SUID_ROOT DOCS +SUID_ROOT_DESC= Install aimsniff with set-uid bit PORTDOCS= README table.struct rc.aimsniff @@ -29,7 +27,7 @@ USE_PERL5= yes PLIST_FILES= bin/aimsniff -.include +.include .if !exists(${LOCALBASE}/lib/perl5/${PERL_VERSION}/${PERL_ARCH}/GDBM_File.pm) #IGNORE= You need perl compiled with GDBM support @@ -37,17 +35,17 @@ PLIST_FILES= bin/aimsniff do-install: ${INSTALL_SCRIPT} ${WRKSRC}/aimSniff.pl ${PREFIX}/bin/aimsniff -.if defined(WITH_SUID_ROOT) +.if ${PORT_OPTIONS:MSUID_ROOT} ${CHMOD} u+s ${PREFIX}/bin/aimsniff .else .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for i in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR} .endfor .endif -.include +.include Modified: head/security/bsp_upektfmess/Makefile ============================================================================== --- head/security/bsp_upektfmess/Makefile Thu Oct 4 10:27:32 2012 (r305248) +++ head/security/bsp_upektfmess/Makefile Thu Oct 4 10:48:50 2012 (r305249) @@ -1,9 +1,5 @@ -# Ports collection makefile for: bsp_upektfmess -# Date created: February 2006 -# Whom: Fredrik Lindberg -# +# Created by: Fredrik Lindberg # $FreeBSD$ -# PORTNAME= bsp_upektfmess PORTVERSION= 1.1 @@ -35,11 +31,11 @@ NO_BUILD= yes NO_WRKSUBDIR= yes ONLY_FOR_ARCHS= i386 -OPTIONS= GUI "Install GUI" off +OPTIONS_DEFINE= GUI -.include +.include -.if defined(WITH_GUI) +.if ${PORT_OPTIONS:MGUI} TFMESSPATH=${WRKDIR}/${DISTNAME} .else TFMESSPATH=${WRKDIR}/${DISTNAME}/console_only @@ -55,7 +51,7 @@ do-install: post-install: .if !defined(BATCH) @${ECHO_CMD} "" -.if defined(WITH_GUI) +.if ${PORT_OPTIONS:MGUI} @${ECHO_CMD} "You have chosen to install the GUI version, this does" @${ECHO_CMD} "not always work correctly with PAM." @${ECHO_CMD} "Please install the non-gui version if you intend to" @@ -67,4 +63,4 @@ post-install: @${ECHO_CMD} "" .endif -.include +.include Modified: head/security/cfv/Makefile ============================================================================== --- head/security/cfv/Makefile Thu Oct 4 10:27:32 2012 (r305248) +++ head/security/cfv/Makefile Thu Oct 4 10:48:50 2012 (r305249) @@ -1,10 +1,5 @@ -# ex:ts=8 -# New ports collection makefile for: cfv -# Date created: Jul 20, 2001 -# Whom: ijliao -# +# Created by: Ying-Chieh Liao # $FreeBSD$ -# PORTNAME= cfv PORTVERSION= 1.18.3 @@ -22,25 +17,18 @@ INSTALL_TARGET= install-wrapper MAN1= cfv.1 -OPTIONS= # start blank to enable it through the pre.mk fence +OPTIONS_DEFINE_i386= PSYCO +PSYCO_DESC= Enable devel/py-psyco optimization support post-patch: @${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/Makefile -.include +.include -.if ${ARCH} == "i386" -OPTIONS+= PSYCO "Enable devel/py-psyco optimization support" off -.else -.undef WITH_PSYCO - -WITHOUT_PSYCO= yes -.endif - -.if defined(WITH_PSYCO) +.if ${PORT_OPTIONS:MPSYCO} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco EXTRA_PATCHES+= ${FILESDIR}/extra-psyco-patch-Makefile .endif -.include +.include Modified: head/security/libprelude/Makefile ============================================================================== --- head/security/libprelude/Makefile Thu Oct 4 10:27:32 2012 (r305248) +++ head/security/libprelude/Makefile Thu Oct 4 10:48:50 2012 (r305249) @@ -1,6 +1,4 @@ -# New ports collection makefile for: libprelude -# Date created: Sun Aug 4 19:31:17 CEST 2002 -# Whom: Clement Laforet +# Created by: Clement Laforet # $FreeBSD$ PORTNAME= libprelude @@ -15,8 +13,7 @@ COMMENT= Framework library for Prelude N LIB_DEPENDS= gnutls.47:${PORTSDIR}/security/gnutls \ gcrypt.18:${PORTSDIR}/security/libgcrypt -OPTIONS= PERL "Include Perl bindings" off \ - PYTHON "Include Python bindings" off +OPTIONS_DEFINE= PERL PYTHON DOCS BROKEN= does not configure @@ -32,7 +29,7 @@ PORTDOCS= * .include -.if defined(WITH_PERL) +.if ${PORT_OPTIONS:MPERL} USE_PERL5= yes .include "${PORTSDIR}/Mk/bsd.perl.mk" CONFIGURE_ARGS+= --with-perl @@ -42,7 +39,7 @@ CONFIGURE_ARGS+= --without-perl PLIST_SUB+= WITH_PERL="@comment " .endif -.if defined(WITH_PYTHON) +.if ${PORT_OPTIONS:MPYTHON} USE_PYTHON= yes CONFIGURE_ARGS+= --with-python PLIST_SUB+= WITH_PYTHON="" PYTHON_VER=${PYTHON_VER} @@ -61,7 +58,7 @@ post-patch: @${REINPLACE_CMD} -e 's|libdir)/pkgconfig|prefix)/libdata/pkgconfig|' ${WRKSRC}/src/Makefile.in post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${INSTALL} -d ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/api/html/* ${DOCSDIR} .endif Modified: head/security/libtomcrypt/Makefile ============================================================================== --- head/security/libtomcrypt/Makefile Thu Oct 4 10:27:32 2012 (r305248) +++ head/security/libtomcrypt/Makefile Thu Oct 4 10:48:50 2012 (r305249) @@ -1,9 +1,5 @@ -# Ports collection makefile for: libtomcrypt -# Date created: 22 Jan 2004 -# Whom: Yonatan -# +# Created by: Yonatan # $FreeBSD$ -# PORTNAME= libtomcrypt PORTVERSION= 1.17 @@ -26,36 +22,32 @@ MAKE_JOBS_SAFE= yes CFLAGS+= -I${PREFIX}/include -OPTIONS= DOCS "build documentation (depends on teTeX)" off \ - LIBTOMMATH "Use LibTomMath" on \ - TOMSFASTMATH "Use TomsFastMath" off \ - GMP "Use GMP" off +OPTIONS_DEFINE= DOCS +OPTIONS_MULTI= MATH +OPTIONS_MULTI_MATH= LIBTOMMATH TOMSFASTMATH GMP +LIBTOMMATH_DESC= Use LibTomMath +TOMSFASTMATH_DESC= Use TomsFastMath -.include +.include -.if defined(WITHOUT_LIBTOMMATH) && !defined(WITH_TOMSFASTMATH) && !defined(WITH_GMP) -IGNORE= requires LibTomMath, TomsFastMath, or GMP (or all three) -.endif - -.if !defined(WITHOUT_LIBTOMMATH) +.if ${PORT_OPTIONS:MLIBTOMMATH} BUILD_DEPENDS+= ${LOCALBASE}/include/tommath.h:${PORTSDIR}/math/libtommath CFLAGS+= -DLTM_DESC .endif -.if defined(WITH_TOMSFASTMATH) +.if ${PORT_OPTIONS:MTOMSFASTMATH} BUILD_DEPENDS+= ${LOCALBASE}/include/tfm.h:${PORTSDIR}/math/tomsfastmath CFLAGS+= -DTFM_DESC .endif -.if defined(WITH_GMP) +.if ${PORT_OPTIONS:MGMP} BUILD_DEPENDS+= ${LOCALBASE}/include/gmp.h:${PORTSDIR}/math/gmp CFLAGS+= -DGMP_DESC .endif -.if defined(WITH_DOCS) +.if ${PORT_OPTIONS:MDOCS} BUILD_DEPENDS+= latex:${PORTSDIR}/print/teTeX .else -NOPORTDOCS= yes MAKE_ARGS+= NODOCS=yes .endif @@ -79,4 +71,4 @@ test: build (cd ${WRKSRC} && CFLAGS="${CFLAGS} -DUSE_GMP" EXTRALIBS="-L${PREFIX}/lib -lgmp" ${GMAKE} test && ${WRKSRC}/test) .endif -.include +.include Modified: head/security/openfwtk/Makefile ============================================================================== --- head/security/openfwtk/Makefile Thu Oct 4 10:27:32 2012 (r305248) +++ head/security/openfwtk/Makefile Thu Oct 4 10:48:50 2012 (r305249) @@ -1,7 +1,4 @@ -# New ports collection makefile for: openfwtk -# Date created: 12 Oct 2007 -# Whom: Anton Karpov -# +# Created by: Anton Karpov # $FreeBSD$ PORTNAME= openfwtk @@ -16,7 +13,8 @@ COMMENT= Application proxy toolkit which LICENSE= BSD -OPTIONS= WATCH "Install fw-watch GUI (require TCL/TK!)" off +OPTIONS_DEFINE= GUI +GUI_DESC= Install fw-watch GUI (require TCL/TK!) WRKSRC= ${WRKDIR}/fwtk WRKSRC_WATCH= ${WRKDIR}/fw_watch @@ -29,7 +27,7 @@ MANCOMPRESSED= no .include -.if defined(WITH_WATCH) +.if ${PORT_OPTIONS:MGUI} USE_TK_WRAPPER= yes PLIST_SUB+= WATCH="" .else @@ -67,7 +65,7 @@ pre-install: @${MKDIR} ${ETCDIR} post-install: -.if defined(WITH_WATCH) +.if ${PORT_OPTIONS:MGUI} @${MKDIR} ${PREFIX}/share/fw_watch .for data in fileselect.tcl fw_watch newsb.tcl searchbox.tcl taputils.tcl ${INSTALL_DATA} ${WRKSRC_WATCH}/${data} ${PREFIX}/share/fw_watch Modified: head/security/pear-File_Passwd/Makefile ============================================================================== --- head/security/pear-File_Passwd/Makefile Thu Oct 4 10:27:32 2012 (r305248) +++ head/security/pear-File_Passwd/Makefile Thu Oct 4 10:48:50 2012 (r305249) @@ -1,9 +1,5 @@ -# Ports collection makefile for: pear-File_Passwd -# Date created: 09 November 2004 -# Whom: Antonio Carlos Venancio Junior () -# +# Created by: Antonio Carlos Venancio Junior # $FreeBSD$ -# PORTNAME= File_Passwd PORTVERSION= 1.1.7 @@ -16,7 +12,8 @@ BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${POR RUN_DEPENDS:= ${BUILD_DEPENDS} LATEST_LINK= pear-File_Passwd -OPTIONS= PEAR_CRYPT_CHAP "PEAR::Crypt_CHAP support" off +OPTIONS_DEFINE= PEAR_CRYPT_CHAP +PEAR_CRYPT_CHAP_DESC= PEAR::Crypt_CHAP support CATEGORY= File FILES= Passwd.php Passwd/Common.php Passwd/Unix.php Passwd/Cvs.php \ @@ -30,7 +27,7 @@ TESTS= testsuite.php test_file_passwd.p .include -.if defined(WITH_PEAR_CRYPT_CHAP) +.if ${PORT_OPTIONS:MPEAR_CRYPT_CHAP} RUN_DEPENDS+= ${PEARDIR}/Crypt/CHAP.php:${PORTSDIR}/security/pear-Crypt_CHAP .endif Modified: head/security/trousers/Makefile ============================================================================== --- head/security/trousers/Makefile Thu Oct 4 10:27:32 2012 (r305248) +++ head/security/trousers/Makefile Thu Oct 4 10:48:50 2012 (r305249) @@ -1,9 +1,5 @@ -# New ports collection makefile for: trousers -# Date created: 18 Sep 2007 -# Whom: Sebastian Schuetz -# +# Created by: Sebastian Schuetz # $FreeBSD$ -# PORTNAME= trousers PORTVERSION= 0.3.6 @@ -41,14 +37,14 @@ CONFIGURE_ARGS= --with-gui=none --enable --localstatedir=${PREFIX}/var \ --with-tssuser=${USERS} --with-tssgroup=${GROUPS} -OPTIONS= EMULATOR "Build for use with the tpm-emulator" off \ - DEBUG "Build with debugging flags" off +OPTIONS_DEFINE= EMULATOR DEBUG +EMULATOR_DESC= Build for use with the tpm-emulator WRKSRC= ${WRKDIR}/${DISTNAME} -.include +.include -.if defined(WITH_EMULATOR) +.if ${PORT_OPTIONS:MEMULATOR} PKGNAMESUFFIX+= -no_tddl LIB_DEPENDS+= tddl.1:${PORTSDIR}/emulators/tpm-emulator @@ -69,8 +65,7 @@ CONFLICTS+= tpm-emulator-0* PLIST_SUB+= TDDL="" .endif -.if defined(WITH_DEBUG) -PKGNAMESUFFIX+= -debug +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--enable-debug .endif @@ -97,4 +92,4 @@ add-plist-post: @${ECHO_CMD} "@unexec ${RMDIR} var/run/ima 2>/dev/null || true" >> ${TMPPLIST} @${ECHO_CMD} "@exec ${INSTALL} -d -o ${USERS} -g ${GROUPS} -m 0700 var/run/ima" >> ${TMPPLIST} -.include +.include