5 files changed, 9 insertions, 50 deletions
diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
index 55fa6a38522..4e0b4385cc7 100644
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2006/03/30 03:44:41 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2006/04/04 22:20:27 dmcmahill Exp $
 #
 
 DISTNAME=	pcb-${SNAPDATE}
-PKGREVISION=	3
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pcb/}
 
@@ -14,7 +13,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 CONFLICTS+=	pcb-current-[0-9]*
 
-SNAPDATE=		20050609
+SNAPDATE=		20060321
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		WISH=${TOOLS_PATH.wish}
 USE_TOOLS+=		bison gm4:run gmake lex wish:run
@@ -23,5 +22,6 @@ INFO_FILES=		# PLIST
 # needed for XWarpPointer in action.c
 LIBS+=		-lX11
 
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/pcb/PLIST b/cad/pcb/PLIST
index 29583484df8..c50b51d8fdf 100644
--- a/cad/pcb/PLIST
+++ b/cad/pcb/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.7 2006/03/30 03:44:41 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/04/04 22:20:27 dmcmahill Exp $
 bin/MergePCBPS
 bin/Merge_dimPCBPS
 bin/pcb
 bin/pcb-bin
+bin/pcb-print
 info/pcb.info
 man/man1/pcb.1
 share/pcb/CreateLibrary.sh
@@ -44,9 +45,6 @@ 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
diff --git a/cad/pcb/distinfo b/cad/pcb/distinfo
index a8e8b5ab5d8..4b69f03ee3d 100644
--- a/cad/pcb/distinfo
+++ b/cad/pcb/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.9 2006/01/05 15:55:26 joerg Exp $
+$NetBSD: distinfo,v 1.10 2006/04/04 22:20:27 dmcmahill Exp $
 
-SHA1 (pcb-20050609.tar.gz) = 5c6c47d36c6c3398c1410a8c5cf0c008b294e4c5
-RMD160 (pcb-20050609.tar.gz) = 4296b437a46e8a331cf773f29749b2bb8f8cb6ad
-Size (pcb-20050609.tar.gz) = 2371793 bytes
-SHA1 (patch-aa) = 3d31486ff101a2ab7698209e325ee85c9630a399
-SHA1 (patch-ab) = 1cdced6e0b60dc3e15ed571564c935c39ebde4a4
+SHA1 (pcb-20060321.tar.gz) = 8c8d332296eb6d55737c6e3909fc1ebed8bb7143
+RMD160 (pcb-20060321.tar.gz) = 1d73e61bb00d1a993dad4e3aa716e7708ac80db9
+Size (pcb-20060321.tar.gz) = 2520122 bytes
diff --git a/cad/pcb/patches/patch-aa b/cad/pcb/patches/patch-aa
deleted file mode 100644
index 7dafb1e6ee2..00000000000
--- a/cad/pcb/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/12/03 04:18:59 dmcmahill 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/patches/patch-ab b/cad/pcb/patches/patch-ab
deleted file mode 100644
index eee7bf9ba51..00000000000
--- a/cad/pcb/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2006/01/05 15:55:26 joerg Exp $
-
---- src/error.c.orig	2006-01-05 15:49:45.000000000 +0000
-+++ src/error.c
-@@ -66,7 +66,6 @@ RCSID("$Id: error.c,v 1.8 2005/03/12 02:
- /* ----------------------------------------------------------------------
-  * some external identifiers
-  */
--extern int errno;		/* system error code */
- 
- #if !defined(HAVE_STRERROR)
- extern int sys_nerr;		/* number of messages available from array */
-@@ -74,7 +73,7 @@ extern int sys_nerr;		/* number of messa
- #endif
- 
- /* the list is already defined for some OS */
--#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__linux__)
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__linux__) && !defined(__DragonFly__)
- #ifdef USE_SYS_ERRLIST
- extern char *sys_errlist[];	/* array of error messages */
- #endif