Update port to version 1.3.1 (uses shared-mime-info rather than rox-base).

Fix a small bug from post-extract (wrong icon path).

3 files changed, 73 insertions, 13 deletions

diff --git a/x11-fm/rox-filer/Makefile b/x11-fm/rox-filer/Makefile
index e38434c7ec86..6ab4d0f52c29 100644
--- a/x11-fm/rox-filer/Makefile
+++ b/x11-fm/rox-filer/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	rox
-PORTVERSION=	1.3.0
+PORTVERSION=	1.3.1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rox
@@ -17,17 +17,24 @@ MAINTAINER=	olgeni@FreeBSD.org
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
 		xml2.5:${PORTSDIR}/textproc/libxml2
-RUN_DEPENDS=	${LOCALBASE}/share/Choices:${PORTSDIR}/x11-fm/rox-base
+RUN_DEPENDS=	${LOCALBASE}/share/mime/mime-info/freedesktop-shared.mimeinfo:${PORTSDIR}/misc/shared-mime-info
 
 MAN1=		rox.1
 
+post-extract:
+	${CP} ${WRKSRC}/ROX-Filer/src/tasklist.c ${WRKSRC}/ROX-Filer/src/tasklist.c.orig
+	${CAT} ${WRKSRC}/ROX-Filer/src/tasklist.c.orig | ${SED} -e "s@images/iconified.png@iconified@" > ${WRKSRC}/ROX-Filer/src/tasklist.c
+
 do-build:
 	# Run the custom build procedure
 	cd ${WRKSRC} && GTK_CONFIG=${GTK_CONFIG} GLIB_CONFIG=${GLIB_CONFIG} ROX-Filer/AppRun --compile
 
 do-install:
 	${MKDIR} ${PREFIX}/apps/ROX-Filer
-	cd ${WRKSRC}/ROX-Filer && ${CP} -r Action.png AppInfo.xml AppRun FreeBSD-ix86 Help Messages Options.xml images style.css ${PREFIX}/apps/ROX-Filer
+	cd ${WRKSRC}/ROX-Filer && ${CP} -r .DirIcon Action.png AppInfo.xml AppRun FreeBSD-ix86 Help Messages Options.xml images style.css ${PREFIX}/apps/ROX-Filer
+	cd ${WRKSRC} && ${CP} -r Choices ${PREFIX}/share/
+	${MKDIR} ${PREFIX}/share/mime/mime-info
+	cd ${WRKSRC} && ${CP} rox.mimeinfo ${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
diff --git a/x11-fm/rox-filer/distinfo b/x11-fm/rox-filer/distinfo
index d41d69ba82d6..978551605b63 100644
--- a/x11-fm/rox-filer/distinfo
+++ b/x11-fm/rox-filer/distinfo
@@ -1 +1 @@
-MD5 (rox-1.3.0.tgz) = d2327e94c7cf69adc46808475c775fad
+MD5 (rox-1.3.1.tgz) = 2141fabae930dfd002ecf84e0f0f2c6c
diff --git a/x11-fm/rox-filer/pkg-plist b/x11-fm/rox-filer/pkg-plist
index e5e06e32c717..716550fb1e40 100644
--- a/x11-fm/rox-filer/pkg-plist
+++ b/x11-fm/rox-filer/pkg-plist
@@ -1,13 +1,17 @@
+apps/ROX-Filer/.DirIcon
+apps/ROX-Filer/Action.png
+apps/ROX-Filer/AppInfo.xml
+apps/ROX-Filer/AppRun
 apps/ROX-Filer/FreeBSD-ix86/ROX-Filer
-apps/ROX-Filer/Help/README
 apps/ROX-Filer/Help/COPYING
 apps/ROX-Filer/Help/Changes
+apps/ROX-Filer/Help/Manual-fr.html
 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/Manual-fr.html
-apps/ROX-Filer/Messages/sp.gmo
 apps/ROX-Filer/Messages/README
+apps/ROX-Filer/Messages/da.gmo
 apps/ROX-Filer/Messages/de.gmo
 apps/ROX-Filer/Messages/fr.gmo
 apps/ROX-Filer/Messages/hu.gmo
@@ -15,10 +19,11 @@ apps/ROX-Filer/Messages/it.gmo
 apps/ROX-Filer/Messages/nl.gmo
 apps/ROX-Filer/Messages/pl.gmo
 apps/ROX-Filer/Messages/ru.gmo
-apps/ROX-Filer/Messages/da.gmo
+apps/ROX-Filer/Messages/sp.gmo
+apps/ROX-Filer/Messages/zh_CN.gmo
+apps/ROX-Filer/Messages/zh_TW.gmo
 apps/ROX-Filer/Options.xml
-apps/ROX-Filer/AppRun
-apps/ROX-Filer/images/zoom.png
+apps/ROX-Filer/images/application.png
 apps/ROX-Filer/images/close.png
 apps/ROX-Filer/images/details.png
 apps/ROX-Filer/images/dirs.png
@@ -26,6 +31,7 @@ apps/ROX-Filer/images/error.png
 apps/ROX-Filer/images/help.png
 apps/ROX-Filer/images/hidden.png
 apps/ROX-Filer/images/home.png
+apps/ROX-Filer/images/iconified.png
 apps/ROX-Filer/images/mount.png
 apps/ROX-Filer/images/mounted.png
 apps/ROX-Filer/images/multiple.png
@@ -33,14 +39,61 @@ apps/ROX-Filer/images/refresh.png
 apps/ROX-Filer/images/symlink.png
 apps/ROX-Filer/images/unknown.png
 apps/ROX-Filer/images/up.png
-apps/ROX-Filer/images/application.png
+apps/ROX-Filer/images/zoom.png
 apps/ROX-Filer/style.css
-apps/ROX-Filer/Action.png
-apps/ROX-Filer/AppInfo.xml
 bin/rox
+share/Choices/MIME-icons/application.png
+share/Choices/MIME-icons/application_pdf.png
+share/Choices/MIME-icons/application_postscript.png
+share/Choices/MIME-icons/application_x-bzip-compressed-tar.png
+share/Choices/MIME-icons/application_x-bzip.png
+share/Choices/MIME-icons/application_x-compressed-tar.png
+share/Choices/MIME-icons/application_x-deb.png
+share/Choices/MIME-icons/application_x-executable.png
+share/Choices/MIME-icons/application_x-font.png
+share/Choices/MIME-icons/application_x-glade.png
+share/Choices/MIME-icons/application_x-gzip.png
+share/Choices/MIME-icons/application_x-gzpostscript.png
+share/Choices/MIME-icons/application_x-jar.png
+share/Choices/MIME-icons/application_x-java.png
+share/Choices/MIME-icons/application_x-lyx.png
+share/Choices/MIME-icons/application_x-python.png
+share/Choices/MIME-icons/application_x-rpm.png
+share/Choices/MIME-icons/application_x-tar.png
+share/Choices/MIME-icons/application_zip.png
+share/Choices/MIME-icons/audio.png
+share/Choices/MIME-icons/audio_x-mod.png
+share/Choices/MIME-icons/image.png
+share/Choices/MIME-icons/image_gif.png
+share/Choices/MIME-icons/image_jpeg.png
+share/Choices/MIME-icons/image_x-xpixmap.png
+share/Choices/MIME-icons/inode_blockdevice.png
+share/Choices/MIME-icons/inode_chardevice.png
+share/Choices/MIME-icons/inode_directory.png
+share/Choices/MIME-icons/inode_fifo.png
+share/Choices/MIME-icons/inode_socket.png
+share/Choices/MIME-icons/text.png
+share/Choices/MIME-icons/text_html.png
+share/Choices/MIME-icons/text_plain.png
+share/Choices/MIME-icons/text_x-c++src.png
+share/Choices/MIME-icons/text_x-csrc.png
+share/Choices/MIME-icons/text_x-java.png
+share/Choices/MIME-icons/text_x-makefile.png
+share/Choices/MIME-icons/text_x-tcl.png
+share/Choices/MIME-icons/text_x-tex.png
+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/mime/mime-info/rox.mimeinfo
+@dirrm share/Choices/MIME-types
+@dirrm share/Choices/MIME-icons
+@dirrm share/Choices
 @dirrm apps/ROX-Filer/images
 @dirrm apps/ROX-Filer/Messages
 @dirrm apps/ROX-Filer/Help
 @dirrm apps/ROX-Filer/FreeBSD-ix86
 @dirrm apps/ROX-Filer
+@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