Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 22 Mar 2013 11:53:34 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r314915 - in head/www: asterisk-stat aws bigbluebutton cacheboy15-devel cacheboy16 cakephp11 cakephp12 cakephp13 cakephp21 cakephp22 codeigniter17 dillo2 dokeos extjs eyeos-themes foswi...
Message-ID:  <201303221153.r2MBrY3j016501@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Fri Mar 22 11:53:34 2013
New Revision: 314915
URL: http://svnweb.freebsd.org/changeset/ports/314915

Log:
  Convert a bunch of www ports to new options framework

Modified:
  head/www/asterisk-stat/Makefile
  head/www/aws/Makefile
  head/www/bigbluebutton/Makefile
  head/www/cacheboy15-devel/Makefile
  head/www/cacheboy16/Makefile
  head/www/cakephp11/Makefile
  head/www/cakephp12/Makefile
  head/www/cakephp13/Makefile
  head/www/cakephp21/Makefile
  head/www/cakephp22/Makefile
  head/www/codeigniter17/Makefile
  head/www/dillo2/Makefile
  head/www/dokeos/Makefile
  head/www/extjs/Makefile
  head/www/eyeos-themes/Makefile
  head/www/foswiki/Makefile
  head/www/p5-WebService-NoPaste/Makefile
  head/www/phpgedview/Makefile
  head/www/pivotx/Makefile
  head/www/prado/Makefile
  head/www/pserv/Makefile
  head/www/publicfile/Makefile
  head/www/pylot/Makefile
  head/www/rnews/Makefile
  head/www/thundercache/Makefile
  head/www/thundersnarf/Makefile
  head/www/tokyopromenade/Makefile
  head/www/w3m/Makefile
  head/www/webcalendar-devel/Makefile
  head/www/webcalendar/Makefile
  head/www/yahoo-ui/Makefile
  head/www/yii/Makefile

Modified: head/www/asterisk-stat/Makefile
==============================================================================
--- head/www/asterisk-stat/Makefile	Fri Mar 22 11:50:30 2013	(r314914)
+++ head/www/asterisk-stat/Makefile	Fri Mar 22 11:53:34 2013	(r314915)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	www/asterisk-stat
-# Date created:				16 June 2007
-# Whom:					Fumihiko Kimura <jfkimura@yahoo.com>
-#
+# Created by: Fumihiko Kimura <jfkimura@yahoo.com>
 # $FreeBSD$
-#
 
 PORTNAME=	asterisk-stat
 PORTVERSION=	2.0.1
@@ -26,11 +22,12 @@ WRKSRC=		${WRKDIR}/${SITE_SUBDIR}
 SUB_FILES=	pkg-message
 SUB_LIST+=	ASTERISKDIR=${ASTERISKDIR}
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL" off
+OPTIONS_DEFINE=	PGSQL
+PGSQL_DESC=	Use PostgreSQL instead of MySQL
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MGSQL}
 ASTERISKSTATDB=	pgsql
 EXTRA_PATCHES+=	${FILESDIR}/pgsql__patch-call.log.php
 .else
@@ -60,4 +57,4 @@ do-install:
 	${INSTALL_DATA} ${FILESDIR}/cdr_${ASTERISKSTATDB}.tbl ${PREFIX}/etc/asterisk
 	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${ASTERISKDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/www/aws/Makefile
==============================================================================
--- head/www/aws/Makefile	Fri Mar 22 11:50:30 2013	(r314914)
+++ head/www/aws/Makefile	Fri Mar 22 11:53:34 2013	(r314915)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:  aws
-# Date created:                       12 December 2010
-# Whom:                               John Marino <draco@marino.st>
-#
+# Created by: John Marino <draco@marino.st>
 # $FreeBSD$
-#
 
 PORTNAME=	aws
 PORTVERSION=	2.10.0
@@ -28,13 +24,12 @@ CC=		gnatgcc
 DOTBUILD=	release
 MAKE_ENV+=	ADA_PROJECT_PATH=${PREFIX}/lib/gnat
 
-OPTIONS=	SSL   "Enable HTTPS/SSL support" on
-OPTIONS+=	IPV6  "Enable IPv6 support" off
-OPTIONS+=	DEMOS "Build demo programs in examples/aws/demos" off
-OPTIONS+=	DEBUG "Build AWS with debugging symbols" off
-OPTIONS+=	LDAP  "Enable LDAP support" off
-OPTIONS+=	DSRT  "Disable shared runtime" off
-OPTIONS+=	RELOC "Build shared libraries (default is static)" off
+OPTIONS_DEFINE=	SSL IPV6 DEMOS DEBUG LDAP DSRT RELOC
+OPTIONS_DEFAULT=	SSL
+SSL_DESC=	Enable HTTPS/SSL support
+DEMOS_DESC=	Build demo programs in examples/aws/demos
+DSRT_DESC=	Disable shared runtime
+RELOC_DESC=	Build shared libraries (default is static)
 
 CONF_ARGS=	PROCESSORS=1
 CONF_ARGS+=	GCC=gnatgcc
@@ -46,7 +41,7 @@ CONF_ARGS+=	PYTHON=python${PYTHON_VER}
 ##  SSL Support  ##
 ###################
 
-.if defined(WITH_SSL)
+.if ${PORT_OPTIONS:MSSL}
 CONF_ARGS+=	SOCKET=openssl
 BUILD_DEPENDS+=	openssl>=1:${PORTSDIR}/security/openssl
 RUN_DEPENDS+=	openssl>=1:${PORTSDIR}/security/openssl
@@ -61,7 +56,7 @@ PLIST_SUB+=	NSSL=""
 ##  LDAP Support  ##
 ####################
 
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 CONF_ARGS+=	LDAP=true
 RUN_DEPENDS+=	openldap24>=2.4:${PORTSDIR}/net/openldap24-client
 .endif
@@ -70,7 +65,7 @@ RUN_DEPENDS+=	openldap24>=2.4:${PORTSDIR
 ##  IPv6 Support  ##
 ####################
 
-.if defined(WITH_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
 CONF_ARGS+=	IPv6=true
 .endif
 
@@ -78,7 +73,7 @@ CONF_ARGS+=	IPv6=true
 ##  Debug Support  ##
 #####################
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 CONF_ARGS+=	DEBUG=true
 .endif
 
@@ -86,7 +81,7 @@ CONF_ARGS+=	DEBUG=true
 ##  Shared Runtime Library  ##
 ##############################
 
-.if defined(WITH_DSRT)
+.if ${PORT_OPTIONS:MDSRT}
 CONF_ARGS+=	ENABLE_SHARED=false
 .endif
 
@@ -94,7 +89,7 @@ CONF_ARGS+=	ENABLE_SHARED=false
 ##  Default Library Type  ##
 ############################
 
-.if defined(WITH_RELOC)
+.if ${PORT_OPTIONS:MRELOC}
 CONF_ARGS+=	DEFAULT_LIBRARY_TYPE=relocatable
 .endif
 
@@ -102,7 +97,7 @@ CONF_ARGS+=	DEFAULT_LIBRARY_TYPE=relocat
 ##  DEMOS Support  ##
 #####################
 
-.if defined(WITH_DEMOS)
+.if ${PORT_OPTIONS:MDEMOS}
 DEMO_DIRS+=	agent
 DEMO_DIRS+=	auth
 DEMO_DIRS+=	com
@@ -131,7 +126,7 @@ DEMO_DIRS+=	wps
 DEMO_DIRS+=	ws
 DEMO_DIRS+=	zdemo
 
-.if defined (WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 DEMO_DIRS+=	test_ldap
 PLIST_SUB+=	LDAP=""
 .else
@@ -157,7 +152,7 @@ test: install
 
 do-install:
 	cd ${WRKSRC} && ${GMAKE} install
-.if defined(WITH_DEMOS)
+.if ${PORT_OPTIONS:MDEMOS}
 	${MAKE} demos
 	${MAKE} demos-install
 .endif

Modified: head/www/bigbluebutton/Makefile
==============================================================================
--- head/www/bigbluebutton/Makefile	Fri Mar 22 11:50:30 2013	(r314914)
+++ head/www/bigbluebutton/Makefile	Fri Mar 22 11:53:34 2013	(r314915)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	www/bigbluebutton
-# Date created:				23 October 2010
-# Whom:					alex.deiter@gmail.com
-#
+# Created by: alex.deiter@gmail.com
 # $FreeBSD$
-#
 
 PORTNAME=	bigbluebutton
 PORTVERSION=	0.71
@@ -53,10 +49,12 @@ FS_USER?=	freeswitch
 FS_GROUP?=	${FS_USER}
 WWWROOT?=	${WWWDIR:S|/${PORTNAME}$||}
 
-OPTIONS=	MEETME "meetme Asterisk module" off \
-		KONFERENCE "konference Asterisk module" on \
-		FREESWITCH "mod_conference FreeSWITCH module" off \
-		OPENOFFICE "Include OpenOffice support" off
+OPTIONS_DEFINE=	MEETME KONFERENCE FREESWITCH OPENOFFICE
+OPTIONS_DEFAULT=	KONFERENCE
+MEETME_DESC=	meetme Asterisk module
+KONFERENCE_DESC=	konference Asterisk module
+FREESWITCH_DESC=	mod_conference FreeSWITCH module
+OPENOFFICE_DESC=	Include OpenOffice support
 
 PLIST_SUB+=	RED5_HOME=${RED5_HOME:S,^${PREFIX}/,,} \
 		TOMCAT_HOME=${TOMCAT_HOME:S,^${PREFIX}/,,} \
@@ -79,26 +77,26 @@ SUB_LIST+=	PORTNAME=${PORTNAME} \
 
 SUB_FILES=	pkg-message openoffice nginx.conf-dist bbb-conf
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_MEETME) || defined(WITH_KONFERENCE)
+.if ${PORT_OPTIONS:MMEETME} || ${PORT_OPTIONS:MKONFERENCE}
 BUILD_DEPENDS+=${LOCALBASE}/sbin/asterisk:${PORTSDIR}/net/asterisk
-.if  defined(WITH_MEETME)
+.if  ${PORT_OPTIONS:MMEETME}
 .if !exists(${LOCALBASE}/lib/asterisk/modules/app_meetme.so)
 IGNORE=Option meetme requires app_meetme.so from asterisk port. Rebuild net/asterisk with WITH_DAHDI=yes
 .endif
 .endif
-.if  defined(WITH_KONFERENCE)
+.if  ${PORT_OPTIONS:MKONFERENCE}
 BUILD_DEPENDS+=${LOCALBASE}/lib/asterisk/modules/app_konference.so:${PORTSDIR}/net/appkonference
 .endif
 .endif
 
-.if defined(WITH_FREESWITCH)
+.if ${PORT_OPTIONS:MFREESWITCH}
 BROKEN=freeswitch 1.0.6 does not work with BigBlueButton
 BUILD_DEPENDS+=${LOCALBASE}/bin/freeswitch:${PORTSDIR}/net/freeswitch
 .endif
 
-.if defined(WITH_OPENOFFICE)
+.if ${PORT_OPTIONS:MOPENOFFICE}
 BUILD_DEPENDS+=	${LOCALBASE}/bin/openoffice.org-3.2.1:${PORTSDIR}/editors/openoffice.org-3
 .endif
 
@@ -173,4 +171,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/www/cacheboy15-devel/Makefile
==============================================================================
--- head/www/cacheboy15-devel/Makefile	Fri Mar 22 11:50:30 2013	(r314914)
+++ head/www/cacheboy15-devel/Makefile	Fri Mar 22 11:53:34 2013	(r314915)
@@ -1,78 +1,5 @@
-# New ports collection makefile for:	squid24
-# Date created:		Tue Mar 27 14:56:08 CEST 2001
-# Whom:			Adrian Chadd <adrian@FreeBSD.org>
-#
+# Created by: Adrian Chadd <adrian@FreeBSD.org>
 # $FreeBSD$
-#
-# Tunables not (yet) configurable via 'make config':
-# SQUID_{U,G}ID
-#   Which user/group Squid should run as (default: squid/squid).
-#   The user and group will be created if they do not already exist using
-#   a uid:gid of 100:100.
-#   NOTE: older versions of Squid defaulted to nobody/nogroup.
-#   If you wish to run Squid as "nobody" (which is not recommended), please
-#   define SQUID_UID=nobody and SQUID_GID=nogroup in your make environment
-#   before you start the update or installation of this port.
-#
-# SQUID_LANGUAGES
-#   A list of languages for which error page files should be installed
-#   (default: all)
-#
-#   E.g. use `make SQUID_LANGUAGES="English French"' if you want to
-#   install the files for these languages only.
-#   Use `make -VSQUID_LANGUAGES' or scroll down to this variable's
-#   definition to see which values are valid.
-#
-# SQUID_DEFAULT_LANG
-#   If you define SQUID_LANGUAGES, select which language should be the default
-#   one (this variable defaults to English). This setting can be overwritten
-#   with squid.conf's error_directory directive.
-#
-# SQUID_CONFIGURE_ARGS
-#   Additional configuration options.
-#
-#   To enable them, use e.g
-#   `make SQUID_CONFIGURE_ARGS="--enable-dlmalloc --enable-truncate" install'
-#
-#   The list below may be incomplete, please see the configure script
-#   in the Squid source distribution for the complete list of additional
-#   options.
-#   Note that you probably do not need to worry about these options in most
-#   cases, they are included in case you want to experiment with them.
-#
-#    --enable-dlmalloc
-#     Compile and use the malloc package from Doug Lea
-#    --enable-gnuregex
-#     Compile and use the supplied GNUregex routines instead of BSD regex
-#     (not recommended).
-#    --enable-xmalloc-statistics
-#     Show malloc statistics in status page
-#    --enable-cachemgr-hostname=some.hostname
-#     Set an explicit hostname in cachemgr.cgi
-#    --enable-truncate
-#     Use truncate() rather than unlink()
-#    --disable-unlinkd
-#     Do not use "unlinkd"
-#    --with-aufs-threads=N_THREADS
-#     Tune the number of worker threads for the aufs object
-#    --with-coss-membuf-size
-#     COSS membuf size (default: 1048576 bytes)
-#    --with-maxfd=N
-#     Override the maximum number of filedescriptors. Useful if you
-#     build as another user who is not privileged to use the amount
-#     of filedescriptors the resulting binary is expected to support.
-#    --enable-ntlm-fail-open
-#     Enable NTLM fail open, where a helper that fails one of the
-#     Authentication steps can allow Squid to still authenticate the user
-#    --enable-x-accelerator-vary
-#     Enable support for the X-Accelerator-Vary HTTP header. Can be used
-#     to indicate variance within an accelerator setup. Typically used
-#     together with other code that adds custom HTTP headers to the
-#     requests.
-#    --enable-forward-log
-#     Enable experimental forward_log directive.
-#    --enable-multicast-miss
-#     Enable experimental multicast notification of cachemisses.
 
 PORTNAME=	cacheboy
 DISTVERSION=	1.5.2
@@ -102,32 +29,39 @@ PORTEXAMPLES=	passwd.sql
 SUB_FILES+=	pkg-deinstall pkg-install pkg-message
 SUB_LIST+=	SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID}
 
-OPTIONS=	SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \
-		SQUID_SASL_AUTH "Install SASL authentication helpers" off \
-		SQUID_DELAY_POOLS "Enable delay pools" off \
-		SQUID_SNMP "Enable SNMP support" off \
-		SQUID_CARP "Enable CARP support" on \
-		SQUID_SSL "Enable SSL support for reverse proxies" off \
-		SQUID_PINGER "Install the icmp helper" off \
-		SQUID_DNS_HELPER "Use the old 'dnsserver' helper" off \
-		SQUID_HTCP "Enable HTCP support" off \
-		SQUID_VIA_DB "Enable forward/via database" off \
-		SQUID_CACHE_DIGESTS "Enable cache digests" off \
-		SQUID_WCCP "Enable Web Cache Coordination Prot. v1" on \
-		SQUID_WCCPV2 "Enable Web Cache Coordination Prot. v2" off \
-		SQUID_STRICT_HTTP "Be strictly HTTP compliant" off \
-		SQUID_IDENT "Enable ident (RFC 931) lookups" on \
-		SQUID_REFERER_LOG "Enable Referer-header logging" off \
-		SQUID_USERAGENT_LOG "Enable User-Agent-header logging" off \
-		SQUID_ARP_ACL "Enable ACLs based on ethernet address" off \
-		SQUID_PF "Enable transparent proxying with PF" off \
-		SQUID_IPFILTER "Enable transp. proxying with IPFilter" off \
-		SQUID_FOLLOW_XFF "Follow X-Forwarded-For headers" off \
-		SQUID_AUFS "Enable the aufs storage scheme" off \
-		SQUID_COSS "Enable the COSS storage scheme" off \
-		SQUID_KQUEUE "Use kqueue(2) instead of poll(2)" on \
-		SQUID_LARGEFILE "Support log and cache files >2GB" off \
-		SQUID_STACKTRACES "Create backtraces on fatal errors" off
+OPTIONS_DEFINE=	DOCS NLS SQUID_LDAP_AUTH SQUID_SASL_AUTH SQUID_DELAY_POOLS SQUID_SNMP \
+		SQUID_CARP SQUID_SSL SQUID_PINGER SQUID_DNS_HELPER SQUID_HTCP SQUID_VIA_DB \
+		SQUID_CACHE_DIGESTS SQUID_WCCP SQUID_WCCPV2 SQUID_STRICT_HTTP SQUID_IDENT \
+		SQUID_REFERER_LOG SQUID_USERAGENT_LOG SQUID_ARP_ACL SQUID_PF SQUID_IPFILTER \
+		SQUID_FOLLOW_XFF SQUID_AUFS SQUID_COSS SQUID_KQUEUE SQUID_LARGEFILE \
+		SQUID_STACKTRACES
+OPTIONS_DEFAULT=	SQUID_CARP SQUID_WCCP SQUID_KQUEUE
+SQUID_LDAP_AUTH_DESC=		Install LDAP authentication helpers
+SQUID_SASL_AUTH_DESC=		Install SASL authentication helpers
+SQUID_DELAY_POOLS_DESC=		Enable delay pools
+SQUID_SNMP_DESC=		Enable SNMP support
+SQUID_CARP_DESC=		Enable CARP support
+SQUID_SSL_DESC=			Enable SSL support for reverse proxies
+SQUID_PINGER_DESC=		Install the icmp helper
+SQUID_DNS_HELPER_DESC=		Use the old 'dnsserver' helper
+SQUID_HTCP_DESC=		Enable HTCP support
+SQUID_VIA_DB_DESC=		Enable forward/via database
+SQUID_CACHE_DIGESTS_DESC=	Enable cache digests
+SQUID_WCCP_DESC=		Enable Web Cache Coordination Prot. v1
+SQUID_WCCPV2_DESC=		Enable Web Cache Coordination Prot. v2
+SQUID_STRICT_HTTP_DESC=		Be strictly HTTP compliant
+SQUID_IDENT_DESC=		Enable ident (RFC 931) lookups
+SQUID_REFERER_LOG_DESC=		Enable Referer-header logging
+SQUID_USERAGENT_LOG_DESC=	Enable User-Agent-header logging
+SQUID_ARP_ACL_DESC=		Enable ACLs based on ethernet address
+SQUID_PF_DESC=			Enable transparent proxying with PF
+SQUID_IPFILTER_DESC=		Enable transp. proxying with IPFilter
+SQUID_FOLLOW_XFF_DESC=		Follow X-Forwarded-For headers
+SQUID_AUFS_DESC=		Enable the aufs storage scheme
+SQUID_COSS_DESC=		Enable the COSS storage scheme
+SQUID_KQUEUE_DESC=		Use kqueue(2) instead of poll(2)
+SQUID_LARGEFILE_DESC=		Support log and cache files >2GB
+SQUID_STACKTRACES_DESC=		Create backtraces on fatal errors
 
 etc_files=	squid/cachemgr.conf.default \
 		squid/mib.txt squid/mime.conf.default \
@@ -177,7 +111,7 @@ CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin 
 		--disable-linux-tproxy \
 		--disable-epoll
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${OSVERSION} >= 800037
 BROKEN=		does not compile with Heimdal 1.1 in 8.0-CURRENT
@@ -194,7 +128,7 @@ digest_auth=	password
 external_acl=	ip_user session unix_group wbinfo_group
 MAN8+=		ncsa_auth.8 pam_auth.8 squid_db_auth.8 squid_session.8 \
 		squid_unix_group.8
-.if defined(WITH_SQUID_LDAP_AUTH)
+.if ${PORT_OPTIONS:MSQUID_LDAP_AUTH}
 USE_OPENLDAP=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -204,7 +138,7 @@ digest_auth+=	ldap
 external_acl+=	ldap_group
 libexec+=	digest_ldap_auth squid_ldap_auth squid_ldap_group
 .endif
-.if defined(WITH_SQUID_SASL_AUTH)
+.if ${PORT_OPTIONS:MSQUID_SASL_AUTH}
 LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -212,7 +146,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 basic_auth+=	SASL
 libexec+=	sasl_auth
 .endif
-.if !defined(NO_NIS) && !defined(WITHOUT_NIS)
+.if !defined(NO_NIS) && ${PORT_OPTIONS:MNIS}
 basic_auth+=	YP
 libexec+=	yp_auth
 .endif
@@ -221,7 +155,7 @@ CONFIGURE_ARGS+=	--enable-auth="basic nt
 			--enable-digest-auth-helpers="${digest_auth}" \
 			--enable-external-acl-helpers="${external_acl}" \
 			--enable-ntlm-auth-helpers="SMB"
-.if !defined(NO_KERBEROS) && !defined(WITHOUT_KERBEROS)
+.if !defined(NO_KERBEROS) && ${PORT_OPTIONS:MKERBEROS}
 # XXX This currently only works with heimdal from the base system,
 #     see files/patch-helpers_negotiate_auth-squid_kerb_auth_*
 CONFIGURE_ARGS+=	--enable-negotiate-auth-helpers="squid_kerb_auth"
@@ -231,15 +165,15 @@ libexec+=	squid_kerb_auth
 # Storage schemes:
 
 storage_schemes=	ufs diskd null
-.if defined(WITH_SQUID_AUFS)
+.if ${PORT_OPTIONS:MSQUID_AUFS}
 storage_schemes+=	aufs
 EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-src-cf.data.pre.aufs
 # Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS
 CONFIGURE_ARGS+=	--with-pthreads
 .endif
-.if defined(WITH_SQUID_COSS)
+.if ${PORT_OPTIONS:MSQUID_COSS}
 storage_schemes+=	coss
-.if !defined(WITH_SQUID_AUFS)
+.if !  ${PORT_OPTIONS:MSQUID_AUFS}
 # use Posix AIO instead of aufs' AIO; note that you then need the kernel to
 # supply AIO support, either by loading the aio(4) module (n/a on 4.x) or by
 # adding the option VFS_AIO to your kernel configuration if you want to
@@ -252,80 +186,80 @@ CONFIGURE_ARGS+=	--enable-storeio="${sto
 
 # Other options set via 'make config':
 
-.if defined(WITH_SQUID_DELAY_POOLS)
+.if ${PORT_OPTIONS:MSQUID_DELAY_POOLS}
 CONFIGURE_ARGS+=	--enable-delay-pools
 .endif
-.if defined(WITH_SQUID_SNMP)
+.if ${PORT_OPTIONS:MSQUID_SNMP}
 CONFIGURE_ARGS+=	--enable-snmp
 .endif
-.if defined(WITHOUT_SQUID_CARP)
+.if ! ${PORT_OPTIONS:MSQUID_CARP}
 CONFIGURE_ARGS+=	--disable-carp
 .endif
-.if defined(WITH_SQUID_SSL)
+.if ${PORT_OPTIONS:MSQUID_SSL}
 # we need to .include bsd.openssl.mk manually here.because USE_OPENSSL only
 # works when it is defined before bsd.port{.pre}.mk is .included.
 # This makes it currently impossible to combine this macro with OPTIONS to
 # conditionally include OpenSSL support.
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL=		yes
 CONFIGURE_ARGS+=	--enable-ssl \
 			--with-openssl="${OPENSSLBASE}"
 CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 .endif
-.if defined(WITH_SQUID_PINGER)
+.if ${PORT_OPTIONS:MSQUID_PINGER}
 CONFIGURE_ARGS+=	--enable-icmp
 libexec+=	pinger
 .endif
-.if defined(WITH_SQUID_DNS_HELPER)
+.if ${PORT_OPTIONS:MSQUID_DNS_HELPER}
 CONFIGURE_ARGS+=	--disable-internal-dns
 libexec+=	dnsserver
 .endif
-.if defined(WITH_SQUID_HTCP)
+.if ${PORT_OPTIONS:MSQUID_HTCP}
 CONFIGURE_ARGS+=	--enable-htcp
 .endif
-.if defined(WITH_SQUID_VIA_DB)
+.if ${PORT_OPTIONS:MSQUID_VIA_DB}
 CONFIGURE_ARGS+=	--enable-forw-via-db
 .endif
-.if defined(WITH_SQUID_CACHE_DIGESTS)
+.if ${PORT_OPTIONS:MSQUID_CACHE_DIGESTS}
 CONFIGURE_ARGS+=	--enable-cache-digests
 .endif
-.if defined(WITHOUT_SQUID_WCCP)
+.if ! ${PORT_OPTIONS:MSQUID_WCCP}
 CONFIGURE_ARGS+=	--disable-wccp
 .endif
-.if defined(WITH_SQUID_WCCPV2)
+.if ${PORT_OPTIONS:MSQUID_WCCPV2}
 CONFIGURE_ARGS+=	--enable-wccpv2
 .endif
-.if defined(WITH_SQUID_STRICT_HTTP)
+.if ${PORT_OPTIONS:MSQUID_STRICT_HTTP}
 CONFIGURE_ARGS+=	--disable-http-violations
 .endif
-.if defined(WITHOUT_SQUID_IDENT)
+.if ! ${PORT_OPTIONS:MSQUID_IDENT}
 CONFIGURE_ARGS+=	--disable-ident-lookups
 .endif
-.if defined(WITH_SQUID_REFERER_LOG)
+.if ${PORT_OPTIONS:MSQUID_REFERER_LOG}
 CONFIGURE_ARGS+=	--enable-referer-log
 .endif
-.if defined(WITH_SQUID_USERAGENT_LOG)
+.if ${PORT_OPTIONS:MSQUID_USERAGENT_LOG}
 CONFIGURE_ARGS+=	--enable-useragent-log
 .endif
-.if defined(WITH_SQUID_ARP_ACL)
+.if ${PORT_OPTIONS:MSQUID_ARP_ACL}
 CONFIGURE_ARGS+=	--enable-arp-acl
 .endif
-.if defined(WITH_SQUID_PF)
+.if ${PORT_OPTIONS:MSQUID_PF}
 CONFIGURE_ARGS+=	--enable-pf-transparent
 .endif
-.if defined(WITH_SQUID_IPFILTER)
+.if ${PORT_OPTIONS:MSQUID_IPFILTER}
 CONFIGURE_ARGS+=	--enable-ipf-transparent
 .endif
-.if defined(WITH_SQUID_FOLLOW_XFF)
+.if ${PORT_OPTIONS:MSQUID_FOLLOW_XFF}
 CONFIGURE_ARGS+=	--enable-follow-x-forwarded-for
 .endif
-.if defined(WITHOUT_SQUID_KQUEUE)
+.if ! ${PORT_OPTIONS:MSQUID_KQUEUE}
 CONFIGURE_ARGS+=	--disable-kqueue
 .endif
-.if defined(WITH_SQUID_LARGEFILE)
+.if ${PORT_OPTIONS:MSQUID_LARGEFILE}
 CONFIGURE_ARGS+=	--with-large-files --enable-large-cache-files
 .endif
-.if defined(WITH_SQUID_STACKTRACES)
+.if ${PORT_OPTIONS:MSQUID_STACKTRACES}
 CONFIGURE_ARGS+=	--enable-stacktraces
 CFLAGS+=	-g
 STRIP=
@@ -377,15 +311,15 @@ pre-su-install:
 	    ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MNLS}
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql ${EXAMPLESDIR}
 .endif
-.if defined(WITH_SQUID_PINGER)
+.if ${PORT_OPTIONS:MSQUID_PINGER}
 	${CHMOD} 4510 ${PREFIX}/libexec/squid/pinger; \
 	${CHGRP} ${SQUID_GID} ${PREFIX}/libexec/squid/pinger
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${docs} ${DOCSDIR}
 .endif
@@ -397,4 +331,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD} ""
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/www/cacheboy16/Makefile
==============================================================================
--- head/www/cacheboy16/Makefile	Fri Mar 22 11:50:30 2013	(r314914)
+++ head/www/cacheboy16/Makefile	Fri Mar 22 11:53:34 2013	(r314915)
@@ -1,78 +1,5 @@
-# New ports collection makefile for:	squid24
-# Date created:		Tue Mar 27 14:56:08 CEST 2001
-# Whom:			Adrian Chadd <adrian@FreeBSD.org>
-#
+# Created by: Adrian Chadd <adrian@FreeBSD.org>
 # $FreeBSD$
-#
-# Tunables not (yet) configurable via 'make config':
-# SQUID_{U,G}ID
-#   Which user/group Squid should run as (default: squid/squid).
-#   The user and group will be created if they do not already exist using
-#   a uid:gid of 100:100.
-#   NOTE: older versions of Squid defaulted to nobody/nogroup.
-#   If you wish to run Squid as "nobody" (which is not recommended), please
-#   define SQUID_UID=nobody and SQUID_GID=nogroup in your make environment
-#   before you start the update or installation of this port.
-#
-# SQUID_LANGUAGES
-#   A list of languages for which error page files should be installed
-#   (default: all)
-#
-#   E.g. use `make SQUID_LANGUAGES="English French"' if you want to
-#   install the files for these languages only.
-#   Use `make -VSQUID_LANGUAGES' or scroll down to this variable's
-#   definition to see which values are valid.
-#
-# SQUID_DEFAULT_LANG
-#   If you define SQUID_LANGUAGES, select which language should be the default
-#   one (this variable defaults to English). This setting can be overwritten
-#   with squid.conf's error_directory directive.
-#
-# SQUID_CONFIGURE_ARGS
-#   Additional configuration options.
-#
-#   To enable them, use e.g
-#   `make SQUID_CONFIGURE_ARGS="--enable-dlmalloc --enable-truncate" install'
-#
-#   The list below may be incomplete, please see the configure script
-#   in the Squid source distribution for the complete list of additional
-#   options.
-#   Note that you probably do not need to worry about these options in most
-#   cases, they are included in case you want to experiment with them.
-#
-#    --enable-dlmalloc
-#     Compile and use the malloc package from Doug Lea
-#    --enable-gnuregex
-#     Compile and use the supplied GNUregex routines instead of BSD regex
-#     (not recommended).
-#    --enable-xmalloc-statistics
-#     Show malloc statistics in status page
-#    --enable-cachemgr-hostname=some.hostname
-#     Set an explicit hostname in cachemgr.cgi
-#    --enable-truncate
-#     Use truncate() rather than unlink()
-#    --disable-unlinkd
-#     Do not use "unlinkd"
-#    --with-aufs-threads=N_THREADS
-#     Tune the number of worker threads for the aufs object
-#    --with-coss-membuf-size
-#     COSS membuf size (default: 1048576 bytes)
-#    --with-maxfd=N
-#     Override the maximum number of filedescriptors. Useful if you
-#     build as another user who is not privileged to use the amount
-#     of filedescriptors the resulting binary is expected to support.
-#    --enable-ntlm-fail-open
-#     Enable NTLM fail open, where a helper that fails one of the
-#     Authentication steps can allow Squid to still authenticate the user
-#    --enable-x-accelerator-vary
-#     Enable support for the X-Accelerator-Vary HTTP header. Can be used
-#     to indicate variance within an accelerator setup. Typically used
-#     together with other code that adds custom HTTP headers to the
-#     requests.
-#    --enable-forward-log
-#     Enable experimental forward_log directive.
-#    --enable-multicast-miss
-#     Enable experimental multicast notification of cachemisses.
 
 PORTNAME=	cacheboy
 DISTVERSION=	1.6
@@ -101,33 +28,40 @@ PORTEXAMPLES=	passwd.sql
 SUB_FILES+=	pkg-deinstall pkg-install pkg-message
 SUB_LIST+=	SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID}
 
-OPTIONS=	SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \
-		SQUID_SASL_AUTH "Install SASL authentication helpers" off \
-		SQUID_DELAY_POOLS "Enable delay pools" off \
-		SQUID_SNMP "Enable SNMP support" off \
-		SQUID_CARP "Enable CARP support" on \
-		SQUID_SSL "Enable SSL support for reverse proxies" off \
-		SQUID_PINGER "Install the icmp helper" off \
-		SQUID_DNS_HELPER "Use the old 'dnsserver' helper" off \
-		SQUID_HTCP "Enable HTCP support" off \
-		SQUID_VIA_DB "Enable forward/via database" off \
-		SQUID_CACHE_DIGESTS "Enable cache digests" off \
-		SQUID_WCCP "Enable Web Cache Coordination Prot. v1" on \
-		SQUID_WCCPV2 "Enable Web Cache Coordination Prot. v2" off \
-		SQUID_STRICT_HTTP "Be strictly HTTP compliant" off \
-		SQUID_IDENT "Enable ident (RFC 931) lookups" on \
-		SQUID_REFERER_LOG "Enable Referer-header logging" off \
-		SQUID_USERAGENT_LOG "Enable User-Agent-header logging" off \
-		SQUID_ARP_ACL "Enable ACLs based on ethernet address" off \
-		SQUID_PF "Enable transparent proxying with PF" off \
-		SQUID_IPFILTER "Enable transp. proxying with IPFilter" off \
-		SQUID_FOLLOW_XFF "Follow X-Forwarded-For headers" off \
-		SQUID_AUFS "Enable the aufs storage scheme" off \
-		SQUID_COSS "Enable the COSS storage scheme" off \
-		SQUID_KQUEUE "Use kqueue(2) instead of poll(2)" on \
-		SQUID_LARGEFILE "Support log and cache files >2GB" off \
-		SQUID_STACKTRACES "Create backtraces on fatal errors" off \
-		SQUID_TPROXY "Enable FreeBSD-current TPROXY support" off
+OPTIONS_DEFINE=	DOCS NLS SQUID_LDAP_AUTH SQUID_SASL_AUTH SQUID_DELAY_POOLS SQUID_SNMP \
+		SQUID_CARP SQUID_SSL SQUID_PINGER SQUID_DNS_HELPER SQUID_HTCP SQUID_VIA_DB \
+		SQUID_CACHE_DIGESTS SQUID_WCCP SQUID_WCCPV2 SQUID_STRICT_HTTP SQUID_IDENT \
+		SQUID_REFERER_LOG SQUID_USERAGENT_LOG SQUID_ARP_ACL SQUID_PF SQUID_IPFILTER \
+		SQUID_FOLLOW_XFF SQUID_AUFS SQUID_COSS SQUID_KQUEUE SQUID_LARGEFILE \
+		SQUID_STACKTRACES TPROXY
+OPTIONS_DEFAULT=	SQUID_CARP SQUID_WCCP SQUID_KQUEUE
+SQUID_LDAP_AUTH_DESC=		Install LDAP authentication helpers
+SQUID_SASL_AUTH_DESC=		Install SASL authentication helpers
+SQUID_DELAY_POOLS_DESC=		Enable delay pools
+SQUID_SNMP_DESC=		Enable SNMP support
+SQUID_CARP_DESC=		Enable CARP support
+SQUID_SSL_DESC=			Enable SSL support for reverse proxies
+SQUID_PINGER_DESC=		Install the icmp helper
+SQUID_DNS_HELPER_DESC=		Use the old 'dnsserver' helper
+SQUID_HTCP_DESC=		Enable HTCP support
+SQUID_VIA_DB_DESC=		Enable forward/via database
+SQUID_CACHE_DIGESTS_DESC=	Enable cache digests
+SQUID_WCCP_DESC=		Enable Web Cache Coordination Prot. v1
+SQUID_WCCPV2_DESC=		Enable Web Cache Coordination Prot. v2
+SQUID_STRICT_HTTP_DESC=		Be strictly HTTP compliant
+SQUID_IDENT_DESC=		Enable ident (RFC 931) lookups
+SQUID_REFERER_LOG_DESC=		Enable Referer-header logging
+SQUID_USERAGENT_LOG_DESC=	Enable User-Agent-header logging
+SQUID_ARP_ACL_DESC=		Enable ACLs based on ethernet address
+SQUID_PF_DESC=			Enable transparent proxying with PF
+SQUID_IPFILTER_DESC=		Enable transp. proxying with IPFilter
+SQUID_FOLLOW_XFF_DESC=		Follow X-Forwarded-For headers
+SQUID_AUFS_DESC=		Enable the aufs storage scheme
+SQUID_COSS_DESC=		Enable the COSS storage scheme
+SQUID_KQUEUE_DESC=		Use kqueue(2) instead of poll(2)
+SQUID_LARGEFILE_DESC=		Support log and cache files >2GB
+SQUID_STACKTRACES_DESC=		Create backtraces on fatal errors
+SQUID_TPROXY_DESC=		Enable FreeBSD-current TPROXY support
 
 etc_files=	squid/cachemgr.conf.default \
 		squid/mib.txt squid/mime.conf.default \
@@ -177,7 +111,7 @@ CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin 
 		--disable-linux-tproxy \
 		--disable-epoll
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${OSVERSION} >= 800037
 MAKE_ENV+=	KRB5_LDADD=-lhx509
@@ -194,7 +128,7 @@ digest_auth=	password
 external_acl=	ip_user session unix_group wbinfo_group
 MAN8+=		ncsa_auth.8 pam_auth.8 squid_db_auth.8 squid_session.8 \
 		squid_unix_group.8
-.if defined(WITH_SQUID_LDAP_AUTH)
+.if ${PORT_OPTIONS:MSQUID_LDAP_AUTH}
 USE_OPENLDAP=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -204,7 +138,7 @@ digest_auth+=	ldap
 external_acl+=	ldap_group
 libexec+=	digest_ldap_auth squid_ldap_auth squid_ldap_group
 .endif
-.if defined(WITH_SQUID_SASL_AUTH)
+.if ${PORT_OPTIONS:MSQUID_SASL_AUTH}
 LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -212,7 +146,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 basic_auth+=	SASL
 libexec+=	sasl_auth
 .endif
-.if !defined(NO_NIS) && !defined(WITHOUT_NIS)
+.if !defined(NO_NIS) && ${PORT_OPTIONS:MNIS}
 basic_auth+=	YP
 libexec+=	yp_auth
 .endif
@@ -221,7 +155,7 @@ CONFIGURE_ARGS+=	--enable-auth="basic nt
 			--enable-digest-auth-helpers="${digest_auth}" \
 			--enable-external-acl-helpers="${external_acl}" \
 			--enable-ntlm-auth-helpers="SMB"
-.if !defined(NO_KERBEROS) && !defined(WITHOUT_KERBEROS)
+.if !defined(NO_KERBEROS) && ${PORT_OPTIONS:MKERBEROS}
 # XXX This currently only works with heimdal from the base system,
 #     see files/patch-helpers_negotiate_auth-squid_kerb_auth_*
 CONFIGURE_ARGS+=	--enable-negotiate-auth-helpers="squid_kerb_auth"
@@ -231,15 +165,15 @@ libexec+=	squid_kerb_auth
 # Storage schemes:
 
 storage_schemes=	ufs diskd null
-.if defined(WITH_SQUID_AUFS)
+.if ${PORT_OPTIONS:MSQUID_AUFS}
 storage_schemes+=	aufs
 EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-src-cf.data.pre.aufs
 # Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS
 CONFIGURE_ARGS+=	--with-pthreads
 .endif
-.if defined(WITH_SQUID_COSS)
+.if ${PORT_OPTIONS:MSQUID_COSS}
 storage_schemes+=	coss
-.if !defined(WITH_SQUID_AUFS)
+.if ! ${PORT_OPTIONS:MSQUID_AUFS}
 # use Posix AIO instead of aufs' AIO; note that you then need the kernel to
 # supply AIO support, either by loading the aio(4) module (n/a on 4.x) or by
 # adding the option VFS_AIO to your kernel configuration if you want to
@@ -252,85 +186,85 @@ CONFIGURE_ARGS+=	--enable-storeio="${sto
 
 # Other options set via 'make config':
 
-.if defined(WITH_SQUID_DELAY_POOLS)
+.if ${PORT_OPTIONS:MSQUID_DELAY_POOLS}
 CONFIGURE_ARGS+=	--enable-delay-pools
 .endif
-.if defined(WITH_SQUID_SNMP)
+.if ${PORT_OPTIONS:MSQUID_SNMP}
 CONFIGURE_ARGS+=	--enable-snmp
 .endif
-.if defined(WITHOUT_SQUID_CARP)
+.if ! ${PORT_OPTIONS:MSQUID_CARP}
 CONFIGURE_ARGS+=	--disable-carp
 .endif
-.if defined(WITH_SQUID_SSL)
+.if ${PORT_OPTIONS:MSQUID_SSL}
 # we need to .include bsd.openssl.mk manually here.because USE_OPENSSL only
 # works when it is defined before bsd.port{.pre}.mk is .included.
 # This makes it currently impossible to combine this macro with OPTIONS to
 # conditionally include OpenSSL support.
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL=	yes
 CONFIGURE_ARGS+=	--enable-ssl \
 			--with-openssl="${OPENSSLBASE}"
 CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 .endif
-.if defined(WITH_SQUID_PINGER)
+.if ${PORT_OPTIONS:MSQUID_PINGER}
 CONFIGURE_ARGS+=	--enable-icmp
 libexec+=	pinger
 .endif
-.if defined(WITH_SQUID_DNS_HELPER)
+.if ${PORT_OPTIONS:MSQUID_DNS_HELPER}
 CONFIGURE_ARGS+=	--disable-internal-dns
 libexec+=	dnsserver
 .endif
-.if defined(WITH_SQUID_HTCP)
+.if ${PORT_OPTIONS:MSQUID_HTCP}
 CONFIGURE_ARGS+=	--enable-htcp
 .endif
-.if defined(WITH_SQUID_VIA_DB)
+.if ${PORT_OPTIONS:MSQUID_VIA_DB}
 CONFIGURE_ARGS+=	--enable-forw-via-db
 .endif
-.if defined(WITH_SQUID_CACHE_DIGESTS)
+.if ${PORT_OPTIONS:MSQUID_CACHE_DIGESTS}
 CONFIGURE_ARGS+=	--enable-cache-digests
 .endif
-.if defined(WITHOUT_SQUID_WCCP)
+.if ! ${PORT_OPTIONS:MSQUID_WCCP}
 CONFIGURE_ARGS+=	--disable-wccp
 .endif
-.if defined(WITH_SQUID_WCCPV2)
+.if ${PORT_OPTIONS:MSQUID_WCCPV2}
 CONFIGURE_ARGS+=	--enable-wccpv2
 .endif
-.if defined(WITH_SQUID_STRICT_HTTP)
+.if ${PORT_OPTIONS:MSQUID_STRICT_HTTP}
 CONFIGURE_ARGS+=	--disable-http-violations
 .endif
-.if defined(WITHOUT_SQUID_IDENT)
+.if ! ${PORT_OPTIONS:MSQUID_IDENT}
 CONFIGURE_ARGS+=	--disable-ident-lookups
 .endif
-.if defined(WITH_SQUID_REFERER_LOG)
+.if ${PORT_OPTIONS:MSQUID_REFERER_LOG}
 CONFIGURE_ARGS+=	--enable-referer-log
 .endif
-.if defined(WITH_SQUID_USERAGENT_LOG)
+.if ${PORT_OPTIONS:MSQUID_USERAGENT_LOG}
 CONFIGURE_ARGS+=	--enable-useragent-log
 .endif
-.if defined(WITH_SQUID_ARP_ACL)
+.if ${PORT_OPTIONS:MSQUID_ARP_ACL}
 CONFIGURE_ARGS+=	--enable-arp-acl
 .endif
-.if defined(WITH_SQUID_PF)
+.if ${PORT_OPTIONS:MSQUID_PF}
 CONFIGURE_ARGS+=	--enable-pf-transparent
 .endif
-.if defined(WITH_SQUID_IPFILTER)
+.if ${PORT_OPTIONS:MSQUID_IPFILTER}
 CONFIGURE_ARGS+=	--enable-ipf-transparent
 .endif
-.if defined(WITH_SQUID_FOLLOW_XFF)
+.if ${PORT_OPTIONS:MSQUID_FOLLOW_XFF}
 CONFIGURE_ARGS+=	--enable-follow-x-forwarded-for
 .endif
-.if defined(WITHOUT_SQUID_KQUEUE)
+.if ! ${PORT_OPTIONS:MSQUID_KQUEUE}
 CONFIGURE_ARGS+=	--disable-kqueue
 .endif
-.if defined(WITH_SQUID_LARGEFILE)
+.if ${PORT_OPTIONS:MSQUID_LARGEFILE}
 CONFIGURE_ARGS+=	--with-large-files --enable-large-cache-files
 .endif
-.if defined(WITH_SQUID_STACKTRACES)
+.if ${PORT_OPTIONS:MSQUID_STACKTRACES}
 CONFIGURE_ARGS+=	--enable-stacktraces
 CFLAGS+=	-g
 STRIP=
 .endif
-.if defined(WITH_SQUID_TPROXY)
+.if ${PORT_OPTIONS:MSQUID_TPROXY}
 CONFIGURE_ARGS+=	--enable-freebsd-tproxy
 .endif
 
@@ -380,15 +314,15 @@ pre-su-install:
 	    ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MNLS}
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql ${EXAMPLESDIR}
 .endif
-.if defined(WITH_SQUID_PINGER)
+.if ${PORT_OPTIONS:MSQUID_PINGER}
 	${CHMOD} 4510 ${PREFIX}/libexec/squid/pinger; \
 	${CHGRP} ${SQUID_GID} ${PREFIX}/libexec/squid/pinger
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${docs} ${DOCSDIR}
 .endif
@@ -400,4 +334,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD} ""
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/www/cakephp11/Makefile
==============================================================================
--- head/www/cakephp11/Makefile	Fri Mar 22 11:50:30 2013	(r314914)
+++ head/www/cakephp11/Makefile	Fri Mar 22 11:53:34 2013	(r314915)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cakephp
-# Date created:        19 January 2007
-# Whom:                Greg Larkin <glarkin@FreeBSD.org>
-#
+# Created by: Greg Larkin <glarkin@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	cakephp
 PORTVERSION=	1.1.19.6305
@@ -35,10 +31,8 @@ SUB_FILES=	pkg-message
 
 WRKSRC=		${WRKDIR}/cake_${DISTVERSION}
 
-OPTIONS=	PROD "Install for production server (see: make confighelp)" Off \
-		MYSQL "Check for/install MySQL support in PHP" Off \
-		PGSQL "Check for/install PostgreSQL support in PHP" Off \
-		SQLITE "Check for/install SQLite support in PHP" Off
+OPTIONS_DEFINE=	PROD MYSQL PGSQL SQLITE DOCS
+PROD_DESC=	Install for production server (see: make confighelp)
 
 PLIST_SUB+=	CONFDIR=${CONFDIR_REL}
 
@@ -57,7 +51,7 @@ CGI_EXT=
 
 SUB_LIST+=	PHPCGI=${WITH_PHP_CGI}
 
-.if defined(WITH_PROD)
+.if ${PORT_OPTIONS:MPROD}
 PROD=		production
 .else
 PROD=		development
@@ -69,17 +63,17 @@ SUB_FILES+=	${CONF}
 
 DB_DEFINED=	no
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 DB_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_mysql.so:${PORTSDIR}/databases/php5-pdo_mysql
 DB_DEFINED=	yes
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 DB_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_pgsql.so:${PORTSDIR}/databases/php5-pdo_pgsql
 DB_DEFINED=	yes
 .endif
 
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 DB_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_sqlite.so:${PORTSDIR}/databases/php5-pdo_sqlite
 DB_DEFINED=	yes
 .endif
@@ -126,7 +120,7 @@ post-install:
 	  ${ECHO_MSG} "" ; \
 	  ${FALSE} ; \
 	fi
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DOCSDIR}
 .endif

Modified: head/www/cakephp12/Makefile
==============================================================================
--- head/www/cakephp12/Makefile	Fri Mar 22 11:50:30 2013	(r314914)
+++ head/www/cakephp12/Makefile	Fri Mar 22 11:53:34 2013	(r314915)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cakephp-devel
-# Date created:        20 December 2007
-# Whom:                Greg Larkin <glarkin@FreeBSD.org>
-#
+# Created by: Greg Larkin <glarkin@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	cakephp
 PORTVERSION=	1.2.10
@@ -43,13 +39,10 @@ CAKE_CONF_FILES=	\
 		app/config/routes.php
 CAKE_CONSOLE=	cake/console/cake
 
-OPTIONS=	PROD "Install for production server (make confighelp)" Off \
-		AP "Add Apache 2.2+ dependency" Off \
-		MYSQL "Check for/install MySQL support in PHP" Off \
-		PGSQL "Check for/install PostgreSQL support in PHP" Off \
-		SQLITE "Check for/install SQLite support in PHP" Off \
-		APC "Enable APC caching engine" Off \
-		MEMCACHE "Enable Memcached caching engine client" Off
+OPTIONS_DEFINE=	PROD AP MYSQL PGSQL SQLITE APC MEMCACHE DOCS
+PROD_DESC=	Install for production server (make confighelp)
+APC_DESC=	APC caching engine

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



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