2 files changed, 17 insertions, 41 deletions

diff --git a/x11-toolkits/linux-gtk2/Makefile b/x11-toolkits/linux-gtk2/Makefile
index 856ec0ed2cf2..58480bb647dc 100644
--- a/x11-toolkits/linux-gtk2/Makefile
+++ b/x11-toolkits/linux-gtk2/Makefile
@@ -7,12 +7,21 @@
 
 PORTNAME=	gtk2
 PORTVERSION=	2.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits linux
 
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	GTK+ library, version 2.X, i386 Linux binary
 
+# these libraries are required by gtk-query-immodules-2.0 or
+# gdk-pixbuf-query-loaders
+RUN_DEPENDS=	${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2 \
+		${LINUXBASE}/usr/lib/libatk-1.0.so.0:${PORTSDIR}/accessibility/linux-atk \
+		${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
+		${LINUXBASE}/usr/lib/libpng12.so.0:${PORTSDIR}/graphics/linux-png \
+		${LINUXBASE}/usr/lib/libtiff.so.3.5:${PORTSDIR}/graphics/linux-tiff \
+		${LINUXBASE}/usr/lib/libpango-1.0.so.0:${PORTSDIR}/x11-toolkits/linux-pango
+
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386
 PLIST=		${WRKDIR}/plist
@@ -27,13 +36,15 @@ pre-install:
 	${RM} -rf ${WRKSRC}/tmp
 	${MKDIR} ${WRKSRC}/tmp
 	cd ${WRKSRC}/tmp; \
-		rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \
+		rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -id; \
 		${FIND} * -type f -o -type l >> ${PLIST}; \
-		${FIND} -d * -type d | ${GREP} -E 'locale|gtk|themes' | \
-		${SED} -e 's:^:@dirrm :' >> ${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:
-	${INSTALL_DATA} ${FILESDIR}/gtk.immodules ${PREFIX}/etc/gtk-2.0/
-	${TOUCH} ${PREFIX}/etc/gtk-2.0/gdk-pixbuf.loaders
+	${PREFIX}/usr/bin/gtk-query-immodules-2.0 > ${PREFIX}/etc/gtk-2.0/gtk.immodules
+	${PREFIX}/usr/bin/gdk-pixbuf-query-loaders > ${PREFIX}/etc/gtk-2.0/gdk-pixbuf.loaders
 
 .include "../linux-gtk/Makefile"
diff --git a/x11-toolkits/linux-gtk2/files/gtk.immodules b/x11-toolkits/linux-gtk2/files/gtk.immodules
deleted file mode 100644
index 8e72725ceb8d..000000000000
--- a/x11-toolkits/linux-gtk2/files/gtk.immodules
+++ /dev/null
@@ -1,35 +0,0 @@
-# $FreeBSD$
-#
-# GTK+ Input Method Modules file
-#
-# ModulesPath = /usr/lib/gtk-2.0/2.2.0/immodules:/usr/lib/gtk-2.0/immodules
-#
-"/usr/lib/gtk-2.0/2.2.0/immodules/im-am-et.so" 
-"am_et" "Amharic (EZ+)" "gtk+" "/usr/share/locale" "am" 
-
-"/usr/lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.so" 
-"cyrillic_translit" "Cyrillic (Transliterated)" "gtk+" "/usr/share/locale" "" 
-
-"/usr/lib/gtk-2.0/2.2.0/immodules/im-hangul.so" 
-"hangul" "Hangul (KSC 5601)" "gtk+" "" "" 
-
-"/usr/lib/gtk-2.0/2.2.0/immodules/im-inuktitut.so" 
-"inuktitut" "Inukitut (Transliterated)" "gtk+" "/usr/share/locale" "iu" 
-
-"/usr/lib/gtk-2.0/2.2.0/immodules/im-ipa.so" 
-"ipa" "IPA" "gtk+" "/usr/share/locale" "" 
-
-"/usr/lib/gtk-2.0/2.2.0/immodules/im-thai-broken.so" 
-"thai_broken" "Thai (Broken)" "gtk+" "/usr/share/locale" "" 
-
-"/usr/lib/gtk-2.0/2.2.0/immodules/im-ti-er.so" 
-"ti_er" "Tigrigna-Eritrean (EZ+)" "gtk+" "/usr/share/locale" "ti" 
-
-"/usr/lib/gtk-2.0/2.2.0/immodules/im-ti-et.so" 
-"ti_et" "Tigrigna-Ethiopian (EZ+)" "gtk+" "/usr/share/locale" "ti" 
-
-"/usr/lib/gtk-2.0/2.2.0/immodules/im-viqr.so" 
-"viqr" "Vietnamese (VIQR)" "gtk+" "/usr/share/locale" "vi" 
-
-"/usr/lib/gtk-2.0/2.2.0/immodules/im-xim.so" 
-"xim" "X Input Method" "gtk+" "/usr/share/locale" "ko:ja:zh"