svn commit: r320139 - head/www/cocoon
Baptiste Daroussin
bapt at FreeBSD.org
Thu Jun 6 22:24:38 UTC 2013
Author: bapt
Date: Thu Jun 6 22:24:37 2013
New Revision: 320139
URL: http://svnweb.freebsd.org/changeset/ports/320139
Log:
Convert to new options framework
Modified:
head/www/cocoon/Makefile
head/www/cocoon/Makefile.options
head/www/cocoon/Makefile.test-options
Modified: head/www/cocoon/Makefile
==============================================================================
--- head/www/cocoon/Makefile Thu Jun 6 22:11:38 2013 (r320138)
+++ head/www/cocoon/Makefile Thu Jun 6 22:24:37 2013 (r320139)
@@ -1,4 +1,3 @@
-# Created by: Jun Kuriyama <kuriyama at FreeBSD.org>
# $FreeBSD$
PORTNAME= cocoon
@@ -78,7 +77,7 @@ post-configure:
${SED} -e 's/.*include.block\(.*\)=.*$$/include.block\1=false/' < ${WRKSRC}/blocks.properties | \
${SED} ${BLOCKSEXP} > ${WRKSRC}/local.blocks.properties
${CP} ${WRKSRC}/build.properties ${WRKSRC}/local.build.properties
-.if (! defined(WITH_DOCS))
+.if ! ${PORT_OPTIONS:MDOCS}
${REINPLACE_CMD} \
-e 's/^#\(exclude.webapp.documentation=\)/\1/' \
-e 's/^#\(exclude.webapp.javadocs=\)/\1/' \
@@ -86,7 +85,7 @@ post-configure:
-e 's/^#\(exclude.javadocs=\)/\1/' \
${WRKSRC}/local.build.properties
.endif
-.if (! defined(WITH_SAMPLES))
+.if ! ${PORT_OPTIONS:MSAMPLES}
${REINPLACE_CMD} \
-e 's/^#\(exclude.webapp.samples=\)/\1/' \
-e 's/^#\(exclude.webapp.test-suite=\)/\1/' \
Modified: head/www/cocoon/Makefile.options
==============================================================================
--- head/www/cocoon/Makefile.options Thu Jun 6 22:11:38 2013 (r320138)
+++ head/www/cocoon/Makefile.options Thu Jun 6 22:24:37 2013 (r320139)
@@ -1,68 +1,197 @@
# ex:ts=22
#
-OPTIONS+= DOCS "Include the documentation" on
-OPTIONS+= SAMPLES "Include the samples" on
-OPTIONS+= SOURCES "Include the sources in jars" off
-OPTIONS+= AUTHENTICATION_FW "Enable the authentication-fw block" on
-OPTIONS+= BATIK "Enable the batik block" on
-OPTIONS+= BSF "Enable the bsf block" on
-OPTIONS+= CHAPERON "Enable the chaperon block" on
-OPTIONS+= DATABASES "Enable the databases block" on
-OPTIONS+= FOP "Enable the fop block" on
-OPTIONS+= FORMS "Enable the forms block" on
-OPTIONS+= HSQLDB "Enable the hsqldb block" on
-OPTIONS+= HTML "Enable the html block" on
-OPTIONS+= ITEXT "Enable the itext block" on
-OPTIONS+= JFOR "Enable the jfor block" on
-OPTIONS+= JSP "Enable the jsp block" on
-OPTIONS+= LINKREWRITER "Enable the linkrewriter block" on
-OPTIONS+= LUCENE "Enable the lucene block" on
-OPTIONS+= MIDI "Enable the midi block" on
-OPTIONS+= NAMING "Enable the naming block" on
-OPTIONS+= OJB "Enable the ojb block" on
-OPTIONS+= PARANOID "Enable the paranoid block" on
-OPTIONS+= POI "Enable the poi block" on
-OPTIONS+= PORTAL "Enable the portal block" on
-OPTIONS+= PROFILER "Enable the profiler block" on
-OPTIONS+= PYTHON "Enable the python block" on
-OPTIONS+= SESSION_FW "Enable the session-fw block" on
-OPTIONS+= VELOCITY "Enable the velocity block" on
-OPTIONS+= WEB3 "Enable the web3 block" on
-OPTIONS+= XMLDB "Enable the xmldb block" on
-OPTIONS+= XSP "Enable the xsp block" on
-OPTIONS+= PHP "Enable the php block" off
-OPTIONS+= PORTAL_FW "Enable the portal-fw block" off
-OPTIONS+= SWF "Enable the swf block" off
-OPTIONS+= WOODY "Enable the woody block" off
-OPTIONS+= AJAX "Enable the ajax block" on
-OPTIONS+= APPLES "Enable the apples block" on
-OPTIONS+= ASCIIART "Enable the asciiart block" on
-OPTIONS+= AUTH "Enable the auth block" on
-OPTIONS+= AXIS "Enable the axis block" on
-OPTIONS+= CAPTCHA "Enable the captcha block" on
-OPTIONS+= CRON "Enable the cron block" on
-OPTIONS+= DELI "Enable the deli block" on
-OPTIONS+= EVENTCACHE "Enable the eventcache block" on
-OPTIONS+= FACES "Enable the faces block" on
-OPTIONS+= IMAGEOP "Enable the imageop block" on
-OPTIONS+= JAVAFLOW "Enable the javaflow block" on
-OPTIONS+= JCR "Enable the jcr block" off
-OPTIONS+= JMS "Enable the jms block" on
-OPTIONS+= LINOTYPE "Enable the linotype block" on
-OPTIONS+= MAIL "Enable the mail block" on
-OPTIONS+= PETSTORE "Enable the petstore block" on
-OPTIONS+= PROXY "Enable the proxy block" on
-OPTIONS+= QDOX "Enable the qdox block" on
-OPTIONS+= QUERYBEAN "Enable the querybean block" on
-OPTIONS+= REPOSITORY "Enable the repository block" on
-OPTIONS+= SERIALIZERS "Enable the serializers block" on
-OPTIONS+= SLIDE "Enable the slide block" on
-OPTIONS+= SLOP "Enable the slop block" on
-OPTIONS+= STX "Enable the stx block" on
-OPTIONS+= TAGLIB "Enable the taglib block" on
-OPTIONS+= TEMPLATE "Enable the template block" on
-OPTIONS+= TOUR "Enable the tour block" on
-OPTIONS+= VALIDATION "Enable the validation block" on
-OPTIONS+= WEBDAV "Enable the webdav block" on
-OPTIONS+= XSLTAL "Enable the xsltal block" on
+OPTIONS_DEFINE= \
+ DOCS \
+ SAMPLES \
+ SOURCES \
+ AUTHENTICATION_FW \
+ BATIK \
+ BSF \
+ CHAPERON \
+ DATABASES \
+ FOP \
+ FORMS \
+ HSQLDB \
+ HTML \
+ ITEXT \
+ JFOR \
+ JSP \
+ LINKREWRITER \
+ LUCENE \
+ MIDI \
+ NAMING \
+ OJB \
+ PARANOID \
+ POI \
+ PORTAL \
+ PROFILER \
+ PYTHON \
+ SESSION_FW \
+ VELOCITY \
+ WEB3 \
+ XMLDB \
+ XSP \
+ PHP \
+ PORTAL_FW \
+ SWF \
+ WOODY \
+ AJAX \
+ APPLES \
+ ASCIIART \
+ AUTH \
+ AXIS \
+ CAPTCHA \
+ CRON \
+ DELI \
+ EVENTCACHE \
+ FACES \
+ IMAGEOP \
+ JAVAFLOW \
+ JCR \
+ JMS \
+ LINOTYPE \
+ MAIL \
+ PETSTORE \
+ PROXY \
+ QDOX \
+ QUERYBEAN \
+ REPOSITORY \
+ SERIALIZERS \
+ SLIDE \
+ SLOP \
+ STX \
+ TAGLIB \
+ TEMPLATE \
+ TOUR \
+ VALIDATION \
+ WEBDAV \
+ XSLTAL
+
+OPTIONS_DEFAULT= \
+ DOCS \
+ SAMPLES \
+ AUTHENTICATION_FW \
+ BATIK \
+ BSF \
+ CHAPERON \
+ DATABASES \
+ FOP \
+ FORMS \
+ HSQLDB \
+ HTML \
+ ITEXT \
+ JFOR \
+ JSP \
+ LINKREWRITER \
+ LUCENE \
+ MIDI \
+ NAMING \
+ OJB \
+ PARANOID \
+ POI \
+ PORTAL \
+ PROFILER \
+ PYTHON \
+ SESSION_FW \
+ VELOCITY \
+ WEB3 \
+ XMLDB \
+ XSP \
+ AJAX \
+ APPLES \
+ ASCIIART \
+ AUTH \
+ AXIS \
+ CAPTCHA \
+ CRON \
+ DELI \
+ EVENTCACHE \
+ FACES \
+ IMAGEOP \
+ JAVAFLOW \
+ JMS \
+ LINOTYPE \
+ MAIL \
+ PETSTORE \
+ PROXY \
+ QDOX \
+ QUERYBEAN \
+ REPOSITORY \
+ SERIALIZERS \
+ SLIDE \
+ SLOP \
+ STX \
+ TAGLIB \
+ TEMPLATE \
+ TOUR \
+ VALIDATION \
+ WEBDAV \
+ XSLTAL
+
+
+DOCS_DESC= Include the documentationn
+SAMPLES_DESC= Include the samples
+SOURCES_DESC= Include the sources in jarsff
+AUTHENTICATION_FW_DESC= Enable the authentication-fw blockn
+BATIK_DESC= Enable the batik blockn
+BSF_DESC= Enable the bsf blockn
+CHAPERON_DESC= Enable the chaperon blockn
+DATABASES_DESC= Enable the databases blockn
+FOP_DESC= Enable the fop blockn
+FORMS_DESC= Enable the forms blockn
+HSQLDB_DESC= Enable the hsqldb blockn
+HTML_DESC= Enable the html blockn
+ITEXT_DESC= Enable the itext blockn
+JFOR_DESC= Enable the jfor blockn
+JSP_DESC= Enable the jsp blockn
+LINKREWRITER_DESC= Enable the linkrewriter blockn
+LUCENE_DESC= Enable the lucene blockn
+MIDI_DESC= Enable the midi blockn
+NAMING_DESC= Enable the naming blockn
+OJB_DESC= Enable the ojb blockn
+PARANOID_DESC= Enable the paranoid blockn
+POI_DESC= Enable the poi blockn
+PORTAL_DESC= Enable the portal blockn
+PROFILER_DESC= Enable the profiler blockn
+PYTHON_DESC= Enable the python blockn
+SESSION_FW_DESC= Enable the session-fw blockn
+VELOCITY_DESC= Enable the velocity blockn
+WEB3_DESC= Enable the web3 blockn
+XMLDB_DESC= Enable the xmldb blockn
+XSP_DESC= Enable the xsp blockn
+PHP_DESC= Enable the php blockff
+PORTAL_FW_DESC= Enable the portal-fw blockff
+SWF_DESC= Enable the swf blockff
+WOODY_DESC= Enable the woody blockff
+AJAX_DESC= Enable the ajax blockn
+APPLES_DESC= Enable the apples blockn
+ASCIIART_DESC= Enable the asciiart blockn
+AUTH_DESC= Enable the auth blockn
+AXIS_DESC= Enable the axis blockn
+CAPTCHA_DESC= Enable the captcha blockn
+CRON_DESC= Enable the cron blockn
+DELI_DESC= Enable the deli blockn
+EVENTCACHE_DESC= Enable the eventcache blockn
+FACES_DESC= Enable the faces blockn
+IMAGEOP_DESC= Enable the imageop blockn
+JAVAFLOW_DESC= Enable the javaflow blockn
+JCR_DESC= Enable the jcr blockff
+JMS_DESC= Enable the jms blockn
+LINOTYPE_DESC= Enable the linotype blockn
+MAIL_DESC= Enable the mail blockn
+PETSTORE_DESC= Enable the petstore blockn
+PROXY_DESC= Enable the proxy blockn
+QDOX_DESC= Enable the qdox blockn
+QUERYBEAN_DESC= Enable the querybean blockn
+REPOSITORY_DESC= Enable the repository blockn
+SERIALIZERS_DESC= Enable the serializers blockn
+SLIDE_DESC= Enable the slide blockn
+SLOP_DESC= Enable the slop blockn
+STX_DESC= Enable the stx blockn
+TAGLIB_DESC= Enable the taglib blockn
+TEMPLATE_DESC= Enable the template blockn
+TOUR_DESC= Enable the tour blockn
+VALIDATION_DESC= Enable the validation blockn
+WEBDAV_DESC= Enable the webdav blockn
+XSLTAL_DESC= Enable the xsltal blockn
Modified: head/www/cocoon/Makefile.test-options
==============================================================================
--- head/www/cocoon/Makefile.test-options Thu Jun 6 22:11:38 2013 (r320138)
+++ head/www/cocoon/Makefile.test-options Thu Jun 6 22:24:37 2013 (r320139)
@@ -1,79 +1,79 @@
-.if defined(WITH_AUTHENTICATION_FW)
+.if ${PORT_OPTIONS:MAUTHENTICATION_FW}
BLOCKS+= authentication-fw
BLOCKS+= session-fw
BLOCKS+= xsp
.endif
-.if defined(WITH_BATIK)
+.if ${PORT_OPTIONS:MBATIK}
BLOCKS+= batik
.endif
-.if defined(WITH_BSF)
+.if ${PORT_OPTIONS:MBSF}
BLOCKS+= bsf
.endif
-.if defined(WITH_CHAPERON)
+.if ${PORT_OPTIONS:MCHAPERON}
BLOCKS+= chaperon
.endif
-.if defined(WITH_DATABASES)
+.if ${PORT_OPTIONS:MDATABASES}
BLOCKS+= databases
BLOCKS+= xsp
.endif
-.if defined(WITH_FOP)
+.if ${PORT_OPTIONS:MFOP}
BLOCKS+= fop
BLOCKS+= batik
BLOCKS+= xsp
.endif
-.if defined(WITH_FORMS)
+.if ${PORT_OPTIONS:MFORMS}
BLOCKS+= forms
BLOCKS+= ajax
BLOCKS+= template
.endif
-.if defined(WITH_HSQLDB)
+.if ${PORT_OPTIONS:MHSQLDB}
BLOCKS+= hsqldb
BLOCKS+= databases
BLOCKS+= xsp
.endif
-.if defined(WITH_HTML)
+.if ${PORT_OPTIONS:MHTML}
BLOCKS+= html
.endif
-.if defined(WITH_ITEXT)
+.if ${PORT_OPTIONS:MITEXT}
BLOCKS+= itext
BLOCKS+= xsp
.endif
-.if defined(WITH_JFOR)
+.if ${PORT_OPTIONS:MJFOR}
BLOCKS+= jfor
.endif
-.if defined(WITH_JSP)
+.if ${PORT_OPTIONS:MJSP}
BLOCKS+= jsp
.endif
-.if defined(WITH_LINKREWRITER)
+.if ${PORT_OPTIONS:MLINKREWRITER}
BLOCKS+= linkrewriter
BLOCKS+= xsp
.endif
-.if defined(WITH_LUCENE)
+.if ${PORT_OPTIONS:MLUCENE}
BLOCKS+= lucene
.endif
-.if defined(WITH_MIDI)
+.if ${PORT_OPTIONS:MMIDI}
BLOCKS+= midi
.endif
-.if defined(WITH_NAMING)
+.if ${PORT_OPTIONS:MNAMING}
BLOCKS+= naming
.endif
-.if defined(WITH_OJB)
+.if ${PORT_OPTIONS:MOJB}
BLOCKS+= ojb
BLOCKS+= ajax
BLOCKS+= databases
@@ -83,15 +83,15 @@ BLOCKS+= template
BLOCKS+= xsp
.endif
-.if defined(WITH_PARANOID)
+.if ${PORT_OPTIONS:MPARANOID}
BLOCKS+= paranoid
.endif
-.if defined(WITH_POI)
+.if ${PORT_OPTIONS:MPOI}
BLOCKS+= poi
.endif
-.if defined(WITH_PORTAL)
+.if ${PORT_OPTIONS:MPORTAL}
BLOCKS+= portal
BLOCKS+= ajax
BLOCKS+= auth
@@ -106,98 +106,98 @@ BLOCKS+= template
BLOCKS+= xsp
.endif
-.if defined(WITH_PROFILER)
+.if ${PORT_OPTIONS:MPROFILER}
BLOCKS+= profiler
BLOCKS+= auth
.endif
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
BLOCKS+= python
BLOCKS+= xsp
.endif
-.if defined(WITH_SESSION_FW)
+.if ${PORT_OPTIONS:MSESSION_FW}
BLOCKS+= session-fw
BLOCKS+= xsp
.endif
-.if defined(WITH_VELOCITY)
+.if ${PORT_OPTIONS:MVELOCITY}
BLOCKS+= velocity
.endif
-.if defined(WITH_WEB3)
+.if ${PORT_OPTIONS:MWEB3}
BLOCKS+= web3
.endif
-.if defined(WITH_XMLDB)
+.if ${PORT_OPTIONS:MXMLDB}
BLOCKS+= xmldb
BLOCKS+= databases
BLOCKS+= xsp
.endif
-.if defined(WITH_XSP)
+.if ${PORT_OPTIONS:MXSP}
BLOCKS+= xsp
.endif
-.if defined(WITH_PHP)
+.if ${PORT_OPTIONS:MPHP}
BLOCKS+= php
.endif
-.if defined(WITH_PORTAL_FW)
+.if ${PORT_OPTIONS:MPORTAL_FW}
BLOCKS+= portal-fw
BLOCKS+= authentication-fw
BLOCKS+= session-fw
BLOCKS+= xsp
.endif
-.if defined(WITH_SWF)
+.if ${PORT_OPTIONS:MSWF}
BLOCKS+= swf
.endif
-.if defined(WITH_WOODY)
+.if ${PORT_OPTIONS:MWOODY}
BLOCKS+= woody
BLOCKS+= xsp
.endif
-.if defined(WITH_AJAX)
+.if ${PORT_OPTIONS:MAJAX}
BLOCKS+= ajax
BLOCKS+= template
.endif
-.if defined(WITH_APPLES)
+.if ${PORT_OPTIONS:MAPPLES}
BLOCKS+= apples
BLOCKS+= ajax
BLOCKS+= forms
BLOCKS+= template
.endif
-.if defined(WITH_ASCIIART)
+.if ${PORT_OPTIONS:MASCIIART}
BLOCKS+= asciiart
.endif
-.if defined(WITH_AUTH)
+.if ${PORT_OPTIONS:MAUTH}
BLOCKS+= auth
.endif
-.if defined(WITH_AXIS)
+.if ${PORT_OPTIONS:MAXIS}
BLOCKS+= axis
BLOCKS+= xsp
.endif
-.if defined(WITH_CAPTCHA)
+.if ${PORT_OPTIONS:MCAPTCHA}
BLOCKS+= captcha
BLOCKS+= template
.endif
-.if defined(WITH_CRON)
+.if ${PORT_OPTIONS:MCRON}
BLOCKS+= cron
.endif
-.if defined(WITH_DELI)
+.if ${PORT_OPTIONS:MDELI}
BLOCKS+= deli
.endif
-.if defined(WITH_EVENTCACHE)
+.if ${PORT_OPTIONS:MEVENTCACHE}
BLOCKS+= eventcache
BLOCKS+= cron
BLOCKS+= databases
@@ -206,7 +206,7 @@ BLOCKS+= jms
BLOCKS+= xsp
.endif
-.if defined(WITH_FACES)
+.if ${PORT_OPTIONS:MFACES}
BLOCKS+= faces
BLOCKS+= ajax
BLOCKS+= auth
@@ -223,11 +223,11 @@ BLOCKS+= template
BLOCKS+= xsp
.endif
-.if defined(WITH_IMAGEOP)
+.if ${PORT_OPTIONS:MIMAGEOP}
BLOCKS+= imageop
.endif
-.if defined(WITH_JAVAFLOW)
+.if ${PORT_OPTIONS:MJAVAFLOW}
BLOCKS+= javaflow
BLOCKS+= ajax
BLOCKS+= databases
@@ -238,11 +238,11 @@ BLOCKS+= template
BLOCKS+= xsp
.endif
-.if defined(WITH_JCR)
+.if ${PORT_OPTIONS:MJCR}
BLOCKS+= jcr
.endif
-.if defined(WITH_JMS)
+.if ${PORT_OPTIONS:MJMS}
BLOCKS+= jms
BLOCKS+= cron
BLOCKS+= databases
@@ -250,16 +250,16 @@ BLOCKS+= hsqldb
BLOCKS+= xsp
.endif
-.if defined(WITH_LINOTYPE)
+.if ${PORT_OPTIONS:MLINOTYPE}
BLOCKS+= linotype
.endif
-.if defined(WITH_MAIL)
+.if ${PORT_OPTIONS:MMAIL}
BLOCKS+= mail
BLOCKS+= asciiart
.endif
-.if defined(WITH_PETSTORE)
+.if ${PORT_OPTIONS:MPETSTORE}
BLOCKS+= petstore
BLOCKS+= ajax
BLOCKS+= databases
@@ -270,15 +270,15 @@ BLOCKS+= velocity
BLOCKS+= xsp
.endif
-.if defined(WITH_PROXY)
+.if ${PORT_OPTIONS:MPROXY}
BLOCKS+= proxy
.endif
-.if defined(WITH_QDOX)
+.if ${PORT_OPTIONS:MQDOX}
BLOCKS+= qdox
.endif
-.if defined(WITH_QUERYBEAN)
+.if ${PORT_OPTIONS:MQUERYBEAN}
BLOCKS+= querybean
BLOCKS+= ajax
BLOCKS+= databases
@@ -290,7 +290,7 @@ BLOCKS+= template
BLOCKS+= xsp
.endif
-.if defined(WITH_REPOSITORY)
+.if ${PORT_OPTIONS:MREPOSITORY}
BLOCKS+= repository
BLOCKS+= cron
BLOCKS+= databases
@@ -300,11 +300,11 @@ BLOCKS+= jms
BLOCKS+= xsp
.endif
-.if defined(WITH_SERIALIZERS)
+.if ${PORT_OPTIONS:MSERIALIZERS}
BLOCKS+= serializers
.endif
-.if defined(WITH_SLIDE)
+.if ${PORT_OPTIONS:MSLIDE}
BLOCKS+= slide
BLOCKS+= cron
BLOCKS+= databases
@@ -315,23 +315,23 @@ BLOCKS+= repository
BLOCKS+= xsp
.endif
-.if defined(WITH_SLOP)
+.if ${PORT_OPTIONS:MSLOP}
BLOCKS+= slop
.endif
-.if defined(WITH_STX)
+.if ${PORT_OPTIONS:MSTX}
BLOCKS+= stx
.endif
-.if defined(WITH_TAGLIB)
+.if ${PORT_OPTIONS:MTAGLIB}
BLOCKS+= taglib
.endif
-.if defined(WITH_TEMPLATE)
+.if ${PORT_OPTIONS:MTEMPLATE}
BLOCKS+= template
.endif
-.if defined(WITH_TOUR)
+.if ${PORT_OPTIONS:MTOUR}
BLOCKS+= tour
BLOCKS+= ajax
BLOCKS+= batik
@@ -342,11 +342,11 @@ BLOCKS+= template
BLOCKS+= xsp
.endif
-.if defined(WITH_VALIDATION)
+.if ${PORT_OPTIONS:MVALIDATION}
BLOCKS+= validation
.endif
-.if defined(WITH_WEBDAV)
+.if ${PORT_OPTIONS:MWEBDAV}
BLOCKS+= webdav
BLOCKS+= cron
BLOCKS+= databases
@@ -357,7 +357,7 @@ BLOCKS+= repository
BLOCKS+= xsp
.endif
-.if defined(WITH_XSLTAL)
+.if ${PORT_OPTIONS:MXSLTAL}
BLOCKS+= xsltal
.endif
More information about the svn-ports-all
mailing list