Move the package which lived in cad/pcb-current over to cad/pcb and

delete the old cad/pcb package.  The package which has lived in cad/pcb
for the last few years was horribly out of date and pcb is not making
a distinction right now between -current snapshots and normal releases.

32 files changed, 227 insertions, 927 deletions

diff --git a/cad/Makefile b/cad/Makefile
index c08729444f7..fd99d9c5438 100644
--- a/cad/Makefile
+++ b/cad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2005/11/03 06:25:53 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2005/12/03 04:18:59 dmcmahill Exp $
 #
 
 COMMENT=	CAD tools
@@ -45,7 +45,6 @@ SUBDIR+=	ng-spice
 SUBDIR+=	ntesla
 SUBDIR+=	oct-wcalc
 SUBDIR+=	pcb
-SUBDIR+=	pcb-current
 SUBDIR+=	py-MyHDL
 SUBDIR+=	py-simpy
 SUBDIR+=	qcad
diff --git a/cad/pcb-current/DESCR b/cad/pcb-current/DESCR
deleted file mode 100644
index f6c26dd1354..00000000000
--- a/cad/pcb-current/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Pcb - X11 interactive printed circuit board layout system.
-
-Pcb is a handy tool for	the X Window System to design printed
-circuit	boards.  All coordinate units are 1/1000 inch.
-
-Please note that this package is a development snapshot and while it contains
-the latest and greatest features, it may be buggy as well.  There is a separate
-pcb package which is made of the stable releases.
diff --git a/cad/pcb-current/MESSAGE b/cad/pcb-current/MESSAGE
deleted file mode 100644
index c091761d2ff..00000000000
--- a/cad/pcb-current/MESSAGE
+++ /dev/null
@@ -1,18 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2003/08/17 03:59:08 dmcmahill Exp $
-
-The following directories are all included in the search path for m4 files:
-
-	${PKG_SYSCONFDIR}
-	${HOME}/.pcb
-	the current working directory
-
-In addition, the files are included if they exist:
-
-	site-config.inc (normally in ${PKG_SYSCONFDIR})
-	user-config.inc (normally in $HOME/.pcb)
-	proj-config.inc (normally in the working directory)
-
-This provides a mechanism for per-site, per-user, and per-project
-libraries.
-===========================================================================
diff --git a/cad/pcb-current/Makefile b/cad/pcb-current/Makefile
deleted file mode 100644
index 9fec29014ac..00000000000
--- a/cad/pcb-current/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2005/08/16 22:04:46 dmcmahill Exp $
-#
-
-DISTNAME=	pcb-${SNAPDATE}
-PKGNAME=	pcb-current-${SNAPDATE}
-CATEGORIES=	cad
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pcb/}
-
-MAINTAINER=	dmcmahill@NetBSD.org
-HOMEPAGE=	http://pcb.sourceforge.net/
-COMMENT=	Printed circuit board layout system (development snapshot version)
-
-DEPENDS+=	tk>=8.3:../../x11/tk
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-CONFLICTS+=	pcb-[0-9]*
-
-SNAPDATE=		20050609
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		bison gm4:run gmake lex
-
-# needed for XWarpPointer in action.c
-LIBS+=		-lX11
-
-INFO_FILES=	pcb.info
-
-.include "../../mk/bsd.prefs.mk"
-
-EVAL_PREFIX+=   TKDIR=tk
-CONFIGURE_ENV+=	WISH=${TKDIR}/bin/wish
-
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/cad/pcb-current/PLIST b/cad/pcb-current/PLIST
deleted file mode 100644
index ef097f1c06f..00000000000
--- a/cad/pcb-current/PLIST
+++ /dev/null
@@ -1,189 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2005/01/28 11:53:50 dmcmahill Exp $
-bin/MergePCBPS
-bin/Merge_dimPCBPS
-bin/pcb
-bin/pcb-bin
-man/man1/pcb.1
-share/pcb/CreateLibrary.sh
-share/pcb/CreateLibraryContents.sh
-share/pcb/ListLibraryContents.sh
-share/pcb/Pcb
-share/pcb/QueryLibrary.sh
-share/pcb/default_font
-share/pcb/examples/LED
-share/pcb/examples/LED.NET
-share/pcb/examples/LED2
-share/pcb/examples/libraries/example.inc
-share/pcb/examples/libraries/example.list
-share/pcb/examples/libraries/example.m4
-share/pcb/m4/TTL_74xx_DIL.list
-share/pcb/m4/TTL_74xx_DIL.m4
-share/pcb/m4/amp.inc
-share/pcb/m4/amp.list
-share/pcb/m4/amp.m4
-share/pcb/m4/amphenol.inc
-share/pcb/m4/amphenol.list
-share/pcb/m4/amphenol.m4
-share/pcb/m4/bga.inc
-share/pcb/m4/bourns.inc
-share/pcb/m4/bourns.list
-share/pcb/m4/bourns.m4
-share/pcb/m4/common.m4
-share/pcb/m4/connector.inc
-share/pcb/m4/connector.list
-share/pcb/m4/connector.m4
-share/pcb/m4/crystal.list
-share/pcb/m4/crystal.m4
-share/pcb/m4/cts.inc
-share/pcb/m4/cts.list
-share/pcb/m4/cts.m4
-share/pcb/m4/dil.inc
-share/pcb/m4/geda.inc
-share/pcb/m4/geda.list
-share/pcb/m4/geda.m4
-share/pcb/m4/generic.list
-share/pcb/m4/generic.m4
-share/pcb/m4/genericsmt.inc
-share/pcb/m4/genericsmt.list
-share/pcb/m4/genericsmt.m4
-share/pcb/m4/gtag.list
-share/pcb/m4/gtag.m4
-share/pcb/m4/jerry.list
-share/pcb/m4/jerry.m4
-share/pcb/m4/johnstech.inc
-share/pcb/m4/johnstech.list
-share/pcb/m4/johnstech.m4
-share/pcb/m4/linear.list
-share/pcb/m4/linear.m4
-share/pcb/m4/logic.list
-share/pcb/m4/logic.m4
-share/pcb/m4/lsi.list
-share/pcb/m4/lsi.m4
-share/pcb/m4/memory.list
-share/pcb/m4/memory.m4
-share/pcb/m4/minicircuits.inc
-share/pcb/m4/minicircuits.list
-share/pcb/m4/minicircuits.m4
-share/pcb/m4/misc.inc
-share/pcb/m4/optical.list
-share/pcb/m4/optical.m4
-share/pcb/m4/panasonic.inc
-share/pcb/m4/panasonic.list
-share/pcb/m4/panasonic.m4
-share/pcb/m4/pci.inc
-share/pcb/m4/pci.list
-share/pcb/m4/pci.m4
-share/pcb/m4/plcc.inc
-share/pcb/m4/qfn.inc
-share/pcb/m4/qfp.inc
-share/pcb/m4/qfp2.inc
-share/pcb/m4/qfpdj.inc
-share/pcb/m4/resistor_0.25W.list
-share/pcb/m4/resistor_0.25W.m4
-share/pcb/m4/resistor_adjust.inc
-share/pcb/m4/resistor_adjust.list
-share/pcb/m4/resistor_adjust.m4
-share/pcb/m4/resistor_array.list
-share/pcb/m4/resistor_array.m4
-share/pcb/m4/rules.inc
-share/pcb/m4/smt.inc
-share/pcb/m4/texas_inst_amplifier.list
-share/pcb/m4/texas_inst_amplifier.m4
-share/pcb/m4/texas_inst_voltage_reg.list
-share/pcb/m4/texas_inst_voltage_reg.m4
-share/pcb/m4/to.inc
-share/pcb/m4/transistor.list
-share/pcb/m4/transistor.m4
-share/pcb/m4/zif.inc
-share/pcb/newlib/2_pin_thru-hole_packages/0.125W_Carbon_Resistor
-share/pcb/newlib/2_pin_thru-hole_packages/1W_Carbon_Resistor
-share/pcb/newlib/2_pin_thru-hole_packages/CK05_type_Capacitor
-share/pcb/newlib/2_pin_thru-hole_packages/CK06_type_capacitor
-share/pcb/newlib/2_pin_thru-hole_packages/IRU1015-33CT_3.3V_reg_TO220
-share/pcb/newlib/2_pin_thru-hole_packages/RN55_type_0.1W_Resistor
-share/pcb/newlib/2_pin_thru-hole_packages/T1.75_LED
-share/pcb/newlib/analog-devices/ADC12138CIMSA
-share/pcb/newlib/burr-brown/OPA340_SOT23-5
-share/pcb/newlib/connectors/100_Pin_jack
-share/pcb/newlib/connectors/16x1_SMD_jack
-share/pcb/newlib/connectors/3terminal_screw_block
-share/pcb/newlib/connectors/72pin45degreeSIMMconnector
-share/pcb/newlib/connectors/MOLEX_miniFitJr-12pin
-share/pcb/newlib/connectors/Power_Jack
-share/pcb/newlib/connectors/RightAngleSMA
-share/pcb/newlib/connectors/SJ-3523-SMT_3.5mm_stereo_jack
-share/pcb/newlib/crystal/CTX169_oscillator
-share/pcb/newlib/electro-optics/IRF_optical_switch
-share/pcb/newlib/generic_SMD_packages/0805_reflow_solder
-share/pcb/newlib/generic_SMD_packages/0805_wave_solder
-share/pcb/newlib/generic_SMD_packages/1206_reflow_solder
-share/pcb/newlib/generic_SMD_packages/SOT-23_Transistor
-share/pcb/newlib/headers/0.1_inch_10pin
-share/pcb/newlib/headers/0.1_inch_2pin
-share/pcb/newlib/headers/2mm_8pin_header
-share/pcb/newlib/msp430/MSP430F1121
-share/pcb/newlib/msp430/MSP430F1121+jtag
-share/pcb/newlib/not_vetted_ingo/pc104+.ele
-share/pcb/newlib/not_vetted_ingo/pc104.ele
-share/pcb/newlib/not_vetted_ingo/pq100.ele
-share/pcb/newlib/not_vetted_ingo/pq128.ele
-share/pcb/newlib/not_vetted_ingo/pq144.ele
-share/pcb/newlib/not_vetted_ingo/pq160.ele
-share/pcb/newlib/not_vetted_ingo/pq208.ele
-share/pcb/newlib/not_vetted_ingo/pq240.ele
-share/pcb/newlib/not_vetted_ingo/pq304.ele
-share/pcb/newlib/not_vetted_ingo/pq32.ele
-share/pcb/newlib/not_vetted_ingo/pq44.ele
-share/pcb/newlib/not_vetted_ingo/smt0402.ele
-share/pcb/newlib/not_vetted_ingo/smt0603.ele
-share/pcb/newlib/not_vetted_ingo/smt0805.ele
-share/pcb/newlib/not_vetted_ingo/smt1206.ele
-share/pcb/newlib/not_vetted_ingo/smt1210.ele
-share/pcb/newlib/not_vetted_ingo/smt1913.ele
-share/pcb/newlib/not_vetted_ingo/smt2416.ele
-share/pcb/newlib/tests/14DIP_oval_pad
-share/pcb/newlib/tests/Generic_TSOP48_Flash
-share/pcb/newlib/tests/MONOBLOCK_large
-share/pcb/newlib/tests/StrongARM_CPU
-share/pcb/newlib/tests/TK11950
-share/pcb/newlib/tests/TO99fromLED
-share/pcb/newlib/tests/UART
-share/pcb/newlib/tests/monoblock_small
-share/pcb/pcb-menu.res
-share/pcb/pcb.pdf
-share/pcb/pcb.ps
-share/pcb/pcblib
-share/pcb/pcblib.contents
-share/pcb/qfp-ui
-share/pcb/qfp.dat
-share/pcb/refcard.pdf
-share/pcb/refcard.ps
-share/pcb/tools/MergePCBPS
-share/pcb/tools/Merge_dimPCBPS
-share/pcb/tools/PCB2HPGL
-share/pcb/tools/apctools.zip
-share/pcb/tools/gerbertotk.c
-share/pcb/tools/pcb2ncap.tgz
-share/pcb/tools/tgo2pcb.tcl
-share/pcb/tutorial/tut1.pcb
-@dirrm share/pcb/tutorial
-@dirrm share/pcb/tools
-@dirrm share/pcb/newlib/toko
-@dirrm share/pcb/newlib/tests
-@dirrm share/pcb/newlib/sockets
-@dirrm share/pcb/newlib/not_vetted_ingo
-@dirrm share/pcb/newlib/msp430
-@dirrm share/pcb/newlib/headers
-@dirrm share/pcb/newlib/generic_SMD_packages
-@dirrm share/pcb/newlib/electro-optics
-@dirrm share/pcb/newlib/cypress
-@dirrm share/pcb/newlib/crystal
-@dirrm share/pcb/newlib/connectors
-@dirrm share/pcb/newlib/burr-brown
-@dirrm share/pcb/newlib/analog-devices
-@dirrm share/pcb/newlib/2_pin_thru-hole_packages
-@dirrm share/pcb/newlib
-@dirrm share/pcb/m4
-@dirrm share/pcb/examples/libraries
-@dirrm share/pcb/examples
-@dirrm share/pcb
diff --git a/cad/pcb-current/distinfo b/cad/pcb-current/distinfo
deleted file mode 100644
index bce5a5c7ed1..00000000000
--- a/cad/pcb-current/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.10 2005/08/04 16:13:39 rillig Exp $
-
-SHA1 (pcb-20050609.tar.gz) = 5c6c47d36c6c3398c1410a8c5cf0c008b294e4c5
-RMD160 (pcb-20050609.tar.gz) = 4296b437a46e8a331cf773f29749b2bb8f8cb6ad
-Size (pcb-20050609.tar.gz) = 2371793 bytes
-SHA1 (patch-aa) = 3d31486ff101a2ab7698209e325ee85c9630a399
diff --git a/cad/pcb-current/patches/patch-aa b/cad/pcb-current/patches/patch-aa
deleted file mode 100644
index 80bc8e28b12..00000000000
--- a/cad/pcb-current/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/08/04 16:13:39 rillig Exp $
-
-A double semicolon counts as an empty statement, after which ISO C90
-does not allow any further variable declarations.
-
---- src/gui-netlist-window.c.orig	Tue Mar  1 06:33:01 2005
-+++ src/gui-netlist-window.c	Thu Aug  4 18:06:36 2005
-@@ -692,7 +692,7 @@ gui_netlist_highlight_node(gchar *node_n
- 	{
- 	GtkTreePath			*path;
- 	GtkTreeIter			iter;
--	LibraryMenuType		*net;;
-+	LibraryMenuType		*net;
- 	gchar				*name;
- 
- 	if (!node_name)
diff --git a/cad/pcb/MESSAGE b/cad/pcb/MESSAGE
index 228f6f94f8d..6cdeaa27ae5 100644
--- a/cad/pcb/MESSAGE
+++ b/cad/pcb/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/09/21 06:49:24 jlam Exp $
+$NetBSD: MESSAGE,v 1.4 2005/12/03 04:18:59 dmcmahill Exp $
 
 The following directories are all included in the search path for m4 files:
 
diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
index 14fcba3346c..b35bce172fc 100644
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@@ -1,67 +1,33 @@
-# $NetBSD: Makefile,v 1.26 2005/04/11 21:45:02 tv Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/03 04:18:59 dmcmahill Exp $
+#
 
-DISTNAME=	pcb-1.6.3
-PKGREVISION=	3
+DISTNAME=	pcb-${SNAPDATE}
 CATEGORIES=	cad
-MASTER_SITES=	ftp://ftp.linuxppc.org/pub/linuxppc/users/harry/PCB/ \
-		ftp://ftp.uni-ulm.de/pub/pcb/mirror/
-EXTRACT_SUFX=	.tgz
-DISTFILES=	pcb-1.6.3.tgz \
-		pcb-docs-1.6.3.tar.gz
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pcb/}
 
 MAINTAINER=	dmcmahill@NetBSD.org
-HOMEPAGE=	http://bach.ece.jhu.edu/~haceaton/pcb/
-COMMENT=	X11 interactive printed circuit board layout system
+HOMEPAGE=	http://pcb.sourceforge.net/
+COMMENT=	Printed circuit board layout system
 
-DEPENDS+=	m4>=1.4:../../devel/m4
+DEPENDS+=	tk>=8.3:../../x11/tk
+
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 CONFLICTS+=	pcb-current-[0-9]*
 
-USE_PKGINSTALL=	yes
-USE_IMAKE=	yes
+SNAPDATE=		20050609
+GNU_CONFIGURE=		yes
+USE_TOOLS+=		bison gm4:run gmake lex
 
-PKG_SYSCONFSUBDIR=	pcb
-DOCDIR=			${PREFIX}/share/doc/pcb
-EGDIR=			${PREFIX}/share/examples/pcb
-INFODIR=		${PREFIX}/info
-M4DIR=			${PREFIX}/lib/X11/pcb/m4
+# needed for XWarpPointer in action.c
+LIBS+=		-lX11
 
 INFO_FILES=	pcb.info
-CONF_FILES=	${EGDIR}/local.inc ${PKG_SYSCONFDIR}/local.inc
-
-# avoid picking up any user config files during the build
-MAKE_ENV+=	HOME=${WRKSRC}
 
-post-patch:
-	for file in ${WRKSRC}/config.h; do				\
-		${SED}	-e "s|@sysconfdir@|${PKG_SYSCONFDIR}|g"		\
-			$${file} > $${file}.fixed;			\
-		${MV} -f $${file}.fixed $${file};			\
-	done
+.include "../../mk/bsd.prefs.mk"
 
-post-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/index.html ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/pcb.html ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/pcb.info ${INFODIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/pcb.ps ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/refcard.ps ${DOCDIR}
-	for file in ${M4DIR}/common.m4; do				\
-		${AWK} '						\
-		/^divert\(0\)dnl/ {					\
-			printf("include(${PKG_SYSCONFDIR}/local.inc)\n"); \
-			printf("sinclude(site-config.inc)\n");		\
-			printf("sinclude(user-config.inc)\n");		\
-			printf("sinclude(proj-config.inc)\n");		\
-		}							\
-		{							\
-			gsub(/^include\(/,"include(${M4DIR}/");		\
-			print;						\
-		}'							\
-		$${file} > $${file}.fixed;				\
-		${MV} -f $${file}.fixed $${file};			\
-	done
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${ECHO} "# list your local includes here" > ${EGDIR}/local.inc
+EVAL_PREFIX+=   TKDIR=tk
+CONFIGURE_ENV+=	WISH=${TKDIR}/bin/wish
 
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/pcb/PLIST b/cad/pcb/PLIST
index 7d10e2e9ec4..d0b43e178c0 100644
--- a/cad/pcb/PLIST
+++ b/cad/pcb/PLIST
@@ -1,55 +1,189 @@
-@comment $NetBSD: PLIST,v 1.5 2004/01/12 11:22:12 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/12/03 04:18:59 dmcmahill Exp $
+bin/MergePCBPS
+bin/Merge_dimPCBPS
 bin/pcb
-lib/X11/app-defaults/Pcb
-lib/X11/pcb/CreateLibrary.sh
-lib/X11/pcb/CreateLibraryContents.sh
-lib/X11/pcb/ListLibraryContents.sh
-lib/X11/pcb/QueryLibrary.sh
-lib/X11/pcb/default_font
-lib/X11/pcb/m4/TTL_74xx_DIL.list
-lib/X11/pcb/m4/TTL_74xx_DIL.m4
-lib/X11/pcb/m4/common.m4
-lib/X11/pcb/m4/connector.inc
-lib/X11/pcb/m4/connector.list
-lib/X11/pcb/m4/connector.m4
-lib/X11/pcb/m4/crystal.list
-lib/X11/pcb/m4/crystal.m4
-lib/X11/pcb/m4/dil.inc
-lib/X11/pcb/m4/generic.list
-lib/X11/pcb/m4/generic.m4
-lib/X11/pcb/m4/linear.list
-lib/X11/pcb/m4/linear.m4
-lib/X11/pcb/m4/logic.list
-lib/X11/pcb/m4/logic.m4
-lib/X11/pcb/m4/lsi.list
-lib/X11/pcb/m4/lsi.m4
-lib/X11/pcb/m4/memory.list
-lib/X11/pcb/m4/memory.m4
-lib/X11/pcb/m4/misc.inc
-lib/X11/pcb/m4/optical.list
-lib/X11/pcb/m4/optical.m4
-lib/X11/pcb/m4/plcc.inc
-lib/X11/pcb/m4/qfp.inc
-lib/X11/pcb/m4/resistor_0.25W.list
-lib/X11/pcb/m4/resistor_0.25W.m4
-lib/X11/pcb/m4/resistor_array.list
-lib/X11/pcb/m4/resistor_array.m4
-lib/X11/pcb/m4/texas_inst_amplifier.list
-lib/X11/pcb/m4/texas_inst_amplifier.m4
-lib/X11/pcb/m4/texas_inst_voltage_reg.list
-lib/X11/pcb/m4/texas_inst_voltage_reg.m4
-lib/X11/pcb/m4/to.inc
-lib/X11/pcb/m4/transistor.list
-lib/X11/pcb/m4/transistor.m4
-lib/X11/pcb/pcblib
-lib/X11/pcb/pcblib.contents
-${IMAKE_MAN_DIR}/pcb.${IMAKE_MANNEWSUFFIX}
-share/doc/pcb/index.html
-share/doc/pcb/pcb.html
-share/doc/pcb/pcb.ps
-share/doc/pcb/refcard.ps
-share/examples/pcb/local.inc
-@dirrm share/examples/pcb
-@dirrm share/doc/pcb
-@dirrm lib/X11/pcb/m4
-@dirrm lib/X11/pcb
+bin/pcb-bin
+man/man1/pcb.1
+share/pcb/CreateLibrary.sh
+share/pcb/CreateLibraryContents.sh
+share/pcb/ListLibraryContents.sh
+share/pcb/Pcb
+share/pcb/QueryLibrary.sh
+share/pcb/default_font
+share/pcb/examples/LED
+share/pcb/examples/LED.NET
+share/pcb/examples/LED2
+share/pcb/examples/libraries/example.inc
+share/pcb/examples/libraries/example.list
+share/pcb/examples/libraries/example.m4
+share/pcb/m4/TTL_74xx_DIL.list
+share/pcb/m4/TTL_74xx_DIL.m4
+share/pcb/m4/amp.inc
+share/pcb/m4/amp.list
+share/pcb/m4/amp.m4
+share/pcb/m4/amphenol.inc
+share/pcb/m4/amphenol.list
+share/pcb/m4/amphenol.m4
+share/pcb/m4/bga.inc
+share/pcb/m4/bourns.inc
+share/pcb/m4/bourns.list
+share/pcb/m4/bourns.m4
+share/pcb/m4/common.m4
+share/pcb/m4/connector.inc
+share/pcb/m4/connector.list
+share/pcb/m4/connector.m4
+share/pcb/m4/crystal.list
+share/pcb/m4/crystal.m4
+share/pcb/m4/cts.inc
+share/pcb/m4/cts.list
+share/pcb/m4/cts.m4
+share/pcb/m4/dil.inc
+share/pcb/m4/geda.inc
+share/pcb/m4/geda.list
+share/pcb/m4/geda.m4
+share/pcb/m4/generic.list
+share/pcb/m4/generic.m4
+share/pcb/m4/genericsmt.inc
+share/pcb/m4/genericsmt.list
+share/pcb/m4/genericsmt.m4
+share/pcb/m4/gtag.list
+share/pcb/m4/gtag.m4
+share/pcb/m4/jerry.list
+share/pcb/m4/jerry.m4
+share/pcb/m4/johnstech.inc
+share/pcb/m4/johnstech.list
+share/pcb/m4/johnstech.m4
+share/pcb/m4/linear.list
+share/pcb/m4/linear.m4
+share/pcb/m4/logic.list
+share/pcb/m4/logic.m4
+share/pcb/m4/lsi.list
+share/pcb/m4/lsi.m4
+share/pcb/m4/memory.list
+share/pcb/m4/memory.m4
+share/pcb/m4/minicircuits.inc
+share/pcb/m4/minicircuits.list
+share/pcb/m4/minicircuits.m4
+share/pcb/m4/misc.inc
+share/pcb/m4/optical.list
+share/pcb/m4/optical.m4
+share/pcb/m4/panasonic.inc
+share/pcb/m4/panasonic.list
+share/pcb/m4/panasonic.m4
+share/pcb/m4/pci.inc
+share/pcb/m4/pci.list
+share/pcb/m4/pci.m4
+share/pcb/m4/plcc.inc
+share/pcb/m4/qfn.inc
+share/pcb/m4/qfp.inc
+share/pcb/m4/qfp2.inc
+share/pcb/m4/qfpdj.inc
+share/pcb/m4/resistor_0.25W.list
+share/pcb/m4/resistor_0.25W.m4
+share/pcb/m4/resistor_adjust.inc
+share/pcb/m4/resistor_adjust.list
+share/pcb/m4/resistor_adjust.m4
+share/pcb/m4/resistor_array.list
+share/pcb/m4/resistor_array.m4
+share/pcb/m4/rules.inc
+share/pcb/m4/smt.inc
+share/pcb/m4/texas_inst_amplifier.list
+share/pcb/m4/texas_inst_amplifier.m4
+share/pcb/m4/texas_inst_voltage_reg.list
+share/pcb/m4/texas_inst_voltage_reg.m4
+share/pcb/m4/to.inc
+share/pcb/m4/transistor.list
+share/pcb/m4/transistor.m4
+share/pcb/m4/zif.inc
+share/pcb/newlib/2_pin_thru-hole_packages/0.125W_Carbon_Resistor
+share/pcb/newlib/2_pin_thru-hole_packages/1W_Carbon_Resistor
+share/pcb/newlib/2_pin_thru-hole_packages/CK05_type_Capacitor
+share/pcb/newlib/2_pin_thru-hole_packages/CK06_type_capacitor
+share/pcb/newlib/2_pin_thru-hole_packages/IRU1015-33CT_3.3V_reg_TO220
+share/pcb/newlib/2_pin_thru-hole_packages/RN55_type_0.1W_Resistor
+share/pcb/newlib/2_pin_thru-hole_packages/T1.75_LED
+share/pcb/newlib/analog-devices/ADC12138CIMSA
+share/pcb/newlib/burr-brown/OPA340_SOT23-5
+share/pcb/newlib/connectors/100_Pin_jack
+share/pcb/newlib/connectors/16x1_SMD_jack
+share/pcb/newlib/connectors/3terminal_screw_block
+share/pcb/newlib/connectors/72pin45degreeSIMMconnector
+share/pcb/newlib/connectors/MOLEX_miniFitJr-12pin
+share/pcb/newlib/connectors/Power_Jack
+share/pcb/newlib/connectors/RightAngleSMA
+share/pcb/newlib/connectors/SJ-3523-SMT_3.5mm_stereo_jack
+share/pcb/newlib/crystal/CTX169_oscillator
+share/pcb/newlib/electro-optics/IRF_optical_switch
+share/pcb/newlib/generic_SMD_packages/0805_reflow_solder
+share/pcb/newlib/generic_SMD_packages/0805_wave_solder
+share/pcb/newlib/generic_SMD_packages/1206_reflow_solder
+share/pcb/newlib/generic_SMD_packages/SOT-23_Transistor
+share/pcb/newlib/headers/0.1_inch_10pin
+share/pcb/newlib/headers/0.1_inch_2pin
+share/pcb/newlib/headers/2mm_8pin_header
+share/pcb/newlib/msp430/MSP430F1121
+share/pcb/newlib/msp430/MSP430F1121+jtag
+share/pcb/newlib/not_vetted_ingo/pc104+.ele
+share/pcb/newlib/not_vetted_ingo/pc104.ele
+share/pcb/newlib/not_vetted_ingo/pq100.ele
+share/pcb/newlib/not_vetted_ingo/pq128.ele
+share/pcb/newlib/not_vetted_ingo/pq144.ele
+share/pcb/newlib/not_vetted_ingo/pq160.ele
+share/pcb/newlib/not_vetted_ingo/pq208.ele
+share/pcb/newlib/not_vetted_ingo/pq240.ele
+share/pcb/newlib/not_vetted_ingo/pq304.ele
+share/pcb/newlib/not_vetted_ingo/pq32.ele
+share/pcb/newlib/not_vetted_ingo/pq44.ele
+share/pcb/newlib/not_vetted_ingo/smt0402.ele
+share/pcb/newlib/not_vetted_ingo/smt0603.ele
+share/pcb/newlib/not_vetted_ingo/smt0805.ele
+share/pcb/newlib/not_vetted_ingo/smt1206.ele
+share/pcb/newlib/not_vetted_ingo/smt1210.ele
+share/pcb/newlib/not_vetted_ingo/smt1913.ele
+share/pcb/newlib/not_vetted_ingo/smt2416.ele
+share/pcb/newlib/tests/14DIP_oval_pad
+share/pcb/newlib/tests/Generic_TSOP48_Flash
+share/pcb/newlib/tests/MONOBLOCK_large
+share/pcb/newlib/tests/StrongARM_CPU
+share/pcb/newlib/tests/TK11950
+share/pcb/newlib/tests/TO99fromLED
+share/pcb/newlib/tests/UART
+share/pcb/newlib/tests/monoblock_small
+share/pcb/pcb-menu.res
+share/pcb/pcb.pdf
+share/pcb/pcb.ps
+share/pcb/pcblib
+share/pcb/pcblib.contents
+share/pcb/qfp-ui
+share/pcb/qfp.dat
+share/pcb/refcard.pdf
+share/pcb/refcard.ps
+share/pcb/tools/MergePCBPS
+share/pcb/tools/Merge_dimPCBPS
+share/pcb/tools/PCB2HPGL
+share/pcb/tools/apctools.zip
+share/pcb/tools/gerbertotk.c
+share/pcb/tools/pcb2ncap.tgz
+share/pcb/tools/tgo2pcb.tcl
+share/pcb/tutorial/tut1.pcb
+@dirrm share/pcb/tutorial
+@dirrm share/pcb/tools
+@dirrm share/pcb/newlib/toko
+@dirrm share/pcb/newlib/tests
+@dirrm share/pcb/newlib/sockets
+@dirrm share/pcb/newlib/not_vetted_ingo
+@dirrm share/pcb/newlib/msp430
+@dirrm share/pcb/newlib/headers
+@dirrm share/pcb/newlib/generic_SMD_packages
+@dirrm share/pcb/newlib/electro-optics
+@dirrm share/pcb/newlib/cypress
+@dirrm share/pcb/newlib/crystal
+@dirrm share/pcb/newlib/connectors
+@dirrm share/pcb/newlib/burr-brown
+@dirrm share/pcb/newlib/analog-devices
+@dirrm share/pcb/newlib/2_pin_thru-hole_packages
+@dirrm share/pcb/newlib
+@dirrm share/pcb/m4
+@dirrm share/pcb/examples/libraries
+@dirrm share/pcb/examples
+@dirrm share/pcb
diff --git a/cad/pcb/distinfo b/cad/pcb/distinfo
index 2176ced81b4..032f3b7d115 100644
--- a/cad/pcb/distinfo
+++ b/cad/pcb/distinfo
@@ -1,29 +1,6 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 14:59:25 agc Exp $
+$NetBSD: distinfo,v 1.8 2005/12/03 04:18:59 dmcmahill Exp $
 
-SHA1 (pcb-1.6.3.tgz) = 79cca1a0ed9567cefd2e98556e1895c86e453010
-RMD160 (pcb-1.6.3.tgz) = b560711587ec777295ff1d434da56950faf74edd
-Size (pcb-1.6.3.tgz) = 577803 bytes
-SHA1 (pcb-docs-1.6.3.tar.gz) = d645df42d7a9758f2112f02f47530eb2c05128a7
-RMD160 (pcb-docs-1.6.3.tar.gz) = 9ab1da0b6884c83f08ab00124252f5847c1aac1a
-Size (pcb-docs-1.6.3.tar.gz) = 252728 bytes
-SHA1 (patch-aa) = 348159ad2c6d0eef4c61bbbd0ff2b30eec3f5728
-SHA1 (patch-ab) = 8c34420992a047c93a29dbc3d51f8516a0c9b8d3
-SHA1 (patch-ac) = 39f423dddd3bce9bd6c625cde9aa5ccb1831ac9d
-SHA1 (patch-ad) = 9edcce665f1a930f857b8ffd65a25c4dad5fa289
-SHA1 (patch-ae) = 3b0b42796c2e8fd5d6d221293593e1e4f80ff660
-SHA1 (patch-af) = 5bee94569170e82a6b29ff04d4cf173dc2da9b49
-SHA1 (patch-ag) = b56547dedeb1672f9e3747b956c0d24fecb200ef
-SHA1 (patch-ah) = c17dd08069b600591e848a568a11c3b300e7d5a5
-SHA1 (patch-ai) = 42200d92387e9132ad1e60dfed5223d306fe201f
-SHA1 (patch-aj) = 5aea947a9e94f7af568feb7086d8071bda8e1523
-SHA1 (patch-ak) = 9e4005721329f6cf7321e593bd07e577643fe31d
-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
-SHA1 (patch-as) = e0fdad72eba52a2170208ead4745872ab2fbc10d
-SHA1 (patch-at) = 79156e2776788a753995740eb4cbd35b9b711c18
-SHA1 (patch-au) = ec6cffdd9b0cb55e42f8430349b057dc5ff05312
+SHA1 (pcb-20050609.tar.gz) = 5c6c47d36c6c3398c1410a8c5cf0c008b294e4c5
+RMD160 (pcb-20050609.tar.gz) = 4296b437a46e8a331cf773f29749b2bb8f8cb6ad
+Size (pcb-20050609.tar.gz) = 2371793 bytes
+SHA1 (patch-aa) = 3d31486ff101a2ab7698209e325ee85c9630a399
diff --git a/cad/pcb/patches/patch-aa b/cad/pcb/patches/patch-aa
index 1af646cc901..7dafb1e6ee2 100644
--- a/cad/pcb/patches/patch-aa
+++ b/cad/pcb/patches/patch-aa
@@ -1,15 +1,16 @@
-$NetBSD: patch-aa,v 1.1.1.1 1998/11/07 14:30:34 frueauf Exp $
+$NetBSD: patch-aa,v 1.2 2005/12/03 04:18:59 dmcmahill Exp $
 
---- src/Imakefile.orig	Wed May 13 12:29:46 1998
-+++ src/Imakefile	Fri Nov  6 15:13:28 1998
-@@ -79,6 +79,10 @@
- 	@echo "creating application default resource from raw file"
- 	@sed -f sed.script  < Pcb.ad.raw > $@
+A double semicolon counts as an empty statement, after which ISO C90
+does not allow any further variable declarations.
+
+--- src/gui-netlist-window.c.orig	Tue Mar  1 06:33:01 2005
++++ src/gui-netlist-window.c	Thu Aug  4 18:06:36 2005
+@@ -692,7 +692,7 @@ gui_netlist_highlight_node(gchar *node_n
+ 	{
+ 	GtkTreePath			*path;
+ 	GtkTreeIter			iter;
+-	LibraryMenuType		*net;;
++	LibraryMenuType		*net;
+ 	gchar				*name;
  
-+pcb.man: ../doc/pcb.man.raw
-+	@(cd ../doc && ${MAKE} ${MFLAGS} ${PARALLELMFLAGS} pcb.man)
-+	@ln -s ../doc/pcb.man pcb.man
-+
- parse_y.h parse_y.c: parse_y.y global.h
- 	$(YACC) -d parse_y.y
- 	$(MV) y.tab.c parse_y.c
+ 	if (!node_name)
diff --git a/cad/pcb/patches/patch-ab b/cad/pcb/patches/patch-ab
deleted file mode 100644
index 16fa6adb69b..00000000000
--- a/cad/pcb/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2002/09/21 06:49:26 jlam Exp $
-
---- config.h.orig	Wed Jan 28 17:28:11 1998
-+++ config.h	Wed Jan 28 17:29:04 1998
-@@ -36,7 +36,7 @@
-  * (LIBDIR is defined by imake)
-  *
-  */
--INFODIR = /usr/info
-+INFODIR = ${PREFIX}/info
- PCBLIBDIR = $(LIBDIR)/pcb
- DEFAULTFONT = default_font
- DEFAULTLIBRARY = pcblib
-@@ -44,7 +44,7 @@
- /* ----------------------------------------------------------------------
-  * the name of GNU m4 (you MUST use GNU m4)
-  */
--GNUM4 = m4
-+GNUM4 = "gm4 -I@sysconfdir@ -I\$$HOME/.pcb -I."
- 
- /* ----------------------------------------------------------------------
-  * BTNMOD determies the modifier key to be used for the
diff --git a/cad/pcb/patches/patch-ac b/cad/pcb/patches/patch-ac
deleted file mode 100644
index ac15884c2d0..00000000000
--- a/cad/pcb/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2000/08/31 14:55:32 dmcmahill Exp $
-
-don't force the user to have latex for building the docs
-
---- doc/Imakefile.orig	Wed May 13 06:29:09 1998
-+++ doc/Imakefile	Thu Aug 31 10:18:06 2000
-@@ -32,5 +32,5 @@
-  */
- 
--all:: pcb.man pcb.ps pcb.html pcb.info refcard.ps
-+all:: pcb.man
- 
- InstallManPage(pcb,$(MANDIR))
diff --git a/cad/pcb/patches/patch-ad b/cad/pcb/patches/patch-ad
deleted file mode 100644
index df5f1c5d43d..00000000000
--- a/cad/pcb/patches/patch-ad
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2002/05/31 19:56:20 dmcmahill Exp $
-
---- src/main.c.orig	Wed May 13 06:29:47 1998
-+++ src/main.c
-@@ -787,9 +787,9 @@
- 	Output.fgGC = XCreateGC(Dpy, Output.OutputWindow, 0, NULL);
- 	Output.bgGC = XCreateGC(Dpy, Output.OutputWindow, 0, NULL);
- 	Output.GridGC = XCreateGC(Dpy, Output.OutputWindow, 0, NULL);
--	if (!VALID_GC((int) Output.fgGC) ||
--		!VALID_GC((int) Output.bgGC) ||
--		!VALID_GC((int) Output.GridGC))
-+	if (!VALID_GC( (long int) Output.fgGC) ||
-+		!VALID_GC( (long int) Output.bgGC) ||
-+		!VALID_GC( (long int) Output.GridGC))
- 		MyFatal("can't create default GC\n");
- 
- 	XSetForeground(Dpy, Output.bgGC, Settings.bgColor);
diff --git a/cad/pcb/patches/patch-ae b/cad/pcb/patches/patch-ae
deleted file mode 100644
index eefa6fd88a0..00000000000
--- a/cad/pcb/patches/patch-ae
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2002/05/31 19:56:20 dmcmahill Exp $
-
---- src/move.c.orig	Wed May 13 06:29:49 1998
-+++ src/move.c
-@@ -359,7 +359,7 @@
- 		DrawArc(Layer, Arc, 0);
- 		Draw();
- 	}
--	if (((int) Dest == -1) || Dest == Layer)
-+	if (((long int) Dest == -1) || Dest == Layer)
- 		return(Arc);
- 	AddObjectToMoveToLayerUndoList(ARC_TYPE, Layer, Arc, Arc);
- 	if (Layer->On)
-@@ -391,7 +391,7 @@
-         	DrawLine(Layer, Line, 0);
- 		Draw();
- 	}
--        if (((int) Dest == -1) || Dest == Layer)
-+        if (((long int) Dest == -1) || Dest == Layer)
-                 return(Line);
- 
- 	AddObjectToMoveToLayerUndoList(LINE_TYPE, Layer, Line, Line);
-@@ -473,7 +473,7 @@
- 	TextTypePtr	new;
- 
-                 /* Dest == -1 means move to silkscreen layer */
--        if (((int) Dest == -1) || (Dest == Layer))
-+        if (((long int) Dest == -1) || (Dest == Layer))
-                 AddObjectToFlagUndoList(TEXT_TYPE, Layer, Text, Text);
-         else 
- 		AddObjectToMoveToLayerUndoList(TEXT_TYPE, Layer, Text, Text);
-@@ -481,7 +481,7 @@
-            (TEST_FLAG(ONSILKFLAG, Text) && (PCB->InvisibleObjectsOn ||
-            (TEST_FLAG(ONSOLDERFLAG, Text) !=0) == SWAP_IDENT)))
- 		EraseText(Text);
--        if ((int) Dest == -1)
-+        if ((long int) Dest == -1)
-         {       
-                 SET_FLAG(ONSILKFLAG, Text);
-                 if (PCB->ElementOn || (TEST_FLAG(ONSOLDERFLAG, Text) !=0) == SWAP_IDENT)
-@@ -536,7 +536,7 @@
- 	PolygonTypePtr	new;
- 	int		LayerThermFlag, DestThermFlag;
- 
--	if (((int) Dest == -1) || (Layer == Dest))
-+	if (((long int) Dest == -1) || (Layer == Dest))
- 		return(Polygon);
- 	AddObjectToMoveToLayerUndoList(POLYGON_TYPE, Layer, Polygon, Polygon);
- 	if (Layer->On)
diff --git a/cad/pcb/patches/patch-af b/cad/pcb/patches/patch-af
deleted file mode 100644
index ce00a416fd8..00000000000
--- a/cad/pcb/patches/patch-af
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-af,v 1.1 2002/05/31 19:56:20 dmcmahill Exp $
-
---- src/control.c.orig	Wed May 13 06:29:41 1998
-+++ src/control.c
-@@ -153,7 +153,7 @@
- static void AddDrawingLayerSelection(Widget Parent)
- {
- 	static	char	name[MAX_LAYER][20];
--			int		i;
-+			long int		i;
- 			Widget	label;
- 			Pixel	background;
- 
-@@ -191,7 +191,7 @@
- {
- 	static	char	name[MAX_LAYER+4][20];
- 			Widget	last;
--			int		i;
-+			long int		i;
- 			char	*text;
- 			Pixel	color;
- 
-@@ -392,7 +392,7 @@
- static void CB_SetDrawingLayer(Widget W,
- 	XtPointer ClientData, XtPointer CallData)
- {
--	ChangeGroupVisibility((int) ClientData, True, True);
-+	ChangeGroupVisibility((long int) ClientData, True, True);
- 	XtVaSetValues(DrawingLayerMenuButton.W,
- 		XtNlabel, UNKNOWN(CURRENT->Name),
- 		XtNbackground, CURRENT->Color,
-@@ -406,7 +406,7 @@
- static void CB_SetOnOff(Widget W, XtPointer ClientData, XtPointer CallData)
- {
- 	Boolean	state;
--	int		layer = (int) ClientData;
-+	long int		layer = (long int) ClientData;
- 
- 		/* get new state of widget */
- 	XtVaGetValues(W, XtNstate, &state, NULL);
diff --git a/cad/pcb/patches/patch-ag b/cad/pcb/patches/patch-ag
deleted file mode 100644
index 2ddc3015e53..00000000000
--- a/cad/pcb/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2002/05/31 19:56:20 dmcmahill Exp $
-
---- src/crosshair.c.orig	Wed May 13 06:29:42 1998
-+++ src/crosshair.c
-@@ -820,7 +820,7 @@
- 	memset(&Crosshair, 0, sizeof(CrosshairType));
- 
- 	Crosshair.GC = XCreateGC(Dpy, Output.OutputWindow, 0, NULL);
--	if (!VALID_GC((int) Crosshair.GC))
-+	if (!VALID_GC((long int) Crosshair.GC))
- 		MyFatal("can't create default crosshair GC\n");
- 	XSetState(Dpy, Crosshair.GC, Settings.CrosshairColor, Settings.bgColor,
- 		GXxor, AllPlanes);
diff --git a/cad/pcb/patches/patch-ah b/cad/pcb/patches/patch-ah
deleted file mode 100644
index 687b496d73a..00000000000
--- a/cad/pcb/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2002/05/31 19:56:21 dmcmahill Exp $
-
---- src/misc.c.orig	Wed May 13 06:29:49 1998
-+++ src/misc.c
-@@ -1066,7 +1066,7 @@
- {
- 	static	char	path[MAXPATHLEN+1];
- 
--#if defined(SYSV) || defined(linux) 
-+#if defined(SYSV) || defined(linux) || defined(__NetBSD__)
- 	return(getcwd(path, MAXPATHLEN));
- #else
- 		/* seems that some BSD releases lack of a prototype for getwd() */
diff --git a/cad/pcb/patches/patch-ai b/cad/pcb/patches/patch-ai
deleted file mode 100644
index a71b618881f..00000000000
--- a/cad/pcb/patches/patch-ai
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2002/05/31 19:56:21 dmcmahill Exp $
-
---- src/dialog.c.orig	Wed May 13 06:29:43 1998
-+++ src/dialog.c
-@@ -55,7 +55,7 @@
- /* ---------------------------------------------------------------------------
-  * some local identifiers
-  */
--static	int		ReturnCode;		/* used by standard dialogs */
-+static	long int		ReturnCode;		/* used by standard dialogs */
- 
- /* ---------------------------------------------------------------------------
-  * some local prototypes
-@@ -71,7 +71,7 @@
-  */
- static void CB_OK(Widget W, XtPointer ClientData, XtPointer CallData)
- {
--	ReturnCode = (int) ClientData;
-+	ReturnCode = (long int) ClientData;
- }
- 
- /* ---------------------------------------------------------------------------
-@@ -124,7 +124,7 @@
-  * waits until returncode is differnt from -1
-  * see also CB_OK()
-  */
--int DialogEventLoop(int *Code)
-+int DialogEventLoop(long int *Code)
- {
- 	XEvent	event;
- 
diff --git a/cad/pcb/patches/patch-aj b/cad/pcb/patches/patch-aj
deleted file mode 100644
index cd9a74b9b8d..00000000000
--- a/cad/pcb/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2002/05/31 19:56:21 dmcmahill Exp $
-
---- src/dialog.h.orig	Wed May 13 06:29:43 1998
-+++ src/dialog.h
-@@ -53,7 +53,7 @@
- } DialogButtonType, *DialogButtonTypePtr;
- 
-  
--int		DialogEventLoop(int *);
-+int		DialogEventLoop(long int *);
- Widget		AddButtons(Widget, Widget, DialogButtonTypePtr, size_t);
- Widget		CreateDialogBox(char *, DialogButtonTypePtr, size_t, char *);
- void		StartDialog(Widget);
diff --git a/cad/pcb/patches/patch-ak b/cad/pcb/patches/patch-ak
deleted file mode 100644
index 6cf2c1b7847..00000000000
--- a/cad/pcb/patches/patch-ak
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2002/05/31 19:56:21 dmcmahill Exp $
-
---- src/fileselect.c.orig	Wed May 13 06:29:45 1998
-+++ src/fileselect.c
-@@ -79,7 +79,7 @@
-  */
- static	Widget		InputW,		/* input field */
- 			CurrentW;	/* label (current directory) */
--static	int		ReturnCode;	/* returncode of buttons */
-+static	long int	ReturnCode;	/* returncode of buttons */
- static	String		CurrentDir;	/* current directory */
- static	Boolean		LockCallback;	/* used by CB_Text() */
- static	SelectorType	DirectorySelector =
-@@ -138,7 +138,7 @@
-  */
- static void CB_CancelOrOK(Widget W, XtPointer ClientData, XtPointer CallData)
- {
--	ReturnCode = (int) ClientData;
-+	ReturnCode = (long int) ClientData;
- }
- 
- /* ---------------------------------------------------------------------------
diff --git a/cad/pcb/patches/patch-al b/cad/pcb/patches/patch-al
deleted file mode 100644
index 5ca72844fd1..00000000000
--- a/cad/pcb/patches/patch-al
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-al,v 1.1 2002/05/31 19:56:21 dmcmahill Exp $
-
---- src/lgdialog.c.orig	Wed May 13 06:29:46 1998
-+++ src/lgdialog.c
-@@ -57,7 +57,7 @@
- /* ---------------------------------------------------------------------------
-  * some local identifiers
-  */
--static	int				ReturnCode;			/* return code of buttons */
-+static	long int	ReturnCode;			/* return code of buttons */
- static	LayerGroupType	LayerGroups;		/* working copy of current lg */
- 
- /* ---------------------------------------------------------------------------
-@@ -65,7 +65,7 @@
-  */
- static void CB_CancelOrOK(Widget W, XtPointer ClientData, XtPointer CallData)
- {
--	ReturnCode = (int) ClientData;
-+	ReturnCode = (long int) ClientData;
- }
- 
- /* ---------------------------------------------------------------------------
-@@ -78,7 +78,7 @@
- 								last,
- 								layernameW,
- 								radioGroup[MAX_LAYER+2];
--			int					i,
-+			long int				i,
- 								group,
- 								layer;
- 			XtTranslations		translationtable;
-@@ -223,7 +223,7 @@
- 			LayerGroups.Number[group] = 0;
- 		for (i = 0; i < MAX_LAYER+2; i++)
- 		{
--			if ((group = (int) XawToggleGetCurrent(radioGroup[i])) != 0)
-+			if ((group = (long int) XawToggleGetCurrent(radioGroup[i])) != 0)
- 			{
- 				group--;
- 				LayerGroups.Entries[group][LayerGroups.Number[group]++] = i;
diff --git a/cad/pcb/patches/patch-am b/cad/pcb/patches/patch-am
deleted file mode 100644
index c8d077c73ac..00000000000
--- a/cad/pcb/patches/patch-am
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-am,v 1.1 2002/05/31 19:56:21 dmcmahill Exp $
-
---- src/printdialog.c.orig	Wed May 13 06:29:56 1998
-+++ src/printdialog.c
-@@ -80,7 +80,7 @@
- 							FilenameLabelW,		/* a label */
- 							FilenameW;			/* input line */
- static	float				Scale = 1.0;		/* initial scaling factor */
--static	int					ReturnCode;			/* returncode of buttons */
-+static	long int			ReturnCode;			/* returncode of buttons */
- static	Boolean				RotateFlag = False,	/* initial rotation flag */
- 							OutlineFlag = False,/* don't draw board outline.. */
- 							AlignmentFlag = False,
-@@ -218,7 +218,7 @@
-  */
- static void CB_CancelOrOK(Widget W, XtPointer ClientData, XtPointer CallData)
- {
--	ReturnCode = (int) ClientData;
-+	ReturnCode = (long int) ClientData;
- }
- 
- /* ---------------------------------------------------------------------------
-@@ -240,7 +240,7 @@
- static void CB_ScrollProc(Widget W, XtPointer ClientData, XtPointer CallData)
- {
- 	float	top;
--	int		delta = (int) CallData;
-+	long int		delta = (long int) CallData;
- 
- 		/* get thumb postion */
- 	XtVaGetValues(W, XtNtopOfThumb, &top, NULL);
diff --git a/cad/pcb/patches/patch-an b/cad/pcb/patches/patch-an
deleted file mode 100644
index 45af04d12a9..00000000000
--- a/cad/pcb/patches/patch-an
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-an,v 1.1 2002/05/31 19:56:21 dmcmahill Exp $
-
---- src/report.c.orig	Wed May 13 06:29:57 1998
-+++ src/report.c
-@@ -47,7 +47,7 @@
- #include <X11/Xaw/Toggle.h>
- 
- 
--static	int	ReturnCode;		/* filled in by dialog */
-+static	long int	ReturnCode;		/* filled in by dialog */
- 
- /*
-  * some local prototypes
-@@ -61,7 +61,7 @@
-  */
- static void CB_OK(Widget W, XtPointer ClientData, XtPointer CallData)
- {
--        ReturnCode = (int) ClientData;
-+        ReturnCode = (long int) ClientData;
- }
- 
- void ReportDrills(void)
diff --git a/cad/pcb/patches/patch-ao b/cad/pcb/patches/patch-ao
deleted file mode 100644
index 79b8c64f7e9..00000000000
--- a/cad/pcb/patches/patch-ao
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2002/05/31 19:56:21 dmcmahill Exp $
-
---- src/sizedialog.c.orig	Wed May 13 06:29:59 1998
-+++ src/sizedialog.c
-@@ -87,7 +87,7 @@
- /* ---------------------------------------------------------------------------
-  * some local identifiers
-  */
--static	int			ReturnCode;			/* returncode of buttons */
-+static	long int	ReturnCode;			/* returncode of buttons */
- static	SliderType	Sliders[] = {
- 	{ "linewidth", MIN_LINESIZE, MAX_LINESIZE, CHUNK, 0, NULL, NULL },
- 	{ "via hole", MIN_PINORVIAHOLE, 0, CHUNK, 0, NULL, NULL },
-@@ -180,7 +180,7 @@
-  */
- static void CB_CancelOrOK(Widget W, XtPointer ClientData, XtPointer CallData)
- {
--	ReturnCode = (int) ClientData;
-+	ReturnCode = (long int) ClientData;
- }
- 
- /* ---------------------------------------------------------------------------
-@@ -190,7 +190,7 @@
-  */
- static void CB_ScrollProc(Widget W, XtPointer ClientData, XtPointer CallData)
- {
--	int				delta = (int) CallData;
-+	long int				delta = (long int) CallData;
- 	SliderTypePtr	slider = (SliderTypePtr) ClientData;
- 
- 	UpdateScrollbar(slider,
diff --git a/cad/pcb/patches/patch-ap b/cad/pcb/patches/patch-ap
deleted file mode 100644
index c8acd882191..00000000000
--- a/cad/pcb/patches/patch-ap
+++ /dev/null
@@ -1,11 +0,0 @@
-$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
deleted file mode 100644
index 141495e9939..00000000000
--- a/cad/pcb/patches/patch-aq
+++ /dev/null
@@ -1,11 +0,0 @@
-$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
deleted file mode 100644
index b6cb03a05b3..00000000000
--- a/cad/pcb/patches/patch-ar
+++ /dev/null
@@ -1,11 +0,0 @@
-$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
diff --git a/cad/pcb/patches/patch-as b/cad/pcb/patches/patch-as
deleted file mode 100644
index 9470f9cf53e..00000000000
--- a/cad/pcb/patches/patch-as
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-as,v 1.1 2004/01/12 11:19:58 seb Exp $
-
---- src/dev_rs274x.c.orig	1998-05-13 10:29:43.000000000 +0000
-+++ src/dev_rs274x.c
-@@ -51,7 +51,7 @@
- #include <sys/types.h>
- #include <errno.h>
- #include <unistd.h>
--#include <varargs.h>
-+#include <stdarg.h>
- 
- #include "global.h"
- 
-@@ -218,10 +218,7 @@
- /*----------------------------------------------------------------------------*/
- /* Error Logging Routines                                                     */
- /*----------------------------------------------------------------------------*/
--static void logError(fp, format, va_alist)
--	FILE *fp;
--	char *format;
--	va_dcl
-+static void logError(FILE* fp, char * format, ...)
- {
- 	va_list args;
- 	char    s[1024];
-@@ -229,7 +226,7 @@ static void logError(fp, format, va_alis
- 		/* FIXME: Is it legitimate to use Message() from within a
- 			driver? */
- 
--	va_start(args);
-+	va_start(args, format);
- 	vsprintf(s, format, args);
- 	fputs(s, fp);
- /*
diff --git a/cad/pcb/patches/patch-at b/cad/pcb/patches/patch-at
deleted file mode 100644
index b35cef4b4bd..00000000000
--- a/cad/pcb/patches/patch-at
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-at,v 1.1 2004/01/12 11:19:58 seb Exp $
-
---- src/error.c.orig	1998-05-13 10:29:45.000000000 +0000
-+++ src/error.c
-@@ -34,7 +34,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <errno.h>
--#include <varargs.h>
-+#include <stdarg.h>
- #include <signal.h>
- #include <unistd.h>
- #include <fcntl.h>
-@@ -51,8 +51,10 @@
- /* ----------------------------------------------------------------------
-  * some external identifiers
-  */
-+#ifndef __NetBSD__
- extern	int		errno,			/* system error code */
- 				sys_nerr;		/* number of messages available from array */
-+#endif
- 
- /* the list is already defined for some OS */
- #if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__linux__) 
-@@ -68,15 +70,13 @@
- /* ---------------------------------------------------------------------------
-  * output of message in a dialog window or log window
-  */
--void Message(Format, va_alist)
--char *Format;
--va_dcl
-+void Message(char *Format, ...)
- {
- 	va_list	args;
- 	char	s[1024];
- 	XEvent	event;
- 
--	va_start(args);
-+	va_start(args, Format);
- 	vsprintf(s, Format, args);
- 	va_end(args);
- 
-@@ -156,9 +156,7 @@
- /* ---------------------------------------------------------------------------
-  * output of fatal error message
-  */
--void MyFatal(Format, va_alist)
--char *Format;
--va_dcl
-+void MyFatal( char *Format, ...)
- {
- 	va_list	args;
- 
-@@ -166,7 +164,7 @@
- 	RestoreStderr();
- 	EmergencySave();
- 
--	va_start(args);
-+	va_start(args, Format);
- 	fprintf(stderr, "%s (%i): fatal, ", Progname, (int) getpid());
- 	vfprintf(stderr, Format, args);
- 	fflush(stderr);
diff --git a/cad/pcb/patches/patch-au b/cad/pcb/patches/patch-au
deleted file mode 100644
index ae87bd6ec31..00000000000
--- a/cad/pcb/patches/patch-au
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-au,v 1.1 2004/01/12 11:19:58 seb Exp $
-
---- src/error.h.orig	1998-05-13 10:29:45.000000000 +0000
-+++ src/error.h
-@@ -37,13 +37,13 @@
- #define	STATUS_BREAK	1
- #define	STATUS_ERROR	-1
- 
--void	Message();
-+void	Message(char *, ...);
- void	OpenErrorMessage(char *);
- void	PopenErrorMessage(char *);
- void	OpendirErrorMessage(char *);
- void	ChdirErrorMessage(char *);
- void	RestoreStderr(void);
--void	MyFatal();
-+void	MyFatal(char *, ...);
- void	CatchSignal(int);
- void	X11ErrorHandler(String);
- void	InitErrorLog(void);