Search for various optional configuration and data files in "${PREFIX}"

instead of "/usr/local". Fixes PR pkg/7698 by Jon Buller.

6 files changed, 83 insertions, 6 deletions

diff --git a/www/Mosaic/Makefile b/www/Mosaic/Makefile
index e8ab1458372..cf3448a39c1 100644
--- a/www/Mosaic/Makefile
+++ b/www/Mosaic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1999/05/24 20:39:49 tv Exp $
+# $NetBSD: Makefile,v 1.13 1999/06/07 21:40:20 tron Exp $
 # FreeBSD Id: Makefile,v 1.15 1998/05/27 08:44:56 dburr Exp
 #
 
@@ -27,9 +27,14 @@ LDFLAGS+=		-L${X11BASE}/lib
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -Dunix"
 CONFIGURE_ARGS=		--with-zdir=/usr --with-jpegdir=${LOCALBASE} --with-pngdir=${LOCALBASE}
 
+post-configure:
+	@${ECHO} '' >>${WRKSRC}/config.h
+	@${ECHO} '#define PREFIX "${PREFIX}"' >>${WRKSRC}/config.h
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/Mosaic ${PREFIX}/bin
 	${LN} -sf Mosaic ${PREFIX}/bin/mosaic
 	${INSTALL_DATA} ${WRKSRC}/app-defaults.color ${PREFIX}/lib/X11/app-defaults/Mosaic
+	${MKDIR} ${PREFIX}/share/mosaic
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/Mosaic/patches/patch-ag b/www/Mosaic/patches/patch-ag
index 41377dbbf99..e54fe93c26f 100644
--- a/www/Mosaic/patches/patch-ag
+++ b/www/Mosaic/patches/patch-ag
@@ -1,8 +1,16 @@
-$NetBSD: patch-ag,v 1.2 1998/08/07 11:14:18 agc Exp $
+$NetBSD: patch-ag,v 1.3 1999/06/07 21:40:20 tron Exp $
 
---- ./src/gui.c.org	Tue Apr  9 21:47:32 1996
-+++ ./src/gui.c	Tue Apr  9 22:01:26 1996
-@@ -3623,7 +3623,7 @@
+--- src/gui.c.orig	Thu Jul 18 21:26:56 1996
++++ src/gui.c	Mon Jun  7 23:25:44 1999
+@@ -173,6 +173,7 @@
+ 
+ 
+ #include "libhtmlw/HTML.h"
++#include "config.h"
+ #include "xresources.h"
+ #include "cci.h"
+ 
+@@ -3963,7 +3964,7 @@
      return 0;
    else 
      {
diff --git a/www/Mosaic/patches/patch-ap b/www/Mosaic/patches/patch-ap
new file mode 100644
index 00000000000..63ed3e3d65f
--- /dev/null
+++ b/www/Mosaic/patches/patch-ap
@@ -0,0 +1,22 @@
+$NetBSD: patch-ap,v 1.1 1999/06/07 21:40:20 tron Exp $
+
+--- src/mosaic.h.orig	Fri Jun 28 06:23:54 1996
++++ src/mosaic.h	Mon Jun  7 23:02:35 1999
+@@ -170,14 +170,14 @@
+ 
+ #ifndef DOCUMENTS_MENU_SPECFILE
+ #define DOCUMENTS_MENU_SPECFILE \
+-  "/usr/local/lib/mosaic/documents.menu"
++  PREFIX "/share/mosaic/documents.menu"
+ #endif /* not DOCUMENTS_MENU_SPECFILE */
+ 
+ #ifndef GLOBAL_EXTENSION_MAP
+-#define GLOBAL_EXTENSION_MAP "/usr/local/lib/mosaic/mime.types"
++#define GLOBAL_EXTENSION_MAP PREFIX "/lib/mosaic/mime.types"
+ #endif
+ #ifndef GLOBAL_TYPE_MAP
+-#define GLOBAL_TYPE_MAP "/usr/local/lib/mosaic/mailcap"
++#define GLOBAL_TYPE_MAP PREFIX "/lib/mosaic/mailcap"
+ #endif
+ 
+ 
diff --git a/www/Mosaic/patches/patch-aq b/www/Mosaic/patches/patch-aq
new file mode 100644
index 00000000000..22d431b3f61
--- /dev/null
+++ b/www/Mosaic/patches/patch-aq
@@ -0,0 +1,27 @@
+$NetBSD: patch-aq,v 1.1 1999/06/07 21:40:21 tron Exp $
+
+--- src/xresources.h.orig	Mon Jun  7 22:56:02 1999
++++ src/xresources.h	Mon Jun  7 23:04:36 1999
+@@ -263,7 +263,7 @@
+ 
+   { "documentsMenuSpecfile", "DocumentsMenuSpecfile", XtRString, sizeof (char *),
+       offset (documents_menu_specfile), XtRString, 
+-      "/usr/local/lib/mosaic/documents.menu" },
++      PREFIX "/share/mosaic/documents.menu" },
+ 
+   { "reloadReloadsImages", "ReloadReloadsImages", XtRBoolean, sizeof (Boolean),
+       offset (reload_reloads_images), XtRString, "False" },
+@@ -477,11 +477,11 @@
+ 
+   { "proxySpecfile", "ProxySpecfile", XtRString, sizeof (char *),
+       offset (proxy_specfile), XtRString, 
+-      "/usr/local/lib/mosaic/proxy" },
++      PREFIX "/share/mosaic/proxy" },
+ 
+   { "noproxySpecfile", "NoproxySpecfile", XtRString, sizeof (char *),
+       offset (noproxy_specfile), XtRString, 
+-      "/usr/local/lib/mosaic/no_proxy" },
++      PREFIX "/share/mosaic/no_proxy" },
+   
+   { "useScreenGamma", "UseScreenGamma", XtRBoolean, sizeof (Boolean),
+       offset (useScreenGamma), XtRString, "False" },
diff --git a/www/Mosaic/patches/patch-ar b/www/Mosaic/patches/patch-ar
new file mode 100644
index 00000000000..bf229763c94
--- /dev/null
+++ b/www/Mosaic/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1 1999/06/07 21:40:21 tron Exp $
+
+--- libwww2/HTNews.c.orig	Thu Jun 27 02:22:42 1996
++++ libwww2/HTNews.c	Mon Jun  7 23:05:58 1999
+@@ -38,7 +38,7 @@
+ #define DEFAULT_NEWS_HOST "news"
+ #endif
+ #ifndef SERVER_FILE
+-#define SERVER_FILE "/usr/local/lib/rn/server"
++#define SERVER_FILE PREFIX "/etc/nntp/domainname"
+ #endif
+ 
+ #define FAST_THRESHOLD 100	/* Above this, read IDs fast */
diff --git a/www/Mosaic/pkg/PLIST b/www/Mosaic/pkg/PLIST
index b5dbef0f8f1..33f36732e50 100644
--- a/www/Mosaic/pkg/PLIST
+++ b/www/Mosaic/pkg/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 1998/07/12 04:05:51 tv Exp $
+@comment $NetBSD: PLIST,v 1.3 1999/06/07 21:40:21 tron Exp $
 bin/Mosaic
 bin/mosaic
 lib/X11/app-defaults/Mosaic
+@exec mkdir -p %D/share/mosaic
+@unexec rm -rf %D/share/mosaic