3 files changed, 98 insertions, 96 deletions

diff --git a/x11-fm/gentoo/Makefile b/x11-fm/gentoo/Makefile
index a32aa18a34c7..ac6ce4d117f2 100644
--- a/x11-fm/gentoo/Makefile
+++ b/x11-fm/gentoo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gentoo
-PORTVERSION=	0.11.46
+PORTVERSION=	0.11.48
 CATEGORIES=	x11-fm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,7 +14,6 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gtk+ based, file manager inspired by DirectoryOpus
 
-USE_SIZE=	yes
 USE_GNOME=	gtk12
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
@@ -26,6 +25,7 @@ MYPORTDOCS=	BUGS CONFIG-CHANGES CREDITS NEWS README README.NLS \
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|icons|${DATADIR}/icons|g' ${WRKSRC}/gentoorc.in
+	@${REINPLACE_CMD} -e 's|-O2|${CFLAGS}|g' ${WRKSRC}/configure
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/gentoo.1x ${MANPREFIX}/man/man1/gentoo.1
diff --git a/x11-fm/gentoo/distinfo b/x11-fm/gentoo/distinfo
index 9664e1fff62d..fc639572f874 100644
--- a/x11-fm/gentoo/distinfo
+++ b/x11-fm/gentoo/distinfo
@@ -1,2 +1,2 @@
-MD5 (gentoo-0.11.46.tar.gz) = 545244fec06e7e5adcf9e6f6c93bd58d
-SIZE (gentoo-0.11.46.tar.gz) = 1280347
+MD5 (gentoo-0.11.48.tar.gz) = c446e50c818ebb01418dbad070605a54
+SIZE (gentoo-0.11.48.tar.gz) = 1273603
diff --git a/x11-fm/gentoo/pkg-plist b/x11-fm/gentoo/pkg-plist
index 1d4ce539ad79..342dbc489849 100644
--- a/x11-fm/gentoo/pkg-plist
+++ b/x11-fm/gentoo/pkg-plist
@@ -1,94 +1,95 @@
 bin/gentoo
 etc/gentoogtkrc
 etc/gentoorc
-%%PORTDOCS%%share/doc/gentoo/BUGS
-%%PORTDOCS%%share/doc/gentoo/CONFIG-CHANGES
-%%PORTDOCS%%share/doc/gentoo/CREDITS
-%%PORTDOCS%%share/doc/gentoo/FAQ
-%%PORTDOCS%%share/doc/gentoo/NEWS
-%%PORTDOCS%%share/doc/gentoo/README
-%%PORTDOCS%%share/doc/gentoo/README.NLS
-%%PORTDOCS%%share/doc/gentoo/README.gtkrc
-%%PORTDOCS%%share/doc/gentoo/TODO
-%%PORTDOCS%%share/doc/gentoo/acks.html
-%%PORTDOCS%%share/doc/gentoo/buttons.html
-%%PORTDOCS%%share/doc/gentoo/columns.html
-%%PORTDOCS%%share/doc/gentoo/commands.html
-%%PORTDOCS%%share/doc/gentoo/config/cfg_dirpane.html
-%%PORTDOCS%%share/doc/gentoo/config/cfg_gui.html
-%%PORTDOCS%%share/doc/gentoo/config/cfg_styles.html
-%%PORTDOCS%%share/doc/gentoo/config/cfg_types.html
-%%PORTDOCS%%share/doc/gentoo/config/gentoorc.html
-%%PORTDOCS%%share/doc/gentoo/config/index.html
-%%PORTDOCS%%share/doc/gentoo/config/template.html
-%%PORTDOCS%%share/doc/gentoo/contribute.html
-%%PORTDOCS%%share/doc/gentoo/dirpanes.html
-%%PORTDOCS%%share/doc/gentoo/gentoo.css
-%%PORTDOCS%%share/doc/gentoo/gpl.html
-%%PORTDOCS%%share/doc/gentoo/history.html
-%%PORTDOCS%%share/doc/gentoo/images/bullet.gif
-%%PORTDOCS%%share/doc/gentoo/images/cfg_dirpane.gif
-%%PORTDOCS%%share/doc/gentoo/images/cfg_gui.gif
-%%PORTDOCS%%share/doc/gentoo/images/cfg_styles.gif
-%%PORTDOCS%%share/doc/gentoo/images/cfg_styles2.gif
-%%PORTDOCS%%share/doc/gentoo/images/cfg_styles3.gif
-%%PORTDOCS%%share/doc/gentoo/images/cfg_types.gif
-%%PORTDOCS%%share/doc/gentoo/images/cfg_types2.gif
-%%PORTDOCS%%share/doc/gentoo/images/cmd_chmod.gif
-%%PORTDOCS%%share/doc/gentoo/images/cmd_dialog.gif
-%%PORTDOCS%%share/doc/gentoo/images/cmd_inp1.gif
-%%PORTDOCS%%share/doc/gentoo/images/cmd_inp2.gif
-%%PORTDOCS%%share/doc/gentoo/images/cmd_inp3.gif
-%%PORTDOCS%%share/doc/gentoo/images/cmd_inp4.gif
-%%PORTDOCS%%share/doc/gentoo/images/cmd_inp5.gif
-%%PORTDOCS%%share/doc/gentoo/images/cmd_selectre.gif
-%%PORTDOCS%%share/doc/gentoo/images/colsel.jpeg
-%%PORTDOCS%%share/doc/gentoo/images/columnedit.gif
-%%PORTDOCS%%share/doc/gentoo/images/gentoo_logo.gif
-%%PORTDOCS%%share/doc/gentoo/images/gentoo_logo_g.gif
-%%PORTDOCS%%share/doc/gentoo/images/gentoo_logo_g_small.gif
-%%PORTDOCS%%share/doc/gentoo/images/gentoo_logo_small.gif
-%%PORTDOCS%%share/doc/gentoo/images/gentoo_logo_text.gif
-%%PORTDOCS%%share/doc/gentoo/images/iconsel.gif
-%%PORTDOCS%%share/doc/gentoo/images/layout.gif
-%%PORTDOCS%%share/doc/gentoo/images/od__logo_small.gif
-%%PORTDOCS%%share/doc/gentoo/images/popupmenu.gif
-%%PORTDOCS%%share/doc/gentoo/images/popupmenu2.gif
-%%PORTDOCS%%share/doc/gentoo/images/status_error.gif
-%%PORTDOCS%%share/doc/gentoo/images/style_tree.gif
-%%PORTDOCS%%share/doc/gentoo/images/stylesel.gif
-%%PORTDOCS%%share/doc/gentoo/images/tone.gif
-%%PORTDOCS%%share/doc/gentoo/images/tone2.gif
-%%PORTDOCS%%share/doc/gentoo/images/tone3.gif
-%%PORTDOCS%%share/doc/gentoo/index.bt
-%%PORTDOCS%%share/doc/gentoo/index.html
-%%PORTDOCS%%share/doc/gentoo/intro.html
-%%PORTDOCS%%share/doc/gentoo/layout.html
-%%PORTDOCS%%share/doc/gentoo/menus.html
-%%PORTDOCS%%share/doc/gentoo/menus.txt
-%%PORTDOCS%%share/doc/gentoo/misc.html
-%%PORTDOCS%%share/doc/gentoo/quick.html
-%%PORTDOCS%%share/doc/gentoo/relnotes.html
-%%PORTDOCS%%share/doc/gentoo/scratch/README
-%%PORTDOCS%%share/doc/gentoo/scratch/command_args.txt
-%%PORTDOCS%%share/doc/gentoo/scratch/command_howto.txt
-%%PORTDOCS%%share/doc/gentoo/scratch/command_options.txt
-%%PORTDOCS%%share/doc/gentoo/scratch/commands.txt
-%%PORTDOCS%%share/doc/gentoo/scratch/dirhistory.txt
-%%PORTDOCS%%share/doc/gentoo/scratch/filestyles.txt
-%%PORTDOCS%%share/doc/gentoo/scratch/filetypes.txt
-%%PORTDOCS%%share/doc/gentoo/scratch/focusing.txt
-%%PORTDOCS%%share/doc/gentoo/scratch/mount.txt
-%%PORTDOCS%%share/doc/gentoo/scratch/outline.txt
-%%PORTDOCS%%share/doc/gentoo/scratch/renamere.txt
-%%PORTDOCS%%share/doc/gentoo/scratch/search_howto.txt
-%%PORTDOCS%%share/doc/gentoo/scratch/symlinks.txt
-%%PORTDOCS%%share/doc/gentoo/status.html
-%%PORTDOCS%%share/doc/gentoo/styles.html
-%%PORTDOCS%%share/doc/gentoo/template.html
-%%PORTDOCS%%share/doc/gentoo/template_toc.html
-%%PORTDOCS%%share/doc/gentoo/types.html
-%%PORTDOCS%%share/doc/gentoo/usage.html
+lib/charset.alias
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/CONFIG-CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.NLS
+%%PORTDOCS%%%%DOCSDIR%%/README.gtkrc
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/acks.html
+%%PORTDOCS%%%%DOCSDIR%%/buttons.html
+%%PORTDOCS%%%%DOCSDIR%%/columns.html
+%%PORTDOCS%%%%DOCSDIR%%/commands.html
+%%PORTDOCS%%%%DOCSDIR%%/config/cfg_dirpane.html
+%%PORTDOCS%%%%DOCSDIR%%/config/cfg_gui.html
+%%PORTDOCS%%%%DOCSDIR%%/config/cfg_styles.html
+%%PORTDOCS%%%%DOCSDIR%%/config/cfg_types.html
+%%PORTDOCS%%%%DOCSDIR%%/config/gentoorc.html
+%%PORTDOCS%%%%DOCSDIR%%/config/index.html
+%%PORTDOCS%%%%DOCSDIR%%/config/template.html
+%%PORTDOCS%%%%DOCSDIR%%/contribute.html
+%%PORTDOCS%%%%DOCSDIR%%/dirpanes.html
+%%PORTDOCS%%%%DOCSDIR%%/gentoo.css
+%%PORTDOCS%%%%DOCSDIR%%/gpl.html
+%%PORTDOCS%%%%DOCSDIR%%/history.html
+%%PORTDOCS%%%%DOCSDIR%%/images/bullet.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/cfg_dirpane.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/cfg_gui.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/cfg_styles.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/cfg_styles2.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/cfg_styles3.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/cfg_types.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/cfg_types2.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/cmd_chmod.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/cmd_dialog.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/cmd_inp1.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/cmd_inp2.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/cmd_inp3.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/cmd_inp4.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/cmd_inp5.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/cmd_selectre.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/colsel.jpeg
+%%PORTDOCS%%%%DOCSDIR%%/images/columnedit.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/gentoo_logo.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/gentoo_logo_g.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/gentoo_logo_g_small.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/gentoo_logo_small.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/gentoo_logo_text.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/iconsel.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/layout.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/od__logo_small.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/popupmenu.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/popupmenu2.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/status_error.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/style_tree.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/stylesel.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/tone.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/tone2.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/tone3.gif
+%%PORTDOCS%%%%DOCSDIR%%/index.bt
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/intro.html
+%%PORTDOCS%%%%DOCSDIR%%/layout.html
+%%PORTDOCS%%%%DOCSDIR%%/menus.html
+%%PORTDOCS%%%%DOCSDIR%%/menus.txt
+%%PORTDOCS%%%%DOCSDIR%%/misc.html
+%%PORTDOCS%%%%DOCSDIR%%/quick.html
+%%PORTDOCS%%%%DOCSDIR%%/relnotes.html
+%%PORTDOCS%%%%DOCSDIR%%/scratch/README
+%%PORTDOCS%%%%DOCSDIR%%/scratch/command_args.txt
+%%PORTDOCS%%%%DOCSDIR%%/scratch/command_howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/scratch/command_options.txt
+%%PORTDOCS%%%%DOCSDIR%%/scratch/commands.txt
+%%PORTDOCS%%%%DOCSDIR%%/scratch/dirhistory.txt
+%%PORTDOCS%%%%DOCSDIR%%/scratch/filestyles.txt
+%%PORTDOCS%%%%DOCSDIR%%/scratch/filetypes.txt
+%%PORTDOCS%%%%DOCSDIR%%/scratch/focusing.txt
+%%PORTDOCS%%%%DOCSDIR%%/scratch/mount.txt
+%%PORTDOCS%%%%DOCSDIR%%/scratch/outline.txt
+%%PORTDOCS%%%%DOCSDIR%%/scratch/renamere.txt
+%%PORTDOCS%%%%DOCSDIR%%/scratch/search_howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/scratch/symlinks.txt
+%%PORTDOCS%%%%DOCSDIR%%/status.html
+%%PORTDOCS%%%%DOCSDIR%%/styles.html
+%%PORTDOCS%%%%DOCSDIR%%/template.html
+%%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
@@ -214,6 +215,7 @@ share/gentoo/icons/xpm.xpm
 share/gentoo/icons/xpm2.xpm
 share/locale/de/LC_MESSAGES/gentoo.mo
 share/locale/fr/LC_MESSAGES/gentoo.mo
+share/locale/locale.alias
 share/locale/pl/LC_MESSAGES/gentoo.mo
 share/locale/sv/LC_MESSAGES/gentoo.mo
 share/locale/ru_RU.CP1251/LC_MESSAGES/gentoo.mo
@@ -242,7 +244,7 @@ share/locale/ru_RU.utf8/LC_MESSAGES/gentoo.mo
 @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
-%%PORTDOCS%%@dirrm share/doc/gentoo/scratch
-%%PORTDOCS%%@dirrm share/doc/gentoo/images
-%%PORTDOCS%%@dirrm share/doc/gentoo/config
-%%PORTDOCS%%@dirrm share/doc/gentoo
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/scratch
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/config
+%%PORTDOCS%%@dirrm %%DOCSDIR%%