Update file-roller to 3.12.2. Try to convert some options to the

compact form, protect an strip command to be run only when
the nautilus option is set and resort a part of the pkg-plist.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19645 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 63 insertions, 54 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index a5c159ce6..c9be92f69 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -3,14 +3,14 @@
 #   $MCom$
 
 PORTNAME=	file-roller
-PORTVERSION=	3.12.1
+PORTVERSION=	3.12.2
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	An archive manager for zip files, tar, etc
+COMMENT=	Archive manager for zip files, tar, etc
 
 BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
 RUN_DEPENDS=	${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar \
@@ -30,25 +30,20 @@ CONFIGURE_ARGS=	--disable-packagekit
 PORTDOCS=	AUTHORS NEWS README TODO ChangeLog
 GLIB_SCHEMAS=	org.gnome.FileRoller.gschema.xml
 
+OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	NAUTILUS
 OPTIONS_DEFAULT=NAUTILUS
 NAUTILUS_DESC=	Enable Nautilus extension
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNAUTILUS}
-USE_GNOME+=	nautilus3
-PLIST_SUB+=	NAUTILUS=""
-.else
-PLIST_SUB+=	NAUTILUS="@comment "
-CONFIGURE_ARGS+=--disable-nautilus-actions
-.endif
+NAUTILUS_USE=	GNOME=nautilus3
+NAUTILUS_CONFIGURE_ENABLE=	nautilus-actions
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/src/fr-command-tar.c \
 		${WRKSRC}/src/fr-command-zip.c
 
+.include <bsd.port.options.mk>
+
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
@@ -56,8 +51,9 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${DOCSDIR}
 .endfor
 .endif
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so
 
+.if ${PORT_OPTIONS:MNAUTILUS}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so
+.endif	
 
 .include <bsd.port.mk>
-
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index 84c096c6c..1f97544ff 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/file-roller-3.12.1.tar.xz) = bb35ae0d3542eee59b916b699f86298dfe93379b1769d6ca1980b2db95672481
-SIZE (gnome3/file-roller-3.12.1.tar.xz) = 1397404
+SHA256 (gnome3/file-roller-3.12.2.tar.xz) = 0677be6618dba609eae2d76420e8a5a8d9a414bcec654e7b71e65b941764eacf
+SIZE (gnome3/file-roller-3.12.2.tar.xz) = 1396796
diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist
index abea8e6b1..92fe90bb8 100644
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@@ -487,44 +487,57 @@ share/locale/zu/LC_MESSAGES/file-roller.mo
 @dirrmtry share/locale/as
 @dirrmtry share/locale/an/LC_MESSAGES
 @dirrmtry share/locale/an
-@dirrm share/help/C/file-roller
-@dirrm share/help/C/file-roller/figures
-@dirrm share/help/ca/file-roller
-@dirrm share/help/ca/file-roller/figures
-@dirrm share/help/cs/file-roller
-@dirrm share/help/cs/file-roller/figures
-@dirrm share/help/da/file-roller
-@dirrm share/help/da/file-roller/figures
-@dirrm share/help/de/file-roller
-@dirrm share/help/de/file-roller/figures
-@dirrm share/help/el/file-roller
-@dirrm share/help/el/file-roller/figures
-@dirrm share/help/es/file-roller
-@dirrm share/help/es/file-roller/figures
-@dirrm share/help/fr/file-roller
-@dirrm share/help/fr/file-roller/figures
-@dirrm share/help/gl/file-roller
-@dirrm share/help/gl/file-roller/figures
-@dirrm share/help/hu/file-roller
-@dirrm share/help/hu/file-roller/figures
-@dirrm share/help/id/file-roller
-@dirrm share/help/id/file-roller/figures
-@dirrm share/help/ja
-@dirrm share/help/ja/file-roller
-@dirrm share/help/ja/file-roller/figures
-@dirrm share/help/pt_BR/file-roller
-@dirrm share/help/pt_BR/file-roller/figures
-@dirrm share/help/ru
-@dirrm share/help/ru/file-roller
-@dirrm share/help/ru/file-roller/figures
-@dirrm share/help/sl/file-roller
-@dirrm share/help/sl/file-roller/figures
+@dirrmtry share/help/zh_CN/file-roller/figures
+@dirrmtry share/help/zh_CN/file-roller
+@dirrm share/help/zh_CN
+@dirrmtry share/help/te/file-roller/figures
+@dirrmtry share/help/te/file-roller
 @dirrm share/help/te
-@dirrm share/help/te/file-roller
-@dirrm share/help/te/file-roller/figures
-@dirrm share/help/zh_CN/file-roller
-@dirrm share/help/zh_CN/file-roller/figures
-@dirrmtry share/help/da
-@dirrmtry share/help/id
+@dirrmtry share/help/sl/file-roller/figures
+@dirrmtry share/help/sl/file-roller
+@dirrm share/help/sl
+@dirrmtry share/help/ru/file-roller/figures
+@dirrmtry share/help/ru/file-roller
+@dirrm share/help/ru
+@dirrmtry share/help/pt_BR/file-roller/figures
+@dirrmtry share/help/pt_BR/file-roller
+@dirrm share/help/pt_BR
+@dirrmtry share/help/ja/file-roller/figures
+@dirrmtry share/help/ja/file-roller
+@dirrm share/help/ja
+@dirrmtry share/help/id/file-roller/figures
+@dirrmtry share/help/id/file-roller
+@dirrm share/help/id
+@dirrmtry share/help/hu/file-roller/figures
+@dirrmtry share/help/hu/file-roller
+@dirrm share/help/hu
+@dirrmtry share/help/gl/file-roller/figures
+@dirrmtry share/help/gl/file-roller
+@dirrm share/help/gl
+@dirrmtry share/help/fr/file-roller/figures
+@dirrmtry share/help/fr/file-roller
+@dirrm share/help/fr
+@dirrmtry share/help/es/file-roller/figures
+@dirrmtry share/help/es/file-roller
+@dirrm share/help/es
+@dirrmtry share/help/el/file-roller/figures
+@dirrmtry share/help/el/file-roller
+@dirrm share/help/el
+@dirrmtry share/help/de/file-roller/figures
+@dirrmtry share/help/de/file-roller
+@dirrm share/help/de
+@dirrmtry share/help/da/file-roller/figures
+@dirrmtry share/help/da/file-roller
+@dirrm share/help/da
+@dirrmtry share/help/cs/file-roller/figures
+@dirrmtry share/help/cs/file-roller
+@dirrm share/help/cs
+@dirrmtry share/help/ca/file-roller/figures
+@dirrmtry share/help/ca/file-roller
+@dirrm share/help/ca
+@dirrmtry share/help/C/file-roller/figures
+@dirrmtry share/help/C/file-roller
+@dirrm share/help/C
+@dirrm share/help
 @dirrm %%DATADIR%%
 @dirrm libexec/file-roller