diff --git a/x11/explorer/Makefile b/x11/explorer/Makefile
index da8a8950cf5..30854cc0b51 100644
--- a/x11/explorer/Makefile
+++ b/x11/explorer/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2002/10/29 19:48:58 naddy Exp $
+# $OpenBSD: Makefile,v 1.21 2004/08/10 11:16:43 xsa Exp $
 
 COMMENT=	"file manager with same look and feel as Windows95(tm)"
 
@@ -12,7 +12,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MODULES=	qt
+MODULES=	x11/qt
 
 CONFIGURE_STYLE=gnu dest
 CONFIGURE_ARGS=	--datadir='$${DESTDIR}${PREFIX}/lib/X11/explorer' \
diff --git a/x11/gtk+/Makefile b/x11/gtk+/Makefile
index 583f4a59289..a5756d6b311 100644
--- a/x11/gtk+/Makefile
+++ b/x11/gtk+/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.55 2004/01/20 13:41:41 marcm Exp $
+# $OpenBSD: Makefile,v 1.56 2004/08/10 11:16:43 xsa Exp $
 
 COMMENT=	"General Toolkit for X11 GUI"
 
@@ -9,7 +9,7 @@ MASTER_SITES=   ${MASTER_SITE_GNOME:=sources/gtk+/1.2/}
 
 HOMEPAGE=	http://www.gtk.org/
 
-MODULES=	gettext
+MODULES=	devel/gettext
 LIB_DEPENDS=	glib.1.2,gmodule.1.2::devel/glib
 
 MAINTAINER=	Brad Smith <brad@openbsd.org>
diff --git a/x11/gtksourceview/Makefile b/x11/gtksourceview/Makefile
index bc97a62994d..593bd622981 100644
--- a/x11/gtksourceview/Makefile
+++ b/x11/gtksourceview/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2004/08/08 13:21:54 sturm Exp $
+# $OpenBSD: Makefile,v 1.3 2004/08/10 11:16:44 xsa Exp $
 
 COMMENT=		"Text widget that extends GTK2's GtkTextView widget"
 DISTNAME=		gtksourceview-1.0.1	
@@ -17,7 +17,7 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtksourceview/1.0/}	
 EXTRACT_SUFX=		.tar.bz2
 
-MODULES=		gettext
+MODULES=		devel/gettext
 
 BUILD_DEPENDS=		:pkgconfig-*:devel/pkgconfig 
 LIB_DEPENDS=		gnomeprintui-2-2::x11/gnome/libgnomeprintui \
diff --git a/x11/kdirstat/Makefile b/x11/kdirstat/Makefile
index e44f5babde1..f7ad6e0c161 100644
--- a/x11/kdirstat/Makefile
+++ b/x11/kdirstat/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2004/08/02 08:06:07 kevlo Exp $
+# $OpenBSD: Makefile,v 1.11 2004/08/10 11:16:43 xsa Exp $
 
 COMMENT=	"graphical disk usage utility for KDE"
 
@@ -20,7 +20,7 @@ EXTRACT_SUFX=	.tar.bz2
 
 LIB_DEPENDS=	kdecore.6,DCOP,kdesu,kdeui,kio,kdefx::x11/kde/libs3
 
-MODULES=	kde
+MODULES=	x11/kde
 
 # catch $HOME/.kde/share/config
 # that meinproc creates during build.
diff --git a/x11/kmplayer/Makefile b/x11/kmplayer/Makefile
index e697d12177b..6b8902ae31c 100644
--- a/x11/kmplayer/Makefile
+++ b/x11/kmplayer/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2003/10/08 17:13:16 sturm Exp $
+# $OpenBSD: Makefile,v 1.3 2004/08/10 11:16:43 xsa Exp $
 
 
 COMMENT='front-end/embeddable kpart for mplayer'
@@ -13,7 +13,7 @@ VERSION=3
 MAINTAINER=	Marc Espie <espie@openbsd.org>
 
 MODKDE_VERSION=	3.1
-MODULES=kde
+MODULES=	x11/kde
 MODGNU_CONFIG_GUESS_DIRS=	${MODKDE_CONFIG_GUESS_DIRS}
 CONFIGURE_STYLE=	autoconf
 AUTOCONF_VERSION=	2.52
diff --git a/x11/kountdown/Makefile b/x11/kountdown/Makefile
index 0423b718a00..6b9e6ba91b2 100644
--- a/x11/kountdown/Makefile
+++ b/x11/kountdown/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2003/06/20 17:20:01 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2004/08/10 11:16:43 xsa Exp $
 
 COMMENT=	"screen saver that displays a countdown to a selected date"
 
@@ -21,7 +21,7 @@ LIB_DEPENDS=	kdecore.4,DCOP,kdefx,kdesu,kdeui,kio,kscreensaver::x11/kde/libs3
 
 AUTOCONF_VERSION= 2.52
 MODKDE_VERSION= 3.1
-MODULES=	kde
+MODULES=	x11/kde
 
 PORTHOME=	${WRKDIR}
 
diff --git a/x11/mplayer-fontmaker/Makefile b/x11/mplayer-fontmaker/Makefile
index 4d5f7620268..6fc68f5ca69 100644
--- a/x11/mplayer-fontmaker/Makefile
+++ b/x11/mplayer-fontmaker/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2003/08/24 01:21:35 jolan Exp $
+# $OpenBSD: Makefile,v 1.14 2004/08/10 11:16:44 xsa Exp $
 
 # sync with mplayer archs due to dependency
 ONLY_FOR_ARCHS=i386 macppc
@@ -7,7 +7,7 @@ DISTNAME=mplayer-fontmaker-0.90
 CATEGORIES=x11
 COMMENT='subtitle fonts generator for mplayer'
 
-MODULES=	iconv
+MODULES=	converters/libiconv
 BUILD_DEPENDS=	::x11/mplayer:configure
 DISTFILES=
 NO_CHECKSUM=	Yes
diff --git a/x11/ogle_gui/Makefile b/x11/ogle_gui/Makefile
index 48ee5fd7344..002fe9d4a3d 100644
--- a/x11/ogle_gui/Makefile
+++ b/x11/ogle_gui/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2004/04/02 19:07:05 sturm Exp $
+# $OpenBSD: Makefile,v 1.9 2004/08/10 11:16:44 xsa Exp $
 
 CATEGORIES=	x11
 
@@ -34,7 +34,7 @@ LIB_DEPENDS+=	glade-2.0.0.0::devel/libglade2 \
 CONFIGURE_ARGS+=--enable-gtk2
 .endif
 
-MODULES=	gettext
+MODULES=	devel/gettext
 
 CONFIGURE_ENV+= CFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib" \
diff --git a/x11/openbox/Makefile b/x11/openbox/Makefile
index 44f42a1ada7..a72a9ff454d 100644
--- a/x11/openbox/Makefile
+++ b/x11/openbox/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2004/04/24 22:09:55 robert Exp $
+# $OpenBSD: Makefile,v 1.19 2004/08/10 11:16:44 xsa Exp $
 
 COMMENT=	"small, fast & usable window manager"
 
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.openbox.org/
 
 MAINTAINER=	Brad Smith <brad@openbsd.org>
 
-MODULES=	gettext
+MODULES=	devel/gettext
 LIB_DEPENDS+=	gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0,gtk-x11-2.0.0.0::x11/gtk+2 \
 		xml2.6::textproc/libxml \
 		startup-notification-1.0.0::devel/startup-notification
diff --git a/x11/qinx/Makefile b/x11/qinx/Makefile
index 7a6bd548566..2d7eaf5ed66 100644
--- a/x11/qinx/Makefile
+++ b/x11/qinx/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2004/03/04 18:48:17 brad Exp $
+# $OpenBSD: Makefile,v 1.4 2004/08/10 11:16:44 xsa Exp $
 
 NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
 
@@ -24,7 +24,7 @@ LIB_DEPENDS=	art_lgpl_2::graphics/libart \
 
 AUTOCONF_VERSION= 2.57
 MODKDE_VERSION= 3.2
-MODULES=	kde
+MODULES=	x11/kde
 
 PORTHOME=	${WRKDIR}
 
diff --git a/x11/qlwm/Makefile b/x11/qlwm/Makefile
index cf497f760a6..69b809c5506 100644
--- a/x11/qlwm/Makefile
+++ b/x11/qlwm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2004/02/25 02:35:18 naddy Exp $
+# $OpenBSD: Makefile,v 1.11 2004/08/10 11:16:44 xsa Exp $
 
 COMMENT=	"qt-based window manager"
 
@@ -21,7 +21,7 @@ DOCDIR=${PREFIX}/share/doc/qlwm
 
 USE_X11=	Yes
 
-MODULES=	qt2
+MODULES=	x11/qt2
 
 MAKE_FLAGS=INCPATH='-I${X11BASE}/include -I${MODQT_INCDIR}' \
 	LFLAGS='-L${X11BASE}/lib -L${MODQT_LIBDIR} -L${LOCALBASE}/lib' \
diff --git a/x11/vlc/Makefile b/x11/vlc/Makefile
index f1a2b76450f..35c1af8c09f 100644
--- a/x11/vlc/Makefile
+++ b/x11/vlc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2004/08/04 16:39:21 naddy Exp $
+# $OpenBSD: Makefile,v 1.14 2004/08/10 11:16:44 xsa Exp $
 
 NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
 
@@ -22,7 +22,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 USE_X11=	Yes
 
-MODULES=	gettext
+MODULES=	devel/gettext
 
 LIB_DEPENDS=	SDL::devel/sdl \
 		gtk.1.2,gdk.1.2::x11/gtk+ \
diff --git a/x11/windowmaker/Makefile b/x11/windowmaker/Makefile
index 39a84e885aa..19ca2885e10 100644
--- a/x11/windowmaker/Makefile
+++ b/x11/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.57 2003/08/16 19:06:07 tedu Exp $
+# $OpenBSD: Makefile,v 1.58 2004/08/10 11:16:44 xsa Exp $
 
 COMMENT=		'window manager that emulates NEXTSTEP(tm)'
 COMMENT-lang=		"language subpackage for Window Maker"
@@ -49,7 +49,7 @@ SUBPACKAGE?=
 .if defined(PACKAGING) && !empty(SUBPACKAGE)
 RUN_DEPENDS=		:windowmaker->=0.80.1:x11/windowmaker
 .else
-MODULES=		gettext
+MODULES=		devel/gettext
 LIB_DEPENDS=		jpeg.62::graphics/jpeg \
 			tiff.35::graphics/tiff \
 			png.2::graphics/png \
diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile
index 036d42da457..db9e0550473 100644
--- a/x11/xglobe/Makefile
+++ b/x11/xglobe/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2003/02/25 10:34:02 espie Exp $
+# $OpenBSD: Makefile,v 1.22 2004/08/10 11:16:44 xsa Exp $
 
 COMMENT=	"display the Earth on X11"
 
@@ -18,7 +18,7 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 USE_X11=		Yes
-MODULES=		qt3
+MODULES=		x11/qt3
 MODQT_MT=Yes
 
 MAKE_FLAGS=	XGLOBE_DIR=${PREFIX}
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 007d90bd0ab..7d2021ac7a8 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2004/06/24 16:23:37 marcm Exp $
+# $OpenBSD: Makefile,v 1.25 2004/08/10 11:16:44 xsa Exp $
 
 COMMENT=		"screen saver and locker for the X Window System"
 
@@ -18,7 +18,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		http://www.jwz.org/xscreensaver/
 
-MODULES=		gettext
+MODULES=		devel/gettext
 
 LIB_DEPENDS+=		xml2.6::textproc/libxml