update to pcb-20060422. This release represents a fairly major overhaul

of PCB.  In particular, the core code has been isolated from the GUI code
and there are now both GTK and Motif/Lesstif GUI's available.  In addition,
command line exporting to RS-274-X, postscript, encapsulated postscript and
png are directly supported.

In addition, there have been many bug fixes since the last packaged snapshot
release.

3 files changed, 41 insertions, 11 deletions

diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
index 3ba96066e94..75450a98588 100644
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2006/04/17 13:46:18 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2006/04/23 03:02:26 dmcmahill Exp $
 #
 
 DISTNAME=	pcb-${SNAPDATE}
-PKGREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pcb/}
 
@@ -14,15 +13,33 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 CONFLICTS+=	pcb-current-[0-9]*
 
-SNAPDATE=		20060321
+SNAPDATE=		20060422
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		WISH=${TOOLS_PATH.wish}
 USE_TOOLS+=		bison gm4:run gmake lex wish:run
 INFO_FILES=		# PLIST
 
-# needed for XWarpPointer in action.c
-LIBS+=		-lX11
+PKG_OPTIONS_VAR=	PKG_OPTIONS.pcb
+PKG_SUPPORTED_OPTIONS=	pcb-motif png
 
+.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mpcb-motif)
+.include "../../mk/motif.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-gui=lesstif
+.else
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-gui=gtk
+.endif
+
+EXPORTERS=	bom gerber ps
+.if !empty(PKG_OPTIONS:Mpng)
+EXPORTERS+=	png
+.include "../../graphics/gd/buildlink3.mk"
+.endif
+
+CONFIGURE_ARGS+=	--with-exporters=${EXPORTERS:Q}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/pcb/PLIST b/cad/pcb/PLIST
index c50b51d8fdf..2c1ebcae365 100644
--- a/cad/pcb/PLIST
+++ b/cad/pcb/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.8 2006/04/04 22:20:27 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/04/23 03:02:26 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
@@ -148,15 +147,28 @@ share/pcb/newlib/tests/TK11950
 share/pcb/newlib/tests/TO99fromLED
 share/pcb/newlib/tests/UART
 share/pcb/newlib/tests/monoblock_small
+share/pcb/pad.eps
+share/pcb/pad.gif
+share/pcb/pad.pdf
+share/pcb/pad.png
 share/pcb/pcb-menu.res
+share/pcb/pcb.html
 share/pcb/pcb.pdf
 share/pcb/pcb.ps
 share/pcb/pcblib
 share/pcb/pcblib.contents
+share/pcb/puller.eps
+share/pcb/puller.gif
+share/pcb/puller.pdf
+share/pcb/puller.png
 share/pcb/qfp-ui
 share/pcb/qfp.dat
 share/pcb/refcard.pdf
 share/pcb/refcard.ps
+share/pcb/thermal.eps
+share/pcb/thermal.gif
+share/pcb/thermal.pdf
+share/pcb/thermal.png
 share/pcb/tools/MergePCBPS
 share/pcb/tools/Merge_dimPCBPS
 share/pcb/tools/PCB2HPGL
@@ -185,4 +197,5 @@ share/pcb/tutorial/tut1.pcb
 @dirrm share/pcb/m4
 @dirrm share/pcb/examples/libraries
 @dirrm share/pcb/examples
+@dirrm share/pcb-${PKGVERSION}
 @dirrm share/pcb
diff --git a/cad/pcb/distinfo b/cad/pcb/distinfo
index 4b69f03ee3d..358c6bd0f2f 100644
--- a/cad/pcb/distinfo
+++ b/cad/pcb/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2006/04/04 22:20:27 dmcmahill Exp $
+$NetBSD: distinfo,v 1.11 2006/04/23 03:02:26 dmcmahill Exp $
 
-SHA1 (pcb-20060321.tar.gz) = 8c8d332296eb6d55737c6e3909fc1ebed8bb7143
-RMD160 (pcb-20060321.tar.gz) = 1d73e61bb00d1a993dad4e3aa716e7708ac80db9
-Size (pcb-20060321.tar.gz) = 2520122 bytes
+SHA1 (pcb-20060422.tar.gz) = b3e7a92590d904643229cda3b39727609c0e9c7f
+RMD160 (pcb-20060422.tar.gz) = be4cc1b02eee79deb836da71f87a629954879bc8
+Size (pcb-20060422.tar.gz) = 3200182 bytes