From the "who gave this guy a commit bit" dept.:

-Fix categories which got mixed up during juggling with different
 repos.

-Remove NO_FILTER_SHLIBS, which disappeared shortly before Qt4 was
 committed.

Noticed by: erwin, pav

22 files changed, 13 insertions, 28 deletions

diff --git a/accessibility/qt4-accessible/Makefile b/accessibility/qt4-accessible/Makefile
index 0ddce4375499..bd1e57e632f7 100644
--- a/accessibility/qt4-accessible/Makefile
+++ b/accessibility/qt4-accessible/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	accessible
 PORTVERSION=	4.2.2
 PORTREVISION=	1
-CATEGORIES?=	accessibility ipv6
+CATEGORIES?=	accessibility
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
 DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
diff --git a/chinese/qt4-codecs-cn/Makefile b/chinese/qt4-codecs-cn/Makefile
index d2d4b8cac69b..33b97f190ad3 100644
--- a/chinese/qt4-codecs-cn/Makefile
+++ b/chinese/qt4-codecs-cn/Makefile
@@ -27,7 +27,6 @@ CONFLICTS=	linguist-0.* qt-2.* qt-3.0.* \
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-NO_FILTER_SHLIBS=yes
 
 CONFIGURE_ARGS=	-fast -no-exceptions \
 		-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
diff --git a/databases/qt4-sql/Makefile b/databases/qt4-sql/Makefile
index fc78239d90f3..285aebf752c5 100644
--- a/databases/qt4-sql/Makefile
+++ b/databases/qt4-sql/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	sql
 PORTVERSION=	4.2.2
-CATEGORIES?=	databases ipv6
+CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
 DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
@@ -27,7 +27,6 @@ CONFLICTS=	linguist-0.* qt-2.* qt-3.0.* \
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-NO_FILTER_SHLIBS=yes
 
 CONFIGURE_ARGS=	-fast -no-exceptions \
 		-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
diff --git a/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile
index 3e697fd48345..f5a52a72d521 100644
--- a/devel/dbus-qt4/Makefile
+++ b/devel/dbus-qt4/Makefile
@@ -30,7 +30,6 @@ CONFLICTS=	linguist-0.* qt-2.* qt-3.0.* \
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-NO_FILTER_SHLIBS=yes
 
 CONFIGURE_ARGS=	-fast -no-exceptions \
 		-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile
index c83018950d77..c21e4460452f 100644
--- a/devel/qt4-corelib/Makefile
+++ b/devel/qt4-corelib/Makefile
@@ -28,7 +28,6 @@ CONFLICTS=	linguist-0.* qt-2.* qt-3.0.* \
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-NO_FILTER_SHLIBS=yes
 
 CONFIGURE_ARGS=	-fast -no-exceptions \
 		-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
diff --git a/devel/qt4-designer/Makefile b/devel/qt4-designer/Makefile
index 58706e479f4e..f4d6937d896b 100644
--- a/devel/qt4-designer/Makefile
+++ b/devel/qt4-designer/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	designer
 PORTVERSION=	4.2.2
 PORTREVISION=	1
-CATEGORIES?=	x11-toolkits ipv6
+CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
 DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
@@ -36,7 +36,6 @@ CONFLICTS=	linguist-0.* qt-2.* qt-3.0.* \
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-NO_FILTER_SHLIBS=yes
 
 CONFIGURE_ARGS=	-fast -no-exceptions \
 		-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
diff --git a/devel/qt4-libqtassistantclient/Makefile b/devel/qt4-libqtassistantclient/Makefile
index 2b35d42d62ca..5728227b976b 100644
--- a/devel/qt4-libqtassistantclient/Makefile
+++ b/devel/qt4-libqtassistantclient/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	libQtAssistantClient
 PORTVERSION=	4.2.2
 PORTREVISION=	1
-CATEGORIES?=	x11-toolkits ipv6
+CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
 DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
@@ -31,7 +31,6 @@ CONFLICTS=	linguist-0.* qt-2.* qt-3.0.* \
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-NO_FILTER_SHLIBS=yes
 
 CONFIGURE_ARGS=	-fast -no-exceptions \
 		-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
diff --git a/devel/qt4-linguist/Makefile b/devel/qt4-linguist/Makefile
index 8effdb5d7bcc..f9e4261ea1f2 100644
--- a/devel/qt4-linguist/Makefile
+++ b/devel/qt4-linguist/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	linguist
 PORTVERSION=	4.2.2
 PORTREVISION=	1
-CATEGORIES?=	x11-toolkits ipv6
+CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
 DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
diff --git a/devel/qt4-porting/Makefile b/devel/qt4-porting/Makefile
index a713320019a6..952187463966 100644
--- a/devel/qt4-porting/Makefile
+++ b/devel/qt4-porting/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	porting
 PORTVERSION=	4.2.2
-CATEGORIES?=	x11-toolkits ipv6
+CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
 DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
diff --git a/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile
index 5146afe5f455..da64ca3b4d76 100644
--- a/devel/qt4-qt3support/Makefile
+++ b/devel/qt4-qt3support/Makefile
@@ -32,7 +32,6 @@ CONFLICTS=	linguist-0.* qt-2.* qt-3.0.* \
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-NO_FILTER_SHLIBS=yes
 USE_XLIB=	yes
 
 CONFIGURE_ARGS=	-fast -no-exceptions \
diff --git a/devel/qt4-qtestlib/Makefile b/devel/qt4-qtestlib/Makefile
index 2287aee427c9..4bd1937da463 100644
--- a/devel/qt4-qtestlib/Makefile
+++ b/devel/qt4-qtestlib/Makefile
@@ -28,7 +28,6 @@ CONFLICTS=	linguist-0.* qt-2.* qt-3.0.* \
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-NO_FILTER_SHLIBS=yes
 
 CONFIGURE_ARGS=	-fast -no-exceptions \
 		-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
diff --git a/devel/qt4-qvfb/Makefile b/devel/qt4-qvfb/Makefile
index a5cfc1bbcd29..ac24d0a7f6dc 100644
--- a/devel/qt4-qvfb/Makefile
+++ b/devel/qt4-qvfb/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	qvfb
 PORTVERSION=	4.2.2
 PORTREVISION=	1
-CATEGORIES?=	x11-toolkits ipv6
+CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
 DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
diff --git a/devel/qt4-uic3/Makefile b/devel/qt4-uic3/Makefile
index 61fa1914fe4f..069881b5bf6b 100644
--- a/devel/qt4-uic3/Makefile
+++ b/devel/qt4-uic3/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	uic3
 PORTVERSION=	4.2.2
 PORTREVISION=	1
-CATEGORIES?=	x11-toolkits ipv6
+CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
 DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
diff --git a/graphics/qt4-svg/Makefile b/graphics/qt4-svg/Makefile
index cc9f77c965b1..c0ee4b340c72 100644
--- a/graphics/qt4-svg/Makefile
+++ b/graphics/qt4-svg/Makefile
@@ -30,7 +30,6 @@ CONFLICTS=	linguist-0.* qt-2.* qt-3.0.* \
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-NO_FILTER_SHLIBS=yes
 
 CONFIGURE_ARGS=	-fast -no-exceptions \
 		-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
diff --git a/japanese/qt4-codecs-jp/Makefile b/japanese/qt4-codecs-jp/Makefile
index 611576b91b4c..94c2e15a76b1 100644
--- a/japanese/qt4-codecs-jp/Makefile
+++ b/japanese/qt4-codecs-jp/Makefile
@@ -29,7 +29,6 @@ USE_GCC=	3.4+
 #USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-NO_FILTER_SHLIBS=yes
 
 CONFIGURE_ARGS=	-fast -no-exceptions \
 		-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
diff --git a/korean/qt4-codecs-kr/Makefile b/korean/qt4-codecs-kr/Makefile
index b911fe18ea23..729760726733 100644
--- a/korean/qt4-codecs-kr/Makefile
+++ b/korean/qt4-codecs-kr/Makefile
@@ -29,7 +29,6 @@ USE_GCC=	3.4+
 #USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-NO_FILTER_SHLIBS=yes
 
 CONFIGURE_ARGS=	-fast -no-exceptions \
 		-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
diff --git a/misc/qt4-doc/Makefile b/misc/qt4-doc/Makefile
index 9da71225de9a..3049e8f6af03 100644
--- a/misc/qt4-doc/Makefile
+++ b/misc/qt4-doc/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	doc
 PORTVERSION=	4.2.2
-CATEGORIES?=	x11-toolkits ipv6
+CATEGORIES?=	misc
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX= 	qt4-
 DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
diff --git a/misc/qt4-qtconfig/Makefile b/misc/qt4-qtconfig/Makefile
index 7d927f449d12..e825dee4b981 100644
--- a/misc/qt4-qtconfig/Makefile
+++ b/misc/qt4-qtconfig/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	qtconfig
 PORTVERSION=	4.2.2
-CATEGORIES?=	x11-toolkits ipv6
+CATEGORIES?=	misc
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
 DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
diff --git a/net/qt4-network/Makefile b/net/qt4-network/Makefile
index 4f141aad6c13..0326d68128cc 100644
--- a/net/qt4-network/Makefile
+++ b/net/qt4-network/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	network
 PORTVERSION=	4.2.2
-CATEGORIES?=	x11-toolkits ipv6
+CATEGORIES?=	net ipv6
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
 DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
@@ -27,7 +27,6 @@ CONFLICTS=	linguist-0.* qt-2.* qt-3.0.* \
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-NO_FILTER_SHLIBS=yes
 
 CONFIGURE_ARGS=	-fast -no-exceptions \
 		-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
diff --git a/textproc/qt4-xml/Makefile b/textproc/qt4-xml/Makefile
index 0d3b2a9c8bd8..3b36fe4131ac 100644
--- a/textproc/qt4-xml/Makefile
+++ b/textproc/qt4-xml/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xml
 PORTVERSION=	4.2.2
-CATEGORIES?=	x11-toolkits
+CATEGORIES?=	textproc
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
 DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
@@ -27,7 +27,6 @@ CONFLICTS=	linguist-0.* qt-2.* qt-3.0.* \
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-NO_FILTER_SHLIBS=yes
 
 CONFIGURE_ARGS=	-fast -no-exceptions \
 		-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile
index cb1583eeb7dd..3261c5aaab1c 100644
--- a/x11-toolkits/qt4-gui/Makefile
+++ b/x11-toolkits/qt4-gui/Makefile
@@ -31,7 +31,6 @@ CONFLICTS=	linguist-0.* qt-2.* qt-3.0.* \
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-NO_FILTER_SHLIBS=yes
 USE_XLIB=	yes
 
 CONFIGURE_ARGS=	-fast -no-exceptions ${CUPS} \
diff --git a/x11/qt4-opengl/Makefile b/x11/qt4-opengl/Makefile
index 951f79e8dfe9..60c5170c3e4e 100644
--- a/x11/qt4-opengl/Makefile
+++ b/x11/qt4-opengl/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	opengl
 PORTVERSION=	4.2.2
 PORTREVISION=	1
-CATEGORIES?=	x11-toolkits
+CATEGORIES?=	x11
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
 DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
@@ -29,7 +29,6 @@ CONFLICTS=	linguist-0.* qt-2.* qt-3.0.* \
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-NO_FILTER_SHLIBS=yes
 USE_XLIB=	yes
 
 CONFIGURE_ARGS=	-fast -no-exceptions \