Some changes to assist in changing the rox package:

* rox-base now owns share/rox and libexec/rox directories;
* rox-base now installs in share/rox for consistency;
* change information about CHOICESPATH in MESSAGE;
* bump to nb1.

3 files changed, 61 insertions, 56 deletions

diff --git a/sysutils/rox-base/MESSAGE b/sysutils/rox-base/MESSAGE
index 0141c3a3602..818ba74681c 100644
--- a/sysutils/rox-base/MESSAGE
+++ b/sysutils/rox-base/MESSAGE
@@ -1,8 +1,8 @@
-$NetBSD: MESSAGE,v 1.1.1.1 2002/04/21 11:25:07 rh Exp $
+$NetBSD: MESSAGE,v 1.2 2002/06/01 18:21:34 cjep Exp $
 
 You need to set CHOICESPATH variable to let other applications such
-as ROX-Filer can find these resources, e.g.:
+as ROX-Filer can find the resources provided by rox-base. These resources
+need to be in a directory with user read/write access. For example:
 
-	setenv CHOICESPATH ${PREFIX}/share/Choices
-
-or cp -R ${PREFIX}/share/Choices to your $HOME directory.
+	cp -R ${PREFIX}/share/rox/Choices ~/.RoxChoices
+	setenv CHOICESPATH ~/.RoxChoices
diff --git a/sysutils/rox-base/Makefile b/sysutils/rox-base/Makefile
index 811ba2dc50f..4e2dcdf5453 100644
--- a/sysutils/rox-base/Makefile
+++ b/sysutils/rox-base/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/04/21 11:25:07 rh Exp $
+# $NetBSD: Makefile,v 1.2 2002/06/01 18:21:34 cjep Exp $
 #
 
 DISTNAME=	rox-base-1.0.2
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tgz
@@ -19,6 +20,8 @@ post-extract:
 	${FIND} ${WRKSRC} -name CVS | xargs ${RM} -rf
 
 do-install:
-	${CP} -Rf ${WRKSRC}/Choices ${PREFIX}/share
+	${INSTALL_DATA_DIR} 	${PREFIX}/share/rox
+	${INSTALL_PROGRAM_DIR} 	${PREFIX}/libexec/rox
+	${CP} -Rf ${WRKSRC}/Choices ${PREFIX}/share/rox
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/rox-base/PLIST b/sysutils/rox-base/PLIST
index 1626700e5d3..d32be77c105 100644
--- a/sysutils/rox-base/PLIST
+++ b/sysutils/rox-base/PLIST
@@ -1,49 +1,51 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/04/21 11:25:07 rh Exp $
-share/Choices/MIME-icons/application.xpm
-share/Choices/MIME-icons/application_pdf.xpm
-share/Choices/MIME-icons/application_postscript.xpm
-share/Choices/MIME-icons/application_x-bzip-compressed-tar.xpm
-share/Choices/MIME-icons/application_x-bzip.xpm
-share/Choices/MIME-icons/application_x-class-file.xpm
-share/Choices/MIME-icons/application_x-compressed-postscript.xpm
-share/Choices/MIME-icons/application_x-compressed-tar.xpm
-share/Choices/MIME-icons/application_x-deb.xpm
-share/Choices/MIME-icons/application_x-gzip.xpm
-share/Choices/MIME-icons/application_x-jar-file.xpm
-share/Choices/MIME-icons/application_x-rpm.xpm
-share/Choices/MIME-icons/application_x-staroffice.xpm
-share/Choices/MIME-icons/application_x-tar.xpm
-share/Choices/MIME-icons/application_x-tcl.xpm
-share/Choices/MIME-icons/application_zip.xpm
-share/Choices/MIME-icons/audio.xpm
-share/Choices/MIME-icons/audio_x-mod.xpm
-share/Choices/MIME-icons/font.xpm
-share/Choices/MIME-icons/image.xpm
-share/Choices/MIME-icons/image_gif.xpm
-share/Choices/MIME-icons/image_jpeg.xpm
-share/Choices/MIME-icons/image_x-xpixmap.xpm
-share/Choices/MIME-icons/special_block-device.xpm
-share/Choices/MIME-icons/special_char-device.xpm
-share/Choices/MIME-icons/special_directory.xpm
-share/Choices/MIME-icons/special_executable.xpm
-share/Choices/MIME-icons/special_pipe.xpm
-share/Choices/MIME-icons/special_socket.xpm
-share/Choices/MIME-icons/text.xpm
-share/Choices/MIME-icons/text_html.xpm
-share/Choices/MIME-icons/text_plain.xpm
-share/Choices/MIME-icons/text_x-C++.xpm
-share/Choices/MIME-icons/text_x-c.xpm
-share/Choices/MIME-icons/text_x-glade.xpm
-share/Choices/MIME-icons/text_x-java.xpm
-share/Choices/MIME-icons/text_x-lyx.xpm
-share/Choices/MIME-icons/text_x-python.xpm
-share/Choices/MIME-icons/video.xpm
-share/Choices/MIME-icons/video_mpeg.xpm
-share/Choices/MIME-info/Standard
-share/Choices/MIME-info/gnome-vfs.mime
-share/Choices/MIME-types/application_postscript
-share/Choices/MIME-types/text
-@dirrm share/Choices/MIME-types
-@dirrm share/Choices/MIME-info
-@dirrm share/Choices/MIME-icons
-@dirrm share/Choices
+@comment $NetBSD: PLIST,v 1.2 2002/06/01 18:21:34 cjep Exp $
+share/rox/Choices/MIME-icons/application.xpm
+share/rox/Choices/MIME-icons/application_pdf.xpm
+share/rox/Choices/MIME-icons/application_postscript.xpm
+share/rox/Choices/MIME-icons/application_x-bzip-compressed-tar.xpm
+share/rox/Choices/MIME-icons/application_x-bzip.xpm
+share/rox/Choices/MIME-icons/application_x-class-file.xpm
+share/rox/Choices/MIME-icons/application_x-compressed-postscript.xpm
+share/rox/Choices/MIME-icons/application_x-compressed-tar.xpm
+share/rox/Choices/MIME-icons/application_x-deb.xpm
+share/rox/Choices/MIME-icons/application_x-gzip.xpm
+share/rox/Choices/MIME-icons/application_x-jar-file.xpm
+share/rox/Choices/MIME-icons/application_x-rpm.xpm
+share/rox/Choices/MIME-icons/application_x-staroffice.xpm
+share/rox/Choices/MIME-icons/application_x-tar.xpm
+share/rox/Choices/MIME-icons/application_x-tcl.xpm
+share/rox/Choices/MIME-icons/application_zip.xpm
+share/rox/Choices/MIME-icons/audio.xpm
+share/rox/Choices/MIME-icons/audio_x-mod.xpm
+share/rox/Choices/MIME-icons/font.xpm
+share/rox/Choices/MIME-icons/image.xpm
+share/rox/Choices/MIME-icons/image_gif.xpm
+share/rox/Choices/MIME-icons/image_jpeg.xpm
+share/rox/Choices/MIME-icons/image_x-xpixmap.xpm
+share/rox/Choices/MIME-icons/special_block-device.xpm
+share/rox/Choices/MIME-icons/special_char-device.xpm
+share/rox/Choices/MIME-icons/special_directory.xpm
+share/rox/Choices/MIME-icons/special_executable.xpm
+share/rox/Choices/MIME-icons/special_pipe.xpm
+share/rox/Choices/MIME-icons/special_socket.xpm
+share/rox/Choices/MIME-icons/text.xpm
+share/rox/Choices/MIME-icons/text_html.xpm
+share/rox/Choices/MIME-icons/text_plain.xpm
+share/rox/Choices/MIME-icons/text_x-C++.xpm
+share/rox/Choices/MIME-icons/text_x-c.xpm
+share/rox/Choices/MIME-icons/text_x-glade.xpm
+share/rox/Choices/MIME-icons/text_x-java.xpm
+share/rox/Choices/MIME-icons/text_x-lyx.xpm
+share/rox/Choices/MIME-icons/text_x-python.xpm
+share/rox/Choices/MIME-icons/video.xpm
+share/rox/Choices/MIME-icons/video_mpeg.xpm
+share/rox/Choices/MIME-info/Standard
+share/rox/Choices/MIME-info/gnome-vfs.mime
+share/rox/Choices/MIME-types/application_postscript
+share/rox/Choices/MIME-types/text
+@dirrm share/rox/Choices/MIME-types
+@dirrm share/rox/Choices/MIME-info
+@dirrm share/rox/Choices/MIME-icons
+@dirrm share/rox/Choices
+@dirrm share/rox
+@dirrm libexec/rox