26 files changed, 417 insertions, 174 deletions
diff --git a/cad/geda-docs/Makefile b/cad/geda-docs/Makefile
index 93640ef29cb..7ac644b27da 100644
--- a/cad/geda-docs/Makefile
+++ b/cad/geda-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/10/14 09:59:29 rh Exp $
+# $NetBSD: Makefile,v 1.8 2002/12/13 05:19:45 dmcmahill Exp $
 #
 
 DISTNAME=		geda-docs-${PKGVERSION}
@@ -15,19 +15,9 @@ COMMENT=		HTML documentation for gEDA
 CONFLICTS+=		gEDA<19991011
 
 DIST_SUBDIR=		geda
-PKGVERSION=		20020209
+PKGVERSION=		20021103
 
-NO_PATCH=		YES
-NO_CONFIGURE=		YES
-NO_BUILD=		YES
+GNU_CONFIGURE=		YES
 USE_X11BASE=		YES
 
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gEDA
-.for file in README attributes.txt hooks_and_scheme.txt keymapping.tex \
-symbols.html README.keymapping fileformats.html keymapping.html \
-netattrib.txt
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/gEDA
-.endfor
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/geda-docs/PLIST b/cad/geda-docs/PLIST
index 29b095ba433..b6465a6bd6e 100644
--- a/cad/geda-docs/PLIST
+++ b/cad/geda-docs/PLIST
@@ -1,11 +1,97 @@
-@comment $NetBSD: PLIST,v 1.2 2002/05/18 14:25:48 dmcmahill Exp $
-share/doc/gEDA/README
-share/doc/gEDA/README.keymapping
-share/doc/gEDA/attributes.txt
-share/doc/gEDA/fileformats.html
-share/doc/gEDA/hooks_and_scheme.txt
-share/doc/gEDA/keymapping.html
-share/doc/gEDA/keymapping.tex
-share/doc/gEDA/netattrib.txt
-share/doc/gEDA/symbols.html
-@dirrm share/doc/gEDA
+@comment $NetBSD: PLIST,v 1.3 2002/12/13 05:19:45 dmcmahill Exp $
+share/gEDA/documentation/attributes/attributes.css
+share/gEDA/documentation/attributes/attributes.dvi
+share/gEDA/documentation/attributes/attributes.html
+share/gEDA/documentation/attributes/attributes.pdf
+share/gEDA/documentation/attributes/attributes.ps
+share/gEDA/documentation/attributes/contents.png
+share/gEDA/documentation/attributes/index.html
+share/gEDA/documentation/attributes/internals.pl
+share/gEDA/documentation/attributes/labels.pl
+share/gEDA/documentation/attributes/next.png
+share/gEDA/documentation/attributes/next_g.png
+share/gEDA/documentation/attributes/node1.html
+share/gEDA/documentation/attributes/node10.html
+share/gEDA/documentation/attributes/node11.html
+share/gEDA/documentation/attributes/node12.html
+share/gEDA/documentation/attributes/node13.html
+share/gEDA/documentation/attributes/node14.html
+share/gEDA/documentation/attributes/node15.html
+share/gEDA/documentation/attributes/node16.html
+share/gEDA/documentation/attributes/node17.html
+share/gEDA/documentation/attributes/node18.html
+share/gEDA/documentation/attributes/node19.html
+share/gEDA/documentation/attributes/node2.html
+share/gEDA/documentation/attributes/node20.html
+share/gEDA/documentation/attributes/node21.html
+share/gEDA/documentation/attributes/node22.html
+share/gEDA/documentation/attributes/node23.html
+share/gEDA/documentation/attributes/node24.html
+share/gEDA/documentation/attributes/node25.html
+share/gEDA/documentation/attributes/node26.html
+share/gEDA/documentation/attributes/node27.html
+share/gEDA/documentation/attributes/node28.html
+share/gEDA/documentation/attributes/node29.html
+share/gEDA/documentation/attributes/node3.html
+share/gEDA/documentation/attributes/node30.html
+share/gEDA/documentation/attributes/node31.html
+share/gEDA/documentation/attributes/node32.html
+share/gEDA/documentation/attributes/node4.html
+share/gEDA/documentation/attributes/node5.html
+share/gEDA/documentation/attributes/node6.html
+share/gEDA/documentation/attributes/node7.html
+share/gEDA/documentation/attributes/node8.html
+share/gEDA/documentation/attributes/node9.html
+share/gEDA/documentation/attributes/prev.png
+share/gEDA/documentation/attributes/prev_g.png
+share/gEDA/documentation/attributes/up.png
+share/gEDA/documentation/attributes/up_g.png
+share/gEDA/documentation/fileformats/fileformats.html
+share/gEDA/documentation/gedadocs.html
+share/gEDA/documentation/gnetlist/gnetlist.txt
+share/gEDA/documentation/gschem/gschem.txt
+share/gEDA/documentation/hooks/hooks_and_scheme.txt
+share/gEDA/documentation/keymapping/keymapping.html
+share/gEDA/documentation/netattrib/netattrib.txt
+share/gEDA/documentation/symbols/contents.png
+share/gEDA/documentation/symbols/images.aux
+share/gEDA/documentation/symbols/images.log
+share/gEDA/documentation/symbols/images.pl
+share/gEDA/documentation/symbols/images.tex
+share/gEDA/documentation/symbols/img1.png
+share/gEDA/documentation/symbols/img2.png
+share/gEDA/documentation/symbols/index.html
+share/gEDA/documentation/symbols/labels.pl
+share/gEDA/documentation/symbols/next.png
+share/gEDA/documentation/symbols/next_g.png
+share/gEDA/documentation/symbols/node1.html
+share/gEDA/documentation/symbols/node10.html
+share/gEDA/documentation/symbols/node11.html
+share/gEDA/documentation/symbols/node12.html
+share/gEDA/documentation/symbols/node13.html
+share/gEDA/documentation/symbols/node14.html
+share/gEDA/documentation/symbols/node2.html
+share/gEDA/documentation/symbols/node3.html
+share/gEDA/documentation/symbols/node4.html
+share/gEDA/documentation/symbols/node5.html
+share/gEDA/documentation/symbols/node6.html
+share/gEDA/documentation/symbols/node7.html
+share/gEDA/documentation/symbols/node8.html
+share/gEDA/documentation/symbols/node9.html
+share/gEDA/documentation/symbols/prev.png
+share/gEDA/documentation/symbols/prev_g.png
+share/gEDA/documentation/symbols/symbols.css
+share/gEDA/documentation/symbols/symbols.dvi
+share/gEDA/documentation/symbols/symbols.html
+share/gEDA/documentation/symbols/symbols.pdf
+share/gEDA/documentation/symbols/symbols.ps
+share/gEDA/documentation/symbols/up.png
+share/gEDA/documentation/symbols/up_g.png
+@dirrm share/gEDA/documentation/symbols
+@dirrm share/gEDA/documentation/netattrib
+@dirrm share/gEDA/documentation/keymapping
+@dirrm share/gEDA/documentation/hooks
+@dirrm share/gEDA/documentation/gschem
+@dirrm share/gEDA/documentation/gnetlist
+@dirrm share/gEDA/documentation/fileformats
+@dirrm share/gEDA/documentation/attributes
diff --git a/cad/geda-docs/distinfo b/cad/geda-docs/distinfo
index 546114305c0..7a84a99cc16 100644
--- a/cad/geda-docs/distinfo
+++ b/cad/geda-docs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/05/18 14:25:48 dmcmahill Exp $
+$NetBSD: distinfo,v 1.5 2002/12/13 05:19:45 dmcmahill Exp $
 
-SHA1 (geda/geda-docs-20020209.tar.gz) = e6d909bcbb6f2d3f6067b15aad18cb1eca1201c4
-Size (geda/geda-docs-20020209.tar.gz) = 18938 bytes
+SHA1 (geda/geda-docs-20021103.tar.gz) = 2d0c2552ce76e0129e00cbee71ac721247958e24
+Size (geda/geda-docs-20021103.tar.gz) = 378007 bytes
diff --git a/cad/geda-symbols/Makefile b/cad/geda-symbols/Makefile
index d4549940541..c00b5a248dd 100644
--- a/cad/geda-symbols/Makefile
+++ b/cad/geda-symbols/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/10/14 09:59:30 rh Exp $
+# $NetBSD: Makefile,v 1.8 2002/12/13 05:19:46 dmcmahill Exp $
 #
 
 DISTNAME=	geda-symbols-${PKGVERSION}
@@ -15,9 +15,10 @@ COMMENT=	Library of symbols for gEDA
 CONFLICTS+=	gEDA<19991011
 
 DIST_SUBDIR=	geda
-PKGVERSION=	20020414
+PKGVERSION=	20021103
 
 GNU_CONFIGURE=	YES
 USE_X11BASE=	YES
+USE_GMAKE=	YES
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/geda-symbols/PLIST b/cad/geda-symbols/PLIST
index 77e27f60b91..f3e87d04fe1 100644
--- a/cad/geda-symbols/PLIST
+++ b/cad/geda-symbols/PLIST
@@ -1,11 +1,16 @@
-@comment $NetBSD: PLIST,v 1.5 2002/06/26 10:29:34 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/12/13 05:19:46 dmcmahill Exp $
 bin/gesym-config
+share/gEDA/documentation/nc.pdf
 share/gEDA/sym/4000/4000-1.sym
+share/gEDA/sym/4000/4000-2.sym
 share/gEDA/sym/4000/4001-1.sym
 share/gEDA/sym/4000/4002-1.sym
+share/gEDA/sym/4000/4002-2.sym
 share/gEDA/sym/4000/4006-1.sym
+share/gEDA/sym/4000/4006-2.sym
 share/gEDA/sym/4000/4007-1.sym
 share/gEDA/sym/4000/4008-1.sym
+share/gEDA/sym/4000/4008-2.sym
 share/gEDA/sym/4000/4009-1.sym
 share/gEDA/sym/4000/4010-1.sym
 share/gEDA/sym/4000/40100-1.sym
@@ -26,20 +31,25 @@ share/gEDA/sym/4000/40117-1.sym
 share/gEDA/sym/4000/4012-1.sym
 share/gEDA/sym/4000/4013-1.sym
 share/gEDA/sym/4000/4014-1.sym
+share/gEDA/sym/4000/4014-2.sym
 share/gEDA/sym/4000/40147-1.sym
 share/gEDA/sym/4000/4015-1.sym
 share/gEDA/sym/4000/4016-1.sym
+share/gEDA/sym/4000/4016-2.sym
 share/gEDA/sym/4000/40160-1.sym
 share/gEDA/sym/4000/40161-1.sym
 share/gEDA/sym/4000/40162-1.sym
 share/gEDA/sym/4000/40163-1.sym
 share/gEDA/sym/4000/4017-1.sym
+share/gEDA/sym/4000/4017-2.sym
 share/gEDA/sym/4000/40174-1.sym
 share/gEDA/sym/4000/40175-1.sym
 share/gEDA/sym/4000/4018-1.sym
+share/gEDA/sym/4000/4018-2.sym
 share/gEDA/sym/4000/40181-1.sym
 share/gEDA/sym/4000/40182-1.sym
 share/gEDA/sym/4000/4019-1.sym
+share/gEDA/sym/4000/4019-2.sym
 share/gEDA/sym/4000/40192-1.sym
 share/gEDA/sym/4000/40193-1.sym
 share/gEDA/sym/4000/40194-1.sym
@@ -48,7 +58,9 @@ share/gEDA/sym/4000/4020-1.sym
 share/gEDA/sym/4000/40208-1.sym
 share/gEDA/sym/4000/4021-1.sym
 share/gEDA/sym/4000/4021-2.sym
+share/gEDA/sym/4000/4021-3.sym
 share/gEDA/sym/4000/4022-1.sym
+share/gEDA/sym/4000/4022-2.sym
 share/gEDA/sym/4000/4023-1.sym
 share/gEDA/sym/4000/4024-1.sym
 share/gEDA/sym/4000/40240-1.sym
@@ -59,6 +71,7 @@ share/gEDA/sym/4000/40257-1.sym
 share/gEDA/sym/4000/4026-1.sym
 share/gEDA/sym/4000/4027-1.sym
 share/gEDA/sym/4000/4028-1.sym
+share/gEDA/sym/4000/4028-2.sym
 share/gEDA/sym/4000/4029-1.sym
 share/gEDA/sym/4000/4030-1.sym
 share/gEDA/sym/4000/4031-1.sym
@@ -192,6 +205,7 @@ share/gEDA/sym/74/74123-1.sym
 share/gEDA/sym/74/74123-2.sym
 share/gEDA/sym/74/74123-3.sym
 share/gEDA/sym/74/74124-1.sym
+share/gEDA/sym/74/74124-2.sym
 share/gEDA/sym/74/74125-1.sym
 share/gEDA/sym/74/74126-1.sym
 share/gEDA/sym/74/74131-1.sym
@@ -259,6 +273,8 @@ share/gEDA/sym/74/74244-2.sym
 share/gEDA/sym/74/74245-1.sym
 share/gEDA/sym/74/74257-1.sym
 share/gEDA/sym/74/74265-1.sym
+share/gEDA/sym/74/74265-2.sym
+share/gEDA/sym/74/74266-1.sym
 share/gEDA/sym/74/7427-1.sym
 share/gEDA/sym/74/74273-1.sym
 share/gEDA/sym/74/74280-1.sym
@@ -280,6 +296,7 @@ share/gEDA/sym/74/7447-1.sym
 share/gEDA/sym/74/7448-1.sym
 share/gEDA/sym/74/7451-1.sym
 share/gEDA/sym/74/74520-1.sym
+share/gEDA/sym/74/74520-2.sym
 share/gEDA/sym/74/7454-1.sym
 share/gEDA/sym/74/74541-1.sym
 share/gEDA/sym/74/7455-1.sym
@@ -287,6 +304,7 @@ share/gEDA/sym/74/7456-1.sym
 share/gEDA/sym/74/7457-1.sym
 share/gEDA/sym/74/74573-1.sym
 share/gEDA/sym/74/74574-1.sym
+share/gEDA/sym/74/74595-1.sym
 share/gEDA/sym/74/74673A-1.sym
 share/gEDA/sym/74/74684-1.sym
 share/gEDA/sym/74/74688-1.sym
@@ -305,8 +323,10 @@ share/gEDA/sym/74/7491-1.sym
 share/gEDA/sym/74/7492-1.sym
 share/gEDA/sym/74/7493-1.sym
 share/gEDA/sym/74/7495-1.sym
+share/gEDA/sym/74/7495-2.sym
 share/gEDA/sym/74/7496-1.sym
 share/gEDA/sym/74/7497-1.sym
+share/gEDA/sym/74/7497-2.sym
 share/gEDA/sym/74/74HCT01-1.sym
 share/gEDA/sym/74/74HCT03-1.sym
 share/gEDA/sym/74/74HCT05-1.sym
@@ -314,6 +334,8 @@ share/gEDA/sym/74/74HCT08-1.sym
 share/gEDA/sym/74/74HCT245-1.sym
 share/gEDA/sym/74/74HCT4094-1.sym
 share/gEDA/sym/74/74HCT541-1.sym
+share/gEDA/sym/74/9602-1.sym
+share/gEDA/sym/74/9602-2.sym
 share/gEDA/sym/IEC417/ac-ac.sym
 share/gEDA/sym/IEC417/ac-dc.sym
 share/gEDA/sym/IEC417/adc.sym
@@ -436,6 +458,7 @@ share/gEDA/sym/analog/coil-1.sym
 share/gEDA/sym/analog/coil-2.sym
 share/gEDA/sym/analog/crystal-1.sym
 share/gEDA/sym/analog/current-1.sym
+share/gEDA/sym/analog/dual-opamp-1.sym
 share/gEDA/sym/analog/fuse-1.sym
 share/gEDA/sym/analog/glow-lamp-1.sym
 share/gEDA/sym/analog/inamp-1.sym
@@ -480,6 +503,7 @@ share/gEDA/sym/analog/resistorpack9-1.sym
 share/gEDA/sym/analog/rpack-1.sym
 share/gEDA/sym/analog/speaker-1.sym
 share/gEDA/sym/analog/speaker-2.sym
+share/gEDA/sym/analog/transformer-1.sym
 share/gEDA/sym/analog/txo-1.sym
 share/gEDA/sym/analog/voltage-1.sym
 share/gEDA/sym/analog/voltage-2.sym
@@ -500,7 +524,9 @@ share/gEDA/sym/connector/DIN41617C13-1.sym
 share/gEDA/sym/connector/DIN41617C15-1.sym
 share/gEDA/sym/connector/DIN41617C31-1.sym
 share/gEDA/sym/connector/MCX-1.sym
+share/gEDA/sym/connector/aui-1.sym
 share/gEDA/sym/connector/connector10-1.sym
+share/gEDA/sym/connector/connector12-1.sym
 share/gEDA/sym/connector/connector15-1.sym
 share/gEDA/sym/connector/connector16-1.sym
 share/gEDA/sym/connector/connector19-1.sym
@@ -530,6 +556,7 @@ share/gEDA/sym/connector/header40-2.sym
 share/gEDA/sym/connector/header50-2.sym
 share/gEDA/sym/connector/jumper-1.sym
 share/gEDA/sym/connector/mains-plug-1.sym
+share/gEDA/sym/connector/mains-plug-2.sym
 share/gEDA/sym/connector/pwrjack-1.sym
 share/gEDA/sym/connector/rs232-idc10.sym
 share/gEDA/sym/dec/DC003C-1.sym
@@ -603,8 +630,8 @@ share/gEDA/sym/font/W.sym
 share/gEDA/sym/font/X.sym
 share/gEDA/sym/font/Y.sym
 share/gEDA/sym/font/Z.sym
-share/gEDA/sym/font/a-diaeresis.sym
 share/gEDA/sym/font/a-ring.sym
+share/gEDA/sym/font/a_-diaeresis.sym
 share/gEDA/sym/font/a_.sym
 share/gEDA/sym/font/amper.sym
 share/gEDA/sym/font/apost.sym
@@ -638,7 +665,7 @@ share/gEDA/sym/font/m_.sym
 share/gEDA/sym/font/minus.sym
 share/gEDA/sym/font/more.sym
 share/gEDA/sym/font/n_.sym
-share/gEDA/sym/font/o-diaeresis.sym
+share/gEDA/sym/font/o_-diaeresis.sym
 share/gEDA/sym/font/o_.sym
 share/gEDA/sym/font/p_.sym
 share/gEDA/sym/font/percent.sym
@@ -666,11 +693,6 @@ share/gEDA/sym/font/w_.sym
 share/gEDA/sym/font/x_.sym
 share/gEDA/sym/font/y_.sym
 share/gEDA/sym/font/z_.sym
-share/gEDA/sym/foot/cap.foot
-share/gEDA/sym/foot/dip300_18.foot
-share/gEDA/sym/foot/led.foot
-share/gEDA/sym/foot/led_7seg.foot
-share/gEDA/sym/foot/resistor.foot
 share/gEDA/sym/idt/idt7204-1.sym
 share/gEDA/sym/io/in-1.sym
 share/gEDA/sym/io/input-1.sym
@@ -688,6 +710,7 @@ share/gEDA/sym/linear/lm2822m-1.sym
 share/gEDA/sym/linear/lm2902-1.sym
 share/gEDA/sym/linear/lm2941-1.sym
 share/gEDA/sym/linear/lm311-1.sym
+share/gEDA/sym/linear/lm317-1.sym
 share/gEDA/sym/linear/lm324-1.sym
 share/gEDA/sym/linear/lm339-1.sym
 share/gEDA/sym/linear/lm358-1.sym
@@ -697,8 +720,6 @@ share/gEDA/sym/linear/lm628n-6.sym
 share/gEDA/sym/linear/lm741-1.sym
 share/gEDA/sym/linear/lm75-1.sym
 share/gEDA/sym/linear/lm7805-1.sym
-share/gEDA/sym/linear/lm7805-2.sym
-share/gEDA/sym/linear/lm7805c-1.sym
 share/gEDA/sym/linear/lm7806-1.sym
 share/gEDA/sym/linear/lm7810-1.sym
 share/gEDA/sym/linear/lm7812-1.sym
@@ -706,18 +727,14 @@ share/gEDA/sym/linear/lm7815-1.sym
 share/gEDA/sym/linear/lm7818-1.sym
 share/gEDA/sym/linear/lm7824-1.sym
 share/gEDA/sym/linear/lm7885-1.sym
-share/gEDA/sym/linear/lm78l05-1.sym
-share/gEDA/sym/linear/lm78l05ac-1.sym
-share/gEDA/sym/linear/lm78l05c-1.sym
-share/gEDA/sym/linear/lm78m05-1.sym
-share/gEDA/sym/linear/lm7905-1.sym
-share/gEDA/sym/linear/lm79m05-1.sym
 share/gEDA/sym/linear/lt1108-1.sym
 share/gEDA/sym/linear/lt1181-1.sym
-share/gEDA/sym/linear/lt1308.sym
+share/gEDA/sym/linear/lt1308-1.sym
 share/gEDA/sym/linear/lt1374cs8.sym
 share/gEDA/sym/linear/lt1376-5.sym
 share/gEDA/sym/linear/lt1761sd-1.sym
+share/gEDA/sym/linear/lt1782-1.sym
+share/gEDA/sym/linear/ltc1799-1.sym
 share/gEDA/sym/linear/ltc2400-1.sym
 share/gEDA/sym/linear/volt_reg_adj-1.sym
 share/gEDA/sym/maxim/adc0820-1.sym
@@ -729,6 +746,7 @@ share/gEDA/sym/maxim/max101A-1.sym
 share/gEDA/sym/maxim/max1055-1.sym
 share/gEDA/sym/maxim/max1114-1.sym
 share/gEDA/sym/maxim/max135-1.sym
+share/gEDA/sym/maxim/max1407-1.sym
 share/gEDA/sym/maxim/max147-1.sym
 share/gEDA/sym/maxim/max1480A-1.sym
 share/gEDA/sym/maxim/max1482-1.sym
@@ -744,6 +762,7 @@ share/gEDA/sym/maxim/max202-1.sym
 share/gEDA/sym/maxim/max214-1.sym
 share/gEDA/sym/maxim/max218-1.sym
 share/gEDA/sym/maxim/max232-1.sym
+share/gEDA/sym/maxim/max232-2.sym
 share/gEDA/sym/maxim/max233-1.sym
 share/gEDA/sym/maxim/max233-2.sym
 share/gEDA/sym/maxim/max237-1.sym
@@ -754,14 +773,18 @@ share/gEDA/sym/maxim/max3491-1.sym
 share/gEDA/sym/maxim/max378-1.sym
 share/gEDA/sym/maxim/max400-1.sym
 share/gEDA/sym/maxim/max4005-1.sym
+share/gEDA/sym/maxim/max4106-1.sym
+share/gEDA/sym/maxim/max4107-1.sym
 share/gEDA/sym/maxim/max436-1.sym
 share/gEDA/sym/maxim/max4636-1.sym
 share/gEDA/sym/maxim/max4662-2.sym
 share/gEDA/sym/maxim/max478-1.sym
 share/gEDA/sym/maxim/max488-1.sym
+share/gEDA/sym/maxim/max489-1.sym
 share/gEDA/sym/maxim/max492-1.sym
 share/gEDA/sym/maxim/max531-1.sym
 share/gEDA/sym/maxim/max535-1.sym
+share/gEDA/sym/maxim/max6018-1.sym
 share/gEDA/sym/maxim/max6314-1.sym
 share/gEDA/sym/maxim/max663-1.sym
 share/gEDA/sym/maxim/max664-1.sym
@@ -785,6 +808,7 @@ share/gEDA/sym/memory/am27S13D-1.sym
 share/gEDA/sym/memory/am9128-1.sym
 share/gEDA/sym/micro/6821-1.sym
 share/gEDA/sym/micro/8031.sym
+share/gEDA/sym/micro/8052basic-1.sym
 share/gEDA/sym/micro/8086-1.sym
 share/gEDA/sym/micro/8088-1.sym
 share/gEDA/sym/micro/8254-1.sym
@@ -815,18 +839,34 @@ share/gEDA/sym/micro/ATmega161_DIP.sym
 share/gEDA/sym/micro/ATmega161_TQFP.sym
 share/gEDA/sym/micro/ATmega163_DIP.sym
 share/gEDA/sym/micro/ATmega163_TQFP.sym
+share/gEDA/sym/micro/ATmega323-1.sym
 share/gEDA/sym/micro/ATtiny11.sym
 share/gEDA/sym/micro/ATtiny12.sym
 share/gEDA/sym/micro/ATtiny28_DIP.sym
 share/gEDA/sym/micro/ATtiny28_TQFP.sym
+share/gEDA/sym/micro/DS80C310-1.sym
 share/gEDA/sym/micro/DS80C310.sym
+share/gEDA/sym/micro/DS80C320-1.sym
 share/gEDA/sym/micro/DS80C320.sym
+share/gEDA/sym/micro/MSP430x11x1.sym
+share/gEDA/sym/micro/MSP430x11x2.sym
+share/gEDA/sym/micro/MSP430x12x.sym
+share/gEDA/sym/micro/MSP430x12x2.sym
+share/gEDA/sym/micro/MSP430x13-4x.sym
+share/gEDA/sym/micro/MSP430x15-6x.sym
+share/gEDA/sym/micro/MSP430x41x.sym
+share/gEDA/sym/micro/MSP430x43x.sym
+share/gEDA/sym/micro/MSP430x44x.sym
+share/gEDA/sym/micro/basicstamp-1.sym
 share/gEDA/sym/micro/mc68hc05j1a-1.sym
 share/gEDA/sym/micro/mc68hc811e2fn-1.sym
 share/gEDA/sym/micro/mc68hc812a4-1.sym
 share/gEDA/sym/micro/mc68hc912b32-1.sym
 share/gEDA/sym/micro/pic16C74A-1.sym
 share/gEDA/sym/micro/pic16C84.sym
+share/gEDA/sym/micro/pic16F876-1.sym
+share/gEDA/sym/micro/pic16F877-1.sym
+share/gEDA/sym/micro/pic16F877A-1.sym
 share/gEDA/sym/micro/pic16c505-1.sym
 share/gEDA/sym/micro/pic16c5x-1.sym
 share/gEDA/sym/micro/sx28ac-1.sym
@@ -847,13 +887,24 @@ share/gEDA/sym/misc/PCM2702E-1.sym
 share/gEDA/sym/misc/SAB80C537-1.sym
 share/gEDA/sym/misc/TC5516AP-1.sym
 share/gEDA/sym/misc/UAA170-1.sym
+share/gEDA/sym/misc/arfx1229-1.sym
+share/gEDA/sym/misc/busripper-1.sym
+share/gEDA/sym/misc/busripper-2.sym
 share/gEDA/sym/misc/dac08sm-1.sym
 share/gEDA/sym/misc/decon-1.sym
 share/gEDA/sym/misc/hole-1.sym
 share/gEDA/sym/misc/icl7660-1.sym
 share/gEDA/sym/misc/include-1.sym
+share/gEDA/sym/misc/input-orcad-1.sym
+share/gEDA/sym/misc/interpage_bidir-1.sym
+share/gEDA/sym/misc/interpage_from-1.sym
+share/gEDA/sym/misc/interpage_to-1.sym
 share/gEDA/sym/misc/mc1496-1.sym
 share/gEDA/sym/misc/mt8870-1.sym
+share/gEDA/sym/misc/nc-bottom-1.sym
+share/gEDA/sym/misc/nc-left-1.sym
+share/gEDA/sym/misc/nc-right-1.sym
+share/gEDA/sym/misc/nc-top-1.sym
 share/gEDA/sym/misc/osc-1.sym
 share/gEDA/sym/misc/si9200-1.sym
 share/gEDA/sym/misc/tl16c554afn-1.sym
@@ -932,8 +983,10 @@ share/gEDA/sym/spice/aop-spice-1.sym
 share/gEDA/sym/spice/cccs-1.sym
 share/gEDA/sym/spice/ccvs-1.sym
 share/gEDA/sym/spice/nullor-1.sym
+share/gEDA/sym/spice/tline.sym
 share/gEDA/sym/spice/vccs-1.sym
 share/gEDA/sym/spice/vcvs-1.sym
+share/gEDA/sym/spice/wline-1x.sym
 share/gEDA/sym/supervisor/adm707.sym
 share/gEDA/sym/switch/relay-1.sym
 share/gEDA/sym/switch/ssrelay-spdt-lcc110-1.sym
@@ -951,6 +1004,7 @@ share/gEDA/sym/switch/switch-pushbutton-nc-1.sym
 share/gEDA/sym/switch/switch-pushbutton-nc-2.sym
 share/gEDA/sym/switch/switch-pushbutton-no-1.sym
 share/gEDA/sym/switch/switch-pushbutton-spdt-1.sym
+share/gEDA/sym/switch/switch-spdt-1.sym
 share/gEDA/sym/switch/switch-spst-1.sym
 share/gEDA/sym/titleblock/cvstitleblock-1.sym
 share/gEDA/sym/titleblock/title-A.sym
@@ -963,6 +1017,16 @@ share/gEDA/sym/titleblock/title-B.sym
 share/gEDA/sym/titleblock/title-C.sym
 share/gEDA/sym/titleblock/title-D.sym
 share/gEDA/sym/titleblock/title-E.sym
+share/gEDA/sym/titleblock/title-bordered-A.sym
+share/gEDA/sym/titleblock/title-bordered-A0.sym
+share/gEDA/sym/titleblock/title-bordered-A1.sym
+share/gEDA/sym/titleblock/title-bordered-A2.sym
+share/gEDA/sym/titleblock/title-bordered-A3.sym
+share/gEDA/sym/titleblock/title-bordered-A4.sym
+share/gEDA/sym/titleblock/title-bordered-B.sym
+share/gEDA/sym/titleblock/title-bordered-C.sym
+share/gEDA/sym/titleblock/title-bordered-D.sym
+share/gEDA/sym/titleblock/title-bordered-E.sym
 share/gEDA/sym/transistor/2N3055-1.sym
 share/gEDA/sym/transistor/2N3904-1.sym
 share/gEDA/sym/transistor/2N5245-1.sym
@@ -1170,7 +1234,6 @@ share/gEDA/system-commonrc
 @dirrm share/gEDA/sym/lattice
 @dirrm share/gEDA/sym/io
 @dirrm share/gEDA/sym/idt
-@dirrm share/gEDA/sym/foot
 @dirrm share/gEDA/sym/font
 @dirrm share/gEDA/sym/ecl
 @dirrm share/gEDA/sym/diode
@@ -1183,4 +1246,5 @@ share/gEDA/system-commonrc
 @dirrm share/gEDA/sym/74
 @dirrm share/gEDA/sym/4000
 @dirrm share/gEDA/sym
+@dirrm share/gEDA/documentation
 @dirrm share/gEDA
diff --git a/cad/geda-symbols/distinfo b/cad/geda-symbols/distinfo
index 47ed11d52ab..f6613299e3c 100644
--- a/cad/geda-symbols/distinfo
+++ b/cad/geda-symbols/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.4 2002/05/18 18:08:40 dmcmahill Exp $
+$NetBSD: distinfo,v 1.5 2002/12/13 05:19:46 dmcmahill Exp $
 
-SHA1 (geda/geda-symbols-20020414.tar.gz) = 029358a9eef40f8be588b2d0ac5ccf44bd2e8d1d
-Size (geda/geda-symbols-20020414.tar.gz) = 360821 bytes
+SHA1 (geda/geda-symbols-20021103.tar.gz) = 6970de8dea67a7ea3dd22aef5c5f085d9d1e01fe
+Size (geda/geda-symbols-20021103.tar.gz) = 453674 bytes
+SHA1 (patch-aa) = 142e5eb02bdf094d038133d1b173c5a4d2533e60
+SHA1 (patch-ab) = d21a03527a02c99a9b70e1cd1ce26ba87e65f29d
diff --git a/cad/geda-symbols/patches/patch-aa b/cad/geda-symbols/patches/patch-aa
new file mode 100644
index 00000000000..5577a7689e6
--- /dev/null
+++ b/cad/geda-symbols/patches/patch-aa
@@ -0,0 +1,36 @@
+$NetBSD: patch-aa,v 1.1 2002/12/13 05:19:47 dmcmahill Exp $
+
+--- documentation/Makefile.am.orig	Sun Nov  3 22:03:36 2002
++++ documentation/Makefile.am
+@@ -9,7 +9,7 @@ EXTRA_DIST = nc.doc geda.fig
+ #
+ %.pic: %.fig
+ 	@echo "Creating pic (using fig2dev)"
+-	@if which fig2dev >/dev/null 2>/dev/null; then           \
++	@if ! which fig2dev >/dev/null 2>/dev/null; then           \
+ 		fig2dev -L pic $*.fig >$*.pic		       ;\
+ 	else                                                    \
+ 		echo "** Did not find fig2dev **"              ;\
+@@ -20,19 +20,19 @@ EXTRA_DIST = nc.doc geda.fig
+ %.ps: %.doc
+ 	@echo "Creating ps (using groff)"
+ 	@rm -rf $*.tmp
+-	@if which groff >/dev/null 2>/dev/null; then              \
++	@if ! which groff >/dev/null 2>/dev/null; then              \
+ 		groff -t -sp -ms $*.doc >$*.tmp		        ;\
+ 	else						         \
+ 		echo "** Did not find groff **"                 ;\
+ 		echo "Some Documentation might not be correct!" ;\
+-		touch $*.ps                                     ;\
++		touch $*.tmp                                     ;\
+ 	fi
+ 	@mv -f $*.tmp $*.ps
+ 
+ %.pdf: %.ps
+ 	@echo "Creating pdf (using ps2pdf)"
+ 	@rm -rf $*.pdf
+-	@if which ps2pdf >/dev/null 2>/dev/null; then             \
++	@if ! which ps2pdf >/dev/null 2>/dev/null; then             \
+ 		ps2pdf $*.ps					;\
+ 	else                                                     \
+ 		echo "** Did not find ps2pdf **"                ;\
diff --git a/cad/geda-symbols/patches/patch-ab b/cad/geda-symbols/patches/patch-ab
new file mode 100644
index 00000000000..ef571b986e6
--- /dev/null
+++ b/cad/geda-symbols/patches/patch-ab
@@ -0,0 +1,36 @@
+$NetBSD: patch-ab,v 1.1 2002/12/13 05:19:47 dmcmahill Exp $
+
+--- documentation/Makefile.in.orig	Sun Nov  3 22:58:59 2002
++++ documentation/Makefile.in
+@@ -316,7 +316,7 @@ uninstall-am: uninstall-datadocDATA unin
+ #
+ %.pic: %.fig
+ 	@echo "Creating pic (using fig2dev)"
+-	@if which fig2dev >/dev/null 2>/dev/null; then           \
++	@if ! which fig2dev >/dev/null 2>/dev/null; then           \
+ 		fig2dev -L pic $*.fig >$*.pic		       ;\
+ 	else                                                    \
+ 		echo "** Did not find fig2dev **"              ;\
+@@ -327,19 +327,19 @@ uninstall-am: uninstall-datadocDATA unin
+ %.ps: %.doc
+ 	@echo "Creating ps (using groff)"
+ 	@rm -rf $*.tmp
+-	@if which groff >/dev/null 2>/dev/null; then              \
++	@if ! which groff >/dev/null 2>/dev/null; then              \
+ 		groff -t -sp -ms $*.doc >$*.tmp		        ;\
+ 	else						         \
+ 		echo "** Did not find groff **"                 ;\
+ 		echo "Some Documentation might not be correct!" ;\
+-		touch $*.ps                                     ;\
++		touch $*.tmp                                     ;\
+ 	fi
+ 	@mv -f $*.tmp $*.ps
+ 
+ %.pdf: %.ps
+ 	@echo "Creating pdf (using ps2pdf)"
+ 	@rm -rf $*.pdf
+-	@if which ps2pdf >/dev/null 2>/dev/null; then             \
++	@if ! which ps2pdf >/dev/null 2>/dev/null; then             \
+ 		ps2pdf $*.ps					;\
+ 	else                                                     \
+ 		echo "** Did not find ps2pdf **"                ;\
diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile
index 3e2effd5713..94a1c6bee0a 100644
--- a/cad/geda-utils/Makefile
+++ b/cad/geda-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/10/14 09:59:30 rh Exp $
+# $NetBSD: Makefile,v 1.9 2002/12/13 05:19:48 dmcmahill Exp $
 #
 
 DISTNAME=		geda-utils-${PKGVERSION}
@@ -12,14 +12,18 @@ MAINTAINER=		dmcmahill@netbsd.org
 HOMEPAGE=		http://www.geda.seul.org/
 COMMENT=		Set of utilites for gEDA
 
-DEPENDS+=		libgeda-${PKGVERSION}:../../cad/libgeda
-
 CONFLICTS+=		gEDA<19991011
 
 DIST_SUBDIR=		geda
-PKGVERSION=		20020414
+PKGVERSION=		20021103
 
 GNU_CONFIGURE=		YES
 USE_X11BASE=		YES
+USE_BUILDLINK2=		YES
+USE_PERL5=		YES
+REPLACE_PERL+=		scripts/gschupdate \
+			scripts/gsymupdate \
+			scripts/sarlacc_sym
 
+.include "../../cad/libgeda/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/geda-utils/PLIST b/cad/geda-utils/PLIST
index 9e51374a0f2..9d1258b9761 100644
--- a/cad/geda-utils/PLIST
+++ b/cad/geda-utils/PLIST
@@ -1,6 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:48:10 zuntum Exp $
-bin/gmk_sym
+@comment $NetBSD: PLIST,v 1.2 2002/12/13 05:19:48 dmcmahill Exp $
 bin/convert_sym
-bin/smash_megafile
+bin/gmk_sym
+bin/gschemdoc
+bin/gschlas
+bin/gschupdate
+bin/gsymupdate
+bin/olib
 bin/sarlacc_schem
 bin/sarlacc_sym
+bin/smash_megafile
+share/gEDA/system-gschlasrc
diff --git a/cad/geda-utils/distinfo b/cad/geda-utils/distinfo
index 1fc16110763..a6223df19d7 100644
--- a/cad/geda-utils/distinfo
+++ b/cad/geda-utils/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.4 2002/05/18 18:08:40 dmcmahill Exp $
+$NetBSD: distinfo,v 1.5 2002/12/13 05:19:48 dmcmahill Exp $
 
-SHA1 (geda/geda-utils-20020414.tar.gz) = 3817a7dfa85e328b0b1f9a6bd28f07e8386ed3f6
-Size (geda/geda-utils-20020414.tar.gz) = 122242 bytes
+SHA1 (geda/geda-utils-20021103.tar.gz) = 102aa61bbb1e18b683d9c649d75aed6f0e225a25
+Size (geda/geda-utils-20021103.tar.gz) = 193709 bytes
+SHA1 (patch-aa) = 57543d77620f2f76ee98349e56ff2b8a74e037a7
+SHA1 (patch-ab) = 7592154535f6fea343c2e825ea0466c5a463f5a4
diff --git a/cad/geda-utils/patches/patch-aa b/cad/geda-utils/patches/patch-aa
new file mode 100644
index 00000000000..a4df23106bd
--- /dev/null
+++ b/cad/geda-utils/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2002/12/13 05:19:48 dmcmahill Exp $
+
+--- src/Makefile.am.orig	Tue Oct 29 21:44:05 2002
++++ src/Makefile.am
+@@ -15,7 +15,7 @@ gmk_sym_LDADD = $(LIBERTY)
+ smash_megafile_LDADD = 
+ convert_sym_LDADD = $(LIBERTY) -lm
+ sarlacc_schem_LDADD = 
+-olib_LDADD = @LEXLIB@
++olib_LDADD = @LEXLIB@ -lm
+ 
+ EXTRA_DIST = 
+ 
diff --git a/cad/geda-utils/patches/patch-ab b/cad/geda-utils/patches/patch-ab
new file mode 100644
index 00000000000..6ea365e9ba2
--- /dev/null
+++ b/cad/geda-utils/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2002/12/13 05:19:49 dmcmahill Exp $
+
+--- src/Makefile.in.orig	Sun Nov  3 23:00:44 2002
++++ src/Makefile.in
+@@ -157,7 +157,7 @@ gmk_sym_LDADD = $(LIBERTY)
+ smash_megafile_LDADD = 
+ convert_sym_LDADD = $(LIBERTY) -lm
+ sarlacc_schem_LDADD = 
+-olib_LDADD = @LEXLIB@
++olib_LDADD = @LEXLIB@ -lm
+ 
+ EXTRA_DIST = 
+ 
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index 9c579c8f113..f5308b1fa3f 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/10/14 09:59:28 rh Exp $
+# $NetBSD: Makefile,v 1.20 2002/12/13 05:19:44 dmcmahill Exp $
 #
 
 DISTNAME=	gEDA-${PKGVERSION}
@@ -10,11 +10,11 @@ MAINTAINER=	dmcmahill@netbsd.org
 HOMEPAGE=	http://www.geda.seul.org/
 COMMENT=	Toolset for automating electronic design
 
-DEPENDS+=	gschem>=${PKGVERSION}:../../cad/gschem
-DEPENDS+=	gnetlist>=${PKGVERSION}:../../cad/gnetlist
-DEPENDS+=	gsymcheck>=${PKGVERSION}:../../cad/gsymcheck
+DEPENDS+=	gschem-${PKGVERSION}:../../cad/gschem
+DEPENDS+=	gnetlist-${PKGVERSION}:../../cad/gnetlist
+DEPENDS+=	gsymcheck-${PKGVERSION}:../../cad/gsymcheck
 DEPENDS+=	geda-utils-${PKGVERSION}:../../cad/geda-utils
-DEPENDS+=	geda-docs-20020209:../../cad/geda-docs
+DEPENDS+=	geda-docs-${PKGVERSION}:../../cad/geda-docs
 
 USE_X11BASE=	yes
 EXTRACT_ONLY=	# empty
@@ -23,7 +23,7 @@ NO_PATCH=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
-PKGVERSION=	20020414
+PKGVERSION=	20021103
 
 do-install:	# empty
 
diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
index 61c4a22d14f..0f0e6851fb0 100644
--- a/cad/gnetlist/Makefile
+++ b/cad/gnetlist/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2002/10/14 09:59:30 rh Exp $
+# $NetBSD: Makefile,v 1.13 2002/12/13 05:19:49 dmcmahill Exp $
 #
 
 DISTNAME=		geda-gnetlist-${PKGVERSION}
 PKGNAME=		gnetlist-${PKGVERSION}
-PKGREVISION=		2
 CATEGORIES=		cad
 MASTER_SITES=		ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
 			ftp://ieee.ing.uniroma1.it/pub/geda/devel/${PKGVERSION}/ \
@@ -15,9 +14,8 @@ HOMEPAGE=		http://www.geda.seul.org/
 COMMENT=		Netlist generation program
 
 DIST_SUBDIR=		geda
-PKGVERSION=		20020414
+PKGVERSION=		20021103
 
-DEPENDS+=		libgeda-${PKGVERSION}:../../cad/libgeda
 DEPENDS+=		geda-symbols-${PKGVERSION}:../../cad/geda-symbols
 # needs GNU m4 for the PCBboard netlister
 DEPENDS+=		m4-1.4:../../devel/m4
@@ -28,7 +26,7 @@ GNU_CONFIGURE=		YES
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
 USE_GMAKE=		YES
-
+USE_BUILDLINK2=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 post-patch:
@@ -37,4 +35,5 @@ post-patch:
 		${WRKSRC}/scheme/gnet-PCBboard.scm.bak > ${WRKSRC}/scheme/gnet-PCBboard.scm
 	${RM} -f ${WRKSRC}/scheme/gnet-PCBboard.scm.bak
 
+.include "../../cad/libgeda/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/gnetlist/distinfo b/cad/gnetlist/distinfo
index 329d3f27182..041e94923f4 100644
--- a/cad/gnetlist/distinfo
+++ b/cad/gnetlist/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.6 2002/06/01 20:11:55 dmcmahill Exp $
+$NetBSD: distinfo,v 1.7 2002/12/13 05:19:49 dmcmahill Exp $
 
-SHA1 (geda/geda-gnetlist-20020414.tar.gz) = f568fc3dc198046d7865b38d99a9de36d47f17fb
-Size (geda/geda-gnetlist-20020414.tar.gz) = 236941 bytes
+SHA1 (geda/geda-gnetlist-20021103.tar.gz) = 7fe02e7d0bb0539df584c1b6b6f86c8f9d25819b
+Size (geda/geda-gnetlist-20021103.tar.gz) = 253431 bytes
 SHA1 (patch-aa) = 5ff82fea2ae9afb672fc1c270be57da1c5f4b293
-SHA1 (patch-ab) = 7546a526795b2e42c0fe716030c3e0c93687e4c3
diff --git a/cad/gnetlist/patches/patch-ab b/cad/gnetlist/patches/patch-ab
deleted file mode 100644
index 44d9af9d672..00000000000
--- a/cad/gnetlist/patches/patch-ab
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2002/05/31 15:51:44 dmcmahill Exp $
-
-use sh(1) and awk(1) not bash(1) and gawk(1).  Also use short options for
-head(1) and tail(1).
-
---- src/gschem2pcb.orig	Fri Apr 21 16:48:38 2000
-+++ src/gschem2pcb
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -43,7 +43,7 @@
- 	fi
- 
- # Search for the beginning of the filename assuming it ends by .sch
--FILENAME=`echo "$1" | sed 's/.sch//g' -`
-+FILENAME=`echo "$1" | sed 's/.sch//g' `
- PCBFILENAME=$FILENAME.pcb
- 
- # test if a .pcb file exists
-@@ -59,7 +59,7 @@
- 	gnetlist -g PCB -o $NETFILENAME $1  
- 	gnetlist -g PCBboard -o $PCBTEMPFILENAME $1 
- 	echo
--	gawk 'BEGIN {FS=","}
-+	awk 'BEGIN {FS=","}
- 		/^PKG_*/{
- 		footprint=$1
- 		sub(/PKG_/,"",footprint)
-@@ -68,23 +68,23 @@
- 		value=substr($3,0,length($3)-1)
- 		printf("Error: the footprint %s for the device %s does not exist\n",footprint,$2,value)
- 		}' $PCBTEMPFILENAME
--	gawk '/^Element\(.*/{printf("%s\t%s\t\n",$3,$4)}' $PCBFILENAME|sort > $LISTFILE
--	gawk '/^Element\(.*/{printf("%s\t%s\t\n",$3,$4)}' $PCBTEMPFILENAME|sort > $NEWLISTFILE
--	UREF=`diff $NEWLISTFILE $LISTFILE | gawk '/</{printf("%s\n",$2)}' -`
-+	awk '/^Element\(.*/{printf("%s\t%s\t\n",$3,$4)}' $PCBFILENAME|sort > $LISTFILE
-+	awk '/^Element\(.*/{printf("%s\t%s\t\n",$3,$4)}' $PCBTEMPFILENAME|sort > $NEWLISTFILE
-+	UREF=`diff $NEWLISTFILE $LISTFILE | awk '/</{printf("%s\n",$2)}' -`
- 	#Search for UREF if $PCBTEMPFILENAME and create $PCBNEWFILENAME
- 	#Header of the pcb file
--	head --lines 5 $PCBTEMPFILENAME > $PCBNEWFILENAME
-+	head -n 5 $PCBTEMPFILENAME > $PCBNEWFILENAME
- 	for f in `echo $UREF`; do
- 		echo "Find new element $f"
--		LINE=`grep -n $f $PCBTEMPFILENAME|sed 's/:.*$//g' -`
--		gawk -v line=$LINE '{if (NR>=line)
-+		LINE=`grep -n $f $PCBTEMPFILENAME|sed 's/:.*$//g' `
-+		awk -v line=$LINE '{if (NR>=line)
- 					{print
- 					if ($1==")") exit}
- 					}' $PCBTEMPFILENAME >> $PCBNEWFILENAME
- 					
- 	done
- 	# End of the pcb file
--	tail --lines 24 $PCBTEMPFILENAME >> $PCBNEWFILENAME
-+	tail -n 24 $PCBTEMPFILENAME >> $PCBNEWFILENAME
- 	
- 	# Un peu de m�nage (in french in the texte)
- 	rm $PCBTEMPFILENAME $NEWLISTFILE $LISTFILE
-@@ -96,7 +96,7 @@
- 	gnetlist -g PCB -o $NETFILENAME $1 
- 	gnetlist -g PCBboard -o $PCBFILENAME $1 
- 	# Test if a footprint has not been found
--	gawk 'BEGIN {FS=","}
-+	awk 'BEGIN {FS=","}
- 		/^PKG_*/{
- 		footprint=$1
- 		sub(/PKG_/,"",footprint)
diff --git a/cad/gschem/Makefile b/cad/gschem/Makefile
index c35c65aed2f..248413c967c 100644
--- a/cad/gschem/Makefile
+++ b/cad/gschem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/10/14 09:59:31 rh Exp $
+# $NetBSD: Makefile,v 1.11 2002/12/13 05:19:50 dmcmahill Exp $
 #
 
 DISTNAME=		geda-gschem-${PKGVERSION}
@@ -13,19 +13,21 @@ MAINTAINER=		dmcmahill@netbsd.org
 HOMEPAGE=		http://www.geda.seul.org/
 COMMENT=		Schematic capture tool
 
-DEPENDS+=		libgeda-${PKGVERSION}:../../cad/libgeda
 DEPENDS+=		geda-symbols-${PKGVERSION}:../../cad/geda-symbols
 
 CONFLICTS+=		gEDA<19991011
 
 DIST_SUBDIR=		geda
-PKGVERSION=		20020414
+PKGVERSION=		20021103
 
 GNU_CONFIGURE=		YES
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
+USE_BUILDLINK2=		YES
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
+.include "../../cad/libgeda/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/gschem/PLIST b/cad/gschem/PLIST
index 6d7b08b6dff..bb89e4f1851 100644
--- a/cad/gschem/PLIST
+++ b/cad/gschem/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/12/09 16:01:14 tron Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/12/13 05:19:51 dmcmahill Exp $
 bin/gschem
 @unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gschemdoc.info
 info/gschemdoc.info
@@ -12,6 +12,7 @@ info/gschemdoc.info-14
 info/gschemdoc.info-15
 info/gschemdoc.info-16
 info/gschemdoc.info-17
+info/gschemdoc.info-18
 info/gschemdoc.info-2
 info/gschemdoc.info-3
 info/gschemdoc.info-4
@@ -21,12 +22,35 @@ info/gschemdoc.info-7
 info/gschemdoc.info-8
 info/gschemdoc.info-9
 man/man1/gschem.1
+share/gEDA/bitmap/gschem-bus.xpm
+share/gEDA/bitmap/gschem-comp.xpm
+share/gEDA/bitmap/gschem-copy.xpm
+share/gEDA/bitmap/gschem-delete.xpm
+share/gEDA/bitmap/gschem-edit.xpm
+share/gEDA/bitmap/gschem-mirror.xpm
+share/gEDA/bitmap/gschem-move.xpm
+share/gEDA/bitmap/gschem-net.xpm
+share/gEDA/bitmap/gschem-new.xpm
+share/gEDA/bitmap/gschem-open.xpm
+share/gEDA/bitmap/gschem-redo.xpm
+share/gEDA/bitmap/gschem-rotate.xpm
+share/gEDA/bitmap/gschem-save.xpm
+share/gEDA/bitmap/gschem-select.xpm
+share/gEDA/bitmap/gschem-text.xpm
+share/gEDA/bitmap/gschem-undo.xpm
+share/gEDA/gschem-darkbg
 share/gEDA/gschem-gtkrc
+share/gEDA/gschem-lightbg
 share/gEDA/system-gschemrc
 share/gEDA/scheme/auto-uref.scm
 share/gEDA/scheme/generate_netlist.scm
 share/gEDA/scheme/gschem.scm
 share/gEDA/scheme/list-keys.scm
 share/gEDA/scheme/print-NB-attribs.scm
+${PKGLOCALEDIR}/locale/de_DE/LC_MESSAGES/geda-gschem.mo
+${PKGLOCALEDIR}/locale/ja_JP/LC_MESSAGES/geda-gschem.mo
+${PKGLOCALEDIR}/locale/nl_NL/LC_MESSAGES/geda-gschem.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/geda-gschem.mo
+@dirrm share/gEDA/bitmap
 @unexec ${RMDIR} %D/share/gEDA/scheme 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/gEDA 2>/dev/null || ${TRUE}
diff --git a/cad/gschem/distinfo b/cad/gschem/distinfo
index ecd56fe7c9c..2101b967b5a 100644
--- a/cad/gschem/distinfo
+++ b/cad/gschem/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/05/18 18:08:43 dmcmahill Exp $
+$NetBSD: distinfo,v 1.5 2002/12/13 05:19:51 dmcmahill Exp $
 
-SHA1 (geda/geda-gschem-20020414.tar.gz) = 07d740f4af4a1dc49e47d4c6e868b6ea23bd670f
-Size (geda/geda-gschem-20020414.tar.gz) = 1050665 bytes
+SHA1 (geda/geda-gschem-20021103.tar.gz) = ed0506577e4682a0f974b2f504c23aac8a937cc2
+Size (geda/geda-gschem-20021103.tar.gz) = 1349580 bytes
diff --git a/cad/gsymcheck/Makefile b/cad/gsymcheck/Makefile
index 4ac9d37619e..7172368dfae 100644
--- a/cad/gsymcheck/Makefile
+++ b/cad/gsymcheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/10/14 09:59:31 rh Exp $
+# $NetBSD: Makefile,v 1.11 2002/12/13 05:19:51 dmcmahill Exp $
 #
 
 DISTNAME=		geda-gsymcheck-${PKGVERSION}
@@ -13,18 +13,18 @@ MAINTAINER=		dmcmahill@netbsd.org
 HOMEPAGE=		http://www.geda.seul.org/
 COMMENT=		EDA (Electronic Design Automation) symbol checker
 
-DEPENDS+=		libgeda-${PKGVERSION}:../../cad/libgeda
 DEPENDS+=		geda-symbols-${PKGVERSION}:../../cad/geda-symbols
 
 CONFLICTS+=		gEDA<19991011
 
 DIST_SUBDIR=		geda
-PKGVERSION=		20020414
+PKGVERSION=		20021103
 
 GNU_CONFIGURE=		YES
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
-
+USE_BUILDLINK2=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
+.include "../../cad/libgeda/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/gsymcheck/distinfo b/cad/gsymcheck/distinfo
index 3275ef8e5d1..55c3db9d3b9 100644
--- a/cad/gsymcheck/distinfo
+++ b/cad/gsymcheck/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/05/18 18:08:46 dmcmahill Exp $
+$NetBSD: distinfo,v 1.5 2002/12/13 05:19:51 dmcmahill Exp $
 
-SHA1 (geda/geda-gsymcheck-20020414.tar.gz) = f8a27263a81ff516bb51cc6a5e2c7d888868ab8e
-Size (geda/geda-gsymcheck-20020414.tar.gz) = 121660 bytes
+SHA1 (geda/geda-gsymcheck-20021103.tar.gz) = 5de066deee58ab6b695bca9deb7e337ca5256490
+Size (geda/geda-gsymcheck-20021103.tar.gz) = 137074 bytes
diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile
index becf415bec0..a67d8e5a370 100644
--- a/cad/libgeda/Makefile
+++ b/cad/libgeda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/05/18 18:08:47 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.11 2002/12/13 05:19:51 dmcmahill Exp $
 #
 
 DISTNAME=		libgeda-${PKGVERSION}
@@ -12,20 +12,21 @@ MAINTAINER=		rh@netbsd.org
 HOMEPAGE=		http://www.geda.seul.org/
 COMMENT=		Library of shared modules for gEDA
 
-DEPENDS+=		guile>=1.3.0:../../lang/guile
-DEPENDS+=		libstroke-[0-9]*:../../devel/libstroke
-DEPENDS+=		libgdgeda>=1.8nb1:../../graphics/libgdgeda
-DEPENDS+=		gtk+>=1.2.3:../../x11/gtk
-
 CONFLICTS+=		gEDA<19991011
 
 DIST_SUBDIR=		geda
-PKGVERSION=		20020414
+PKGVERSION=		20021103
 
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 USE_X11BASE=		YES
+USE_BUILDLINK2=		YES
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
+.include "../../devel/libstroke/buildlink2.mk"
+.include "../../graphics/libgdgeda/buildlink2.mk"
+.include "../../lang/guile/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"   
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/libgeda/PLIST b/cad/libgeda/PLIST
index 18136c29bab..278a017f54a 100644
--- a/cad/libgeda/PLIST
+++ b/cad/libgeda/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/05/18 18:08:47 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/12/13 05:19:51 dmcmahill Exp $
 bin/libgeda-config
 include/libgeda/colors.h
 include/libgeda/defines.h
@@ -6,7 +6,6 @@ include/libgeda/funcs.h
 include/libgeda/globals.h
 include/libgeda/libgeda.h
 include/libgeda/o_types.h
-include/libgeda/pcb_struct.h
 include/libgeda/prototype.h
 include/libgeda/struct.h
 @unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/libgedadoc.info
@@ -17,6 +16,7 @@ info/libgedadoc.info-10
 info/libgedadoc.info-11
 info/libgedadoc.info-12
 info/libgedadoc.info-13
+info/libgedadoc.info-14
 info/libgedadoc.info-2
 info/libgedadoc.info-3
 info/libgedadoc.info-4
@@ -28,6 +28,6 @@ info/libgedadoc.info-9
 lib/libgeda.a
 lib/libgeda.la
 lib/libgeda.so
-lib/libgeda.so.15
-lib/libgeda.so.15.0
+lib/libgeda.so.17
+lib/libgeda.so.17.0
 @dirrm include/libgeda
diff --git a/cad/libgeda/buildlink2.mk b/cad/libgeda/buildlink2.mk
new file mode 100644
index 00000000000..61bd0467442
--- /dev/null
+++ b/cad/libgeda/buildlink2.mk
@@ -0,0 +1,36 @@
+# $NetBSD: buildlink2.mk,v 1.1 2002/12/13 05:19:52 dmcmahill Exp $
+#
+# This Makefile fragment is included by packages that use libgeda.
+#
+# This file was created automatically using createbuildlink 2.2.
+#
+
+.if !defined(LIBGEDA_BUILDLINK2_MK)
+LIBGEDA_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			libgeda
+BUILDLINK_DEPENDS.libgeda?=		libgeda>=20021103
+BUILDLINK_PKGSRCDIR.libgeda?=		../../cad/libgeda
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.libgeda=libgeda
+BUILDLINK_PREFIX.libgeda_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.libgeda+=	include/libgeda/colors.h
+BUILDLINK_FILES.libgeda+=	include/libgeda/defines.h
+BUILDLINK_FILES.libgeda+=	include/libgeda/funcs.h
+BUILDLINK_FILES.libgeda+=	include/libgeda/globals.h
+BUILDLINK_FILES.libgeda+=	include/libgeda/libgeda.h
+BUILDLINK_FILES.libgeda+=	include/libgeda/o_types.h
+BUILDLINK_FILES.libgeda+=	include/libgeda/prototype.h
+BUILDLINK_FILES.libgeda+=	include/libgeda/struct.h
+BUILDLINK_FILES.libgeda+=	lib/libgeda.*
+
+.include "../../devel/libstroke/buildlink2.mk"
+.include "../../graphics/libgdgeda/buildlink2.mk"
+.include "../../lang/guile/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	libgeda-buildlink
+
+libgeda-buildlink: _BUILDLINK_USE
+
+.endif	# LIBGEDA_BUILDLINK2_MK
diff --git a/cad/libgeda/distinfo b/cad/libgeda/distinfo
index e5ec96f4828..335e1613f72 100644
--- a/cad/libgeda/distinfo
+++ b/cad/libgeda/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/05/18 18:08:47 dmcmahill Exp $
+$NetBSD: distinfo,v 1.5 2002/12/13 05:19:52 dmcmahill Exp $
 
-SHA1 (geda/libgeda-20020414.tar.gz) = b545f581fd04283238416efda29b3a9301a8abc4
-Size (geda/libgeda-20020414.tar.gz) = 838513 bytes
+SHA1 (geda/libgeda-20021103.tar.gz) = 07fd71465e8bfc9002dc43e6a6b2e73fc92b67f4
+Size (geda/libgeda-20021103.tar.gz) = 872726 bytes