Update pstoedit to 3.50.

While here, remove restriction, it's "please", not "have to".
 see: http://packages.debian.org/changelogs/pool/main/p/pstoedit/pstoedit_3.45-8/pstoedit.copyright

New or changed in 3.50:

    * added an option (-gs) to specify the full path to GhostScript (under
      Windows - either the .exe or the DLL). This can be used by portable
      applications to direct pstoedit to use a specific GhostScript version.
    * Stanislav Brabec contributed several improvements to the PCB driver. See
      http://www.penguin.cz/~utx/pstoedit-pcb/ on how these can be useful.
    * Scott Pakin submitted several improvements to the mpost driver and the
      font substitution mechanism.
    * new driver for .vtk files e.g. for ParaView - http://www.paraview.org/
      - but this is still a very basic version. Thanks to Mitesh Patel for
      initiating and testing.
    * new driver for cairo (http://cairographics.org/ ) contributed by Dan
      McMahill. This driver generates C-code which can be compiled and linked
      against the cairo libraries. See the contrib/cairo directory for an
      example.
    * several improvements on the DXF driver as suggested and sponsored by
      Markus Meyer.
    * because pstoedit may write its output to stdout, all output written by
      GhostScript to stdout is now redirected to stderr in order to avoid mixed
      output.
    * added a -q option to suppress the initial startup message of pstoedit.
      This can by useful when being called via a pipe, e.g. from inkscape.
      However, note that this does not suppress all output written to stderr -
      see also note above.
    * John Bowman fixed a number of problems related to clipping and image
      support for the Asymptote backend.
    * fixed a compilation problem with g++ V4.x.
    * new driver for gcode (.ngc files) (tested with emc see
      http://linuxcnc.org). Contributed by Lawrence Glaister.
    * some adaptations for newer versions of libming
    * fixed a line width problem for xfig format.
    * corrected the broken pstoedit.m4 - thanks to Ian Abbott
    * some minor code beautifying.

7 files changed, 55 insertions, 40 deletions

diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index ae2c0075ee4..5034686eae3 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -1,23 +1,15 @@
-# $NetBSD: Makefile,v 1.48 2010/04/09 01:38:32 obache Exp $
+# $NetBSD: Makefile,v 1.49 2010/04/13 06:53:19 obache Exp $
 
-DISTNAME=	pstoedit-3.45
-PKGREVISION=	7
+DISTNAME=	pstoedit-3.50
 CATEGORIES=	converters graphics print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pstoedit/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.pstoedit.net/
 COMMENT=	Convert PostScript / PDF into various vector graphic formats
-LICENSE=	unclear-license
-
+#LICENSE=	gnu-gpl-v2
 # man page indicates that there are many licenses and one has to read all
 # the source files
-RESTRICTED=	license is unclear
-RESTRICTED?=	"The author writes: If you include this program on a CDROM, please send me a copy of the CD, or if it goes with a book, of the book."
-NO_SRC_ON_FTP=		${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -29,7 +21,7 @@ USE_LIBTOOL=	yes
 USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CXXFLAGS="${CFLAGS} -Dunix"
-CONFIGURE_ENV+=	ac_cv_path_GS=${LOCALBASE}/bin/gs
+CONFIGURE_ENV+=	ac_cv_path_GS=${TOOLS_PATH.gs}
 
 # needs libEMF which has build problems on alpha and probably
 # other 64-bit systems
@@ -57,5 +49,5 @@ post-install:
 .include "../../graphics/ImageMagick/buildlink3.mk"
 .include "../../graphics/plotutils/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../..//multimedia/ming/buildlink3.mk"
+.include "../../multimedia/ming/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/pstoedit/PLIST b/graphics/pstoedit/PLIST
index 395eb8ede58..1e400b22ccc 100644
--- a/graphics/pstoedit/PLIST
+++ b/graphics/pstoedit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:59:25 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2010/04/13 06:53:19 obache Exp $
 bin/pstoedit
 include/pstoedit/base64writer.h
 include/pstoedit/cppcomp.h
@@ -18,8 +18,9 @@ lib/pstoedit/libpstoedit.la
 lib/pstoedit/pkgconfig/pstoedit.pc
 lib/pstoedit/pstoedit/libp2edrvlplot.la
 lib/pstoedit/pstoedit/libp2edrvmagick++.la
-lib/pstoedit/pstoedit/libp2edrvswf.la
 lib/pstoedit/pstoedit/libp2edrvstd.la
+lib/pstoedit/pstoedit/libp2edrvswf.la
+man/man1/pstoedit.1
 share/aclocal/pstoedit.m4
 share/doc/html/pstoedit/changelog.htm
 share/doc/html/pstoedit/index.htm
diff --git a/graphics/pstoedit/distinfo b/graphics/pstoedit/distinfo
index 9ac19346076..5aab220e666 100644
--- a/graphics/pstoedit/distinfo
+++ b/graphics/pstoedit/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.12 2009/03/10 03:29:37 dmcmahill Exp $
+$NetBSD: distinfo,v 1.13 2010/04/13 06:53:19 obache Exp $
 
-SHA1 (pstoedit-3.45.tar.gz) = 3eecd5efcd4f3d1752d13303a2d1b64346f74171
-RMD160 (pstoedit-3.45.tar.gz) = dbe610807dae3ece5d32979100795d3399beb23a
-Size (pstoedit-3.45.tar.gz) = 848922 bytes
-SHA1 (patch-aa) = db0c80414eeefa5e8b28c70f124bd23e2e1aa6cb
-SHA1 (patch-ab) = 450443318bcff521998fa29f2902401dfe14fd6e
-SHA1 (patch-ac) = fb67dc34c06e98e80fc241ba906bd0b9d1d1ec4d
+SHA1 (pstoedit-3.50.tar.gz) = 5685bef29fa00aae7cc314d3a1dd21612a98eb2b
+RMD160 (pstoedit-3.50.tar.gz) = ba9be28424ced48464d93dd8bca60107d181a1c3
+Size (pstoedit-3.50.tar.gz) = 894115 bytes
+SHA1 (patch-aa) = 7b6f650e502727b680fd91923f05a5188e91bfa6
+SHA1 (patch-ab) = deeafbf9d10f3869a5192d11f2bb5026025704bf
+SHA1 (patch-ac) = 1ea36a9e84a9e065aeeea570926336107adfdee0
+SHA1 (patch-ad) = 4b0727d518dba7164bb28e9ed3c05979757a54b9
diff --git a/graphics/pstoedit/patches/patch-aa b/graphics/pstoedit/patches/patch-aa
index badda39ce03..89089911cd7 100644
--- a/graphics/pstoedit/patches/patch-aa
+++ b/graphics/pstoedit/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2009/03/10 03:29:37 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.6 2010/04/13 06:53:20 obache Exp $
 
---- src/Makefile.am.orig	2007-07-08 10:52:54.000000000 +0000
+--- src/Makefile.am.orig	2009-08-13 08:13:53.000000000 +0000
 +++ src/Makefile.am
-@@ -103,7 +103,7 @@ libpstoedit_la_SOURCES =			\
+@@ -130,7 +130,7 @@ libpstoedit_la_SOURCES =			\
  	genericints.h 				\
  	version.h
  
--libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -ldl
-+libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB}
+-libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -ldl -lm
++libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -lm
  libpstoedit_la_LDFLAGS = -no-undefined
  
  pstoedit_SOURCES = cmdmain.cpp
diff --git a/graphics/pstoedit/patches/patch-ab b/graphics/pstoedit/patches/patch-ab
index 9daa14c15b9..7058391f9f0 100644
--- a/graphics/pstoedit/patches/patch-ab
+++ b/graphics/pstoedit/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.5 2009/03/10 03:29:37 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.6 2010/04/13 06:53:20 obache Exp $
 
---- src/Makefile.in.orig	2007-09-09 16:07:30.000000000 +0000
+--- src/Makefile.in.orig	2009-08-13 08:18:34.000000000 +0000
 +++ src/Makefile.in
-@@ -358,7 +358,7 @@ libpstoedit_la_SOURCES = \
+@@ -396,7 +396,7 @@ libpstoedit_la_SOURCES = \
  	genericints.h 				\
  	version.h
  
--libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -ldl
-+libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB}
+-libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -ldl -lm
++libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -lm
  libpstoedit_la_LDFLAGS = -no-undefined
  pstoedit_SOURCES = cmdmain.cpp
  pstoedit_LDFLAGS = -no-undefined -L. libpstoedit.la ${LIBLD_LDFLAGS}
diff --git a/graphics/pstoedit/patches/patch-ac b/graphics/pstoedit/patches/patch-ac
index b94378d8af7..e160083ef2a 100644
--- a/graphics/pstoedit/patches/patch-ac
+++ b/graphics/pstoedit/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.5 2009/03/10 03:29:37 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.6 2010/04/13 06:53:20 obache Exp $
 
 Avoid this:
 
@@ -7,14 +7,14 @@ Avoid this:
 
 on alpha (and probably others)
 
---- configure.orig	2007-08-10 20:26:10.000000000 +0000
+--- configure.orig	2009-08-13 08:18:46.000000000 +0000
 +++ configure
-@@ -22282,7 +22282,7 @@ echo "${ECHO_T}GNU on RiscOS" >&6; }
-   else
-     { echo "$as_me:$LINENO: result: GNU" >&5
- echo "${ECHO_T}GNU" >&6; }
--    SPECIAL_CXXFLAGS="-DBUGGYGPP -pedantic -Wall -Wwrite-strings -Wcast-qual -Wpointer-arith "
-+    SPECIAL_CXXFLAGS="-DBUGGYGPP  -Wall -Wwrite-strings -Wcast-qual -Wpointer-arith "
+@@ -18160,7 +18160,7 @@ $as_echo "GNU on RiscOS" >&6; }
+     { $as_echo "$as_me:$LINENO: result: GNU" >&5
+ $as_echo "GNU" >&6; }
+ #   need to disable long long warning here because of ImageMagick using it
+-    SPECIAL_CXXFLAGS="-DBUGGYGPP -pedantic -Wall -Wwrite-strings -Wcast-qual -Wpointer-arith -Wno-long-long "
++    SPECIAL_CXXFLAGS="-DBUGGYGPP -Wall -Wwrite-strings -Wcast-qual -Wpointer-arith -Wno-long-long "
    fi
    CXXFLAGS="-g"
  elif test `echo "$CXX" | egrep -c 'xlC$'` -eq 1; then
diff --git a/graphics/pstoedit/patches/patch-ad b/graphics/pstoedit/patches/patch-ad
new file mode 100644
index 00000000000..9e3c4f4c802
--- /dev/null
+++ b/graphics/pstoedit/patches/patch-ad
@@ -0,0 +1,21 @@
+$NetBSD: patch-ad,v 1.5 2010/04/13 06:53:20 obache Exp $
+
+ming_config.h is not installed with ming>=0.4
+
+--- src/drvswf.cpp.orig	2009-06-21 15:10:21.000000000 +0000
++++ src/drvswf.cpp
+@@ -32,7 +32,6 @@
+ //static bool cubic = false;
+ 
+ #include "mingpp.h"
+-#include "ming_config.h"
+ 
+ #if defined(_WIN32)
+ extern "C" {
+@@ -718,4 +717,4 @@ static DriverDescriptionT < drvSWF > D_S
+ 										   false	/*clipping */
+ 										   );
+ #endif
+- 
+\ No newline at end of file
++