update the gEDA suite to version 1.4.0

Release notes for the gEDA/gaf 1.4.0.20080127 stable snapshot

   Summary
     __________________________________________________________________

   This is the third major stable release of gEDA/gaf. It rolls up the
       various feature additions, code cleanup, and bug fixes that have
       occurred over the past five months. Major highlights include:

     * Many usability improvements to the various programs
     * Optional support for desktop integration (GNOME and KDE)
     * Many improvements to component library handling (internals and
       component selection dialog)
     * libgeda is now internationalized
     * Many language translation updates to gschem and gattrib
     * Improved error handling throughout all the programs
     * Fixes to the spice-sdb backend to support slotting
     * Rendering improvements and speedups in gschem
     * A bunch of new tests in gsymcheck to catch a few common errors
     * Improved support for running under MinGW
     * Lots and lots of code cleanup and improvements throughout all the
       programs
     * The usual slew of bugs and quirks fixed

   NOTE: This is a stable snapshot and should be packaged up by
   distribution package maintainers.

   Changes
     __________________________________________________________________

   Changes in this release only (since v1.3.1):
       Peter Clifton

     * Fix typo in Dutch translation
     * Fix use after free corruption when consolidating nets
     * Invalidate component cache when updating symbols. [#1880211]
     * Only call gdk_window_invalidate_rect() when drawing to a GdkWindow.

   Werner Hoch
     * gsymcheck: improved the pintype check, added test case
     * Added new pintype test symbol and output to EXTRA_DIST
     * gsymcheck: test for misplaced attributes
     * gsymcheck: moved obsolete and forbidden attribute checks
     * fixed error handling bug in run_source_command() [#1869941]
     * forward status messages from the library command to the log
     * fixed two symbols with missplaced pin attribute errors
     * detach missplaced symbol attributes
     * fixed symbol with invalid pintype attribute
     * Update the pinnumbers when updating a symbol with slots
     * Updated German translation of gschem

   Ales Hvezda
     * Updated documentation from the official wiki website
     * Changed Edit/Undo and Add/Bus hotkeys
     * Fixed reversed VDD/VSS nets in this hex schmitt trigger
     * Fix a crash when running a script that calls (gschem-image ...)

   Bernd Jendrissek
     * Update Afrikaans translation to fix spelling error.

   Bert Timmerman
     * libgeda Dutch translation updates

   For all the other changes from last development series (1.3.x):
     * [1]gaf-1.3.0 Release Notes
     * [2]gaf-1.3.1 Release Notes

   Notes/Bugs/Errata/Known Issues/Last Minute Issues
     __________________________________________________________________

     * Many thanks to everybody who contributed to this snapshot and
       previous development snapshots.
     * Updates to this stable snapshot (1.4.x series) will occur if people
       find issues.
     * The next major stable snapshot (1.6.x) will probably happen in the
       middle of this year.
     * Please submit all bugs to the [3]bug tracker.

25 files changed, 153 insertions, 98 deletions

diff --git a/cad/gattrib/Makefile b/cad/gattrib/Makefile
index 828b8cf1328..267495469a4 100644
--- a/cad/gattrib/Makefile
+++ b/cad/gattrib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/09/01 12:00:42 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.13 2008/02/01 02:34:21 dmcmahill Exp $
 
 DISTNAME=		geda-gattrib-${PKGVERSION}
 PKGNAME=		gattrib-${PKGVERSION}
@@ -10,11 +10,13 @@ COMMENT=		Attribute editor for gEDA
 
 .include "../../cad/geda/Makefile.common"
 
+USE_TOOLS+=             bash intltool msgfmt pkg-config
+REPLACE_BASH=		icon-theme-installer
 GNU_CONFIGURE=		YES
-USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		pkg-config
 
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../cad/libgeda/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/gattrib/PLIST b/cad/gattrib/PLIST
index c7f7f644f98..6abf43c70d9 100644
--- a/cad/gattrib/PLIST
+++ b/cad/gattrib/PLIST
@@ -1,3 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2005/10/24 20:45:28 rillig Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/02/01 02:34:21 dmcmahill Exp $
 bin/gattrib
+share/applications/geda-gattrib.desktop
+share/gEDA/gattrib-menus.xml
 share/gEDA/system-gattribrc
+share/icons/hicolor/48x48/apps/geda-gattrib-48.png
+share/icons/hicolor/scalable/apps/geda-gattrib.svg
+${PKGLOCALEDIR}/locale/de_DE/LC_MESSAGES/geda-gattrib.mo
+${PKGLOCALEDIR}/locale/es_ES/LC_MESSAGES/geda-gattrib.mo
+${PKGLOCALEDIR}/locale/nl_NL/LC_MESSAGES/geda-gattrib.mo
diff --git a/cad/gattrib/distinfo b/cad/gattrib/distinfo
index 0021bef4d20..b56f3a37f7a 100644
--- a/cad/gattrib/distinfo
+++ b/cad/gattrib/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.15 2007/05/31 12:48:32 dmcmahill Exp $
+$NetBSD: distinfo,v 1.16 2008/02/01 02:34:21 dmcmahill Exp $
 
-SHA1 (geda/geda-gattrib-20070526.tar.gz) = 4ced3f9775dc6e7abd8a1a08f7ea0886de6a32c6
-RMD160 (geda/geda-gattrib-20070526.tar.gz) = bb229409cbbe522e0c25b6bed95865324c6b8856
-Size (geda/geda-gattrib-20070526.tar.gz) = 291639 bytes
+SHA1 (geda/geda-gattrib-1.4.0.tar.gz) = 96c9de3bebd26b76d0559b4ee848be2105035d5e
+RMD160 (geda/geda-gattrib-1.4.0.tar.gz) = 86b1e4dddca96203492f2094e4579a1361064e63
+Size (geda/geda-gattrib-1.4.0.tar.gz) = 349998 bytes
diff --git a/cad/geda-docs/distinfo b/cad/geda-docs/distinfo
index 68fa56e18c7..7f85ccb2e1a 100644
--- a/cad/geda-docs/distinfo
+++ b/cad/geda-docs/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.19 2007/05/31 12:48:34 dmcmahill Exp $
+$NetBSD: distinfo,v 1.20 2008/02/01 02:34:24 dmcmahill Exp $
 
-SHA1 (geda/geda-docs-20070526.tar.gz) = 3dcd9fe85c55fc46257ff61cfc961fec2f2e0f5f
-RMD160 (geda/geda-docs-20070526.tar.gz) = 98c9f54548c8d83963964b598dcbd55947b510e2
-Size (geda/geda-docs-20070526.tar.gz) = 1808257 bytes
+SHA1 (geda/geda-docs-1.4.0.tar.gz) = d8b77a3f39fa324637314b62bdd56a7b2742f1a2
+RMD160 (geda/geda-docs-1.4.0.tar.gz) = 087d16a3cbaff1eb1a948e59ad6b87e950aa236f
+Size (geda/geda-docs-1.4.0.tar.gz) = 1833377 bytes
diff --git a/cad/geda-examples/Makefile b/cad/geda-examples/Makefile
index 6ef01207fde..d6a0cf034d5 100644
--- a/cad/geda-examples/Makefile
+++ b/cad/geda-examples/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2007/06/08 23:52:02 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.17 2008/02/01 02:34:24 dmcmahill Exp $
 #
 
 DISTNAME=	geda-examples-${PKGVERSION}
-PKGREVISION=	1
 CATEGORIES=	cad
 
 MAINTAINER=	dmcmahill@NetBSD.org
diff --git a/cad/geda-examples/PLIST b/cad/geda-examples/PLIST
index f56c626c251..166d8c203f6 100644
--- a/cad/geda-examples/PLIST
+++ b/cad/geda-examples/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.6 2007/06/08 23:52:02 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/02/01 02:34:24 dmcmahill Exp $
 share/examples/geda/AUTHORS
 share/examples/geda/COPYING
 share/examples/geda/ChangeLog
+share/examples/geda/ChangeLog-1.0
 share/examples/geda/INSTALL
 share/examples/geda/NEWS
 share/examples/geda/README
@@ -39,9 +40,9 @@ share/examples/geda/configure
 share/examples/geda/configure.ac
 share/examples/geda/gTAG/7414-1.sym
 share/examples/geda/gTAG/ChangeLog
+share/examples/geda/gTAG/ChangeLog-1.0
 share/examples/geda/gTAG/README
 share/examples/geda/gTAG/attribs
-share/examples/geda/gTAG/commonrc
 share/examples/geda/gTAG/copyleft.sym
 share/examples/geda/gTAG/crdist.sh
 share/examples/geda/gTAG/cy7c64603-52nc.sym
@@ -61,9 +62,8 @@ share/examples/geda/gTAG/gTAG-ucont.sym
 share/examples/geda/gTAG/gTAG.bom
 share/examples/geda/gTAG/gTAG.ps
 share/examples/geda/gTAG/gTAG.sch
+share/examples/geda/gTAG/gafrc
 share/examples/geda/gTAG/gnetlistrc
-share/examples/geda/gTAG/gschemrc
-share/examples/geda/gTAG/gschlasrc
 share/examples/geda/gTAG/max882.sym
 share/examples/geda/gTAG/sn75240pw.sym
 share/examples/geda/install-sh
diff --git a/cad/geda-examples/distinfo b/cad/geda-examples/distinfo
index 90d8cbc5cc9..c79e5595797 100644
--- a/cad/geda-examples/distinfo
+++ b/cad/geda-examples/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2007/05/31 12:48:34 dmcmahill Exp $
+$NetBSD: distinfo,v 1.13 2008/02/01 02:34:24 dmcmahill Exp $
 
-SHA1 (geda/geda-examples-20070526.tar.gz) = 1104a2be6ce6ab93df55e6b9854f139bfae431ad
-RMD160 (geda/geda-examples-20070526.tar.gz) = 8581372a0c23b9061aba552fd24e04e5a2868878
-Size (geda/geda-examples-20070526.tar.gz) = 253225 bytes
+SHA1 (geda/geda-examples-1.4.0.tar.gz) = 73895b572cbaf10eda563b8e8474dae9e833211f
+RMD160 (geda/geda-examples-1.4.0.tar.gz) = 46f7358ba440e040df3872dbd99c01f35d9fe74f
+Size (geda/geda-examples-1.4.0.tar.gz) = 257780 bytes
diff --git a/cad/geda-symbols/PLIST b/cad/geda-symbols/PLIST
index 636b3d8745f..1db580497a6 100644
--- a/cad/geda-symbols/PLIST
+++ b/cad/geda-symbols/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.19 2007/05/31 12:48:34 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.20 2008/02/01 02:34:23 dmcmahill Exp $
 share/doc/geda-doc/nc.pdf
+share/gEDA/gafrc.d/geda-clib.scm
+share/gEDA/scheme/geda-font.scm
 share/gEDA/sym/4000/4000-1.sym
 share/gEDA/sym/4000/4000-2.sym
 share/gEDA/sym/4000/4001-1.sym
@@ -875,6 +877,7 @@ share/gEDA/sym/font/rbrace.sym
 share/gEDA/sym/font/rbrack.sym
 share/gEDA/sym/font/rparen.sym
 share/gEDA/sym/font/s_-acute-accent.sym
+share/gEDA/sym/font/s_-sharp.sym
 share/gEDA/sym/font/s_.sym
 share/gEDA/sym/font/semi.sym
 share/gEDA/sym/font/slash.sym
@@ -1049,6 +1052,7 @@ share/gEDA/sym/maxim/max3120-1.sym
 share/gEDA/sym/maxim/max3223e-1.sym
 share/gEDA/sym/maxim/max3226-1.sym
 share/gEDA/sym/maxim/max3491-1.sym
+share/gEDA/sym/maxim/max3674-1.sym
 share/gEDA/sym/maxim/max378-1.sym
 share/gEDA/sym/maxim/max400-1.sym
 share/gEDA/sym/maxim/max4005-1.sym
@@ -1634,7 +1638,6 @@ share/gEDA/sym/xilinx/XC2S50-5PQ208C.sym
 share/gEDA/sym/xilinx/XC2S50-5PQ208I.sym
 share/gEDA/sym/xilinx/XC2S50-6PQ208C.sym
 share/gEDA/sym/xilinx/XC95108-PC84.sym
-share/gEDA/system-gafrc
 @dirrm share/gEDA/sym/xilinx
 @dirrm share/gEDA/sym/vhdl
 @dirrm share/gEDA/sym/verilog
diff --git a/cad/geda-symbols/distinfo b/cad/geda-symbols/distinfo
index fb7e1b22a04..5a25e00db40 100644
--- a/cad/geda-symbols/distinfo
+++ b/cad/geda-symbols/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.19 2007/05/31 12:48:34 dmcmahill Exp $
+$NetBSD: distinfo,v 1.20 2008/02/01 02:34:24 dmcmahill Exp $
 
-SHA1 (geda/geda-symbols-20070526.tar.gz) = 2e7bdcf0132ca8e380e59418daadde34fa10eff2
-RMD160 (geda/geda-symbols-20070526.tar.gz) = 49c2f6d7a0eba1b4a94378d9b76c0ad983e568a5
-Size (geda/geda-symbols-20070526.tar.gz) = 835528 bytes
+SHA1 (geda/geda-symbols-1.4.0.tar.gz) = a4bb4ee080b5eb822dac42f6f983be6ec8e669c7
+RMD160 (geda/geda-symbols-1.4.0.tar.gz) = f40c545c24b091296f6faf5b836cf9616a55ecbb
+Size (geda/geda-symbols-1.4.0.tar.gz) = 833319 bytes
diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile
index 3d25f88bc5f..533e3749120 100644
--- a/cad/geda-utils/Makefile
+++ b/cad/geda-utils/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2007/08/11 15:09:16 joerg Exp $
+# $NetBSD: Makefile,v 1.44 2008/02/01 02:34:23 dmcmahill Exp $
 #
 
 DISTNAME=		geda-utils-${PKGVERSION}
-PKGREVISION=		1
 CATEGORIES=		cad
 
 MAINTAINER=		dmcmahill@NetBSD.org
diff --git a/cad/geda-utils/distinfo b/cad/geda-utils/distinfo
index 92b3f782d97..fba2fb2ad7d 100644
--- a/cad/geda-utils/distinfo
+++ b/cad/geda-utils/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.20 2007/05/31 12:48:33 dmcmahill Exp $
+$NetBSD: distinfo,v 1.21 2008/02/01 02:34:23 dmcmahill Exp $
 
-SHA1 (geda/geda-utils-20070526.tar.gz) = 742551219cd930438c4c74b995b986a8297b7801
-RMD160 (geda/geda-utils-20070526.tar.gz) = c66cbebb70001fb389f957e09c5003d7adbb11bb
-Size (geda/geda-utils-20070526.tar.gz) = 309717 bytes
+SHA1 (geda/geda-utils-1.4.0.tar.gz) = 725311fe02f6736f83f426c070e9fc40e42a231d
+RMD160 (geda/geda-utils-1.4.0.tar.gz) = 212ac8d9975ddbe02ea774e1cb897a91d6f28f23
+Size (geda/geda-utils-1.4.0.tar.gz) = 322537 bytes
diff --git a/cad/geda/Makefile.common b/cad/geda/Makefile.common
index f0325e23095..e76088e878b 100644
--- a/cad/geda/Makefile.common
+++ b/cad/geda/Makefile.common
@@ -1,7 +1,12 @@
-# $NetBSD: Makefile.common,v 1.12 2007/05/31 12:48:35 dmcmahill Exp $
+# $NetBSD: Makefile.common,v 1.13 2008/02/01 02:34:25 dmcmahill Exp $
 #
 
 DIST_SUBDIR=	geda
-PKGVERSION=	20070526
-MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
-		http://www.geda.seul.org/devel/${PKGVERSION}/
+PKGVERSION=	1.4.0
+MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/release/v1.4/${PKGVERSION}/ \
+		http://www.geda.seul.org/release/v1.4/${PKGVERSION}/
+
+USE_TOOLS+=		gmake
+CONFIGURE_ARGS+=	--disable-update-desktop-database
+CONFIGURE_ARGS+=	--disable-update-mime-database
+USE_PKGLOCALEDIR=	yes
diff --git a/cad/gnetlist/PLIST b/cad/gnetlist/PLIST
index d899e30b917..ed1c7257a8c 100644
--- a/cad/gnetlist/PLIST
+++ b/cad/gnetlist/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2007/05/31 12:48:33 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.11 2008/02/01 02:34:23 dmcmahill Exp $
 bin/gnetlist
 bin/mk_verilog_syms
 bin/sch2eaglepos.sh
@@ -30,6 +30,7 @@ share/gEDA/scheme/gnet-futurenet2.scm
 share/gEDA/scheme/gnet-geda.scm
 share/gEDA/scheme/gnet-gossip.scm
 share/gEDA/scheme/gnet-gsch2pcb.scm
+share/gEDA/scheme/gnet-mathematica.scm
 share/gEDA/scheme/gnet-maxascii.scm
 share/gEDA/scheme/gnet-osmond.scm
 share/gEDA/scheme/gnet-pads.scm
@@ -50,6 +51,7 @@ share/gEDA/scheme/gnet-verilog.scm
 share/gEDA/scheme/gnet-vhdl.scm
 share/gEDA/scheme/gnet-vipec.scm
 share/gEDA/scheme/gnetlist.scm
+share/gEDA/scheme/gnetlist-post.scm
 share/gEDA/system-gnetlistrc
 @unexec ${RMDIR} %D/share/doc/geda-doc/man 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/doc/geda-doc/readmes 2>/dev/null || ${TRUE}
diff --git a/cad/gnetlist/distinfo b/cad/gnetlist/distinfo
index 77a07d73991..23f8e7ac16e 100644
--- a/cad/gnetlist/distinfo
+++ b/cad/gnetlist/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.23 2007/05/31 12:48:33 dmcmahill Exp $
+$NetBSD: distinfo,v 1.24 2008/02/01 02:34:23 dmcmahill Exp $
 
-SHA1 (geda/geda-gnetlist-20070526.tar.gz) = 91eadb4b3dbf4a1355e70559565fcded64f93270
-RMD160 (geda/geda-gnetlist-20070526.tar.gz) = 37d09ffc935f0a3c7ac8aacaeaf4dc3e66fc9887
-Size (geda/geda-gnetlist-20070526.tar.gz) = 382149 bytes
+SHA1 (geda/geda-gnetlist-1.4.0.tar.gz) = 494e4d9f323a935f6a858138101b5bed6788ce2f
+RMD160 (geda/geda-gnetlist-1.4.0.tar.gz) = 4e2c295ae6033da05cdffd62c28c41c4a5443843
+Size (geda/geda-gnetlist-1.4.0.tar.gz) = 402250 bytes
 SHA1 (patch-aa) = 1fdc681538545f5712a423bc62b1ce89fbc7ff4c
diff --git a/cad/gschem/Makefile b/cad/gschem/Makefile
index 1b84386be06..04bffdb07aa 100644
--- a/cad/gschem/Makefile
+++ b/cad/gschem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2007/05/31 12:48:32 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.44 2008/02/01 02:34:22 dmcmahill Exp $
 #
 
 DISTNAME=		geda-gschem-${PKGVERSION}
@@ -10,20 +10,26 @@ HOMEPAGE=		http://www.geda.seul.org/
 COMMENT=		Schematic capture tool
 
 DEPENDS+=		geda-symbols-${PKGVERSION}{,nb[0-9]*}:../../cad/geda-symbols
+DEPENDS+=		gettext-tools>=0.14.6:../../devel/gettext-tools
 
 CONFLICTS+=		gEDA<19991011
 
 .include "../../cad/geda/Makefile.common"
 
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		pkg-config
+USE_TOOLS+=		bash intltool msgfmt pkg-config
 # otherwise the gettext stuff in here tries to do
 # /bin/sh /usr/bin/install -d /some/directory
 # but of course /usr/bin/install is a binary.
 MAKE_FLAGS+=		install_sh=${WRKSRC}/install-sh
-USE_PKGLOCALEDIR=	YES
+CONFIGURE_ARGS+=	--disable-update-desktop-database
+CONFIGURE_ARGS+=	--disable-update-mime-database
+
+REPLACE_BASH=		icon-theme-installer
 
 .include "../../cad/libgeda/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../devel/libstroke/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/gschem/PLIST b/cad/gschem/PLIST
index 6854b612cfd..c1c4f8faf59 100644
--- a/cad/gschem/PLIST
+++ b/cad/gschem/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.20 2007/05/31 12:48:32 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.21 2008/02/01 02:34:22 dmcmahill Exp $
 bin/gschem
 bin/gschemdoc
 man/man1/gschem.1
+share/applications/geda-gschem.desktop
 share/gEDA/bitmap/gschem-alignment_bottomcenter.png
 share/gEDA/bitmap/gschem-alignment_bottomleft.png
 share/gEDA/bitmap/gschem-alignment_bottomright.png
@@ -44,6 +45,7 @@ share/gEDA/gschem-gtkrc
 share/gEDA/gschem-lightbg
 share/gEDA/scheme/auto-place-attribs.scm
 share/gEDA/scheme/auto-uref.scm
+share/gEDA/scheme/default-attrib-positions.scm
 share/gEDA/scheme/generate_netlist.scm
 share/gEDA/scheme/gschem.scm
 share/gEDA/scheme/image.scm
@@ -52,14 +54,18 @@ share/gEDA/scheme/pcb.scm
 share/gEDA/scheme/print-NB-attribs.scm
 share/gEDA/scheme/print.scm
 share/gEDA/system-gschemrc
-share/locale/de_DE/LC_MESSAGES/geda-gschem.mo
-share/locale/es_ES/LC_MESSAGES/geda-gschem.mo
-share/locale/fr_FR/LC_MESSAGES/geda-gschem.mo
-share/locale/it_IT/LC_MESSAGES/geda-gschem.mo
-share/locale/ja_JP/LC_MESSAGES/geda-gschem.mo
-share/locale/nl_NL/LC_MESSAGES/geda-gschem.mo
-share/locale/pt_BR/LC_MESSAGES/geda-gschem.mo
-share/locale/ru/LC_MESSAGES/geda-gschem.mo
+share/icons/hicolor/48x48/apps/geda-gschem-48.png
+share/icons/hicolor/scalable/apps/geda-gschem.svg
+${PKGLOCALEDIR}/locale/af_ZA/LC_MESSAGES/geda-gschem.mo
+${PKGLOCALEDIR}/locale/de_DE/LC_MESSAGES/geda-gschem.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/geda-gschem.mo
+${PKGLOCALEDIR}/locale/es_ES/LC_MESSAGES/geda-gschem.mo
+${PKGLOCALEDIR}/locale/fr_FR/LC_MESSAGES/geda-gschem.mo
+${PKGLOCALEDIR}/locale/it_IT/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
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/geda-gschem.mo
 @dirrm share/gEDA/bitmap
 @unexec ${RMDIR} %D/share/doc/geda-doc 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/gEDA/scheme 2>/dev/null || ${TRUE}
diff --git a/cad/gschem/distinfo b/cad/gschem/distinfo
index e6f1f0dbaa4..756c2b4c2dc 100644
--- a/cad/gschem/distinfo
+++ b/cad/gschem/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.25 2007/05/31 12:48:32 dmcmahill Exp $
+$NetBSD: distinfo,v 1.26 2008/02/01 02:34:22 dmcmahill Exp $
 
-SHA1 (geda/geda-gschem-20070526.tar.gz) = 48fb4acfc628bb64fdc8c1c047671b31c3fd7778
-RMD160 (geda/geda-gschem-20070526.tar.gz) = 76eb9285c8ff4e6f5ee0edb05d8ccd618e6dbaff
-Size (geda/geda-gschem-20070526.tar.gz) = 1100946 bytes
-SHA1 (patch-aa) = 749ad5d273b3ef4da318d63171c4ec50214d72ea
-SHA1 (patch-ab) = 338c3ceaafb9fb15ea669bd6442a40899e040854
+SHA1 (geda/geda-gschem-1.4.0.tar.gz) = 0bdc4e350019f2193eda6f065277008538f06747
+RMD160 (geda/geda-gschem-1.4.0.tar.gz) = d7b8a05a5000f333102b9e286c8aac69223ae329
+Size (geda/geda-gschem-1.4.0.tar.gz) = 1120760 bytes
diff --git a/cad/gschem/patches/patch-aa b/cad/gschem/patches/patch-aa
deleted file mode 100644
index 12bf2fd2e1a..00000000000
--- a/cad/gschem/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aa,v 1.16 2007/05/31 12:48:32 dmcmahill Exp $
-
---- configure.ac.orig	2007-05-26 14:46:25.000000000 +0000
-+++ configure.ac	2007-05-29 16:23:31.000000000 +0000
-@@ -400,5 +400,5 @@
-                 [AC_DEFINE([HAVE_LOCALE_H], 1, [Define if you have locale.h])],
-                 [
--                  if test "$USE_NLS" == "yes"; then
-+                  if test "$USE_NLS" = "yes"; then
-                     AC_MSG_ERROR([Cannot find useful locale.h, and nls support is enabled. Try compiling with --disable-nls])
-                   fi
diff --git a/cad/gschem/patches/patch-ab b/cad/gschem/patches/patch-ab
deleted file mode 100644
index 4610fb8dbfd..00000000000
--- a/cad/gschem/patches/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ab,v 1.10 2007/05/31 12:48:33 dmcmahill Exp $
-
---- configure.orig	2007-05-26 14:46:42.000000000 +0000
-+++ configure	2007-05-29 16:23:44.000000000 +0000
-@@ -7515,5 +7515,5 @@
- else
- 
--                  if test "$USE_NLS" == "yes"; then
-+                  if test "$USE_NLS" = "yes"; then
-                     { { echo "$as_me:$LINENO: error: Cannot find useful locale.h, and nls support is enabled. Try compiling with --disable-nls" >&5
- echo "$as_me: error: Cannot find useful locale.h, and nls support is enabled. Try compiling with --disable-nls" >&2;}
diff --git a/cad/gsymcheck/distinfo b/cad/gsymcheck/distinfo
index 99777b1499f..3490f233b39 100644
--- a/cad/gsymcheck/distinfo
+++ b/cad/gsymcheck/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.19 2007/05/31 12:48:33 dmcmahill Exp $
+$NetBSD: distinfo,v 1.20 2008/02/01 02:34:23 dmcmahill Exp $
 
-SHA1 (geda/geda-gsymcheck-20070526.tar.gz) = a7f865c226e6c133cce46a711a880f372c405838
-RMD160 (geda/geda-gsymcheck-20070526.tar.gz) = ae57d37d4722e8d00ad77723b5b9f69a7183a27b
-Size (geda/geda-gsymcheck-20070526.tar.gz) = 152580 bytes
+SHA1 (geda/geda-gsymcheck-1.4.0.tar.gz) = 28af761573b682f93dff5936cc6d01458080239e
+RMD160 (geda/geda-gsymcheck-1.4.0.tar.gz) = 22cdbb0e5e6e7a1afff40e1be6d069ddac0ccd3d
+Size (geda/geda-gsymcheck-1.4.0.tar.gz) = 169129 bytes
diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile
index dfab2acc9ab..651220e769d 100644
--- a/cad/libgeda/Makefile
+++ b/cad/libgeda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2006/10/23 09:43:12 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.43 2008/02/01 02:34:20 dmcmahill Exp $
 #
 
 DISTNAME=		libgeda-${PKGVERSION}
@@ -12,11 +12,20 @@ CONFLICTS+=		gEDA<19991011
 
 .include "../../cad/geda/Makefile.common"
 
+DEPENDS+=               gettext-tools>=0.14.6:../../devel/gettext-tools
+
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-USE_TOOLS+=		pkg-config
+USE_TOOLS+=		bash intltool msgfmt pkg-config
+CONFIGURE_ARGS+=	--disable-update-mime-database
+
+REPLACE_BASH=		icon-theme-installer
 
+.include "../../databases/shared-mime-info/mimedb.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/guile/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/libgeda/PLIST b/cad/libgeda/PLIST
index 29a86440ff3..22475fd275f 100644
--- a/cad/libgeda/PLIST
+++ b/cad/libgeda/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.12 2006/09/01 12:00:43 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.13 2008/02/01 02:34:21 dmcmahill Exp $
 include/libgeda/colors.h
 include/libgeda/defines.h
 include/libgeda/funcs.h
+include/libgeda/geda_list.h
 include/libgeda/globals.h
 include/libgeda/i_vars.h
 include/libgeda/libgeda.h
@@ -12,5 +13,34 @@ include/libgeda/struct.h
 lib/libgeda.la
 lib/pkgconfig/libgeda.pc
 share/gEDA/prolog.ps
+share/gEDA/scheme/geda.scm
+share/gEDA/system-gafrc
+share/icons/hicolor/16x16/mimetypes/application-x-geda-gsch2pcb-project-16.png
+share/icons/hicolor/16x16/mimetypes/application-x-geda-schematic-16.png
+share/icons/hicolor/16x16/mimetypes/application-x-geda-symbol-16.png
+share/icons/hicolor/22x22/mimetypes/application-x-geda-gsch2pcb-project-22.png
+share/icons/hicolor/22x22/mimetypes/application-x-geda-schematic-22.png
+share/icons/hicolor/22x22/mimetypes/application-x-geda-symbol-22.png
+share/icons/hicolor/24x24/mimetypes/application-x-geda-gsch2pcb-project-24.png
+share/icons/hicolor/24x24/mimetypes/application-x-geda-schematic-24.png
+share/icons/hicolor/24x24/mimetypes/application-x-geda-symbol-24.png
+share/icons/hicolor/32x32/mimetypes/application-x-geda-gsch2pcb-project-32.png
+share/icons/hicolor/32x32/mimetypes/application-x-geda-schematic-32.png
+share/icons/hicolor/32x32/mimetypes/application-x-geda-symbol-32.png
+share/icons/hicolor/48x48/mimetypes/application-x-geda-gsch2pcb-project-48.png
+share/icons/hicolor/48x48/mimetypes/application-x-geda-schematic-48.png
+share/icons/hicolor/48x48/mimetypes/application-x-geda-symbol-48.png
+share/icons/hicolor/scalable/mimetypes/application-x-geda-gsch2pcb-project.svg
+share/icons/hicolor/scalable/mimetypes/application-x-geda-schematic.svg
+share/icons/hicolor/scalable/mimetypes/application-x-geda-symbol.svg
+${PKGLOCALEDIR}/locale/de_DE/LC_MESSAGES/libgeda33.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/libgeda33.mo
+${PKGLOCALEDIR}/locale/es_ES/LC_MESSAGES/libgeda33.mo
+${PKGLOCALEDIR}/locale/nl_NL/LC_MESSAGES/libgeda33.mo
+share/mime/packages/libgeda.xml
+share/mimelnk/application/x-geda-gsch2pcb-project.desktop
+share/mimelnk/application/x-geda-schematic.desktop
+share/mimelnk/application/x-geda-symbol.desktop
+@dirrm share/gEDA/scheme
 @dirrm share/gEDA
 @dirrm include/libgeda
diff --git a/cad/libgeda/buildlink3.mk b/cad/libgeda/buildlink3.mk
index fc53f5610bd..55fd5f0111c 100644
--- a/cad/libgeda/buildlink3.mk
+++ b/cad/libgeda/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2007/05/31 12:48:32 dmcmahill Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2008/02/01 02:34:21 dmcmahill Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBGEDA_BUILDLINK3_MK:=	${LIBGEDA_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+=	libgeda
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgeda
 
 .if !empty(LIBGEDA_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libgeda+=	libgeda-20070526{,nb[0-9]*}
-BUILDLINK_ABI_DEPENDS.libgeda?=	libgeda-20070526{,nb[0-9]*}
+BUILDLINK_API_DEPENDS.libgeda+=	libgeda-1.4.0{,nb[0-9]*}
+BUILDLINK_ABI_DEPENDS.libgeda?=	libgeda-1.4.0{,nb[0-9]*}
 BUILDLINK_PKGSRCDIR.libgeda?=	../../cad/libgeda
 .endif	# LIBGEDA_BUILDLINK3_MK
 
diff --git a/cad/libgeda/distinfo b/cad/libgeda/distinfo
index 4834ee5ce95..0fb6723a29d 100644
--- a/cad/libgeda/distinfo
+++ b/cad/libgeda/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.19 2007/05/31 12:48:32 dmcmahill Exp $
+$NetBSD: distinfo,v 1.20 2008/02/01 02:34:21 dmcmahill Exp $
 
-SHA1 (geda/libgeda-20070526.tar.gz) = df0e83ca16bcbb2b6de2c8692cb29357000cc52d
-RMD160 (geda/libgeda-20070526.tar.gz) = 1201f7f3d9e933e5083e6b730593ff9beefb33d7
-Size (geda/libgeda-20070526.tar.gz) = 633422 bytes
+SHA1 (geda/libgeda-1.4.0.tar.gz) = d169b31f938f0ddc2e51499892de88c61467afd3
+RMD160 (geda/libgeda-1.4.0.tar.gz) = 40076de4e0b8509eacecbef1356af163c67372cd
+Size (geda/libgeda-1.4.0.tar.gz) = 1010177 bytes
+SHA1 (patch-aa) = c613ba03180a163a384f022c52eb4de69448b2b5
diff --git a/cad/libgeda/patches/patch-aa b/cad/libgeda/patches/patch-aa
new file mode 100644
index 00000000000..4b8b19db6d9
--- /dev/null
+++ b/cad/libgeda/patches/patch-aa
@@ -0,0 +1,10 @@
+$NetBSD: patch-aa,v 1.3 2008/02/01 02:34:21 dmcmahill Exp $
+
+--- src/o_picture.c.orig	2008-01-06 00:09:11.000000000 +0000
++++ src/o_picture.c	2008-01-31 17:39:27.000000000 +0000
+@@ -24,4 +24,5 @@
+ #include <string.h>
+ #endif
++#include <libgen.h>
+ #include <math.h>
+