- Update to 0.15.1

PR:		132475
Submitted by:	Ports Fury

4 files changed, 41 insertions, 63 deletions

diff --git a/x11-fm/gentoo/Makefile b/x11-fm/gentoo/Makefile
index f799d450baac..3baf56471597 100644
--- a/x11-fm/gentoo/Makefile
+++ b/x11-fm/gentoo/Makefile
@@ -6,19 +6,19 @@
 #
 
 PORTNAME=	gentoo
-PORTVERSION=	0.11.57
+PORTVERSION=	0.15.2
 CATEGORIES=	x11-fm
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gtk+ based, file manager inspired by DirectoryOpus
 
-OPTIONS=	NLS "Native Language Support" on \
-		FAM "File Alteration Monitor Support" off
+OPTIONS=	FAM "File Alteration Monitor Support" off
 
-USE_GNOME=	gnometarget gtk12
+USE_GNOME=	gnomehack gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
+		MKDIR_P="${MKDIR}"
 
 MAN1=		gentoo.1
 
@@ -27,27 +27,18 @@ LDFLAGS=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.else
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.endif
-
 .if defined(WITH_FAM)
 USE_FAM=	yes
-CPPFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
 .else
 CONFIGURE_ARGS+=	--disable-fam
 .endif
 
 post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|^CFLAGS = @GENTOO_CFLAGS@|CFLAGS = @CFLAGS@|g ; \
-		 s|^MKDIR_P =.*$$|MKDIR_P = ${MKDIR}|g ; \
-		 s|^mkdir_p =.*$$|mkdir_p = ${MKDIR}|g'
+	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g ; \
+		 s|/bin/mount|/sbin/mount|g ; \
+		 s|/bin/umount|/sbin/umount|g' ${WRKSRC}/gentoorc.in
+	@${REINPLACE_CMD} -e '/^CFLAGS/s|@GENTOO_CFLAGS@|@CFLAGS@|g' \
+		${WRKSRC}/src/Makefile.in
 
 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 db0e5abe475d..5eb48d3c7e2a 100644
--- a/x11-fm/gentoo/distinfo
+++ b/x11-fm/gentoo/distinfo
@@ -1,3 +1,3 @@
-MD5 (gentoo-0.11.57.tar.gz) = 00ec2afd0254aa815f87980a27dcf242
-SHA256 (gentoo-0.11.57.tar.gz) = f5c4cca84b728bcc71ab1a0f1d9fc60f369cd1bdf79d1d88826081f3bd189f94
-SIZE (gentoo-0.11.57.tar.gz) = 1479376
+MD5 (gentoo-0.15.2.tar.gz) = d3b66eeab00efa43c9b744fefe27d863
+SHA256 (gentoo-0.15.2.tar.gz) = 907d94685e4fee2cd102510d14fb34b1ea80272870c7acd806da5d7e3b42adec
+SIZE (gentoo-0.15.2.tar.gz) = 1456814
diff --git a/x11-fm/gentoo/files/patch-gentoorc.in b/x11-fm/gentoo/files/patch-gentoorc.in
deleted file mode 100644
index 43f1e3452849..000000000000
--- a/x11-fm/gentoo/files/patch-gentoorc.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- gentoorc.in.old	Sat Sep 24 23:47:27 2005
-+++ gentoorc.in	Sat Sep 24 23:48:26 2005
-@@ -2716,8 +2716,8 @@
-  </Paths>
-  <Mounting>
-   <mode>"always"</mode>
--  <cmd_mount>"/bin/mount"</cmd_mount>
--  <cmd_umount>"/bin/umount"</cmd_umount>
-+  <cmd_mount>"/sbin/mount"</cmd_mount>
-+  <cmd_umount>"/sbin/umount"</cmd_umount>
-   <check_nlink>TRUE</check_nlink>
-   <show_stderr>TRUE</show_stderr>
-   <umount_exit>TRUE</umount_exit>
diff --git a/x11-fm/gentoo/pkg-plist b/x11-fm/gentoo/pkg-plist
index 1bd625fb7c4b..fca6c5eb2c49 100644
--- a/x11-fm/gentoo/pkg-plist
+++ b/x11-fm/gentoo/pkg-plist
@@ -212,36 +212,36 @@ etc/gentoorc
 %%DATADIR%%/icons/xcf.xpm
 %%DATADIR%%/icons/xpm.xpm
 %%DATADIR%%/icons/xpm2.xpm
-%%NLS%%share/locale/de/LC_MESSAGES/gentoo.mo
-%%NLS%%share/locale/es_MX/LC_MESSAGES/gentoo.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/gentoo.mo
-%%NLS%%share/locale/it/LC_MESSAGES/gentoo.mo
-%%NLS%%share/locale/ja_JP.UTF-8/LC_MESSAGES/gentoo.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/gentoo.mo
-%%NLS%%share/locale/ru_RU.CP1251/LC_MESSAGES/gentoo.mo
-%%NLS%%share/locale/ru_RU.KOI8-R/LC_MESSAGES/gentoo.mo
-%%NLS%%share/locale/ru_RU.UTF-8/LC_MESSAGES/gentoo.mo
-%%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
-%%NLS%%share/locale/sv/LC_MESSAGES/gentoo.mo
-%%NLS%%@dirrmtry share/locale/ru_RU.utf8/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ru_RU.utf8
-%%NLS%%@dirrmtry share/locale/ru_RU.koi8r/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ru_RU.koi8r
-%%NLS%%@dirrmtry share/locale/ru_RU.cp1251/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ru_RU.cp1251
-%%NLS%%@dirrmtry share/locale/ru_RU.UTF-8/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ru_RU.UTF-8
-%%NLS%%@dirrmtry share/locale/ru_RU.KOI8-R/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ru_RU.KOI8-R
-%%NLS%%@dirrmtry share/locale/ru_RU.CP1251/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ru_RU.CP1251
-%%NLS%%@dirrmtry share/locale/ja_JP.UTF-8/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ja_JP.UTF-8
+share/locale/de/LC_MESSAGES/gentoo.mo
+share/locale/es_MX/LC_MESSAGES/gentoo.mo
+share/locale/fr/LC_MESSAGES/gentoo.mo
+share/locale/it/LC_MESSAGES/gentoo.mo
+share/locale/ja_JP.UTF-8/LC_MESSAGES/gentoo.mo
+share/locale/pl/LC_MESSAGES/gentoo.mo
+share/locale/ru_RU.CP1251/LC_MESSAGES/gentoo.mo
+share/locale/ru_RU.KOI8-R/LC_MESSAGES/gentoo.mo
+share/locale/ru_RU.UTF-8/LC_MESSAGES/gentoo.mo
+share/locale/ru_RU.cp1251/LC_MESSAGES/gentoo.mo
+share/locale/ru_RU.koi8r/LC_MESSAGES/gentoo.mo
+share/locale/ru_RU.utf8/LC_MESSAGES/gentoo.mo
+share/locale/sv/LC_MESSAGES/gentoo.mo
+@dirrmtry share/locale/ru_RU.utf8/LC_MESSAGES
+@dirrmtry share/locale/ru_RU.utf8
+@dirrmtry share/locale/ru_RU.koi8r/LC_MESSAGES
+@dirrmtry share/locale/ru_RU.koi8r
+@dirrmtry share/locale/ru_RU.cp1251/LC_MESSAGES
+@dirrmtry share/locale/ru_RU.cp1251
+@dirrmtry share/locale/ru_RU.UTF-8/LC_MESSAGES
+@dirrmtry share/locale/ru_RU.UTF-8
+@dirrmtry share/locale/ru_RU.KOI8-R/LC_MESSAGES
+@dirrmtry share/locale/ru_RU.KOI8-R
+@dirrmtry share/locale/ru_RU.CP1251/LC_MESSAGES
+@dirrmtry share/locale/ru_RU.CP1251
+@dirrmtry share/locale/ja_JP.UTF-8/LC_MESSAGES
+@dirrmtry share/locale/ja_JP.UTF-8
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/scratch
-%%PORTDOCS%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/config
 %%PORTDOCS%%@dirrm %%DOCSDIR%%