Date: Mon, 24 Oct 2016 10:18:50 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424560 - in head: audio/codec2 emulators/i386-wine-staging emulators/open-vm-tools-nox11 emulators/wine-staging graphics/djview4-qt4 java/langspec mail/mutt mail/qpopper mail/sympa mis... Message-ID: <201610241018.u9OAIoLO063839@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon Oct 24 10:18:50 2016 New Revision: 424560 URL: https://svnweb.freebsd.org/changeset/ports/424560 Log: OPTIONS_SET/OPTIONS_UNSET are global variables, they cannot be used in ports Makefiles. So, replace them with OPTIONS_SLAVE, OPTIONS_EXCLUDE, OPTIONS_DEFAULT, where appropriate. The ghostscript ports are doing something nasty that is certainly wrong, but I don't want to try to understand it. Sponsored by: Absolight Modified: head/audio/codec2/Makefile (contents, props changed) head/emulators/i386-wine-staging/Makefile (contents, props changed) head/emulators/open-vm-tools-nox11/Makefile (contents, props changed) head/emulators/wine-staging/Makefile (contents, props changed) head/graphics/djview4-qt4/Makefile (contents, props changed) head/java/langspec/Makefile (contents, props changed) head/mail/mutt/Makefile (contents, props changed) head/mail/qpopper/Makefile (contents, props changed) head/mail/qpopper/pkg-plist (contents, props changed) head/mail/sympa/Makefile (contents, props changed) head/misc/freebsd-doc-en/Makefile (contents, props changed) head/net-mgmt/nrpe-ssl/Makefile (contents, props changed) head/net/nss-pam-ldapd-sasl/Makefile (contents, props changed) head/security/clamav-milter/Makefile (contents, props changed) head/www/apache22-event-mpm/Makefile (contents, props changed) head/www/apache22-worker-mpm/Makefile (contents, props changed) head/x11-toolkits/py-kivy/Makefile (contents, props changed) Modified: head/audio/codec2/Makefile ============================================================================== --- head/audio/codec2/Makefile Mon Oct 24 10:14:35 2016 (r424559) +++ head/audio/codec2/Makefile Mon Oct 24 10:18:50 2016 (r424560) @@ -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 Modified: head/emulators/i386-wine-staging/Makefile ============================================================================== --- head/emulators/i386-wine-staging/Makefile Mon Oct 24 10:14:35 2016 (r424559) +++ head/emulators/i386-wine-staging/Makefile Mon Oct 24 10:18:50 2016 (r424560) @@ -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 Modified: head/emulators/open-vm-tools-nox11/Makefile ============================================================================== --- head/emulators/open-vm-tools-nox11/Makefile Mon Oct 24 10:14:35 2016 (r424559) +++ head/emulators/open-vm-tools-nox11/Makefile Mon Oct 24 10:18:50 2016 (r424560) @@ -3,7 +3,7 @@ MASTERDIR= ${.CURDIR}/../open-vm-tools PKGNAMESUFFIX= -nox11 -OPTIONS_UNSET= X11 LIBNOTIFY +OPTIONS_EXCLUDE= X11 LIBNOTIFY BROKEN_powerpc64= Does not build Modified: head/emulators/wine-staging/Makefile ============================================================================== --- head/emulators/wine-staging/Makefile Mon Oct 24 10:14:35 2016 (r424559) +++ head/emulators/wine-staging/Makefile Mon Oct 24 10:18:50 2016 (r424560) @@ -9,7 +9,7 @@ CONFLICTS_INSTALL= wine-[0-9]* wine-deve 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 Modified: head/graphics/djview4-qt4/Makefile ============================================================================== --- head/graphics/djview4-qt4/Makefile Mon Oct 24 10:14:35 2016 (r424559) +++ head/graphics/djview4-qt4/Makefile Mon Oct 24 10:18:50 2016 (r424560) @@ -5,7 +5,7 @@ PKGNAMESUFFIX= -qt4 CONFLICTS= ${PORTNAME}-[0-9]* -OPTIONS_SET= QT4 +OPTIONS_SLAVE= QT4 OPTIONS_EXCLUDE= QT5 MASTERDIR= ${.CURDIR}/../djview4 Modified: head/java/langspec/Makefile ============================================================================== --- head/java/langspec/Makefile Mon Oct 24 10:14:35 2016 (r424559) +++ head/java/langspec/Makefile Mon Oct 24 10:18:50 2016 (r424560) @@ -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}..." Modified: head/mail/mutt/Makefile ============================================================================== --- head/mail/mutt/Makefile Mon Oct 24 10:14:35 2016 (r424559) +++ head/mail/mutt/Makefile Mon Oct 24 10:18:50 2016 (r424560) @@ -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 \ Modified: head/mail/qpopper/Makefile ============================================================================== --- head/mail/qpopper/Makefile Mon Oct 24 10:14:35 2016 (r424559) +++ head/mail/qpopper/Makefile Mon Oct 24 10:18:50 2016 (r424560) @@ -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 Modified: head/mail/qpopper/pkg-plist ============================================================================== --- head/mail/qpopper/pkg-plist Mon Oct 24 10:14:35 2016 (r424559) +++ head/mail/qpopper/pkg-plist Mon Oct 24 10:18:50 2016 (r424560) @@ -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%% Modified: head/mail/sympa/Makefile ============================================================================== --- head/mail/sympa/Makefile Mon Oct 24 10:14:35 2016 (r424559) +++ head/mail/sympa/Makefile Mon Oct 24 10:18:50 2016 (r424560) @@ -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 Modified: head/misc/freebsd-doc-en/Makefile ============================================================================== --- head/misc/freebsd-doc-en/Makefile Mon Oct 24 10:14:35 2016 (r424559) +++ head/misc/freebsd-doc-en/Makefile Mon Oct 24 10:18:50 2016 (r424560) @@ -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> Modified: head/net-mgmt/nrpe-ssl/Makefile ============================================================================== --- head/net-mgmt/nrpe-ssl/Makefile Mon Oct 24 10:14:35 2016 (r424559) +++ head/net-mgmt/nrpe-ssl/Makefile Mon Oct 24 10:18:50 2016 (r424560) @@ -7,7 +7,7 @@ COMMENT= Nagios Remote Plugin Executor ( CONFLICTS= nrpe-2.* -OPTIONS_SET= SSL +OPTIONS_SLAVE= SSL MASTERDIR= ${.CURDIR}/../nrpe Modified: head/net/nss-pam-ldapd-sasl/Makefile ============================================================================== --- head/net/nss-pam-ldapd-sasl/Makefile Mon Oct 24 10:14:35 2016 (r424559) +++ head/net/nss-pam-ldapd-sasl/Makefile Mon Oct 24 10:18:50 2016 (r424560) @@ -9,7 +9,7 @@ COMMENT= Advanced fork of nss_ldap with LICENSE= # pet portlint -OPTIONS_SET+= SASL +OPTIONS_SLAVE+= SASL SLAVE_PORT= sasl # In case we come up with more MASTERDIR= ${.CURDIR}/../nss-pam-ldapd Modified: head/security/clamav-milter/Makefile ============================================================================== --- head/security/clamav-milter/Makefile Mon Oct 24 10:14:35 2016 (r424559) +++ head/security/clamav-milter/Makefile Mon Oct 24 10:18:50 2016 (r424560) @@ -3,7 +3,7 @@ PKGNAMESUFFIX= -milter -OPTIONS_SET+= MILTER +OPTIONS_SLAVE+= MILTER MASTERDIR= ${.CURDIR}/../clamav PKGNAMESUFFIX= -milter Modified: head/www/apache22-event-mpm/Makefile ============================================================================== --- head/www/apache22-event-mpm/Makefile Mon Oct 24 10:14:35 2016 (r424559) +++ head/www/apache22-event-mpm/Makefile Mon Oct 24 10:18:50 2016 (r424560) @@ -10,6 +10,5 @@ DESCR= ${.CURDIR}/pkg-descr PORT_OPTIONS+= CGID OPTIONS_EXCLUDE= CGI -OPTIONS_UNSET+= CGI .include "${MASTERDIR}/Makefile" Modified: head/www/apache22-worker-mpm/Makefile ============================================================================== --- head/www/apache22-worker-mpm/Makefile Mon Oct 24 10:14:35 2016 (r424559) +++ head/www/apache22-worker-mpm/Makefile Mon Oct 24 10:18:50 2016 (r424560) @@ -10,6 +10,5 @@ DESCR= ${.CURDIR}/pkg-descr PORT_OPTIONS+= CGID OPTIONS_EXCLUDE= CGI -OPTIONS_UNSET+= CGI .include "${MASTERDIR}/Makefile" Modified: head/x11-toolkits/py-kivy/Makefile ============================================================================== --- head/x11-toolkits/py-kivy/Makefile Mon Oct 24 10:14:35 2016 (r424559) +++ head/x11-toolkits/py-kivy/Makefile Mon Oct 24 10:18:50 2016 (r424560) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610241018.u9OAIoLO063839>