Various nit-fixes:

* When running rox, the user needs rw access to the CHOICESPATH. The rox
  startup script assists by making a directory of defaults in the user's
  home directory and setting CHOICESPATH if it unset. This fixes bug
  noted by Rui-Xiang Guo in a private e-mail.
* rox-base now owns the share/rox and libexec/rox directories.
* the installation is handled slightly better (e.g. now make deinstall &&
  make install will work).
* Bump to nb2.

4 files changed, 37 insertions, 14 deletions

diff --git a/sysutils/rox/MESSAGE b/sysutils/rox/MESSAGE
new file mode 100644
index 00000000000..ce7ad2f0a78
--- /dev/null
+++ b/sysutils/rox/MESSAGE
@@ -0,0 +1,9 @@
+$NetBSD: MESSAGE,v 1.1 2002/06/01 18:25:46 cjep Exp $
+
+Please note the following when running the rox(1) command that comes with 
+this package. If the environment variable CHOICESPATH is unset, then the 
+package will automatically set up a directory called .RoxChoices in your 
+home directory containing defaults from ${PREFIX}/share/rox/Choices and 
+will set CHOICESPATH appropriately.
+
+Rox applications can be found in ${PREFIX}/share/rox.
diff --git a/sysutils/rox/Makefile b/sysutils/rox/Makefile
index 86d59b887f9..b071badf28e 100644
--- a/sysutils/rox/Makefile
+++ b/sysutils/rox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/05/26 19:45:44 cjep Exp $
+# $NetBSD: Makefile,v 1.4 2002/06/01 18:25:46 cjep Exp $
 #
 
 DISTNAME=	rox-1.2.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tgz
@@ -11,7 +11,7 @@ MAINTAINER=	rxg@netbsd.org
 HOMEPAGE=	http://rox.sourceforge.net/
 COMMENT=	RISC OS-like filer for X
 
-DEPENDS+=	rox-base>=1.0.2:../../sysutils/rox-base
+DEPENDS+=	rox-base>=1.0.2nb1:../../sysutils/rox-base
 
 DIST_SUBDIR=	rox
 
@@ -22,23 +22,21 @@ CONFIGURE_ARGS+=	--with-gtk2
 WRKSRC=		${WRKDIR}/${DISTNAME}/ROX-Filer/src
 
 post-patch:
-	${SED} -e "s:APPDIR:"${PREFIX}/share/rox":g" < ${FILESDIR}/rox > \
+	${SED} -e "s:@PREFIX@:"${PREFIX}":g" < ${FILESDIR}/rox > \
 		${WRKDIR}/${DISTNAME}/rox
 
 post-build:
-	${CP} ${WRKSRC}/ROX-Filer ${WRKDIR}/${DISTNAME}/ROX-Filer
+	${MV} ${WRKSRC} ${WRKDIR}/${DISTNAME}/src
 
 pre-install:
 	${RM} -f ${WRKDIR}/${DISTNAME}/ROX-Filer/AppRun.orig
 	${RM} -rf ${WRKSRC}
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/rox
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/rox
-	${INSTALL} ${WRKDIR}/${DISTNAME}/ROX-Filer/ROX-Filer		\
+	${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/src/ROX-Filer	\
 			${PREFIX}/libexec/rox
-	${RM} -f ${WRKDIR}/${DISTNAME}/ROX-Filer/ROX-Filer
-	${CP} -Rf ${WRKDIR}/${DISTNAME}/ROX-Filer ${PREFIX}/share/rox
+	${CP} -Rf ${WRKDIR}/${DISTNAME}/ROX-Filer			\
+				${PREFIX}/share/rox/ROX-Filer;
 	${SED} -e "s:@PREFIX@:"${PREFIX}":g" <				\
 		${WRKDIR}/${DISTNAME}/ROX-Filer/AppRun > 		\
 		${PREFIX}/share/rox/ROX-Filer/AppRun
diff --git a/sysutils/rox/PLIST b/sysutils/rox/PLIST
index e382042e739..ccfd97064f1 100644
--- a/sysutils/rox/PLIST
+++ b/sysutils/rox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/05/26 19:45:44 cjep Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/06/01 18:25:46 cjep Exp $
 bin/rox
 man/man1/rox.1
 libexec/rox/ROX-Filer
@@ -45,5 +45,3 @@ share/rox/ROX-Filer/style.css
 @dirrm share/rox/ROX-Filer/Messages
 @dirrm share/rox/ROX-Filer/Help
 @dirrm share/rox/ROX-Filer
-@dirrm share/rox
-@dirrm libexec/rox
diff --git a/sysutils/rox/files/rox b/sysutils/rox/files/rox
index 2e9c9ed967a..0f98caf6fe2 100644
--- a/sysutils/rox/files/rox
+++ b/sysutils/rox/files/rox
@@ -1,2 +1,20 @@
 #!/bin/sh
-exec APPDIR/ROX-Filer/AppRun "$@"
+#
+# $NetBSD: rox,v 1.2 2002/06/01 18:25:46 cjep Exp $
+#
+
+# The user's Choices directory  
+ROX_CHOICES_DIR="$HOME/.RoxChoices"
+
+#
+# If CHOICESPATH is not set, then check to see whether the user has
+# a $ROX_CHOICES_DIR directory. If they haven't, set one up.
+#
+if [ -z "$CHOICESPATH" ]; then
+	[ ! -d "$ROX_CHOICES_DIR" ] && 					\
+			cp -R @PREFIX@/share/rox/Choices "$ROX_CHOICES_DIR";
+	export CHOICESPATH="$ROX_CHOICES_DIR";
+fi
+
+# Run the ROX-Filer application
+exec @PREFIX@/share/rox/ROX-Filer/AppRun "$@"