diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
index d2770a6ed04e..5f2da6e2e16e 100644
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@@ -6,19 +6,22 @@
 #
 
 PORTNAME=	pcb
-PORTVERSION=	1.7
-PORTREVISION=	1
+PORTVERSION=	1.7.3
 CATEGORIES=	cad
-MASTER_SITES=	ftp://ftp.riken.go.jp/pub/Linux/plamo/Plamo-1.4.x/contrib/Electronic/sources/ \
-		ftp://sunsite.tus.ac.jp/pub/archives/linux/jp-linux/plamo/Plamo-1.4.x/contrib/Electronic/sources/
+MASTER_SITES=	http://bach.ece.jhu.edu/~haceaton/pcb/
+DISTNAME=	${PORTNAME}-wip
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	gagnon__s@videotron.ca
 COMMENT=	X11 interactive printed circuit board layout system
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		latex:${PORTSDIR}/print/teTeX
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
 USE_IMAKE=	yes
+
 MAN1=		pcb.1
 
 pre-install:
diff --git a/cad/pcb/distinfo b/cad/pcb/distinfo
index 2ab42103ea66..2a698b215a53 100644
--- a/cad/pcb/distinfo
+++ b/cad/pcb/distinfo
@@ -1 +1 @@
-MD5 (pcb-1.7.tar.gz) = 1b4ad00cb3c36ca420f3fa6c9d71a889
+MD5 (pcb-wip.tgz) = 381fe0232b0e3ca12ecd2572a3dda386
diff --git a/cad/pcb/files/patch-aa b/cad/pcb/files/patch-aa
deleted file mode 100644
index 61ab93f3a24d..000000000000
--- a/cad/pcb/files/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/set.c.orig	Thu Nov 25 01:20:02 1999
-+++ src/set.c	Thu Nov 25 01:20:12 1999
-@@ -49,7 +49,6 @@
- #include "set.h"
- 
- #include <X11/cursorfont.h>
--#include <X11/Xaw3d/Form.h>
- 
- /* ---------------------------------------------------------------------------
-  * output of cursor position
diff --git a/cad/pcb/files/patch-ab b/cad/pcb/files/patch-ab
new file mode 100644
index 000000000000..bb3a2634d591
--- /dev/null
+++ b/cad/pcb/files/patch-ab
@@ -0,0 +1,17 @@
+--- src/error.h.orig	Sun Jun  8 19:04:52 2003
++++ src/error.h	Sun Jun  8 19:06:16 2003
+@@ -37,14 +37,8 @@
+ #define	STATUS_BREAK	1
+ #define	STATUS_ERROR	-1
+ 
+-#if (!defined(__GLIBC__) || (__GLIBC__ < 2) || \
+-((__GLIBC__ == 2) && defined(__powerpc__) && (__GLIBC_MINOR__ == 0)))
+-void	Message();
+-void	MyFatal();
+-#else
+ void	Message(char *Format, ...);
+ void	MyFatal(char *Format, ...);
+-#endif
+ void	OpenErrorMessage(char *);
+ void	PopenErrorMessage(char *);
+ void	OpendirErrorMessage(char *);
diff --git a/cad/pcb/files/patch-ac b/cad/pcb/files/patch-ac
index 276138720e58..a03c804f10d2 100644
--- a/cad/pcb/files/patch-ac
+++ b/cad/pcb/files/patch-ac
@@ -1,15 +1,16 @@
---- config.h.orig	Wed Jan 28 17:28:11 1998
-+++ config.h	Wed Jan 28 17:29:04 1998
-@@ -36,7 +36,7 @@
+--- config.h.orig	Sun Jun  8 05:24:52 2003
++++ config.h	Sun Jun  8 05:26:54 2003
+@@ -36,15 +36,15 @@
   * (LIBDIR is defined by imake)
   *
   */
 -INFODIR = /usr/info
+-PCBLIBDIR = $(LIBDIR)/pcb
 +INFODIR = ${PREFIX}/info
- PCBLIBDIR = $(LIBDIR)/pcb
++PCBLIBDIR = ${PREFIX}/lib/pcb
  DEFAULTFONT = default_font
  DEFAULTLIBRARY = pcblib
-@@ -44,7 +44,7 @@
+ 
  /* ----------------------------------------------------------------------
   * the name of GNU m4 (you MUST use GNU m4)
   */
diff --git a/cad/pcb/files/patch-ae b/cad/pcb/files/patch-ae
index 4da1fba7128a..193598056dfd 100644
--- a/cad/pcb/files/patch-ae
+++ b/cad/pcb/files/patch-ae
@@ -1,5 +1,5 @@
---- src/Imakefile.orig	Thu Jan 14 02:52:36 1999
-+++ src/Imakefile	Sun Dec 10 17:17:07 2000
+--- src/Imakefile.orig	Sun Jun  8 04:21:06 2003
++++ src/Imakefile	Sun Jun  8 04:21:19 2003
 @@ -67,7 +67,7 @@
  
  depend:: parse_l.c parse_y.c
diff --git a/cad/pcb/pkg-plist b/cad/pcb/pkg-plist
index 2268878c24ef..d6c926de0415 100644
--- a/cad/pcb/pkg-plist
+++ b/cad/pcb/pkg-plist
@@ -1,47 +1,47 @@
 bin/pcb
 lib/X11/app-defaults/Pcb
-lib/X11/pcb/default_font
-lib/X11/pcb/pcblib
-lib/X11/pcb/pcblib.contents
-lib/X11/pcb/CreateLibrary.sh
-lib/X11/pcb/CreateLibraryContents.sh
-lib/X11/pcb/ListLibraryContents.sh
-lib/X11/pcb/QueryLibrary.sh
-lib/X11/pcb/m4/TTL_74xx_DIL.m4
-lib/X11/pcb/m4/crystal.m4
-lib/X11/pcb/m4/connector.m4
-lib/X11/pcb/m4/generic.m4
-lib/X11/pcb/m4/linear.m4
-lib/X11/pcb/m4/logic.m4
-lib/X11/pcb/m4/lsi.m4
-lib/X11/pcb/m4/memory.m4
-lib/X11/pcb/m4/optical.m4
-lib/X11/pcb/m4/resistor_array.m4
-lib/X11/pcb/m4/resistor_0.25W.m4
-lib/X11/pcb/m4/texas_inst_amplifier.m4
-lib/X11/pcb/m4/texas_inst_voltage_reg.m4
-lib/X11/pcb/m4/transistor.m4
-lib/X11/pcb/m4/TTL_74xx_DIL.list
-lib/X11/pcb/m4/crystal.list
-lib/X11/pcb/m4/connector.list
-lib/X11/pcb/m4/generic.list
-lib/X11/pcb/m4/linear.list
-lib/X11/pcb/m4/logic.list
-lib/X11/pcb/m4/lsi.list
-lib/X11/pcb/m4/memory.list
-lib/X11/pcb/m4/optical.list
-lib/X11/pcb/m4/common.m4
-lib/X11/pcb/m4/resistor_array.list
-lib/X11/pcb/m4/resistor_0.25W.list
-lib/X11/pcb/m4/texas_inst_amplifier.list
-lib/X11/pcb/m4/texas_inst_voltage_reg.list
-lib/X11/pcb/m4/transistor.list
-lib/X11/pcb/m4/connector.inc
-lib/X11/pcb/m4/dil.inc
-lib/X11/pcb/m4/misc.inc
-lib/X11/pcb/m4/qfp.inc
-lib/X11/pcb/m4/plcc.inc
-lib/X11/pcb/m4/to.inc
+lib/pcb/default_font
+lib/pcb/pcblib
+lib/pcb/pcblib.contents
+lib/pcb/CreateLibrary.sh
+lib/pcb/CreateLibraryContents.sh
+lib/pcb/ListLibraryContents.sh
+lib/pcb/QueryLibrary.sh
+lib/pcb/m4/TTL_74xx_DIL.m4
+lib/pcb/m4/crystal.m4
+lib/pcb/m4/connector.m4
+lib/pcb/m4/generic.m4
+lib/pcb/m4/linear.m4
+lib/pcb/m4/logic.m4
+lib/pcb/m4/lsi.m4
+lib/pcb/m4/memory.m4
+lib/pcb/m4/optical.m4
+lib/pcb/m4/resistor_array.m4
+lib/pcb/m4/resistor_0.25W.m4
+lib/pcb/m4/texas_inst_amplifier.m4
+lib/pcb/m4/texas_inst_voltage_reg.m4
+lib/pcb/m4/transistor.m4
+lib/pcb/m4/TTL_74xx_DIL.list
+lib/pcb/m4/crystal.list
+lib/pcb/m4/connector.list
+lib/pcb/m4/generic.list
+lib/pcb/m4/linear.list
+lib/pcb/m4/logic.list
+lib/pcb/m4/lsi.list
+lib/pcb/m4/memory.list
+lib/pcb/m4/optical.list
+lib/pcb/m4/common.m4
+lib/pcb/m4/resistor_array.list
+lib/pcb/m4/resistor_0.25W.list
+lib/pcb/m4/texas_inst_amplifier.list
+lib/pcb/m4/texas_inst_voltage_reg.list
+lib/pcb/m4/transistor.list
+lib/pcb/m4/connector.inc
+lib/pcb/m4/dil.inc
+lib/pcb/m4/misc.inc
+lib/pcb/m4/qfp.inc
+lib/pcb/m4/plcc.inc
+lib/pcb/m4/to.inc
 @unexec install-info --delete %D/info/pcb.info %D/info/dir
 info/pcb.info
 @exec install-info --section="Utilities" --entry="* PCB: (pcb).		Interactive printed circuit board layout system for X11" %D/info/pcb.info %D/info/dir
@@ -50,5 +50,5 @@ share/doc/pcb/pcb.html
 share/doc/pcb/pcb.ps
 share/doc/pcb/refcard.ps
 @dirrm share/doc/pcb
-@dirrm lib/X11/pcb/m4
-@dirrm lib/X11/pcb
+@dirrm lib/pcb/m4
+@dirrm lib/pcb