4 files changed, 33 insertions, 17 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index b9663d86d520..4ca6b12fcb38 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	file-roller
-PORTVERSION=	2.26.2
+PORTVERSION=	2.26.3
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	GNOME
@@ -16,6 +16,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An archive manager for zip files, tar, etc
 
+OPTIONS=	NAUTILUS	"Enable Nautilus extension"	on
+
 RUN_DEPENDS=	${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar
 
 USE_LDCONFIG=	yes
@@ -24,27 +26,35 @@ USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack desktopfileutils nautilus2 \
-		gnomedocutils
+USE_GNOME=	gnomeprefix intlhack gnomehack desktopfileutils gnomedocutils
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+PORTDOCS=	AUTHORS NEWS README TODO ChangeLog
 GCONF_SCHEMAS=	file-roller.schemas
 
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_NAUTILUS)
+USE_GNOME+=	nautilus2
+PLIST_SUB+=	NAUTILUS=""
+.else
+PLIST_SUB+=	NAUTILUS="@comment "
+CONFIGURE_ARGS+=	--disable-nautilus-actions
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/src/fr-command-tar.c
-	@${FIND} ${WRKSRC} -name "fr-command-*.c" | ${XARGS} ${REINPLACE_CMD} \
-		-e 's|atoll|fr_atoll|g'
 
 post-install:
 	@-update-desktop-database
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for f in AUTHORS NEWS README TODO
+.for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index bc912b9e44ca..65bcd8a96ce5 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/file-roller-2.26.2.tar.bz2) = 9d4575665dcbf063a062aa5a776eca68
-SHA256 (gnome2/file-roller-2.26.2.tar.bz2) = e93055dfb149396903204539d0754a9e3b76e52e7668ac2f744b0820041a61ac
-SIZE (gnome2/file-roller-2.26.2.tar.bz2) = 1565897
+MD5 (gnome2/file-roller-2.26.3.tar.bz2) = 1876e9807a12c37f9bb2d00807905755
+SHA256 (gnome2/file-roller-2.26.3.tar.bz2) = 06ec16ab8b1c9d0a1b3d40d2d63cd8170776bcc44ffa1f48e0403a9e23aef769
+SIZE (gnome2/file-roller-2.26.3.tar.bz2) = 1561967
diff --git a/archivers/file-roller/files/patch-src_fr-enum-types.c b/archivers/file-roller/files/patch-src_fr-enum-types.c
new file mode 100644
index 000000000000..d1d08ea534a3
--- /dev/null
+++ b/archivers/file-roller/files/patch-src_fr-enum-types.c
@@ -0,0 +1,11 @@
+--- src/fr-enum-types.c.orig	2009-06-30 20:34:58.000000000 +1000
++++ src/fr-enum-types.c	2009-06-30 20:35:02.000000000 +1000
+@@ -4,7 +4,7 @@
+ #include <glib-object.h>
+ 
+ /* enumerations from "../../src/typedefs.h" */
+-#include "../../src/typedefs.h"
++#include "typedefs.h"
+ GType
+ fr_compression_get_type (void)
+ {
diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist
index 4855c34757f7..394d0d64f1ab 100644
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@@ -1,12 +1,8 @@
 bin/file-roller
-lib/nautilus/extensions-2.0/libnautilus-fileroller.la
-lib/nautilus/extensions-2.0/libnautilus-fileroller.so
+%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-fileroller.la
+%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-fileroller.so
 libexec/file-roller/isoinfo.sh
 share/applications/file-roller.desktop
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
 %%DATADIR%%/icons/hicolor/16x16/actions/add-files-to-archive.png
 %%DATADIR%%/icons/hicolor/16x16/actions/add-folder-to-archive.png
 %%DATADIR%%/icons/hicolor/16x16/actions/extract-archive.png
@@ -271,7 +267,6 @@ share/omf/file-roller/file-roller-vi.omf
 @dirrm %%DATADIR%%/icons/hicolor
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
 @dirrm libexec/file-roller
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true