diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
new file mode 100644
index 00000000000..22eddf57587
--- /dev/null
+++ b/cad/pcb/Makefile
@@ -0,0 +1,48 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2007/01/05 16:52:21 steven Exp $
+
+COMMENT=	"printed circuit board layout tool"
+DISTNAME=	pcb-20060822
+CATEGORIES=	cad
+
+HOMEPAGE=	http://pcb.sourceforge.net/
+
+MAINTAINER=	Andreas Bihlmaier <andreas.bihlmaier@gmx.de>
+
+# GPL
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+WANTLIB=	X11 Xext Xrender c m z fontconfig freetype jpeg png \
+		cairo glitz atk-1.0 glib-2.0 gmodule-2.0 gobject-2.0 \
+		pango-1.0 pangoft2-1.0 pangocairo-1.0
+
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pcb/}
+
+RUN_DEPENDS=	::devel/m4 \
+		:tk-8.4.*:x11/tk/8.4
+BUILD_DEPENDS=	${RUN_DEPENDS}
+LIB_DEPENDS=	gd.>=20::graphics/gd \
+		gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2
+
+MODULES=	devel/gettext
+
+USE_X11=	Yes
+CONFIGURE_STYLE=gnu
+CONFIGURE_ARGS=	--disable-doc --with-gui=gtk
+
+pre-configure:
+	@perl -pi -e 's,!!DOCDIR!!,${PREFIX}/share/doc/pcb,' \
+		${WRKSRC}/doc/pcb.1
+
+post-install:
+	rm -rf ${PREFIX}/share/${DISTNAME}
+	${INSTALL_MAN} ${WRKSRC}/doc/pcb.1 ${PREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/doc/pcb.info* ${PREFIX}/info
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pcb
+	${INSTALL_DATA} ${WRKSRC}/doc/pcb.html ${PREFIX}/share/doc/pcb
+	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${PREFIX}/share/doc/pcb
+	${INSTALL_DATA} ${WRKSRC}/doc/refcard.pdf ${PREFIX}/share/doc/pcb
+
+.include <bsd.port.mk>
diff --git a/cad/pcb/distinfo b/cad/pcb/distinfo
new file mode 100644
index 00000000000..365e85cbe69
--- /dev/null
+++ b/cad/pcb/distinfo
@@ -0,0 +1,4 @@
+MD5 (pcb-20060822.tar.gz) = e091285d6741860484b31e8ac5b7e37f
+RMD160 (pcb-20060822.tar.gz) = 65318c31a99b4ab4e38d2140f8c9a2bb5913a797
+SHA1 (pcb-20060822.tar.gz) = e7ba587033f5ef4fb9a5372fe84c4e6d69aca75b
+SIZE (pcb-20060822.tar.gz) = 3229845
diff --git a/cad/pcb/patches/patch-configure b/cad/pcb/patches/patch-configure
new file mode 100644
index 00000000000..5413cb61aa4
--- /dev/null
+++ b/cad/pcb/patches/patch-configure
@@ -0,0 +1,12 @@
+$OpenBSD: patch-configure,v 1.1.1.1 2007/01/05 16:52:21 steven Exp $
+--- configure.orig	Wed Aug 23 03:47:59 2006
++++ configure	Thu Jan  4 11:14:57 2007
+@@ -4436,7 +4436,7 @@ echo "$as_me: error: Did not find a m4 e
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-for ac_prog in wish wish83 wish8.3 wish80 wish8.0 cygwish83 cygwish80
++for ac_prog in wish wish84 wish8.4 wish80 wish8.0 cygwish83 cygwish80
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
diff --git a/cad/pcb/patches/patch-doc_pcb_1 b/cad/pcb/patches/patch-doc_pcb_1
new file mode 100644
index 00000000000..ccc45d2ed31
--- /dev/null
+++ b/cad/pcb/patches/patch-doc_pcb_1
@@ -0,0 +1,25 @@
+$OpenBSD: patch-doc_pcb_1,v 1.1.1.1 2007/01/05 16:52:21 steven Exp $
+--- doc/pcb.1.orig	Tue Aug 24 23:44:24 2004
++++ doc/pcb.1	Fri Jan  5 09:11:57 2007
+@@ -30,17 +30,14 @@ The
+ program is a tool for the layout of printed circuit boards.
+ The complete manual for
+ .B pcb
+-is provided in a GNU texinfo format as well as HTML and PDF.
++is provided in a GNU texinfo format as well as HTML.
+ The texinfo version of the manual is typically viewed with the
+ .B info
+ program or alternatively with 
+ .B emacs
+ or a graphical info viewer such as
+-.B tkinfo
+-.  The PDF and HTML documentation is typically installed as
+-/usr/local/share/pcb/pcb.html and /usr/local/share/pcb/pcb.pdf.
+-The prefix "/usr/local" may vary at your site.
+-
+-
++.B tkinfo.
++The HTML documentation is installed as
++!!DOCDIR!!/pcb.html.
+ 
+ 
diff --git a/cad/pcb/patches/patch-example_Makefile_in b/cad/pcb/patches/patch-example_Makefile_in
new file mode 100644
index 00000000000..71e7b3046d3
--- /dev/null
+++ b/cad/pcb/patches/patch-example_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-example_Makefile_in,v 1.1.1.1 2007/01/05 16:52:21 steven Exp $
+--- example/Makefile.in.orig	Thu Jan  4 11:18:29 2007
++++ example/Makefile.in	Thu Jan  4 11:18:34 2007
+@@ -204,7 +204,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-examplesdir = $(pkgdatadir)/examples
++examplesdir = $(datadir)/examples/pcb
+ examples_DATA = ${EXAMPLES}
+ SUBDIRS = libraries
+ EXTRA_DIST = ${EXAMPLES}
diff --git a/cad/pcb/patches/patch-example_libraries_Makefile_in b/cad/pcb/patches/patch-example_libraries_Makefile_in
new file mode 100644
index 00000000000..68a110cb627
--- /dev/null
+++ b/cad/pcb/patches/patch-example_libraries_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-example_libraries_Makefile_in,v 1.1.1.1 2007/01/05 16:52:21 steven Exp $
+--- example/libraries/Makefile.in.orig	Thu Jan  4 11:23:54 2007
++++ example/libraries/Makefile.in	Thu Jan  4 11:23:57 2007
+@@ -195,7 +195,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-examplesdir = $(pkgdatadir)/examples/libraries
++examplesdir = $(datadir)/examples/pcb/libraries
+ examples_DATA = ${EXAMPLES}
+ EXTRA_DIST = ${EXAMPLES}
+ EXAMPLES = \
diff --git a/cad/pcb/patches/patch-src_fontmode_c b/cad/pcb/patches/patch-src_fontmode_c
new file mode 100644
index 00000000000..1c0417e7c32
--- /dev/null
+++ b/cad/pcb/patches/patch-src_fontmode_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_fontmode_c,v 1.1.1.1 2007/01/05 16:52:21 steven Exp $
+--- src/fontmode.c.orig	Thu Jan  4 11:35:05 2007
++++ src/fontmode.c	Thu Jan  4 11:35:09 2007
+@@ -232,6 +232,8 @@ FontSave (int argc, char **argv, int Ux,
+     }
+ 
+   SetFontInfo (font);
++  
++  return 0;
+ }
+ 
+ HID_Action fontmode_action_list[] = {
diff --git a/cad/pcb/pkg/DESCR b/cad/pcb/pkg/DESCR
new file mode 100644
index 00000000000..6a09c2a4664
--- /dev/null
+++ b/cad/pcb/pkg/DESCR
@@ -0,0 +1,6 @@
+PCB is an interactive printed circuit board editor. PCB includes a rats
+nest feature, design rule checking, and can provide industry standard
+RS-274-X (Gerber), NC drill, and centroid data (X-Y data) output for use
+in the board fabrication and assembly process. PCB offers high end
+features such as an autorouter and trace optimizer which can tremendously
+reduce layout time.
diff --git a/cad/pcb/pkg/PLIST b/cad/pcb/pkg/PLIST
new file mode 100644
index 00000000000..5465b6f2bde
--- /dev/null
+++ b/cad/pcb/pkg/PLIST
@@ -0,0 +1,189 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2007/01/05 16:52:21 steven Exp $
+bin/MergePCBPS
+bin/Merge_dimPCBPS
+bin/pcb
+bin/pcb-bin
+@info info/pcb.info
+@man man/man1/pcb.1
+share/doc/pcb/
+share/doc/pcb/pad.png
+share/doc/pcb/pcb.html
+share/doc/pcb/puller.png
+share/doc/pcb/refcard.pdf
+share/doc/pcb/thermal.png
+share/examples/pcb/
+share/examples/pcb/LED
+share/examples/pcb/LED.NET
+share/examples/pcb/LED2
+share/examples/pcb/libraries/
+share/examples/pcb/libraries/example.inc
+share/examples/pcb/libraries/example.list
+share/examples/pcb/libraries/example.m4
+share/pcb/
+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/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/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/
+share/pcb/newlib/2_pin_thru-hole_packages/
+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/
+share/pcb/newlib/analog-devices/ADC12138CIMSA
+share/pcb/newlib/burr-brown/
+share/pcb/newlib/burr-brown/OPA340_SOT23-5
+share/pcb/newlib/connectors/
+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/
+share/pcb/newlib/crystal/CTX169_oscillator
+share/pcb/newlib/cypress/
+share/pcb/newlib/electro-optics/
+share/pcb/newlib/electro-optics/IRF_optical_switch
+share/pcb/newlib/generic_SMD_packages/
+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/
+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/
+share/pcb/newlib/msp430/MSP430F1121
+share/pcb/newlib/msp430/MSP430F1121+jtag
+share/pcb/newlib/not_vetted_ingo/
+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/sockets/
+share/pcb/newlib/tests/
+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/newlib/toko/
+share/pcb/pcb-menu.res
+share/pcb/pcblib
+share/pcb/pcblib.contents
+share/pcb/qfp-ui
+share/pcb/qfp.dat
+share/pcb/tools/
+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/
+share/pcb/tutorial/tut1.pcb