3 files changed, 138 insertions, 160 deletions

diff --git a/x11-fm/gentoo/Makefile b/x11-fm/gentoo/Makefile
index f75db5b51eb2..50a630cd034c 100644
--- a/x11-fm/gentoo/Makefile
+++ b/x11-fm/gentoo/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gentoo
-PORTVERSION=	0.11.48
-PORTREVISION=	1
+PORTVERSION=	0.11.49
 CATEGORIES=	x11-fm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,29 +14,29 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gtk+ based, file manager inspired by DirectoryOpus
 
-USE_GNOME=	gtk12
-USE_ICONV=	yes
+USE_GNOME=	gnometarget gtk12
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--disable-fam
 
 MAN1=		gentoo.1
 
 MYPORTDOCS=	BUGS CONFIG-CHANGES CREDITS NEWS README README.NLS \
 		README.gtkrc TODO
 
-.if !defined(WITHOUT_NLS)
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|icons|${DATADIR}/icons|g' ${WRKSRC}/gentoorc.in
-	@${REINPLACE_CMD} -e 's|-O2|${CFLAGS}|g' ${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|^CFLAGS = @GENTOO_CFLAGS@|CFLAGS = @CFLAGS@|g' \
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/gentoo.1x ${MANPREFIX}/man/man1/gentoo.1
@@ -46,12 +45,11 @@ post-install:
 .for file in ${MYPORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
-	${TAR} -C ${WRKSRC}/docs --exclude "gentoo.1x" -cf - . | \
+	${TAR} -C ${WRKSRC}/docs --exclude "gentoo.1x*" -cf - . | \
 		${TAR} -C ${DOCSDIR} --unlink -xf -
 	@${FIND} ${DOCSDIR} | ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP}
 	@${FIND} ${DOCSDIR} | ${XARGS} ${CHMOD} ${SHAREMODE}
 	@${FIND} ${DOCSDIR} -type d | ${XARGS} ${CHMOD} a+x
-	@${FIND} ${DOCSDIR} -name *.bak -delete
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-fm/gentoo/distinfo b/x11-fm/gentoo/distinfo
index fc639572f874..ecad4e93c0ce 100644
--- a/x11-fm/gentoo/distinfo
+++ b/x11-fm/gentoo/distinfo
@@ -1,2 +1,2 @@
-MD5 (gentoo-0.11.48.tar.gz) = c446e50c818ebb01418dbad070605a54
-SIZE (gentoo-0.11.48.tar.gz) = 1273603
+MD5 (gentoo-0.11.49.tar.gz) = d4ba19c5ab08c1c38b2ba9df733c754a
+SIZE (gentoo-0.11.49.tar.gz) = 1277249
diff --git a/x11-fm/gentoo/pkg-plist b/x11-fm/gentoo/pkg-plist
index 2fdc9475b6d0..9fdf61395387 100644
--- a/x11-fm/gentoo/pkg-plist
+++ b/x11-fm/gentoo/pkg-plist
@@ -89,129 +89,129 @@ etc/gentoorc
 %%PORTDOCS%%%%DOCSDIR%%/template_toc.html
 %%PORTDOCS%%%%DOCSDIR%%/types.html
 %%PORTDOCS%%%%DOCSDIR%%/usage.html
-share/gentoo/icons/AbiWord.xpm
-share/gentoo/icons/Amiga.xpm
-share/gentoo/icons/Animation.xpm
-share/gentoo/icons/Apple.xpm
-share/gentoo/icons/BSD.xpm
-share/gentoo/icons/Bad.xpm
-share/gentoo/icons/Battery.xpm
-share/gentoo/icons/CDROM.xpm
-share/gentoo/icons/Card.xpm
-share/gentoo/icons/Database.xpm
-share/gentoo/icons/Directory.xpm
-share/gentoo/icons/Directory2.xpm
-share/gentoo/icons/Document.xpm
-share/gentoo/icons/EggTimer.xpm
-share/gentoo/icons/ExcelCalcXLS.xpm
-share/gentoo/icons/Executable.xpm
-share/gentoo/icons/FIFO.xpm
-share/gentoo/icons/Floppy.xpm
-share/gentoo/icons/Font.xpm
-share/gentoo/icons/GNUstep.xpm
-share/gentoo/icons/Ghost.xpm
-share/gentoo/icons/GnomeCalc.xpm
-share/gentoo/icons/GnomeWord.xpm
-share/gentoo/icons/Harddrive.xpm
-share/gentoo/icons/Image.xpm
-share/gentoo/icons/Internet.xpm
-share/gentoo/icons/KDECalc.xpm
-share/gentoo/icons/KDEWord.xpm
-share/gentoo/icons/Kernel.xpm
-share/gentoo/icons/Keymap.xpm
-share/gentoo/icons/Lego.xpm
-share/gentoo/icons/License.xpm
-share/gentoo/icons/Linux.xpm
-share/gentoo/icons/MSWordDoc.xpm
-share/gentoo/icons/Makefile.xpm
-share/gentoo/icons/Maya.xpm
-share/gentoo/icons/Mixer.xpm
-share/gentoo/icons/Mouse.xpm
-share/gentoo/icons/Mouse2.xpm
-share/gentoo/icons/NetAmiga.xpm
-share/gentoo/icons/NetApple.xpm
-share/gentoo/icons/NetHD.xpm
-share/gentoo/icons/NetSGI.xpm
-share/gentoo/icons/NetSun.xpm
-share/gentoo/icons/NetWindows.xpm
-share/gentoo/icons/Package.xpm
-share/gentoo/icons/Package2.xpm
-share/gentoo/icons/Port.xpm
-share/gentoo/icons/Port2.xpm
-share/gentoo/icons/PowerButton.xpm
-share/gentoo/icons/Printer.xpm
-share/gentoo/icons/Readme.xpm
-share/gentoo/icons/SCSI.xpm
-share/gentoo/icons/SoundCard.xpm
-share/gentoo/icons/Source.xpm
-share/gentoo/icons/Speaker.xpm
-share/gentoo/icons/Speaker2.xpm
-share/gentoo/icons/Spreadsheet.xpm
-share/gentoo/icons/Tape.xpm
-share/gentoo/icons/VRML.xpm
-share/gentoo/icons/Windows.xpm
-share/gentoo/icons/aiff.xpm
-share/gentoo/icons/au.xpm
-share/gentoo/icons/avi.xpm
-share/gentoo/icons/bmp.xpm
-share/gentoo/icons/bmp2.xpm
-share/gentoo/icons/c.xpm
-share/gentoo/icons/class.xpm
-share/gentoo/icons/conf.xpm
-share/gentoo/icons/core.xpm
-share/gentoo/icons/cpp.xpm
-share/gentoo/icons/deb.xpm
-share/gentoo/icons/eps.xpm
-share/gentoo/icons/exe.xpm
-share/gentoo/icons/gentoo.png
-share/gentoo/icons/gif.xpm
-share/gentoo/icons/gif2.xpm
-share/gentoo/icons/h.xpm
-share/gentoo/icons/html.xpm
-share/gentoo/icons/html2.xpm
-share/gentoo/icons/iff.xpm
-share/gentoo/icons/iff2.xpm
-share/gentoo/icons/java.xpm
-share/gentoo/icons/jpeg.xpm
-share/gentoo/icons/jpeg2.xpm
-share/gentoo/icons/log.xpm
-share/gentoo/icons/m.xpm
-share/gentoo/icons/man.xpm
-share/gentoo/icons/midi.xpm
-share/gentoo/icons/mod.xpm
-share/gentoo/icons/mov.xpm
-share/gentoo/icons/mov2.xpm
-share/gentoo/icons/mp3.xpm
-share/gentoo/icons/mpeg.xpm
-share/gentoo/icons/o.xpm
-share/gentoo/icons/pcx.xpm
-share/gentoo/icons/pcx2.xpm
-share/gentoo/icons/pdb.xpm
-share/gentoo/icons/pdf.xpm
-share/gentoo/icons/pl.xpm
-share/gentoo/icons/png.xpm
-share/gentoo/icons/png2.xpm
-share/gentoo/icons/prc.xpm
-share/gentoo/icons/ps.xpm
-share/gentoo/icons/r.xpm
-share/gentoo/icons/ra.xpm
-share/gentoo/icons/rom.xpm
-share/gentoo/icons/rpm.xpm
-share/gentoo/icons/sh.xpm
-share/gentoo/icons/sid.xpm
-share/gentoo/icons/so.xpm
-share/gentoo/icons/targa.xpm
-share/gentoo/icons/targa2.xpm
-share/gentoo/icons/tex.xpm
-share/gentoo/icons/tiff.xpm
-share/gentoo/icons/tiff2.xpm
-share/gentoo/icons/txt.xpm
-share/gentoo/icons/wav.xpm
-share/gentoo/icons/xbm.xpm
-share/gentoo/icons/xbm2.xpm
-share/gentoo/icons/xcf.xpm
-share/gentoo/icons/xpm.xpm
-share/gentoo/icons/xpm2.xpm
+%%DATADIR%%/icons/AbiWord.xpm
+%%DATADIR%%/icons/Amiga.xpm
+%%DATADIR%%/icons/Animation.xpm
+%%DATADIR%%/icons/Apple.xpm
+%%DATADIR%%/icons/BSD.xpm
+%%DATADIR%%/icons/Bad.xpm
+%%DATADIR%%/icons/Battery.xpm
+%%DATADIR%%/icons/CDROM.xpm
+%%DATADIR%%/icons/Card.xpm
+%%DATADIR%%/icons/Database.xpm
+%%DATADIR%%/icons/Directory.xpm
+%%DATADIR%%/icons/Directory2.xpm
+%%DATADIR%%/icons/Document.xpm
+%%DATADIR%%/icons/EggTimer.xpm
+%%DATADIR%%/icons/ExcelCalcXLS.xpm
+%%DATADIR%%/icons/Executable.xpm
+%%DATADIR%%/icons/FIFO.xpm
+%%DATADIR%%/icons/Floppy.xpm
+%%DATADIR%%/icons/Font.xpm
+%%DATADIR%%/icons/GNUstep.xpm
+%%DATADIR%%/icons/Ghost.xpm
+%%DATADIR%%/icons/GnomeCalc.xpm
+%%DATADIR%%/icons/GnomeWord.xpm
+%%DATADIR%%/icons/Harddrive.xpm
+%%DATADIR%%/icons/Image.xpm
+%%DATADIR%%/icons/Internet.xpm
+%%DATADIR%%/icons/KDECalc.xpm
+%%DATADIR%%/icons/KDEWord.xpm
+%%DATADIR%%/icons/Kernel.xpm
+%%DATADIR%%/icons/Keymap.xpm
+%%DATADIR%%/icons/Lego.xpm
+%%DATADIR%%/icons/License.xpm
+%%DATADIR%%/icons/Linux.xpm
+%%DATADIR%%/icons/MSWordDoc.xpm
+%%DATADIR%%/icons/Makefile.xpm
+%%DATADIR%%/icons/Maya.xpm
+%%DATADIR%%/icons/Mixer.xpm
+%%DATADIR%%/icons/Mouse.xpm
+%%DATADIR%%/icons/Mouse2.xpm
+%%DATADIR%%/icons/NetAmiga.xpm
+%%DATADIR%%/icons/NetApple.xpm
+%%DATADIR%%/icons/NetHD.xpm
+%%DATADIR%%/icons/NetSGI.xpm
+%%DATADIR%%/icons/NetSun.xpm
+%%DATADIR%%/icons/NetWindows.xpm
+%%DATADIR%%/icons/Package.xpm
+%%DATADIR%%/icons/Package2.xpm
+%%DATADIR%%/icons/Port.xpm
+%%DATADIR%%/icons/Port2.xpm
+%%DATADIR%%/icons/PowerButton.xpm
+%%DATADIR%%/icons/Printer.xpm
+%%DATADIR%%/icons/Readme.xpm
+%%DATADIR%%/icons/SCSI.xpm
+%%DATADIR%%/icons/SoundCard.xpm
+%%DATADIR%%/icons/Source.xpm
+%%DATADIR%%/icons/Speaker.xpm
+%%DATADIR%%/icons/Speaker2.xpm
+%%DATADIR%%/icons/Spreadsheet.xpm
+%%DATADIR%%/icons/Tape.xpm
+%%DATADIR%%/icons/VRML.xpm
+%%DATADIR%%/icons/Windows.xpm
+%%DATADIR%%/icons/aiff.xpm
+%%DATADIR%%/icons/au.xpm
+%%DATADIR%%/icons/avi.xpm
+%%DATADIR%%/icons/bmp.xpm
+%%DATADIR%%/icons/bmp2.xpm
+%%DATADIR%%/icons/c.xpm
+%%DATADIR%%/icons/class.xpm
+%%DATADIR%%/icons/conf.xpm
+%%DATADIR%%/icons/core.xpm
+%%DATADIR%%/icons/cpp.xpm
+%%DATADIR%%/icons/deb.xpm
+%%DATADIR%%/icons/eps.xpm
+%%DATADIR%%/icons/exe.xpm
+%%DATADIR%%/icons/gentoo.png
+%%DATADIR%%/icons/gif.xpm
+%%DATADIR%%/icons/gif2.xpm
+%%DATADIR%%/icons/h.xpm
+%%DATADIR%%/icons/html.xpm
+%%DATADIR%%/icons/html2.xpm
+%%DATADIR%%/icons/iff.xpm
+%%DATADIR%%/icons/iff2.xpm
+%%DATADIR%%/icons/java.xpm
+%%DATADIR%%/icons/jpeg.xpm
+%%DATADIR%%/icons/jpeg2.xpm
+%%DATADIR%%/icons/log.xpm
+%%DATADIR%%/icons/m.xpm
+%%DATADIR%%/icons/man.xpm
+%%DATADIR%%/icons/midi.xpm
+%%DATADIR%%/icons/mod.xpm
+%%DATADIR%%/icons/mov.xpm
+%%DATADIR%%/icons/mov2.xpm
+%%DATADIR%%/icons/mp3.xpm
+%%DATADIR%%/icons/mpeg.xpm
+%%DATADIR%%/icons/o.xpm
+%%DATADIR%%/icons/pcx.xpm
+%%DATADIR%%/icons/pcx2.xpm
+%%DATADIR%%/icons/pdb.xpm
+%%DATADIR%%/icons/pdf.xpm
+%%DATADIR%%/icons/pl.xpm
+%%DATADIR%%/icons/png.xpm
+%%DATADIR%%/icons/png2.xpm
+%%DATADIR%%/icons/prc.xpm
+%%DATADIR%%/icons/ps.xpm
+%%DATADIR%%/icons/r.xpm
+%%DATADIR%%/icons/ra.xpm
+%%DATADIR%%/icons/rom.xpm
+%%DATADIR%%/icons/rpm.xpm
+%%DATADIR%%/icons/sh.xpm
+%%DATADIR%%/icons/sid.xpm
+%%DATADIR%%/icons/so.xpm
+%%DATADIR%%/icons/targa.xpm
+%%DATADIR%%/icons/targa2.xpm
+%%DATADIR%%/icons/tex.xpm
+%%DATADIR%%/icons/tiff.xpm
+%%DATADIR%%/icons/tiff2.xpm
+%%DATADIR%%/icons/txt.xpm
+%%DATADIR%%/icons/wav.xpm
+%%DATADIR%%/icons/xbm.xpm
+%%DATADIR%%/icons/xbm2.xpm
+%%DATADIR%%/icons/xcf.xpm
+%%DATADIR%%/icons/xpm.xpm
+%%DATADIR%%/icons/xpm2.xpm
 %%NLS%%share/locale/de/LC_MESSAGES/gentoo.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/gentoo.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/gentoo.mo
@@ -222,28 +222,8 @@ share/gentoo/icons/xpm2.xpm
 %%NLS%%share/locale/ru_RU.cp1251/LC_MESSAGES/gentoo.mo
 %%NLS%%share/locale/ru_RU.koi8r/LC_MESSAGES/gentoo.mo
 %%NLS%%share/locale/ru_RU.utf8/LC_MESSAGES/gentoo.mo
-@dirrm share/gentoo/icons
-@dirrm share/gentoo
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/de 2> /dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/fr 2> /dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/pl 2> /dev/null || true
-@unexec rmdir %D/share/locale/ru_RU.CP1251/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ru_RU.CP1251 2> /dev/null || true
-@unexec rmdir %D/share/locale/ru_RU.KOI8-R/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ru_RU.KOI8-R 2> /dev/null || true
-@unexec rmdir %D/share/locale/ru_RU.UTF-8/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ru_RU.UTF-8 2> /dev/null || true
-@unexec rmdir %D/share/locale/ru_RU.cp1251/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ru_RU.cp1251 2> /dev/null || true
-@unexec rmdir %D/share/locale/ru_RU.koi8r/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ru_RU.koi8r 2> /dev/null || true
-@unexec rmdir %D/share/locale/ru_RU.utf8/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ru_RU.utf8 2> /dev/null || true
-@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/sv 2> /dev/null || true
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/scratch
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/config