Sync w/ FreeBSD ports tree that I have committed since a few days.

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

4 files changed, 26 insertions, 30 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 24373743c..2a336ac26 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	fileroller
-# Date created:				18 May 2002
-# Whom:					Anders Nordby <anders@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/archivers/file-roller/Makefile,v 1.189 2012/08/17 19:06:42 kwm Exp $
-#
+# Created by: Anders Nordby <anders@FreeBSD.org>
+# $FreeBSD: head/archivers/file-roller/Makefile 309632 2012-12-29 20:57:20Z mezz $
+#   $MCom: ports/archivers/file-roller/Makefile,v 1.184 2010/11/15 22:58:48 kwm Exp $
 
 PORTNAME=	file-roller
 PORTVERSION=	2.32.1
@@ -39,16 +35,19 @@ CONFIGURE_ARGS=	--disable-packagekit
 PORTDOCS=	AUTHORS NEWS README TODO ChangeLog
 GCONF_SCHEMAS=	file-roller.schemas
 
-OPTIONS=	NAUTILUS	"Enable Nautilus extension"	on
+OPTIONS_DEFINE=	DOCS NAUTILUS
+NAUTILUS_DESC=	Enable Nautilus extension
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFAULT=NAUTILUS
 
-.if !defined(WITHOUT_NAUTILUS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNAUTILUS}
 USE_GNOME+=	nautilus2
 PLIST_SUB+=	NAUTILUS=""
 .else
 PLIST_SUB+=	NAUTILUS="@comment "
-CONFIGURE_ARGS+=	--disable-nautilus-actions
+CONFIGURE_ARGS+=--disable-nautilus-actions
 .endif
 
 post-patch:
@@ -58,11 +57,11 @@ post-patch:
 
 post-install:
 	@-update-desktop-database
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/archivers/file-roller3/Makefile b/archivers/file-roller3/Makefile
index a62dc9d9f..910b55461 100644
--- a/archivers/file-roller3/Makefile
+++ b/archivers/file-roller3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	fileroller
-# Date created:				18 May 2002
-# Whom:					Anders Nordby <anders@FreeBSD.org>
-#
+# Created by: Anders Nordby <anders@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/archivers/file-roller3/Makefile,v 1.19 2011/11/19 10:18:05 kwm Exp $
-#
+#   $MCom$
 
 PORTNAME=	file-roller
 PORTVERSION=	3.4.2
@@ -30,23 +26,26 @@ USE_GNOME=	gnomeprefix intlhack gnomehack desktopfileutils gnomedocutils \
 		gtk30 gconf2
 USE_XORG=	sm
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-packagekit
 
 PORTDOCS=	AUTHORS NEWS README TODO ChangeLog
 GLIB_SCHEMAS=	org.gnome.FileRoller.gschema.xml
 
-OPTIONS=	NAUTILUS	"Enable Nautilus extension"	on
+OPTIONS_DEFINE=	DOCS NAUTILUS
+NAUTILUS_DESC=	Enable Nautilus extension
+
+OPTIONS_DEFAULT=NAUTILUS
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NAUTILUS)
+.if ${PORT_OPTIONS:MNAUTILUS}
 USE_GNOME+=	nautilus3
 PLIST_SUB+=	NAUTILUS=""
 .else
 PLIST_SUB+=	NAUTILUS="@comment "
-CONFIGURE_ARGS+=	--disable-nautilus-actions
+CONFIGURE_ARGS+=--disable-nautilus-actions
 .endif
 
 post-patch:
@@ -56,7 +55,7 @@ post-patch:
 
 post-install:
 	@-update-desktop-database
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
diff --git a/archivers/file-roller3/files/patch-src_fr-command-zip.c b/archivers/file-roller3/files/patch-src_fr-command-zip.c
index 29525d9e1..5995813eb 100644
--- a/archivers/file-roller3/files/patch-src_fr-command-zip.c
+++ b/archivers/file-roller3/files/patch-src_fr-command-zip.c
@@ -5,7 +5,7 @@
  	fr_process_set_out_line_func (comm->process, list__process_line, comm);
  
 +#ifdef __FreeBSD__
-+	fr_process_begin_command (comm->process, "/usr/local/bin/unzip");
++	fr_process_begin_command (comm->process, "%%LOCALBASE%%/bin/unzip");
 +#else
  	fr_process_begin_command (comm->process, "unzip");
 +#endif
@@ -17,7 +17,7 @@
  				      comm);
  
 +#ifdef __FreeBSD__
-+	fr_process_begin_command (comm->process, "/usr/local/bin/unzip");
++	fr_process_begin_command (comm->process, "%%LOCALBASE%%/bin/unzip");
 +#else
  	fr_process_begin_command (comm->process, "unzip");
 +#endif
@@ -29,7 +29,7 @@
  fr_command_zip_test (FrCommand   *comm)
  {
 +#ifdef __FreeBSD__
-+	fr_process_begin_command (comm->process, "/usr/local/bin/unzip");
++	fr_process_begin_command (comm->process, "%%LOCALBASE%%/bin/unzip");
 +#else
  	fr_process_begin_command (comm->process, "unzip");
 +#endif
diff --git a/archivers/file-roller3/pkg-descr b/archivers/file-roller3/pkg-descr
index 703a89829..75feec94b 100644
--- a/archivers/file-roller3/pkg-descr
+++ b/archivers/file-roller3/pkg-descr
@@ -17,5 +17,3 @@ of any type for which you have a viewer.
 Former WinZip users may find this program useful.  It serves the same purpose.
 
 WWW: http://fileroller.sourceforge.net/
-
-- Anders Nordby <anders@FreeBSD.org>