update to gerbv-1.0.2

Changes are:
* Removed all build support for GTK1.
* Dino Ghilardi fixed log.c (the last reminder of GTK1) so
  log windows popup don't crash gerbv anymore.
* Dan McMahill added the GCC4 patch.
* Renamed stack_t to macro_stack_t to support darwin/MacOS X
  pointed out by Daniel Mack.
* Changed build system to suit new autoconf/automake versions.
  Caused gerbv not to find init.scm.
* Fixed a bug so gerbv can handle negative coordinates when using
  trailing zeroes.
* Better checking of return values for errors.
* Use setlocale explicit so your locale doesn't screw up sscanf
  and strtod to use comma (,) instead of dot (.).
* For distributions there is a new directory called desktop, where
  gerbv.desktop and gerbv.png is stored for desktop settings.
  Submitted to Debian bug list from Vassilis Pandis for Ubuntu.

4 files changed, 11 insertions, 29 deletions

diff --git a/cad/gerbv/DESCR b/cad/gerbv/DESCR
index 8493e49e4d3..3d15936538e 100644
--- a/cad/gerbv/DESCR
+++ b/cad/gerbv/DESCR
@@ -1,5 +1,4 @@
-Gerber Viewer (gerbv) is a viewer for Gerber files. Gerber files are
+Gerber Viewer (gerbv) is a viewer for RS-274-X (Gerber) files
+as well as NC (numerical control) drill files. Gerber files are
 generated from PCB CAD system and sent to PCB manufacturers as basis
 for the manufacturing process.
-
-Additionally, gerbv can read and display NC drill files.
diff --git a/cad/gerbv/Makefile b/cad/gerbv/Makefile
index 747c253bd2d..97b23df045a 100644
--- a/cad/gerbv/Makefile
+++ b/cad/gerbv/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2006/04/17 13:46:17 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2006/08/08 11:46:50 dmcmahill Exp $
 #
 
-DISTNAME=	gerbv-1.0.1
-PKGREVISION=	2
+DISTNAME=	gerbv-1.0.2
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gerbv/}
 
@@ -14,9 +13,9 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
 
 CONFIGURE_ARGS+=	--enable-exportpng
 GNU_CONFIGURE=	YES
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake pkg-config
 
-.include "../../graphics/gdk-pixbuf/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/gerbv/distinfo b/cad/gerbv/distinfo
index 971812da490..5a2665bd3ca 100644
--- a/cad/gerbv/distinfo
+++ b/cad/gerbv/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.15 2006/07/13 06:58:37 gson Exp $
+$NetBSD: distinfo,v 1.16 2006/08/08 11:46:50 dmcmahill Exp $
 
-SHA1 (gerbv-1.0.1.tar.gz) = 7cc6b59959888cfb83df63f616d86e83f10b7c1f
-RMD160 (gerbv-1.0.1.tar.gz) = bc1564a43f0cf8d3052735bb424879bdc27ec95f
-Size (gerbv-1.0.1.tar.gz) = 1033739 bytes
-SHA1 (patch-aa) = 5341d1b1bbc075731b79262126768991b0ad534f
+SHA1 (gerbv-1.0.2.tar.gz) = 4ed3bd604eaf6bbefc868f3eb6e379d28ecc0f84
+RMD160 (gerbv-1.0.2.tar.gz) = f5d7e00fd9576f6ed8d0f1dee457fc9dd2c98c26
+Size (gerbv-1.0.2.tar.gz) = 1066247 bytes
diff --git a/cad/gerbv/patches/patch-aa b/cad/gerbv/patches/patch-aa
deleted file mode 100644
index b3d37db51aa..00000000000
--- a/cad/gerbv/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2006/07/13 06:58:37 gson Exp $
-
---- src/drill.c.orig	2005-01-09 23:51:57.000000000 +0200
-+++ src/drill.c
-@@ -217,8 +217,8 @@ parse_drillfile(gerb_file_t *fd)
- 	    /* KLUDGE. This function isn't allowed to return anything
- 	       but inches */
- 	    if(state->unit == MM) {
--		(double)curr_net->start_x /= 25.4;
--		(double)curr_net->start_y /= 25.4;
-+		curr_net->start_x /= 25.4;
-+		curr_net->start_y /= 25.4;
- 		/* KLUDGE. All images, regardless of input format,
- 		   are returned in INCH format */
- 		curr_net->unit = INCH;