From owner-svn-ports-head@FreeBSD.ORG Sun Apr 28 20:01:11 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 0558BD51; Sun, 28 Apr 2013 20:01:11 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id DC1D4131F; Sun, 28 Apr 2013 20:01:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3SK1AqQ048008; Sun, 28 Apr 2013 20:01:10 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3SK17Ew047979; Sun, 28 Apr 2013 20:01:07 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201304282001.r3SK17Ew047979@svn.freebsd.org> From: Baptiste Daroussin Date: Sun, 28 Apr 2013 20:01:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316744 - in head/sysutils: apachetop apcupsd avfs boxbackup-devel env4801 flexbackup heartbeat hoz jx kgtk kkbswitch lire msyslog open openipmi pflogx psmisc pwsafe radmind samesame sc... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Apr 2013 20:01:11 -0000 Author: bapt Date: Sun Apr 28 20:01:07 2013 New Revision: 316744 URL: http://svnweb.freebsd.org/changeset/ports/316744 Log: Convert left sysutils ports to new options framework Modified: head/sysutils/apachetop/Makefile head/sysutils/apcupsd/Makefile head/sysutils/avfs/Makefile head/sysutils/boxbackup-devel/Makefile head/sysutils/env4801/Makefile head/sysutils/flexbackup/Makefile head/sysutils/heartbeat/Makefile head/sysutils/hoz/Makefile head/sysutils/jx/Makefile head/sysutils/kgtk/Makefile head/sysutils/kkbswitch/Makefile head/sysutils/lire/Makefile head/sysutils/msyslog/Makefile head/sysutils/open/Makefile head/sysutils/openipmi/Makefile head/sysutils/pflogx/Makefile head/sysutils/psmisc/Makefile head/sysutils/pwsafe/Makefile head/sysutils/radmind/Makefile head/sysutils/samesame/Makefile head/sysutils/screen/Makefile head/sysutils/squashfs-tools/Makefile head/sysutils/sysinfo/Makefile head/sysutils/syslog-ng-devel/Makefile head/sysutils/syslog-ng/Makefile head/sysutils/sysupdate/Makefile head/sysutils/torsmo/Makefile head/sysutils/udfclient/Makefile head/sysutils/usbhotkey/Makefile head/sysutils/webjob/Makefile head/sysutils/zisofs-tools/Makefile Modified: head/sysutils/apachetop/Makefile ============================================================================== --- head/sysutils/apachetop/Makefile Sun Apr 28 19:11:32 2013 (r316743) +++ head/sysutils/apachetop/Makefile Sun Apr 28 20:01:07 2013 (r316744) @@ -1,9 +1,5 @@ -# New ports collection makefile for: apachetop -# Date created: 30 Sep 2003 -# Whom: Sebastian Yepes F. -# +# Created by: Sebastian Yepes F. # $FreeBSD$ -# PORTNAME= apachetop PORTVERSION= 0.12.6 @@ -21,23 +17,22 @@ GNU_CONFIGURE= yes MAN1= apachetop.1 PLIST_FILES= bin/apachetop -OPTIONS= ADNS "Asynchronous-capable DNS support" off \ - FAM "File Alteration Monitor support" off \ - PCRE "Perl Compatible Regular Expressions support" off +OPTIONS_DEFINE= ADNS FAM PCRE +ADNS_DESC= Asynchronous-capable DNS support -.include +.include -.if defined(WITH_ADNS) +.if ${PORT_OPTIONS:MADNS} LIB_DEPENDS+= adns.1:${PORTSDIR}/dns/adns CONFIGURE_ARGS+=--with-adns=${LOCALBASE} .endif -.if defined(WITH_FAM) +.if ${PORT_OPTIONS:MFAM} LIB_DEPENDS+= fam.0:${PORTSDIR}/devel/fam CONFIGURE_ARGS+=--with-fam=${LOCALBASE} .endif -.if defined(WITH_PCRE) +.if ${PORT_OPTIONS:MPCRE} LIB_DEPENDS+= pcre.3:${PORTSDIR}/devel/pcre CONFIGURE_ARGS+=--with-pcre=${LOCALBASE} .endif @@ -49,4 +44,4 @@ post-patch: ${WRKSRC}/src/log.* @cd ${WRKSRC} && ${TOUCH} -r configure.ac aclocal.m4 stamp-h.in -.include +.include Modified: head/sysutils/apcupsd/Makefile ============================================================================== --- head/sysutils/apcupsd/Makefile Sun Apr 28 19:11:32 2013 (r316743) +++ head/sysutils/apcupsd/Makefile Sun Apr 28 20:01:07 2013 (r316744) @@ -1,9 +1,5 @@ -# New ports collection makefile for: apcupsd -# Date created: 1.12.2001 -# Whom: Lars Köller -# +# Created by: Lars Köller # $FreeBSD$ -# PORTNAME= apcupsd PORTVERSION= 3.14.10 @@ -41,41 +37,44 @@ CFLAGS+= -I${LOCALBASE}/include -L${LOCA MAN5= apcupsd.conf.5 MAN8= apcaccess.8 apccontrol.8 apctest.8 apcupsd.8 -OPTIONS= APCSMART_DRV "Compile APC SmartUPS serial driver" on \ - APCDUMB_DRV "Compile dumb UPS driver" on \ - CLIENT_ONLY "Only NIS client (no network server or drivers)" off \ - CGI "Compile with CGI programms to show status" off \ - PCNET_DRV "Compile PowerChute Network Shutdown driver" on \ - USB "Compile with USB Support driver" on \ - SNMP_DRV "Compile with SNMP driver" on \ - SNMP_DRV_OLD "Compile with old SNMP driver" off \ - TCP_WRAPPERS "Compile with TCP_WRAPPERS support" on\ - TEST_DRV "Compile TEST driver" off \ - GAPCMON "Build GTK GUI front-end" off +OPTIONS_DEFINE= APCSMART_DRV APCDUMB_DRV CLIENT_ONLY CGI PCNET_DRV USB SNMP_DRV \ + SNMP_DRV_OLD TCP_WRAPPERS TEST_DRV GAPCMON DOCS +OPTIONS_DEFAULT= APCSMART_DRV APCDUMB_DRV PCNET_DRV USB TCP_WRAPPERS +APCSMART_DRV_DESC= Compile APC SmartUPS serial driver +APCDUMB_DRV_DESC= Compile dumb UPS driver +CLIENT_ONLY_DESC= Only NIS client (no network server or drivers) +CGI_DESC= Compile with CGI programms to show status +PCNET_DRV_DESC= Compile PowerChute Network Shutdown driver +USB_DESC= Compile with USB Support driver +SNMP_DRV_DESC= Compile with SNMP driver +SNMP_DRV_OLD_DESC= Compile with old SNMP driver +TCP_WRAPPERS_DESC= Compile with TCP_WRAPPERS support +TEST_DRV_DESC= Compile TEST driver +GAPCMON_DESC= Build GTK GUI front-end PORTDOCS= ${PORTNAME}.pdf .include -.ifdef(WITH_APCSMART_DRV) +.if ${PORT_OPTIONS:MAPCSMART_DRV} CONFIGURE_ARGS+= --enable-apcsmart .else CONFIGURE_ARGS+= --disable-apcsmart .endif -.ifdef(WITH_APCDUMB_DRV) +.if ${PORT_OPTIONS:MAPCDUMB_DRV} CONFIGURE_ARGS+= --enable-dumb .else CONFIGURE_ARGS+= --disable-dumb .endif -.ifdef(WITH_CLIENT_ONLY) +.if ${PORT_OPTIONS:MCLIENT_ONLY} CONFIGURE_ARGS+= --enable-net \ --disable-apcsmart --disable-dumb --disable-usb \ --disable-snmp --disable-test --disable-pcnet .endif -.ifdef(WITH_CGI) +.if ${PORT_OPTIONS:MCGI} CONFIGURE_ARGS+= --enable-cgi --with-cgi-bin=${ETCDIR}/cgi LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd PLIST_SUB+= CGI="" @@ -83,7 +82,7 @@ PLIST_SUB+= CGI="" PLIST_SUB+= CGI="@comment " .endif -.ifdef(WITH_GAPCMON) +.if ${PORT_OPTIONS:MGAPCMON} CONFIGURE_ARGS+= --enable-gapcmon USE_GNOME+= gconf2 PLIST_SUB+= GAPCMON="" @@ -92,34 +91,34 @@ CONFLICTS+= gapcmon-[0-9]* PLIST_SUB+= GAPCMON="@comment " .endif -.ifdef(WITH_PCNET_DRV) +.if ${PORT_OPTIONS:MPCNET_DRV} CONFIGURE_ARGS+= --enable-pcnet .else CONFIGURE_ARGS+= --disable-pcnet .endif -.ifdef(WITH_USB) +.if ${PORT_OPTIONS:MUSB} CONFIGURE_ARGS+= --enable-usb .endif -.ifdef(WITH_SNMP_DRV) +.if ${PORT_OPTIONS:MSNMP_DRV} CONFIGURE_ARGS+= --enable-snmp .else CONFIGURE_ARGS+= --disable-snmp .endif -.ifdef(WITH_SNMP_DRV_OLD) +.if ${PORT_OPTIONS:MSNMP_DRV_OLD} LIB_DEPENDS+= netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp CONFIGURE_ARGS+= --enable-net-snmp .else CONFIGURE_ARGS+= --disable-net-snmp .endif -.ifdef(WITH_TCP_WRAPPERS) +.if ${PORT_OPTIONS:MTCP_WRAPPERS} CONFIGURE_ARGS+= --with-libwrap=yes .endif -.ifdef(WITH_TEST_DRV) +.if ${PORT_OPTIONS:MTEST_DRV} CONFIGURE_ARGS+= --enable-test .endif @@ -127,17 +126,11 @@ CONFIGURE_ARGS+= --enable-test #CONFIGURE_ENV+= LIBS="-lcurses -lmenu" #PLIST_SUB+= POWERFL="" -.include - -.if defined(WITH_USB) && ${OSVERSION} >= 800069 -CONFIGURE_ARGS+= --with-generic-usb -.endif - pre-configure: -.if defined(WITH_CLIENT_ONLY) && ( defined(WITH_APCSMART_DRV) || \ - defined(WITH_APCDUMB_DRV) || defined(WITH_PCNET_DRV) || \ - defined(WITH_POWERFLUTE) || defined(WITH_USB) || \ - defined(WITH_SNMP_DRV) || defined(WITH_TEST_DRV) ) +.if ${PORT_OPTIONS:MCLIENT_ONLY} && ( ${PORT_OPTIONS:MAPCSMART_DRV} || \ + ${PORT_OPTIONS:MAPCDUMB_DRV} || ${PORT_OPTIONS:MPCNET_DRV} || \ + ${PORT_OPTIONS:MPOWERFLUTE} || ${PORT_OPTIONS:MUSB} || \ + ${PORT_OPTIONS:MSNMP_DRV} || ${PORT_OPTIONS:MTEST_DRV} ) @${ECHO_CMD} "It doesn't make sense to build drivers if all you want is" @${ECHO_CMD} "the client; please do make config and select either" @${ECHO_CMD} "CLIENT_ONLY or the *_DRV you need" @@ -167,10 +160,10 @@ post-install: fi; \ fi; \ done -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${DISTDIR}/${PORTNAME}.pdf ${DOCSDIR} .endif @${CAT} ${PKGMESSAGE} -.include +.include Modified: head/sysutils/avfs/Makefile ============================================================================== --- head/sysutils/avfs/Makefile Sun Apr 28 19:11:32 2013 (r316743) +++ head/sysutils/avfs/Makefile Sun Apr 28 20:01:07 2013 (r316744) @@ -23,19 +23,20 @@ USE_GMAKE= yes USE_BZIP2= yes USE_LDCONFIG= yes -OPTIONS= DEBUG "Enable debug" off \ - LIBRARY "Enable library" off \ - FUSE "Enable fuse" on +OPTIONS_DEFINE= DEBUG LIBRARY FUSE +OPTIONS_DEFAULT= FUSE +LIBRARY_DESC= Enable library +FUSE_DESC= Enable fuse -.include +.include -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-debug .else CONFIGURE_ARGS+= --disable-debug .endif -.if defined(WITH_LIBRARY) +.if ${PORT_OPTIONS:MLIBRARY} CONFIGURE_ARGS+= --enable-library PLIST_SUB+= LIBRARY="" .else @@ -43,7 +44,7 @@ CONFIGURE_ARGS+= --disable-library PLIST_SUB+= LIBRARY="@comment " .endif -.if defined(WITH_FUSE) +.if ${PORT_OPTIONS:MFUSE} CONFIGURE_ARGS+= --enable-fuse PLIST_SUB+= FUSE="" .else @@ -51,4 +52,4 @@ CONFIGURE_ARGS+= --disable-fuse PLIST_SUB+= FUSE="@comment " .endif -.include +.include Modified: head/sysutils/boxbackup-devel/Makefile ============================================================================== --- head/sysutils/boxbackup-devel/Makefile Sun Apr 28 19:11:32 2013 (r316743) +++ head/sysutils/boxbackup-devel/Makefile Sun Apr 28 20:01:07 2013 (r316744) @@ -1,9 +1,5 @@ -# New ports collection makefile for: boxbackup -# Date created: 19 December 2004 -# Whom: James O'Gorman -# +# Created by: James O'Gorman # $FreeBSD$ -# PORTNAME= boxbackup PORTVERSION= 0.11.r${SVNVERSION:C/^[0-9\.]+_[a-z]+_([0-9]+)/\1/} @@ -37,23 +33,22 @@ CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/e PKGMESSAGE= ${WRKDIR}/pkg-message -OPTIONS= CLIENT "Install the bbackupd client" On \ - SERVER "Install the bbstored server" On \ - GNUREADLINE "Enable the use of GNU readline" Off +OPTIONS_SINGLE= TYPE +OPTIONS_SINGLE_TYPE= CLIENT SERVER +OPTIONS_DEFINE= GNUREADLINE +OPTIONS_DEFAULT= CLIENT SERVER +CLIENT_DESC= Install the bbackupd client +SERVER_DESC= Install the bbstored server +GNUREADLINE_DESC= Enable the use of GNU readline -.include +.include -.if defined(WITH_GNUREADLINE) +.if ${PORT_OPTIONS:MGNUREADLINE} CONFIGURE_ARGS+=--enable-gnu-readline .endif -.if defined(WITHOUT_CLIENT) && defined(WITHOUT_SERVER) -IGNORE= requires at least CLIENT or SERVER to be defined.\ - Please 'make config' again -.endif - MANCOMPRESSED= yes -.if defined(WITH_CLIENT) +.if ${PORT_OPTIONS:MCLIENT} USE_RC_SUBR+= bbackupd PLIST_SUB+= CLIENT="" ALL_TARGET+= build-backup-client @@ -65,7 +60,7 @@ SUB_FILES+= 999.boxbackup PLIST_SUB+= CLIENT="@comment " .endif -.if defined(WITH_SERVER) +.if ${PORT_OPTIONS:MSERVER} USE_RC_SUBR+= bbstored USERS+= _bbstored GROUPS+= _bbstored @@ -78,11 +73,11 @@ MAN8+= bbstored.8 bbstoreaccounts.8 bbs PLIST_SUB+= SERVER="@comment " .endif -.if defined(WITHOUT_CLIENT) +.if ! ${PORT_OPTIONS:MCLIENT} # if this is a server-only install, CONFLICT with an install of the CLIENT or both CONFLICTS= boxbackup-client-[0-9]* boxbackup-[0-9]* CLIENT_OR_SERVER=-server -.elif defined(WITHOUT_SERVER) +.elif ! ${PORT_OPTIONS:MSERVER} # if this is a client-only install, CONFLICT with an install of the SERVER or both CONFLICTS= boxbackup-server-[0-9]* boxbackup-[0-9]* CLIENT_OR_SERVER=-client @@ -94,10 +89,10 @@ CONFLICTS= boxbackup-server-[0-9]* boxba post-patch: @${REINPLACE_CMD} -e '/html/d' ${WRKSRC}/parcels.txt -.if !defined(WITHOUT_CLIENT) +.if ${PORT_OPTIONS:MCLIENT} @${CAT} ${FILESDIR}/pkg-message.client >> ${PKGMESSAGE} .endif -.if !defined(WITHOUT_SERVER) +.if ${PORT_OPTIONS:MSERVER} @${CAT} ${FILESDIR}/pkg-message.server >> ${PKGMESSAGE} .endif @@ -105,12 +100,12 @@ post-configure: @${REINPLACE_CMD} -e '/share.doc.boxbackup/d' ${WRKSRC}/parcels/scripts/install-backup-* post-install: -.if !defined(WITHOUT_CLIENT) +.if ${PORT_OPTIONS:MCLIENT} @${MKDIR} -m 0700 ${PREFIX}/etc/box/bbackupd @${MKDIR} ${PREFIX}/etc/periodic/monthly ${INSTALL_SCRIPT} ${WRKDIR}/999.boxbackup ${PREFIX}/etc/periodic/monthly .endif -.if !defined(WITHOUT_SERVER) +.if ${PORT_OPTIONS:MSERVER} @${MKDIR} -m 0700 ${PREFIX}/etc/box/bbstored .endif @${CAT} ${PKGMESSAGE} @@ -119,4 +114,4 @@ test: @${ECHO_CMD} "===> Running tests" @${MAKE} -C ${WRKSRC} test -.include +.include Modified: head/sysutils/env4801/Makefile ============================================================================== --- head/sysutils/env4801/Makefile Sun Apr 28 19:11:32 2013 (r316743) +++ head/sysutils/env4801/Makefile Sun Apr 28 20:01:07 2013 (r316744) @@ -1,9 +1,5 @@ -# Ports collection makefile for: env4801 -# Date created: Tue, Nov 24th, 2004 -# Whom: Patrick M. Hausen (pmh@hausen.com) -# +# Created by: Patrick M. Hausen (pmh@hausen.com) # $FreeBSD$ -# PORTNAME= env4801 PORTVERSION= 0.3 @@ -26,12 +22,14 @@ MAKE_ARGS= -DNOMAN PLIST_FILES= sbin/env4801 etc/rc.d/env4801.sh -OPTIONS= STATIC "Build a statically linked executable" On +OPTIONS_DEFINE= STATIC +OPTIONS_DEFAULT= STATIC +STATIC_DESC= Build a statically linked executable -.include +.include post-patch: -.ifdef(WITHOUT_STATIC) +.if ! ${PORT_OPTIONS:MSTATIC} @${REINPLACE_CMD} -e '/-static/d' ${WRKSRC}/Makefile .endif @@ -46,4 +44,4 @@ do-install: post-install: @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PKGMESSAGE} -.include +.include Modified: head/sysutils/flexbackup/Makefile ============================================================================== --- head/sysutils/flexbackup/Makefile Sun Apr 28 19:11:32 2013 (r316743) +++ head/sysutils/flexbackup/Makefile Sun Apr 28 20:01:07 2013 (r316744) @@ -1,9 +1,5 @@ -# New ports collection makefile for: flexbackup -# Date created: Wed Nov 3 17:58:26 MST 1999 -# Whom: John Reynolds -# +# Created by: John Reynolds # $FreeBSD$ -# PORTNAME= flexbackup PORTVERSION= 1.2.1 @@ -26,31 +22,32 @@ USE_PERL5= yes SUB_FILES+= pkg-message -OPTIONS= AFIO "Enable afio support" Off \ - BUFFER "Enable buffer support" Off \ - MBUFFER "Enable mbuffer support" Off \ - STAR "Enable star support" Off \ - ZIP "Enable zip support" Off +OPTIONS_DEFINE= AFIO BUFFER MBUFFER STAR ZIP DOCS +AFIO_DESC= Enable afio support +BUFFER_DESC= Enable buffer support +MBUFFER_DESC= Enable mbuffer support +STAR_DESC= Enable star support +ZIP_DESC= Enable zip support -.include +.include -.if defined(WITH_AFIO) +.if ${PORT_OPTIONS:MAFIO} RUN_DEPENDS+= afio:${PORTSDIR}/sysutils/afio .endif -.if defined(WITH_BUFFER) +.if ${PORT_OPTIONS:MBUFFER} RUN_DEPENDS+= buffer:${PORTSDIR}/misc/buffer .endif -.if defined(WITH_MBUFFER) +.if ${PORT_OPTIONS:MMBUFFER} RUN_DEPENDS+= mbuffer:${PORTSDIR}/misc/mbuffer .endif -.if defined(WITH_STAR) +.if ${PORT_OPTIONS:MSTAR} RUN_DEPENDS+= star:${PORTSDIR}/archivers/star .endif -.if defined(WITH_ZIP) +.if ${PORT_OPTIONS:MZIP} RUN_DEPENDS+= zip:${PORTSDIR}/archivers/zip .endif @@ -70,9 +67,9 @@ do-install: DOCLIST= CHANGES CREDITS README TODO faq.html post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @cd ${WRKSRC} && ${COPYTREE_SHARE} "${DOCLIST}" ${DOCSDIR} .endif @${CAT} ${PKGMESSAGE} -.include +.include Modified: head/sysutils/heartbeat/Makefile ============================================================================== --- head/sysutils/heartbeat/Makefile Sun Apr 28 19:11:32 2013 (r316743) +++ head/sysutils/heartbeat/Makefile Sun Apr 28 20:01:07 2013 (r316744) @@ -1,9 +1,5 @@ -# New ports collection makefile for: heartbeat -# Date created: 18 March 2005 -# Whom: Scott Kleihege -# +# Created by: Scott Kleihege # $FreeBSD$ -# PORTNAME= heartbeat PORTVERSION= 2.1.4 @@ -62,18 +58,19 @@ MAN1= cl_status.1 ha_logger.1 hb_addnod MAN8= apphbd.8 cibadmin.8 crm_resource.8 ha_logd.8 heartbeat.8 \ meatclient.8 stonith.8 -OPTIONS= MGMT "Enable X11 Management Utilities" Off \ - LDIRECTORD "Enable Linux Director Daemon" Off \ - APCSNMP "Enable APC SNMP Stonith Device" Off \ - DRAC3 "Enable Dell DRACIII Stonith Device" Off +OPTIONS_DEFINE=MGMT LDIRECTORD APCSNMP DRAC3 +MGMT_DESC= Enable X11 Management Utilities +LDIRECTORD_DESC= Enable Linux Director Daemon +APCSNMP_DESC= Enable APC SNMP Stonith Device +DRAC3_DESC= Enable Dell DRACIII Stonith Device -.include +.include .if !defined(BATCH) BATCH=NO .endif -.if defined(WITH_MGMT) +.if ${PORT_OPTIONS:MMGMT} BUILD_DEPENDS+= swig:${PORTSDIR}/devel/swig13 RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc:${PORTSDIR}/x11-toolkits/py-gtk2 PLIST_SUB+= MGMT="" @@ -82,7 +79,7 @@ CONFIGURE_ARGS+= --disable-mgmt PLIST_SUB+= MGMT="@comment " .endif -.if defined(WITH_LDIRECTORD) +.if ${PORT_OPTIONS:MLDIRECTORD} RUN_DEPENDS+= p5-libwww>=0:${PORTSDIR}/www/p5-libwww \ p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools USE_PERL5_RUN= yes @@ -93,14 +90,14 @@ CONFIGURE_ARGS+= --disable-ldirectord PLIST_SUB+= LDIRECTORD="@comment " .endif -.if defined(WITH_APCSNMP) || exists (${PREFIX}/lib/libnetsnmp.so) +.if ${PORT_OPTIONS:MAPCSNMP} || exists (${PREFIX}/lib/libnetsnmp.so) LIB_DEPENDS+= netsnmp:${PORTSDIR}/net-mgmt/net-snmp PLIST_SUB+= APCSNMP="" .else PLIST_SUB+= APCSNMP="@comment " .endif -.if defined(WITH_DRAC3) || exists (${PREFIX}/lib/libcurl.so) +.if ${PORT_OPTIONS:MDRAC3} || exists (${PREFIX}/lib/libcurl.so) USE_CURL= yes LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl PLIST_SUB+= DRAC3="" @@ -108,10 +105,10 @@ PLIST_SUB+= DRAC3="" PLIST_SUB+= DRAC3="@comment " .endif -.if defined(NOPORTDOCS) -PLIST_SUB+= NOPORTDOCS="@comment " -.else +.if ${PORT_OPTIONS:MDOCS} PLIST_SUB+= NOPORTDOCS="" +.else +PLIST_SUB+= NOPORTDOCS="@comment " .endif # BladeHPI Stonith Automagic Building @@ -152,20 +149,20 @@ post-patch: ${TAR} -cf libltdl.tar libltdl && \ ${RM} -rf libltdl -.if defined(NOPORTDOCS) - @${REINPLACE_CMD} -e 's| doc | |' \ - ${WRKSRC}/Makefile.am -.else +.if ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e 's|^\(docdir.*doc/\).*|\1${PORTNAME}|' \ ${WRKSRC}/configure.in \ ${WRKSRC}/doc/Makefile.am +.else + @${REINPLACE_CMD} -e 's| doc | |' \ + ${WRKSRC}/Makefile.am .endif pre-install: @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} # Install sample configuration @if [ ! -f ${PREFIX}/etc/ha.d/authkeys ]; then \ ${CP} -p ${DOCSDIR}/authkeys ${PREFIX}/etc/ha.d/authkeys ; \ @@ -184,7 +181,7 @@ post-install: ${CP} -p ${DOCSDIR}/logd.cf ${PREFIX}/etc/ha.d/logd.cf.sample .endif -.if defined(WITH_LDIRECTORD) +.if ${PORT_OPTIONS:MLDIRECTORD} @if [ ! -f ${PREFIX}/etc/ha.d/ldirectord.cf ]; then \ ${CP} -p ${WRKSRC}/ldirectord/ldirectord.cf ${PREFIX}/etc/ha.d/ldirectord.cf ; \ ${CP} -p ${WRKSRC}/ldirectord/ldirectord.cf ${PREFIX}/etc/ha.d/ldirectord.cf.sample ; \ @@ -194,7 +191,7 @@ post-install: # Some subdirs treat man as documentation, therefor we have to install # those man pages manually if NOPORTDOCS is defined. -.if defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} # Some subdirs treat man as documentation, therefor we have to install # those man pages manually if NOPORTDOCS is defined. @@ -208,4 +205,4 @@ post-install: @${CAT} ${PKGMESSAGE} -.include +.include Modified: head/sysutils/hoz/Makefile ============================================================================== --- head/sysutils/hoz/Makefile Sun Apr 28 19:11:32 2013 (r316743) +++ head/sysutils/hoz/Makefile Sun Apr 28 20:01:07 2013 (r316744) @@ -1,9 +1,5 @@ -# New ports collection makefile for: HOZ - Hacha Open Zource -# Date created: 2005-09-16 -# Whom: Jose Alonso Cardenas Marquez -# +# Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ -# PORTNAME= hoz PORTVERSION= 1.65 @@ -20,52 +16,50 @@ USE_GMAKE= yes PORTDOCS= README -OPTIONS= CLI "CLI interface" on \ - GTK2 "GTK interface" on \ - LANG_ES "Spanish translation" off \ - LANG_EN "English translation" on \ - LANG_FR "French translation" off +OPTIONS_DEFINE= CLI GTK2 LANG_ES LANG_EN LANG_FR +OPTIONS_DEFAULT= CLI GTK2 LANG_EN +LANG_EN_DESC= language support -.include +.include -.if !defined(WITHOUT_GTK2) +.if ${PORT_OPTIONS:MGTK2} USE_GNOME+= gtk20 .endif -.if defined(WITHOUT_CLI) +.if ! ${PORT_OPTIONS:MCLI} ALL_TARGET= gtk .else PLIST_FILES+= bin/hoz .endif -.if defined(WITHOUT_GTK2) +.if ! ${PORT_OPTIONS:MGTK2} ALL_TARGET= cli .else PLIST_FILES+= bin/ghoz .endif -.if defined(WITH_LANG_ES) +.if ${PORT_OPTIONS:MLANG_ES} MAKE_ENV+= LANG="-DHOZ_LANG_ES" .endif -.if !defined(WITHOUT_LANG_EN) +.if ${PORT_OPTIONS:MLANG_EN} MAKE_ENV+= LANG="-DHOZ_LANG_EN" .endif -.if defined(WITH_LANG_FR) +.if ${PORT_OPTIONS:MLANG_FR} MAKE_ENV+= LANG="-DHOZ_LANG_FR" .endif do-install: -.if !defined(WITHOUT_CLI) +.if ${PORT_OPTIONS:MCLI} ${INSTALL_PROGRAM} ${WRKSRC}/hoz ${PREFIX}/bin .endif -.if !defined(WITHOUT_GTK2) +.if ${PORT_OPTIONS:MGTK2} ${INSTALL_PROGRAM} ${WRKSRC}/ghoz ${PREFIX}/bin .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif -.include +.include Modified: head/sysutils/jx/Makefile ============================================================================== --- head/sysutils/jx/Makefile Sun Apr 28 19:11:32 2013 (r316743) +++ head/sysutils/jx/Makefile Sun Apr 28 20:01:07 2013 (r316744) @@ -1,9 +1,5 @@ -# New ports collection makefile for: jx -# Date created: 15 December 2008 -# Whom: Dmitry Shulgachik -# +# Created by: Dmitry Shulgachik # $FreeBSD$ -# PORTNAME= jx PORTVERSION= 1.23 @@ -21,25 +17,26 @@ PLIST_FILES= bin/${PORTNAME} MAN1= jx.1 MANCOMPRESSED= yes -OPTIONS= CONFIG "Enable custom config (recuire Config::General)" Off +OPTIONS_DEFINE= CONFIG +CONFIG_DESC= Enable custom config (recuire Config::General) -.include +.include -.if !defined(WITHOUT_CONFIG) +.if ${PORT_OPTIONS:MCONFIG} RUN_DEPENDS= p5-Config-General>=0:${PORTSDIR}/devel/p5-Config-General PLIST_FILES+= etc/${PORTNAME}.cfg.sample .endif post-patch: -.if !defined(WITHOUT_CONFIG) +.if ${PORT_OPTIONS:MCONFIG} ${REINPLACE_CMD} -e 's/use constant use_config => 0;/use constant use_config => 1;/' ${WRKSRC}/${PORTNAME}.pl .endif do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${PREFIX}/bin/${PORTNAME} ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1.gz ${PREFIX}/man/man1/${PORTNAME}.1.gz -.if !defined(WITHOUT_CONFIG) +.if ${PORT_OPTIONS:MCONFIG} ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.cfg.sample ${PREFIX}/etc/${PORTNAME}.cfg.sample .endif -.include +.include Modified: head/sysutils/kgtk/Makefile ============================================================================== --- head/sysutils/kgtk/Makefile Sun Apr 28 19:11:32 2013 (r316743) +++ head/sysutils/kgtk/Makefile Sun Apr 28 20:01:07 2013 (r316744) @@ -1,9 +1,5 @@ -# Ports collection makefile for: kgtk -# Date created: Sep 13, 2007 -# Whom: Rashid N. "Citycat" Achilov -# +# Created by: Rashid N. "Citycat" Achilov # $FreeBSD$ -# PORTNAME= kgtk PORTVERSION= 0.9.4 @@ -18,7 +14,7 @@ COMMENT= Daemon to use KDE dialogs in GT SUB_FILES= pkg-message -OPTIONS= UNICODE "System locale is utf-8" off +OPTIONS_DEFINE= UNICODE USE_BZIP2= yes USE_GNOME= gtk20 @@ -30,16 +26,16 @@ CMAKE_SOURCE_PATH= .. USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} -.include +.include -.if defined(WITHOUT_NLS) -PLIST_SUB+= NLS="@comment " -.else +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" +.else +PLIST_SUB+= NLS="@comment " .endif -.if defined(WITHOUT_UNICODE) +.if ! ${PORT_OPTIONS:MUNICODE} EXTRA_PATCHES+= ${PATCHDIR}/opt-patch-kgtk-wrapper \ ${PATCHDIR}/opt-patch-gtk2__kgtk2-wrapper.cmake .endif @@ -62,4 +58,4 @@ post-configure: post-install: @${CAT} ${PKGMESSAGE} -.include +.include Modified: head/sysutils/kkbswitch/Makefile ============================================================================== --- head/sysutils/kkbswitch/Makefile Sun Apr 28 19:11:32 2013 (r316743) +++ head/sysutils/kkbswitch/Makefile Sun Apr 28 20:01:07 2013 (r316744) @@ -1,9 +1,5 @@ -# New ports collection makefile for: kkbswitch -# Date created: 01 Oct 2003 -# Whom: Rashid N. Achilov -# +# Created by: Rashid N. Achilov # $FreeBSD$ -# PORTNAME= kkbswitch PORTVERSION= 1.4.3 @@ -28,19 +24,20 @@ DOCSDIR= share/doc/HTML/en/${PORTNAME} MAN1= kkbswitch.1 -OPTIONS= RU_UA_LAYOUT "With additional RU_UA keyboard layout" off +OPTIONS_DEFINE= RU_UA_LAYOUT +RU_UA_LAYOUT_DESC= With additional RU_UA keyboard layout PLIST_SUB= PREFIX=${PREFIX} \ LOCALBASE=${LOCALBASE} \ DOCSDIR=${DOCSDIR} -.include +.include -.if defined(WITH_RU_UA_LAYOUT) +.if ${PORT_OPTIONS:MRU_UA_LAYOUT} CONFIGURE_ARGS+= --enable-ru-ua-layout PLIST_SUB+= LAYOUT="" .else PLIST_SUB+= LAYOUT="@comment " .endif -.include +.include Modified: head/sysutils/lire/Makefile ============================================================================== --- head/sysutils/lire/Makefile Sun Apr 28 19:11:32 2013 (r316743) +++ head/sysutils/lire/Makefile Sun Apr 28 20:01:07 2013 (r316744) @@ -1,9 +1,5 @@ -# New ports collection makefile for: lire -# Date Created: 26 june 2002 -# Whom: Edwin Groothuis -# +# Created by: Edwin Groothuis # $FreeBSD$ -# # # Remark regarding the errors during pkg_delete: These directories not @@ -31,10 +27,12 @@ BUILD_DEPENDS= unzip:${PORTSDIR}/archive p5-Curses-UI>=0:${PORTSDIR}/devel/p5-Curses-UI \ p5-Locale-libintl>=0:${PORTSDIR}/devel/p5-Locale-libintl -OPTIONS= CHARTS "Have Charts output format" On \ - HTML "Have HTML or DocBook output format" On \ - PDF "Have PDF output format" Off \ - EXCEL95 "Have Excel95 Spreadsheet output format" Off +OPTIONS_DEFINE= CHARTS HTML PDF EXCEL95 +OPTIONS_DEFAULT= CHARTS HTML +CHARTS_DESC= Have Charts output format +HTML_DESC= Have HTML or DocBook output format +PDF_DESC= Have PDF output format +EXCEL95_DESC= Have Excel95 Spreadsheet output format USE_GNOME= libxml2 libxslt USE_PERL5= yes USE_GMAKE= yes @@ -260,16 +258,16 @@ MAN3= \ MAN7= lire.7 -.include +.include -.ifdef(WITH_CHARTS) +.if ${PORT_OPTIONS:MCHARTS} RUN_DEPENDS+= ploticus:${PORTSDIR}/math/ploticus-nox11 BUILD_DEPENDS+= p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph .endif -.ifdef(WITH_HTML) +.if ${PORT_OPTIONS:MHTML} RUN_DEPENDS+= lynx:${PORTSDIR}/www/lynx .endif -.ifdef(WITH_PDF) +.if ${PORT_OPTIONS:MPDF} RUN_DEPENDS+= epsffit:${PORTSDIR}/print/psutils \ gs:${PORTSDIR}/print/ghostview \ jade:${PORTSDIR}/textproc/jade \ @@ -277,7 +275,7 @@ RUN_DEPENDS+= epsffit:${PORTSDIR}/print/ ${LOCALBASE}/share/sgml/docbook/dsssl:${PORTSDIR}/textproc/dsssl-docbook-modular .endif -.ifdef(WITH_EXCEL95) +.if ${PORT_OPTIONS:MEXCEL95} BUILD_DEPENDS+= p5-Spreadsheet-WriteExcel>=0:${PORTSDIR}/textproc/p5-Spreadsheet-WriteExcel .endif @@ -286,4 +284,4 @@ RUN_DEPENDS+= ${BUILD_DEPENDS} post-install: @${CAT} ${PKGMESSAGE} -.include +.include Modified: head/sysutils/msyslog/Makefile ============================================================================== --- head/sysutils/msyslog/Makefile Sun Apr 28 19:11:32 2013 (r316743) +++ head/sysutils/msyslog/Makefile Sun Apr 28 20:01:07 2013 (r316744) @@ -1,9 +1,5 @@ -# New ports collection makefile for: msyslog -# Date created: 14 May 2001 -# Whom: Anders Nordby -# +# Created by: Anders Nordby # $FreeBSD$ -# PORTNAME= msyslog PORTVERSION= 1.08g @@ -16,8 +12,7 @@ DISTNAME= ${PORTNAME}-v${PORTVERSION}-sr MAINTAINER= 5u623l20@gmail.com COMMENT= Flexible and easy to integrate syslog daemon -OPTIONS= MYSQL "With MySQL Support" off \ - PGSQL "With Postgres Support" off \ +OPTIONS_DEFINE= MYSQL PGSQL WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} @@ -30,20 +25,20 @@ MANCOMPRESSED= yes PORTSCOUT= skipv:1.09d -.include +.include .if ${OSVERSION} > 900006 EXTRA_PATCHES= ${PATCHDIR}/utmpx-src-modules-om_classic.c .endif -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes MAN8+= om_mysql.8 .else CONFIGURE_ARGS+= --without-mysql .endif -.if defined(WITH_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes MAN8+= om_pgsql.8 .else @@ -67,4 +62,4 @@ post-install: > ${PKGMESSAGE} @${CAT} ${PKGMESSAGE} -.include +.include Modified: head/sysutils/open/Makefile ============================================================================== --- head/sysutils/open/Makefile Sun Apr 28 19:11:32 2013 (r316743) +++ head/sysutils/open/Makefile Sun Apr 28 20:01:07 2013 (r316744) @@ -1,9 +1,5 @@ -# New ports collection makefile for: open -# Date created: 10 Feb 2004 -# Whom: Max Khon -# +# Created by: Max Khon # $FreeBSD$ -# PORTNAME= open PORTVERSION= 1.4 @@ -18,15 +14,16 @@ COMMENT= Open opens a new vt and runs a ALL_TARGET= open MAN1= open.1 PLIST_FILES= bin/open -OPTIONS= SETUID "Install setuid open binary" off +OPTIONS_DEFINE= SETUID +SETUID_DESC= Install setuid open binary PKGMESSAGE= ${WRKDIR}/pkg-message -.include +.include do-install: ${INSTALL_PROGRAM} ${WRKSRC}/open ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/open.1 ${PREFIX}/man/man1 -.if defined(WITH_SETUID) +.if ${PORT_OPTIONS:MSETUID} ${CHMOD} u+s ${PREFIX}/bin/open .else @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \ @@ -34,4 +31,4 @@ do-install: @${CAT} ${PKGMESSAGE} .endif -.include +.include Modified: head/sysutils/openipmi/Makefile ============================================================================== --- head/sysutils/openipmi/Makefile Sun Apr 28 19:11:32 2013 (r316743) +++ head/sysutils/openipmi/Makefile Sun Apr 28 20:01:07 2013 (r316744) @@ -29,39 +29,42 @@ MAN1= ipmi_ui.1 openipmicmd.1 openipmig MAN7= ipmi_cmdlang.7 openipmi_conparms.7 MAN8= ipmilan.8 -OPTIONS= SSL "IPMI 2.0 RMCP+ encryption and authentication" On \ - SNMP "SNMP trap support for the sample programs" Off \ - PERL "Perl interface for OpenIPMI library" Off \ - PYTHON "Python interface for OpenIPMI library" Off \ - TCL "TCL interface for OpenIPMI library" Off \ - TKINTER "GUI for OpenIPMI, written in Python" Off \ - TRACE "Enable backtrace inspecting" Off \ - GDBM "Local SDR caching on startup" Off \ - GLIB12 "Simply OS handler for glib 1.2" Off \ - GLIB20 "Simply OS handler for glib 2.0" Off +OPTIONS_DEFINE= SSL SNMP PERL PYTHON TCL TKINTER TRACE GDBM +OPTIONS_RADIO= GLIB +OPTIONS_RADIO_GLIB= GLIB12 GLIB20 +SSL_DESC= IPMI 2.0 RMCP+ encryption and authentication +SNMP_DESC= SNMP trap support for the sample programs +PERL_DESC= Perl interface for OpenIPMI library +PYTHON_DESC= Python interface for OpenIPMI library +TCL_DESC= TCL interface for OpenIPMI library +TKINTER_DESC= GUI for OpenIPMI, written in Python +TRACE_DESC= Enable backtrace inspecting +GDBM_DESC= Local SDR caching on startup +GLIB12_DESC= Simply OS handler for glib 1.2 +GLIB20_DESC= Simply OS handler for glib 2.0 .include .if exists(${LOCALBASE}/lib/libgdbm.so.3) -WITH_GDBM= yes +PORT_OPTIONS+= GDBM .endif -.if defined(WITH_SNMP) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***