Upgrade to version 2.3.

4 files changed, 27 insertions, 25 deletions

diff --git a/x11-fm/rox-filer/Makefile b/x11-fm/rox-filer/Makefile
index 6f4061f81ae0..9d395ca1f448 100644
--- a/x11-fm/rox-filer/Makefile
+++ b/x11-fm/rox-filer/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	rox
-PORTVERSION=	2.2.0
-PORTREVISION=	2
+PORTVERSION=	2.3
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rox
@@ -29,23 +28,15 @@ MAN1=		rox.1
 
 .include <bsd.port.pre.mk>
 
-.if (${ARCH} == "i386")
-BINARIES=	FreeBSD-ix86
-.else
-BINARIES=	FreeBSD-${ARCH}
-.endif
-
-PLIST_SUB=	BINARIES="${BINARIES}"
-
 CONFIGURE_ENV=		APP_DIR=${WRKSRC}/ROX-Filer
-CONFIGURE_ARGS=		--enable-rox --with-platform=${BINARIES}
+CONFIGURE_ARGS=		--enable-rox
 CONFIGURE_WRKSRC=	${WRKSRC}/ROX-Filer/src
 BUILD_WRKSRC=		${CONFIGURE_WRKSRC}
 ALL_TARGET=
 
 do-install:
 	@${MKDIR} ${PREFIX}/apps/ROX-Filer
-	@cd ${WRKSRC}/ROX-Filer && ${CP} -r .DirIcon  AppInfo.xml AppRun ${BINARIES} Help Messages Options.xml ROX images style.css ${PREFIX}/apps/ROX-Filer
+	@cd ${WRKSRC}/ROX-Filer && ${CP} -r .DirIcon AppInfo.xml AppRun Help Messages Options.xml ROX ROX-Filer 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
diff --git a/x11-fm/rox-filer/distinfo b/x11-fm/rox-filer/distinfo
index 7c77284aded5..008399911df8 100644
--- a/x11-fm/rox-filer/distinfo
+++ b/x11-fm/rox-filer/distinfo
@@ -1,2 +1,2 @@
-MD5 (rox-2.2.0.tgz) = 0deefd9e7edd4e79cd0f18f423264ebb
-SIZE (rox-2.2.0.tgz) = 2033724
+MD5 (rox-2.3.tgz) = 5cca7bc58af875b88dd9956fda4249f3
+SIZE (rox-2.3.tgz) = 2246715
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
index bb26a1e7670c..9b656a8e17ed 100644
--- a/x11-fm/rox-filer/files/patch-ROX-Filer_src_configure.in
+++ b/x11-fm/rox-filer/files/patch-ROX-Filer_src_configure.in
@@ -3,14 +3,26 @@ $FreeBSD$
 
 --- ROX-Filer/src/configure.in.orig
 +++ ROX-Filer/src/configure.in
-@@ -143,10 +143,6 @@
- AC_HEADER_SYS_WAIT
- AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h mntent.h sys/ucred.h sys/mntent.h apsymbols.h apbuild/apsymbols.h sys/statvfs.h sys/vfs.h)
+@@ -2,11 +2,6 @@
+ AC_INIT(main.c)
+ AC_CONFIG_HEADER(config.h)
+ 
+-[ if [ -f configure ]; then ]
+-	AC_MSG_ERROR([Please run configure from the build directory (try ../AppRun --compile)])
+-	exit 1
+-fi
+-
+ dnl Checks for programs.
+ AC_PROG_CC
  
+@@ -127,10 +122,6 @@
+ AC_HEADER_STDC
+ AC_HEADER_SYS_WAIT
+ AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h mntent.h sys/ucred.h sys/mntent.h apsymbols.h apbuild/apsymbols.h sys/statvfs.h sys/vfs.h wctype.h)
+-
 -AC_CHECK_HEADER([X11/SM/SMlib.h], [],
 -  [AC_MSG_ERROR([Session management library (libsm) missing. It is part of the X server distribution. Try installing the libsm-dev package.])]
 -)
--
+ 
  dnl Checks for typedefs, structures, and compiler characteristics.
  AC_C_CONST
- AC_TYPE_UID_T
diff --git a/x11-fm/rox-filer/pkg-plist b/x11-fm/rox-filer/pkg-plist
index aacf6237e054..64d229d84b99 100644
--- a/x11-fm/rox-filer/pkg-plist
+++ b/x11-fm/rox-filer/pkg-plist
@@ -1,4 +1,3 @@
-apps/ROX-Filer/%%BINARIES%%/ROX-Filer
 apps/ROX-Filer/.DirIcon
 apps/ROX-Filer/AppInfo.xml
 apps/ROX-Filer/AppRun
@@ -15,6 +14,8 @@ apps/ROX-Filer/Messages/cs.gmo
 apps/ROX-Filer/Messages/da.gmo
 apps/ROX-Filer/Messages/de.gmo
 apps/ROX-Filer/Messages/es.gmo
+apps/ROX-Filer/Messages/et_EE.gmo
+apps/ROX-Filer/Messages/eu.gmo
 apps/ROX-Filer/Messages/fi.gmo
 apps/ROX-Filer/Messages/fr.gmo
 apps/ROX-Filer/Messages/hu.gmo
@@ -30,6 +31,7 @@ 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/ROX-Filer
 apps/ROX-Filer/ROX/MIME/mime-application.png
 apps/ROX-Filer/ROX/MIME/mime-application:pdf.png
 apps/ROX-Filer/ROX/MIME/mime-application:pgp.png
@@ -74,7 +76,6 @@ apps/ROX-Filer/ROX/MIME/mime-application:x-java.png
 apps/ROX-Filer/ROX/MIME/mime-application:x-lyx.png
 apps/ROX-Filer/ROX/MIME/mime-application:x-object.png
 apps/ROX-Filer/ROX/MIME/mime-application:x-perl.png
-apps/ROX-Filer/ROX/MIME/mime-application:x-python.png
 apps/ROX-Filer/ROX/MIME/mime-application:x-rpm.png
 apps/ROX-Filer/ROX/MIME/mime-application:x-sharedlib.png
 apps/ROX-Filer/ROX/MIME/mime-application:x-shellscript.png
@@ -104,6 +105,7 @@ apps/ROX-Filer/ROX/MIME/mime-inode:directory.png
 apps/ROX-Filer/ROX/MIME/mime-inode:fifo.png
 apps/ROX-Filer/ROX/MIME/mime-inode:mount-point.png
 apps/ROX-Filer/ROX/MIME/mime-inode:socket.png
+apps/ROX-Filer/ROX/MIME/mime-message.png
 apps/ROX-Filer/ROX/MIME/mime-text.png
 apps/ROX-Filer/ROX/MIME/mime-text:html.png
 apps/ROX-Filer/ROX/MIME/mime-text:x-c++src.png
@@ -112,6 +114,7 @@ apps/ROX-Filer/ROX/MIME/mime-text:x-csrc.png
 apps/ROX-Filer/ROX/MIME/mime-text:x-diff.png
 apps/ROX-Filer/ROX/MIME/mime-text:x-java.png
 apps/ROX-Filer/ROX/MIME/mime-text:x-makefile.png
+apps/ROX-Filer/ROX/MIME/mime-text:x-python.png
 apps/ROX-Filer/ROX/MIME/mime-text:x-tcl.png
 apps/ROX-Filer/ROX/MIME/mime-text:x-tex.png
 apps/ROX-Filer/ROX/MIME/mime-text:xml.png
@@ -142,11 +145,7 @@ share/mime/packages/rox.xml
 @dirrm apps/ROX-Filer/ROX
 @dirrm apps/ROX-Filer/Messages
 @dirrm apps/ROX-Filer/Help
-@dirrm apps/ROX-Filer/%%BINARIES%%
 @dirrm apps/ROX-Filer
-@unexec rmdir %D/share/mime/packages 2>/dev/null || true
-@unexec rmdir %D/share/mime/mime-info 2>/dev/null || true
-@unexec rmdir %D/share/mime 2>/dev/null || true
 @unexec rmdir %D/apps 2>/dev/null || true
 @exec %%LOCALBASE%%/bin/update-mime-database %%LOCALBASE%%/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %%LOCALBASE%%/share/mime