Update to 3.60:

New or changed in 3.60:

    added option (-minlinewidth) for adjusting very thin (e.g. zero-width) lines to a minimal width.
    added an option (-pslanguagelevel) for easy switching the language level to be used by GhostScript during interpretation of the PostScript/PDF file.
    new driver for the "Context Free" drawing tool (http://www.contextfreeart.org/ ) contributed by Scott Pakin.
    fixed the windows binary version - some drivers were missing.
    fixed some problems in handling composite fonts (FontType = 0)
    windows 32 bit binary can call 64 bit ghostscript as exe (i.e. not via DLL interface)
    support for 64 bit windows and Office 2010

6 files changed, 19 insertions, 41 deletions

diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 38db5e64ad4..052310158b7 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.55 2011/11/20 22:11:22 sbd Exp $
+# $NetBSD: Makefile,v 1.56 2011/11/30 21:07:20 wiz Exp $
 
-DISTNAME=	pstoedit-3.50
-PKGREVISION=	6
+DISTNAME=	pstoedit-3.60
 CATEGORIES=	converters graphics print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pstoedit/}
 
diff --git a/graphics/pstoedit/PLIST b/graphics/pstoedit/PLIST
index 1e400b22ccc..68907a3b42d 100644
--- a/graphics/pstoedit/PLIST
+++ b/graphics/pstoedit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2010/04/13 06:53:19 obache Exp $
+@comment $NetBSD: PLIST,v 1.8 2011/11/30 21:07:20 wiz Exp $
 bin/pstoedit
 include/pstoedit/base64writer.h
 include/pstoedit/cppcomp.h
@@ -26,6 +26,7 @@ share/doc/html/pstoedit/changelog.htm
 share/doc/html/pstoedit/index.htm
 share/doc/html/pstoedit/pstoedit.htm
 share/doc/pstoedit/readme.txt
+share/pstoedit/drvhpgl.pencolors
 share/pstoedit/examplefigmap.fmp
 share/pstoedit/latex2e.fmp
 share/pstoedit/mpost.fmp
diff --git a/graphics/pstoedit/distinfo b/graphics/pstoedit/distinfo
index 5aab220e666..19cf0d661cc 100644
--- a/graphics/pstoedit/distinfo
+++ b/graphics/pstoedit/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.13 2010/04/13 06:53:19 obache Exp $
+$NetBSD: distinfo,v 1.14 2011/11/30 21:07:20 wiz Exp $
 
-SHA1 (pstoedit-3.50.tar.gz) = 5685bef29fa00aae7cc314d3a1dd21612a98eb2b
-RMD160 (pstoedit-3.50.tar.gz) = ba9be28424ced48464d93dd8bca60107d181a1c3
-Size (pstoedit-3.50.tar.gz) = 894115 bytes
+SHA1 (pstoedit-3.60.tar.gz) = 649ade3d873429548eb6dd9f3e13cb79a8d6a1a2
+RMD160 (pstoedit-3.60.tar.gz) = 5e1e40b5d8ea1cee045ce19b5c6322e35f108690
+Size (pstoedit-3.60.tar.gz) = 988351 bytes
 SHA1 (patch-aa) = 7b6f650e502727b680fd91923f05a5188e91bfa6
-SHA1 (patch-ab) = deeafbf9d10f3869a5192d11f2bb5026025704bf
-SHA1 (patch-ac) = 1ea36a9e84a9e065aeeea570926336107adfdee0
-SHA1 (patch-ad) = 4b0727d518dba7164bb28e9ed3c05979757a54b9
+SHA1 (patch-ab) = 02f7955e508cdc3b52985ac35d8f91c621e43290
+SHA1 (patch-ac) = aa0c53f93c6f256c72f60f11363f372dfc949c40
diff --git a/graphics/pstoedit/patches/patch-ab b/graphics/pstoedit/patches/patch-ab
index 7058391f9f0..f6cf8f9e0e3 100644
--- a/graphics/pstoedit/patches/patch-ab
+++ b/graphics/pstoedit/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2010/04/13 06:53:20 obache Exp $
+$NetBSD: patch-ab,v 1.7 2011/11/30 21:07:20 wiz Exp $
 
---- src/Makefile.in.orig	2009-08-13 08:18:34.000000000 +0000
+--- src/Makefile.in.orig	2011-08-27 15:27:38.000000000 +0000
 +++ src/Makefile.in
-@@ -396,7 +396,7 @@ libpstoedit_la_SOURCES = \
+@@ -412,7 +412,7 @@ libpstoedit_la_SOURCES = \
  	genericints.h 				\
  	version.h
  
@@ -10,4 +10,4 @@ $NetBSD: patch-ab,v 1.6 2010/04/13 06:53:20 obache Exp $
 +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}
+ pstoedit_LDADD = libpstoedit.la ${LIBLD_LDFLAGS}
diff --git a/graphics/pstoedit/patches/patch-ac b/graphics/pstoedit/patches/patch-ac
index e160083ef2a..eab1ee4d6f6 100644
--- a/graphics/pstoedit/patches/patch-ac
+++ b/graphics/pstoedit/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.6 2010/04/13 06:53:20 obache Exp $
+$NetBSD: patch-ac,v 1.7 2011/11/30 21:07:20 wiz Exp $
 
 Avoid this:
 
@@ -7,14 +7,14 @@ Avoid this:
 
 on alpha (and probably others)
 
---- configure.orig	2009-08-13 08:18:46.000000000 +0000
+--- configure.orig	2011-08-27 15:27:42.000000000 +0000
 +++ configure
-@@ -18160,7 +18160,7 @@ $as_echo "GNU on RiscOS" >&6; }
-     { $as_echo "$as_me:$LINENO: result: GNU" >&5
+@@ -16859,7 +16859,7 @@ $as_echo "GNU on RiscOS" >&6; }
+     { $as_echo "$as_me:${as_lineno-$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
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: AIX xlC" >&5
diff --git a/graphics/pstoedit/patches/patch-ad b/graphics/pstoedit/patches/patch-ad
deleted file mode 100644
index 9e3c4f4c802..00000000000
--- a/graphics/pstoedit/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-$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
-+