4 files changed, 68 insertions, 27 deletions

diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 70a6a99aae9..bb5cc840dad 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -1,11 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2005/06/01 18:02:57 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2005/08/12 19:29:29 drochner Exp $
 
-DISTNAME=	pstoedit_3_31
-PKGNAME=	pstoedit-3.31
-PKGREVISION=	2
+DISTNAME=	pstoedit-3.41
 CATEGORIES=	converters graphics print
-MASTER_SITES=	http://home.t-online.de/home/helga.glunz/wglunz/pstoedit/
-EXTRACT_SUFX=	.zip
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pstoedit/}
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.pstoedit.net/
@@ -15,13 +12,10 @@ RESTRICTED?=	"The author writes: If you include this program on a CDROM, please
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
-WRKSRC=		${WRKDIR}/pstoedit_3.31/src
 USE_LIBTOOL=	yes
 USE_LANGUAGES=	c++
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	LIBTOOL="${LIBTOOL}" LIBPLOTTERLA="${X11PREFIX}/lib/libplotter.la"
 CONFIGURE_ENV+=	CXXFLAGS="${CFLAGS} -Dunix"
-CONFIGURE_ENV+=	LDLIBS="${X11_LDFLAGS}"
 CONFIGURE_ENV+=	GS=${LOCALBASE}/bin/gs
 CONFIGURE_ARGS+=--datadir=${PREFIX}/share
 CONFIGURE_ARGS+=--libdir=${PREFIX}/lib/pstoedit	# plugin dir -- unused for now
@@ -29,12 +23,9 @@ BUILD_TARGET=
 
 LIBS.SunOS+=	-ldl
 
-post-extract:
-	cd ${WRKSRC} && ${LN} ../config/* .
-
 DOCDIR=		${PREFIX}/share/doc/pstoedit
 HTMLDIR=	${PREFIX}/share/doc/html/pstoedit
-DOCSRC=		${WRKSRC}/..
+DOCSRC=		${WRKSRC}/doc
 
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
@@ -46,5 +37,5 @@ post-install:
 
 .include "../../graphics/plotutils/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
-.include "../../mk/ghostscript.mk"
+#.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/pstoedit/PLIST b/graphics/pstoedit/PLIST
index 93313c77227..59cad07f078 100644
--- a/graphics/pstoedit/PLIST
+++ b/graphics/pstoedit/PLIST
@@ -1,16 +1,39 @@
-@comment $NetBSD: PLIST,v 1.3 2003/05/06 23:03:10 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/08/12 19:29:29 drochner Exp $
 bin/pstoedit
-man/man1/pstoedit.1
+bin/pstoedit-config
+include/pstoedit/base64writer.h
+include/pstoedit/cppcomp.h
+include/pstoedit/drvbase.h
+include/pstoedit/drvfuncs.h
+include/pstoedit/miscutil.h
+include/pstoedit/ordlist.h
+include/pstoedit/poptions.h
+include/pstoedit/psimage.h
+include/pstoedit/pstoedit.h
+include/pstoedit/pstoeditoptions.h
+include/pstoedit/pstoeditoutputlib.h
+include/pstoedit/pstoedll.h
+lib/pstoedit/libpstoedit.la
+lib/pstoedit/pkgconfig/pstoedit.pc
+lib/pstoedit/pstoedit/libp2edrvlplot.la
+lib/pstoedit/pstoedit/libp2edrvstd.la
+share/aclocal/pstoedit.m4
 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/examplefigmap.fmp
 share/pstoedit/latex2e.fmp
 share/pstoedit/mpost.fmp
-share/pstoedit/pstoedit.htm
+share/pstoedit/safer.ps
 share/pstoedit/svg.fmp
 share/pstoedit/swffonts/default.fdb
+share/pstoedit/wemf.fmp
 @dirrm share/pstoedit/swffonts
 @dirrm share/pstoedit
 @dirrm share/doc/pstoedit
 @dirrm share/doc/html/pstoedit
+@dirrm lib/pstoedit/pstoedit
+@dirrm lib/pstoedit/pkgconfig
+@dirrm lib/pstoedit
+@dirrm include/pstoedit
diff --git a/graphics/pstoedit/distinfo b/graphics/pstoedit/distinfo
index 096b6ca86d6..e070233e84b 100644
--- a/graphics/pstoedit/distinfo
+++ b/graphics/pstoedit/distinfo
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.9 2005/03/14 15:04:04 rillig Exp $
+$NetBSD: distinfo,v 1.10 2005/08/12 19:29:29 drochner Exp $
 
-SHA1 (pstoedit_3_31.zip) = 95e7a09385c3d9ce3dbe8ba5afcc9154021c83ce
-RMD160 (pstoedit_3_31.zip) = 1d8304c89647f0d8b4d425b1320d81755e0ee672
-Size (pstoedit_3_31.zip) = 558546 bytes
-SHA1 (patch-aa) = 25513e3452eed6eb464df1c0dbeeafa4d0f446bf
-SHA1 (patch-ab) = c96f64f0bf26ebbd4b119bf1f6da426421b22537
-SHA1 (patch-ac) = 614ba9036e1484755955b765e829227e64f10879
-SHA1 (patch-ad) = 794556f6c5afd37bcc40c5c319450011a437c2ff
-SHA1 (patch-ae) = 26ef548a105d0a2ff8b093a4f51fb6f66f95521e
-SHA1 (patch-af) = f69cbc2c7d40daa8fa3a2f2069bc1f167ad25b8e
+SHA1 (pstoedit-3.41.tar.gz) = 10a0a666c02eb5102f867744f6e75ee815b03aca
+RMD160 (pstoedit-3.41.tar.gz) = 8db6d8b40ba681a01eb2bda3a0f14e31df25130f
+Size (pstoedit-3.41.tar.gz) = 797596 bytes
+SHA1 (patch-ba) = a0e14f4b515069972f0cc7bf0f0949c1828edd28
diff --git a/graphics/pstoedit/patches/patch-ba b/graphics/pstoedit/patches/patch-ba
new file mode 100644
index 00000000000..017de804103
--- /dev/null
+++ b/graphics/pstoedit/patches/patch-ba
@@ -0,0 +1,32 @@
+$NetBSD: patch-ba,v 1.1 2005/08/12 19:29:29 drochner Exp $
+
+--- src/drvlatex2e.cpp.orig	2005-08-09 14:29:27.000000000 +0200
++++ src/drvlatex2e.cpp
+@@ -284,27 +284,6 @@ void drvLATEX2E::show_text(const TextInf
+ 	const char * cp = textinfo.thetext.value();
+ 	//buffer << textinfo.thetext.value() 
+ 
+-#if 0
+-// characters to be handled specially	

+-% -> \%

+-# -> \#

+-{ -> \{

+-} -> \}

+-_ -> \_

+-& -> \&

+-$ -> \$  

+-	Tritt auch manchmal mit veränderter Bedeutung als $$ auf: --> \$\$

+-

+-\ -> \textbackslash

+-^ -> \textasciicircum

+-~ -> \textasciitilde

+-

+-Zusätzlich machen folgende Zeichen oft Probleme:

+-

+-" -> \textquotedblright

+-?`-> \textquestiondown

+-!`-> \textexclamdown
+-#endif
+ 	while (cp && *cp) {
+ 		if ((*cp == '%') ||
+ 			(*cp == '#') ||