svn commit: r426080 - in head: databases/pgpool-II databases/pgpool-II-33 deskutils/egroupware irc/ircd-ratbox lang/php56 lang/php56-extensions lang/php70 lang/php70-extensions mail/assp mail/imap-...
Alexey Dokuchaev
danfe at FreeBSD.org
Mon Nov 14 03:15:07 UTC 2016
Author: danfe
Date: Mon Nov 14 03:15:03 2016
New Revision: 426080
URL: https://svnweb.freebsd.org/changeset/ports/426080
Log:
- Remove redundant definitions of IPV6_DESC and [OPEN]SSL_DESC when closely
matching standard ones from `Mk/bsd.options.desc.mk'
- Rename couple of options to standard name or the one that better reflects
their usage
Modified:
head/databases/pgpool-II-33/Makefile
head/databases/pgpool-II/Makefile
head/deskutils/egroupware/Makefile
head/irc/ircd-ratbox/Makefile
head/lang/php56-extensions/Makefile
head/lang/php56/Makefile
head/lang/php70-extensions/Makefile
head/lang/php70/Makefile
head/mail/assp/Makefile
head/mail/imap-uw/Makefile
head/mail/panda-imap/Makefile
head/mail/qpopper/Makefile
head/mail/spamassassin/Makefile
head/net-mgmt/ocsinventory-agent/Makefile
head/net/rwhoisd/Makefile
head/security/silktools/Makefile
head/sysutils/bacula-client/Makefile
head/sysutils/bacula-server/Makefile
head/sysutils/syslog-ng-devel/Makefile
head/sysutils/syslog-ng36/Makefile
head/sysutils/syslog-ng37/Makefile
head/www/bozohttpd/Makefile
head/www/mongoose/Makefile
Modified: head/databases/pgpool-II-33/Makefile
==============================================================================
--- head/databases/pgpool-II-33/Makefile Mon Nov 14 02:58:57 2016 (r426079)
+++ head/databases/pgpool-II-33/Makefile Mon Nov 14 03:15:03 2016 (r426080)
@@ -39,7 +39,6 @@ LIBMEMCACHED_DESC= Build with MemCached
LIBMEMCACHED_BUILD_DEPENDS= libmemcached>=1.0:databases/libmemcached
LIBMEMCACHED_CONFIGURE_ON= --with-memcached=${LOCALBASE}/lib/libmemcached
-SSL_DESC= Build with OpenSSL support
SSL_CONFIGURE_WITH= openssl
SSL_USE= OPENSSL=yes
Modified: head/databases/pgpool-II/Makefile
==============================================================================
--- head/databases/pgpool-II/Makefile Mon Nov 14 02:58:57 2016 (r426079)
+++ head/databases/pgpool-II/Makefile Mon Nov 14 03:15:03 2016 (r426080)
@@ -29,7 +29,6 @@ PORTDOCShtml= pgpool-en.html pgpool-ja.h
PORTDOCShtml+= tutorial-en.html tutorial-ja.html
OPTIONS_DEFINE+= DOCS SSL
-SSL_DESC= Build with OpenSSL support
.include <bsd.port.options.mk>
Modified: head/deskutils/egroupware/Makefile
==============================================================================
--- head/deskutils/egroupware/Makefile Mon Nov 14 02:58:57 2016 (r426079)
+++ head/deskutils/egroupware/Makefile Mon Nov 14 03:15:03 2016 (r426080)
@@ -31,10 +31,9 @@ SUB_LIST= EG_DIR=${EG_DIR} \
USE_GITHUB= yes
GH_ACCOUNT= EGroupware
-OPTIONS_DEFINE= MYSQL POSTGRES OSSL ZIP GD LDAP MBSTRING
-OPTIONS_DEFAULT=MYSQL OSSL ZIP
+OPTIONS_DEFINE= MYSQL POSTGRES SSL ZIP GD LDAP MBSTRING
+OPTIONS_DEFAULT=MYSQL SSL ZIP
-OSSL_DESC= Enable SSL connection support
MBSTRING_DESC= Support multi-byte character sets
POSTGRES_DESC= PostgreSQL database support
ZIP_DESC= Install PHP zip extension
@@ -42,7 +41,7 @@ ZIP_DESC= Install PHP zip extension
MYSQL_USE= PHP=mysqli,pdo_mysql
POSTGRES_USE= PHP=pgsql,pdo_pgsql
MBSTRING_USE= PHP=mbstring
-OSSL_USE= PHP=openssl
+SSL_USE= PHP=openssl
ZIP_USE= PHP=zip
GD_USE= PHP=gd
LDAP_USE= PHP=ldap
Modified: head/irc/ircd-ratbox/Makefile
==============================================================================
--- head/irc/ircd-ratbox/Makefile Mon Nov 14 02:58:57 2016 (r426079)
+++ head/irc/ircd-ratbox/Makefile Mon Nov 14 03:15:03 2016 (r426080)
@@ -52,8 +52,6 @@ PORTDOCS= [^i]*.txt README.* technical/[
OPTIONS_DEFINE= OPENSSL IPV6 ZIPLINKS SHARED_MODS ASSERT SMALL_NET \
SERVICES SHORTCUTS
-OPENSSL_DESC= Support OpenSSL encrypted connections
-IPV6_DESC= Enable IPv6 support
ZIPLINKS_DESC= Support compressed server links
SHARED_MODS_DESC= Support shared modules
ASSERT_DESC= Enable debugging code
Modified: head/lang/php56-extensions/Makefile
==============================================================================
--- head/lang/php56-extensions/Makefile Mon Nov 14 02:58:57 2016 (r426079)
+++ head/lang/php56-extensions/Makefile Mon Nov 14 03:15:03 2016 (r426080)
@@ -52,7 +52,6 @@ MYSQL_DESC= MySQL database support
MYSQLI_DESC= MySQLi database support
ODBC_DESC= ODBC support
OPCACHE_DESC= OPcache support
-OPENSSL_DESC= OpenSSL support
PCNTL_DESC= pcntl support (CLI only)
PDF_DESC= PDFlib support (implies GD)
PDO_DESC= PHP Data Objects Interface (PDO)
Modified: head/lang/php56/Makefile
==============================================================================
--- head/lang/php56/Makefile Mon Nov 14 02:58:57 2016 (r426079)
+++ head/lang/php56/Makefile Mon Nov 14 03:15:03 2016 (r426080)
@@ -47,7 +47,6 @@ FPM_DESC= Build FPM version
EMBED_DESC= Build embedded library
DEBUG_DESC= Enable debug
DTRACE_DESC= Enable DTrace support
-IPV6_DESC= Enable ipv6 support
MAILHEAD_DESC= Enable mail header patch
LINKTHR_DESC= Link thread lib (for threaded extensions)
ZTS_DESC= Force Zend Thread Safety (ZTS) build
Modified: head/lang/php70-extensions/Makefile
==============================================================================
--- head/lang/php70-extensions/Makefile Mon Nov 14 02:58:57 2016 (r426079)
+++ head/lang/php70-extensions/Makefile Mon Nov 14 03:15:03 2016 (r426080)
@@ -51,7 +51,6 @@ MCRYPT_DESC= Encryption support
MYSQLI_DESC= MySQLi database support
ODBC_DESC= ODBC support
OPCACHE_DESC= OPcache support
-OPENSSL_DESC= OpenSSL support
PCNTL_DESC= pcntl support (CLI only)
PDF_DESC= PDFlib support (implies GD)
PDO_DESC= PHP Data Objects Interface (PDO)
Modified: head/lang/php70/Makefile
==============================================================================
--- head/lang/php70/Makefile Mon Nov 14 02:58:57 2016 (r426079)
+++ head/lang/php70/Makefile Mon Nov 14 03:15:03 2016 (r426080)
@@ -50,7 +50,6 @@ EMBED_DESC= Build embedded library
DEBUG_DESC= Enable debug
PHPDBG_DESC= Interactive PHP debugger
DTRACE_DESC= Enable DTrace support
-IPV6_DESC= Enable ipv6 support
LINKTHR_DESC= Link thread lib (for threaded extensions)
ZTS_DESC= Force Zend Thread Safety (ZTS) build
Modified: head/mail/assp/Makefile
==============================================================================
--- head/mail/assp/Makefile Mon Nov 14 02:58:57 2016 (r426079)
+++ head/mail/assp/Makefile Mon Nov 14 03:15:03 2016 (r426080)
@@ -53,8 +53,6 @@ MYSQL_DESC= Use MySQL db to store white/
MATCHRE_DESC= Match IP ranges and CIDR blocks in lists
SENDERB_DESC= Country Code checks
MIMEMOD_DESC= Multiple Attachement detection
-SSL_DESC= SSL secure sockets support
-IPV6_DESC= IPv6 sockets support
OPTIONS_DEFAULT= EMVALID SPF SRS SEND FBACKW CLAMAV DNSBL MATCHRE SENDERB MIMEMOD SSL
Modified: head/mail/imap-uw/Makefile
==============================================================================
--- head/mail/imap-uw/Makefile Mon Nov 14 02:58:57 2016 (r426079)
+++ head/mail/imap-uw/Makefile Mon Nov 14 03:15:03 2016 (r426080)
@@ -36,7 +36,7 @@ ALL_TARGET= bsf
OPTIONS_DEFINE= SSL SSL_AND_PLAINTEXT DRAC NETSCAPE_BRAIN_DAMAGE DOCS
OPTIONS_DEFAULT= SSL
OPTIONS_SUB= yes
-SSL_DESC= Compile with SSL support
+
SSL_AND_PLAINTEXT_DESC= Allow plain text passwords and SSL
DRAC_DESC= Dynamically open MTA for relaying
NETSCAPE_BRAIN_DAMAGE_DESC= See Makefile for documentation
Modified: head/mail/panda-imap/Makefile
==============================================================================
--- head/mail/panda-imap/Makefile Mon Nov 14 02:58:57 2016 (r426079)
+++ head/mail/panda-imap/Makefile Mon Nov 14 03:15:03 2016 (r426080)
@@ -33,7 +33,7 @@ ALL_TARGET= bsf
OPTIONS_DEFINE= SSL SSL_AND_PLAINTEXT DRAC NETSCAPE_BRAIN_DAMAGE DOCS
OPTIONS_DEFAULT= SSL
OPTIONS_SUB= yes
-SSL_DESC= Compile with SSL support
+
SSL_AND_PLAINTEXT_DESC= Allow plain text passwords and SSL
DRAC_DESC= Dynamically open MTA for relaying
NETSCAPE_BRAIN_DAMAGE_DESC= See Makefile for documentation
Modified: head/mail/qpopper/Makefile
==============================================================================
--- head/mail/qpopper/Makefile Mon Nov 14 02:58:57 2016 (r426079)
+++ head/mail/qpopper/Makefile Mon Nov 14 03:15:03 2016 (r426080)
@@ -41,7 +41,7 @@ PKGDEINSTALL= ${PKGINSTALL}
OPTIONS_DEFINE= APOP_ONLY APOP DOCUMENTATION DRAC FULL_POPD_DEBUG PAM \
POPPASSD SAMPLE_POPUSERS SHY_ENABLED \
- SSL STANDALONE_MODE U_OPTION
+ OPENSSL STANDALONE_MODE U_OPTION
APOP_ONLY_DESC= build with APOP authentication only
APOP_DESC= build with APOP
@@ -52,14 +52,13 @@ PAM_DESC= build with PAM authentication
POPPASSD_DESC= build the poppassd daemon
SAMPLE_POPUSERS_DESC= build a default reject file
SHY_ENABLED_DESC= hide qpopper version in POP3 banner
-SSL_DESC= build with SSL/TLS support
STANDALONE_MODE_DESC= build qpopper to be run without inetd
U_OPTION_DESC= include support for user .qpopper-options
-OPTIONS_DEFAULT= APOP SSL U_OPTION
+OPTIONS_DEFAULT= APOP OPENSSL U_OPTION
OPTIONS_SUB= yes
-SSL_USES= ssl
+OPENSSL_USES= ssl
.include <bsd.port.pre.mk>
@@ -119,7 +118,7 @@ USE_RC_SUBR= ${PORTNAME}
.endif
# The default is to build without SSL/TLS support.
-.if ${PORT_OPTIONS:MSSL}
+.if ${PORT_OPTIONS:MOPENSSL}
CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
.endif
Modified: head/mail/spamassassin/Makefile
==============================================================================
--- head/mail/spamassassin/Makefile Mon Nov 14 02:58:57 2016 (r426079)
+++ head/mail/spamassassin/Makefile Mon Nov 14 03:15:03 2016 (r426080)
@@ -55,7 +55,6 @@ OPTIONS_SINGLE_GPG= GNUPG_NONE GNUPG GNU
OPTIONS_DEFAULT= AS_ROOT GNUPG SSL UPDATE_AND_COMPILE
AS_ROOT_DESC= Run spamd as root (recommended)
-SSL_DESC= Build spamd/spamc with SSL support
DATABASE_DESC= Optional user-config/bayes database backends
Modified: head/net-mgmt/ocsinventory-agent/Makefile
==============================================================================
--- head/net-mgmt/ocsinventory-agent/Makefile Mon Nov 14 02:58:57 2016 (r426079)
+++ head/net-mgmt/ocsinventory-agent/Makefile Mon Nov 14 03:15:03 2016 (r426080)
@@ -36,7 +36,6 @@ OPTIONS_DEFINE= DAEMON IPMI SSL PRINTER
DAEMON_DESC= Daemon mode
IPMI_DESC= Collect information about IPMI
-SSL_DESC= Get SSL communications working
PRINTER_DESC= Printers detection
SNMP_DESC= Scan network devices using SNMP
Modified: head/net/rwhoisd/Makefile
==============================================================================
--- head/net/rwhoisd/Makefile Mon Nov 14 02:58:57 2016 (r426079)
+++ head/net/rwhoisd/Makefile Mon Nov 14 03:15:03 2016 (r426080)
@@ -31,7 +31,6 @@ ETCFILES= rwhoisd.allow rwhoisd.auth_are
PLIST_SUB+= ETCFILES="${ETCFILES}"
OPTIONS_DEFINE= IPV6 DOCS
-IPV6_DESC= Enable IPV6 support
IPV6_CONFIGURE_OFF= --disable-ipv6
post-patch:
Modified: head/security/silktools/Makefile
==============================================================================
--- head/security/silktools/Makefile Mon Nov 14 02:58:57 2016 (r426079)
+++ head/security/silktools/Makefile Mon Nov 14 03:15:03 2016 (r426080)
@@ -39,7 +39,6 @@ CARES_CONFIGURE_WITH= c-ares=${LOCALBASE
CARES_LIB_DEPENDS= libcares.so:dns/c-ares
IPV6_CONFIGURE_ENABLE= ipv6
-IPV6_DESC= Support for analysis of flow records containing IPv6 addresses
GNUTLS_CONFIGURE_WITH= gnutls=${LOCALBASE}
GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
Modified: head/sysutils/bacula-client/Makefile
==============================================================================
--- head/sysutils/bacula-client/Makefile Mon Nov 14 02:58:57 2016 (r426079)
+++ head/sysutils/bacula-client/Makefile Mon Nov 14 03:15:03 2016 (r426080)
@@ -11,10 +11,7 @@ USE_RC_SUBR= bacula-fd
PLIST= ${PKGDIR}/pkg-plist.client
MASTERDIR= ${.CURDIR}/../../sysutils/bacula-server
-OPTIONS_DEFINE= NLS PYTHON ENABLE_IPV6
-OPTIONS_DEFAULT=ENABLE_IPV6
-
-ENABLE_IPV6_DESC= Enable IPv6 support
+OPTIONS_DEFINE= NLS PYTHON IPV6
BROKEN_aarch64= Fails to link: missing sbrk
Modified: head/sysutils/bacula-server/Makefile
==============================================================================
--- head/sysutils/bacula-server/Makefile Mon Nov 14 02:58:57 2016 (r426079)
+++ head/sysutils/bacula-server/Makefile Mon Nov 14 03:15:03 2016 (r426080)
@@ -32,10 +32,9 @@ USE_LDCONFIG= yes
CPPFLAGS+= -I/usr/include/readline -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-OPTIONS_DEFINE?= SQLITE3 MYSQL PGSQL MTX PYTHON NLS ENABLE_IPV6
-OPTIONS_DEFAULT?= NLS PGSQL ENABLE_IPV6
+OPTIONS_DEFINE?= SQLITE3 MYSQL PGSQL MTX PYTHON NLS IPV6
+OPTIONS_DEFAULT?= NLS PGSQL
MTX_DESC= Install mtx for control of autochanger devices
-ENABLE_IPV6_DESC= Enable IPv6 support
.if ${PKGNAMESUFFIX} == "-client" || ${PKGNAMESUFFIX} == "-server" #Till end of the file
@@ -142,7 +141,7 @@ readline_CONFIGURE= yes
.endif
# if IPv6 is not in the kernel, it generates many errors
-.if ! ${PORT_OPTIONS:MENABLE_IPV6}
+.if ! ${PORT_OPTIONS:MIPV6}
CONFIGURE_ARGS+= --disable-ipv6
.endif
Modified: head/sysutils/syslog-ng-devel/Makefile
==============================================================================
--- head/sysutils/syslog-ng-devel/Makefile Mon Nov 14 02:58:57 2016 (r426079)
+++ head/sysutils/syslog-ng-devel/Makefile Mon Nov 14 03:15:03 2016 (r426080)
@@ -29,7 +29,6 @@ OPTIONS_DEFAULT= JSON
TCP_WRAPPERS_DESC= Build with TCP Wrappers
SQL_DESC= Build with database (libdbi) support
SPOOF_DESC= Build with spoof source support
-IPV6_DESC= Build with IPV6 support
SMTP_DESC= Build with SMTP support
JSON_DESC= Build with JSON-C support
GEOIP_DESC= Build with GeoIP support
Modified: head/sysutils/syslog-ng36/Makefile
==============================================================================
--- head/sysutils/syslog-ng36/Makefile Mon Nov 14 02:58:57 2016 (r426079)
+++ head/sysutils/syslog-ng36/Makefile Mon Nov 14 03:15:03 2016 (r426080)
@@ -31,7 +31,6 @@ OPTIONS_DEFAULT= OPENSSL JSON
TCP_WRAPPERS_DESC= Build with TCP Wrappers
SQL_DESC= Build with database (libdbi) support
SPOOF_DESC= Build with spoof source support
-IPV6_DESC= Build with IPV6 support
SMTP_DESC= Build with SMTP support
JSON_DESC= Build with JSON-C support
GEOIP_DESC= Build with GeoIP support
Modified: head/sysutils/syslog-ng37/Makefile
==============================================================================
--- head/sysutils/syslog-ng37/Makefile Mon Nov 14 02:58:57 2016 (r426079)
+++ head/sysutils/syslog-ng37/Makefile Mon Nov 14 03:15:03 2016 (r426080)
@@ -35,7 +35,6 @@ OPTIONS_DEFAULT= JSON
TCP_WRAPPERS_DESC= Build with TCP Wrappers
SQL_DESC= Build with database (libdbi) support
SPOOF_DESC= Build with spoof source support
-IPV6_DESC= Build with IPV6 support
SMTP_DESC= Build with SMTP support
JSON_DESC= Build with JSON-C support
GEOIP_DESC= Build with GeoIP support
Modified: head/www/bozohttpd/Makefile
==============================================================================
--- head/www/bozohttpd/Makefile Mon Nov 14 02:58:57 2016 (r426079)
+++ head/www/bozohttpd/Makefile Mon Nov 14 03:15:03 2016 (r426080)
@@ -26,7 +26,6 @@ USES= cpe uidfix tar:bzip2
CPE_VENDOR= eterna
HTPASSWD_DESC= Enable htpassword support
-SSL_DESC= Enable SSL support
CGI_DESC= Enable CGI support
.include <bsd.port.options.mk>
Modified: head/www/mongoose/Makefile
==============================================================================
--- head/www/mongoose/Makefile Mon Nov 14 02:58:57 2016 (r426079)
+++ head/www/mongoose/Makefile Mon Nov 14 03:15:03 2016 (r426080)
@@ -39,8 +39,6 @@ DIRECTORY_LISTING_DESC= Enable directory
LOGGING_DESC= Enable logging
SSI_DESC= Enable SSI
THREADS_DESC= Enable threads
-SSL_DESC= Enable SSL
-IPV6_DESC= Enable IPv6 support
DEBUG_HEXDUMP_DESC= Enable hexdump of sent and received traffic
SSL_USES= ssl
More information about the svn-ports-all
mailing list