Add inet6 to default suggested options. It's 2012.

106 files changed, 221 insertions, 150 deletions

diff --git a/audio/audacious-plugins/options.mk b/audio/audacious-plugins/options.mk
index a23c782b58a..3b81786050d 100644
--- a/audio/audacious-plugins/options.mk
+++ b/audio/audacious-plugins/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.5 2011/02/26 14:44:33 hans Exp $
+# $NetBSD: options.mk,v 1.6 2012/06/12 15:45:54 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.audacious-plugins
 PKG_SUPPORTED_OPTIONS=	arts esound inet6 jack midi pulseaudio sid
-PKG_SUGGESTED_OPTIONS+=	pulseaudio
+PKG_SUGGESTED_OPTIONS+=	inet6 pulseaudio
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/audio/audacious/Makefile b/audio/audacious/Makefile
index d5182445858..0a1f913135e 100644
--- a/audio/audacious/Makefile
+++ b/audio/audacious/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/06/03 23:56:59 dholland Exp $
+# $NetBSD: Makefile,v 1.20 2012/06/12 15:45:54 wiz Exp $
 #
 
 DISTNAME=		audacious-1.5.1
@@ -24,6 +24,7 @@ PKGCONFIG_OVERRIDE+=	audacious.pc.in
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.audacious
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/audio/bmp/Makefile.common b/audio/bmp/Makefile.common
index 433310a847d..1ff9d745d38 100644
--- a/audio/bmp/Makefile.common
+++ b/audio/bmp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2011/04/17 09:02:17 obache Exp $
+# $NetBSD: Makefile.common,v 1.27 2012/06/12 15:45:54 wiz Exp $
 #
 # used by audio/bmp/Makefile
 # used by audio/bmp-esound/Makefile
@@ -46,6 +46,7 @@ PKGCONFIG_OVERRIDE+=	bmp.pc
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.bmp
 PKG_SUPPORTED_OPTIONS=	gnome inet6 xmms-eq
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 .include "../../mk/bsd.prefs.mk"
diff --git a/audio/esound/options.mk b/audio/esound/options.mk
index eb586cf26e1..8ea11126379 100644
--- a/audio/esound/options.mk
+++ b/audio/esound/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2005/06/08 13:20:04 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:45:54 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.esound
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/audio/libmpg123/mpg123-options.mk b/audio/libmpg123/mpg123-options.mk
index dff7a13e033..7c9be137922 100644
--- a/audio/libmpg123/mpg123-options.mk
+++ b/audio/libmpg123/mpg123-options.mk
@@ -1,8 +1,9 @@
-# $NetBSD: mpg123-options.mk,v 1.1 2008/10/15 01:58:53 bjs Exp $
+# $NetBSD: mpg123-options.mk,v 1.2 2012/06/12 15:45:54 wiz Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mpg123
 PKG_SUPPORTED_OPTIONS=	inet6 debug
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.fast.prefs.mk"
 
diff --git a/audio/musicpd/options.mk b/audio/musicpd/options.mk
index 5abb15a0aa3..960bc1e32d3 100644
--- a/audio/musicpd/options.mk
+++ b/audio/musicpd/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.18 2011/11/30 13:53:19 wiz Exp $
+# $NetBSD: options.mk,v 1.19 2012/06/12 15:45:54 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.musicpd
 PKG_SUPPORTED_OPTIONS=	audiofile bzip2 curl faad ffmpeg flac fluidsynth id3 inet6 libao lame jack libmms libwildmidi mikmod modplug musepack musicpd-lastfm ogg shout sqlite3 wavpack zziplib
-PKG_SUGGESTED_OPTIONS=	audiofile curl faad flac id3 libao musepack ogg
+PKG_SUGGESTED_OPTIONS=	audiofile curl faad flac id3 inet6 libao musepack ogg
 
 PKG_OPTIONS_LEGACY_OPTS=	libmikmod:mikmod
 PKG_OPTIONS_LEGACY_OPTS=	aac:faad
diff --git a/audio/xmms/Makefile.common b/audio/xmms/Makefile.common
index bc7d2e99bf7..c89d0359f0f 100644
--- a/audio/xmms/Makefile.common
+++ b/audio/xmms/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2011/04/17 09:13:13 obache Exp $
+# $NetBSD: Makefile.common,v 1.31 2012/06/12 15:45:54 wiz Exp $
 #
 # used by audio/xmms/Makefile
 # used by audio/xmms-esound/Makefile
@@ -34,6 +34,7 @@ PTHREAD_OPTS+=		require
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.xmms
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/chat/bitlbee/Makefile b/chat/bitlbee/Makefile
index 28f00acf09f..dd10f82a7a9 100644
--- a/chat/bitlbee/Makefile
+++ b/chat/bitlbee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2012/03/03 00:12:47 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2012/06/12 15:45:55 wiz Exp $
 #
 
 DISTNAME=		bitlbee-3.0.3
@@ -64,6 +64,8 @@ do-install:
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.bitlbee
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Minet6)
diff --git a/chat/cgiirc/Makefile b/chat/cgiirc/Makefile
index 0baa3d18173..fbecb49fbfd 100644
--- a/chat/cgiirc/Makefile
+++ b/chat/cgiirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2011/03/02 20:24:40 gls Exp $
+# $NetBSD: Makefile,v 1.18 2012/06/12 15:45:55 wiz Exp $
 
 DISTNAME=	cgiirc-0.5.10
 #PKGREVISION=	2
@@ -22,6 +22,7 @@ CONF_FILES+=	${PREFIX}/share/examples/cgiirc/cgiirc.config \
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cgiirc
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/chat/jabberd/options.mk b/chat/jabberd/options.mk
index 5a528b5abba..8b86fc05781 100644
--- a/chat/jabberd/options.mk
+++ b/chat/jabberd/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2005/06/02 21:39:53 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:45:55 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.jabberd
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/chat/ninja/options.mk b/chat/ninja/options.mk
index 15093b8217c..d1c4d371c32 100644
--- a/chat/ninja/options.mk
+++ b/chat/ninja/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2007/02/22 19:26:12 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2012/06/12 15:45:55 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ninja
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/chat/scrollz/Makefile b/chat/scrollz/Makefile
index e97997ac305..b947e24a32f 100644
--- a/chat/scrollz/Makefile
+++ b/chat/scrollz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2010/01/29 15:59:57 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2012/06/12 15:45:55 wiz Exp $
 #
 
 DISTNAME=	ScrollZ-1.9.5
@@ -20,6 +20,7 @@ INSTALLATION_DIRS+=	${PKGMANDIR}/man1
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.scrollz
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/chat/silc-client/options.mk b/chat/silc-client/options.mk
index 0f27a252729..7b25fcad622 100644
--- a/chat/silc-client/options.mk
+++ b/chat/silc-client/options.mk
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.5 2008/07/13 12:04:11 tonnerre Exp $
+# $NetBSD: options.mk,v 1.6 2012/06/12 15:45:55 wiz Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.silc-client
 PKG_SUPPORTED_OPTIONS=	debug inet6 perl
-PKG_SUGGESTED_OPTIONS=	perl
+PKG_SUGGESTED_OPTIONS=	inet6 perl
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/chat/silc-server/options.mk b/chat/silc-server/options.mk
index 44deb0467b8..d369eb2a1c9 100644
--- a/chat/silc-server/options.mk
+++ b/chat/silc-server/options.mk
@@ -1,8 +1,9 @@
-# $NetBSD: options.mk,v 1.3 2005/06/19 01:22:17 salo Exp $
+# $NetBSD: options.mk,v 1.4 2012/06/12 15:45:55 wiz Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.silc-server
 PKG_SUPPORTED_OPTIONS=	debug inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/chat/unrealircd/options.mk b/chat/unrealircd/options.mk
index f61e2d3941d..3adb25f715a 100644
--- a/chat/unrealircd/options.mk
+++ b/chat/unrealircd/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2008/06/13 23:15:33 adrianp Exp $
+# $NetBSD: options.mk,v 1.11 2012/06/12 15:45:55 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.unrealircd
 
@@ -11,7 +11,7 @@ PKG_SUPPORTED_OPTIONS+=	unrealircd-chroot unrealircd-prefixaq
 PKG_SUPPORTED_OPTIONS+=	unrealircd-showlistmodes unrealircd-topicisnuhost
 PKG_SUPPORTED_OPTIONS+=	unrealircd-shunnotices unrealircd-operoverride-verify
 PKG_SUPPORTED_OPTIONS+=	unrealircd-no-operoverride unrealircd-disableusermod
-PKG_SUGGESTED_OPTIONS=	unrealircd-showlistmodes unrealircd-hub \
+PKG_SUGGESTED_OPTIONS=	inet6 unrealircd-showlistmodes unrealircd-hub \
 			unrealircd-prefixaq
 
 .include "../../mk/bsd.options.mk"
diff --git a/databases/openldap-client/options.mk b/databases/openldap-client/options.mk
index bdb3f6c383c..a358247b199 100644
--- a/databases/openldap-client/options.mk
+++ b/databases/openldap-client/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.1.1.1 2006/05/31 18:18:34 ghen Exp $
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:45:55 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.openldap-client
 PKG_SUPPORTED_OPTIONS=	kerberos sasl slp inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/databases/openldap-server/options.mk b/databases/openldap-server/options.mk
index 655688b5f5e..49e1f7d6276 100644
--- a/databases/openldap-server/options.mk
+++ b/databases/openldap-server/options.mk
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.15 2012/03/13 19:57:12 adam Exp $
+# $NetBSD: options.mk,v 1.16 2012/06/12 15:45:55 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.openldap-server
 PKG_SUPPORTED_OPTIONS=	bdb sasl slp inet6 smbk5pwd dso
 PKG_OPTIONS_OPTIONAL_GROUPS+=	odbc
 PKG_OPTIONS_GROUP.odbc=	iodbc unixodbc
-PKG_SUGGESTED_OPTIONS=	bdb
+PKG_SUGGESTED_OPTIONS=	bdb inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/databases/p5-perl-ldap/Makefile b/databases/p5-perl-ldap/Makefile
index 5e146446d2a..b11b6ecd96e 100644
--- a/databases/p5-perl-ldap/Makefile
+++ b/databases/p5-perl-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2011/08/06 20:43:44 adam Exp $
+# $NetBSD: Makefile,v 1.42 2012/06/12 15:45:56 wiz Exp $
 
 DISTNAME=	perl-ldap-0.4001
 PKGNAME=	p5-${DISTNAME:S/4001/40.01/}
@@ -24,8 +24,10 @@ DEPENDS+=	p5-XML-SAX-Writer-[0-9]*:../../textproc/p5-XML-SAX-Writer
 
 MAKE_PARAMS+=	--skip	# skip CPAN auto installation of modules
 
-PKG_SUPPORTED_OPTIONS=	sasl inet6
 PKG_OPTIONS_VAR=	PKG_OPTIONS.p5-perl-ldap
+PKG_SUPPORTED_OPTIONS=	sasl inet6
+PKG_SUGGESTED_OPTIONS=	inet6
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Msasl)
diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index 125f1f4f982..b8228581a33 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2012/04/27 12:31:43 obache Exp $
+# $NetBSD: Makefile,v 1.77 2012/06/12 15:45:56 wiz Exp $
 #
 
 DISTNAME=	monotone-1.0
@@ -29,6 +29,7 @@ INSTALL_MAKE_FLAGS+=	bashcompdir=${PREFIX:Q}/share/examples/monotone
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.monotone
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 CHECK_INTERPRETER_SKIP+=	share/monotone/contrib/*
 CHECK_PORTABILITY_SKIP+=	debian/*
diff --git a/devel/scmcvs/options.mk b/devel/scmcvs/options.mk
index 9efa2f869f0..6008e09853e 100644
--- a/devel/scmcvs/options.mk
+++ b/devel/scmcvs/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2008/01/04 06:48:06 martti Exp $
+# $NetBSD: options.mk,v 1.3 2012/06/12 15:45:56 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cvs
 PKG_SUPPORTED_OPTIONS=	kerberos
@@ -10,6 +10,7 @@ PKG_SUPPORTED_OPTIONS=	kerberos
     empty(MACHINE_PLATFORM:MLinux-*) && \
     defined(NOT_YET_AVAILABLE_FOR_CVS_1_11_21)
 PKG_SUPPORTED_OPTIONS+=	inet6
+PKG_SUGGESTED_OPTIONS+=	inet6
 .endif
 
 .include "../../mk/bsd.options.mk"
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index 3fbe2c42239..9ad8ba6c0a8 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2012/03/03 00:13:06 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2012/06/12 15:45:56 wiz Exp $
 #
 
 DISTNAME=	gtetrinet-0.7.11
@@ -21,6 +21,7 @@ MAKE_FLAGS+=		schemadir=${PREFIX}/share/gconf/schemas
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gtetrinet
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/games/netris/options.mk b/games/netris/options.mk
index 13448c5e7c1..72096624531 100644
--- a/games/netris/options.mk
+++ b/games/netris/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2005/05/31 22:02:58 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2012/06/12 15:45:56 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.netris
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index 13e5c25bb37..246be181b6a 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2012/03/15 11:53:28 obache Exp $
+# $NetBSD: Makefile,v 1.26 2012/06/12 15:45:56 wiz Exp $
 
 DISTNAME=		quakeforge-0.5.5
 PKGREVISION=		11
@@ -29,6 +29,7 @@ REPLACE_PYTHON+=	tools/qfcc/source/qfpreqcc
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.quakeforge
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/games/xtris/options.mk b/games/xtris/options.mk
index 0a5f779e3c9..2aca96f8be1 100644
--- a/games/xtris/options.mk
+++ b/games/xtris/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2005/05/31 22:04:06 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2012/06/12 15:45:56 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.xtris
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/graphics/sane-backends/options.mk b/graphics/sane-backends/options.mk
index d7b7a8fbe4e..668825c5c0b 100644
--- a/graphics/sane-backends/options.mk
+++ b/graphics/sane-backends/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.8 2011/08/15 01:56:33 schnoebe Exp $
+# $NetBSD: options.mk,v 1.9 2012/06/12 15:45:56 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.sane-backends
 PKG_SUPPORTED_OPTIONS=		inet6 snmp
-PKG_SUGGESTED_OPTIONS=		#defined
+PKG_SUGGESTED_OPTIONS=		inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/lang/php5/Makefile.php b/lang/php5/Makefile.php
index bc0da60bfcb..ad7c50ef51a 100644
--- a/lang/php5/Makefile.php
+++ b/lang/php5/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.45 2012/05/13 16:08:37 taca Exp $
+# $NetBSD: Makefile.php,v 1.46 2012/06/12 15:45:57 wiz Exp $
 #
 
 .include "../../lang/php5/Makefile.common"
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=	--with-libxml-dir=${PREFIX:Q}
 # not defined yet, so we cannot use it here.
 PKG_OPTIONS_VAR=	PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
 PKG_SUPPORTED_OPTIONS+=	inet6 ssl maintainer-zts suhosin
-PKG_SUGGESTED_OPTIONS+=	ssl
+PKG_SUGGESTED_OPTIONS+=	inet6 ssl
 
 SUBST_CLASSES+=		ini
 SUBST_STAGE.ini=	post-patch
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 3048be802e4..729897de0fb 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2012/06/04 00:13:51 dholland Exp $
+# $NetBSD: Makefile,v 1.43 2012/06/12 15:45:57 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 INSTALLATION_DIRS+=	${EGDIR}
@@ -34,7 +34,7 @@ CONF_FILES=	${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.claws-mail
 PKG_SUPPORTED_OPTIONS=	claws-mail-jpilot ldap inet6
-PKG_SUGGESTED_OPTIONS=
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile
index 1479eca718b..532c7b9467b 100644
--- a/mail/cucipop/Makefile
+++ b/mail/cucipop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2011/11/01 14:47:09 bsiegert Exp $
+# $NetBSD: Makefile,v 1.35 2012/06/12 15:45:57 wiz Exp $
 #
 
 DISTNAME=	cucipop-1.31
@@ -36,6 +36,7 @@ SPECIAL_PERMS+=	${PREFIX}/sbin/cucipop ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 2555
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cucipop
 PKG_SUPPORTED_OPTIONS=	db inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/bsd.options.mk"
diff --git a/mail/cue/options.mk b/mail/cue/options.mk
index de9cec62121..cdf760c8c16 100644
--- a/mail/cue/options.mk
+++ b/mail/cue/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2009/12/15 13:11:18 taca Exp $
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:45:57 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cue
 PKG_SUPPORTED_OPTIONS=	canna idea inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mail/dk-milter/options.mk b/mail/dk-milter/options.mk
index 235a8b7f760..a467c9294aa 100644
--- a/mail/dk-milter/options.mk
+++ b/mail/dk-milter/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.1.1.1 2005/07/20 19:42:50 tv Exp $
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:45:57 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dk-milter
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mail/dkim-milter/options.mk b/mail/dkim-milter/options.mk
index 9b63e5458b9..3d0fdf6a805 100644
--- a/mail/dkim-milter/options.mk
+++ b/mail/dkim-milter/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.8 2010/10/18 08:42:31 pettai Exp $
+# $NetBSD: options.mk,v 1.9 2012/06/12 15:45:57 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dkim-milter
 PKG_SUPPORTED_OPTIONS=	inet6 dkim-milter-arlib debug dkim-stats without-libsm vbr
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mail/evolution-data-server/options.mk b/mail/evolution-data-server/options.mk
index 4debdd64dfe..1e125b6933d 100644
--- a/mail/evolution-data-server/options.mk
+++ b/mail/evolution-data-server/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2009/05/28 20:25:25 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:45:57 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.evolution-data-server
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mail/exim/options.mk b/mail/exim/options.mk
index f19eb8d427d..ead29471417 100644
--- a/mail/exim/options.mk
+++ b/mail/exim/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2010/09/17 12:01:37 adam Exp $
+# $NetBSD: options.mk,v 1.19 2012/06/12 15:45:57 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.exim
 PKG_SUPPORTED_OPTIONS=	exim-appendfile-maildir exim-appendfile-mailstore
@@ -13,7 +13,7 @@ PKG_SUPPORTED_OPTIONS+=	readline
 PKG_SUGGESTED_OPTIONS=	exim-appendfile-maildir exim-appendfile-mailstore
 PKG_SUGGESTED_OPTIONS+=	exim-appendfile-mbx exim-content-scan
 PKG_SUGGESTED_OPTIONS+=	exim-lookup-dsearch exim-old-demime exim-tcp-wrappers
-PKG_SUGGESTED_OPTIONS+=	exim-tls
+PKG_SUGGESTED_OPTIONS+=	exim-tls inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mail/gmime/options.mk b/mail/gmime/options.mk
index 983f9f6084f..4cce5509936 100644
--- a/mail/gmime/options.mk
+++ b/mail/gmime/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2005/01/10 20:59:43 adrianp Exp $
+# $NetBSD: options.mk,v 1.3 2012/06/12 15:45:57 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gmime
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mail/heirloom-mailx/options.mk b/mail/heirloom-mailx/options.mk
index 9e2a73691ff..2295229b2de 100644
--- a/mail/heirloom-mailx/options.mk
+++ b/mail/heirloom-mailx/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.1.1.1 2008/10/30 13:01:00 obache Exp $
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:45:58 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.heirloom-mailx
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/libmilter/options.mk b/mail/libmilter/options.mk
index f67e6a5c7b3..942543b413c 100644
--- a/mail/libmilter/options.mk
+++ b/mail/libmilter/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2007/09/25 20:05:24 jlam Exp $
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:45:58 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libmilter
 PKG_SUPPORTED_OPTIONS=	inet6
-PKG_SUGGESTED_OPTIONS=	# empty
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index e2387664a45..da8884682f0 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2012/03/03 00:13:30 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2012/06/12 15:45:58 wiz Exp $
 #
 
 DISTNAME=	mail-notification-5.4
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=	evolution=no
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mail-notification
 PKG_SUPPORTED_OPTIONS=	inet6 sasl ssl
-PKG_SUGGESTED_OPTIONS=	ssl
+PKG_SUGGESTED_OPTIONS=	inet6 ssl
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mail/msmtp/options.mk b/mail/msmtp/options.mk
index 00e06f3e13e..40e822b0621 100644
--- a/mail/msmtp/options.mk
+++ b/mail/msmtp/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2011/12/02 12:33:53 ryoon Exp $
+# $NetBSD: options.mk,v 1.13 2012/06/12 15:45:58 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.msmtp
 
@@ -6,7 +6,7 @@ PKG_OPTIONS_OPTIONAL_GROUPS=	ssl
 PKG_OPTIONS_GROUP.ssl=	gnutls ssl
 
 PKG_SUPPORTED_OPTIONS=	gnome-keyring gsasl idn inet6 scripts
-PKG_SUGGESTED_OPTIONS=	ssl
+PKG_SUGGESTED_OPTIONS=	inet6 ssl
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mail/poppassd/options.mk b/mail/poppassd/options.mk
index 11aee8c868a..3a364620184 100644
--- a/mail/poppassd/options.mk
+++ b/mail/poppassd/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2005/12/05 14:12:29 taca Exp $
+# $NetBSD: options.mk,v 1.3 2012/06/12 15:45:58 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.poppassd
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mail/qpopper/options.mk b/mail/qpopper/options.mk
index e6fae09a9e5..5221ac2b615 100644
--- a/mail/qpopper/options.mk
+++ b/mail/qpopper/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.12 2007/02/22 19:26:43 wiz Exp $
+# $NetBSD: options.mk,v 1.13 2012/06/12 15:45:58 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.qpopper
 PKG_SUPPORTED_OPTIONS=	drac inet6 kerberos pam qpopper-servermode ssl
-PKG_SUGGESTED_OPTIONS=	ssl
+PKG_SUGGESTED_OPTIONS=	inet6 ssl
 PKG_OPTIONS_LEGACY_VARS+=	QPOPPER_SERVERMODE:qpopper-servermode
 PKG_OPTIONS_LEGACY_VARS+=	QPOPPER_USE_DRAC:drac
 
diff --git a/mail/sendmail/options.mk b/mail/sendmail/options.mk
index f672a5e6751..a71d9cabb3c 100644
--- a/mail/sendmail/options.mk
+++ b/mail/sendmail/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.17 2007/04/26 06:26:27 jnemeth Exp $
+# $NetBSD: options.mk,v 1.18 2012/06/12 15:45:58 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sendmail
 PKG_SUPPORTED_OPTIONS=	inet6 db2 db4 ldap sasl tls tcpwrappers
-PKG_SUGGESTED_OPTIONS=	tcpwrappers
+PKG_SUGGESTED_OPTIONS=	inet6 tcpwrappers
 
 PKG_OPTIONS_LEGACY_OPTS+=	starttls:tls
 
diff --git a/mail/smtpfeed/Makefile b/mail/smtpfeed/Makefile
index 2c42b025adc..ef6a798d7aa 100644
--- a/mail/smtpfeed/Makefile
+++ b/mail/smtpfeed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2010/02/11 19:39:04 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2012/06/12 15:45:58 wiz Exp $
 
 DISTNAME=	smtpfeed-1.18
 PKGREVISION=	1
@@ -28,6 +28,7 @@ DOCS=	COPYRIGHT FEATURES FEATURES.j FYI FYI.j INSTALL INSTALL.j \
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.smtpfeed
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mail/solid-pop3d/options.mk b/mail/solid-pop3d/options.mk
index 6903a013f36..96699ad7541 100644
--- a/mail/solid-pop3d/options.mk
+++ b/mail/solid-pop3d/options.mk
@@ -1,10 +1,11 @@
-# $NetBSD: options.mk,v 1.1 2007/09/07 22:07:31 jlam Exp $
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:45:58 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.solid-pop3d
 PKG_SUPPORTED_OPTIONS=	inet6
 PKG_SUPPORTED_OPTIONS+=	solid-pop3d-aliases
 PKG_SUPPORTED_OPTIONS+=	solid-pop3d-apop
 PKG_SUPPORTED_OPTIONS+=	solid-pop3d-standalone
+PKG_SUGGESTED_OPTIONS=	inet6
 
 PKG_OPTIONS_LEGACY_VARS+=	SPOP3D_ENABLE_ALIASES:solid-pop3d-aliases
 PKG_OPTIONS_LEGACY_VARS+=	SPOP3D_ENABLE_APOP:solid-pop3d-apop
diff --git a/mail/spamassassin/options.mk b/mail/spamassassin/options.mk
index d9fb7316f84..7bd35435a4f 100644
--- a/mail/spamassassin/options.mk
+++ b/mail/spamassassin/options.mk
@@ -1,8 +1,7 @@
-# $NetBSD: options.mk,v 1.9 2010/03/24 21:41:10 heinz Exp $
+# $NetBSD: options.mk,v 1.10 2012/06/12 15:45:59 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.spamassassin
-PKG_SUPPORTED_OPTIONS=	inet6
-PKG_SUPPORTED_OPTIONS+=	ssl
+PKG_SUPPORTED_OPTIONS=	inet6 ssl
 
 #
 # Default options
diff --git a/mail/ssmtp/options.mk b/mail/ssmtp/options.mk
index 5800ad47ac1..cb67ec5a53e 100644
--- a/mail/ssmtp/options.mk
+++ b/mail/ssmtp/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:38 dillo Exp $
+# $NetBSD: options.mk,v 1.3 2012/06/12 15:45:59 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ssmtp
 PKG_SUPPORTED_OPTIONS=	inet6 ssl
-PKG_SUGGESTED_OPTIONS=	ssl
+PKG_SUGGESTED_OPTIONS=	inet6 ssl
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mail/teapop/options.mk b/mail/teapop/options.mk
index 4237c24a50f..f38225e6daf 100644
--- a/mail/teapop/options.mk
+++ b/mail/teapop/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.5 2007/12/22 21:13:46 adam Exp $
+# $NetBSD: options.mk,v 1.6 2012/06/12 15:45:59 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.teapop
 PKG_SUPPORTED_OPTIONS=	drac mysql apop vpop tcpd pgsql ldap inet6
-PKG_SUGGESTED_OPTIONS=	apop vpop tcpd
+PKG_SUGGESTED_OPTIONS=	apop inet6 tcpd vpop
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index 8f3be7597f1..5b73b9132e4 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2010/08/21 10:17:58 seb Exp $
+# $NetBSD: Makefile,v 1.53 2012/06/12 15:45:59 wiz Exp $
 
 DISTNAME=	sdr-3.0
 PKGREVISION=	2
@@ -20,6 +20,7 @@ HAS_CONFIGURE=	yes
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sdr
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mbone/vic-devel/options.mk b/mbone/vic-devel/options.mk
index 889353372d4..fb194d6f861 100644
--- a/mbone/vic-devel/options.mk
+++ b/mbone/vic-devel/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1.1.1 2008/12/16 19:35:45 sborrill Exp $
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:45:59 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.vic
 PKG_SUPPORTED_OPTIONS=		inet6 vic-gpl
-PKG_SUGGESTED_OPTIONS=		vic-gpl
+PKG_SUGGESTED_OPTIONS=		inet6 vic-gpl
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index 7a8dd0ff678..11c111609ce 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.114 2012/04/27 12:31:54 obache Exp $
+# $NetBSD: Makefile,v 1.115 2012/06/12 15:45:59 wiz Exp $
 #
 
 DISTNAME=		gnome-utils-2.32.0
@@ -25,6 +25,8 @@ CONFIGURE_ARGS+=	--enable-gtk-doc=no
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnome-utils
 PKG_SUPPORTED_OPTIONS+=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
+
 .include "../../mk/bsd.options.mk"
 .if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=	--enable-ipv6
diff --git a/net/argus/options.mk b/net/argus/options.mk
index 155b8859ef8..43ac3b73d2a 100644
--- a/net/argus/options.mk
+++ b/net/argus/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2005/06/22 13:14:50 markd Exp $
+# $NetBSD: options.mk,v 1.3 2012/06/12 15:45:59 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.argus
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/net/dnsmasq/Makefile b/net/dnsmasq/Makefile
index 48b7072d8aa..5551a850806 100644
--- a/net/dnsmasq/Makefile
+++ b/net/dnsmasq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/01/31 12:39:22 roy Exp $
+# $NetBSD: Makefile,v 1.17 2012/06/12 15:45:59 wiz Exp $
 #
 
 DISTNAME=		dnsmasq-2.59
@@ -16,6 +16,7 @@ CONF_FILES=		${PREFIX}/share/examples/dnsmasq/dnsmasq.conf.example \
 PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dnsmasq
 PKG_SUPPORTED_OPTIONS=	dbus inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 PLIST_VARS+=	dbus
 
 .include "../../mk/bsd.options.mk"
diff --git a/net/isc-dhcp4/options.mk b/net/isc-dhcp4/options.mk
index 87ec4f7d76e..cb0601028a0 100644
--- a/net/isc-dhcp4/options.mk
+++ b/net/isc-dhcp4/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.1.1.1 2008/02/13 22:03:58 adrianp Exp $
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:45:59 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dhcp
 PKG_SUPPORTED_OPTIONS+=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/net/libupnp/options.mk b/net/libupnp/options.mk
index 215654901c7..658e2da09f6 100644
--- a/net/libupnp/options.mk
+++ b/net/libupnp/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2012/04/13 23:38:34 obache Exp $
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:46:00 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libupnp
 PKG_SUPPORTED_OPTIONS=	inet6 debug
-PKG_SUGGESTED_OPTIONS=	# empty
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile
index d594fa548b6..a0a5f9e9ffb 100644
--- a/net/mDNSResponder/Makefile
+++ b/net/mDNSResponder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2011/01/13 03:15:50 obache Exp $
+# $NetBSD: Makefile,v 1.36 2012/06/12 15:46:00 wiz Exp $
 
 DISTNAME=	mDNSResponder-258.14
 CATEGORIES=	net
@@ -58,6 +58,7 @@ LDFLAGS.SunOS+=	-lsocket
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mDNSResponder
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/net/mrtg/options.mk b/net/mrtg/options.mk
index 263076e8b5f..23cf524d666 100644
--- a/net/mrtg/options.mk
+++ b/net/mrtg/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.4 2011/08/06 11:52:16 tron Exp $
+# $NetBSD: options.mk,v 1.5 2012/06/12 15:46:00 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mrtg
 PKG_SUPPORTED_OPTIONS=	inet6 mrtg-snmpv3
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/net/net-snmp/options.mk b/net/net-snmp/options.mk
index a0812ffb24c..cd07353f37f 100644
--- a/net/net-snmp/options.mk
+++ b/net/net-snmp/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2011/06/24 09:46:10 adam Exp $
+# $NetBSD: options.mk,v 1.14 2012/06/12 15:46:00 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.net-snmp
 PKG_SUPPORTED_OPTIONS=		ssl snmp-unprived snmp-nokmem perl
@@ -9,6 +9,7 @@ PKG_SUGGESTED_OPTIONS=		perl
 .if ${OPSYS} != "SunOS"
 # net-snmp doesn't do IPv6 on Solaris
 PKG_SUPPORTED_OPTIONS+=		inet6
+PKG_SUGGESTED_OPTIONS+=		inet6
 .endif
 
 .include "../../mk/bsd.options.mk"
diff --git a/net/nsd/Makefile b/net/nsd/Makefile
index 397ec75f5ee..8ff0fd61b32 100644
--- a/net/nsd/Makefile
+++ b/net/nsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2012/04/18 10:39:43 pettai Exp $
+# $NetBSD: Makefile,v 1.55 2012/06/12 15:46:00 wiz Exp $
 
 DISTNAME=	nsd-3.2.10
 CATEGORIES=	net
@@ -14,6 +14,7 @@ BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.7
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.nsd
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/net/ntp4/options.mk b/net/ntp4/options.mk
index c14449f1951..cb2c1447b52 100644
--- a/net/ntp4/options.mk
+++ b/net/ntp4/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2009/09/08 08:40:26 tnn Exp $
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:46:00 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ntp4
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .if empty(MISSING_FEATURES:Minet6)
 PKG_SUGGESTED_OPTIONS+=	inet6
diff --git a/net/oidentd/Makefile b/net/oidentd/Makefile
index 9f7b9ea2e8e..dfb182a5fe5 100644
--- a/net/oidentd/Makefile
+++ b/net/oidentd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2011/03/20 12:45:07 obache Exp $
+# $NetBSD: Makefile,v 1.13 2012/06/12 15:46:00 wiz Exp $
 
 DISTNAME=	oidentd-2.0.7
 PKGREVISION=	4
@@ -20,6 +20,7 @@ OSVERSION_SPECIFIC=	YES
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.oidentd
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/net/omniORB/Makefile b/net/omniORB/Makefile
index 46ff241d105..b758addbc56 100644
--- a/net/omniORB/Makefile
+++ b/net/omniORB/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/03/16 04:31:15 obache Exp $
+# $NetBSD: Makefile,v 1.5 2012/06/12 15:46:00 wiz Exp $
 #
 
 DISTNAME=		omniORB-4.1.5
@@ -39,6 +39,8 @@ CONFIGURE_ARGS+=	--with-omniORB-config=${OMNIORB_CONFIG:Q}
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.omniORB
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
+
 .include "../../mk/bsd.options.mk"
 .if empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=--disable-ipv6
diff --git a/net/ortp/options.mk b/net/ortp/options.mk
index ba43d036e49..46173aea585 100644
--- a/net/ortp/options.mk
+++ b/net/ortp/options.mk
@@ -1,8 +1,9 @@
-# $NetBSD: options.mk,v 1.1.1.1 2009/10/02 19:09:29 markd Exp $
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:46:00 wiz Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ortp
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/net/pchar/Makefile b/net/pchar/Makefile
index d6cd174ac43..da66ceeeb67 100644
--- a/net/pchar/Makefile
+++ b/net/pchar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2010/01/17 12:02:34 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2012/06/12 15:46:01 wiz Exp $
 
 DISTNAME=		pchar-1.5
 PKGREVISION=		2
@@ -16,6 +16,7 @@ USE_LANGUAGES=		c c++
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.pchar
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/net/proftpd/options.mk b/net/proftpd/options.mk
index ba2ae11f712..26890cb4695 100644
--- a/net/proftpd/options.mk
+++ b/net/proftpd/options.mk
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.10 2011/01/12 07:31:00 adam Exp $
+# $NetBSD: options.mk,v 1.11 2012/06/12 15:46:01 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.proftpd
-PKG_SUGGESTED_OPTIONS=	pam inet6
 PKG_SUPPORTED_OPTIONS=	pam inet6 wrap tls quota ldap proftpd-readme ban
 PKG_OPTIONS_OPTIONAL_GROUPS+=	sql
 PKG_OPTIONS_GROUP.sql=		mysql pgsql
+PKG_SUGGESTED_OPTIONS=	pam inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/net/quagga/options.mk b/net/quagga/options.mk
index c04fefca59c..4394ff15bf5 100644
--- a/net/quagga/options.mk
+++ b/net/quagga/options.mk
@@ -1,10 +1,11 @@
-# $NetBSD: options.mk,v 1.4 2011/12/05 17:52:37 gdt Exp $
+# $NetBSD: options.mk,v 1.5 2012/06/12 15:46:01 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.quagga
 PKG_SUPPORTED_OPTIONS=	inet6
 PKG_SUPPORTED_OPTIONS+=	quagga-ospf-opaque-lsa
-PKG_SUGGESTED_OPTIONS+=	quagga-ospf-opaque-lsa
 PKG_SUPPORTED_OPTIONS+=	quagga-vtysh
+PKG_SUGGESTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS+=	quagga-ospf-opaque-lsa
 PKG_SUGGESTED_OPTIONS+=	quagga-vtysh
 
 PKG_OPTIONS_LEGACY_VARS+=	USE_ZEBRA_OSPF_OPAQUELSA:quagga-ospf-opaque-lsa
diff --git a/net/rbldnsd/options.mk b/net/rbldnsd/options.mk
index c07259d10a2..7c144ff1525 100644
--- a/net/rbldnsd/options.mk
+++ b/net/rbldnsd/options.mk
@@ -1,8 +1,7 @@
-# $NetBSD: options.mk,v 1.1.1.1 2006/12/08 22:14:12 cube Exp $
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:46:01 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.rbldnsd
 PKG_SUPPORTED_OPTIONS=	inet6 rbldnsd-master-dump zlib
-
 PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
diff --git a/net/smokeping/options.mk b/net/smokeping/options.mk
index a18ce1e8b82..0abc1984afd 100644
--- a/net/smokeping/options.mk
+++ b/net/smokeping/options.mk
@@ -1,8 +1,9 @@
-# $NetBSD: options.mk,v 1.2 2007/11/22 22:56:01 adrianp Exp $
+# $NetBSD: options.mk,v 1.3 2012/06/12 15:46:01 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.smokeping
 
 PKG_SUPPORTED_OPTIONS=	smokeping-speedycgi inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 ###
 ### Just here to ease migration to the options framework
diff --git a/net/snort/options.mk b/net/snort/options.mk
index 546ac3aedb3..8c8b79764b8 100644
--- a/net/snort/options.mk
+++ b/net/snort/options.mk
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.5 2007/10/31 16:49:17 adrianp Exp $
+# $NetBSD: options.mk,v 1.6 2012/06/12 15:46:01 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.snort
 
 PKG_SUPPORTED_OPTIONS=	debug snort-prelude ssl snmp snort-gre
 PKG_SUPPORTED_OPTIONS+=	snort-dynamicplugin snort-timestats
 PKG_SUPPORTED_OPTIONS+=	snort-rulestate inet6
-PKG_SUGGESTED_OPTIONS=
+PKG_SUGGESTED_OPTIONS=	inet6
 
 PKG_OPTIONS_OPTIONAL_GROUPS=	flex
 PKG_OPTIONS_GROUP.flex=		snort-flexresp snort-flexresp2
diff --git a/net/socat/options.mk b/net/socat/options.mk
index 3475a401994..10dbb9e426f 100644
--- a/net/socat/options.mk
+++ b/net/socat/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2007/10/09 20:21:29 adrianp Exp $
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:46:01 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.socat
 PKG_SUPPORTED_OPTIONS+=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/net/tcpdump/options.mk b/net/tcpdump/options.mk
index b68ec805728..f07cc31c00e 100644
--- a/net/tcpdump/options.mk
+++ b/net/tcpdump/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2010/08/21 12:04:52 obache Exp $
+# $NetBSD: options.mk,v 1.3 2012/06/12 15:46:01 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.tcpdump
 PKG_SUPPORTED_OPTIONS=	inet6 ssl libsmi
-PKG_SUGGESTED_OPTIONS=	ssl
+PKG_SUGGESTED_OPTIONS=	inet6 ssl
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/net/tnftpd/options.mk b/net/tnftpd/options.mk
index 24860542cf3..b84ae4aa360 100644
--- a/net/tnftpd/options.mk
+++ b/net/tnftpd/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2008/10/09 04:14:29 lukem Exp $
+# $NetBSD: options.mk,v 1.3 2012/06/12 15:46:02 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.tnftpd
 PKG_SUPPORTED_OPTIONS=	inet6 pam
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/net/trafshow/Makefile b/net/trafshow/Makefile
index 80e9372907a..8ee7c9b4605 100644
--- a/net/trafshow/Makefile
+++ b/net/trafshow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2011/03/17 22:09:52 zafer Exp $
+# $NetBSD: Makefile,v 1.34 2012/06/12 15:46:02 wiz Exp $
 
 DISTNAME=	trafshow-5.2.3
 CATEGORIES=	net
@@ -16,6 +16,7 @@ GNU_CONFIGURE=	yes
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.trafshow
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/net/ttt/options.mk b/net/ttt/options.mk
index 074628bf655..53adc575101 100644
--- a/net/ttt/options.mk
+++ b/net/ttt/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2007/10/14 02:04:38 obache Exp $
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:46:02 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ttt
 PKG_SUPPORTED_OPTIONS+=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/net/ucspi-tcp/options.mk b/net/ucspi-tcp/options.mk
index 5565a912757..cb1a15e4838 100644
--- a/net/ucspi-tcp/options.mk
+++ b/net/ucspi-tcp/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2011/06/09 01:47:13 schmonz Exp $
+# $NetBSD: options.mk,v 1.3 2012/06/12 15:46:02 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ucspi-tcp
 PKG_SUPPORTED_OPTIONS+=	inet6 ucspi-tcp-nodefaultrbl
-PKG_SUGGESTED_OPTIONS+=	ucspi-tcp-nodefaultrbl
+PKG_SUGGESTED_OPTIONS+=	inet6 ucspi-tcp-nodefaultrbl
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/net/vino/options.mk b/net/vino/options.mk
index af2ef352a81..209e61b4052 100644
--- a/net/vino/options.mk
+++ b/net/vino/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.4 2010/07/08 18:37:03 drochner Exp $
+# $NetBSD: options.mk,v 1.5 2012/06/12 15:46:02 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.vino
 PKG_SUPPORTED_OPTIONS+=	avahi inet6 telepathy
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/net/wget/options.mk b/net/wget/options.mk
index 61a675b7025..48346a1a2ef 100644
--- a/net/wget/options.mk
+++ b/net/wget/options.mk
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.6 2011/10/24 15:22:01 ryoon Exp $
+# $NetBSD: options.mk,v 1.7 2012/06/12 15:46:02 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.wget
 PKG_SUPPORTED_OPTIONS=	gnutls idn inet6 openssl
 PKG_OPTIONS_REQUIRED_GROUPS=	ssl
 PKG_OPTIONS_GROUP.ssl=	gnutls openssl
-PKG_SUGGESTED_OPTIONS=	idn openssl
+PKG_SUGGESTED_OPTIONS=	idn inet6 openssl
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/news/knews/Makefile b/news/knews/Makefile
index abdbefb0604..9de32a2fb79 100644
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2012/03/04 07:45:02 tron Exp $
+# $NetBSD: Makefile,v 1.61 2012/06/12 15:46:02 wiz Exp $
 
 DISTNAME=	knews-1.0b.1
 PKGNAME=	knews-1.0
@@ -22,6 +22,7 @@ BUILD_DEFS+=	KNEWS_DOMAIN_NAME KNEWS_DOMAIN_FILE
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.knews
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile
index b4ee7c79925..d2728626876 100644
--- a/news/leafnode/Makefile
+++ b/news/leafnode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2012/03/03 00:13:48 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2012/06/12 15:46:02 wiz Exp $
 
 DISTNAME=		leafnode-1.11.7
 PKGREVISION=		1
@@ -53,6 +53,7 @@ USE_TOOLS+=		gmake
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.leafnode
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/news/tin/options.mk b/news/tin/options.mk
index 889b87e57bf..567fb835bd3 100644
--- a/news/tin/options.mk
+++ b/news/tin/options.mk
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.12 2010/07/26 06:52:52 dholland Exp $
+# $NetBSD: options.mk,v 1.13 2012/06/12 15:46:02 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.tin
 PKG_SUPPORTED_OPTIONS=		icu inet6 tin-use-inn-spool
 PKG_OPTIONS_OPTIONAL_GROUPS=	display
 PKG_OPTIONS_GROUP.display=	curses ncurses ncursesw
-PKG_SUGGESTED_OPTIONS=		curses
+PKG_SUGGESTED_OPTIONS=		curses inet6
 # untested
 #PKG_SUPPORTED_OPTIONS+=	socks
 
diff --git a/pkgtools/pkg_install/options.mk b/pkgtools/pkg_install/options.mk
index 20f8374b632..29c1645d029 100644
--- a/pkgtools/pkg_install/options.mk
+++ b/pkgtools/pkg_install/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2010/01/26 15:48:13 joerg Exp $
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:46:02 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libfetch
 PKG_SUPPORTED_OPTIONS=	inet6
-PKG_SUGGESTED_OPTIONS=
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/security/dnssec-tools/options.mk b/security/dnssec-tools/options.mk
index 887efcdae03..0959478e40f 100644
--- a/security/dnssec-tools/options.mk
+++ b/security/dnssec-tools/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1.1.1 2010/07/22 21:08:26 pettai Exp $
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:46:03 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.dnssec-tools
 PKG_SUPPORTED_OPTIONS=		inet6 dlv
-PKG_SUGGESTED_OPTIONS=
+PKG_SUGGESTED_OPTIONS=		inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/security/putty/options.mk b/security/putty/options.mk
index ea902fe368c..93b6faf80e6 100644
--- a/security/putty/options.mk
+++ b/security/putty/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2012/02/22 15:27:13 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:46:03 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.putty
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/security/stunnel/options.mk b/security/stunnel/options.mk
index b14affd8f44..411063526da 100644
--- a/security/stunnel/options.mk
+++ b/security/stunnel/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.7 2009/10/30 23:54:52 jym Exp $
+# $NetBSD: options.mk,v 1.8 2012/06/12 15:46:03 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.stunnel
 PKG_SUPPORTED_OPTIONS=	inet6 threads tcpwrappers
-PKG_SUGGESTED_OPTIONS=	tcpwrappers
+PKG_SUGGESTED_OPTIONS=	inet6 tcpwrappers
 CHECK_BUILTIN.pthread:=		yes
 .include "../../mk/pthread.builtin.mk"
 CHECK_BUILTIN.pthread:=		no
diff --git a/security/tcp_wrappers/Makefile b/security/tcp_wrappers/Makefile
index dbfc5acd478..df2293a3551 100644
--- a/security/tcp_wrappers/Makefile
+++ b/security/tcp_wrappers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2011/02/06 08:39:59 obache Exp $
+# $NetBSD: Makefile,v 1.35 2012/06/12 15:46:03 wiz Exp $
 
 DISTNAME=	tcp_wrappers_7.6-ipv6.1
 PKGNAME=	tcp_wrappers-7.6.1
@@ -17,6 +17,7 @@ USE_LIBTOOL=		yes
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.tcp_wrappers
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/sysutils/amanda-common/options.mk b/sysutils/amanda-common/options.mk
index 9fe3d7ad2d5..b82d60e1e21 100644
--- a/sysutils/amanda-common/options.mk
+++ b/sysutils/amanda-common/options.mk
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.4 2012/05/21 04:25:36 sbd Exp $
+# $NetBSD: options.mk,v 1.5 2012/06/12 15:46:03 wiz Exp $
 
 # Since amanda's ipv6 usage is broken, turn it off by default.
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.amanda
 PKG_SUPPORTED_OPTIONS+=	inet6 amanda-fqdn amanda-ssh
-PKG_SUGGESTED_OPTIONS+=	amanda-ssh
+PKG_SUGGESTED_OPTIONS+=	inet6 amanda-ssh
 
 PKG_OPTIONS_LEGACY_VARS+=	AMANDA_FQDN:amanda-fqdn
 PKG_OPTIONS_LEGACY_VARS+=	AMANDA_SSH:amanda-ssh
diff --git a/sysutils/gnome-vfs/options.mk b/sysutils/gnome-vfs/options.mk
index 60cf48e13c9..43fd232ca1f 100644
--- a/sysutils/gnome-vfs/options.mk
+++ b/sysutils/gnome-vfs/options.mk
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.4 2009/11/12 00:13:26 drochner Exp $
+# $NetBSD: options.mk,v 1.5 2012/06/12 15:46:03 wiz Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnome-vfs
 PKG_SUPPORTED_OPTIONS=	fam gssapi hal inet6 avahi
-PKG_SUGGESTED_OPTIONS=	fam hal
+PKG_SUGGESTED_OPTIONS=	fam hal inet6
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/sysutils/socket/Makefile b/sysutils/socket/Makefile
index fca0a9f8cd3..f3a3c1d9daa 100644
--- a/sysutils/socket/Makefile
+++ b/sysutils/socket/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2010/02/04 20:58:45 heinz Exp $
+# $NetBSD: Makefile,v 1.17 2012/06/12 15:46:03 wiz Exp $
 
 DISTNAME=	socket-1.1
 CATEGORIES=	sysutils net
@@ -14,6 +14,7 @@ MAKE_ENV+=	INSTALLBASE=${PREFIX:Q}
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.socket
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 
diff --git a/textproc/libxml2/options.mk b/textproc/libxml2/options.mk
index 8276927cdff..15c408f6397 100644
--- a/textproc/libxml2/options.mk
+++ b/textproc/libxml2/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2008/10/09 19:20:36 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:46:03 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libxml2
 PKG_SUPPORTED_OPTIONS+=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/www/curl/options.mk b/www/curl/options.mk
index 1890540cd33..2b01643152c 100644
--- a/www/curl/options.mk
+++ b/www/curl/options.mk
@@ -1,7 +1,9 @@
-# $NetBSD: options.mk,v 1.7 2010/07/21 18:48:27 drochner Exp $
+# $NetBSD: options.mk,v 1.8 2012/06/12 15:46:03 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.curl
 PKG_SUPPORTED_OPTIONS=	inet6 libssh2 gssapi ldap rtmp
+PKG_SUGGESTED_OPTIONS=	inet6
+
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == NetBSD
 # Kerberos is built in - no additional dependency
diff --git a/www/dillo/options.mk b/www/dillo/options.mk
index 3fef10ee06a..5dbd6676168 100644
--- a/www/dillo/options.mk
+++ b/www/dillo/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2008/10/31 02:02:44 snj Exp $
+# $NetBSD: options.mk,v 1.3 2012/06/12 15:46:04 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dillo
 PKG_SUPPORTED_OPTIONS=	inet6 ssl
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/www/elinks/options.mk b/www/elinks/options.mk
index 0bb59d96b02..408901dbcaf 100644
--- a/www/elinks/options.mk
+++ b/www/elinks/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2012/01/09 14:53:31 drochner Exp $
+# $NetBSD: options.mk,v 1.14 2012/06/12 15:46:04 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.elinks
 PKG_SUPPORTED_OPTIONS+=	bittorrent nntp javascript finger gopher
@@ -11,7 +11,7 @@ PKG_OPTIONS_GROUP.malloc=	boehm-gc elinks-fastmem
 PKG_OPTIONS_REQUIRED_GROUPS=	tls
 PKG_OPTIONS_OPTIONAL_GROUPS=	malloc
 PKG_SUGGESTED_OPTIONS=	ssl javascript elinks-html-highlight elinks-exmode
-PKG_SUGGESTED_OPTIONS+=	expat boehm-gc
+PKG_SUGGESTED_OPTIONS+=	expat boehm-gc inet6
 
 PKG_OPTIONS_LEGACY_OPTS+= spidermonkey:javascript
 
diff --git a/www/lynx/options.mk b/www/lynx/options.mk
index fcc4da61b92..0ca67d612b1 100644
--- a/www/lynx/options.mk
+++ b/www/lynx/options.mk
@@ -1,8 +1,7 @@
-# $NetBSD: options.mk,v 1.12 2010/02/25 18:50:21 drochner Exp $
+# $NetBSD: options.mk,v 1.13 2012/06/12 15:46:04 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.lynx
 PKG_SUPPORTED_OPTIONS=	inet6
-PKG_SUGGESTED_OPTIONS=	curses
 
 PKG_OPTIONS_OPTIONAL_GROUPS=	socksproxy
 PKG_OPTIONS_GROUP.socksproxy=	socks5 socks4
@@ -10,6 +9,8 @@ PKG_OPTIONS_GROUP.socksproxy=	socks5 socks4
 PKG_OPTIONS_REQUIRED_GROUPS=	screen
 PKG_OPTIONS_GROUP.screen=	ncurses ncursesw slang curses
 
+PKG_SUGGESTED_OPTIONS=	curses inet6
+
 .include "../../mk/bsd.options.mk"
 
 ###
diff --git a/www/nginx/options.mk b/www/nginx/options.mk
index 8a2f44dbdb7..80dced8c8de 100644
--- a/www/nginx/options.mk
+++ b/www/nginx/options.mk
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.14 2012/04/21 10:32:47 imil Exp $
+# $NetBSD: options.mk,v 1.15 2012/06/12 15:46:04 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.nginx
 PKG_SUPPORTED_OPTIONS=	dav flv gtools inet6 mail-proxy memcache naxsi pcre \
 			push realip ssl sub uwsgi image-filter upload debug \
 			status
-PKG_SUGGESTED_OPTIONS=	pcre ssl
+PKG_SUGGESTED_OPTIONS=	inet6 pcre ssl
 
 PLIST_VARS+=		naxsi uwsgi
 
diff --git a/www/screws/options.mk b/www/screws/options.mk
index 4020ad38551..e1246d35010 100644
--- a/www/screws/options.mk
+++ b/www/screws/options.mk
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.3 2005/06/19 01:46:36 salo Exp $
+# $NetBSD: options.mk,v 1.4 2012/06/12 15:46:04 wiz Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.screws
 PKG_SUPPORTED_OPTIONS=	inet6 lua ssl
-PKG_SUGGESTED_OPTIONS=	lua ssl
+PKG_SUGGESTED_OPTIONS=	inet6 lua ssl
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/www/w3m/options.mk b/www/w3m/options.mk
index 25d11050459..dded5be95ae 100644
--- a/www/w3m/options.mk
+++ b/www/w3m/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.12 2011/01/22 13:27:15 wiz Exp $
+# $NetBSD: options.mk,v 1.13 2012/06/12 15:46:04 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.w3m
 PKG_SUPPORTED_OPTIONS=	inet6 migemo w3m-lynx-key
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .if ${_W3M_USE_IMAGE} == "YES"
 PKG_OPTIONS_REQUIRED_GROUPS+=	imagelib
diff --git a/www/wwwoffle/options.mk b/www/wwwoffle/options.mk
index 953f0b2bb29..fef653658f1 100644
--- a/www/wwwoffle/options.mk
+++ b/www/wwwoffle/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2006/02/22 23:00:37 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:46:04 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.wwwoffle
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/x11/gdm/options.mk b/x11/gdm/options.mk
index d07e80724be..0fd73bd9845 100644
--- a/x11/gdm/options.mk
+++ b/x11/gdm/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2008/11/22 17:35:15 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:46:04 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gdm
-PKG_SUPPORTED_OPTIONS=	inet6 pam consolekit
-PKG_SUGGESTED_OPTIONS=	consolekit
+PKG_SUPPORTED_OPTIONS=	consolekit inet6 pam
+PKG_SUGGESTED_OPTIONS=	consolekit inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/x11/gnome-applets/options.mk b/x11/gnome-applets/options.mk
index 0d5c0e2bebc..bbe39231b98 100644
--- a/x11/gnome-applets/options.mk
+++ b/x11/gnome-applets/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2008/11/24 15:02:18 jmcneill Exp $
+# $NetBSD: options.mk,v 1.3 2012/06/12 15:46:04 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnome-applets
-PKG_SUPPORTED_OPTIONS=	inet6 hal
-PKG_SUGGESTED_OPTIONS+=	hal
+PKG_SUPPORTED_OPTIONS=	hal inet6
+PKG_SUGGESTED_OPTIONS+=	hal inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile
index 1d44a74b774..7dde5aaae81 100644
--- a/x11/gnopernicus/Makefile
+++ b/x11/gnopernicus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2012/03/03 00:14:09 wiz Exp $
+# $NetBSD: Makefile,v 1.73 2012/06/12 15:46:05 wiz Exp $
 #
 
 DISTNAME=		gnopernicus-1.1.1
@@ -40,6 +40,7 @@ INSTALL_MAKE_FLAGS+=	translationdir=${EGDIR}/translation_tables
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnopernicus
 PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/x11/kde-workspace4/options.mk b/x11/kde-workspace4/options.mk
index 411130622ec..055aec1794c 100644
--- a/x11/kde-workspace4/options.mk
+++ b/x11/kde-workspace4/options.mk
@@ -1,9 +1,10 @@
-# $NetBSD: options.mk,v 1.1 2012/03/19 19:44:03 markd Exp $
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:46:05 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.kde-workspace
 PKG_SUPPORTED_OPTIONS=	inet6
 #PKG_SUPPORTED_OPTIONS=	inet6 sasl samba debug pam
 #PKG_SUGGESTED_OPTIONS=	sasl
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/x11/kdebase3/options.mk b/x11/kdebase3/options.mk
index cee30a68a5f..c520dfac90e 100644
--- a/x11/kdebase3/options.mk
+++ b/x11/kdebase3/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.5 2008/04/30 12:20:09 xtraeme Exp $
+# $NetBSD: options.mk,v 1.6 2012/06/12 15:46:05 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.kdebase
 PKG_SUPPORTED_OPTIONS=	inet6 sasl samba debug pam composite
-PKG_SUGGESTED_OPTIONS=	sasl
+PKG_SUGGESTED_OPTIONS=	inet6 sasl
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/x11/libICE/options.mk b/x11/libICE/options.mk
index 3a188a04e0f..1206b9e974f 100644
--- a/x11/libICE/options.mk
+++ b/x11/libICE/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2007/11/07 11:51:52 abs Exp $
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:46:05 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libICE
 PKG_SUPPORTED_OPTIONS+=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/x11/libSM/options.mk b/x11/libSM/options.mk
index fb9f9575c12..5fbd2ba4335 100644
--- a/x11/libSM/options.mk
+++ b/x11/libSM/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2007/10/15 12:48:57 abs Exp $
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:46:05 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libSM
 PKG_SUPPORTED_OPTIONS+=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/x11/modular-xorg-server/options.mk b/x11/modular-xorg-server/options.mk
index b9f44228e23..8920f75c17b 100644
--- a/x11/modular-xorg-server/options.mk
+++ b/x11/modular-xorg-server/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.7 2009/10/22 20:12:25 tnn Exp $
+# $NetBSD: options.mk,v 1.8 2012/06/12 15:46:05 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.modular-xorg-server
 PKG_SUPPORTED_OPTIONS=	dri inet6 debug
-PKG_SUGGESTED_OPTIONS=	dri
+PKG_SUGGESTED_OPTIONS=	dri inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common
index 9b1fee49706..feeca9604bc 100644
--- a/x11/qt3-libs/Makefile.common
+++ b/x11/qt3-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.74 2011/07/21 17:07:11 joerg Exp $
+# $NetBSD: Makefile.common,v 1.75 2012/06/12 15:46:05 wiz Exp $
 # used by x11/qt3-docs/Makefile
 # used by x11/qt3-libs/Makefile
 # used by x11/qt3-tools/Makefile
@@ -89,6 +89,7 @@ CONFIGURE_ARGS+=	-no-xinerama
 PKG_OPTIONS_VAR=	PKG_OPTIONS.qt3
 PKG_SUPPORTED_OPTIONS=	cups debug
 PKG_SUPPORTED_OPTIONS+=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/x11/xdm/options.mk b/x11/xdm/options.mk
index d458dbd267e..6201c82535f 100644
--- a/x11/xdm/options.mk
+++ b/x11/xdm/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2007/11/07 17:17:55 abs Exp $
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:46:06 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.xdm
 PKG_SUPPORTED_OPTIONS+=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/x11/xhost/options.mk b/x11/xhost/options.mk
index 039f68caa23..80360d1569b 100644
--- a/x11/xhost/options.mk
+++ b/x11/xhost/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2007/10/15 14:39:47 abs Exp $
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:46:06 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.xhost
 PKG_SUPPORTED_OPTIONS+=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"