From 02cc9e090fe87898fb09d944c6a1c796decd3627 Mon Sep 17 00:00:00 2001 From: naddy Date: Thu, 11 Aug 2005 17:32:06 +0000 Subject: [PATCH] Update to 3.41; from maintainer Steven Mestdagh. Relevant changes from the changelog: * added a .asy backend for Asymptote files ( http://asymptote.sourceforge.net/ ). Thanks to John Bowman * fixed three bugs (one memory leak, two other minor problems) detected by the Coverity Prevent tool (http://www.coverity.com/) * PostScript frontend: fixed a bug in tracing the bounding box of raster images. * fixed a bug in sub path handling - thanks to Soren Henriksen. * fixed the handling of some special characters in the LaTeX2e format driver. --- graphics/pstoedit/Makefile | 8 +++++-- graphics/pstoedit/distinfo | 8 +++---- graphics/pstoedit/patches/patch-configure | 8 +++---- .../pstoedit/patches/patch-src_Makefile_in | 8 +++---- .../pstoedit/patches/patch-src_drvlatex2e_cpp | 21 +++++++++++++++++++ graphics/pstoedit/pkg/DESCR | 1 + 6 files changed, 40 insertions(+), 14 deletions(-) create mode 100644 graphics/pstoedit/patches/patch-src_drvlatex2e_cpp diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile index fdd5266bc92..b57d3322c9b 100644 --- a/graphics/pstoedit/Makefile +++ b/graphics/pstoedit/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2005/08/04 17:05:22 naddy Exp $ +# $OpenBSD: Makefile,v 1.2 2005/08/11 17:32:06 naddy Exp $ COMMENT= "translate PostScript/PDF graphics to other vector formats" -DISTNAME= pstoedit-3.40 +DISTNAME= pstoedit-3.41 CATEGORIES= graphics HOMEPAGE= http://www.pstoedit.net/ @@ -29,6 +29,10 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ --without-magick WANTLIB= c stdc++ m +# trailing carriage returns where we need to apply a patch +pre-patch: + @perl -pi -e 's/\r$$//' ${WRKSRC}/src/drvlatex2e.cpp + post-install: cd ${WRKSRC}/doc && ${INSTALL_MAN} pstoedit.1 ${PREFIX}/man/man1 diff --git a/graphics/pstoedit/distinfo b/graphics/pstoedit/distinfo index 922c867f238..4444a30eeba 100644 --- a/graphics/pstoedit/distinfo +++ b/graphics/pstoedit/distinfo @@ -1,4 +1,4 @@ -MD5 (pstoedit-3.40.tar.gz) = 5756c28eef3a11fe395248c5bf053556 -RMD160 (pstoedit-3.40.tar.gz) = 254276cd94ed43183843313ffa300074de5b7cbc -SHA1 (pstoedit-3.40.tar.gz) = b5bed98b5f414e0013d137e50cb8f55e25de1662 -SIZE (pstoedit-3.40.tar.gz) = 789869 +MD5 (pstoedit-3.41.tar.gz) = dc2f8b756299422bfefc5c18fa0d33d3 +RMD160 (pstoedit-3.41.tar.gz) = 8db6d8b40ba681a01eb2bda3a0f14e31df25130f +SHA1 (pstoedit-3.41.tar.gz) = 10a0a666c02eb5102f867744f6e75ee815b03aca +SIZE (pstoedit-3.41.tar.gz) = 797596 diff --git a/graphics/pstoedit/patches/patch-configure b/graphics/pstoedit/patches/patch-configure index 2a10217e0ad..8cae7f4f0ac 100644 --- a/graphics/pstoedit/patches/patch-configure +++ b/graphics/pstoedit/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.1.1.1 2005/08/04 17:05:22 naddy Exp $ ---- configure.orig Thu Jan 6 22:03:06 2005 -+++ configure Thu Jul 28 08:17:22 2005 -@@ -21463,9 +21463,7 @@ echo "${ECHO_T}GNU on RiscOS" >&6 +$OpenBSD: patch-configure,v 1.2 2005/08/11 17:32:06 naddy Exp $ +--- configure.orig Sun Aug 7 22:07:46 2005 ++++ configure Thu Aug 11 18:42:11 2005 +@@ -21464,9 +21464,7 @@ echo "${ECHO_T}GNU on RiscOS" >&6 else echo "$as_me:$LINENO: result: GNU" >&5 echo "${ECHO_T}GNU" >&6 diff --git a/graphics/pstoedit/patches/patch-src_Makefile_in b/graphics/pstoedit/patches/patch-src_Makefile_in index b76da3e0b4a..1b8891694a8 100644 --- a/graphics/pstoedit/patches/patch-src_Makefile_in +++ b/graphics/pstoedit/patches/patch-src_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2005/08/04 17:05:22 naddy Exp $ ---- src/Makefile.in.orig Thu Jan 6 22:03:00 2005 -+++ src/Makefile.in Thu Jul 28 01:07:15 2005 -@@ -472,9 +472,9 @@ clean-pkglibLTLIBRARIES: +$OpenBSD: patch-src_Makefile_in,v 1.2 2005/08/11 17:32:06 naddy Exp $ +--- src/Makefile.in.orig Sun Aug 7 22:07:42 2005 ++++ src/Makefile.in Thu Aug 11 18:42:11 2005 +@@ -473,9 +473,9 @@ clean-pkglibLTLIBRARIES: libp2edrvlplot.la: $(libp2edrvlplot_la_OBJECTS) $(libp2edrvlplot_la_DEPENDENCIES) $(CXXLINK) -rpath $(pkglibdir) $(libp2edrvlplot_la_LDFLAGS) $(libp2edrvlplot_la_OBJECTS) $(libp2edrvlplot_la_LIBADD) $(LIBS) libp2edrvmagick++.la: $(libp2edrvmagick___la_OBJECTS) $(libp2edrvmagick___la_DEPENDENCIES) diff --git a/graphics/pstoedit/patches/patch-src_drvlatex2e_cpp b/graphics/pstoedit/patches/patch-src_drvlatex2e_cpp new file mode 100644 index 00000000000..cb640cdf9f5 --- /dev/null +++ b/graphics/pstoedit/patches/patch-src_drvlatex2e_cpp @@ -0,0 +1,21 @@ +$OpenBSD: patch-src_drvlatex2e_cpp,v 1.1 2005/08/11 17:32:06 naddy Exp $ +--- src/drvlatex2e.cpp.orig Thu Aug 11 18:42:16 2005 ++++ src/drvlatex2e.cpp Thu Aug 11 18:42:34 2005 +@@ -284,7 +284,7 @@ void drvLATEX2E::show_text(const TextInf + const char * cp = textinfo.thetext.value(); + //buffer << textinfo.thetext.value() + +-#if 0 ++/* + // characters to be handled specially + % -> \% + # -> \# +@@ -304,7 +304,7 @@ Zusätzlich machen folgende Zeichen oft P + " -> \textquotedblright + ?`-> \textquestiondown + !`-> \textexclamdown +-#endif ++*/ + while (cp && *cp) { + if ((*cp == '%') || + (*cp == '#') || diff --git a/graphics/pstoedit/pkg/DESCR b/graphics/pstoedit/pkg/DESCR index 4cdb66b9ebc..0a4b03b27c1 100644 --- a/graphics/pstoedit/pkg/DESCR +++ b/graphics/pstoedit/pkg/DESCR @@ -11,6 +11,7 @@ formats. Currently pstoedit can generate the following major formats: - via the libp2edrvstd.so module (not available on static platforms): + * Asymptote (.asy) * DXF - CAD exchange format * gnuplot * gschem