aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--astro/p5-Astro-satpass/Makefile22
-rw-r--r--audio/pacpl/Makefile135
-rw-r--r--databases/p5-Class-DBI-Loader/Makefile20
-rw-r--r--databases/p5-DBD-Oracle/Makefile29
-rw-r--r--databases/p5-DBIx-Class-EncodedColumn/Makefile14
-rw-r--r--databases/p5-DBIx-Class-Schema-Loader/Makefile14
-rw-r--r--databases/p5-DBIx-Class/Makefile5
-rw-r--r--databases/p5-SQL-Translator/Makefile10
-rw-r--r--devel/p5-CPANPLUS/Makefile9
-rw-r--r--devel/p5-Class-C3/Makefile5
-rw-r--r--devel/p5-Data-Dumper-Concise/Makefile6
-rw-r--r--devel/p5-Data-Random/Makefile10
-rw-r--r--devel/p5-Log-Dispatch/Makefile41
-rw-r--r--mail/p5-Net-IMAP-Simple/Makefile9
-rw-r--r--math/PDL/Makefile47
-rw-r--r--misc/p5-Business-ISBN/Makefile13
-rw-r--r--multimedia/dvdrip/Makefile13
-rw-r--r--net/p5-Net-SSH-Perl/Makefile6
-rw-r--r--net/p5-Net-Server/Makefile6
-rw-r--r--security/p5-Authen-SASL/Makefile9
-rw-r--r--security/p5-Crypt-CBCeasy/Makefile33
-rw-r--r--security/p5-GD-SecurityImage/Makefile5
-rw-r--r--textproc/p5-XML-SAX/Makefile6
-rw-r--r--textproc/p5-ack/Makefile9
-rw-r--r--www/p5-App-Nopaste/Makefile18
-rw-r--r--www/p5-FCGI/Makefile5
-rw-r--r--www/p5-Maypole/Makefile10
-rw-r--r--www/p5-MojoMojo/Makefile46
-rw-r--r--www/p5-Template-Toolkit/Makefile17
-rw-r--r--www/p5-URI-Fetch/Makefile11
-rw-r--r--x11-toolkits/p5-Tk/Makefile5
31 files changed, 315 insertions, 273 deletions
diff --git a/astro/p5-Astro-satpass/Makefile b/astro/p5-Astro-satpass/Makefile
index f3df0c4107bc..18747a3422f0 100644
--- a/astro/p5-Astro-satpass/Makefile
+++ b/astro/p5-Astro-satpass/Makefile
@@ -21,11 +21,13 @@ LICENSE_COMB= dual
BUILD_DEPENDS= p5-Date-Manip>=1.14:${PORTSDIR}/devel/p5-Date-Manip
RUN_DEPENDS= p5-Date-Manip>=1.14:${PORTSDIR}/devel/p5-Date-Manip
-OPTIONS= GEOCODER_US "Add support for Geo::Coder::Geocoder::US" on \
- SIMBAD "Add support for Astro::SIMBAD::Client" on \
- SOAPLITE "Add support for SOAP::Lite (deprecated)" off \
- SPACETRACK "Add support for Astro::SpaceTrack" on \
- USGS "Add support for Geo::WebService::Elevation::USGS" on
+OPTIONS_DEFINE= GEOCODER_US SIMBAD SOAPLITE SPACETRACK USGS
+OPTIONS_DEFAULT= GEOCODER_US SIMBAD SPACETRACK USGS
+GEOCODER_US_DESC= Add support for Geo::Coder::Geocoder::US
+SIMBAD_DESC= Add support for Astro::SIMBAD::Client
+SOAPLITE_DESC= Add support for SOAP::Lite (deprecated)
+SPACETRACK_DESC= Add support for Astro::SpaceTrack
+USGS_DESC= Add support for Geo::WebService::Elevation::USGS
CONFIGURE_ARGS= -y
PERL_CONFIGURE= yes
@@ -44,23 +46,23 @@ MAN3= Astro::Coord::ECI.3 \
.include <bsd.port.options.mk>
-.if !defined(WITHOUT_GEOCODER_US)
+.if ${PORT_OPTIONS:MGEOCODER_US}
RUN_DEPENDS+= p5-Geo-Coder-Geocoder-US>=0:${PORTSDIR}/misc/p5-Geo-Coder-Geocoder-US
.endif
-.if !defined(WITHOUT_SIMBAD)
+.if ${PORT_OPTIONS:MSIMBAD}
RUN_DEPENDS+= p5-Astro-SIMBAD-Client>=0:${PORTSDIR}/astro/p5-Astro-SIMBAD-Client
.endif
-.if !defined(WITHOUT_SPACETRACK)
+.if ${PORT_OPTIONS:MSPACETRACK}
RUN_DEPENDS+= p5-Astro-SpaceTrack>=0:${PORTSDIR}/astro/p5-Astro-SpaceTrack
.endif
-.if !defined(WITHOUT_USGS)
+.if ${PORT_OPTIONS:MUSGS}
RUN_DEPENDS+= p5-Geo-WebService-Elevation-USGS>=0:${PORTSDIR}/science/p5-Geo-WebService-Elevation-USGS
.endif
-.if defined(WITH_SOAPLITE)
+.if ${PORT_OPTIONS:MSOAPLITE}
RUN_DEPENDS+= p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite
.endif
diff --git a/audio/pacpl/Makefile b/audio/pacpl/Makefile
index 4c4764d1ef98..ac0ef2717cc9 100644
--- a/audio/pacpl/Makefile
+++ b/audio/pacpl/Makefile
@@ -19,53 +19,52 @@ USE_PERL5_RUN= yes
ONLY_FOR_ARCHS= i386 amd64
NO_BUILD= yes
-OPTIONS= BONK "Bonk support" off \
- CDPARANOIA "CD Ripping support" on \
- CDDB "CDDB support" on \
- FAAC "FAAC support" on \
- FAAD "FAAD support" on \
- FFMPEG "FFMPEG suport" on \
- FLAC "FLAC support" on \
- FLACTAG "FLAC tagging support" on \
- GOGO "GOGO-no-coda support" off \
- LAME "Lame support" on \
- LAUDIO "Laudio support" off \
- SNDFILE "libsndfile support" off \
- LPAC "LPAC support" off \
- MONKEY "Monkey's Audio support" off \
- APETAG "Monkey's tagging support" off \
- MP3TAG "MP3 tagging support" on \
- MP4TAG "MP4 tagging support" off \
- MPLAYER "MPlayer support" on \
- MUSEPACK "Musepack support" off \
- MUSETAG "Musepack tagging support" off \
- OPTIMFROG "OptimFROG support" off \
- OGGVORBIS "Ogg/Vorbis support" off \
- OGGTAG "Ogg/Vorbis tagging support" off \
- SHORTEN "Shorten support" off \
- SOX "SoX support" off \
- SPEEX "Speex support" off \
- TOOLAME "tooLAME support" off \
- TTA "TTA support" off \
- WAVPACK "WavPack support" off \
- WMATAG "WMA Tagging support" off \
- KDE4SM "Konqueror/Dolphin integration" off \
- AMAROK "Amarok integration (BROKEN)" off \
- MORELANGS "Additional language support" off
+OPTIONS_DEFINE= BONK CDPARANOIA CDDB FAAC FAAD FFMPEG FLAC FLACTAG GOGO \
+ LAME LAUDIO SNDFILE LPAC APE APETAG MP3TAG MP4TAG \
+ MPP MPLAYER OPTIMFROG VORBIS VORBISTAG SHORTEN \
+ SOX SPEEX TOOLAME TTA WAVPACK WMATAG KDE4 AMAROK NORELANGS \
+ DOCS
+
+OPTIONS_DEFAULT= CDPARANOIA CDDB FAAD FFMPEG FLAC FLACTAG MP3TAG \
+ VORBIS VORBISTAG
+.if !defined(PACKAGE_BUILDING)
+OPTIONS_DEFAULT= LAME FAAC
+.endif
+
+BONK_DESC= Enable Bonk support
+AMAROK_DESC= Enable Amarok integration (BROKEN)
+APETAG_DESC= Enable Monkey's tagging support
+FLACTAG_DESC= Enable FLAC tagging support
+KDE4_DESC= Enable Konqueror/Dolphin integration
+LAUDIO_DESC= Enable laudio support
+LPAC_DESC= Enable LPAC support
+MP3TAG_DESC= Enable MP3 tagging support
+MP4TAG_DESC= Enable MP4 tagging support
+MPLAYER_DESC= Enable Mplayer support
+MPPTAG_DESC= Enable Musepack tagging support
+OPTIMFROG_DESC= Enable OptimFROG support"
+VORBISTAG_DESC= Enable Ogg/Vorbis tagging support
+SHORTEN_DESC= Enable Shorten support
+SOX_DESC= Enable SoX support
+TOOLAME_DESC= Enable tooLAME support
+TTA_DESC= Enable TTA support
+WAVPACK_DESC= Enable wavpack support
+WMATAG_DESC= Enable WMA tagging support
+MORELANGS_DESC= Enable Additional language support
MAN1= pacpl.1
PACPL_PO= en_US.po
.include <bsd.port.options.mk>
-.if defined(WITH_KDE4SM)
+.if ${PORT_OPTIONS:MKDE4}
USE_KDE4= kdebase
PLIST_SUB+= KDE4SERVICEMENU="" KDE4_PREFIX="${KDE4_PREFIX}"
.else
PLIST_SUB+= KDE4SERVICEMENU="@comment "
.endif
-.if defined(WITH_AMAROK)
+.if ${PORT_OPTIONS:MAMAROK}
BROKEN= Amarok support temporarily broken in 4.05+
RUN_DEPENDS+= amarok:${PORTSDIR}/audio/amarok
PLIST_SUB+= AMAROK=""
@@ -75,123 +74,123 @@ PLIST_SUB+= AMAROK="@comment "
.include <bsd.port.pre.mk>
-.if defined(WITH_BONK)
+.if ${PORT_OPTIONS:MBONK}
RUN_DEPENDS+= bonk:${PORTSDIR}/audio/bonk
.endif
-.if defined(WITH_CDDB)
+.if ${PORT_OPTIONS:MCDDB}
RUN_DEPENDS+= p5-CDDB_get>0:${PORTSDIR}/audio/p5-CDDB_get
.endif
-.if defined(WITH_CDPARANOIA)
+.if ${PORT_OPTIONS:MCDPARANOIA}
RUN_DEPENDS+= cdparanoia:${PORTSDIR}/audio/cdparanoia
.endif
-.if defined(WITH_FAAC)
+.if ${PORT_OPTIONS:MFAAC}
RUN_DEPENDS+= faac:${PORTSDIR}/audio/faac
.endif
-.if defined(WITH_FAAD)
+.if ${PORT_OPTIONS:MFAAD}
RUN_DEPENDS+= faad:${PORTSDIR}/audio/faad
.endif
-.if defined(WITH_FFMPEG)
+.if ${PORT_OPTIONS:MFFMPEG}
RUN_DEPENDS+= ffmpeg:${PORTSDIR}/multimedia/ffmpeg
.endif
-.if defined(WITH_FLAC)
+.if ${PORT_OPTIONS:MFLAC}
RUN_DEPENDS+= flac:${PORTSDIR}/audio/flac
.endif
-.if defined(WITH_FLACTAG)
+.if ${PORT_OPTIONS:MFLACTAG}
RUN_DEPENDS+= p5-Audio-FLAC-Header>0:${PORTSDIR}/audio/p5-Audio-FLAC-Header
.endif
-.if defined(WITH_GOGO)
+.if ${PORT_OPTIONS:MGOGO}
RUN_DEPENDS+= gogo:${PORTSDIR}/audio/gogo
.endif
-.if defined(WITH_LAME)
+.if ${PORT_OPTIONS:MLAME}
RUN_DEPENDS+= lame:${PORTSDIR}/audio/lame
.endif
-.if defined(WITH_LAUDIO)
+.if ${PORT_OPTIONS:MLAUDIO}
RUN_DEPENDS+= laudio:${PORTSDIR}/audio/laudio
.endif
-.if defined(WITH_SNDFILE)
+.if ${PORT_OPTIONS:MSNDFILE}
RUN_DEPENDS+= sndfile-convert:${PORTSDIR}/audio/libsndfile
.endif
-.if defined(WITH_LPAC)
+.if ${PORT_OPTIONS:MLPAC}
RUN_DEPENDS+= lpac:${PORTSDIR}/audio/lpac
.endif
-.if defined(WITH_MONKEY)
+.if ${PORT_OPTIONS:MAPE}
RUN_DEPENDS+= mac:${PORTSDIR}/audio/mac
.endif
-.if defined(WITH_MUSETAG) || defined(WITH_APETAG)
+.if ${PORT_OPTIONS:MMPPTAG} || ${PORT_OPTIONS:MAPETAG}
RUN_DEPENDS+= p5-Audio-Musepack>0:${PORTSDIR}/audio/p5-Audio-Musepack
.endif
-.if defined(WITH_MP3TAG)
+.if ${PORT_OPTIONS:MMP3TAG}
RUN_DEPENDS+= p5-MP3-Tag>0:${PORTSDIR}/audio/p5-MP3-Tag
.endif
-.if defined(WITH_MP4TAG)
+.if ${PORT_OPTIONS:MMP4TAG}
RUN_DEPENDS+= p5-MP4-Info>0:${PORTSDIR}/multimedia/p5-MP4-Info
.endif
-.if defined(WITH_MPLAYER)
+.if ${PORT_OPTIONS:MMPLAYER}
RUN_DEPENDS+= mplayer:${PORTSDIR}/multimedia/mplayer
.endif
-.if defined(WITH_MUSEPACK)
+.if ${PORT_OPTIONS:MMPPPACK}
RUN_DEPENDS+= mppenc:${PORTSDIR}/audio/musepack
.endif
-.if defined(WITH_OPTIMFROG)
+.if ${PORT_OPTIONS:MOPTIMFROG}
RUN_DEPENDS+= ofr:${PORTSDIR}/audio/optimfrog
.endif
-.if defined(WITH_OGGVORBIS)
+.if ${PORT_OPTIONS:MVORBISVORBIS}
RUN_DEPENDS+= oggenc:${PORTSDIR}/audio/vorbis-tools
.endif
-.if defined(WITH_OGGTAG)
+.if ${PORT_OPTIONS:MVORBISTAG}
RUN_DEPENDS+= p5-Ogg-Vorbis-Header>0:${PORTSDIR}/audio/p5-Ogg-Vorbis-Header
.endif
-.if defined(WITH_SHORTEN)
+.if ${PORT_OPTIONS:MSHORTEN}
RUN_DEPENDS+= shorten:${PORTSDIR}/audio/shorten
.endif
-.if defined(WITH_SOX)
+.if ${PORT_OPTIONS:MSOX}
RUN_DEPENDS+= sox:${PORTSDIR}/audio/sox
.endif
-.if defined(WITH_SPEEX)
+.if ${PORT_OPTIONS:MSPEEX}
RUN_DEPENDS+= speexenc:${PORTSDIR}/audio/speex
.endif
-.if defined(WITH_TOOLAME)
+.if ${PORT_OPTIONS:MTOOLAME}
RUN_DEPENDS+= toolame:${PORTSDIR}/audio/toolame
.endif
-.if defined(WITH_TTA)
+.if ${PORT_OPTIONS:MTTA}
RUN_DEPENDS+= ttaenc:${PORTSDIR}/audio/tta
.endif
-.if defined(WITH_WAVPACK)
+.if ${PORT_OPTIONS:MWAVPACK}
RUN_DEPENDS+= wavpack:${PORTSDIR}/audio/wavpack
.endif
-.if defined(WITH_WMATAG)
+.if ${PORT_OPTIONS:MWMATAG}
RUN_DEPENDS+= p5-Audio-WMA>0:${PORTSDIR}/audio/p5-Audio-WMA
.endif
-.if defined(WITH_MORELANGS)
+.if ${PORT_OPTIONS:MMORELANGS}
PACPL_PO+= ca.po de.po es.po et.po fr_FR.po it_IT.po nl_NL.po pl.po pt.po ro.po ru_RU.po tr.po zh_CN.po
PLIST_SUB+= ADDITIONAL_LANGS=""
.else
@@ -239,17 +238,17 @@ do-install:
@pod2man ${WRKSRC}/pacpl ${WRKSRC}/pacpl.1
${INSTALL_MAN} ${WRKSRC}/pacpl.1 ${MAN1PREFIX}/man/man1/
-.if defined(WITH_KDE4SM)
+.if ${PORT_OPTIONS:MKDE4}
${INSTALL_DATA} ${WRKSRC}/plugins/konqueror/pacpl.desktop ${KDE4_PREFIX}/share/kde4/services/ServiceMenus
.endif
-.if defined(WITH_AMAROK)
+.if ${PORT_OPTIONS:MAMAROK)
${MKDIR} ${PREFIX}/share/apps/amarok/scripts/transcoding_pacx
${INSTALL_DATA} ${WRKSRC}/plugins/amarok/pacx ${PREFIX}/share/apps/amarok/scripts/transcoding_pacx/transcoding_pacx.pl
${PERL} -e 'print qq(name = Pacx\ntype = transcode)' > ${PREFIX}/share/apps/amarok/scripts/transcoding_pacx/transcoding_pacx.spec
.endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/extra/README.module ${WRKSRC}/ChangeLog ${WRKSRC}/README ${DOCSDIR}
.endif
diff --git a/databases/p5-Class-DBI-Loader/Makefile b/databases/p5-Class-DBI-Loader/Makefile
index 45dc8bffc742..56b063d62886 100644
--- a/databases/p5-Class-DBI-Loader/Makefile
+++ b/databases/p5-Class-DBI-Loader/Makefile
@@ -29,7 +29,11 @@ MAN3= Class::DBI::Loader.3 \
Class::DBI::Loader::SQLite.3 \
Class::DBI::Loader::mysql.3
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE= PGSQL MYSQL SQLITE DOCS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
DOCS= Changes README
post-install:
@@ -38,20 +42,14 @@ post-install:
@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
.endif
-OPTIONS= PGSQL "Enable support for PostgreSQL" Off \
- MYSQL "Enable support for MySQL" Off \
- SQLITE "Enable support for SQLite" Off
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
RUN_DEPENDS+= p5-Class-DBI-Pg>=0:${PORTSDIR}/databases/p5-Class-DBI-Pg
.endif
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
RUN_DEPENDS+= p5-Class-DBI-mysql>=0:${PORTSDIR}/databases/p5-Class-DBI-mysql
.endif
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
RUN_DEPENDS+= p5-Class-DBI-SQLite>=0:${PORTSDIR}/databases/p5-Class-DBI-SQLite
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/p5-DBD-Oracle/Makefile b/databases/p5-DBD-Oracle/Makefile
index a49328bc38af..244a9eb23be8 100644
--- a/databases/p5-DBD-Oracle/Makefile
+++ b/databases/p5-DBD-Oracle/Makefile
@@ -15,7 +15,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= DBI driver for Oracle RDBMS server
-OPTIONS= OCI8 "Use OCI8" off
+OPTIONS_DEFINE= OCI8 DOCS
+OCI8_DESC= Use OCI8
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
RUN_DEPENDS:= ${BUILD_DEPENDS}
@@ -26,19 +27,9 @@ CONFIGURE_ENV= ORACLE_HOME="${ORACLE_HOME}"
MAN1= ora_explain.1
MAN3= DBD::Oracle.3 DBD::Oraperl.3
-post-install:
-.ifndef(NOPORTDOCS)
- @${ECHO_MSG} "===> Installing examples for ${PKGNAME}"
- @${MKDIR} ${EXAMPLESDIR}
- @${INSTALL_DATA} ${WRKSRC}/Oracle.ex/Readme ${EXAMPLESDIR}
- @${INSTALL_SCRIPT} ${WRKSRC}/Oracle.ex/*.pl ${EXAMPLESDIR}
- @${INSTALL_SCRIPT} ${WRKSRC}/Oracle.ex/japh ${EXAMPLESDIR}
- @${INSTALL_SCRIPT} ${WRKSRC}/Oracle.ex/sql ${EXAMPLESDIR}
-.endif
+.include <bsd.port.options.mk>
-.include <bsd.port.pre.mk>
-
-.ifdef WITH_OCI8
+.if ${PORT_OPTIONS:MOCI8}
PORTVERSION= 1.19
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
ORACLE_HOME= ${LOCALBASE}/oracle8-client
@@ -58,4 +49,14 @@ post-patch:
@${PERL} -pi -e 's!\(void\*\)(SvOK)!$$1!g' ${WRKSRC}/oci7.c
.endif
-.include <bsd.port.post.mk>
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+ @${ECHO_MSG} "===> Installing examples for ${PKGNAME}"
+ @${MKDIR} ${EXAMPLESDIR}
+ @${INSTALL_DATA} ${WRKSRC}/Oracle.ex/Readme ${EXAMPLESDIR}
+ @${INSTALL_SCRIPT} ${WRKSRC}/Oracle.ex/*.pl ${EXAMPLESDIR}
+ @${INSTALL_SCRIPT} ${WRKSRC}/Oracle.ex/japh ${EXAMPLESDIR}
+ @${INSTALL_SCRIPT} ${WRKSRC}/Oracle.ex/sql ${EXAMPLESDIR}
+.endif
+
+.include <bsd.port.mk>
diff --git a/databases/p5-DBIx-Class-EncodedColumn/Makefile b/databases/p5-DBIx-Class-EncodedColumn/Makefile
index fbc653206a53..c3684bd589cb 100644
--- a/databases/p5-DBIx-Class-EncodedColumn/Makefile
+++ b/databases/p5-DBIx-Class-EncodedColumn/Makefile
@@ -36,21 +36,23 @@ MAN3= DBIx::Class::EncodedColumn.3 \
post-extract:
@${PERL} -i -ne 'print unless m,^build_requires, || m,^feature, .. m,;,' ${WRKSRC}/Makefile.PL
-OPTIONS= SHA "Digest::SHA Support" On \
- BLOWFISH "Blowfish Support?" On \
- OPENPGP "Crypt::OpenPGP (gpg) Support" On
+OPTIONS_DEFINE= SHA BLOWFISH OPENPGP
+OPTIONS_DEFAULT= SHA BLOWFISH OPENPGP
+SHA_DESC= Digest::SHA Support
+BLOWFISH_DESC= Blowfish Support
+OPENPGP_DESC= Crypt::OpenPGP (gpg) Support
.include <bsd.port.pre.mk>
-.if defined(WITH_SHA)
+.if ${PORT_OPTIONS:MSHA}
. if ${PERL_LEVEL} < 501000
RUN_DEPENDS+= p5-Digest-SHA>=0:${PORTSDIR}/security/p5-Digest-SHA
. endif
.endif
-.if defined(WITH_BLOWFISH)
+.if ${PORT_OPTIONS:MBLOWFISH}
RUN_DEPENDS+= p5-Crypt-Eksblowfish>=0:${PORTSDIR}/security/p5-Crypt-Eksblowfish
.endif
-.if defined(WITH_OPENPGP)
+.if ${PORT_OPTIONS:MOPENPGP}
RUN_DEPENDS+= p5-Crypt-OpenPGP>=0:${PORTSDIR}/security/p5-Crypt-OpenPGP \
p5-Crypt-CAST5_PP>=0:${PORTSDIR}/security/p5-Crypt-CAST5_PP
.endif
diff --git a/databases/p5-DBIx-Class-Schema-Loader/Makefile b/databases/p5-DBIx-Class-Schema-Loader/Makefile
index 4bf0171a0539..f14b028c6766 100644
--- a/databases/p5-DBIx-Class-Schema-Loader/Makefile
+++ b/databases/p5-DBIx-Class-Schema-Loader/Makefile
@@ -51,10 +51,8 @@ TEST_DEPENDS= p5-Config-General>=0:${PORTSDIR}/devel/p5-Config-General \
p5-Test-Warn>=0.21:${PORTSDIR}/devel/p5-Test-Warn \
p5-namespace-autoclean>=0.09:${PORTSDIR}/devel/p5-namespace-autoclean
-OPTIONS= MYSQL "MySQL Support" Off \
- ORACLE "Oracle Support (experimental)" Off \
- PGSQL "PostgreSQL Support" Off \
- SQLITE "SQLite Support" Off
+OPTIONS_DEFINE= MYSQL ORACLE PGSQL SQLITE
+ORACLE_DESC= Enable Oracle backend (experimental)
PERL_CONFIGURE= yes
@@ -101,20 +99,20 @@ MAN3= DBIx::Class::Schema::Loader.3 \
.include <bsd.port.options.mk>
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
USE_MYSQL= yes
.endif
-.if defined(WITH_ORACLE)
+.if ${PORT_OPTIONS:MORACLE}
BUILD_DEPENDS+= p5-DBD-Oracle>=0.19:${PORTSDIR}/databases/p5-DBD-Oracle
RUN_DEPENDS+= p5-DBD-Oracle>=0.19:${PORTSDIR}/databases/p5-DBD-Oracle
.endif
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
USE_PGSQL= yes
.endif
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
USE_SQLITE= yes
.endif
diff --git a/databases/p5-DBIx-Class/Makefile b/databases/p5-DBIx-Class/Makefile
index ed490b0809d7..29b8368f07fb 100644
--- a/databases/p5-DBIx-Class/Makefile
+++ b/databases/p5-DBIx-Class/Makefile
@@ -60,7 +60,8 @@ TEST_DEPENDS= p5-Class-DBI-Plugin-DeepAbstractSearch>=0:${PORTSDIR}/databases/p5
p5-Time-Piece-MySQL>=0:${PORTSDIR}/databases/p5-Time-Piece-MySQL \
p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
-OPTIONS= SQLT "SQL::Translator (generate DDL from schema)" off
+OPTIONS_DEFINE= SQLT
+SQLT_DESC= SQL::Translator (generate DDL from schema)
PERL_CONFIGURE= yes
CONFIGURE_ENV= DBICTEST_NO_SQLITE_CHECK=1
@@ -183,7 +184,7 @@ MAN3= DBIx::Class.3 \
.include <bsd.port.options.mk>
-.ifdef(WITH_SQLT)
+.if ${PORT_OPTIONS:MSQLT}
RUN_DEPENDS+= p5-SQL-Translator>=0.09.004:${PORTSDIR}/databases/p5-SQL-Translator
.endif
diff --git a/databases/p5-SQL-Translator/Makefile b/databases/p5-SQL-Translator/Makefile
index a052f802e0d8..66790972edec 100644
--- a/databases/p5-SQL-Translator/Makefile
+++ b/databases/p5-SQL-Translator/Makefile
@@ -36,7 +36,9 @@ BUILD_DEPENDS= p5-Class-Base>=0:${PORTSDIR}/devel/p5-Class-Base \
RUN_DEPENDS:= ${BUILD_DEPENDS}
TEST_DEPENDS= p5-Test-Differences>=0.61:${PORTSDIR}/devel/p5-Test-Differences \
p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
-OPTIONS= DIAGRAM "Diagram generation support" Off
+
+OPTIONS_DEFINE= DIAGRAM
+DIAGRAM_DESC= Diagram generation support
PERL_CONFIGURE= yes
@@ -116,12 +118,12 @@ post-patch:
regression-test: build
cd ${WRKSRC}/ && ${MAKE} test
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_DIAGRAM)
+.if ${PORT_OPTIONS:MDIAGRAM}
BUILD_DEPENDS+= p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
p5-Graph>=0:${PORTSDIR}/math/p5-Graph \
p5-GraphViz>=0:${PORTSDIR}/graphics/p5-GraphViz
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-CPANPLUS/Makefile b/devel/p5-CPANPLUS/Makefile
index dd9868f7e044..ab0fe8326ef9 100644
--- a/devel/p5-CPANPLUS/Makefile
+++ b/devel/p5-CPANPLUS/Makefile
@@ -23,8 +23,9 @@ PERL_CONFIGURE= yes
CONFIGURE_ARGS= AUTOINSTALL=1
INSTALL_TARGET= pure_install
-OPTIONS= TEST_REPORTER "Send reports to cpan-testers" off \
- YAML "Check reports from cpan-testers" off
+OPTIONS_DEFINE= TEST_REPORTER YAML
+
+TEST_REPORTER_DESC= Send reports to cpan-testers
MAN3= CPANPLUS.3 \
CPANPLUS::Backend.3 \
@@ -92,11 +93,11 @@ post-patch:
@${REINPLACE_CMD} -e 's/5.009/5.666/; /install_script/d' ${WRKSRC}/Makefile.PL
.endif
-.if defined(WITH_TEST_REPORTER)
+.if ${PORT_OPTIONS:MTEST_REPORTER}
RUN_DEPENDS+= ${SITE_PERL}/Test/Reporter.pm:${PORTSDIR}/devel/p5-Test-Reporter
.endif
-.if defined(WITH_YAML)
+.if ${PORT_OPTIONS:MYAML}
RUN_DEPENDS+= ${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML
.endif
diff --git a/devel/p5-Class-C3/Makefile b/devel/p5-Class-C3/Makefile
index aef6bc72d525..f4c5afb5a816 100644
--- a/devel/p5-Class-C3/Makefile
+++ b/devel/p5-Class-C3/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= A pragma to use the C3 method resolution order algorithm
-OPTIONS= XS "XS speed optimizations" off
+OPTIONS_DEFINE= XS
+XS_DESC= XS speed optimizations
PERL_CONFIGURE= yes
@@ -23,7 +24,7 @@ MAN3= Class::C3.3 \
.include <bsd.port.options.mk>
-.ifdef(WITH_XS)
+.if ${PORT_OPTIONS:MXS}
BUILD_DEPENDS+= p5-Class-C3-XS>=0.13:${PORTSDIR}/devel/p5-Class-C3-XS
RUN_DEPENDS+= p5-Class-C3-XS>=0.13:${PORTSDIR}/devel/p5-Class-C3-XS
.else
diff --git a/devel/p5-Data-Dumper-Concise/Makefile b/devel/p5-Data-Dumper-Concise/Makefile
index ca793f60a93d..6c4c1a2a3cf0 100644
--- a/devel/p5-Data-Dumper-Concise/Makefile
+++ b/devel/p5-Data-Dumper-Concise/Makefile
@@ -20,11 +20,13 @@ RUN_DEPENDS= p5-Data-Dumper>=0:${PORTSDIR}/devel/p5-Data-Dumper
TEST_DEPENDS = p5-Error>=0:${PORTSDIR}/lang/p5-Error
-OPTIONS= ARGNAMES "Enable DwarnN subroutine" On
+OPTIONS_DEFINE= ARGNAMES
+OPTIONS_DEFAULT= ARGNAMES
+ARGNAMES_DESC= Enable DwarnN subroutine
.include <bsd.port.options.mk>
-.if defined(WITH_ARGNAMES)
+.if ${PORT_OPTIONS:MARGNAMES}
BUILD_DEPENDS+= p5-Devel-ArgNames>=0.03:${PORTSDIR}/devel/p5-Devel-ArgNames
RUN_DEPENDS+= p5-Devel-ArgNames>=0.03:${PORTSDIR}/devel/p5-Devel-ArgNames
.endif
diff --git a/devel/p5-Data-Random/Makefile b/devel/p5-Data-Random/Makefile
index 664e8b17a2c4..3fe945f6a23f 100644
--- a/devel/p5-Data-Random/Makefile
+++ b/devel/p5-Data-Random/Makefile
@@ -16,8 +16,10 @@ COMMENT= Perl module for generating random data
BUILD_DEPENDS= p5-YAML-Tiny>=0:${PORTSDIR}/textproc/p5-YAML-Tiny
-OPTIONS= DATE_CALC "Support for rand_date()" on \
- GD "Support for rand_image()" off
+OPTIONS_DEFINE= DATE_CALC GD
+OPTIONS_DEFAULT= DATE_CALC
+DATE_CALC_DESC= Support for rand_date()
+GD_DESC= Support for rand_image()
PERL_CONFIGURE= yes
@@ -25,12 +27,12 @@ MAN3= Data::Random.3 Data::Random::WordList.3
.include <bsd.port.options.mk>
-.if !defined(WITHOUT_DATE_CALC)
+.if ${PORT_OPTIONS:MDATE_CALC}
BUILD_DEPENDS+= p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc
RUN_DEPENDS+= p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc
.endif
-.if defined(WITH_GD)
+.if ${PORT_OPTIONS:MGD}
BUILD_DEPENDS+= p5-GD>=0:${PORTSDIR}/graphics/p5-GD
RUN_DEPENDS+= p5-GD>=0:${PORTSDIR}/graphics/p5-GD
.endif
diff --git a/devel/p5-Log-Dispatch/Makefile b/devel/p5-Log-Dispatch/Makefile
index bb24b89775d4..77042fd30de1 100644
--- a/devel/p5-Log-Dispatch/Makefile
+++ b/devel/p5-Log-Dispatch/Makefile
@@ -38,47 +38,50 @@ MAN3= Log::Dispatch.3 \
Log::Dispatch::Screen.3 \
Log::Dispatch::Syslog.3
-OPTIONS= APACHELOG "Apache::Log support" off \
- EMAIL_MIMELITE "MIME::Lite support" off \
- EMAIL_MAILSEND "Mail::Send support" off \
- EMAIL_MAILSENDMAIL "Mail::Sendmail support" on \
- MAIL_SENDER "Mail::Sender support" off
+OPTIONS_DEFINE= APACHELOG EMAIL_MIMELITE EMAIL_MAILSEND EMAIL_MAILSENDMAIL MAIL_SENDER DOCS
+OPTIONS_DEFAULT= EMAIL_MAILSENDMAIL
-.if !defined(NOPORTDOCS)
-PORTDOCS= Changes README
-
-post-install:
- @${MKDIR} ${DOCSDIR}
- @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
- @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-.endif
+APACHELOG_DESC= Apache::Log support
+EMAIL_MIMELITE_DESC= MIME::Lite support
+EMAIL_MAILSEND_DESC= Mail::Send support
+EMAIL_MAILSENDMAIL_DESC= Mail::Sendmail support
+MAIL_SENDER_DESC= Mail::Sender support
.include <bsd.port.options.mk>
-.if defined(WITH_APACHELOG)
+.if ${PORT_OPTIONS:MAPACHELOG}
USE_APACHE= 20+
.endif
.include <bsd.port.pre.mk>
-.if defined(WITH_APACHELOG)
+.if ${PORT_OPTIONS:MAPACHELOG}
RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2
.endif
-.if defined(WITH_EMAIL_MIMELITE)
+.if ${PORT_OPTIONS:MEMAIL_MIMELITE}
RUN_DEPENDS+= ${SITE_PERL}/MIME/Lite.pm:${PORTSDIR}/mail/p5-MIME-Lite
.endif
-.if defined(WITH_EMAIL_MAILSEND)
+.if ${PORT_OPTIONS:MEMAIL_MAILSEND}
RUN_DEPENDS+= ${SITE_PERL}/Mail/Send.pm:${PORTSDIR}/mail/p5-Mail-Tools
.endif
-.if !defined(WITHOUT_EMAIL_MAILSENDMAIL)
+.if ${PORT_OPTIONS:MEMAIL_MAILSENDMAIL}
RUN_DEPENDS+= ${SITE_PERL}/Mail/Sendmail.pm:${PORTSDIR}/mail/p5-Mail-Sendmail
.endif
-.if defined(WITH_MAIL_SENDER)
+.if ${PORT_OPTIONS:MMAIL_SENDER}
RUN_DEPENDS+= ${SITE_PERL}/Mail/Sender.pm:${PORTSDIR}/mail/p5-Mail-Sender
.endif
+.if ${PORT_OPTIONS:MDOCS}
+PORTDOCS= Changes README
+
+post-install:
+ @${MKDIR} ${DOCSDIR}
+ @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+ @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
+.endif
+
.include <bsd.port.post.mk>
diff --git a/mail/p5-Net-IMAP-Simple/Makefile b/mail/p5-Net-IMAP-Simple/Makefile
index 75e5235651f9..754ae7191143 100644
--- a/mail/p5-Net-IMAP-Simple/Makefile
+++ b/mail/p5-Net-IMAP-Simple/Makefile
@@ -39,15 +39,18 @@ PERL_CONFIGURE= yes
MAN3= Net::IMAP::Simple.3 \
Net::IMAP::Simple::PipeSocket.3
-OPTIONS= SX "Simple protocol extensions (use Parse::RecDescent)" off
+OPTIONS_DEFINE= SX
+SX_DESC= Simple protocol extensions (use Parse::RecDescent)
.include <bsd.port.options.mk>
-CONFIGURE_ENV+= WITH_SX="${WITH_SX}"
+.if ${PORT_OPTIONS:MSX}
+CONFIGURE_ENV+= WITH_SX="true"
+.endif
.include <bsd.port.pre.mk>
-.ifdef(WITH_SX)
+.if ${PORT_OPTIONS:MSX}
PLIST_SUB+= WITH_SX=""
MAN3+= Net::IMAP::SimpleX.3
RUN_DEPENDS+= p5-Parse-RecDescent>=0:${PORTSDIR}/devel/p5-Parse-RecDescent
diff --git a/math/PDL/Makefile b/math/PDL/Makefile
index 603678666b0f..36111a23f6ba 100644
--- a/math/PDL/Makefile
+++ b/math/PDL/Makefile
@@ -32,65 +32,68 @@ PLIST_FILES= bin/pdl bin/pdldoc bin/perldl bin/pptemplate \
${SITE_PERL_REL}/${PERL_ARCH}/Inline/MakePdlppInstallable.pm
MAKE_JOBS_UNSAFE= yes
-OPTIONS= PGPLOT "Enable PDL::Graphics::PGPLOT" on \
- PLPLOT "Enable PDL::Graphics::PLplot" off \
- GL "Enable PDL::Graphics::TriD and OpenGL" on \
- GD "Enable PDL::IO::GD" off \
- FFTW "Enable PDL::FFTW" on \
- GSL "Enable PDL::GSL interface" off \
- HDF "Enable PDL::IO::HDF interface" off \
- PROJ "Enable PDL::GIS::Proj interface" off \
- F77 "Enable PDL::Minuit and PDL::Slatec" on \
- READLINE "Use GNU readline" off \
- SINK "Include PDL kitchen sink" off
+OPTIONS_DEFINE= PGPLOT PLPLOT OPENGL GD FFTW GSL HDF PROJ F77 READLINE SINK
+OPTIONS_DEFAULT= PGPLOT OPENGL FFTW F77
+
+PGPLOT_DESC= Enable PDL::Graphics::PGPLOT
+PLPLOT_DESC= Enable PDL::Graphics::PLplot
+OPENGL_DESC= Enable PDL::Graphics::TriD and OpenGL
+GD_DESC= Enable PDL::IO::GD
+FFTW_DESC= Enable PDL::FFTW
+GSL_DESC= Enable PDL::GSL interface
+HDF_DESC= Enable PDL::IO::HDF interface
+PROJ_DESC= Enable PDL::GIS::Proj interface
+F77_DESC= Enable PDL::Minuit and PDL::Slatec
+READLINE_DESC= Use GNU readline
+SINK_DESC= Include PDL kitchen sink
.include <bsd.port.options.mk>
-.if defined(WITH_PGPLOT)
+.if ${PORT_OPTIONS:MPGPLOT}
BUILD_DEPENDS+= p5-PGPLOT>=0:${PORTSDIR}/graphics/p5-PGPLOT
.endif
-.if defined(WITH_PLPLOT)
+.if ${PORT_OPTIONS:MPLPLOT}
LIB_DEPENDS+= plplotd.11:${PORTSDIR}/math/plplot
.endif
-.if defined(WITH_GL)
+.if ${PORT_OPTIONS:MOPENGL}
BUILD_DEPENDS+= p5-OpenGL>=0.60:${PORTSDIR}/graphics/p5-OpenGL
RUN_DEPENDS+= p5-OpenGL>=0.60:${PORTSDIR}/graphics/p5-OpenGL
USE_GL= yes
.endif
-.if defined(WITH_GD)
+.if ${PORT_OPTIONS:MGD}
LIB_DEPENDS+= gd:${PORTSDIR}/graphics/gd
.endif
-.if defined(WITH_F77)
+.if ${PORT_OPTIONS:MF77}
BUILD_DEPENDS+= p5-ExtUtils-F77>=0:${PORTSDIR}/lang/p5-ExtUtils-F77
.endif
-.if defined(WITH_FFTW)
+.if ${PORT_OPTIONS:MFFTW}
LIB_DEPENDS+= fftw.2:${PORTSDIR}/math/fftw
.endif
-.if defined(WITH_GSL)
+.if ${PORT_OPTIONS:MGSL}
LIB_DEPENDS+= gsl:${PORTSDIR}/math/gsl
.endif
-.if defined(WITH_HDF)
+.if ${PORT_OPTIONS:MHDF}
LIB_DEPENDS+= df:${PORTSDIR}/science/hdf
.endif
-.if defined(WITH_PROJ)
+.if ${PORT_OPTIONS:MPROJ}
LIB_DEPENDS+= proj:${PORTSDIR}/graphics/proj
.endif
-.if defined(WITH_READLINE)
+.if ${PORT_OPTIONS:MREADLINE}
RUN_DEPENDS+= p5-ReadLine-Gnu>=0:${PORTSDIR}/devel/p5-ReadLine-Gnu
.else
RUN_DEPENDS+= p5-ReadLine-Perl>=0:${PORTSDIR}/devel/p5-ReadLine-Perl
.endif
-.if defined(WITH_SINK)
+.if ${PORT_OPTIONS:MSINK}
RUN_DEPENDS+= ppmtogif:${PORTSDIR}/graphics/netpbm \
mpeg_encode:${PORTSDIR}/multimedia/mpeg_encode \
saoimage:${PORTSDIR}/astro/saoimage
diff --git a/misc/p5-Business-ISBN/Makefile b/misc/p5-Business-ISBN/Makefile
index e92a65c7890b..7bbc11a65868 100644
--- a/misc/p5-Business-ISBN/Makefile
+++ b/misc/p5-Business-ISBN/Makefile
@@ -25,17 +25,18 @@ PLIST_FILES= ${SITE_PERL_REL}/Business/ISBN.pm \
${SITE_PERL_REL}/Business/ISBN13.pm \
${SITE_PERL_REL}/${PERL_ARCH}/auto/Business/ISBN/.packlist
-OPTIONS= BARCODE "Barcode support" off \
- XISBN "xISBN support" off
+OPTIONS_DEFINE= BARCODE XISBN
+BARCODE_DESC= Barcode support
+XISBN_DESC= xISBN support
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_BARCODE)
+.if ${PORT_OPTIONS:MBARCODE}
RUN_DEPENDS+= p5-GD-Barcode>=0:${PORTSDIR}/graphics/p5-GD-Barcode
.endif
-.if defined(WITH_XISBN)
+.if ${PORT_OPTIONS:MXISBN}
RUN_DEPENDS+= p5-libwww>=0:${PORTSDIR}/www/p5-libwww
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile
index f242410fecc7..27119ff96fd1 100644
--- a/multimedia/dvdrip/Makefile
+++ b/multimedia/dvdrip/Makefile
@@ -32,8 +32,9 @@ BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gt
${SITE_PERL}/Event/RPC.pm:${PORTSDIR}/devel/p5-Event-RPC \
${SITE_PERL}/Locale/Messages.pm:${PORTSDIR}/devel/p5-Locale-libintl
-OPTIONS= SUBTITLE "Enable support for getting subtitles" on \
- VORBIS "OGG/Vorbis audio support" on
+OPTIONS_DEFINE= VORBIS SUBTITLE
+OPTIONS_DEFAULT= VORBIS SUBTITLE
+SUBTITLE_DESC= Enable support for getting subtitles
PERL_CONFIGURE= yes
CONFIGURE_ENV= SKIP_UNPACK_REQUIRED_MODULES=1
@@ -43,14 +44,14 @@ MAKE_JOBS_UNSAFE= yes
MAN1= dvdrip.1 dvdrip-progress.1 dvdrip-splitpipe.1
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if !defined(WITHOUT_VORBIS)
+.if ${PORT_OPTIONS:MVORBIS}
RUN_DEPENDS+= oggenc:${PORTSDIR}/audio/vorbis-tools \
ogmmerge:${PORTSDIR}/multimedia/ogmtools
.endif
-.if !defined(WITHOUT_SUBTITLE)
+.if ${PORT_OPTIONS:MSUBTITLE}
RUN_DEPENDS+= subtitle2pgm:${PORTSDIR}/multimedia/subtitleripper
.endif
@@ -73,4 +74,4 @@ post-install:
@cd ${WRKSRC}/blib/man3 && ${FIND} * -name "*.3" | ${SED} \
's,^,${MAN3PREFIX:S,^${PREFIX}/,,}/man/man3/,' >> ${TMPPLIST}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/p5-Net-SSH-Perl/Makefile b/net/p5-Net-SSH-Perl/Makefile
index c7b469dfa063..08d18a8cf8c5 100644
--- a/net/p5-Net-SSH-Perl/Makefile
+++ b/net/p5-Net-SSH-Perl/Makefile
@@ -71,11 +71,13 @@ MAN3= Net::SSH::Perl.3 \
CONFIGURE_ENV+= PERL_MM_USE_DEFAULT="1"
PERL_CONFIGURE= yes
-OPTIONS= GMP "Use the optimized Math::BigInt::GMP backend" on
+OPTIONS_DEFINE= GMP
+OPTIONS_DEFAULT= GMP
+GMP_DESC= Use the optimized Math::BigInt::GMP backend
.include <bsd.port.pre.mk>
-.if !defined(WITHOUT_GMP)
+.if ${PORT_OPTIONS:MGMP}
GMP_DEPEND= ${SITE_PERL}/${PERL_ARCH}/Math/BigInt/GMP.pm:${PORTSDIR}/math/p5-Math-BigInt-GMP
BUILD_DEPENDS+= ${GMP_DEPEND}
RUN_DEPENDS+= ${GMP_DEPEND}
diff --git a/net/p5-Net-Server/Makefile b/net/p5-Net-Server/Makefile
index 6a22f055bd4b..b0f1496a1c38 100644
--- a/net/p5-Net-Server/Makefile
+++ b/net/p5-Net-Server/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= p5-IO-Multiplex>=1.01:${PORTSDIR}/devel/p5-IO-Multiplex
PERL_CONFIGURE= yes
-OPTIONS= IPV6 "Enable ipv6 support patch from Debian" off
+OPTIONS_DEFINE= IPV6
MAN3= Net::Server.3 \
Net::Server::Daemonize.3\
@@ -41,14 +41,14 @@ MAN3= Net::Server.3 \
.include <bsd.port.options.mk>
-.if defined(WITH_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
BUILD_DEPENDS+= p5-Socket6>=0.23:${PORTSDIR}/net/p5-Socket6
RUN_DEPENDS+= p5-Socket6>=0.23:${PORTSDIR}/net/p5-Socket6
EXTRA_PATCHES= ${FILESDIR}/extra-patch-ipv6-support
.endif
post-patch:
-.if defined(WITH_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
@cd ${WRKSRC}/ && ${FIND} . -name '*.orig' -delete
.endif
diff --git a/security/p5-Authen-SASL/Makefile b/security/p5-Authen-SASL/Makefile
index aca831df2c73..d500435fed55 100644
--- a/security/p5-Authen-SASL/Makefile
+++ b/security/p5-Authen-SASL/Makefile
@@ -17,7 +17,8 @@ COMMENT= Perl5 module for SASL authentication
RUN_DEPENDS= p5-Digest-HMAC>0:${PORTSDIR}/security/p5-Digest-HMAC
BUILD_DEPENDS= ${RUN_DEPENDS}
-OPTIONS= KERBEROS "Enable Kerberos support" On
+OPTIONS_DEFINE= KERBEROS
+OPTIONS_DEFAULT= KERBEROS
PERL_CONFIGURE= yes
CONFIGURE_ENV+= AUTOMATED_TESTING=yes
@@ -32,10 +33,10 @@ MAN3= Authen::SASL.3 \
Authen::SASL::Perl::LOGIN.3 \
Authen::SASL::Perl::PLAIN.3
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if !defined(WITHOUT_KERBEROS)
+.if ${PORT_OPTIONS:MKERBEROS}
RUN_DEPENDS+= p5-GSSAPI>0:${PORTSDIR}/security/p5-GSSAPI
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/p5-Crypt-CBCeasy/Makefile b/security/p5-Crypt-CBCeasy/Makefile
index 598edc847ca2..107c28498edb 100644
--- a/security/p5-Crypt-CBCeasy/Makefile
+++ b/security/p5-Crypt-CBCeasy/Makefile
@@ -22,31 +22,34 @@ PERL_CONFIGURE= yes
MAN3= Crypt::CBCeasy.3
-.include <bsd.port.pre.mk>
-
-OPTIONS= DES "Build with Crypt::DES support" on
-.if !defined(WITHOUT_DES)
+OPTIONS_DEFINE= DES IDEA BLOWFISH BLOWFISH_PP TWOFISH2 RIJNDAEL
+OPTIONS_DEFAULT= DES IDEA BLOWFISH BLOWFISH_PP TWOFISH2 RIJNDAEL
+DES_DESC= Build with Crypt::DES support
+IDEA_DESC= Build with Crypt::IDEA support
+BLOWFISH_DESC= Build with Crypt::Blowfish support
+BLOWFISH_PP_DESC= Build with Crypt::Blowfish_PP support
+TWOFISH2_DESC= Build with Crypt::Twofish2 support
+RIJNDAEL_DESC= Build with Crypt::Rijndael support
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDES}
BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Crypt/DES.pm:${PORTSDIR}/security/p5-Crypt-DES
.endif
-OPTIONS+= IDEA "Build with Crypt::IDEA support" on
-.if !defined(WITHOUT_IDEA)
+.if ${PORT_OPTIONS:MIDEA}
BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Crypt/IDEA.pm:${PORTSDIR}/security/p5-Crypt-IDEA
.endif
-OPTIONS+= BLOWFISH "Build with Crypt::Blowfish support" on
-.if !defined(WITHOUT_BLOWFISH)
+.if ${PORT_OPTIONS:MBLOWFISH}
BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Crypt/Blowfish.pm:${PORTSDIR}/security/p5-Crypt-Blowfish
.endif
-OPTIONS+= BLOWFISH_PP "Build with Crypt::Blowfish_PP support" on
-.if !defined(WITHOUT_BLOWFISH_PP)
+.if ${PORT_OPTIONS:MBLOWFISH_PP}
BUILD_DEPENDS+= ${SITE_PERL}/Crypt/Blowfish_PP.pm:${PORTSDIR}/security/p5-Crypt-Blowfish_PP
.endif
-OPTIONS+= TWOFISH2 "Build with Crypt::Twofish2 support" on
-.if !defined(WITHOUT_TWOFISH2)
+.if ${PORT_OPTIONS:MTWOFISH2}
BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Crypt/Twofish2.pm:${PORTSDIR}/security/p5-Crypt-Twofish2
.endif
-OPTIONS+= RIJNDAEL "Build with Crypt::Rijndael support" on
-.if !defined(WITHOUT_RIJNDAEL)
+.if ${PORT_OPTIONS:MRIJNDAEL}
BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Crypt/Rijndael.pm:${PORTSDIR}/security/p5-Crypt-Rijndael
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/p5-GD-SecurityImage/Makefile b/security/p5-GD-SecurityImage/Makefile
index b81e9e1e80b3..4b32798b22cb 100644
--- a/security/p5-GD-SecurityImage/Makefile
+++ b/security/p5-GD-SecurityImage/Makefile
@@ -18,7 +18,8 @@ COMMENT= Perl5 module for creating CAPTCHA security images
BUILD_DEPENDS= p5-GD>=0:${PORTSDIR}/graphics/p5-GD
RUN_DEPENDS= p5-GD>=0:${PORTSDIR}/graphics/p5-GD
-OPTIONS= IMAGEMAGICK "Build ImageMagick module" off
+OPTIONS_DEFINE= IMAGEMAGICK
+IMAGEMAGICK_DESC= Build ImageMagick module
PORTSCOUT= skipv:1.581
@@ -31,7 +32,7 @@ MAN3= GD::SecurityImage.3 \
.include <bsd.port.options.mk>
-.if defined(WITH_IMAGEMAGICK)
+.if ${PORT_OPTIONS:MIMAGEMAGICK}
BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Image/Magick.pm:${PORTSDIR}/graphics/ImageMagick
RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Image/Magick.pm:${PORTSDIR}/graphics/ImageMagick
.endif
diff --git a/textproc/p5-XML-SAX/Makefile b/textproc/p5-XML-SAX/Makefile
index b676b948c4d0..4327db8de935 100644
--- a/textproc/p5-XML-SAX/Makefile
+++ b/textproc/p5-XML-SAX/Makefile
@@ -25,11 +25,13 @@ MAN3= XML::SAX.3 XML::SAX::DocumentLocator.3 XML::SAX::Intro.3 \
XML::SAX::ParserFactory.3 XML::SAX::PurePerl.3 \
XML::SAX::PurePerl::Reader.3
-OPTIONS= WRITE_INI_OK "Alter ParserDetails.ini with relevant information" on
+OPTIONS_DEFINE= WRITE_INI_OK
+
+WRITE_INI_OK_DESC= Alter ParserDetails.ini with relevant information
.include <bsd.port.options.mk>
-.if defined(WITH_WRITE_INI_OK)
+.if ${PORT_OPTIONS:MWRITE_INI_OK}
WRITE_INI_OK= 1
.else
WRITE_INI_OK= 0
diff --git a/textproc/p5-ack/Makefile b/textproc/p5-ack/Makefile
index ec30d15ac12f..1d5c334c2099 100644
--- a/textproc/p5-ack/Makefile
+++ b/textproc/p5-ack/Makefile
@@ -23,12 +23,13 @@ PERL_CONFIGURE= yes
MAN1= ack.1
-OPTIONS= BASH_COMPLETE "use bash completion" off
+OPTIONS_DEFINE= BASH_COMPLETE
+BASH_COMPLETE_DESC= install bash completion files
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
COMPLETION_DIR= ${PREFIX}/etc/bash_completion.d
-.if defined(WITH_BASH_COMPLETE)
+.if ${PORT_OPTIONS:MBASH_COMPLETE}
RUN_DEPENDS+= ${COMPLETION_DIR}:${PORTSDIR}/shells/bash-completion
PLIST_SUB+= BASH=""
post-install:
@@ -37,4 +38,4 @@ post-install:
PLIST_SUB+= BASH="@comment "
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-App-Nopaste/Makefile b/www/p5-App-Nopaste/Makefile
index ac9bd30fd8aa..0e053f3d927c 100644
--- a/www/p5-App-Nopaste/Makefile
+++ b/www/p5-App-Nopaste/Makefile
@@ -24,9 +24,11 @@ BUILD_DEPENDS+= p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize \
RUN_DEPENDS:= ${BUILD_DEPENDS}
-OPTIONS= CLIPBOARD "Support X11 Clipboard" On \
- PASTEBIN "Support pastebin.com" On \
- GITHUB "Support github" On
+OPTIONS_DEFINE= CLIPBOARD PASTEBIN GITHUB
+OPTIONS_DEFAULT= CLIPBOARD PASTEBIN GITHUB
+CLIPBOARD_DESC= Support X11 Clipboard
+PASTEBIN_DESC= Support pastebin.com
+GITHUB_DESC= Support github
PERL_CONFIGURE= yes
@@ -47,17 +49,17 @@ MAN3= App::Nopaste.3 \
App::Nopaste::Service::ssh.3 \
App::Nopaste::Service::Ubuntu.3
-.include <bsd.port.pre.mk>
-.if defined(WITH_PASTEBIN)
+.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MPASTEBIN}
BUILD_DEPENDS+= p5-WWW-Pastebin-PastebinCom-Create>=0:${PORTSDIR}/www/p5-WWW-Pastebin-PastebinCom-Create
RUN_DEPENDS+= p5-WWW-Pastebin-PastebinCom-Create>=0:${PORTSDIR}/www/p5-WWW-Pastebin-PastebinCom-Create
.endif
-.if defined(WITH_CLIPBOARD)
+.if ${PORT_OPTIONS:MCLIPBOARD}
BUILD_DEPENDS+= p5-Clipboard>=0:${PORTSDIR}/x11/p5-Clipboard
RUN_DEPENDS+= p5-Clipboard>=0:${PORTSDIR}/x11/p5-Clipboard
.endif
-.if defined(WITH_GITHUB)
+.if ${PORT_OPTIONS:MGITHUB}
BUILD_DEPENDS+= p5-Config-GitLike>=0:${PORTSDIR}/devel/p5-Config-GitLike
RUN_DEPENDS+= p5-Config-GitLike>=0:${PORTSDIR}/devel/p5-Config-GitLike
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-FCGI/Makefile b/www/p5-FCGI/Makefile
index 2a61d95eedc9..bdf822523b14 100644
--- a/www/p5-FCGI/Makefile
+++ b/www/p5-FCGI/Makefile
@@ -15,7 +15,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Modules for perl5, for enabling FastCGI support in CGI scripts
-OPTIONS= PURE_PERL "Build pure Perl version (experimental)" off
+OPTIONS_DEFINE= PURE_PERL
+PURE_PERL_DESC= Build pure Perl version (experimental)
# XXX: fcgi.0 is missing FCGX_Detach, see ports/149755
#LIB_DEPENDS= fcgi.0:${PORTSDIR}/www/fcgi
@@ -27,7 +28,7 @@ MAN3= FCGI.3
.include <bsd.port.options.mk>
-.if defined(WITH_PURE_PERL)
+.if ${PORT_OPTIONS:MPURE_PERL}
CONFIGURE_ARGS+=--pure-perl
PLIST_SUB= PURE_PERL="@comment "
.else
diff --git a/www/p5-Maypole/Makefile b/www/p5-Maypole/Makefile
index aebf755e6fc1..63a61c5f743a 100644
--- a/www/p5-Maypole/Makefile
+++ b/www/p5-Maypole/Makefile
@@ -44,12 +44,14 @@ PORTSCOUT= skipv:2.121
MAKE_JOBS_SAFE= yes
-OPTIONS= MODPERL2 "mod_perl2 support" on
+OPTIONS_DEFINE= MODPERL2 DOCS EXAMPLES
+OPTIONS_DEFAULT= MODPERL2
+MODPERL2_DESC= mod_perl2 support
PERL_CONFIGURE= yes
.include <bsd.port.options.mk>
-.if defined(WITH_MODPERL2)
+.if ${PORT_OPTIONS:MMODPERL2}
USE_APACHE_RUN= 20+
BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Apache2/Request.pm:${PORTSDIR}/www/p5-libapreq2
.endif
@@ -103,13 +105,13 @@ DOC_FILES= ../Manual.pod \
Workflow.pod
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@ ${MKDIR} ${DOCSDIR}/
.for FILE in ${DOC_FILES}
@ ${INSTALL_DATA} ${WRKSRC}/lib/Maypole/Manual/${FILE} ${DOCSDIR}/
.endfor
.endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
@ ${MKDIR} ${EXAMPLESDIR}/
@ ${CP} -R ${WRKSRC}/examples/ ${EXAMPLESDIR}/
.endif
diff --git a/www/p5-MojoMojo/Makefile b/www/p5-MojoMojo/Makefile
index 2e33e9a6392e..93d1b4dab519 100644
--- a/www/p5-MojoMojo/Makefile
+++ b/www/p5-MojoMojo/Makefile
@@ -189,63 +189,65 @@ MAN3= MojoMojo.3 \
Text::SmartyPants.3 \
Text::Wikispaces2Markdown.3
-OPTIONS= DEPLOY "Automatic database deployment" Off \
- FASTCGI "FastCGI support" Off \
- TOCGEN "Table of Contents generator" Off \
- RECAPTCHA "reCAPTCHA for anonymous edits" Off \
- SYNTAX_HIGHLIGHT "Syntax highlighter" Off \
- RSS_FORMATTER "RSS formatter" Off \
- DOCBOOK_FORMATTER "DocBook formatter" Off \
- POD_FORMATTER "POD formatter" Off \
- TRANSCLUSION "Transclusion support" Off \
- AMAZON "Amazon boxes" Off \
- EMOTICONS "Emoticons" Off
+OPTIONS_DEFINE= DEPLOY FASTCGI TOCGEN RECAPTCHA SYNTAX_HIGHLIGHT RSS_FORMATTER \
+ DOCBOOK_FORMATTER POD_FORMATTER TRANSCLUSION AMAZON EMOTICONS
+
+DEPLOY_DESC= Automatic database deployment
+TOCGEN_DESC= Table of Contents generator
+RECAPTCHA_DESC= reCAPTCHA for anonymous edits
+SYNTAX_HIGHLIGHT_DESC= Syntax highlighter
+RSS_FORMATTER_DESC= RSS formatter
+DOCBOOK_FORMATTER_DESC= DocBook formatter
+POD_FORMATTER_DESC= POD formatter
+TRANSCLUSION_DESC= Transclusion support
+AMAZON_DESC= Amazon boxes
+EMOTICONS_DESC= Emoticons
.include <bsd.port.options.mk>
-.if defined(WITH_DEPLOY)
+.if ${PORT_OPTIONS:MDEPLOY}
RUN_DEPENDS+= p5-SQL-Translator>=0.09006:${PORTSDIR}/databases/p5-SQL-Translator
.endif
-.if defined(WITH_FASTCGI)
+.if ${PORT_OPTIONS:MFASTCGI}
RUN_DEPENDS+= p5-FCGI-ProcManager>=0:${PORTSDIR}/www/p5-FCGI-ProcManager
.endif
-.if defined(WITH_TOCGEN)
+.if ${PORT_OPTIONS:MTOCGEN}
RUN_DEPENDS+= p5-HTML-Toc>=1.10:${PORTSDIR}/www/p5-HTML-Toc
.endif
-.if defined(WITH_RECAPTCHA)
+.if ${PORT_OPTIONS:MRECAPTCHA}
RUN_DEPENDS+= p5-HTML-FormFu>=0:${PORTSDIR}/www/p5-HTML-FormFu
.endif
-.if defined(WITH_SYNTAX_HIGHLIGHT)
+.if ${PORT_OPTIONS:MSYNTAX_HIGHLIGHT}
RUN_DEPENDS+= p5-Syntax-Highlight-Engine-Kate>=0:${PORTSDIR}/textproc/p5-Syntax-Highlight-Engine-Kate
.endif
-.if defined(WITH_RSS_FORMATTER)
+.if ${PORT_OPTIONS:MRSS_FORMATTER}
RUN_DEPENDS+= p5-XML-Feed>=0:${PORTSDIR}/textproc/p5-XML-Feed
.endif
-.if defined(WITH_DOCBOOK_FORMATTER)
+.if ${PORT_OPTIONS:MDOCBOOK_FORMATTER}
RUN_DEPENDS+= p5-XML-LibXML>=1.66:${PORTSDIR}/textproc/p5-XML-LibXML \
p5-XML-LibXSLT>=1.66:${PORTSDIR}/textproc/p5-XML-LibXSLT
.endif
-.if defined(WITH_POD_FORMATTER)
+.if ${PORT_OPTIONS:MPOD_FORMATTER}
RUN_DEPENDS+= p5-Pod-Simple>=3.01:${PORTSDIR}/textproc/p5-Pod-Simple
.endif
-.if defined(WITH_TRANSCLUSION)
+.if ${PORT_OPTIONS:MTRANSCLUSION}
RUN_DEPENDS+= p5-URI-Fetch>=0:${PORTSDIR}/www/p5-URI-Fetch \
p5-libwww>=0:${PORTSDIR}/www/p5-libwww
.endif
-.if defined(WITH_AMAZON)
+.if ${PORT_OPTIONS:MAMAZON}
RUN_DEPENDS+= p5-Net-Amazon>=0:${PORTSDIR}/net/p5-Net-Amazon
.endif
-.if defined(WITH_EMOTICONS)
+.if ${PORT_OPTIONS:MEMOTICONS}
RUN_DEPENDS+= p5-Text-Emoticon-MSN>=0:${PORTSDIR}/textproc/p5-Text-Emoticon-MSN
.endif
diff --git a/www/p5-Template-Toolkit/Makefile b/www/p5-Template-Toolkit/Makefile
index 98954ec61f2e..fd40ad0173a8 100644
--- a/www/p5-Template-Toolkit/Makefile
+++ b/www/p5-Template-Toolkit/Makefile
@@ -21,10 +21,11 @@ RUN_DEPENDS= p5-AppConfig>=1.56:${PORTSDIR}/devel/p5-AppConfig
TEST_DEPENDS= p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \
p5-Pod-POM>=0:${PORTSDIR}/textproc/p5-Pod-POM
-OPTIONS= DATE_CALC "With Date::Calc Plugin" off \
- IMAGE_INFO "With Image::Info Plugin" off \
- IMAGE_SIZE "With Image::Size Plugin" off \
- POD_POM "With Pod::POM Plugin" off
+OPTIONS_DEFINE= DATE_CALC IMAGE_INFO IMAGE_SIZE POD_POM
+DATE_CALC_DESC= With Date::Calc Plugin
+IMAGE_INFO_DESC= With Image::Info Plugin
+IMAGE_SIZE_DESC= With Image::Size Plugin
+POD_POM_DESC= With Pod::POM Plugin
PERL_CONFIGURE= yes
CONFIGURE_ARGS= TT_ACCEPT=y
@@ -33,22 +34,22 @@ CONFIGURE_ARGS= TT_ACCEPT=y
.include <bsd.port.options.mk>
-.if defined(WITH_DATE_CALC)
+.if ${PORT_OPTIONS:MDATE_CALC}
BUILD_DEPENDS+= p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc
RUN_DEPENDS+= p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc
.endif
-.if defined(WITH_IMAGE_INFO)
+.if ${PORT_OPTIONS:MIMAGE_INFO}
BUILD_DEPENDS+= p5-Image-Info>=0:${PORTSDIR}/graphics/p5-Image-Info
RUN_DEPENDS+= p5-Image-Info>=0:${PORTSDIR}/graphics/p5-Image-Info
.endif
-.if defined(WITH_IMAGE_SIZE)
+.if ${PORT_OPTIONS:MIMAGE_SIZE}
BUILD_DEPENDS+= p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size
RUN_DEPENDS+= p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size
.endif
-.if defined(WITH_POD_POM)
+.if ${PORT_OPTIONS:MPOD_POM}
BUILD_DEPENDS+= p5-Pod-POM>=0:${PORTSDIR}/textproc/p5-Pod-POM
RUN_DEPENDS+= p5-Pod-POM>=0:${PORTSDIR}/textproc/p5-Pod-POM
.endif
diff --git a/www/p5-URI-Fetch/Makefile b/www/p5-URI-Fetch/Makefile
index 583d9bf873ae..cacf84acee63 100644
--- a/www/p5-URI-Fetch/Makefile
+++ b/www/p5-URI-Fetch/Makefile
@@ -20,8 +20,11 @@ RUN_DEPENDS= p5-Class-ErrorHandler>=0:${PORTSDIR}/devel/p5-Class-ErrorHandler \
p5-libwww>=0:${PORTSDIR}/www/p5-libwww
BUILD_DEPENDS= ${RUN_DEPENDS}
-OPTIONS= ZLIB "GZIP Support" on \
- CACHE "Caching Support" off
+OPTIONS_DEFINE= ZLIB CACHE
+OPTIONS_DEFAULT= ZLIB
+
+ZLIB_DESC= GZIP Support
+CACHE_DESC= Caching Support
PERL_CONFIGURE= yes
@@ -30,13 +33,13 @@ MAN3= URI::Fetch.3 \
.include <bsd.port.pre.mk>
-.if !defined(WITHOUT_ZLIB)
+.if ${PORT_OPTIONS:MZLIB}
. if ${PERL_LEVEL} < 500903
RUN_DEPENDS+= p5-IO-Compress>=2.017:${PORTSDIR}/archivers/p5-IO-Compress
. endif
.endif
-.if defined(WITH_CACHE)
+.if ${PORT_OPTIONS:MCACHE}
RUN_DEPENDS+= p5-Cache>=0:${PORTSDIR}/devel/p5-Cache
.endif
diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile
index e2cde1e32ec0..64ca82e65087 100644
--- a/x11-toolkits/p5-Tk/Makefile
+++ b/x11-toolkits/p5-Tk/Makefile
@@ -17,7 +17,8 @@ COMMENT= A re-port of a perl5 interface to Tk8.4
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
png.6:${PORTSDIR}/graphics/png
-OPTIONS= XFT "Client-side fonts via libXft (experimental)" off
+OPTIONS_DEFINE= XFT
+XFT_DESC= Client-side fonts via libXft (experimental)
CONFIGURE_ARGS= X11INC=${LOCALBASE}/include X11LIB=${LOCALBASE}/lib
MAKE_JOBS_UNSAFE= yes
@@ -146,7 +147,7 @@ MAN3= Tie::Watch.3 \
.include <bsd.port.options.mk>
-.if defined(WITH_XFT)
+.if ${PORT_OPTIONS:MXFT}
CONFIGURE_ARGS= XFT=1
USE_XORG+= xft
.endif