aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/codec2/Makefile1
-rw-r--r--emulators/i386-wine-staging/Makefile2
-rw-r--r--emulators/open-vm-tools-nox11/Makefile2
-rw-r--r--emulators/wine-staging/Makefile2
-rw-r--r--graphics/djview4-qt4/Makefile2
-rw-r--r--java/langspec/Makefile2
-rw-r--r--mail/mutt/Makefile2
-rw-r--r--mail/qpopper/Makefile8
-rw-r--r--mail/qpopper/pkg-plist2
-rw-r--r--mail/sympa/Makefile2
-rw-r--r--misc/freebsd-doc-en/Makefile2
-rw-r--r--net-mgmt/nrpe-ssl/Makefile2
-rw-r--r--net/nss-pam-ldapd-sasl/Makefile2
-rw-r--r--security/clamav-milter/Makefile2
-rw-r--r--www/apache22-event-mpm/Makefile1
-rw-r--r--www/apache22-worker-mpm/Makefile1
-rw-r--r--x11-toolkits/py-kivy/Makefile2
17 files changed, 14 insertions, 23 deletions
diff --git a/audio/codec2/Makefile b/audio/codec2/Makefile
index 0335953b9150..1f50669e26af 100644
--- a/audio/codec2/Makefile
+++ b/audio/codec2/Makefile
@@ -21,7 +21,6 @@ USE_LDCONFIG= yes
OPTIONS_DEFINE= EXAMPLES TEST
OPTIONS_SUB= yes
-OPTIONS_UNSET= EXAMPLES TEST
EXAMPLES_CMAKE_ON= -DINSTALL_EXAMPLES=ON
TEST_CMAKE_ON= -DUNITTEST=ON
diff --git a/emulators/i386-wine-staging/Makefile b/emulators/i386-wine-staging/Makefile
index e7f644bad41b..3e266feca58a 100644
--- a/emulators/i386-wine-staging/Makefile
+++ b/emulators/i386-wine-staging/Makefile
@@ -8,7 +8,7 @@ SLAVE_PORT= i386-wine-devel
CONFLICTS_INSTALL= i386-wine-[0-9]* wine-[0-9]* wine-staging-[0-9]* i386-wine-devel-[0-9]* wine-devel-[0-9]*
OPTIONS_SLAVE= STAGING
-OPTIONS_SET= LIBXSLT MPG123 HAL V4L X11
+OPTIONS_DEFAULT= LIBXSLT MPG123 HAL V4L X11
SLAVEDIR= ${.CURDIR}/../i386-wine-devel
PLIST= ${MASTERDIR}/pkg-plist
diff --git a/emulators/open-vm-tools-nox11/Makefile b/emulators/open-vm-tools-nox11/Makefile
index 213410761d9d..130e37b268b4 100644
--- a/emulators/open-vm-tools-nox11/Makefile
+++ b/emulators/open-vm-tools-nox11/Makefile
@@ -3,7 +3,7 @@
MASTERDIR= ${.CURDIR}/../open-vm-tools
PKGNAMESUFFIX= -nox11
-OPTIONS_UNSET= X11 LIBNOTIFY
+OPTIONS_EXCLUDE= X11 LIBNOTIFY
BROKEN_powerpc64= Does not build
diff --git a/emulators/wine-staging/Makefile b/emulators/wine-staging/Makefile
index a3847176ff59..2228a41be369 100644
--- a/emulators/wine-staging/Makefile
+++ b/emulators/wine-staging/Makefile
@@ -9,7 +9,7 @@ CONFLICTS_INSTALL= wine-[0-9]* wine-devel-[0-9]* i386-wine-[0-9]* \
i386-wine-staging-[0-9]* i386-wine-devel-[0-9]*
OPTIONS_SLAVE= STAGING
-OPTIONS_SET= LIBXSLT MPG123 HAL V4L X11
+OPTIONS_DEFAULT= LIBXSLT MPG123 HAL V4L X11
MASTERDIR= ${.CURDIR}/../wine-devel
PLIST= ${MASTERDIR}/pkg-plist
diff --git a/graphics/djview4-qt4/Makefile b/graphics/djview4-qt4/Makefile
index f14045524602..538d8d475c34 100644
--- a/graphics/djview4-qt4/Makefile
+++ b/graphics/djview4-qt4/Makefile
@@ -5,7 +5,7 @@ PKGNAMESUFFIX= -qt4
CONFLICTS= ${PORTNAME}-[0-9]*
-OPTIONS_SET= QT4
+OPTIONS_SLAVE= QT4
OPTIONS_EXCLUDE= QT5
MASTERDIR= ${.CURDIR}/../djview4
diff --git a/java/langspec/Makefile b/java/langspec/Makefile
index 368298c61390..e29f2dfc4f34 100644
--- a/java/langspec/Makefile
+++ b/java/langspec/Makefile
@@ -14,7 +14,7 @@ NO_BUILD= yes
NO_WRKSUBDIR= yes
PORTDOCS= *
-OPTIONS_SET_FORCE= DOCS
+OPTIONS_DEFINE= DOCS
do-install:
@${ECHO} -n ">> Installing documentation in ${DOCSDIR}..."
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index c2e8d453f6c0..44a35e13eff7 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -54,7 +54,7 @@ AUTOMAKE_ARGS= --add-missing --foreign
OPTIONS_SUB= yes
.if defined (MUTT_LITE)
-OPTIONS_UNSET= NLS DOCS EXAMPLES
+OPTIONS_EXCLUDE= NLS DOCS EXAMPLES
.else
OPTIONS_DEFINE= COMPRESSED_FOLDERS SASL DEBUG DOCS EXAMPLES FLOCK \
FORCEBASE64 GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 45ae723f29f6..ca71e4c0ec15 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -76,12 +76,6 @@ OS_DEFS+= -DAPOP_ONLY
.endif
.endif
-# Do not install documentation since it is in pdf format and normally
-# not used unless user wants it.
-.if empty(PORT_OPTIONS:MDOCUMENTATION)
-OPTIONS_UNSET+= DOCS
-.endif
-
# If WITH_DRAC variable present in the environment, qpopper builds
# with Dynamic Relay Authorization Control support.
.if ${PORT_OPTIONS:MDRAC}
@@ -161,7 +155,7 @@ do-install:
.if ${PORT_OPTIONS:MPOPPASSD}
@${INSTALL_PROGRAM} ${WRKSRC}/password/poppassd ${STAGEDIR}${PREFIX}/libexec/qpoppassd
.endif
-.if ${PORT_OPTIONS:MDOCS}
+.if ${PORT_OPTIONS:MDOCUMENTATION}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/GUIDE.pdf ${STAGEDIR}${DOCSDIR}
.endif
diff --git a/mail/qpopper/pkg-plist b/mail/qpopper/pkg-plist
index 6338974096cd..71bd803b90c5 100644
--- a/mail/qpopper/pkg-plist
+++ b/mail/qpopper/pkg-plist
@@ -5,5 +5,5 @@ libexec/qpopper
man/man8/qpopper.8.gz
%%QPOPAUTH%%man/man8/qpopauth.8.gz
%%EPOPPASSD%%libexec/qpoppassd
-%%PORTDOCS%%%%DOCSDIR%%/GUIDE.pdf
+%%DOCUMENTATION%%%%DOCSDIR%%/GUIDE.pdf
@dir(%%USERS%%,%%GROUPS%%,) %%ETCDIR%%
diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index 1207e316edb4..42b56ac3c484 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -101,7 +101,7 @@ SYBASE_DESC= Sybase database
DB_TYPE:= ${DB_TYPE:tu}
. for option in ${OPTIONS_RADIO_DATABASE}
. if ${DB_TYPE} == ${option:S,PGSQL,PG,}
-OPTIONS_SET+= ${option}
+OPTIONS_DEFAULT+= ${option}
.warning You need to replace your DB_TYPE variable in make.conf with mail_sympa_SET+=${option}
. endif
. endfor
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index e4d41180032a..8d42e00e6189 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -49,7 +49,7 @@ TXT_DESC= Plain text
# if PACKAGE_BUILDING=yes, enable all of $AVAILABLEFORMATS.
.if defined(PACKAGE_BUILDING)
-OPTIONS_SET+= ${AVAILABLEFORMATS}
+OPTIONS_DEFAULT+= ${AVAILABLEFORMATS}
.endif
.include <bsd.port.options.mk>
diff --git a/net-mgmt/nrpe-ssl/Makefile b/net-mgmt/nrpe-ssl/Makefile
index 11b538196b80..bdc7ffd120e2 100644
--- a/net-mgmt/nrpe-ssl/Makefile
+++ b/net-mgmt/nrpe-ssl/Makefile
@@ -7,7 +7,7 @@ COMMENT= Nagios Remote Plugin Executor (SSL version)
CONFLICTS= nrpe-2.*
-OPTIONS_SET= SSL
+OPTIONS_SLAVE= SSL
MASTERDIR= ${.CURDIR}/../nrpe
diff --git a/net/nss-pam-ldapd-sasl/Makefile b/net/nss-pam-ldapd-sasl/Makefile
index 126b0bd6b50b..844854e0ed63 100644
--- a/net/nss-pam-ldapd-sasl/Makefile
+++ b/net/nss-pam-ldapd-sasl/Makefile
@@ -9,7 +9,7 @@ COMMENT= Advanced fork of nss_ldap with sasl support
LICENSE= # pet portlint
-OPTIONS_SET+= SASL
+OPTIONS_SLAVE+= SASL
SLAVE_PORT= sasl # In case we come up with more
MASTERDIR= ${.CURDIR}/../nss-pam-ldapd
diff --git a/security/clamav-milter/Makefile b/security/clamav-milter/Makefile
index cdac4f297e65..7420cec0d48a 100644
--- a/security/clamav-milter/Makefile
+++ b/security/clamav-milter/Makefile
@@ -3,7 +3,7 @@
PKGNAMESUFFIX= -milter
-OPTIONS_SET+= MILTER
+OPTIONS_SLAVE+= MILTER
MASTERDIR= ${.CURDIR}/../clamav
PKGNAMESUFFIX= -milter
diff --git a/www/apache22-event-mpm/Makefile b/www/apache22-event-mpm/Makefile
index 0ccb8df31aec..f2d5f7d299e5 100644
--- a/www/apache22-event-mpm/Makefile
+++ b/www/apache22-event-mpm/Makefile
@@ -10,6 +10,5 @@ DESCR= ${.CURDIR}/pkg-descr
PORT_OPTIONS+= CGID
OPTIONS_EXCLUDE= CGI
-OPTIONS_UNSET+= CGI
.include "${MASTERDIR}/Makefile"
diff --git a/www/apache22-worker-mpm/Makefile b/www/apache22-worker-mpm/Makefile
index 05f5c773af72..a18d743319c1 100644
--- a/www/apache22-worker-mpm/Makefile
+++ b/www/apache22-worker-mpm/Makefile
@@ -10,6 +10,5 @@ DESCR= ${.CURDIR}/pkg-descr
PORT_OPTIONS+= CGID
OPTIONS_EXCLUDE= CGI
-OPTIONS_UNSET+= CGI
.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/py-kivy/Makefile b/x11-toolkits/py-kivy/Makefile
index ed16e7eb38a9..502f0e814109 100644
--- a/x11-toolkits/py-kivy/Makefile
+++ b/x11-toolkits/py-kivy/Makefile
@@ -31,7 +31,7 @@ PYDISTUTILS_BUILDARGS= --inplace
PYDISTUTILS_EGGINFO= Kivy-${PORTVERSION}-py${PYTHON_VER}.egg-info
OPTIONS_DEFINE= DOCS
-OPTIONS_SET= ENCHANT OPENCV PYGAME
+OPTIONS_DEFAULT= ENCHANT OPENCV PYGAME
OPTIONS_SUB= yes
OPTIONS_GROUP= VIDEO AUDIO IMAGE CAMERA SPELLING CLIPBOARD
OPTIONS_MULTI= WINDOW TEXT
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 11:24:43 +0000