6 files changed, 17 insertions, 131 deletions

diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index 22e812ed8866..014ff91aaa2a 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	autotrace
-PORTVERSION=	0.29
-PORTREVISION=	1
+PORTVERSION=	0.30
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} 
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	kanou@mil.allnet.ne.jp
@@ -29,9 +28,15 @@ LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 
 USE_AUTOCONF=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" \
+		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/ming"
 USE_XLIB=	yes
 
-pre-install:
-	@(cd ${WRKSRC} ; perl -p -i.bak -e s/\\@OBJEXT\\@/o/ Makefile)	
+MAN1=		autotrace.1
+
+pre-patch:
+	@${PERL} -pi.orig -e \
+		's|\$$\(libdir\)/pkgconfig|\$$\(prefix\)/libdata/pkgconfig|' \
+		${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/graphics/autotrace/distinfo b/graphics/autotrace/distinfo
index a2ed3c9abe4b..ce57c1ea0552 100644
--- a/graphics/autotrace/distinfo
+++ b/graphics/autotrace/distinfo
@@ -1 +1 @@
-MD5 (autotrace-0.29.tar.gz) = 39ff756fc6d8a8cdd4616e311e1066b8
+MD5 (autotrace-0.30.tar.gz) = 979efa47568d41eb4d804e2658f3cade
diff --git a/graphics/autotrace/files/patch-aa b/graphics/autotrace/files/patch-aa
deleted file mode 100644
index a029db4e4715..000000000000
--- a/graphics/autotrace/files/patch-aa
+++ /dev/null
@@ -1,123 +0,0 @@
---- configure.in.orig	Sat Dec  8 11:28:42 2001
-+++ configure.in	Mon Dec 24 13:12:03 2001
-@@ -84,55 +84,75 @@
- 	                     AC_MSG_WARN(*** ZLIB header files not found: PNG Input will be disabled. ***)),
- 	     AC_MSG_WARN(*** ZLIB library files not found: PNG Input will be disabled. ***))
- 
--dnl Test for libpng
--HAVE_LIBPNG_STAGE1=no
--AC_CHECK_LIB(png, png_get_image_width,
--	HAVE_LIBPNG_STAGE1=yes ,,-lz)
--
--HAVE_LIBPNG=no
--if test "x$HAVE_LIBPNG_STAGE1" = "xyes" ; then
--	AC_CHECK_LIB(png, png_read_png,
--		HAVE_LIBPNG=yes ,,-lz)
--	if test "x$HAVE_LIBPNG" = "xyes" ; then
--		LIBPNG_LDFLAGS="-lpng -lz"
--		AC_SUBST(LIBPNG_LDFLAGS)
--		AC_DEFINE(HAVE_LIBPNG)
--	else
--	   AC_MSG_WARN([*** libpng exists but cannot find png_read_png in the libpng. ***])
--	   AC_MSG_WARN([*** libpng might be old.                                      ***])
--	   AC_MSG_WARN([*** You need libpng 1.0.6 or higher.                          ***])
--	   AC_MSG_WARN([*** Png input handler is disabled.                            ***])
--	fi
--else
--	AC_MSG_WARN([*** Cannot find libpng.            ***])
--	AC_MSG_WARN([*** Png input handler is disabled. ***])
--fi
--AM_CONDITIONAL(HAVE_LIBPNG, test x$HAVE_LIBPNG = xyes)
--
- dnl
--dnl LIBMING(LIBSWF)
-+dnl commented out by porter.
- dnl
--HAVE_LIBSWF=no
- 
--AC_CHECK_HEADER(ming.h,
--	        swf_header_found=yes,
--		swf_header_found=no)
--if test "${swf_header_found}" = yes ; then
--	AC_CHECK_LIB(ming, Ming_init, 
--		     HAVE_LIBSWF=yes,,-lm)
--	if test "$HAVE_LIBSWF" = "yes" ; then
--		LIBSWF_LDFLAGS="-lming -lm"
--		AC_SUBST(LIBSWF_LDFLAGS)
--		AC_DEFINE(HAVE_LIBSWF)
--	else
-- 		AC_MSG_WARN([*** Cannot find libming.    ***])
--		AC_MSG_WARN([*** SWF output is disabled. ***])
--	fi
--else
--	AC_MSG_WARN([*** Cannot find ming.h.     ***])
--	AC_MSG_WARN([*** SWF output is disabled. ***])
--fi
-+dnl dnl Test for libpng
-+dnl HAVE_LIBPNG_STAGE1=no
-+dnl AC_CHECK_LIB(png, png_get_image_width,
-+dnl 	HAVE_LIBPNG_STAGE1=yes ,,-lz)
-+
-+dnl HAVE_LIBPNG=no
-+dnl if test "x$HAVE_LIBPNG_STAGE1" = "xyes" ; then
-+dnl 	AC_CHECK_LIB(png, png_read_png,
-+dnl 		HAVE_LIBPNG=yes ,,-lz)
-+dnl 	if test "x$HAVE_LIBPNG" = "xyes" ; then
-+dnl 		LIBPNG_LDFLAGS="-lpng -lz"
-+dnl 		AC_SUBST(LIBPNG_LDFLAGS)
-+dnl 		AC_DEFINE(HAVE_LIBPNG)
-+dnl 	else
-+dnl 	   AC_MSG_WARN([*** libpng exists but cannot find png_read_png in the libpng. ***])
-+dnl 	   AC_MSG_WARN([*** libpng might be old.                                      ***])
-+dnl 	   AC_MSG_WARN([*** You need libpng 1.0.6 or higher.                          ***])
-+dnl 	   AC_MSG_WARN([*** Png input handler is disabled.                            ***])
-+dnl 	fi
-+dnl else
-+dnl 	AC_MSG_WARN([*** Cannot find libpng.            ***])
-+dnl 	AC_MSG_WARN([*** Png input handler is disabled. ***])
-+dnl fi
-+dnl AM_CONDITIONAL(HAVE_LIBPNG, test x$HAVE_LIBPNG = xyes)
-+
-+dnl dnl
-+dnl dnl LIBMING(LIBSWF)
-+dnl dnl
-+dnl HAVE_LIBSWF=no
-+dnl 
-+dnl AC_CHECK_HEADER(ming/ming.h,
-+dnl 	        swf_header_found=yes,
-+dnl 		swf_header_found=no)
-+dnl if test "${swf_header_found}" = yes ; then
-+dnl 	AC_CHECK_LIB(ming, Ming_init, 
-+dnl 		     HAVE_LIBSWF=yes,,-lm)
-+dnl 	if test "$HAVE_LIBSWF" = "yes" ; then
-+dnl 		LIBSWF_LDFLAGS="-lming -lm"
-+dnl 		AC_SUBST(LIBSWF_LDFLAGS)
-+dnl 		AC_DEFINE(HAVE_LIBSWF)
-+dnl 	else
-+dnl  		AC_MSG_WARN([*** Cannot find libming.    ***])
-+dnl 		AC_MSG_WARN([*** SWF output is disabled. ***])
-+dnl 	fi
-+dnl else
-+dnl 	AC_MSG_WARN([*** Cannot find ming.h.     ***])
-+dnl 	AC_MSG_WARN([*** SWF output is disabled. ***])
-+dnl fi
-+dnl AM_CONDITIONAL(HAVE_LIBSWF, test x$HAVE_LIBSWF = xyes)
-+
-+AC_MSG_WARN("************************************")
-+AC_MSG_WARN("*** \ \ forcing HAVE_LIBPNG=yes. \ \ \*\*\*")
-+HAVE_LIBPNG=yes
-+LIBPNG_LDFLAGS="-lpng -lz"
-+AC_SUBST(LIBPNG_LDFLAGS)
-+AC_DEFINE(HAVE_LIBPNG)
-+AM_CONDITIONAL(HAVE_LIBPNG, test x$HAVE_LIBPNG = xyes)
-+
-+AC_MSG_WARN("*** \ \ forcing HAVE_LIBSWF=yes. \ \ \*\*\*")
-+HAVE_LIBSWF=yes
-+LIBSWF_LDFLAGS="-lming -lm"
-+AC_SUBST(LIBSWF_LDFLAGS)
-+AC_DEFINE(HAVE_LIBSWF)
- AM_CONDITIONAL(HAVE_LIBSWF, test x$HAVE_LIBSWF = xyes)
-+AC_MSG_WARN("************************************")
- 
- AC_CHECK_HEADERS(malloc.h)
- 
diff --git a/graphics/autotrace/pkg-comment b/graphics/autotrace/pkg-comment
index 1907a62df961..ed19af7340da 100644
--- a/graphics/autotrace/pkg-comment
+++ b/graphics/autotrace/pkg-comment
@@ -1 +1 @@
-convert bitmap to vector graphics
+Convert bitmap to vector graphics
diff --git a/graphics/autotrace/pkg-descr b/graphics/autotrace/pkg-descr
index 74c2ae65c4b5..bc1c7428b7c5 100644
--- a/graphics/autotrace/pkg-descr
+++ b/graphics/autotrace/pkg-descr
@@ -1,4 +1,4 @@
 AutoTrace is a utility that converts bitmap to vector graphics.
 
 For more information, see
-WWW: http://AutoTrace.sourceforge.net/ .
+WWW: http://AutoTrace.sourceforge.net/
diff --git a/graphics/autotrace/pkg-plist b/graphics/autotrace/pkg-plist
index c4c88fedf1a3..a3624173749e 100644
--- a/graphics/autotrace/pkg-plist
+++ b/graphics/autotrace/pkg-plist
@@ -3,6 +3,10 @@ bin/autotrace
 bin/autotrace-config
 share/aclocal/autotrace.m4
 @unexec rmdir %D/share/aclocal 2>/dev/null || true
+libdata/pkgconfig/autotrace.pc
+@unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true
 include/autotrace/types.h
 include/autotrace/autotrace.h
+include/autotrace/input.h
+include/autotrace/exception.h
 @dirrm include/autotrace