Merge from pkgsrc-current to buildlink2 branch.

8 files changed, 101 insertions, 70 deletions

diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
index 250d91ba0c8..8c73af26a54 100644
--- a/cad/gnetlist/Makefile
+++ b/cad/gnetlist/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2002/03/13 17:36:39 fredb Exp $
+# $NetBSD: Makefile,v 1.8.2.1 2002/06/23 18:39:56 jlam 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}/ \
@@ -15,10 +15,12 @@ HOMEPAGE=		http://www.geda.seul.org/
 COMMENT=		Netlist generation program
 
 DIST_SUBDIR=		geda
-PKGVERSION=		20010708
+PKGVERSION=		20020414
 
-DEPENDS+=		libgeda-${PKGVERSION}nb1:../../cad/libgeda
+DEPENDS+=		libgeda-${PKGVERSION}:../../cad/libgeda
 DEPENDS+=		geda-symbols-${PKGVERSION}:../../cad/geda-symbols
+# needs GNU m4 for the PCBboard netlister
+DEPENDS+=		m4-1.4:../../devel/m4
 
 CONFLICTS+=		gEDA<19991011
 
@@ -29,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/PLIST b/cad/gnetlist/PLIST
index 3d4757c5fe3..f838f4bd761 100644
--- a/cad/gnetlist/PLIST
+++ b/cad/gnetlist/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:30 skrll Exp $
+@comment $NetBSD: PLIST,v 1.2.2.1 2002/06/23 18:39:56 jlam Exp $
 bin/gnetlist
 bin/gschem2pcb
 bin/mk_verilog_syms
@@ -13,6 +13,7 @@ share/gEDA/scheme/gnet-bom2.scm
 share/gEDA/scheme/gnet-drc.scm
 share/gEDA/scheme/gnet-geda.scm
 share/gEDA/scheme/gnet-gossip.scm
+share/gEDA/scheme/gnet-maxascii.scm
 share/gEDA/scheme/gnet-pads.scm
 share/gEDA/scheme/gnet-partslist-common.scm
 share/gEDA/scheme/gnet-partslist1.scm
diff --git a/cad/gnetlist/distinfo b/cad/gnetlist/distinfo
index 37e61cfc3d9..4af9cfd62ce 100644
--- a/cad/gnetlist/distinfo
+++ b/cad/gnetlist/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/07/17 03:02:51 dmcmahill Exp $
+$NetBSD: distinfo,v 1.3.2.1 2002/06/23 18:39:57 jlam Exp $
 
-SHA1 (geda/geda-gnetlist-20010708.tar.gz) = 901a6f1cdfe69d210918b11c9504043b4c76ad97
-Size (geda/geda-gnetlist-20010708.tar.gz) = 181258 bytes
-SHA1 (patch-aa) = aaefde49f95790a6fbdfa1cc79619b94947cabda
-SHA1 (patch-ab) = 1b5613e3cc0144a919b51f528335045eb59cf71a
-SHA1 (patch-ac) = da34fd6502363724f587bb14de379aa671a03530
-SHA1 (patch-ad) = cbaa1389b1ffdef48a3c90384b28990531c0e3b0
-SHA1 (patch-ae) = 9d75c7e132d0732b2290fc80c79607fbe2a18076
+SHA1 (geda/geda-gnetlist-20020414.tar.gz) = f568fc3dc198046d7865b38d99a9de36d47f17fb
+Size (geda/geda-gnetlist-20020414.tar.gz) = 236941 bytes
+SHA1 (patch-aa) = 5ff82fea2ae9afb672fc1c270be57da1c5f4b293
+SHA1 (patch-ab) = 7546a526795b2e42c0fe716030c3e0c93687e4c3
diff --git a/cad/gnetlist/patches/patch-aa b/cad/gnetlist/patches/patch-aa
index 922e0d1b20f..8ac44effd4a 100644
--- a/cad/gnetlist/patches/patch-aa
+++ b/cad/gnetlist/patches/patch-aa
@@ -1,13 +1,15 @@
-$NetBSD: patch-aa,v 1.1 2001/07/17 03:02:51 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.1.2.1 2002/06/23 18:39:57 jlam Exp $
 
---- src/i_vars.c.orig	Mon Jun 11 18:50:26 2001
-+++ src/i_vars.c	Mon Jul 16 19:51:56 2001
-@@ -21,4 +21,8 @@
- #include <stdio.h>
+needs GNU m4
+
+--- scheme/gnet-PCBboard.scm.orig	Sun Jan 27 13:48:35 2002
++++ scheme/gnet-PCBboard.scm
+@@ -151,7 +151,7 @@
+ ;; Original pipe command commented out by AVH (bugfix by Rich Walker)
+ ;;  (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* " -I@pcb_confdir@ -I$HOME/.pcb -I. " *m4-pcbdir* "/common.m4 - >> " output-filename))))
  
-+#ifdef HAVE_STRINGS_H
-+#include <strings.h>
-+#endif
-+
- #include <libgeda/libgeda.h>
  
+        ;; packages is a list with the different uref value
diff --git a/cad/gnetlist/patches/patch-ab b/cad/gnetlist/patches/patch-ab
index 68333d84b9f..10917ffcc26 100644
--- a/cad/gnetlist/patches/patch-ab
+++ b/cad/gnetlist/patches/patch-ab
@@ -1,12 +1,71 @@
-$NetBSD: patch-ab,v 1.1 2001/07/17 03:02:51 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.1.2.1 2002/06/23 18:39:58 jlam Exp $
 
---- src/gnetlist.c.orig	Sun Jul  8 12:13:54 2001
-+++ src/gnetlist.c	Mon Jul 16 19:52:44 2001
-@@ -20,4 +20,7 @@
- #include <config.h>
- #include <stdio.h>
-+#ifdef HAVE_STRINGS_H
-+#include <strings.h>
-+#endif
- #include <signal.h>
- #ifdef HAVE_UNISTD_H
+use sh(1) and awk(1) not bash(1) and gawk(1).  Also use short options for
+head(1) and tail(1).
+
+--- src/gschem2pcb.orig	Fri Apr 21 16:48:38 2000
++++ src/gschem2pcb
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -43,7 +43,7 @@
+ 	fi
+ 
+ # Search for the beginning of the filename assuming it ends by .sch
+-FILENAME=`echo "$1" | sed 's/.sch//g' -`
++FILENAME=`echo "$1" | sed 's/.sch//g' `
+ PCBFILENAME=$FILENAME.pcb
+ 
+ # test if a .pcb file exists
+@@ -59,7 +59,7 @@
+ 	gnetlist -g PCB -o $NETFILENAME $1  
+ 	gnetlist -g PCBboard -o $PCBTEMPFILENAME $1 
+ 	echo
+-	gawk 'BEGIN {FS=","}
++	awk 'BEGIN {FS=","}
+ 		/^PKG_*/{
+ 		footprint=$1
+ 		sub(/PKG_/,"",footprint)
+@@ -68,23 +68,23 @@
+ 		value=substr($3,0,length($3)-1)
+ 		printf("Error: the footprint %s for the device %s does not exist\n",footprint,$2,value)
+ 		}' $PCBTEMPFILENAME
+-	gawk '/^Element\(.*/{printf("%s\t%s\t\n",$3,$4)}' $PCBFILENAME|sort > $LISTFILE
+-	gawk '/^Element\(.*/{printf("%s\t%s\t\n",$3,$4)}' $PCBTEMPFILENAME|sort > $NEWLISTFILE
+-	UREF=`diff $NEWLISTFILE $LISTFILE | gawk '/</{printf("%s\n",$2)}' -`
++	awk '/^Element\(.*/{printf("%s\t%s\t\n",$3,$4)}' $PCBFILENAME|sort > $LISTFILE
++	awk '/^Element\(.*/{printf("%s\t%s\t\n",$3,$4)}' $PCBTEMPFILENAME|sort > $NEWLISTFILE
++	UREF=`diff $NEWLISTFILE $LISTFILE | awk '/</{printf("%s\n",$2)}' -`
+ 	#Search for UREF if $PCBTEMPFILENAME and create $PCBNEWFILENAME
+ 	#Header of the pcb file
+-	head --lines 5 $PCBTEMPFILENAME > $PCBNEWFILENAME
++	head -n 5 $PCBTEMPFILENAME > $PCBNEWFILENAME
+ 	for f in `echo $UREF`; do
+ 		echo "Find new element $f"
+-		LINE=`grep -n $f $PCBTEMPFILENAME|sed 's/:.*$//g' -`
+-		gawk -v line=$LINE '{if (NR>=line)
++		LINE=`grep -n $f $PCBTEMPFILENAME|sed 's/:.*$//g' `
++		awk -v line=$LINE '{if (NR>=line)
+ 					{print
+ 					if ($1==")") exit}
+ 					}' $PCBTEMPFILENAME >> $PCBNEWFILENAME
+ 					
+ 	done
+ 	# End of the pcb file
+-	tail --lines 24 $PCBTEMPFILENAME >> $PCBNEWFILENAME
++	tail -n 24 $PCBTEMPFILENAME >> $PCBNEWFILENAME
+ 	
+ 	# Un peu de ménage (in french in the texte)
+ 	rm $PCBTEMPFILENAME $NEWLISTFILE $LISTFILE
+@@ -96,7 +96,7 @@
+ 	gnetlist -g PCB -o $NETFILENAME $1 
+ 	gnetlist -g PCBboard -o $PCBFILENAME $1 
+ 	# Test if a footprint has not been found
+-	gawk 'BEGIN {FS=","}
++	awk 'BEGIN {FS=","}
+ 		/^PKG_*/{
+ 		footprint=$1
+ 		sub(/PKG_/,"",footprint)
diff --git a/cad/gnetlist/patches/patch-ac b/cad/gnetlist/patches/patch-ac
deleted file mode 100644
index 320c3fe87ba..00000000000
--- a/cad/gnetlist/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2001/07/17 03:02:51 dmcmahill Exp $
-
---- src/parsecmd.c.orig	Sun Feb 18 17:47:48 2001
-+++ src/parsecmd.c	Mon Jul 16 19:53:14 2001
-@@ -20,4 +20,7 @@
- #include <config.h>
- #include <stdio.h>
-+#ifdef HAVE_STRINGS_H
-+#include <strings.h>
-+#endif
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
diff --git a/cad/gnetlist/patches/patch-ad b/cad/gnetlist/patches/patch-ad
deleted file mode 100644
index c433838ac21..00000000000
--- a/cad/gnetlist/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2001/07/17 03:02:51 dmcmahill Exp $
-
---- src/s_net.c.orig	Fri Jun 15 20:37:43 2001
-+++ src/s_net.c	Mon Jul 16 19:53:43 2001
-@@ -20,4 +20,7 @@
- #include <config.h>
- #include <stdio.h>
-+#ifdef HAVE_STRINGS_H
-+#include <strings.h>
-+#endif
- #include <stdlib.h>
- #include <assert.h>
diff --git a/cad/gnetlist/patches/patch-ae b/cad/gnetlist/patches/patch-ae
deleted file mode 100644
index 94b3f844ac1..00000000000
--- a/cad/gnetlist/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2001/07/17 03:02:51 dmcmahill Exp $
-
---- src/s_rename.c.orig	Thu Mar  1 21:54:03 2001
-+++ src/s_rename.c	Mon Jul 16 19:54:17 2001
-@@ -20,4 +20,7 @@
- #include <config.h>
- #include <stdio.h>
-+#ifdef HAVE_STRINGS_H
-+#include <strings.h>
-+#endif
- #include <stdlib.h>
- #include <assert.h>