Update to 1.3.5.

5 files changed, 64 insertions, 17 deletions

diff --git a/x11-fm/rox-filer/Makefile b/x11-fm/rox-filer/Makefile
index 292564e33236..183dda8ba006 100644
--- a/x11-fm/rox-filer/Makefile
+++ b/x11-fm/rox-filer/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	rox
-PORTVERSION=	1.3.4
+PORTVERSION=	1.3.5
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rox
@@ -14,18 +14,23 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	olgeni@FreeBSD.org
 
-BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
+BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig \
+		autoconf:${PORTSDIR}/devel/autoconf
 LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
-		xml2.5:${PORTSDIR}/textproc/libxml2
+		xml2.5:${PORTSDIR}/textproc/libxml2 \
+		gnomevfs-2.0:${PORTSDIR}/devel/gnomevfs2
 RUN_DEPENDS=	${LOCALBASE}/share/mime/packages/freedesktop.org.xml:${PORTSDIR}/misc/shared-mime-info
 
 MAN1=		rox.1
 
+post-patch:
+	@cd ${WRKSRC}/ROX-Filer/src && ${LOCALBASE}/bin/autoconf
+
 .include <bsd.port.pre.mk>
 
 do-build:
 	# Run the custom build procedure
-	cd ${WRKSRC} && GTK_CONFIG=${GTK_CONFIG} GLIB_CONFIG=${GLIB_CONFIG} ROX-Filer/AppRun --compile
+	@cd ${WRKSRC} && GTK_CONFIG=${GTK_CONFIG} GLIB_CONFIG=${GLIB_CONFIG} ROX-Filer/AppRun --compile
 
 .if (${ARCH} == "i386")
 BINARIES=	FreeBSD-ix86
@@ -36,12 +41,13 @@ BINARIES=	FreeBSD-${ARCH}
 PLIST_SUB=	BINARIES="${BINARIES}"
 
 do-install:
-	${MKDIR} ${PREFIX}/apps/ROX-Filer
-	cd ${WRKSRC}/ROX-Filer && ${CP} -r .DirIcon Action.png AppInfo.xml AppRun ${BINARIES} Help Messages Options.xml images style.css ${PREFIX}/apps/ROX-Filer
-	cd ${WRKSRC} && ${CP} -r Choices ${PREFIX}/share/
-	${MKDIR} ${PREFIX}/share/mime/mime-info
-	${CAT} ${FILESDIR}/rox | ${SED} -e "s|%%PREFIX%%|${PREFIX}|" > ${PREFIX}/bin/rox
-	${CHMOD} 775 ${PREFIX}/bin/rox
-	${INSTALL_MAN} ${WRKSRC}/rox.1 ${PREFIX}/man/man1
+	@${MKDIR} ${PREFIX}/apps/ROX-Filer
+	@cd ${WRKSRC}/ROX-Filer && ${CP} -r .DirIcon Action.png AppInfo.xml AppRun ${BINARIES} Help Messages Options.xml images style.css ${PREFIX}/apps/ROX-Filer
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/apps/ROX-Filer
+	@cd ${WRKSRC} && ${CP} -r Choices ${PREFIX}/share/
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/Choices
+	@${CAT} ${FILESDIR}/rox | ${SED} -e "s|%%PREFIX%%|${PREFIX}|" > ${PREFIX}/bin/rox
+	@${CHMOD} 775 ${PREFIX}/bin/rox
+	@${INSTALL_MAN} ${WRKSRC}/rox.1 ${PREFIX}/man/man1
 
 .include <bsd.port.post.mk>
diff --git a/x11-fm/rox-filer/distinfo b/x11-fm/rox-filer/distinfo
index 0a2b195b7c84..6ed0b19c5492 100644
--- a/x11-fm/rox-filer/distinfo
+++ b/x11-fm/rox-filer/distinfo
@@ -1 +1 @@
-MD5 (rox-1.3.4.tgz) = 03ae4975d0df84092cbf2a05b1cb1258
+MD5 (rox-1.3.5.tgz) = 47a3aea3e0d2a7bd9c8b82e28cdcda42
diff --git a/x11-fm/rox-filer/files/patch-ROX-Filer_src_Makefile.in b/x11-fm/rox-filer/files/patch-ROX-Filer_src_Makefile.in
new file mode 100644
index 000000000000..9e5bf8edfecc
--- /dev/null
+++ b/x11-fm/rox-filer/files/patch-ROX-Filer_src_Makefile.in
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- ROX-Filer/src/Makefile.in.orig	Sat Dec  7 23:12:44 2002
++++ ROX-Filer/src/Makefile.in	Sat Dec  7 23:12:52 2002
+@@ -11,8 +11,8 @@
+ #PROF = -fprofile-arcs -pg
+ 
+ CFLAGS = ${PROF} @CFLAGS@ @LFS_CFLAGS@ \
+-	 `${PKG_CONFIG} --cflags gtk+-2.0 libxml-2.0`
+-LDFLAGS = ${PROF} @LDFLAGS@ ${LIBS} `${PKG_CONFIG} --libs gtk+-2.0 libxml-2.0`
++	 `${PKG_CONFIG} --cflags gtk+-2.0 libxml-2.0 gnome-vfs-module-2.0`
++LDFLAGS = ${PROF} @LDFLAGS@ ${LIBS} `${PKG_CONFIG} --libs gtk+-2.0 libxml-2.0 gnome-vfs-module-2.0`
+ EXEC = ${PLATFORM_DIR}/${PROG}
+ 
+ ############ Things to change for different programs
diff --git a/x11-fm/rox-filer/files/patch-ROX-Filer_src_configure.in b/x11-fm/rox-filer/files/patch-ROX-Filer_src_configure.in
new file mode 100644
index 000000000000..2acb526e215f
--- /dev/null
+++ b/x11-fm/rox-filer/files/patch-ROX-Filer_src_configure.in
@@ -0,0 +1,22 @@
+
+$FreeBSD$
+
+--- ROX-Filer/src/configure.in.orig	Tue Oct  1 12:40:56 2002
++++ ROX-Filer/src/configure.in	Sun Dec  8 21:29:55 2002
+@@ -53,6 +53,7 @@
+ ROX_REQUIRE(gtk+-2.0, 2.0.1)
+ ROX_REQUIRE(glib-2.0, 2.0.3)
+ ROX_REQUIRE(libxml-2.0, 2.0.0)
++ROX_REQUIRE(gnome-vfs-module-2.0, 2.0.0)
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
+@@ -86,7 +87,7 @@
+ fi
+ 
+ AC_MSG_CHECKING(for large file support)
+-if getconf LFS64_CFLAGS > /dev/null 2> /dev/null; then
++if true > /dev/null 2> /dev/null; then
+   AC_MSG_RESULT(yes)
+   LFS_CFLAGS="`getconf LFS_CFLAGS`"
+   LFS_LDFLAGS="`getconf LFS_LDFLAGS`"
diff --git a/x11-fm/rox-filer/pkg-plist b/x11-fm/rox-filer/pkg-plist
index afcf9e4f8b55..417d5734a6a6 100644
--- a/x11-fm/rox-filer/pkg-plist
+++ b/x11-fm/rox-filer/pkg-plist
@@ -10,26 +10,28 @@ apps/ROX-Filer/Help/Manual.html
 apps/ROX-Filer/Help/README
 apps/ROX-Filer/Help/README-es
 apps/ROX-Filer/Help/TODO
-apps/ROX-Filer/Help/ld-id2842228.html
-apps/ROX-Filer/Help/ld-id2846545.html
 apps/ROX-Filer/Messages/README
 apps/ROX-Filer/Messages/da.gmo
 apps/ROX-Filer/Messages/de.gmo
+apps/ROX-Filer/Messages/es.gmo
 apps/ROX-Filer/Messages/fr.gmo
 apps/ROX-Filer/Messages/hu.gmo
 apps/ROX-Filer/Messages/it.gmo
 apps/ROX-Filer/Messages/nl.gmo
+apps/ROX-Filer/Messages/no.gmo
 apps/ROX-Filer/Messages/pl.gmo
 apps/ROX-Filer/Messages/ru.gmo
-apps/ROX-Filer/Messages/sp.gmo
+apps/ROX-Filer/Messages/sv.gmo
 apps/ROX-Filer/Messages/zh_CN.gmo
 apps/ROX-Filer/Messages/zh_TW.gmo
 apps/ROX-Filer/Options.xml
 apps/ROX-Filer/images/application.png
 apps/ROX-Filer/images/dirs.png
 apps/ROX-Filer/images/iconified.png
-apps/ROX-Filer/images/mount.png
-apps/ROX-Filer/images/mounted.png
+apps/ROX-Filer/images/rox-mount.png
+apps/ROX-Filer/images/rox-mounted.png
+apps/ROX-Filer/images/rox-show-details.png
+apps/ROX-Filer/images/rox-show-hidden.png
 apps/ROX-Filer/images/symlink.png
 apps/ROX-Filer/style.css
 bin/rox
@@ -78,6 +80,7 @@ share/Choices/MIME-icons/video.png
 share/Choices/MIME-icons/video_mpeg.png
 share/Choices/MIME-types/application_postscript
 share/Choices/MIME-types/text
+share/Choices/MIME-types/text_html
 @dirrm share/Choices/MIME-types
 @dirrm share/Choices/MIME-icons
 @dirrm share/Choices