Mega-patch to cleanup the ports infrastructure regarding our linux bits:

  - USE_LINUX now implies NO_FILTER_SHLIBS=yes. It also doesn't use FreeBSD
    tools to strip binaries anymore, so it's not neccesary anymore to override
    STRIP and STRIP_CMD.
  - USE_LINUX_PREFIX implies NO_MTREE now.
  - In the USE_LINUX case, USE_XLIB now depends upon the linux X11 libraries
    instead upon the native FreeBSD libraries.
  - The variable LINUX_BASE_PORT contains a string which is suitable as an
    item in *_DEPENDS, so if a port BATCH_DEPENDS or FETCH_DEPENDS upon the
    default (or overriden) linux base, ${LINUX_BASE_PORT} should be used
    instead of a hardcoded reference.
  - Change all ports to comply to the "new world order".
  - The Ports Collection now allows to override the default linux_base port.
    Specify e.g. OVERRIDE_LINUX_BASE_PORT=rh-9 in /etc/make.conf to use
    ${PORTSDIR}/emulators/linux_base-rh-9 (the logic is to use
    ${PORTSDIR}/emulators/linux_base-${OVERRIDE_LINUX_BASE_PORT}).
  - If USE_LINUX or OVERRIDE_LINUX_BASE doesn't point to an existing linux_base
    port and if USE_LINUX isn't set to "yes" (case insensitive), the port will
    be marked as IGNORE. [1]
  - Readd USE_LINUX knobs into several ports and make several uses of a
    conditional dependency ("USE_LINUX?=") into an unconditional one
    ("USE_LINUX=") which where removed/changed by Trevor to allow the use of
    alternative linux_base ports. While this is a nice goal, the implementation
    resulted in missing dependencies. The OVERRIDE_LINUX_BASE_PORT knob
    in this commit is supposed to fix the problem while keeping the feature.
    Basicaly this includes a backout of Trevor's commit, to prevent confusion
    I mention it here explicitely.
  - Use the correct prefix (X11- instead of LOCAL- or LINUX-) for some ports.
    Chase dependencies for this.
  - Changes to make linux_devtools installable on amd64, remove some stray
    device nodes (they don't work on recent OS versions and aren't really
    needed).
  - Make linux_base-8 PREFIX clean and remove some stray device nodes.
    Additionally tell a little bit more about how to setup NIS/YP [2].
  - Update the PGSQL dependency in the linux-opengroupware port to a recent
    version (the old one isn't available anymore), I don't know if this
    works (at least it isn't more broken than before).
  - Use PREFIX/usr/share/doc instead of PREFIX/usr/doc in the divx4linux
    ports, the former path exists already and gets populated by other
    packages too (PREFIX=LINUXPREFIX!).
  - Fix some obvious (non-linuxolator) bugs in some linux ports while being
    there.
  - Bump PORTREVISION where neccesary.

Requested by:	portmgr (linimon) [1]
Submittted by:	Gerrit Kuehn <gerrit_huehn@gruft.fido.de [2]
Approved by:	portmgr (kris, linimon), maintainers (or maintainer timeout)
Tested on:	ports cluster (kris)
Reviewed by:	silence on emulation@
Superseedes PR:	69997

Maintainer approval from:
	chris@chrisburkert.de
	cracauer@cons.org
	des
	girgen
	jamie@bishopston.net
	mezz
	mi
	nivit@users.sf.net
        pat
	simond@irrelevant.org
	riggs@rrr.de
	Udo.Schweigert@Siemens.com

15 files changed, 600 insertions, 78 deletions

diff --git a/x11-toolkits/linux-f10-gtk/Makefile b/x11-toolkits/linux-f10-gtk/Makefile
index 7e5ae5708641..62fa6ed0074c 100644
--- a/x11-toolkits/linux-f10-gtk/Makefile
+++ b/x11-toolkits/linux-f10-gtk/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME?=	gtk
 PORTVERSION?=	1.2
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES?=	x11-toolkits linux
 MASTER_SITES?=	${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
 PKGNAMEPREFIX=	linux-
@@ -19,10 +19,14 @@ MAINTAINER?=	freebsd-emulation@FreeBSD.org
 COMMENT?=	RPM of the Gtk lib
 
 BUILD_DEPENDS+=	rpm:${PORTSDIR}/archivers/rpm
+# XXX: I haven't checked if every port which includes this Makefile needs
+#      USE_XLIB, so let it be a RUN_DEPENDS?= until the refactoring of the
+#      RPM bits.
 RUN_DEPENDS?=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs
 
 ONLY_FOR_ARCHS?=	i386 alpha amd64
 
+USE_LINUX=		yes
 USE_LINUX_PREFIX=	yes
 
 .include <bsd.port.pre.mk>
@@ -34,9 +38,9 @@ RPMFLAGS+=	--ignorearch
 DIST_SUBDIR?=	rpm
 EXTRACT_ONLY=
 NO_BUILD=	yes
-NO_FILTER_SHLIBS=	yes
 PLIST?=		${PKGDIR}/pkg-plist.${ARCH}
 MD5_FILE?=	${MASTERDIR}/distinfo.${ARCH}
+LINUX_LDCONFIG?=${LINUXBASE}/sbin/ldconfig
 
 # Let's avoid hardcoding 'en' as the language.
 LANG=		en
@@ -62,6 +66,7 @@ do-install:
 		${ECHO_MSG} $$R; \
 		rpm -U ${RPMFLAGS} ${RPMDIR}/$$R || true ; \
 	done
+	@${LINUX_LDCONFIG}
 
 new-plist:
 	@${RM} -rf ${WRKSRC}/tmp
diff --git a/x11-toolkits/linux-f10-gtk2/Makefile b/x11-toolkits/linux-f10-gtk2/Makefile
index d6256fc5f5df..f18b02bde642 100644
--- a/x11-toolkits/linux-f10-gtk2/Makefile
+++ b/x11-toolkits/linux-f10-gtk2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk2
 PORTVERSION=	2.2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits linux
 MASTER_SITES=	http://www.infostrategique.com/linuxrpms/legacy/9/
 
@@ -22,31 +22,15 @@ BUILD_DEPENDS+=	${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-gl
 		${LINUXBASE}/usr/lib/libpng12.so.0.1.2.7:${PORTSDIR}/graphics/linux-png \
 		${LINUXBASE}/usr/lib/libtiff.so.3.6.1:${PORTSDIR}/graphics/linux-tiff \
 		${LINUXBASE}/usr/lib/libpango-1.0.so.0.200.1:${PORTSDIR}/x11-toolkits/linux-pango
-RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs \
-		${BUILD_DEPENDS}
+RUN_DEPENDS+=	${BUILD_DEPENDS}
 
 DIST_SUBDIR=	rpm/i386/rh9
-NO_MTREE=	yes
 ONLY_FOR_ARCHS=	i386
-PLIST=		${WRKDIR}/plist
+PLIST=		${PKGDIR}/pkg-plist
+USE_XLIB=	yes
 RESTRICTED=	"binaries under GNU LGPL without accompanying source"
 RPM_SET=	gtk2-2.2.1-4.1.legacy.i386.rpm
 
-pre-install:
-	${RM} -f ${PLIST}
-.for ii in gtk.immodules gdk-pixbuf.loaders
-	${ECHO_CMD} etc/gtk-2.0/${ii} >> ${PLIST}
-.endfor
-	${MKDIR} ${WRKSRC}/tmp
-	cd ${WRKSRC}/tmp; \
-	rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -id; \
-		${FIND} * -type f -o -type l >> ${PLIST}; \
-		${FIND} -d * -type d | ${GREP} -E 'gtk|themes' | \
-		${SED} -e 's:^:@dirrm :' >> ${PLIST}; \
-		${FIND} -d * -type d | ${GREP} locale | \
-		${SED} -e 's:^:@unexec rmdir %D/:;s:$$: 2>/dev/null || true:' \
-			>> ${PLIST}
-
 post-install:
 .for ii in gdk-pixbuf-query-loaders gtk-demo gtk-query-immodules-2.0 testgtk testtext
 	@${BRANDELF} -t Linux ${PREFIX}/usr/bin/${ii}
diff --git a/x11-toolkits/linux-f10-gtk2/pkg-plist b/x11-toolkits/linux-f10-gtk2/pkg-plist
new file mode 100644
index 000000000000..0b6a30cde5a2
--- /dev/null
+++ b/x11-toolkits/linux-f10-gtk2/pkg-plist
@@ -0,0 +1,184 @@
+etc/gtk-2.0/gtk.immodules
+etc/gtk-2.0/gdk-pixbuf.loaders
+usr/bin/gdk-pixbuf-query-loaders
+usr/bin/gtk-demo
+usr/bin/gtk-query-immodules-2.0
+usr/bin/testgtk
+usr/bin/testtext
+usr/lib/gtk-2.0/2.2.0/immodules/im-am-et.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-am-et.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-hangul.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-hangul.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-inuktitut.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-inuktitut.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-ipa.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-ipa.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-thai-broken.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-thai-broken.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-ti-er.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-ti-er.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-ti-et.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-ti-et.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-viqr.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-viqr.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-xim.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-xim.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ani.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ani.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-bmp.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-bmp.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-gif.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-gif.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ico.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ico.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-jpeg.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-jpeg.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-png.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-png.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-pnm.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-pnm.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ras.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ras.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tga.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tga.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tiff.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tiff.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-wbmp.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-wbmp.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xbm.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xbm.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xpm.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xpm.so
+usr/lib/libgdk-x11-2.0.so.0
+usr/lib/libgdk-x11-2.0.so.0.200.1
+usr/lib/libgdk_pixbuf-2.0.so.0
+usr/lib/libgdk_pixbuf-2.0.so.0.200.1
+usr/lib/libgdk_pixbuf_xlib-2.0.so.0
+usr/lib/libgdk_pixbuf_xlib-2.0.so.0.200.1
+usr/lib/libgtk-x11-2.0.so.0
+usr/lib/libgtk-x11-2.0.so.0.200.1
+usr/share/doc/gtk2-2.2.1/AUTHORS
+usr/share/doc/gtk2-2.2.1/COPYING
+usr/share/doc/gtk2-2.2.1/ChangeLog
+usr/share/doc/gtk2-2.2.1/NEWS
+usr/share/doc/gtk2-2.2.1/README
+usr/share/gtk-2.0/demo/alphatest.png
+usr/share/gtk-2.0/demo/apple-red.png
+usr/share/gtk-2.0/demo/appwindow.c
+usr/share/gtk-2.0/demo/background.jpg
+usr/share/gtk-2.0/demo/button_box.c
+usr/share/gtk-2.0/demo/changedisplay.c
+usr/share/gtk-2.0/demo/colorsel.c
+usr/share/gtk-2.0/demo/dialog.c
+usr/share/gtk-2.0/demo/drawingarea.c
+usr/share/gtk-2.0/demo/editable_cells.c
+usr/share/gtk-2.0/demo/floppybuddy.gif
+usr/share/gtk-2.0/demo/gnome-applets.png
+usr/share/gtk-2.0/demo/gnome-calendar.png
+usr/share/gtk-2.0/demo/gnome-foot.png
+usr/share/gtk-2.0/demo/gnome-gimp.png
+usr/share/gtk-2.0/demo/gnome-gmush.png
+usr/share/gtk-2.0/demo/gnome-gsame.png
+usr/share/gtk-2.0/demo/gnu-keys.png
+usr/share/gtk-2.0/demo/gtk-logo-rgb.gif
+usr/share/gtk-2.0/demo/images.c
+usr/share/gtk-2.0/demo/item_factory.c
+usr/share/gtk-2.0/demo/list_store.c
+usr/share/gtk-2.0/demo/menus.c
+usr/share/gtk-2.0/demo/panes.c
+usr/share/gtk-2.0/demo/pixbufs.c
+usr/share/gtk-2.0/demo/sizegroup.c
+usr/share/gtk-2.0/demo/stock_browser.c
+usr/share/gtk-2.0/demo/textview.c
+usr/share/gtk-2.0/demo/tree_store.c
+usr/share/locale/am/LC_MESSAGES/gtk20.mo
+usr/share/locale/az/LC_MESSAGES/gtk20.mo
+usr/share/locale/be/LC_MESSAGES/gtk20.mo
+usr/share/locale/bg/LC_MESSAGES/gtk20.mo
+usr/share/locale/ca/LC_MESSAGES/gtk20.mo
+usr/share/locale/cs/LC_MESSAGES/gtk20.mo
+usr/share/locale/cy/LC_MESSAGES/gtk20.mo
+usr/share/locale/da/LC_MESSAGES/gtk20.mo
+usr/share/locale/de/LC_MESSAGES/gtk20.mo
+usr/share/locale/el/LC_MESSAGES/gtk20.mo
+usr/share/locale/en@IPA/LC_MESSAGES/gtk20.mo
+usr/share/locale/en_GB/LC_MESSAGES/gtk20.mo
+usr/share/locale/es/LC_MESSAGES/gtk20.mo
+usr/share/locale/et/LC_MESSAGES/gtk20.mo
+usr/share/locale/eu/LC_MESSAGES/gtk20.mo
+usr/share/locale/fa/LC_MESSAGES/gtk20.mo
+usr/share/locale/fi/LC_MESSAGES/gtk20.mo
+usr/share/locale/fr/LC_MESSAGES/gtk20.mo
+usr/share/locale/ga/LC_MESSAGES/gtk20.mo
+usr/share/locale/gl/LC_MESSAGES/gtk20.mo
+usr/share/locale/he/LC_MESSAGES/gtk20.mo
+usr/share/locale/hi/LC_MESSAGES/gtk20.mo
+usr/share/locale/hr/LC_MESSAGES/gtk20.mo
+usr/share/locale/hu/LC_MESSAGES/gtk20.mo
+usr/share/locale/ia/LC_MESSAGES/gtk20.mo
+usr/share/locale/it/LC_MESSAGES/gtk20.mo
+usr/share/locale/ja/LC_MESSAGES/gtk20.mo
+usr/share/locale/ko/LC_MESSAGES/gtk20.mo
+usr/share/locale/lt/LC_MESSAGES/gtk20.mo
+usr/share/locale/lv/LC_MESSAGES/gtk20.mo
+usr/share/locale/mk/LC_MESSAGES/gtk20.mo
+usr/share/locale/mn/LC_MESSAGES/gtk20.mo
+usr/share/locale/ms/LC_MESSAGES/gtk20.mo
+usr/share/locale/nl/LC_MESSAGES/gtk20.mo
+usr/share/locale/nn/LC_MESSAGES/gtk20.mo
+usr/share/locale/no/LC_MESSAGES/gtk20.mo
+usr/share/locale/pl/LC_MESSAGES/gtk20.mo
+usr/share/locale/pt/LC_MESSAGES/gtk20.mo
+usr/share/locale/pt_BR/LC_MESSAGES/gtk20.mo
+usr/share/locale/ro/LC_MESSAGES/gtk20.mo
+usr/share/locale/ru/LC_MESSAGES/gtk20.mo
+usr/share/locale/sk/LC_MESSAGES/gtk20.mo
+usr/share/locale/sl/LC_MESSAGES/gtk20.mo
+usr/share/locale/sp/LC_MESSAGES/gtk20.mo
+usr/share/locale/sr/LC_MESSAGES/gtk20.mo
+usr/share/locale/sv/LC_MESSAGES/gtk20.mo
+usr/share/locale/ta/LC_MESSAGES/gtk20.mo
+usr/share/locale/tr/LC_MESSAGES/gtk20.mo
+usr/share/locale/uk/LC_MESSAGES/gtk20.mo
+usr/share/locale/vi/LC_MESSAGES/gtk20.mo
+usr/share/locale/wa/LC_MESSAGES/gtk20.mo
+usr/share/locale/zh_CN/LC_MESSAGES/gtk20.mo
+usr/share/locale/zh_TW/LC_MESSAGES/gtk20.mo
+usr/share/themes/Default/gtk-2.0-key/gtkrc
+usr/share/themes/Emacs/gtk-2.0-key/gtkrc
+usr/share/themes/Raleigh/gtk-2.0/gtkrc
+@dirrm etc/gtk-2.0
+@dirrm usr/lib/gtk-2.0/2.2.0/immodules
+@dirrm usr/lib/gtk-2.0/2.2.0/loaders
+@dirrm usr/lib/gtk-2.0/2.2.0
+@dirrm usr/lib/gtk-2.0
+@dirrm usr/share/doc/gtk2-2.2.1
+@dirrm usr/share/gtk-2.0/demo
+@dirrm usr/share/gtk-2.0
+@dirrm usr/share/themes/Default/gtk-2.0-key
+@dirrm usr/share/themes/Default
+@dirrm usr/share/themes/Emacs/gtk-2.0-key
+@dirrm usr/share/themes/Emacs
+@dirrm usr/share/themes/Raleigh/gtk-2.0
+@dirrm usr/share/themes/Raleigh
+@dirrm usr/share/themes
+@unexec rmdir %D/usr/share/locale/cy/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/cy 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/en@IPA/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/en@IPA 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/fa/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/fa 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/ga 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/ia/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/ia 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/lt/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/lt 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/lv/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/lv 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/mk/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/mk 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/sp/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/sp 2>&1 >/dev/null || true
diff --git a/x11-toolkits/linux-f10-openmotif/Makefile b/x11-toolkits/linux-f10-openmotif/Makefile
index 40884e0cc17e..610ef74bf61c 100644
--- a/x11-toolkits/linux-f10-openmotif/Makefile
+++ b/x11-toolkits/linux-f10-openmotif/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	openmotif
 PORTVERSION=	2.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits linux
 MASTER_SITES=	ftp://ftp.ics.com/pub/Products/Motif/%SUBDIR%/
 MASTER_SITE_SUBDIR=	om2.2.4/redhat-7.3
@@ -19,12 +19,12 @@ MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Motif toolkit Linux libraries
 
 BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm
-RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs
 
 ONLY_FOR_ARCHS=	i386
+USE_LINUX=	yes
 USE_LINUX_PREFIX=	yes
+USE_XLIB=	yes
 NO_BUILD=	yes
-NO_FILTER_SHLIBS=	yes
 MD5_FILE=	${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
 EXTRACT_FILES=	./usr/X11R6/lib/libMrm.so.3.0.3 \
diff --git a/x11-toolkits/linux-f10-pango/Makefile b/x11-toolkits/linux-f10-pango/Makefile
index bfae1cfb4acb..a37e4a1daa9b 100644
--- a/x11-toolkits/linux-f10-pango/Makefile
+++ b/x11-toolkits/linux-f10-pango/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pango
 PORTVERSION=	1.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits linux
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
@@ -21,6 +21,7 @@ BUILD_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFre
 
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_XLIB=	yes
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386
 PLIST=		${PKGDIR}/pkg-plist
diff --git a/x11-toolkits/linux-f8-gtk/Makefile b/x11-toolkits/linux-f8-gtk/Makefile
index 7e5ae5708641..62fa6ed0074c 100644
--- a/x11-toolkits/linux-f8-gtk/Makefile
+++ b/x11-toolkits/linux-f8-gtk/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME?=	gtk
 PORTVERSION?=	1.2
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES?=	x11-toolkits linux
 MASTER_SITES?=	${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
 PKGNAMEPREFIX=	linux-
@@ -19,10 +19,14 @@ MAINTAINER?=	freebsd-emulation@FreeBSD.org
 COMMENT?=	RPM of the Gtk lib
 
 BUILD_DEPENDS+=	rpm:${PORTSDIR}/archivers/rpm
+# XXX: I haven't checked if every port which includes this Makefile needs
+#      USE_XLIB, so let it be a RUN_DEPENDS?= until the refactoring of the
+#      RPM bits.
 RUN_DEPENDS?=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs
 
 ONLY_FOR_ARCHS?=	i386 alpha amd64
 
+USE_LINUX=		yes
 USE_LINUX_PREFIX=	yes
 
 .include <bsd.port.pre.mk>
@@ -34,9 +38,9 @@ RPMFLAGS+=	--ignorearch
 DIST_SUBDIR?=	rpm
 EXTRACT_ONLY=
 NO_BUILD=	yes
-NO_FILTER_SHLIBS=	yes
 PLIST?=		${PKGDIR}/pkg-plist.${ARCH}
 MD5_FILE?=	${MASTERDIR}/distinfo.${ARCH}
+LINUX_LDCONFIG?=${LINUXBASE}/sbin/ldconfig
 
 # Let's avoid hardcoding 'en' as the language.
 LANG=		en
@@ -62,6 +66,7 @@ do-install:
 		${ECHO_MSG} $$R; \
 		rpm -U ${RPMFLAGS} ${RPMDIR}/$$R || true ; \
 	done
+	@${LINUX_LDCONFIG}
 
 new-plist:
 	@${RM} -rf ${WRKSRC}/tmp
diff --git a/x11-toolkits/linux-f8-gtk2/Makefile b/x11-toolkits/linux-f8-gtk2/Makefile
index d6256fc5f5df..f18b02bde642 100644
--- a/x11-toolkits/linux-f8-gtk2/Makefile
+++ b/x11-toolkits/linux-f8-gtk2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk2
 PORTVERSION=	2.2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits linux
 MASTER_SITES=	http://www.infostrategique.com/linuxrpms/legacy/9/
 
@@ -22,31 +22,15 @@ BUILD_DEPENDS+=	${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-gl
 		${LINUXBASE}/usr/lib/libpng12.so.0.1.2.7:${PORTSDIR}/graphics/linux-png \
 		${LINUXBASE}/usr/lib/libtiff.so.3.6.1:${PORTSDIR}/graphics/linux-tiff \
 		${LINUXBASE}/usr/lib/libpango-1.0.so.0.200.1:${PORTSDIR}/x11-toolkits/linux-pango
-RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs \
-		${BUILD_DEPENDS}
+RUN_DEPENDS+=	${BUILD_DEPENDS}
 
 DIST_SUBDIR=	rpm/i386/rh9
-NO_MTREE=	yes
 ONLY_FOR_ARCHS=	i386
-PLIST=		${WRKDIR}/plist
+PLIST=		${PKGDIR}/pkg-plist
+USE_XLIB=	yes
 RESTRICTED=	"binaries under GNU LGPL without accompanying source"
 RPM_SET=	gtk2-2.2.1-4.1.legacy.i386.rpm
 
-pre-install:
-	${RM} -f ${PLIST}
-.for ii in gtk.immodules gdk-pixbuf.loaders
-	${ECHO_CMD} etc/gtk-2.0/${ii} >> ${PLIST}
-.endfor
-	${MKDIR} ${WRKSRC}/tmp
-	cd ${WRKSRC}/tmp; \
-	rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -id; \
-		${FIND} * -type f -o -type l >> ${PLIST}; \
-		${FIND} -d * -type d | ${GREP} -E 'gtk|themes' | \
-		${SED} -e 's:^:@dirrm :' >> ${PLIST}; \
-		${FIND} -d * -type d | ${GREP} locale | \
-		${SED} -e 's:^:@unexec rmdir %D/:;s:$$: 2>/dev/null || true:' \
-			>> ${PLIST}
-
 post-install:
 .for ii in gdk-pixbuf-query-loaders gtk-demo gtk-query-immodules-2.0 testgtk testtext
 	@${BRANDELF} -t Linux ${PREFIX}/usr/bin/${ii}
diff --git a/x11-toolkits/linux-f8-gtk2/pkg-plist b/x11-toolkits/linux-f8-gtk2/pkg-plist
new file mode 100644
index 000000000000..0b6a30cde5a2
--- /dev/null
+++ b/x11-toolkits/linux-f8-gtk2/pkg-plist
@@ -0,0 +1,184 @@
+etc/gtk-2.0/gtk.immodules
+etc/gtk-2.0/gdk-pixbuf.loaders
+usr/bin/gdk-pixbuf-query-loaders
+usr/bin/gtk-demo
+usr/bin/gtk-query-immodules-2.0
+usr/bin/testgtk
+usr/bin/testtext
+usr/lib/gtk-2.0/2.2.0/immodules/im-am-et.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-am-et.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-hangul.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-hangul.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-inuktitut.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-inuktitut.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-ipa.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-ipa.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-thai-broken.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-thai-broken.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-ti-er.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-ti-er.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-ti-et.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-ti-et.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-viqr.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-viqr.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-xim.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-xim.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ani.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ani.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-bmp.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-bmp.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-gif.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-gif.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ico.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ico.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-jpeg.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-jpeg.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-png.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-png.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-pnm.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-pnm.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ras.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ras.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tga.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tga.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tiff.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tiff.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-wbmp.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-wbmp.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xbm.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xbm.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xpm.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xpm.so
+usr/lib/libgdk-x11-2.0.so.0
+usr/lib/libgdk-x11-2.0.so.0.200.1
+usr/lib/libgdk_pixbuf-2.0.so.0
+usr/lib/libgdk_pixbuf-2.0.so.0.200.1
+usr/lib/libgdk_pixbuf_xlib-2.0.so.0
+usr/lib/libgdk_pixbuf_xlib-2.0.so.0.200.1
+usr/lib/libgtk-x11-2.0.so.0
+usr/lib/libgtk-x11-2.0.so.0.200.1
+usr/share/doc/gtk2-2.2.1/AUTHORS
+usr/share/doc/gtk2-2.2.1/COPYING
+usr/share/doc/gtk2-2.2.1/ChangeLog
+usr/share/doc/gtk2-2.2.1/NEWS
+usr/share/doc/gtk2-2.2.1/README
+usr/share/gtk-2.0/demo/alphatest.png
+usr/share/gtk-2.0/demo/apple-red.png
+usr/share/gtk-2.0/demo/appwindow.c
+usr/share/gtk-2.0/demo/background.jpg
+usr/share/gtk-2.0/demo/button_box.c
+usr/share/gtk-2.0/demo/changedisplay.c
+usr/share/gtk-2.0/demo/colorsel.c
+usr/share/gtk-2.0/demo/dialog.c
+usr/share/gtk-2.0/demo/drawingarea.c
+usr/share/gtk-2.0/demo/editable_cells.c
+usr/share/gtk-2.0/demo/floppybuddy.gif
+usr/share/gtk-2.0/demo/gnome-applets.png
+usr/share/gtk-2.0/demo/gnome-calendar.png
+usr/share/gtk-2.0/demo/gnome-foot.png
+usr/share/gtk-2.0/demo/gnome-gimp.png
+usr/share/gtk-2.0/demo/gnome-gmush.png
+usr/share/gtk-2.0/demo/gnome-gsame.png
+usr/share/gtk-2.0/demo/gnu-keys.png
+usr/share/gtk-2.0/demo/gtk-logo-rgb.gif
+usr/share/gtk-2.0/demo/images.c
+usr/share/gtk-2.0/demo/item_factory.c
+usr/share/gtk-2.0/demo/list_store.c
+usr/share/gtk-2.0/demo/menus.c
+usr/share/gtk-2.0/demo/panes.c
+usr/share/gtk-2.0/demo/pixbufs.c
+usr/share/gtk-2.0/demo/sizegroup.c
+usr/share/gtk-2.0/demo/stock_browser.c
+usr/share/gtk-2.0/demo/textview.c
+usr/share/gtk-2.0/demo/tree_store.c
+usr/share/locale/am/LC_MESSAGES/gtk20.mo
+usr/share/locale/az/LC_MESSAGES/gtk20.mo
+usr/share/locale/be/LC_MESSAGES/gtk20.mo
+usr/share/locale/bg/LC_MESSAGES/gtk20.mo
+usr/share/locale/ca/LC_MESSAGES/gtk20.mo
+usr/share/locale/cs/LC_MESSAGES/gtk20.mo
+usr/share/locale/cy/LC_MESSAGES/gtk20.mo
+usr/share/locale/da/LC_MESSAGES/gtk20.mo
+usr/share/locale/de/LC_MESSAGES/gtk20.mo
+usr/share/locale/el/LC_MESSAGES/gtk20.mo
+usr/share/locale/en@IPA/LC_MESSAGES/gtk20.mo
+usr/share/locale/en_GB/LC_MESSAGES/gtk20.mo
+usr/share/locale/es/LC_MESSAGES/gtk20.mo
+usr/share/locale/et/LC_MESSAGES/gtk20.mo
+usr/share/locale/eu/LC_MESSAGES/gtk20.mo
+usr/share/locale/fa/LC_MESSAGES/gtk20.mo
+usr/share/locale/fi/LC_MESSAGES/gtk20.mo
+usr/share/locale/fr/LC_MESSAGES/gtk20.mo
+usr/share/locale/ga/LC_MESSAGES/gtk20.mo
+usr/share/locale/gl/LC_MESSAGES/gtk20.mo
+usr/share/locale/he/LC_MESSAGES/gtk20.mo
+usr/share/locale/hi/LC_MESSAGES/gtk20.mo
+usr/share/locale/hr/LC_MESSAGES/gtk20.mo
+usr/share/locale/hu/LC_MESSAGES/gtk20.mo
+usr/share/locale/ia/LC_MESSAGES/gtk20.mo
+usr/share/locale/it/LC_MESSAGES/gtk20.mo
+usr/share/locale/ja/LC_MESSAGES/gtk20.mo
+usr/share/locale/ko/LC_MESSAGES/gtk20.mo
+usr/share/locale/lt/LC_MESSAGES/gtk20.mo
+usr/share/locale/lv/LC_MESSAGES/gtk20.mo
+usr/share/locale/mk/LC_MESSAGES/gtk20.mo
+usr/share/locale/mn/LC_MESSAGES/gtk20.mo
+usr/share/locale/ms/LC_MESSAGES/gtk20.mo
+usr/share/locale/nl/LC_MESSAGES/gtk20.mo
+usr/share/locale/nn/LC_MESSAGES/gtk20.mo
+usr/share/locale/no/LC_MESSAGES/gtk20.mo
+usr/share/locale/pl/LC_MESSAGES/gtk20.mo
+usr/share/locale/pt/LC_MESSAGES/gtk20.mo
+usr/share/locale/pt_BR/LC_MESSAGES/gtk20.mo
+usr/share/locale/ro/LC_MESSAGES/gtk20.mo
+usr/share/locale/ru/LC_MESSAGES/gtk20.mo
+usr/share/locale/sk/LC_MESSAGES/gtk20.mo
+usr/share/locale/sl/LC_MESSAGES/gtk20.mo
+usr/share/locale/sp/LC_MESSAGES/gtk20.mo
+usr/share/locale/sr/LC_MESSAGES/gtk20.mo
+usr/share/locale/sv/LC_MESSAGES/gtk20.mo
+usr/share/locale/ta/LC_MESSAGES/gtk20.mo
+usr/share/locale/tr/LC_MESSAGES/gtk20.mo
+usr/share/locale/uk/LC_MESSAGES/gtk20.mo
+usr/share/locale/vi/LC_MESSAGES/gtk20.mo
+usr/share/locale/wa/LC_MESSAGES/gtk20.mo
+usr/share/locale/zh_CN/LC_MESSAGES/gtk20.mo
+usr/share/locale/zh_TW/LC_MESSAGES/gtk20.mo
+usr/share/themes/Default/gtk-2.0-key/gtkrc
+usr/share/themes/Emacs/gtk-2.0-key/gtkrc
+usr/share/themes/Raleigh/gtk-2.0/gtkrc
+@dirrm etc/gtk-2.0
+@dirrm usr/lib/gtk-2.0/2.2.0/immodules
+@dirrm usr/lib/gtk-2.0/2.2.0/loaders
+@dirrm usr/lib/gtk-2.0/2.2.0
+@dirrm usr/lib/gtk-2.0
+@dirrm usr/share/doc/gtk2-2.2.1
+@dirrm usr/share/gtk-2.0/demo
+@dirrm usr/share/gtk-2.0
+@dirrm usr/share/themes/Default/gtk-2.0-key
+@dirrm usr/share/themes/Default
+@dirrm usr/share/themes/Emacs/gtk-2.0-key
+@dirrm usr/share/themes/Emacs
+@dirrm usr/share/themes/Raleigh/gtk-2.0
+@dirrm usr/share/themes/Raleigh
+@dirrm usr/share/themes
+@unexec rmdir %D/usr/share/locale/cy/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/cy 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/en@IPA/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/en@IPA 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/fa/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/fa 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/ga 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/ia/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/ia 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/lt/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/lt 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/lv/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/lv 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/mk/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/mk 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/sp/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/sp 2>&1 >/dev/null || true
diff --git a/x11-toolkits/linux-f8-openmotif/Makefile b/x11-toolkits/linux-f8-openmotif/Makefile
index 40884e0cc17e..610ef74bf61c 100644
--- a/x11-toolkits/linux-f8-openmotif/Makefile
+++ b/x11-toolkits/linux-f8-openmotif/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	openmotif
 PORTVERSION=	2.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits linux
 MASTER_SITES=	ftp://ftp.ics.com/pub/Products/Motif/%SUBDIR%/
 MASTER_SITE_SUBDIR=	om2.2.4/redhat-7.3
@@ -19,12 +19,12 @@ MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Motif toolkit Linux libraries
 
 BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm
-RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs
 
 ONLY_FOR_ARCHS=	i386
+USE_LINUX=	yes
 USE_LINUX_PREFIX=	yes
+USE_XLIB=	yes
 NO_BUILD=	yes
-NO_FILTER_SHLIBS=	yes
 MD5_FILE=	${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
 EXTRACT_FILES=	./usr/X11R6/lib/libMrm.so.3.0.3 \
diff --git a/x11-toolkits/linux-f8-pango/Makefile b/x11-toolkits/linux-f8-pango/Makefile
index bfae1cfb4acb..a37e4a1daa9b 100644
--- a/x11-toolkits/linux-f8-pango/Makefile
+++ b/x11-toolkits/linux-f8-pango/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pango
 PORTVERSION=	1.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits linux
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
@@ -21,6 +21,7 @@ BUILD_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFre
 
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_XLIB=	yes
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386
 PLIST=		${PKGDIR}/pkg-plist
diff --git a/x11-toolkits/linux-gtk/Makefile b/x11-toolkits/linux-gtk/Makefile
index 7e5ae5708641..62fa6ed0074c 100644
--- a/x11-toolkits/linux-gtk/Makefile
+++ b/x11-toolkits/linux-gtk/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME?=	gtk
 PORTVERSION?=	1.2
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES?=	x11-toolkits linux
 MASTER_SITES?=	${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
 PKGNAMEPREFIX=	linux-
@@ -19,10 +19,14 @@ MAINTAINER?=	freebsd-emulation@FreeBSD.org
 COMMENT?=	RPM of the Gtk lib
 
 BUILD_DEPENDS+=	rpm:${PORTSDIR}/archivers/rpm
+# XXX: I haven't checked if every port which includes this Makefile needs
+#      USE_XLIB, so let it be a RUN_DEPENDS?= until the refactoring of the
+#      RPM bits.
 RUN_DEPENDS?=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs
 
 ONLY_FOR_ARCHS?=	i386 alpha amd64
 
+USE_LINUX=		yes
 USE_LINUX_PREFIX=	yes
 
 .include <bsd.port.pre.mk>
@@ -34,9 +38,9 @@ RPMFLAGS+=	--ignorearch
 DIST_SUBDIR?=	rpm
 EXTRACT_ONLY=
 NO_BUILD=	yes
-NO_FILTER_SHLIBS=	yes
 PLIST?=		${PKGDIR}/pkg-plist.${ARCH}
 MD5_FILE?=	${MASTERDIR}/distinfo.${ARCH}
+LINUX_LDCONFIG?=${LINUXBASE}/sbin/ldconfig
 
 # Let's avoid hardcoding 'en' as the language.
 LANG=		en
@@ -62,6 +66,7 @@ do-install:
 		${ECHO_MSG} $$R; \
 		rpm -U ${RPMFLAGS} ${RPMDIR}/$$R || true ; \
 	done
+	@${LINUX_LDCONFIG}
 
 new-plist:
 	@${RM} -rf ${WRKSRC}/tmp
diff --git a/x11-toolkits/linux-gtk2/Makefile b/x11-toolkits/linux-gtk2/Makefile
index d6256fc5f5df..f18b02bde642 100644
--- a/x11-toolkits/linux-gtk2/Makefile
+++ b/x11-toolkits/linux-gtk2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk2
 PORTVERSION=	2.2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits linux
 MASTER_SITES=	http://www.infostrategique.com/linuxrpms/legacy/9/
 
@@ -22,31 +22,15 @@ BUILD_DEPENDS+=	${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-gl
 		${LINUXBASE}/usr/lib/libpng12.so.0.1.2.7:${PORTSDIR}/graphics/linux-png \
 		${LINUXBASE}/usr/lib/libtiff.so.3.6.1:${PORTSDIR}/graphics/linux-tiff \
 		${LINUXBASE}/usr/lib/libpango-1.0.so.0.200.1:${PORTSDIR}/x11-toolkits/linux-pango
-RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs \
-		${BUILD_DEPENDS}
+RUN_DEPENDS+=	${BUILD_DEPENDS}
 
 DIST_SUBDIR=	rpm/i386/rh9
-NO_MTREE=	yes
 ONLY_FOR_ARCHS=	i386
-PLIST=		${WRKDIR}/plist
+PLIST=		${PKGDIR}/pkg-plist
+USE_XLIB=	yes
 RESTRICTED=	"binaries under GNU LGPL without accompanying source"
 RPM_SET=	gtk2-2.2.1-4.1.legacy.i386.rpm
 
-pre-install:
-	${RM} -f ${PLIST}
-.for ii in gtk.immodules gdk-pixbuf.loaders
-	${ECHO_CMD} etc/gtk-2.0/${ii} >> ${PLIST}
-.endfor
-	${MKDIR} ${WRKSRC}/tmp
-	cd ${WRKSRC}/tmp; \
-	rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -id; \
-		${FIND} * -type f -o -type l >> ${PLIST}; \
-		${FIND} -d * -type d | ${GREP} -E 'gtk|themes' | \
-		${SED} -e 's:^:@dirrm :' >> ${PLIST}; \
-		${FIND} -d * -type d | ${GREP} locale | \
-		${SED} -e 's:^:@unexec rmdir %D/:;s:$$: 2>/dev/null || true:' \
-			>> ${PLIST}
-
 post-install:
 .for ii in gdk-pixbuf-query-loaders gtk-demo gtk-query-immodules-2.0 testgtk testtext
 	@${BRANDELF} -t Linux ${PREFIX}/usr/bin/${ii}
diff --git a/x11-toolkits/linux-gtk2/pkg-plist b/x11-toolkits/linux-gtk2/pkg-plist
new file mode 100644
index 000000000000..0b6a30cde5a2
--- /dev/null
+++ b/x11-toolkits/linux-gtk2/pkg-plist
@@ -0,0 +1,184 @@
+etc/gtk-2.0/gtk.immodules
+etc/gtk-2.0/gdk-pixbuf.loaders
+usr/bin/gdk-pixbuf-query-loaders
+usr/bin/gtk-demo
+usr/bin/gtk-query-immodules-2.0
+usr/bin/testgtk
+usr/bin/testtext
+usr/lib/gtk-2.0/2.2.0/immodules/im-am-et.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-am-et.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-hangul.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-hangul.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-inuktitut.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-inuktitut.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-ipa.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-ipa.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-thai-broken.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-thai-broken.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-ti-er.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-ti-er.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-ti-et.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-ti-et.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-viqr.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-viqr.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-xim.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-xim.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ani.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ani.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-bmp.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-bmp.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-gif.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-gif.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ico.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ico.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-jpeg.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-jpeg.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-png.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-png.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-pnm.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-pnm.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ras.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ras.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tga.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tga.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tiff.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tiff.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-wbmp.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-wbmp.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xbm.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xbm.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xpm.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xpm.so
+usr/lib/libgdk-x11-2.0.so.0
+usr/lib/libgdk-x11-2.0.so.0.200.1
+usr/lib/libgdk_pixbuf-2.0.so.0
+usr/lib/libgdk_pixbuf-2.0.so.0.200.1
+usr/lib/libgdk_pixbuf_xlib-2.0.so.0
+usr/lib/libgdk_pixbuf_xlib-2.0.so.0.200.1
+usr/lib/libgtk-x11-2.0.so.0
+usr/lib/libgtk-x11-2.0.so.0.200.1
+usr/share/doc/gtk2-2.2.1/AUTHORS
+usr/share/doc/gtk2-2.2.1/COPYING
+usr/share/doc/gtk2-2.2.1/ChangeLog
+usr/share/doc/gtk2-2.2.1/NEWS
+usr/share/doc/gtk2-2.2.1/README
+usr/share/gtk-2.0/demo/alphatest.png
+usr/share/gtk-2.0/demo/apple-red.png
+usr/share/gtk-2.0/demo/appwindow.c
+usr/share/gtk-2.0/demo/background.jpg
+usr/share/gtk-2.0/demo/button_box.c
+usr/share/gtk-2.0/demo/changedisplay.c
+usr/share/gtk-2.0/demo/colorsel.c
+usr/share/gtk-2.0/demo/dialog.c
+usr/share/gtk-2.0/demo/drawingarea.c
+usr/share/gtk-2.0/demo/editable_cells.c
+usr/share/gtk-2.0/demo/floppybuddy.gif
+usr/share/gtk-2.0/demo/gnome-applets.png
+usr/share/gtk-2.0/demo/gnome-calendar.png
+usr/share/gtk-2.0/demo/gnome-foot.png
+usr/share/gtk-2.0/demo/gnome-gimp.png
+usr/share/gtk-2.0/demo/gnome-gmush.png
+usr/share/gtk-2.0/demo/gnome-gsame.png
+usr/share/gtk-2.0/demo/gnu-keys.png
+usr/share/gtk-2.0/demo/gtk-logo-rgb.gif
+usr/share/gtk-2.0/demo/images.c
+usr/share/gtk-2.0/demo/item_factory.c
+usr/share/gtk-2.0/demo/list_store.c
+usr/share/gtk-2.0/demo/menus.c
+usr/share/gtk-2.0/demo/panes.c
+usr/share/gtk-2.0/demo/pixbufs.c
+usr/share/gtk-2.0/demo/sizegroup.c
+usr/share/gtk-2.0/demo/stock_browser.c
+usr/share/gtk-2.0/demo/textview.c
+usr/share/gtk-2.0/demo/tree_store.c
+usr/share/locale/am/LC_MESSAGES/gtk20.mo
+usr/share/locale/az/LC_MESSAGES/gtk20.mo
+usr/share/locale/be/LC_MESSAGES/gtk20.mo
+usr/share/locale/bg/LC_MESSAGES/gtk20.mo
+usr/share/locale/ca/LC_MESSAGES/gtk20.mo
+usr/share/locale/cs/LC_MESSAGES/gtk20.mo
+usr/share/locale/cy/LC_MESSAGES/gtk20.mo
+usr/share/locale/da/LC_MESSAGES/gtk20.mo
+usr/share/locale/de/LC_MESSAGES/gtk20.mo
+usr/share/locale/el/LC_MESSAGES/gtk20.mo
+usr/share/locale/en@IPA/LC_MESSAGES/gtk20.mo
+usr/share/locale/en_GB/LC_MESSAGES/gtk20.mo
+usr/share/locale/es/LC_MESSAGES/gtk20.mo
+usr/share/locale/et/LC_MESSAGES/gtk20.mo
+usr/share/locale/eu/LC_MESSAGES/gtk20.mo
+usr/share/locale/fa/LC_MESSAGES/gtk20.mo
+usr/share/locale/fi/LC_MESSAGES/gtk20.mo
+usr/share/locale/fr/LC_MESSAGES/gtk20.mo
+usr/share/locale/ga/LC_MESSAGES/gtk20.mo
+usr/share/locale/gl/LC_MESSAGES/gtk20.mo
+usr/share/locale/he/LC_MESSAGES/gtk20.mo
+usr/share/locale/hi/LC_MESSAGES/gtk20.mo
+usr/share/locale/hr/LC_MESSAGES/gtk20.mo
+usr/share/locale/hu/LC_MESSAGES/gtk20.mo
+usr/share/locale/ia/LC_MESSAGES/gtk20.mo
+usr/share/locale/it/LC_MESSAGES/gtk20.mo
+usr/share/locale/ja/LC_MESSAGES/gtk20.mo
+usr/share/locale/ko/LC_MESSAGES/gtk20.mo
+usr/share/locale/lt/LC_MESSAGES/gtk20.mo
+usr/share/locale/lv/LC_MESSAGES/gtk20.mo
+usr/share/locale/mk/LC_MESSAGES/gtk20.mo
+usr/share/locale/mn/LC_MESSAGES/gtk20.mo
+usr/share/locale/ms/LC_MESSAGES/gtk20.mo
+usr/share/locale/nl/LC_MESSAGES/gtk20.mo
+usr/share/locale/nn/LC_MESSAGES/gtk20.mo
+usr/share/locale/no/LC_MESSAGES/gtk20.mo
+usr/share/locale/pl/LC_MESSAGES/gtk20.mo
+usr/share/locale/pt/LC_MESSAGES/gtk20.mo
+usr/share/locale/pt_BR/LC_MESSAGES/gtk20.mo
+usr/share/locale/ro/LC_MESSAGES/gtk20.mo
+usr/share/locale/ru/LC_MESSAGES/gtk20.mo
+usr/share/locale/sk/LC_MESSAGES/gtk20.mo
+usr/share/locale/sl/LC_MESSAGES/gtk20.mo
+usr/share/locale/sp/LC_MESSAGES/gtk20.mo
+usr/share/locale/sr/LC_MESSAGES/gtk20.mo
+usr/share/locale/sv/LC_MESSAGES/gtk20.mo
+usr/share/locale/ta/LC_MESSAGES/gtk20.mo
+usr/share/locale/tr/LC_MESSAGES/gtk20.mo
+usr/share/locale/uk/LC_MESSAGES/gtk20.mo
+usr/share/locale/vi/LC_MESSAGES/gtk20.mo
+usr/share/locale/wa/LC_MESSAGES/gtk20.mo
+usr/share/locale/zh_CN/LC_MESSAGES/gtk20.mo
+usr/share/locale/zh_TW/LC_MESSAGES/gtk20.mo
+usr/share/themes/Default/gtk-2.0-key/gtkrc
+usr/share/themes/Emacs/gtk-2.0-key/gtkrc
+usr/share/themes/Raleigh/gtk-2.0/gtkrc
+@dirrm etc/gtk-2.0
+@dirrm usr/lib/gtk-2.0/2.2.0/immodules
+@dirrm usr/lib/gtk-2.0/2.2.0/loaders
+@dirrm usr/lib/gtk-2.0/2.2.0
+@dirrm usr/lib/gtk-2.0
+@dirrm usr/share/doc/gtk2-2.2.1
+@dirrm usr/share/gtk-2.0/demo
+@dirrm usr/share/gtk-2.0
+@dirrm usr/share/themes/Default/gtk-2.0-key
+@dirrm usr/share/themes/Default
+@dirrm usr/share/themes/Emacs/gtk-2.0-key
+@dirrm usr/share/themes/Emacs
+@dirrm usr/share/themes/Raleigh/gtk-2.0
+@dirrm usr/share/themes/Raleigh
+@dirrm usr/share/themes
+@unexec rmdir %D/usr/share/locale/cy/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/cy 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/en@IPA/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/en@IPA 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/fa/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/fa 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/ga 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/ia/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/ia 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/lt/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/lt 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/lv/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/lv 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/mk/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/mk 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/sp/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/sp 2>&1 >/dev/null || true
diff --git a/x11-toolkits/linux-openmotif/Makefile b/x11-toolkits/linux-openmotif/Makefile
index 40884e0cc17e..610ef74bf61c 100644
--- a/x11-toolkits/linux-openmotif/Makefile
+++ b/x11-toolkits/linux-openmotif/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	openmotif
 PORTVERSION=	2.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits linux
 MASTER_SITES=	ftp://ftp.ics.com/pub/Products/Motif/%SUBDIR%/
 MASTER_SITE_SUBDIR=	om2.2.4/redhat-7.3
@@ -19,12 +19,12 @@ MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Motif toolkit Linux libraries
 
 BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm
-RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs
 
 ONLY_FOR_ARCHS=	i386
+USE_LINUX=	yes
 USE_LINUX_PREFIX=	yes
+USE_XLIB=	yes
 NO_BUILD=	yes
-NO_FILTER_SHLIBS=	yes
 MD5_FILE=	${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
 EXTRACT_FILES=	./usr/X11R6/lib/libMrm.so.3.0.3 \
diff --git a/x11-toolkits/linux-pango/Makefile b/x11-toolkits/linux-pango/Makefile
index bfae1cfb4acb..a37e4a1daa9b 100644
--- a/x11-toolkits/linux-pango/Makefile
+++ b/x11-toolkits/linux-pango/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pango
 PORTVERSION=	1.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits linux
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
@@ -21,6 +21,7 @@ BUILD_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFre
 
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_XLIB=	yes
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386
 PLIST=		${PKGDIR}/pkg-plist