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

9 files changed, 6 insertions, 10 deletions

diff --git a/audio/abraca/Makefile b/audio/abraca/Makefile
index d9627d5dcd2..c1cc0590c87 100644
--- a/audio/abraca/Makefile
+++ b/audio/abraca/Makefile
@@ -23,7 +23,6 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX} \
 			--mandir=${PREFIX}/man
 
 OPTIONS_DEFINE=	NLS
-OPTIONS_DEFAULT=	NLS
 
 OPTIONS_SUB=	yes
 NLS_USES=	gettext
diff --git a/audio/dsbmixer/Makefile b/audio/dsbmixer/Makefile
index b62de401497..c8dfa582266 100644
--- a/audio/dsbmixer/Makefile
+++ b/audio/dsbmixer/Makefile
@@ -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
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 78097d9ab67..5597e890ec3 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -36,7 +36,6 @@ CONFIGURE_ARGS=	--disable-appdata-validate \
 PORTDOCS=	HACKING THANKS TODO
 
 OPTIONS_DEFINE=	WAVPACK NLS OPUS SPEEX DOCS
-OPTIONS_DEFAULT=	NLS
 OPTIONS_SUB=	yes
 
 WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
diff --git a/audio/exaile/Makefile b/audio/exaile/Makefile
index bb9a025673f..87d9fcc966e 100644
--- a/audio/exaile/Makefile
+++ b/audio/exaile/Makefile
@@ -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
diff --git a/audio/idjc/Makefile b/audio/idjc/Makefile
index b685aab1714..7628cf3570b 100644
--- a/audio/idjc/Makefile
+++ b/audio/idjc/Makefile
@@ -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
diff --git a/audio/libmp3splt/Makefile b/audio/libmp3splt/Makefile
index 92add26b3ad..a4ece040082 100644
--- a/audio/libmp3splt/Makefile
+++ b/audio/libmp3splt/Makefile
@@ -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
diff --git a/audio/mp3splt/Makefile b/audio/mp3splt/Makefile
index 8e7bffd5a98..519e88cd804 100644
--- a/audio/mp3splt/Makefile
+++ b/audio/mp3splt/Makefile
@@ -23,7 +23,6 @@ CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=		NLS
-OPTIONS_DEFAULT=	NLS
 OPTIONS_SUB=		yes
 
 NLS_USES=		gettext
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index ce9f7f1b0c4..a2c6e99ebad 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -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
diff --git a/audio/shoutcast/Makefile b/audio/shoutcast/Makefile
index 60f226c45cf..de7512343f3 100644
--- a/audio/shoutcast/Makefile
+++ b/audio/shoutcast/Makefile
@@ -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