Fix build on NetBSD. Fix PLIST. Add DESTDIR support. Rename back to match

package directory and older versions.

4 files changed, 44 insertions, 20 deletions

diff --git a/sysutils/rox/Makefile b/sysutils/rox/Makefile
index 39ece286b0e..ccc6065df80 100644
--- a/sysutils/rox/Makefile
+++ b/sysutils/rox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2009/11/05 19:50:54 reinoud Exp $
+# $NetBSD: Makefile,v 1.49 2009/12/10 16:28:44 joerg Exp $
 #
 
 DISTNAME=	rox-filer-2.10
-#PKGREVISION=	0
+PKGNAME=	rox-2.10
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tar.bz2
@@ -11,6 +11,7 @@ MAINTAINER=	rxg@NetBSD.org
 HOMEPAGE=	http://rox.sourceforge.net/
 COMMENT=	RISC OS-like filer for X
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 CONFLICTS=	rox-base-[0-9]*
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
@@ -19,8 +20,9 @@ DIST_SUBDIR=	rox
 USE_TOOLS+=		pax pkg-config
 GNU_CONFIGURE=		yes
 
-INSTALLATION_DIRS=	libexec/rox share/Choices share/rox/ROX-Filer \
-			  ${PKGMANDIR}/man1
+INSTALLATION_DIRS=	bin libexec/rox ${PKGMANDIR}/man1 \
+			share/Choices share/mime/packages \
+			share/rox/ROX-Filer
 
 SUBST_CLASSES+=		path
 SUBST_MESSAGE.path=	Fixing hardcoded paths.
@@ -43,23 +45,23 @@ CONFIGURE_SCRIPT=	./configure.tmp
 LIBS.SunOS+=		-lm
 
 post-patch:
-	${MV} ${WRKSRC:Q}/ROX-Filer/src/configure ${WRKSRC:Q}/ROX-Filer/src/${CONFIGURE_SCRIPT:Q}
+	${MV} ${WRKSRC}/ROX-Filer/src/configure ${WRKSRC}/ROX-Filer/src/${CONFIGURE_SCRIPT}
 
 post-build:
-	@${ECHO} "#!/bin/sh" >> ${WRKDIR:Q}/rox
-	@${ECHO} ${PREFIX:Q}"/share/rox/ROX-Filer/AppRun \"\$$@\"" >> ${WRKDIR:Q}/rox
+	@${ECHO} "#!/bin/sh" >> ${WRKDIR}/rox
+	@${ECHO} ${PREFIX}"/share/rox/ROX-Filer/AppRun \"\$$@\"" >> ${WRKDIR}/rox
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC:Q}/ROX-Filer/ROX-Filer ${PREFIX:Q}/libexec/rox
-	cd ${WRKSRC:Q}/Choices && pax -rw . ${PREFIX:Q}/share/Choices
-	cd ${WRKSRC:Q}/ROX-Filer && pax -rw	\
+	${INSTALL_PROGRAM} ${WRKSRC}/ROX-Filer/ROX-Filer ${DESTDIR}${PREFIX}/libexec/rox
+	cd ${WRKSRC}/Choices && pax -rw . ${DESTDIR}${PREFIX}/share/Choices
+	cd ${WRKSRC}/ROX-Filer && pax -rw	\
 		-s ',^\./ROX-Filer$$,,' -s ',^\./ROX-Filer/.*,,'	\
 		-s ',^\./ROX-Filer.dbg$$,,' -s ',^\./ROX-Filer.dbg/.*,,'\
 		-s ',^\./src$$,,' -s ',^\./src/.*,,'	\
-		. ${PREFIX:Q}/share/rox/ROX-Filer
-	${INSTALL_MAN} ${WRKSRC:Q}/rox.1 ${PREFIX:Q}/${PKGMANDIR}/man1
-	${INSTALL_DATA} ${WRKSRC:Q}/rox.xml ${PREFIX:Q}/share/mime/packages
-	${INSTALL_SCRIPT} ${WRKDIR:Q}/rox ${PREFIX:Q}/bin
+		. ${DESTDIR}${PREFIX}/share/rox/ROX-Filer
+	${INSTALL_MAN} ${WRKSRC}/rox.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA} ${WRKSRC}/rox.xml ${DESTDIR}${PREFIX}/share/mime/packages
+	${INSTALL_SCRIPT} ${WRKDIR}/rox ${DESTDIR}${PREFIX}/bin
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
diff --git a/sysutils/rox/PLIST b/sysutils/rox/PLIST
index e47b44a497b..e6081660ac6 100644
--- a/sysutils/rox/PLIST
+++ b/sysutils/rox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/11/05 19:50:54 reinoud Exp $
+@comment $NetBSD: PLIST,v 1.9 2009/12/10 16:28:44 joerg Exp $
 bin/rox
 libexec/rox/ROX-Filer
 man/man1/rox.1
@@ -26,6 +26,7 @@ share/rox/ROX-Filer/Messages/et_EE/LC_MESSAGES/ROX-Filer.mo
 share/rox/ROX-Filer/Messages/eu/LC_MESSAGES/ROX-Filer.mo
 share/rox/ROX-Filer/Messages/fi/LC_MESSAGES/ROX-Filer.mo
 share/rox/ROX-Filer/Messages/fr/LC_MESSAGES/ROX-Filer.mo
+share/rox/ROX-Filer/Messages/gl/LC_MESSAGES/ROX-Filer.mo
 share/rox/ROX-Filer/Messages/hu/LC_MESSAGES/ROX-Filer.mo
 share/rox/ROX-Filer/Messages/it/LC_MESSAGES/ROX-Filer.mo
 share/rox/ROX-Filer/Messages/ja/LC_MESSAGES/ROX-Filer.mo
@@ -37,9 +38,12 @@ share/rox/ROX-Filer/Messages/pt_PT/LC_MESSAGES/ROX-Filer.mo
 share/rox/ROX-Filer/Messages/ro/LC_MESSAGES/ROX-Filer.mo
 share/rox/ROX-Filer/Messages/ru/LC_MESSAGES/ROX-Filer.mo
 share/rox/ROX-Filer/Messages/sv/LC_MESSAGES/ROX-Filer.mo
+share/rox/ROX-Filer/Messages/uk/LC_MESSAGES/ROX-Filer.mo
+share/rox/ROX-Filer/Messages/vi/LC_MESSAGES/ROX-Filer.mo
 share/rox/ROX-Filer/Messages/zh_CN/LC_MESSAGES/ROX-Filer.mo
 share/rox/ROX-Filer/Messages/zh_TW/LC_MESSAGES/ROX-Filer.mo
 share/rox/ROX-Filer/Options.xml
+share/rox/ROX-Filer/ROX/MIME/application-msword.png
 share/rox/ROX-Filer/ROX/MIME/application-pdf.png
 share/rox/ROX-Filer/ROX/MIME/application-pgp.png
 share/rox/ROX-Filer/ROX/MIME/application-postscript.png
@@ -47,7 +51,6 @@ share/rox/ROX-Filer/ROX/MIME/application-vnd.ms-access.png
 share/rox/ROX-Filer/ROX/MIME/application-vnd.ms-excel.png
 share/rox/ROX-Filer/ROX/MIME/application-vnd.ms-office.png
 share/rox/ROX-Filer/ROX/MIME/application-vnd.ms-powerpoint.png
-share/rox/ROX-Filer/ROX/MIME/application-vnd.ms-office.png
 share/rox/ROX-Filer/ROX/MIME/application-vnd.rn-realmedia.png
 share/rox/ROX-Filer/ROX/MIME/application-vnd.stardivision.writer.png
 share/rox/ROX-Filer/ROX/MIME/application-vnd.sun.xml.calc.png
@@ -64,6 +67,7 @@ share/rox/ROX-Filer/ROX/MIME/application-x-abiword.png
 share/rox/ROX-Filer/ROX/MIME/application-x-bzip-compressed-tar.png
 share/rox/ROX-Filer/ROX/MIME/application-x-bzip.png
 share/rox/ROX-Filer/ROX/MIME/application-x-compressed-tar.png
+share/rox/ROX-Filer/ROX/MIME/application-x-core.png
 share/rox/ROX-Filer/ROX/MIME/application-x-deb.png
 share/rox/ROX-Filer/ROX/MIME/application-x-dia-diagram.png
 share/rox/ROX-Filer/ROX/MIME/application-x-dvi.png
@@ -74,11 +78,13 @@ share/rox/ROX-Filer/ROX/MIME/application-x-font-pcf.png
 share/rox/ROX-Filer/ROX/MIME/application-x-font-speedo.png
 share/rox/ROX-Filer/ROX/MIME/application-x-font-ttf.png
 share/rox/ROX-Filer/ROX/MIME/application-x-font.png
+share/rox/ROX-Filer/ROX/MIME/application-x-generic.png
 share/rox/ROX-Filer/ROX/MIME/application-x-glade.png
 share/rox/ROX-Filer/ROX/MIME/application-x-gnumeric.png
 share/rox/ROX-Filer/ROX/MIME/application-x-gzip.png
 share/rox/ROX-Filer/ROX/MIME/application-x-gzpostscript.png
 share/rox/ROX-Filer/ROX/MIME/application-x-jar.png
+share/rox/ROX-Filer/ROX/MIME/application-x-java-archive.png
 share/rox/ROX-Filer/ROX/MIME/application-x-java.png
 share/rox/ROX-Filer/ROX/MIME/application-x-lyx.png
 share/rox/ROX-Filer/ROX/MIME/application-x-object.png
@@ -93,15 +99,18 @@ share/rox/ROX-Filer/ROX/MIME/application-x-troff-man-compressed.png
 share/rox/ROX-Filer/ROX/MIME/application-x-troff-man.png
 share/rox/ROX-Filer/ROX/MIME/application-x-troff.png
 share/rox/ROX-Filer/ROX/MIME/application-xhtml+xml.png
+share/rox/ROX-Filer/ROX/MIME/application-xml.png
 share/rox/ROX-Filer/ROX/MIME/application-zip.png
 share/rox/ROX-Filer/ROX/MIME/audio-midi.png
 share/rox/ROX-Filer/ROX/MIME/audio-mpeg.png
+share/rox/ROX-Filer/ROX/MIME/audio-x-generic.png
 share/rox/ROX-Filer/ROX/MIME/audio-x-mod.png
 share/rox/ROX-Filer/ROX/MIME/audio-x-mp3.png
 share/rox/ROX-Filer/ROX/MIME/audio-x-pn-realaudio.png
 share/rox/ROX-Filer/ROX/MIME/audio-x-wav.png
 share/rox/ROX-Filer/ROX/MIME/image-gif.png
 share/rox/ROX-Filer/ROX/MIME/image-jpeg.png
+share/rox/ROX-Filer/ROX/MIME/image-x-generic.png
 share/rox/ROX-Filer/ROX/MIME/image-x-xpixmap.png
 share/rox/ROX-Filer/ROX/MIME/inode-blockdevice.png
 share/rox/ROX-Filer/ROX/MIME/inode-chardevice.png
@@ -110,11 +119,13 @@ share/rox/ROX-Filer/ROX/MIME/inode-directory.png
 share/rox/ROX-Filer/ROX/MIME/inode-fifo.png
 share/rox/ROX-Filer/ROX/MIME/inode-mount-point.png
 share/rox/ROX-Filer/ROX/MIME/inode-socket.png
+share/rox/ROX-Filer/ROX/MIME/message-x-generic.png
 share/rox/ROX-Filer/ROX/MIME/text-html.png
 share/rox/ROX-Filer/ROX/MIME/text-x-c++src.png
 share/rox/ROX-Filer/ROX/MIME/text-x-copying.png
 share/rox/ROX-Filer/ROX/MIME/text-x-csrc.png
 share/rox/ROX-Filer/ROX/MIME/text-x-diff.png
+share/rox/ROX-Filer/ROX/MIME/text-x-generic.png
 share/rox/ROX-Filer/ROX/MIME/text-x-java.png
 share/rox/ROX-Filer/ROX/MIME/text-x-makefile.png
 share/rox/ROX-Filer/ROX/MIME/text-x-python.png
@@ -123,7 +134,9 @@ share/rox/ROX-Filer/ROX/MIME/text-x-tex.png
 share/rox/ROX-Filer/ROX/MIME/text-xml.png
 share/rox/ROX-Filer/ROX/MIME/video-mpeg.png
 share/rox/ROX-Filer/ROX/MIME/video-quicktime.png
+share/rox/ROX-Filer/ROX/MIME/video-x-generic.png
 share/rox/ROX-Filer/ROX/index.theme
+share/rox/ROX-Filer/Templates.glade
 share/rox/ROX-Filer/images/application.png
 share/rox/ROX-Filer/images/dirs.png
 share/rox/ROX-Filer/images/iconified.png
@@ -132,6 +145,7 @@ share/rox/ROX-Filer/images/rox-mounted.png
 share/rox/ROX-Filer/images/rox-select.png
 share/rox/ROX-Filer/images/rox-show-details.png
 share/rox/ROX-Filer/images/rox-show-hidden.png
+share/rox/ROX-Filer/images/rox-symlink.png
 share/rox/ROX-Filer/images/rox-xattr.png
 share/rox/ROX-Filer/images/symlink.png
 share/rox/ROX-Filer/style.css
diff --git a/sysutils/rox/distinfo b/sysutils/rox/distinfo
index 68017aebaeb..9a81e15c7f6 100644
--- a/sysutils/rox/distinfo
+++ b/sysutils/rox/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2009/11/05 19:50:54 reinoud Exp $
+$NetBSD: distinfo,v 1.11 2009/12/10 16:28:44 joerg Exp $
 
 SHA1 (rox/rox-filer-2.10.tar.bz2) = 691297d18be69a883db0a38130f5df99f9e1bc29
 RMD160 (rox/rox-filer-2.10.tar.bz2) = 48b64ccaceb96b59fbd2467aa65d8e128ebd960d
 Size (rox/rox-filer-2.10.tar.bz2) = 1903129 bytes
 SHA1 (patch-aa) = 20cf42090c9cd3149af6e7be59f826624062d759
 SHA1 (patch-ab) = e7e27a71fdea3257f85fdfc3f8d1352d0f1f0968
-SHA1 (patch-ac) = 4c5555ac12e7d037344f85440378ff021a7fe2c6
+SHA1 (patch-ac) = fc78b2208cb052bedaab4ae3c1e59677bc299f6e
 SHA1 (patch-ad) = 3a8fef42c3749bb9aa2fc17f292a940aacd596b3
diff --git a/sysutils/rox/patches/patch-ac b/sysutils/rox/patches/patch-ac
index 745a732c9d8..a644758a48a 100644
--- a/sysutils/rox/patches/patch-ac
+++ b/sysutils/rox/patches/patch-ac
@@ -1,8 +1,16 @@
-$NetBSD: patch-ac,v 1.5 2009/11/05 19:50:54 reinoud Exp $
+$NetBSD: patch-ac,v 1.6 2009/12/10 16:28:44 joerg Exp $
 
 --- ROX-Filer/src/pixmaps.c.orig	2009-07-18 16:23:18.000000000 +0200
 +++ ROX-Filer/src/pixmaps.c
-@@ -432,7 +432,7 @@ static void save_thumbnail(const char *p
+@@ -34,6 +34,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <inttypes.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <string.h>
+@@ -432,7 +433,7 @@ static void save_thumbnail(const char *p
  
  	swidth = g_strdup_printf("%d", original_width);
  	sheight = g_strdup_printf("%d", original_height);