add PKG_SYSCONFDIR/pcb, $HOME/.pcb and . to the search path for PCB m4

files.  In addition sinclude the files 'site-config.inc',
'user-config.inc', and 'proj-config.inc' to allow for per-site, per-user,
and per-project configuration instead of only per-site configuration.
This is essential for use by non-sysadmin users and users who need to
keep project specific setups.

10 files changed, 84 insertions, 16 deletions

diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
index 67b51e94a4c..a5f3e5a9431 100644
--- a/cad/gnetlist/Makefile
+++ b/cad/gnetlist/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2002/05/31 15:51:42 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.11 2002/06/01 20:11:55 dmcmahill Exp $
 #
 
 DISTNAME=		geda-gnetlist-${PKGVERSION}
 PKGNAME=		gnetlist-${PKGVERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		cad
 MASTER_SITES=		ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
 			ftp://ieee.ing.uniroma1.it/pub/geda/devel/${PKGVERSION}/ \
@@ -31,4 +31,10 @@ USE_GMAKE=		YES
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
+post-patch:
+	${MV} -f ${WRKSRC}/scheme/gnet-PCBboard.scm ${WRKSRC}/scheme/gnet-PCBboard.scm.bak
+	${SED} 's;@pcb_confdir@;${PKG_SYSCONFDIR}/pcb;g' \
+		${WRKSRC}/scheme/gnet-PCBboard.scm.bak > ${WRKSRC}/scheme/gnet-PCBboard.scm
+	${RM} -f ${WRKSRC}/scheme/gnet-PCBboard.scm.bak
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/gnetlist/distinfo b/cad/gnetlist/distinfo
index fec816192e7..329d3f27182 100644
--- a/cad/gnetlist/distinfo
+++ b/cad/gnetlist/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2002/05/31 15:51:43 dmcmahill Exp $
+$NetBSD: distinfo,v 1.6 2002/06/01 20:11:55 dmcmahill Exp $
 
 SHA1 (geda/geda-gnetlist-20020414.tar.gz) = f568fc3dc198046d7865b38d99a9de36d47f17fb
 Size (geda/geda-gnetlist-20020414.tar.gz) = 236941 bytes
-SHA1 (patch-aa) = 2ec0c4ae6743f79b2d905c98d634cebb77bbc7d7
+SHA1 (patch-aa) = 5ff82fea2ae9afb672fc1c270be57da1c5f4b293
 SHA1 (patch-ab) = 7546a526795b2e42c0fe716030c3e0c93687e4c3
diff --git a/cad/gnetlist/patches/patch-aa b/cad/gnetlist/patches/patch-aa
index 1af901dc1f7..a6930e11cdc 100644
--- a/cad/gnetlist/patches/patch-aa
+++ b/cad/gnetlist/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2002/05/31 15:51:44 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.4 2002/06/01 20:11:55 dmcmahill Exp $
 
 needs GNU m4
 
@@ -9,7 +9,7 @@ needs GNU m4
  ;;  (let ((pipe (open-output-pipe (string-append "m4 " *m4-pcbdir* "/common.m4 - >> " output-filename))))
  ;; Fixed pipe command (AVH 1/27/02)
 -   (let ((pipe (open-output-pipe (string-append "m4 -d -I" *m4-pcbdir* " " *m4-pcbdir* "/common.m4 - >> " output-filename))))
-+   (let ((pipe (open-output-pipe (string-append "gm4 -d -I" *m4-pcbdir* " " *m4-pcbdir* "/common.m4 - >> " output-filename))))
++   (let ((pipe (open-output-pipe (string-append "gm4 -d -I" *m4-pcbdir* " -I@pcb_confdir@ -I$HOME/.pcb -I. " *m4-pcbdir* "/common.m4 - >> " output-filename))))
  
  
         ;; packages is a list with the different uref value
diff --git a/cad/pcb/MESSAGE b/cad/pcb/MESSAGE
new file mode 100644
index 00000000000..7632d10db06
--- /dev/null
+++ b/cad/pcb/MESSAGE
@@ -0,0 +1,12 @@
+======================================================================
+$NetBSD: MESSAGE,v 1.1 2002/06/01 20:11:55 dmcmahill Exp $
+
+${PCB_CONFDIR}, $HOME/.pcb and the current working directory are
+all included in the search path for m4 files.  In addition, the
+files "site-config.inc" (which would normally live in ${PCB_CONFDIR}),
+"user-config.inc" (which would normally live $HOME/.pcb) and
+"proj-config.inc" (in the working directory) are included if they
+exist.  This provides a mechanism for per-site, per-user,
+and per-project libraries
+
+======================================================================
diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
index b2a1850947f..fda97f3267b 100644
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2002/05/31 19:56:19 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.12 2002/06/01 20:11:55 dmcmahill Exp $
 # FreeBSD Id: Makefile,v 1.19 1998/10/31 18:05:31 jseger Exp
 #
 
 DISTNAME=	pcb-1.6.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.linuxppc.org/pub/linuxppc/users/harry/PCB/ \
 		ftp://ftp.uni-ulm.de/pub/pcb/mirror/
@@ -23,6 +23,15 @@ INFO_FILES=	pcb.info
 
 DEINSTALL_FILE=	${WRKDIR}/DEINSTALL
 
+PCB_CONFDIR=	${PKG_SYSCONFDIR}/pcb
+MESSAGE_SUBST+=	PCB_CONFDIR=${PCB_CONFDIR}
+# avoid picking up any user config files during the build
+MAKE_ENV+=	HOME=${WRKSRC}
+
+post-patch:
+	${MV} -f ${WRKSRC}/config.h  ${WRKSRC}/config.h.bak
+	${SED} 's;@pkg_sysconfdir@;${PCB_CONFDIR};g' ${WRKSRC}/config.h.bak > ${WRKSRC}/config.h
+
 pre-install:
 	${SED} 's;@pkg_sysconfdir@;${PKG_SYSCONFDIR};g' ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
 
@@ -33,12 +42,17 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/pcb.info ${PREFIX}/info/
 	${INSTALL_MAN} ${WRKSRC}/doc/pcb.ps ${PREFIX}/share/doc/pcb/
 	${INSTALL_MAN} ${WRKSRC}/doc/refcard.ps ${PREFIX}/share/doc/pcb/
-	${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}/pcb
-	if [ ! -f "${PKG_SYSCONFDIR}/pcb/local.inc" ]; then \
-		${ECHO} "# list your local includes here" > ${PKG_SYSCONFDIR}/pcb/local.inc ; \
+	${INSTALL_DATA_DIR} ${PCB_CONFDIR}
+	if [ ! -f "${PCB_CONFDIR}/local.inc" ]; then \
+		${ECHO} "# list your local includes here" > ${PCB_CONFDIR}/local.inc ; \
 	fi
 	${MV} -f ${X11BASE}/lib/X11/pcb/m4/common.m4 ${X11BASE}/lib/X11/pcb/m4/common.m4.bak
-	${AWK} '/^divert\(0\)dnl/ {print "include(${PKG_SYSCONFDIR}/pcb/local.inc)"} \
+	${AWK} '/^divert\(0\)dnl/ { \
+			printf("include(${PCB_CONFDIR}/local.inc)\n"); \
+			printf("sinclude(site-config.inc)\n"); \
+			printf("sinclude(user-config.inc)\n"); \
+			printf("sinclude(proj-config.inc)\n"); \
+			} \
 		{gsub(/^include\(/,"include(${X11BASE}/lib/X11/pcb/m4/"); print } ' \
 		${X11BASE}/lib/X11/pcb/m4/common.m4.bak > ${X11BASE}/lib/X11/pcb/m4/common.m4
 	${RM} -f ${X11BASE}/lib/X11/pcb/m4/common.m4.bak
diff --git a/cad/pcb/distinfo b/cad/pcb/distinfo
index ad44bb5ed18..f823d88e391 100644
--- a/cad/pcb/distinfo
+++ b/cad/pcb/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.3 2002/05/31 19:56:19 dmcmahill Exp $
+$NetBSD: distinfo,v 1.4 2002/06/01 20:11:55 dmcmahill Exp $
 
 SHA1 (pcb-1.6.3.tgz) = 79cca1a0ed9567cefd2e98556e1895c86e453010
 Size (pcb-1.6.3.tgz) = 577803 bytes
 SHA1 (pcb-docs-1.6.3.tar.gz) = d645df42d7a9758f2112f02f47530eb2c05128a7
 Size (pcb-docs-1.6.3.tar.gz) = 252728 bytes
 SHA1 (patch-aa) = 348159ad2c6d0eef4c61bbbd0ff2b30eec3f5728
-SHA1 (patch-ab) = 8b2a39f3301766cdc1108ebe1d3f280d7ec93cfb
+SHA1 (patch-ab) = c035596d9981968e1faf80390a778b31ca807154
 SHA1 (patch-ac) = 39f423dddd3bce9bd6c625cde9aa5ccb1831ac9d
 SHA1 (patch-ad) = 9edcce665f1a930f857b8ffd65a25c4dad5fa289
 SHA1 (patch-ae) = 3b0b42796c2e8fd5d6d221293593e1e4f80ff660
@@ -19,3 +19,6 @@ SHA1 (patch-al) = d873599ad739ce54fc2dc98b2a37ec36b4cc75e5
 SHA1 (patch-am) = 3173f8bc6ef90629d64de5c86c45fd2f57d90f5f
 SHA1 (patch-an) = 9f3ccc70c33b32ca069e4c9a874ef553c96c6e7d
 SHA1 (patch-ao) = 23277a25c79fa45ff704049274c73c6837fd6595
+SHA1 (patch-ap) = 1e68a6b6e4cccfa29c8944fad05218fab7cf46ff
+SHA1 (patch-aq) = 1964ce89b506a5b70510dd8e8e795eb94bfe055a
+SHA1 (patch-ar) = 055a31f976afb9caf05b972ec5b2c9b4e9930218
diff --git a/cad/pcb/patches/patch-ab b/cad/pcb/patches/patch-ab
index 6172a128715..2002644a3fc 100644
--- a/cad/pcb/patches/patch-ab
+++ b/cad/pcb/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 1998/11/07 14:30:34 frueauf Exp $
+$NetBSD: patch-ab,v 1.2 2002/06/01 20:11:55 dmcmahill Exp $
 
 --- config.h.orig	Wed Jan 28 17:28:11 1998
 +++ config.h	Wed Jan 28 17:29:04 1998
@@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.1.1.1 1998/11/07 14:30:34 frueauf Exp $
   * the name of GNU m4 (you MUST use GNU m4)
   */
 -GNUM4 = m4
-+GNUM4 = gm4
++GNUM4 = "gm4 -I@pkg_sysconfdir@ -I\$$HOME/.pcb -I."
  
  /* ----------------------------------------------------------------------
   * BTNMOD determies the modifier key to be used for the
diff --git a/cad/pcb/patches/patch-ap b/cad/pcb/patches/patch-ap
new file mode 100644
index 00000000000..c8acd882191
--- /dev/null
+++ b/cad/pcb/patches/patch-ap
@@ -0,0 +1,11 @@
+$NetBSD: patch-ap,v 1.1 2002/06/01 20:11:56 dmcmahill Exp $
+
+--- lib/QueryLibrary.sh.raw.orig	Sat May 16 17:11:06 1998
++++ lib/QueryLibrary.sh.raw	Sat Jun  1 14:57:50 2002
+@@ -30,5 +30,5 @@
+ # usage: QueryLibrary.sh template value package
+ 
+-M4=GNUM4
++M4="GNUM4"
+ 
+ Usage()
diff --git a/cad/pcb/patches/patch-aq b/cad/pcb/patches/patch-aq
new file mode 100644
index 00000000000..141495e9939
--- /dev/null
+++ b/cad/pcb/patches/patch-aq
@@ -0,0 +1,11 @@
+$NetBSD: patch-aq,v 1.1 2002/06/01 20:11:56 dmcmahill Exp $
+
+--- lib/CreateLibrary.sh.raw.orig	Sat May 16 17:11:04 1998
++++ lib/CreateLibrary.sh.raw	Sat Jun  1 14:56:58 2002
+@@ -30,5 +30,5 @@
+ # usage: CreateContents.sh library common_macro_file file...
+ 
+-M4=GNUM4
++M4="GNUM4"
+ 
+ if [ $# -lt 3 ]; then
diff --git a/cad/pcb/patches/patch-ar b/cad/pcb/patches/patch-ar
new file mode 100644
index 00000000000..b6cb03a05b3
--- /dev/null
+++ b/cad/pcb/patches/patch-ar
@@ -0,0 +1,11 @@
+$NetBSD: patch-ar,v 1.1 2002/06/01 20:11:56 dmcmahill Exp $
+
+--- lib/CreateLibraryContents.sh.raw.orig	Sat May 16 17:11:04 1998
++++ lib/CreateLibraryContents.sh.raw	Sat Jun  1 15:00:46 2002
+@@ -30,5 +30,5 @@
+ # usage: CreateLibraryContents.sh common_macro_file file...
+ 
+-M4=GNUM4
++M4="GNUM4"
+ 
+ # a TAB plus one blank for some stupid old sed implementations