svn commit: r415742 - in head: archivers/rpm4 audio/abraca audio/dsbmixer audio/easytag audio/exaile audio/idjc audio/libmp3splt audio/mp3splt audio/musicpd audio/shoutcast cad/gmsh cad/pcb cad/spi...

Dmitry Marakasov amdmi3 at FreeBSD.org
Mon May 23 20:35:12 UTC 2016 

Author: amdmi3
Date: Mon May 23 20:35:01 2016
New Revision: 415742
URL: https://svnweb.freebsd.org/changeset/ports/415742

Log:
  Remove NLS, DOCS, EXAMPLES and IPV6 from OPTIONS_DEFAULT, they are enabled by default anyway and don't need to be listed
  
  Approved by:	portmgr blanket

Modified:
  head/archivers/rpm4/Makefile
  head/audio/abraca/Makefile
  head/audio/dsbmixer/Makefile
  head/audio/easytag/Makefile
  head/audio/exaile/Makefile
  head/audio/idjc/Makefile
  head/audio/libmp3splt/Makefile
  head/audio/mp3splt/Makefile
  head/audio/musicpd/Makefile
  head/audio/shoutcast/Makefile
  head/cad/gmsh/Makefile
  head/cad/pcb/Makefile
  head/cad/spice/Makefile
  head/chinese/ibus-libpinyin/Makefile
  head/chinese/ibus-pinyin/Makefile
  head/comms/hylafax/Makefile
  head/databases/memcached/Makefile
  head/databases/pgpool-II-33/Makefile
  head/deskutils/genius/Makefile
  head/deskutils/howm/Makefile
  head/deskutils/moregroupware/Makefile
  head/deskutils/xfce4-notification-daemon/Makefile
  head/devel/apr1/Makefile
  head/devel/apr2/Makefile
  head/devel/eblob/Makefile
  head/devel/extra-cmake-modules/Makefile
  head/devel/gcc-arm-embedded/Makefile
  head/devel/giggle/Makefile
  head/devel/git/Makefile
  head/devel/godot/Makefile
  head/devel/hadoop2/Makefile
  head/devel/kdbg/Makefile
  head/devel/libconcurrent/Makefile
  head/devel/libftdi1/Makefile
  head/devel/libslang2/Makefile
  head/devel/lockfree-malloc/Makefile
  head/devel/omniORB-4.1/Makefile
  head/devel/omniORB/Makefile
  head/devel/staf/Makefile
  head/devel/swig13/Makefile
  head/dns/bind9-devel/Makefile
  head/dns/bind910/Makefile
  head/dns/bind99/Makefile
  head/dns/dnsmasq-devel/Makefile
  head/dns/dnsmasq/Makefile
  head/dns/ldns/Makefile
  head/dns/libbind/Makefile
  head/dns/nsd/Makefile
  head/editors/apel/Makefile
  head/editors/flim/Makefile
  head/editors/jed/Makefile
  head/editors/semi/Makefile
  head/editors/texworks/Makefile
  head/emulators/dolphin-emu/Makefile
  head/ftp/curl/Makefile
  head/ftp/lftp/Makefile
  head/ftp/proftpd/Makefile
  head/ftp/vsftpd-ext/Makefile
  head/ftp/yafc/Makefile
  head/games/0verkill/Makefile
  head/games/crafty/Makefile
  head/games/gnubg/Makefile
  head/games/ldmud/Makefile
  head/games/trackballs/Makefile
  head/graphics/darktable/Makefile
  head/graphics/gdk-pixbuf2/Makefile
  head/graphics/gimageview/Makefile
  head/graphics/graphviz/Makefile
  head/graphics/peps/Makefile
  head/graphics/povray37/Makefile
  head/irc/atheme-services/Makefile
  head/irc/irc/Makefile
  head/irc/ircd-ratbox/Makefile
  head/irc/irssi/Makefile
  head/japanese/navi2ch/Makefile
  head/java/icedtea-web/Makefile
  head/java/openjdk6/Makefile
  head/korean/libhangul/Makefile
  head/lang/elixir/Makefile
  head/lang/ghc/Makefile
  head/lang/nhc98/Makefile
  head/lang/php55/Makefile
  head/lang/php56/Makefile
  head/lang/php70/Makefile
  head/lang/python27/Makefile
  head/lang/python33/Makefile
  head/lang/python34/Makefile
  head/lang/python35/Makefile
  head/mail/amavis-logwatch/Makefile
  head/mail/assp/Makefile
  head/mail/libcmime/Makefile
  head/mail/meta1/Makefile
  head/mail/milter-greylist-devel/Makefile
  head/mail/mu4e-maildirs/Makefile
  head/mail/wanderlust-devel/Makefile
  head/math/coq/Makefile
  head/math/slatec/Makefile
  head/misc/lifelines/Makefile
  head/misc/raspberrypi-userland/Makefile
  head/multimedia/audacious/Makefile
  head/multimedia/gpac-libgpac/Makefile
  head/multimedia/mencoder/Makefile
  head/multimedia/mpeg4ip/Makefile
  head/multimedia/mplayer/Makefile
  head/multimedia/ogmrip/Makefile
  head/multimedia/xfce4-parole/Makefile
  head/net-im/gajim/Makefile
  head/net-im/licq/Makefile
  head/net-mgmt/icingaweb2/Makefile
  head/net-mgmt/librenms/Makefile
  head/net-mgmt/monitoring-plugins/Makefile
  head/net-mgmt/nagios-plugins/Makefile
  head/net-mgmt/net-snmp/Makefile
  head/net-mgmt/pandorafms_agent/Makefile
  head/net-mgmt/pandorafms_server/Makefile
  head/net-mgmt/pmacct/Makefile
  head/net-mgmt/zabbix2-agent/Makefile
  head/net-mgmt/zabbix2-server/Makefile
  head/net-mgmt/zabbix22-agent/Makefile
  head/net-mgmt/zabbix22-server/Makefile
  head/net-mgmt/zabbix24-agent/Makefile
  head/net-mgmt/zabbix24-server/Makefile
  head/net-mgmt/zabbix3-agent/Makefile
  head/net-mgmt/zabbix3-server/Makefile
  head/net-p2p/bitflu/Makefile
  head/net/chrony/Makefile
  head/net/fping/Makefile
  head/net/irrd/Makefile
  head/net/isc-dhcp41-server/Makefile
  head/net/isc-dhcp43-server/Makefile
  head/net/kea/Makefile
  head/net/libpcap/Makefile
  head/net/nanomsg/Makefile
  head/net/netcat/Makefile
  head/net/ngrep/Makefile
  head/net/openmpi/Makefile
  head/net/opensips/Makefile
  head/net/packter-agent/Makefile
  head/net/remmina-plugins/Makefile
  head/net/remmina/Makefile
  head/net/rwhoisd/Makefile
  head/net/sslh/Makefile
  head/net/tcpdump/Makefile
  head/net/tigervnc/Makefile
  head/net/uget/Makefile
  head/net/unison-devel/Makefile
  head/net/unison-nox11/Makefile
  head/net/unison232/Makefile
  head/net/wireshark-qt5/Makefile
  head/net/x11vnc/Makefile
  head/net/zebra/Makefile
  head/news/slrn/Makefile
  head/print/a2ps/Makefile
  head/print/auctex/Makefile
  head/print/cups-pdf/Makefile
  head/print/ghostscript7-base/Makefile
  head/print/ghostscript8-base/Makefile
  head/print/ghostscript9-agpl-base/Makefile
  head/print/ghostscript9-base/Makefile
  head/print/lyx/Makefile
  head/print/pslib/Makefile
  head/print/texlive-full/Makefile
  head/science/gnudatalanguage/Makefile
  head/security/afl/Makefile
  head/security/amavisd-new/Makefile
  head/security/arm/Makefile
  head/security/clamav/Makefile
  head/security/heimdal/Makefile
  head/security/snort/Makefile
  head/security/sssd/Makefile
  head/shells/bash/Makefile
  head/sysutils/bacula5-client-static/Makefile
  head/sysutils/bacula5-client/Makefile
  head/sysutils/burp/Makefile
  head/sysutils/coreutils/Makefile
  head/sysutils/dsbbatmon/Makefile
  head/sysutils/dsbmc/Makefile
  head/sysutils/e2fsprogs/Makefile
  head/sysutils/froxlor/Makefile
  head/sysutils/xfburn/Makefile
  head/sysutils/xfce4-battery-plugin/Makefile
  head/sysutils/xfce4-settings/Makefile
  head/sysutils/xfce4-systemload-plugin/Makefile
  head/textproc/bsdsort/Makefile
  head/textproc/gnugrep/Makefile
  head/textproc/ibus/Makefile
  head/textproc/kdiff3/Makefile
  head/www/c-icap/Makefile
  head/www/calendarserver/Makefile
  head/www/dillo2/Makefile
  head/www/e2guardian/Makefile
  head/www/emacs-w3m/Makefile
  head/www/gatling/Makefile
  head/www/hiawatha/Makefile
  head/www/hs-http-server/Makefile
  head/www/lighttpd/Makefile
  head/www/links/Makefile
  head/www/lynx-current/Makefile
  head/www/mod_musicindex/Makefile
  head/www/neon/Makefile
  head/www/nginx-devel/Makefile
  head/www/nginx/Makefile
  head/www/privoxy/Makefile
  head/www/roundup/Makefile
  head/www/sarg/Makefile
  head/www/squid-devel/Makefile
  head/www/squid/Makefile
  head/www/tengine/Makefile
  head/x11-fm/thunar-vfs/Makefile
  head/x11-toolkits/libxfce4gui/Makefile
  head/x11-wm/awesome/Makefile
  head/x11-wm/icewm/Makefile
  head/x11-wm/xfce4-panel/Makefile
  head/x11-wm/xfce4-wm/Makefile
  head/x11/libXpm/Makefile
  head/x11/terminator/Makefile
  head/x11/wbar/Makefile

Modified: head/archivers/rpm4/Makefile
==============================================================================
--- head/archivers/rpm4/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/archivers/rpm4/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libpopt.so:devel/popt \
 BUILD_DEPENDS=	${LOCALBASE}/bin/gsed:textproc/gsed
 
 OPTIONS_DEFINE=	PYTHON NLS DOCS
-OPTIONS_DEFAULT=PYTHON NLS
+OPTIONS_DEFAULT=PYTHON
 OPTIONS_SUB=	yes
 PYTHON_CONFIGURE_ENABLE=python
 PYTHON_USES=	python:2.7

Modified: head/audio/abraca/Makefile
==============================================================================
--- head/audio/abraca/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/audio/abraca/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -23,7 +23,6 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX} \
 			--mandir=${PREFIX}/man
 
 OPTIONS_DEFINE=	NLS
-OPTIONS_DEFAULT=	NLS
 
 OPTIONS_SUB=	yes
 NLS_USES=	gettext

Modified: head/audio/dsbmixer/Makefile
==============================================================================
--- head/audio/dsbmixer/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/audio/dsbmixer/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -16,7 +16,7 @@ USES=		tar:tgz pkgconfig
 USE_GNOME=	gtk20
 
 OPTIONS_DEFINE=	DEVD NLS
-OPTIONS_DEFAULT=DEVD NLS
+OPTIONS_DEFAULT=DEVD
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext

Modified: head/audio/easytag/Makefile
==============================================================================
--- head/audio/easytag/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/audio/easytag/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -36,7 +36,6 @@ CONFIGURE_ARGS=	--disable-appdata-valida
 PORTDOCS=	HACKING THANKS TODO
 
 OPTIONS_DEFINE=	WAVPACK NLS OPUS SPEEX DOCS
-OPTIONS_DEFAULT=	NLS
 OPTIONS_SUB=	yes
 
 WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack

Modified: head/audio/exaile/Makefile
==============================================================================
--- head/audio/exaile/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/audio/exaile/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -21,7 +21,7 @@ USE_GSTREAMER=	good faad python
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=		BAD CDDB DBUS HAL NOTIFY NLS SEXY
-OPTIONS_DEFAULT=	BAD CDDB DBUS HAL NOTIFY NLS SEXY
+OPTIONS_DEFAULT=	BAD CDDB DBUS HAL NOTIFY SEXY
 OPTIONS_SUB=		yes
 BAD_DESC=		Install bad GStreamer plugins
 BAD_USE=		GSTREAMER=bad

Modified: head/audio/idjc/Makefile
==============================================================================
--- head/audio/idjc/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/audio/idjc/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -26,9 +26,8 @@ RUN_DEPENDS=	oggenc:audio/vorbis-tools \
 		${PYTHON_PKGNAMEPREFIX}mutagen>=0:audio/py-mutagen \
 		${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus
 
-OPTIONS_SUB=	YES
 OPTIONS_DEFINE=	DOCS NLS
-OPTIONS_DEFAULT=	DOCS NLS
+OPTIONS_SUB=	YES
 
 USES=		compiler:nestedfct desktop-file-utils gettext gmake \
 		libtool pathfix pkgconfig python:2.7

Modified: head/audio/libmp3splt/Makefile
==============================================================================
--- head/audio/libmp3splt/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/audio/libmp3splt/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -28,7 +28,7 @@ OPTIONS_SUB=	yes
 
 PCRE_DESC=	PCRE support to set tags from input filename
 
-OPTIONS_DEFAULT=	MAD FLAC VORBIS ID3 PCRE NLS
+OPTIONS_DEFAULT=	MAD FLAC VORBIS ID3 PCRE
 
 MAD_CONFIGURE_ENABLE=	mp3
 MAD_LIB_DEPENDS=	libmad.so:audio/libmad

Modified: head/audio/mp3splt/Makefile
==============================================================================
--- head/audio/mp3splt/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/audio/mp3splt/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -23,7 +23,6 @@ CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=		NLS
-OPTIONS_DEFAULT=	NLS
 OPTIONS_SUB=		yes
 
 NLS_USES=		gettext

Modified: head/audio/musicpd/Makefile
==============================================================================
--- head/audio/musicpd/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/audio/musicpd/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -55,7 +55,7 @@ TWOLAME_DESC=	TwoLAME support (mp2)
 VORBISENC_DESC=	Ogg Vorbis encoder
 WILDMIDI_DESC=	WildMIDI support (MIDI files)
 
-OPTIONS_DEFAULT=ID3TAG IPV6 MAD OSS FLAC VORBIS WAV FFMPEG SNDFILE CURL
+OPTIONS_DEFAULT=ID3TAG MAD OSS FLAC VORBIS WAV FFMPEG SNDFILE CURL
 
 AAC_CONFIGURE_ENABLE=aac
 AAC_LIB_DEPENDS=libfaad.so:audio/faad

Modified: head/audio/shoutcast/Makefile
==============================================================================
--- head/audio/shoutcast/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/audio/shoutcast/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -27,8 +27,8 @@ CONFLICTS=	linux-shoutcast-[0-9]*
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
-OPTIONS_DEFAULT=	SERVERSETUP EXAMPLES
 OPTIONS_DEFINE=	SERVERSETUP DOCS EXAMPLES
+OPTIONS_DEFAULT=	SERVERSETUP
 OPTIONS_SUB=	yes
 SETUPSERVER_DESC=	SHOUTcast Server Setup Tools
 EXAMPLE_DESC=	SHOUTcast Server Example Configuration Files

Modified: head/cad/gmsh/Makefile
==============================================================================
--- head/cad/gmsh/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/cad/gmsh/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -34,7 +34,7 @@ MAKE_JOBS_UNSAFE=	yes
 CMAKE_ARGS+=	-DCMAKE_SKIP_RPATH:BOOL=YES
 
 OPTIONS_DEFINE=	STATIC_LIB SHARED_LIB TETGEN METIS TAUCS MED CGNS GMM OCC
-OPTIONS_DEFAULT=	DOCS STATIC_LIB SHARED_LIB TETGEN METIS MED CGNS GMM
+OPTIONS_DEFAULT=	STATIC_LIB SHARED_LIB TETGEN METIS MED CGNS GMM
 
 STATIC_LIB_DESC=	Build static library
 SHARED_LIB_DESC=	Build shared library

Modified: head/cad/pcb/Makefile
==============================================================================
--- head/cad/pcb/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/cad/pcb/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -37,7 +37,7 @@ PORTDOCS=	\
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SINGLE=	GUI
 OPTIONS_SINGLE_GUI=MOTIF GTK NONE
-OPTIONS_DEFAULT=DOCS GTK
+OPTIONS_DEFAULT=GTK
 DOCS_CONFIGURE_ENABLE=	doc
 DOCS_CONFIGURE_ON=	--docdir=${DOCSDIR}
 NLS_CONFIGURE_ENABLE=	nls

Modified: head/cad/spice/Makefile
==============================================================================
--- head/cad/spice/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/cad/spice/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -40,7 +40,7 @@ PORTEXAMPLES=	bjtnoise.cir bsim1tst.cir 
 		rtlinv.cir schmitt.cir simplepz.cir
 
 OPTIONS_DEFINE=	DOCS EXAMPLES X11 DEV_BSIM3 DEV_BSIM4 DEV_HISIM2
-OPTIONS_DEFAULT=DOCS EXAMPLES X11
+OPTIONS_DEFAULT=X11
 
 X11_USE=		XORG=x11,xaw,xext,xmu,xt
 X11_CONFIGURE_ENV=	WITH_X11=yes

Modified: head/chinese/ibus-libpinyin/Makefile
==============================================================================
--- head/chinese/ibus-libpinyin/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/chinese/ibus-libpinyin/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -25,7 +25,7 @@ CONFIGURE_ARGS=	--disable-dependency-tra
 				--disable-lua-extension
 
 OPTIONS_DEFINE=		ENGLISH STROKE OPENCC NLS
-OPTIONS_DEFAULT=	ENGLISH STROKE NLS
+OPTIONS_DEFAULT=	ENGLISH STROKE
 OPTIONS_SUB=		yes
 ENGLISH_DESC=		Enable English input mode
 STROKE_DESC=		Enable stroke input mode

Modified: head/chinese/ibus-pinyin/Makefile
==============================================================================
--- head/chinese/ibus-pinyin/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/chinese/ibus-pinyin/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -25,7 +25,6 @@ CONFIGURE_ARGS=	--disable-dependency-tra
 PROJECTHOST=	ibus
 
 OPTIONS_DEFINE=	NLS
-OPTIONS_DEFAULT=	NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext

Modified: head/comms/hylafax/Makefile
==============================================================================
--- head/comms/hylafax/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/comms/hylafax/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -39,7 +39,7 @@ SUB_FILES=	pkg-message
 USE_RC_SUBR=	hylafax
 
 OPTIONS_DEFINE=	PAM NLS GAWK DOCS
-OPTIONS_DEFAULT=PAM NLS
+OPTIONS_DEFAULT=PAM
 NO_OPTIONS_SORT=yes
 OPTIONS_SUB=	yes
 GAWK_DESC=	Use gawk for scripts

Modified: head/databases/memcached/Makefile
==============================================================================
--- head/databases/memcached/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/databases/memcached/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -20,7 +20,7 @@ CONFLICTS=	memcached-1.2*
 
 # Dtrace option disabled until it is fixed upstream
 OPTIONS_DEFINE=		SASL DOCS DTRACE
-OPTIONS_DEFAULT=	SASL DOCS
+OPTIONS_DEFAULT=	SASL
 
 DTRACE_DESC=	Enable dtrace probes
 SASL_DESC=	Enable SASL Authentication

Modified: head/databases/pgpool-II-33/Makefile
==============================================================================
--- head/databases/pgpool-II-33/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/databases/pgpool-II-33/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -28,7 +28,7 @@ DOCS=		AUTHORS COPYING ChangeLog INSTALL
 		doc/tutorial-en.html doc/tutorial-ja.html
 
 OPTIONS_DEFINE+=	DOCS SSL LIBMEMCACHED PAM
-OPTIONS_DEFAULT=	DOCS SSL PAM
+OPTIONS_DEFAULT=	SSL PAM
 
 # Buggy configure: adding eg. --without-pam to CONFIGURE_ARGS causes
 # USE_PAM to be *defined* in config.h Omit the --with-pam or

Modified: head/deskutils/genius/Makefile
==============================================================================
--- head/deskutils/genius/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/deskutils/genius/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -29,7 +29,6 @@ INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
 
 OPTIONS_DEFINE=		NLS
-OPTIONS_DEFAULT=	NLS
 OPTIONS_SUB=		yes
 
 NLS_USES=		gettext

Modified: head/deskutils/howm/Makefile
==============================================================================
--- head/deskutils/howm/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/deskutils/howm/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -16,7 +16,7 @@ ELISP=		action-lock.el bcomp.el cheat-fo
 		howm-version.el howm-view.el howm.el riffle.el
 
 OPTIONS_DEFINE=	COMPILED_ELISP DOCS EXAMPLES
-OPTIONS_DEFAULT=COMPILED_ELISP DOCS EXAMPLES
+OPTIONS_DEFAULT=COMPILED_ELISP
 COMPILED_ELISP_DESC=	Install pre-compiled ELISP files
 OPTIONS_SUB=	yes
 

Modified: head/deskutils/moregroupware/Makefile
==============================================================================
--- head/deskutils/moregroupware/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/deskutils/moregroupware/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -25,7 +25,7 @@ WANT_PHP_MOD=	yes
 OPTIONS_DEFINE=	ADDONS NLS
 OPTIONS_SINGLE=	DB
 OPTIONS_SINGLE_DB=	PGSQL MYSQL
-OPTIONS_DEFAULT=	NLS MYSQL
+OPTIONS_DEFAULT=	MYSQL
 ADDONS_DESC=	install additional workgroup features (addons)
 OPTIONS_SUB=	yes
 

Modified: head/deskutils/xfce4-notification-daemon/Makefile
==============================================================================
--- head/deskutils/xfce4-notification-daemon/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/deskutils/xfce4-notification-daemon/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -38,7 +38,7 @@ OPTIONS_DEFINE=	GRADIENT CLOSE NLS
 GRADIENT_DESC=	Show a gradient look in the default theme
 CLOSE_DESC=	Show the close button in the default theme
 
-OPTIONS_DEFAULT=CLOSE NLS
+OPTIONS_DEFAULT=CLOSE
 
 .include <bsd.port.options.mk>
 

Modified: head/devel/apr1/Makefile
==============================================================================
--- head/devel/apr1/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/devel/apr1/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -32,7 +32,7 @@ OPTIONS_GROUP_APR=	IPV6 DEVRANDOM
 OPTIONS_GROUP_APU=	BDB GDBM LDAP MYSQL NDBM PGSQL SQLITE FREETDS
 OPTIONS_RADIO=		CRYPTO
 OPTIONS_RADIO_CRYPTO=	SSL NSS
-OPTIONS_DEFAULT=	IPV6 DEVRANDOM BDB GDBM SSL
+OPTIONS_DEFAULT=	DEVRANDOM BDB GDBM SSL
 
 DEVRANDOM_DESC=		Use /dev/random or compatible
 NDBM_DESC=		NDBM support

Modified: head/devel/apr2/Makefile
==============================================================================
--- head/devel/apr2/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/devel/apr2/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -36,7 +36,7 @@ OPTIONS_GROUP_APR=	IPV6 DEVRANDOM
 OPTIONS_GROUP_APU=	BDB GDBM MYSQL NDBM PGSQL SQLITE
 OPTIONS_RADIO=		CRYPTO
 OPTIONS_RADIO_CRYPTO=	SSL NSS
-OPTIONS_DEFAULT=	THREADS IPV6 DEVRANDOM BDB GDBM SSL
+OPTIONS_DEFAULT=	THREADS DEVRANDOM BDB GDBM SSL
 
 DEVELOPER_ONLY_DESC=	I want to test apr2 not the maintainer
 DEVRANDOM_DESC=		Use /dev/random or compatible

Modified: head/devel/eblob/Makefile
==============================================================================
--- head/devel/eblob/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/devel/eblob/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -23,7 +23,7 @@ USES=		cmake
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	ASSERT PYTHON SNAPPY EXAMPLES TESTS
-OPTIONS_DEFAULT=PYTHON SNAPPY EXAMPLES TESTS
+OPTIONS_DEFAULT=PYTHON SNAPPY TESTS
 TESTS_DESC=	Build tests
 
 .include <bsd.port.options.mk>

Modified: head/devel/extra-cmake-modules/Makefile
==============================================================================
--- head/devel/extra-cmake-modules/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/devel/extra-cmake-modules/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -21,7 +21,7 @@ NO_ARCH=	yes
 ## options
 
 OPTIONS_DEFINE=	DOCS MANPAGES
-OPTIONS_DEFAULT=DOCS MANPAGES
+OPTIONS_DEFAULT=MANPAGES
 
 SPHINX_DEP=		sphinx-build:textproc/py-sphinx
 DOCS_BUILD_DEPENDS=	${SPHINX_DEP}

Modified: head/devel/gcc-arm-embedded/Makefile
==============================================================================
--- head/devel/gcc-arm-embedded/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/devel/gcc-arm-embedded/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -16,7 +16,7 @@ LICENSE_COMB=	multi
 BROKEN_powerpc64=	Does not build
 
 OPTIONS_DEFINE=	PURE PYGDB EXAMPLES HTML PDF DOCS
-OPTIONS_DEFAULT=EXAMPLES PYGDB
+OPTIONS_DEFAULT=PYGDB
 PURE_DESC=	Use all libraries from bundle, do not depend on anything
 HTML_DESC=	Install HTML documentation
 PDF_DESC=	Install PDF documentation (requires TeX, it is huge)

Modified: head/devel/giggle/Makefile
==============================================================================
--- head/devel/giggle/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/devel/giggle/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -19,7 +19,6 @@ BUILD_DEPENDS=	git:devel/git \
 RUN_DEPENDS=	git:devel/git
 
 OPTIONS_DEFINE=	NLS
-OPTIONS_DEFAULT=	NLS
 #VTE_DESC=	Terminal Widget
 
 GNU_CONFIGURE=	yes

Modified: head/devel/git/Makefile
==============================================================================
--- head/devel/git/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/devel/git/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -42,7 +42,7 @@ CONFIGURE_ARGS=	--enable-pthreads=-pthre
 
 OPTIONS_DEFINE=	GUI SVN GITWEB CONTRIB P4 CVS HTMLDOCS PERL ICONV CURL \
 		SEND_EMAIL NLS
-OPTIONS_DEFAULT=	CONTRIB P4 CVS PERL ICONV CURL SEND_EMAIL NLS
+OPTIONS_DEFAULT=	CONTRIB P4 CVS PERL ICONV CURL SEND_EMAIL
 OPTIONS_SUB=	yes
 
 GITWEB_DESC=	Install gitweb

Modified: head/devel/godot/Makefile
==============================================================================
--- head/devel/godot/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/devel/godot/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -26,7 +26,7 @@ MAKE_ARGS+=	platform=x11
 CXXFLAGS+=	-DRTAUDIO_ENABLED
 
 OPTIONS_DEFINE=	EXAMPLES TOOLS
-OPTIONS_DEFAULT=	EXAMPLES TOOLS
+OPTIONS_DEFAULT=	TOOLS
 OPTIONS_SUB=	yes
 
 TOOLS_DESC=	Include development tools (IDE)

Modified: head/devel/hadoop2/Makefile
==============================================================================
--- head/devel/hadoop2/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/devel/hadoop2/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -44,7 +44,6 @@ SHEBANG_FILES=	hadoop-hdfs-project/hadoo
 MAKE_ENV+=	JAVA_HOME=${JAVA_HOME} HADOOP_PROTOC_PATH=${LOCALBASE}/protobuf25/bin/protoc
 
 OPTIONS_DEFINE=		EXAMPLES
-OPTIONS_DEFAULT=	EXAMPLES
 
 TOMCAT_VERSION=	6.0.44
 HADOOP_DIST=	${WRKSRC}/hadoop-dist/target/hadoop-${PORTVERSION}

Modified: head/devel/kdbg/Makefile
==============================================================================
--- head/devel/kdbg/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/devel/kdbg/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -17,7 +17,6 @@ USE_QT4=	moc_build qmake_build rcc_build
 INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=	NLS
-OPTIONS_DEFAULT=NLS
 
 .include <bsd.port.options.mk>
 

Modified: head/devel/libconcurrent/Makefile
==============================================================================
--- head/devel/libconcurrent/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/devel/libconcurrent/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -22,7 +22,6 @@ GH_TAGNAME=	f55d33a789a4b2c6267268ec2d44
 ONLY_FOR_ARCHS=	i386 amd64
 
 OPTIONS_DEFINE=	EXAMPLES
-OPTIONS_DEFAULT=	EXAMPLES
 
 MAKEFILE=	makefile
 MAKE_ARGS=	LIBCONCURRENT_DESTDIR=${STAGEDIR}${PREFIX}

Modified: head/devel/libftdi1/Makefile
==============================================================================
--- head/devel/libftdi1/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/devel/libftdi1/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -15,7 +15,7 @@ BROKEN_powerpc64=	Does not build
 LIB_DEPENDS=	libconfuse.so:devel/libconfuse
 
 OPTIONS_DEFINE=		PYTHON BOOST DOCS EXAMPLES
-OPTIONS_DEFAULT=	PYTHON BOOST DOCS EXAMPLES
+OPTIONS_DEFAULT=	PYTHON BOOST
 OPTIONS_SUB=		yes
 
 BOOST_DESC=	Build with boost

Modified: head/devel/libslang2/Makefile
==============================================================================
--- head/devel/libslang2/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/devel/libslang2/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -28,7 +28,7 @@ DOCSDIR=	${PREFIX}/share/doc/slang
 DATADIR=	${PREFIX}/share/slsh
 
 OPTIONS_DEFINE=	PCRE PNG ICONV ONIG DOCS
-OPTIONS_DEFAULT=PCRE PNG ICONV DOCS
+OPTIONS_DEFAULT=PCRE PNG ICONV
 OPTIONS_SUB=	yes
 
 ONIG_DESC=	Oniguruma support

Modified: head/devel/lockfree-malloc/Makefile
==============================================================================
--- head/devel/lockfree-malloc/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/devel/lockfree-malloc/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -19,7 +19,6 @@ USES=		tar:bzip2
 USE_GCC=	yes
 
 OPTIONS_DEFINE=	DOCS
-OPTIONS_DEFAULT=DOCS
 DOCS_DESC=	Install README
 
 PLIST_FILES=	lib/liblite-malloc-shared.so \

Modified: head/devel/omniORB-4.1/Makefile
==============================================================================
--- head/devel/omniORB-4.1/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/devel/omniORB-4.1/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -28,7 +28,7 @@ CONFIGURE_ARGS=	--datadir=${DATADIR} --w
 		--with-omniNames-logdir=/var/log
 
 OPTIONS_DEFINE=	DOCS EXAMPLES STATIC
-OPTIONS_DEFAULT=	DOCS EXAMPLES STATIC
+OPTIONS_DEFAULT=	STATIC
 OPTIONS_SUB=	yes
 STATIC_CONFIGURE_OFF=	--disable-static
 

Modified: head/devel/omniORB/Makefile
==============================================================================
--- head/devel/omniORB/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/devel/omniORB/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -23,7 +23,7 @@ CONFIGURE_ARGS=	--datadir=${DATADIR} --w
 		--with-omniORB-config=${PREFIX}/etc/omniORB.cfg \
 		--with-omniNames-logdir=/var/log
 OPTIONS_DEFINE=	DOCS STATIC
-OPTIONS_DEFAULT=	DOCS STATIC
+OPTIONS_DEFAULT=	STATIC
 OPTIONS_SUB=	yes
 STATIC_CONFIGURE_OFF=	--disable-static
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:S/-2//}

Modified: head/devel/staf/Makefile
==============================================================================
--- head/devel/staf/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/devel/staf/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -30,7 +30,7 @@ MAKE_ARGS=	OS_NAME="freebsd" \
 		PROJECTS="${STAF_PROJECTS}"
 
 OPTIONS_DEFINE=	DEBUG IPV6 OPENSSL PYTHON
-OPTIONS_DEFAULT=IPV6 OPENSSL
+OPTIONS_DEFAULT=OPENSSL
 OPTIONS_SUB=	yes
 
 DEBUG_VARS=	staf_build_type=debug

Modified: head/devel/swig13/Makefile
==============================================================================
--- head/devel/swig13/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/devel/swig13/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -32,7 +32,6 @@ PORTEXAMPLES=	*
 PORTDATA=	*
 
 OPTIONS_DEFINE=	LUA DOCS EXAMPLES
-OPTIONS_DEFAULT=DOCS EXAMPLES
 
 LUA_DESC=	Lua support
 LUA_USES=	lua:51

Modified: head/dns/bind9-devel/Makefile
==============================================================================
--- head/dns/bind9-devel/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/dns/bind9-devel/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -44,7 +44,7 @@ CONFLICTS+=	bind9*-9.[456789].* bind9*-s
 
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFAULT=	IPV6 SSL THREADS SIGCHASE IDN GSSAPI_NONE
+OPTIONS_DEFAULT=	SSL THREADS SIGCHASE IDN GSSAPI_NONE
 OPTIONS_DEFINE=		IDN LARGE_FILE PYTHON START_LATE \
 			FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA
 OPTIONS_RADIO=	CRYPTO GOSTDEF

Modified: head/dns/bind910/Makefile
==============================================================================
--- head/dns/bind910/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/dns/bind910/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -61,7 +61,7 @@ CONFLICTS+=	bind9*-9.[456789].* bind9*-s
 SUB_FILES=	pkg-message
 .endif
 
-OPTIONS_DEFAULT=	IPV6 SSL THREADS SIGCHASE IDN GSSAPI_NONE
+OPTIONS_DEFAULT=	SSL THREADS SIGCHASE IDN GSSAPI_NONE
 OPTIONS_DEFINE=		IDN LARGE_FILE PYTHON START_LATE \
 			FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA
 OPTIONS_RADIO=	CRYPTO GOSTDEF

Modified: head/dns/bind99/Makefile
==============================================================================
--- head/dns/bind99/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/dns/bind99/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -42,7 +42,7 @@ CONFLICTS=	bind9*-9.[45678].* bind9*-sdb
 
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFAULT=	IPV6 SSL THREADS SIGCHASE IDN GSSAPI_NONE RRL
+OPTIONS_DEFAULT=	SSL THREADS SIGCHASE IDN GSSAPI_NONE RRL
 OPTIONS_DEFINE=		SSL IDN REPLACE_BASE LARGE_FILE FIXED_RRSET SIGCHASE \
 			IPV6 THREADS FILTER_AAAA GOST PYTHON START_LATE MINCACHE \
 			LINKS RPZ_NSIP RPZ_NSDNAME RRL DOCS RPZ_PATCH NEWSTATS \

Modified: head/dns/dnsmasq-devel/Makefile
==============================================================================
--- head/dns/dnsmasq-devel/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/dns/dnsmasq-devel/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -26,7 +26,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" PREFIX="${PREFIX}" COPTS="${CFLAGS}" LIBS="${LDFLAGS}" RPM_OPT_FLAGS="${CPPFLAGS}"
 
 OPTIONS_DEFINE=		IPV6 DBUS LUA DNSSEC DOCS
-OPTIONS_DEFAULT=	IPV6 NLS DNSSEC
+OPTIONS_DEFAULT=	DNSSEC
 OPTIONS_EXCLUDE+=	EXAMPLES
 OPTIONS_RADIO=		INTL
 OPTIONS_RADIO_INTL=	IDN NLS

Modified: head/dns/dnsmasq/Makefile
==============================================================================
--- head/dns/dnsmasq/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/dns/dnsmasq/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -25,7 +25,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" PREFIX="${PREFIX}" COPTS="${CFLAGS}" LIBS="${LDFLAGS}" RPM_OPT_FLAGS="${CPPFLAGS}"
 
 OPTIONS_DEFINE=		IPV6 DBUS LUA DNSSEC DOCS
-OPTIONS_DEFAULT=	IPV6 NLS DNSSEC
+OPTIONS_DEFAULT=	DNSSEC
 OPTIONS_EXCLUDE+=	EXAMPLES
 OPTIONS_RADIO=		INTL
 OPTIONS_RADIO_INTL=	IDN NLS

Modified: head/dns/ldns/Makefile
==============================================================================
--- head/dns/ldns/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/dns/ldns/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -22,7 +22,7 @@ USE_LDCONFIG=	yes
 
 .if ! (defined(BUILD_PYLDNS) || defined(BUILD_P5PERL))
 OPTIONS_DEFINE=	DOXYGEN EXAMPLES DRILL
-OPTIONS_DEFAULT=	EXAMPLES DRILL
+OPTIONS_DEFAULT=	DRILL
 
 DRILL_DESC=	With drill program
 .endif

Modified: head/dns/libbind/Makefile
==============================================================================
--- head/dns/libbind/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/dns/libbind/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -20,7 +20,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --with-randomdev=/dev/random
 
 OPTIONS_DEFINE=	IPV6 THREADS
-OPTIONS_DEFAULT=	IPV6 THREADS
+OPTIONS_DEFAULT=	THREADS
 
 IPV6_CONFIGURE_ENABLE=		ipv6
 THREADS_CONFIGURE_ENABLE=	threads

Modified: head/dns/nsd/Makefile
==============================================================================
--- head/dns/nsd/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/dns/nsd/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -53,7 +53,7 @@ PORTDOCS=	CREDITS ChangeLog LICENSE NSD-
 
 OPTIONS_DEFINE=		ROOT_SERVER LARGEFILE IPV6 BIND8_STATS CHECKING \
 		MINRESPSIZE NSEC3 MMAP DOCS RRL ZONE_STATS MUNIN_PLUGIN
-OPTIONS_DEFAULT=	LARGEFILE IPV6 NSEC3 MINRESPSIZE RRL
+OPTIONS_DEFAULT=	LARGEFILE NSEC3 MINRESPSIZE RRL
 OPTIONS_SUB=	yes
 
 MUNIN_PLUGIN_IMPLIES=	BIND8_STATS

Modified: head/editors/apel/Makefile
==============================================================================
--- head/editors/apel/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/editors/apel/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -32,7 +32,6 @@ MAKE_ARGS+=	PREFIX="${STAGEDIR}${LOCALBA
 		VERSION_SPECIFIC_LISPDIR="${STAGEDIR}${APEL_VERSION_SPECIFIC_LISPDIR}"
 
 OPTIONS_DEFINE=	DOCS
-OPTIONS_DEFAULT=DOCS
 
 .include <bsd.port.pre.mk>
 

Modified: head/editors/flim/Makefile
==============================================================================
--- head/editors/flim/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/editors/flim/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -38,7 +38,6 @@ EMACS_MASTERDIR_PKGFILES=YES
 DESCR=		${PKGDIR}/pkg-descr
 
 OPTIONS_DEFINE=	DOCS
-OPTIONS_DEFAULT=	DOCS
 
 # target name for make build
 ALL_TARGET?=	elc

Modified: head/editors/jed/Makefile
==============================================================================
--- head/editors/jed/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/editors/jed/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libslang.so:devel/libslang2
 CONFLICTS=	jed-devel-[0-9]*
 
 OPTIONS_DEFINE=	X11 PERMS HOSTLOOKUP DOCS
-OPTIONS_DEFAULT=X11 HOSTLOOKUP DOCS
+OPTIONS_DEFAULT=X11 HOSTLOOKUP
 
 PERMS_DESC=	Respect permissions by Root
 HOSTLOOKUP_DESC=Look-up for hostname

Modified: head/editors/semi/Makefile
==============================================================================
--- head/editors/semi/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/editors/semi/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -43,7 +43,6 @@ MAKE_ARGS+=	PREFIX="${STAGEDIR}${LOCALBA
 		VERSION_SPECIFIC_LISPDIR="${STAGEDIR}${SEMI_VERSION_SPECIFIC_LISPDIR}"
 
 OPTIONS_DEFINE=	DOCS
-OPTIONS_DEFAULT=	DOCS
 
 .include <bsd.port.pre.mk>
 .include <bsd.port.options.mk>

Modified: head/editors/texworks/Makefile
==============================================================================
--- head/editors/texworks/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/editors/texworks/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -45,7 +45,6 @@ PLIST_DIRS=	lib/texworks
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS LUA PYTHON
-OPTIONS_DEFAULT=DOCS
 LUA_USES=	lua:51
 LUA_PLIST_FILES=lib/texworks/libTWLuaPlugin.so
 PYTHON_USES=	python:3

Modified: head/emulators/dolphin-emu/Makefile
==============================================================================
--- head/emulators/dolphin-emu/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/emulators/dolphin-emu/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -52,7 +52,7 @@ CMAKE_ARGS+=	-DDOLPHIN_WC_BRANCH:STRING=
 		-DDOLPHIN_WC_REVISION:STRING="1"
 
 OPTIONS_DEFINE=	PULSEAUDIO PORTAUDIO DEBUG FRAMEDUMPS UPNP NLS
-OPTIONS_DEFAULT=	PORTAUDIO FRAMEDUMPS UPNP NLS
+OPTIONS_DEFAULT=	PORTAUDIO FRAMEDUMPS UPNP
 OPTIONS_SUB=	yes
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_ON=	-DDISABLE_PULSEAUDIO:BOOL=OFF

Modified: head/ftp/curl/Makefile
==============================================================================
--- head/ftp/curl/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/ftp/curl/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -19,7 +19,7 @@ OPTIONS_SINGLE=	GSSAPI
 OPTIONS_RADIO_RESOLV=	CARES THREADED_RESOLVER
 OPTIONS_RADIO_SSL=	GNUTLS NSS OPENSSL POLARSSL WOLFSSL
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
-OPTIONS_DEFAULT=	CA_BUNDLE COOKIES IPV6 OPENSSL PROXY RESOLV THREADED_RESOLVER TLS_SRP
+OPTIONS_DEFAULT=	CA_BUNDLE COOKIES OPENSSL PROXY RESOLV THREADED_RESOLVER TLS_SRP
 CA_BUNDLE_DESC=		Install CA bundle for OpenSSL
 CA_BUNDLE_IMPLIES=	OPENSSL
 COOKIES_DESC=		Cookies support

Modified: head/ftp/lftp/Makefile
==============================================================================
--- head/ftp/lftp/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/ftp/lftp/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -35,7 +35,7 @@ SHEBANG_FILES=	src/verify-file \
 OPTIONS_DEFINE=	NLS
 OPTIONS_RADIO=	SSL
 OPTIONS_RADIO_SSL=	OPENSSL GNUTLS
-OPTIONS_DEFAULT=	SSL OPENSSL NLS
+OPTIONS_DEFAULT=	SSL OPENSSL
 OPTIONS_SUB=	yes
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls

Modified: head/ftp/proftpd/Makefile
==============================================================================
--- head/ftp/proftpd/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/ftp/proftpd/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -87,7 +87,7 @@ PLIST_FILES+=	libexec/proftpd/${m}.a \
 .endfor
 .else
 OPTIONS_DEFINE=	DOCS HTMLDOCS IPV6 NLS MEMCACHE PCRE
-OPTIONS_DEFAULT=	IPV6 NLS PCRE
+OPTIONS_DEFAULT=	PCRE
 
 HTMLDOCS_DESC=		Include HTML documentation
 MEMCACHE_DESC=		Memcache support using libmemcached

Modified: head/ftp/vsftpd-ext/Makefile
==============================================================================
--- head/ftp/vsftpd-ext/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/ftp/vsftpd-ext/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -29,7 +29,7 @@ DOCFILES=	AUDIT BENCHMARKS BUGS Changelo
 		SIZE SPEED TODO TUNING
 
 OPTIONS_DEFINE=	RC_SCRIPT VSFTPD_SSL DOCS
-OPTIONS_DEFAULT=RC_SCRIPT DOCS
+OPTIONS_DEFAULT=RC_SCRIPT
 RC_SCRIPT_DESC=	install RC_SCRIPT
 
 VSFTPD_SSL_DESC=Include support for SSL

Modified: head/ftp/yafc/Makefile
==============================================================================
--- head/ftp/yafc/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/ftp/yafc/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -13,7 +13,7 @@ COMMENT=	Yet another ftp client. Similar
 LICENSE=	GPLv2+
 
 OPTIONS_DEFINE=	BASH EXAMPLES NLS SSH READLINE
-OPTIONS_DEFAULT=BASH NLS SSH
+OPTIONS_DEFAULT=BASH SSH
 
 USES=		gmake tar:xz
 USE_OPENSSL=	yes

Modified: head/games/0verkill/Makefile
==============================================================================
--- head/games/0verkill/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/games/0verkill/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/doc/COPYING
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	X11 DOCS
-OPTIONS_DEFAULT=X11 DOCS
+OPTIONS_DEFAULT=X11
 
 OPTIONS_SUB=	yes
 X11_USE=	XORG=xpm

Modified: head/games/crafty/Makefile
==============================================================================
--- head/games/crafty/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/games/crafty/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -38,7 +38,6 @@ OPT=		-DHASHSTATS -DTRACE -DBOOKDIR=\\\"
 		-DPERSDIR=\\\"${WITH_PERSDIR}\\\" -DSKILL
 
 OPTIONS_DEFINE=	DOCS BOOK
-OPTIONS_DEFAULT=DOCS
 OPTIONS_SUB=	yes
 BOOK_DESC=	Include (default) opening book
 

Modified: head/games/gnubg/Makefile
==============================================================================
--- head/games/gnubg/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/games/gnubg/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -30,7 +30,6 @@ USES=		gmake libtool pathfix shebangfix 
 USE_GNOME=	glib20
 
 OPTIONS_DEFINE=	NLS DOCS
-OPTIONS_DEFAULT=NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext

Modified: head/games/ldmud/Makefile
==============================================================================
--- head/games/ldmud/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/games/ldmud/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -31,7 +31,7 @@ USERS=		mud
 GROUPS=		mud
 
 OPTIONS_DEFINE=	MYSQL PGSQL SQLITE IPV6 DOCS
-OPTIONS_DEFAULT=MYSQL PGSQL SQLITE IPV6 LPMUD
+OPTIONS_DEFAULT=MYSQL PGSQL SQLITE LPMUD
 OPTIONS_SINGLE=	MUDLIB
 OPTIONS_SINGLE_MUDLIB=	LPMUD DEMOLIB
 OPTIONS_SUB=	yes

Modified: head/games/trackballs/Makefile
==============================================================================
--- head/games/trackballs/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/games/trackballs/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -29,7 +29,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 OPTIONS_DEFINE=	MUSIC NLS
-OPTIONS_DEFAULT=	MUSIC NLS
+OPTIONS_DEFAULT=	MUSIC
 OPTIONS_SUB=	yes
 MUSIC_DESC=	Install additional music
 NLS_USES=	gettext

Modified: head/graphics/darktable/Makefile
==============================================================================
--- head/graphics/darktable/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/graphics/darktable/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -40,7 +40,7 @@ SQUISH_DESC=	Compress thumbnail via libs
 RAWSPEED_DESC=	Compile with rawspeed backend
 SLIDESHOW_DESC=	Build OpenGL/SDL slideshow viewer
 
-OPTIONS_DEFAULT=COLORD FLICKR GEO GPHOTO LUA NLS OPENEXR OPENJPEG	\
+OPTIONS_DEFAULT=COLORD FLICKR GEO GPHOTO LUA OPENEXR OPENJPEG	\
 		PRINT RAWSPEED SLIDESHOW SQUISH WEBP
 OPTIONS_SUB=	yes
 

Modified: head/graphics/gdk-pixbuf2/Makefile
==============================================================================
--- head/graphics/gdk-pixbuf2/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/graphics/gdk-pixbuf2/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -28,7 +28,7 @@ INSTALL_TARGET=	install-strip
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	JASPER JPEG PNG TIFF NLS
-OPTIONS_DEFAULT=JASPER JPEG PNG TIFF NLS
+OPTIONS_DEFAULT=JASPER JPEG PNG TIFF
 JASPER_CONFIGURE_WITH=	libjasper
 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 JPEG_CONFIGURE_WITH=	libjpeg

Modified: head/graphics/gimageview/Makefile
==============================================================================
--- head/graphics/gimageview/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/graphics/gimageview/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -25,7 +25,7 @@ LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	SPLASH NLS LIBMNG LIBWMF LIBRSVG2 LIBEXIF MPLAYER LIBXINE DOCS
-OPTIONS_DEFAULT=SPLASH NLS LIBMNG LIBWMF LIBRSVG2 LIBEXIF MPLAYER
+OPTIONS_DEFAULT=SPLASH LIBMNG LIBWMF LIBRSVG2 LIBEXIF MPLAYER
 OPTIONS_SUB=	yes
 
 SPLASH_DESC=		Show splash screen on startup

Modified: head/graphics/graphviz/Makefile
==============================================================================
--- head/graphics/graphviz/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/graphics/graphviz/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -53,7 +53,7 @@ OPTIONS_DEFINE=	XPM DIGCOLA IPSEPCOLA IC
 		ANN GTS GTK2 GDK GDK_PIXBUF GNOMEUI SMYRNA GVEDIT MING DEVIL \
 		GHOSTSCRIPT PERL PHP PYTHON RUBY LUA TCL TK GUILE NVTHREADS \
 		DOCS EXAMPLES
-OPTIONS_DEFAULT=	XPM DIGCOLA IPSEPCOLA ICONV NLS PANGOCAIRO NVTHREADS
+OPTIONS_DEFAULT=	XPM DIGCOLA IPSEPCOLA ICONV PANGOCAIRO NVTHREADS
 NO_OPTIONS_SORT=yes
 OPTIONS_SUB=	yes
 DIGCOLA_DESC=	neato layout engine wiwth DIGCOLA features

Modified: head/graphics/peps/Makefile
==============================================================================
--- head/graphics/peps/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/graphics/peps/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -24,9 +24,6 @@ PLIST_FILES=	bin/peps \
 PORTDOCS=	peps.pdf
 
 OPTIONS_DEFINE=	DOCS
-OPTIONS_DEFAULT=DOCS
-
-.include <bsd.port.options.mk>
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/peps ${STAGEDIR}${PREFIX}/bin

Modified: head/graphics/povray37/Makefile
==============================================================================
--- head/graphics/povray37/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/graphics/povray37/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -16,7 +16,7 @@ BROKEN_powerpc64=	Does not build
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 OPTIONS_DEFINE=	X11 PNG JPEG TIFF OPENEXR STATIC IO EXAMPLES DOCS
-OPTIONS_DEFAULT=PNG JPEG EXAMPLES DOCS
+OPTIONS_DEFAULT=PNG JPEG
 OPTIONS_SUB=	yes
 IO_DESC=	Without I/O restrictions (security risk)
 EXAMPLES_DESC=	Install example scenes

Modified: head/irc/atheme-services/Makefile
==============================================================================
--- head/irc/atheme-services/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/irc/atheme-services/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -29,7 +29,7 @@ LIB_DEPENDS+=	libmowgli-2.so:devel/libmo
 USE_RC_SUBR=	atheme-services
 
 OPTIONS_DEFINE=	CONTRIB CRACKLIB DOCS LDAP NLS PCRE PERL
-OPTIONS_DEFAULT=	CRACKLIB DOCS LDAP NLS PCRE PERL
+OPTIONS_DEFAULT=	CRACKLIB LDAP PCRE PERL
 
 CONTRIB_DESC=	Enable contrib modules
 CRACKLIB_DESC=	Use cracklib for checking password strength

Modified: head/irc/irc/Makefile
==============================================================================
--- head/irc/irc/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/irc/irc/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -24,7 +24,6 @@ CONFIGURE_WRKSRC=	${WRKSRC}/build
 CONFIGURE_SCRIPT=	support/configure
 
 OPTIONS_DEFINE=	IPV6
-OPTIONS_DEFAULT=IPV6
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 post-configure:

Modified: head/irc/ircd-ratbox/Makefile
==============================================================================
--- head/irc/ircd-ratbox/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/irc/ircd-ratbox/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -58,7 +58,7 @@ SMALL_NET_DESC=		Tune server internals f
 SERVICES_DESC=		Enable ratbox-services compatibility code
 SHORTCUTS_DESC=		Build with ircd-shortcut commands
 
-OPTIONS_DEFAULT=	OPENSSL IPV6 ZIPLINKS SHARED_MODS
+OPTIONS_DEFAULT=	OPENSSL ZIPLINKS SHARED_MODS
 OPTIONS_EXCLUDE=	NLS EXAMPLES
 
 OPTIONS_SUB=		yes

Modified: head/irc/irssi/Makefile
==============================================================================
--- head/irc/irssi/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/irc/irssi/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -21,7 +21,7 @@ CONFIGURE_ARGS=	--with-ncurses=${NCURSES
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	PERL PROXY SOCKS IPV6 BOT DOCS TRUECOLOR
-OPTIONS_DEFAULT=	PERL IPV6 DOCS
+OPTIONS_DEFAULT=	PERL
 OPTIONS_SUB=	yes
 SOCKS_DESC=	Socks proxy support
 SOCKS_CONFIGURE_WITH=	socks

Modified: head/japanese/navi2ch/Makefile
==============================================================================
--- head/japanese/navi2ch/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/japanese/navi2ch/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -30,7 +30,7 @@ PORTDOC_LISPS=	gikope.el navi2ch-logo.el
 LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}
 
 OPTIONS_DEFINE=	DOCS X11
-OPTIONS_DEFAULT=DOCS X11
+OPTIONS_DEFAULT=X11
 X11_RUN_DEPENDS=${LOCALBASE}/share/mona/monak12.pcf.gz:japanese/font-mona
 
 post-install:

Modified: head/java/icedtea-web/Makefile
==============================================================================
--- head/java/icedtea-web/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/java/icedtea-web/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -48,7 +48,7 @@ CONFIGURE_SHELL=	${bash_CMD}
 TEST_TARGET=	check
 
 OPTIONS_DEFINE=	DOCS PLUGIN RHINO TAGSOUP
-OPTIONS_DEFAULT=DOCS PLUGIN
+OPTIONS_DEFAULT=PLUGIN
 OPTIONS_SUB=	yes
 
 PLUGIN_DESC=	Enable the browser plug-in

Modified: head/java/openjdk6/Makefile
==============================================================================
--- head/java/openjdk6/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/java/openjdk6/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -30,7 +30,7 @@ RUN_DEPENDS=	javavm:java/javavmwrapper \
 OPENJDK_BUILDDATE=	03_may_2016
 
 OPTIONS_DEFINE=	ICEDTEA IPV6 POLICY SOUND TZUPDATE
-OPTIONS_DEFAULT=ICEDTEA IPV6 TZUPDATE
+OPTIONS_DEFAULT=ICEDTEA TZUPDATE
 ICEDTEA_DESC=	Apply additional patches from IcedTea
 POLICY_DESC=	Install the Unlimited Strength Policy Files
 SOUND_DESC=	Enable sound support

Modified: head/korean/libhangul/Makefile
==============================================================================
--- head/korean/libhangul/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/korean/libhangul/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -14,7 +14,6 @@ LICENSE=	LGPL21
 
 GNU_CONFIGURE=	yes
 OPTIONS_DEFINE=	NLS
-OPTIONS_DEFAULT=NLS
 OPTIONS_SUB=	NLS
 USE_LDCONFIG=	yes
 USES=		iconv libtool pkgconfig

Modified: head/lang/elixir/Makefile
==============================================================================
--- head/lang/elixir/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/lang/elixir/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -28,7 +28,7 @@ NO_ARCH=	yes
 OPTIONS_SUB=	yes
 
 OPTIONS_DEFINE=	SRC DOCS
-OPTIONS_DEFAULT=SRC DOCS
+OPTIONS_DEFAULT=SRC
 
 SRC_DESC=	Install source code
 

Modified: head/lang/ghc/Makefile
==============================================================================
--- head/lang/ghc/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/lang/ghc/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -48,7 +48,7 @@ OPTIONS_DEFINE=			PROFILE DYNAMIC LLVM D
 OPTIONS_SINGLE=			C_Compiler
 OPTIONS_SINGLE_C_Compiler=	GCC PCLANG BCLANG
 
-OPTIONS_DEFAULT=	PROFILE DYNAMIC DOCS GCC
+OPTIONS_DEFAULT=	PROFILE DYNAMIC GCC
 
 BOOT_DESC=		Use installed GHC for bootstrapping
 BOOTH_DESC=		Use installed HsColour for bootstrapping

Modified: head/lang/nhc98/Makefile
==============================================================================
--- head/lang/nhc98/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/lang/nhc98/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -26,7 +26,6 @@ MAKE_ARGS+=		ARCH=
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=		DOCS
-OPTIONS_DEFAULT=	DOCS
 
 DOCS_CONFIGURE_ON=	--docdir=${DOCSDIR} +docs
 DOCS_CONFIGURE_OFF=	-docs

Modified: head/lang/php55/Makefile
==============================================================================
--- head/lang/php55/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/lang/php55/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -35,7 +35,7 @@ CONFIGURE_ARGS+=--with-layout=GNU \
 USE_GNOME=	libxml2
 
 OPTIONS_DEFINE+=CLI CGI FPM EMBED DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS
-OPTIONS_DEFAULT=CLI CGI FPM IPV6 LINKTHR
+OPTIONS_DEFAULT=CLI CGI FPM LINKTHR
 # Bug 197128:  No ASM code for MIPS/MIPS64, disable FPM
 OPTIONS_EXCLUDE_mips=FPM
 OPTIONS_EXCLUDE_mips64=FPM

Modified: head/lang/php56/Makefile
==============================================================================
--- head/lang/php56/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/lang/php56/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -35,7 +35,7 @@ CONFIGURE_ARGS+=--with-layout=GNU \
 USE_GNOME=	libxml2
 
 OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS
-OPTIONS_DEFAULT=CLI CGI FPM IPV6 LINKTHR
+OPTIONS_DEFAULT=CLI CGI FPM LINKTHR
 # Bug 197128:  No ASM code for MIPS/MIPS64, disable FPM
 OPTIONS_EXCLUDE_mips=FPM
 OPTIONS_EXCLUDE_mips64=FPM

Modified: head/lang/php70/Makefile
==============================================================================
--- head/lang/php70/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/lang/php70/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -39,7 +39,7 @@ CONFIGURE_ARGS+=--with-layout=GNU \
 USE_GNOME=	libxml2
 
 OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 LINKTHR ZTS
-OPTIONS_DEFAULT=CLI CGI FPM IPV6 LINKTHR
+OPTIONS_DEFAULT=CLI CGI FPM LINKTHR
 # Bug 197128:  No ASM code for MIPS/MIPS64, disable FPM
 OPTIONS_EXCLUDE_mips=FPM
 OPTIONS_EXCLUDE_mips64=FPM

Modified: head/lang/python27/Makefile
==============================================================================
--- head/lang/python27/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/lang/python27/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -39,7 +39,7 @@ PLIST_SUB=		ABI=${ABIFLAGS} \
 			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554
 
 OPTIONS_DEFINE=		DEBUG IPV6 LIBFFI NLS PYMALLOC SEM THREADS
-OPTIONS_DEFAULT=	IPV6 LIBFFI NLS PYMALLOC SEM THREADS UCS4
+OPTIONS_DEFAULT=	LIBFFI PYMALLOC SEM THREADS UCS4
 OPTIONS_SINGLE=		UNICODE
 OPTIONS_SINGLE_UNICODE=	UCS2 UCS4
 OPTIONS_SUB=		yes

Modified: head/lang/python33/Makefile
==============================================================================
--- head/lang/python33/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/lang/python33/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -43,7 +43,7 @@ PLIST_SUB=		ABI=${ABIFLAGS} \
 			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554
 
 OPTIONS_DEFINE=		DEBUG IPV6 LIBFFI NLS PYMALLOC THREADS TSC
-OPTIONS_DEFAULT=	IPV6 LIBFFI NLS PYMALLOC THREADS
+OPTIONS_DEFAULT=	LIBFFI PYMALLOC THREADS
 OPTIONS_SUB=		yes
 
 LIBFFI_DESC=		Use libffi from ports instead of bundled version

Modified: head/lang/python34/Makefile
==============================================================================
--- head/lang/python34/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/lang/python34/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -43,7 +43,7 @@ PLIST_SUB=		ABI=${ABIFLAGS} \
 			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554
 
 OPTIONS_DEFINE=		DEBUG IPV6 LIBFFI NLS PYMALLOC THREADS TSC
-OPTIONS_DEFAULT=	IPV6 LIBFFI NLS PYMALLOC THREADS
+OPTIONS_DEFAULT=	LIBFFI PYMALLOC THREADS
 OPTIONS_RADIO=		HASH
 OPTIONS_RADIO_HASH=	FNV SIPHASH
 OPTIONS_SUB=		yes

Modified: head/lang/python35/Makefile
==============================================================================
--- head/lang/python35/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/lang/python35/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -50,7 +50,7 @@ PLIST_SUB=		XYDOT=${PYTHON_VER} XY=${PYT
 			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554
 
 OPTIONS_DEFINE=		DEBUG IPV6 LIBFFI NLS PYMALLOC THREADS TSC
-OPTIONS_DEFAULT=	IPV6 LIBFFI NLS PYMALLOC THREADS
+OPTIONS_DEFAULT=	LIBFFI PYMALLOC THREADS
 OPTIONS_RADIO=		HASH
 OPTIONS_RADIO_HASH=	FNV SIPHASH
 OPTIONS_SUB=		yes

Modified: head/mail/amavis-logwatch/Makefile
==============================================================================
--- head/mail/amavis-logwatch/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/mail/amavis-logwatch/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -20,7 +20,6 @@ USE_PERL5=	run
 NO_BUILD=	yes
 SHEBANG_FILES=	amavis-logwatch
 OPTIONS_DEFINE=	EXAMPLES DOCS
-OPTIONS_DEFAULT=EXAMPLES DOCS
 
 post-patch:
 	@cd ${WRKSRC} && ${REINPLACE_CMD} -e '\

Modified: head/mail/assp/Makefile
==============================================================================
--- head/mail/assp/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/mail/assp/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -56,7 +56,7 @@ MIMEMOD_DESC=	Multiple Attachement detec
 SSL_DESC=	SSL secure sockets support
 IPV6_DESC=	IPv6 sockets support
 
-OPTIONS_DEFAULT=	EMVALID SPF SRS SEND FBACKW CLAMAV DNSBL MATCHRE SENDERB MIMEMOD SSL IPV6
+OPTIONS_DEFAULT=	EMVALID SPF SRS SEND FBACKW CLAMAV DNSBL MATCHRE SENDERB MIMEMOD SSL
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/ASSP_1.9.9_14158_install/${PORTNAME:tu}
 

Modified: head/mail/libcmime/Makefile
==============================================================================
--- head/mail/libcmime/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/mail/libcmime/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -17,7 +17,6 @@ USE_LDCONFIG=	yes
 CMAKE_ARGS=	--no-warn-unused-cli
 
 OPTIONS_DEFINE=	DEBUG DOCS DOXYGEN
-OPTIONS_DEFAULT=DOCS
 OPTIONS_SUB=	yes
 DOCS_ALL_TARGET=doc
 

Modified: head/mail/meta1/Makefile
==============================================================================
--- head/mail/meta1/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/mail/meta1/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -43,7 +43,7 @@ META1CONFDIR?=	${PREFIX}/etc/meta1
 NOLOGIN_CMD?=	/usr/sbin/nologin
 
 OPTIONS_DEFINE=	IPV6 BDB PMILTER DKIM MSP SASL2 SASL2AUTHD TLS DOCS
-OPTIONS_DEFAULT=	IPV6 PMILTER DKIM SASL2 TLS
+OPTIONS_DEFAULT=	PMILTER DKIM SASL2 TLS
 NO_OPTIONS_SORT=yes
 OPTIONS_SUB=	yes
 

Modified: head/mail/milter-greylist-devel/Makefile
==============================================================================
--- head/mail/milter-greylist-devel/Makefile	Mon May 23 20:18:24 2016	(r415741)
+++ head/mail/milter-greylist-devel/Makefile	Mon May 23 20:35:01 2016	(r415742)
@@ -24,7 +24,7 @@ USES=		tar:tgz
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	DKIM SPF GEOIP CURL LDAP P0F POSTFIX DOCS EXAMPLES

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-head mailing list