Update to 0.29. Changes since 0.26:

version 0.29 (Fixes the lowercase/uppercase problems, fix for swf export,
new MIF and CGM export, code rearrangements)
version 0.28 (Several bugfixes, Progress bar, Cancel point, Efforts to
make libautotrace.a thread-safe, Clean up library name space (all
exported symbols have "at_" prefix), DXF, EPD and PDF export, Despeckling
filter)
version 0.27a (Fixed a compilation problem)
version 0.27 (Parts of the code were rearranged, fixed a bug in color
quantization, centerline support, Elastic Reality output, now works with
new versions of ImageMagick, swf output (via libming), dxf output was
removed because it never worked, speed up and simplification of the
fitting routine)
Should also fix bulk build failure.

5 files changed, 38 insertions, 43 deletions

diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index 03d80742de6..8dfaec51df6 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.7 2001/10/24 22:10:59 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2002/01/03 14:03:01 wiz Exp $
 #
 
-DISTNAME=	autotrace-0.26
+DISTNAME=	autotrace-0.29
 CATEGORIES=	graphics cad
-MASTER_SITES=	http://homepages.go.com/homepages/m/a/r/martweb/ \
-		ftp://autotrace.sourceforge.net/pub/autotrace/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=autotrace/}
 
 MAINTAINER=	rh@netbsd.org
-HOMEPAGE=	http://homepages.go.com/homepages/m/a/r/martweb/AutoTrace.htm
+HOMEPAGE=	http://autotrace.sourceforge.net/
 COMMENT=	convert bitmap to vector graphics
 
 USE_BUILDLINK_ONLY=	YES
diff --git a/graphics/autotrace/PLIST b/graphics/autotrace/PLIST
index a0b283b6da5..7332c4e17cd 100644
--- a/graphics/autotrace/PLIST
+++ b/graphics/autotrace/PLIST
@@ -1,2 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:17 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/01/03 14:03:02 wiz Exp $
 bin/autotrace
+bin/autotrace-config
+include/autotrace/autotrace.h
+include/autotrace/types.h
+lib/libautotrace.a
+share/aclocal/autotrace.m4
+@dirrm include/autotrace
diff --git a/graphics/autotrace/distinfo b/graphics/autotrace/distinfo
index d34fa1850d0..2a215b04aee 100644
--- a/graphics/autotrace/distinfo
+++ b/graphics/autotrace/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/08/23 21:32:17 jlam Exp $
+$NetBSD: distinfo,v 1.4 2002/01/03 14:03:02 wiz Exp $
 
-SHA1 (autotrace-0.26.tar.gz) = 5d0d86e9eacdfb8ccb5214735b316cd345f8e5bb
-Size (autotrace-0.26.tar.gz) = 119613 bytes
-SHA1 (patch-aa) = f90fae93064171c057873489dc7daa26048dc118
-SHA1 (patch-ab) = fd641419c0402854955419c238e42f06197665d6
+SHA1 (autotrace-0.29.tar.gz) = f503eec18bd76fa25d0ac3913505057163fd9818
+Size (autotrace-0.29.tar.gz) = 212608 bytes
+SHA1 (patch-ab) = 2aa7a9bb4d42591384aae0d24488c06df9c31e7c
diff --git a/graphics/autotrace/patches/patch-aa b/graphics/autotrace/patches/patch-aa
deleted file mode 100644
index 63d9d0eb308..00000000000
--- a/graphics/autotrace/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2001/02/15 15:25:57 wiz Exp $
-
---- input-magick.c.orig	Mon Nov 13 16:43:34 2000
-+++ input-magick.c
-@@ -32,7 +32,7 @@
- #else
-   image=ReadImage(image_info,&exception);
-   if (image == (Image *) NULL)
--    MagickError(exception.severity,exception.message,exception.qualifier);
-+    MagickError(exception.severity,exception.reason,exception.description);
- #endif
-   
-   image_type=GetImageType(image);
diff --git a/graphics/autotrace/patches/patch-ab b/graphics/autotrace/patches/patch-ab
index 9ce74e19983..fbf647bb822 100644
--- a/graphics/autotrace/patches/patch-ab
+++ b/graphics/autotrace/patches/patch-ab
@@ -1,25 +1,29 @@
-$NetBSD: patch-ab,v 1.1 2001/08/23 21:32:18 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2002/01/03 14:03:02 wiz Exp $
 
---- configure.orig	Wed Nov 15 12:11:09 2000
+--- configure.orig	Mon Dec 24 11:57:35 2001
 +++ configure
-@@ -1139,9 +1139,9 @@
+@@ -1152,9 +1152,9 @@
    echo "$ac_t""no" 1>&6
  fi
  
--if test "x$MAGICK_CONFIG" = "xMagick-config" ; then
-+if test "x$MAGICK_CONFIG" != "x" ; then
- 	CPPFLAGS_BACKUP="$CPPFLAGS"
--	CPPFLAGS=`Magick-config --cppflags`
-+	CPPFLAGS=`$MAGICK_CONFIG --cppflags`
- 	ac_safe=`echo "magick/api.h" | sed 'y%./+-%__p_%'`
+-	if test "x$MAGICK_CONFIG" = "xMagick-config" ; then
++	if test "x$MAGICK_CONFIG" != "x" ; then
+ 		CPPFLAGS_BACKUP="$CPPFLAGS"
+-		CPPFLAGS=`Magick-config --cppflags`
++		CPPFLAGS=`$MAGICK_CONFIG --cppflags`
+ 		ac_safe=`echo "magick/api.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for magick/api.h""... $ac_c" 1>&6
- echo "configure:1148: checking for magick/api.h" >&5
-@@ -1180,7 +1180,7 @@
- 	CPPFLAGS=${CPPFLAGS_BACKUP}
- 
- 	if test "x${magick_header_found}" = xyes ; then
--		MAGICK_LDFLAGS="`Magick-config --ldflags` `Magick-config --libs`"
-+		MAGICK_LDFLAGS="`$MAGICK_CONFIG --ldflags` `$MAGICK_CONFIG --libs`"
- 		
- 		
- 		HAVE_MAGICK=yes
+ echo "configure:1161: checking for magick/api.h" >&5
+@@ -1192,10 +1192,10 @@
+ 		MAGICK_CFLAGS=${CPPFLAGS}
+ 		CPPFLAGS=${CPPFLAGS_BACKUP}
+ 		if test "x${magick_header_found}" = xyes ; then
+-			MAGICK_LDFLAGS="`Magick-config --ldflags` `Magick-config --libs`"
++			MAGICK_LDFLAGS="`$MAGICK_CONFIG --ldflags` `$MAGICK_CONFIG --libs`"
+ 												echo $ac_n "checking ImageMagick - version >= 5.2.1""... $ac_c" 1>&6
+ echo "configure:1198: checking ImageMagick - version >= 5.2.1" >&5
+-						MAGICK_VERSION=`Magick-config --version`
++						MAGICK_VERSION=`$MAGICK_CONFIG --version`
+ 						MAGICK_MAJOR_VERSION=`echo $MAGICK_VERSION \
+ 			| sed -e "s/^\([0-9]*\).[0-9]*.[0-9]*$/\1/"`
+ 			MAGICK_MINOR_VERSION=`echo $MAGICK_VERSION \