diff options
author | Baptiste Daroussin <bapt@FreeBSD.org> | 2012-06-12 06:44:14 +0000 |
---|---|---|
committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2012-06-12 06:44:14 +0000 |
commit | 954c1faffa55fcd3510c0a9967b8ac3001df353f (patch) | |
tree | 1c9b8a5b68b507ef2c36d35139fd2f7f6ca62eec /deskutils | |
parent | Convert to new option framework (diff) |
Convert to new options framework
Notes
Notes:
svn path=/head/; revision=299094
Diffstat (limited to 'deskutils')
-rw-r--r-- | deskutils/surrealtodo/Makefile | 12 | ||||
-rw-r--r-- | deskutils/taskjuggler/Makefile | 16 |
2 files changed, 12 insertions, 16 deletions
diff --git a/deskutils/surrealtodo/Makefile b/deskutils/surrealtodo/Makefile index ad184e7c53fa..f12353175e88 100644 --- a/deskutils/surrealtodo/Makefile +++ b/deskutils/surrealtodo/Makefile @@ -25,19 +25,19 @@ PKGMESSAGE= ${WRKDIR}/${PORTNAME}/pkg-message SUB_FILES= pkg-message PLIST_DIRSTRY= %%WWWDIR%% -OPTIONS= POSTGRE "Use PostgreSQL Database" off \ - APACHE "Use Apache webserver" on \ - LIGHTTPD "Use Lighttpd webserver" off +OPTIONS_DEFINE= PGSQL APACHE LIGHTTPD +OPTIONS_DEFAULT= APACHE +LIGHTTPD_DESC= Use Lighttpd webserver .include <bsd.port.options.mk> -.if defined(WITH_POSTGRE) +.if ${PORT_OPTIONS:MPOSTGRE} USE_PHP+= pgsql .endif -.if defined(WITH_APACHE) +.if ${PORT_OPTIONS:MAPACHE} USE_APACHE= 22 .endif -.if defined(WITH_LIGHTTPD) +.if ${PORT_OPTIONS:MLIGHTTPD} RUN_DEPENDS+= lighttpd:${PORTSDIR}/www/lighttpd .endif diff --git a/deskutils/taskjuggler/Makefile b/deskutils/taskjuggler/Makefile index 02b225914771..544cfee21a78 100644 --- a/deskutils/taskjuggler/Makefile +++ b/deskutils/taskjuggler/Makefile @@ -22,8 +22,8 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Class/MethodMaker.pm:${PORTSDIR}/devel/ ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser RUN_DEPENDS:= ${BUILD_DEPENDS} -OPTIONS= DOCS "Build documentation" on \ - KDE "Build KDE frontend" on +OPTIONS_DEFINE= DOCS KDE3 +OPTIONS_DEFAULT= KDE3 USE_BZIP2= yes USE_QT_VER= 3 @@ -38,19 +38,15 @@ USE_LDCONFIG= yes AUTOTOOLSFILES= admin/cvs.sh -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITHOUT_DOCS) -NOPORTDOCS= true -.endif - -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt .else CONFIGURE_ARGS+=--disable-docs .endif -.if !defined(WITHOUT_KDE) +.if ${PORT_OPTIONS:MKDE3} LIB_DEPENDS+= kimproxy:${PORTSDIR}/x11/kdelibs3 \ kcal.2:${PORTSDIR}/deskutils/kdepim3 PLIST_SUB+= KDE="" @@ -92,4 +88,4 @@ regression-test: @(cd ${BUILD_WRKSRC}/TestSuite; \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) -.include <bsd.port.post.mk> +.include <bsd.port.mk> |