summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--graphics/pstoedit/Makefile17
-rw-r--r--graphics/pstoedit/PLIST7
-rw-r--r--graphics/pstoedit/distinfo13
-rw-r--r--graphics/pstoedit/patches/patch-aa19
-rw-r--r--graphics/pstoedit/patches/patch-ab13
-rw-r--r--graphics/pstoedit/patches/patch-ac20
-rw-r--r--graphics/pstoedit/patches/patch-ba32
7 files changed, 67 insertions, 54 deletions
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index fb69e5bea55..ee7202b62e1 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2008/09/10 13:59:43 gdt Exp $
+# $NetBSD: Makefile,v 1.39 2009/03/10 03:29:37 dmcmahill Exp $
-DISTNAME= pstoedit-3.41
-PKGREVISION= 2
+DISTNAME= pstoedit-3.45
CATEGORIES= converters graphics print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pstoedit/}
@@ -21,14 +20,18 @@ NO_BIN_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
-# XXX Avoid hard dependency on Ghostscript
-#USE_TOOLS+= gs:run
+USE_TOOLS+= gs:run
USE_LIBTOOL= yes
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CXXFLAGS="${CFLAGS} -Dunix"
CONFIGURE_ENV+= ac_cv_path_GS=${LOCALBASE}/bin/gs
+
+# needs libEMF which has build problems on alpha and probably
+# other 64-bit systems
+CONFIGURE_ARGS+=--without-emf
+
CONFIGURE_ARGS+=--datadir=${PREFIX}/share
CONFIGURE_ARGS+=--libdir=${PREFIX}/lib/pstoedit # plugin dir -- unused for now
BUILD_TARGET=
@@ -47,5 +50,9 @@ post-install:
done
${INSTALL_DATA} ${DOCSRC}/readme.txt ${DESTDIR}${DOCDIR}
+.include "../../graphics/gd/buildlink3.mk"
+.include "../../graphics/ImageMagick/buildlink3.mk"
.include "../../graphics/plotutils/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../..//multimedia/ming/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/pstoedit/PLIST b/graphics/pstoedit/PLIST
index 59cad07f078..6d0a34e71c1 100644
--- a/graphics/pstoedit/PLIST
+++ b/graphics/pstoedit/PLIST
@@ -1,12 +1,13 @@
-@comment $NetBSD: PLIST,v 1.4 2005/08/12 19:29:29 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/03/10 03:29:37 dmcmahill Exp $
bin/pstoedit
-bin/pstoedit-config
include/pstoedit/base64writer.h
include/pstoedit/cppcomp.h
include/pstoedit/drvbase.h
include/pstoedit/drvfuncs.h
+include/pstoedit/genericints.h
include/pstoedit/miscutil.h
include/pstoedit/ordlist.h
+include/pstoedit/papersizes.h
include/pstoedit/poptions.h
include/pstoedit/psimage.h
include/pstoedit/pstoedit.h
@@ -16,6 +17,8 @@ include/pstoedit/pstoedll.h
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
share/aclocal/pstoedit.m4
share/doc/html/pstoedit/changelog.htm
diff --git a/graphics/pstoedit/distinfo b/graphics/pstoedit/distinfo
index d4e2b72f997..9ac19346076 100644
--- a/graphics/pstoedit/distinfo
+++ b/graphics/pstoedit/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.11 2005/12/28 17:27:28 joerg Exp $
+$NetBSD: distinfo,v 1.12 2009/03/10 03:29:37 dmcmahill Exp $
-SHA1 (pstoedit-3.41.tar.gz) = 10a0a666c02eb5102f867744f6e75ee815b03aca
-RMD160 (pstoedit-3.41.tar.gz) = 8db6d8b40ba681a01eb2bda3a0f14e31df25130f
-Size (pstoedit-3.41.tar.gz) = 797596 bytes
-SHA1 (patch-aa) = bbe51177db5672e3254f89b401af16e14f1a767d
-SHA1 (patch-ba) = a0e14f4b515069972f0cc7bf0f0949c1828edd28
+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
diff --git a/graphics/pstoedit/patches/patch-aa b/graphics/pstoedit/patches/patch-aa
index 6db2ab55b39..badda39ce03 100644
--- a/graphics/pstoedit/patches/patch-aa
+++ b/graphics/pstoedit/patches/patch-aa
@@ -1,12 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2005/12/28 17:27:28 joerg Exp $
+$NetBSD: patch-aa,v 1.5 2009/03/10 03:29:37 dmcmahill Exp $
---- src/drvasy.cpp.orig 2005-12-28 17:12:36.000000000 +0000
-+++ src/drvasy.cpp
-@@ -37,6 +37,7 @@
+--- src/Makefile.am.orig 2007-07-08 10:52:54.000000000 +0000
++++ src/Makefile.am
+@@ -103,7 +103,7 @@ libpstoedit_la_SOURCES = \
+ genericints.h \
+ version.h
- #include <limits.h> // PATH_MAX for MSVC
- #include <ctype.h> // Need definition of ispunct()
-+#include <unistd.h> // Need defintion of mkstemp()
- #include <sstream>
+-libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -ldl
++libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB}
+ libpstoedit_la_LDFLAGS = -no-undefined
- #if !(defined(unix) || defined(__unix__) || defined(_unix) || defined(__unix) || defined(__EMX__) || defined (NetBSD) )
+ pstoedit_SOURCES = cmdmain.cpp
diff --git a/graphics/pstoedit/patches/patch-ab b/graphics/pstoedit/patches/patch-ab
new file mode 100644
index 00000000000..9daa14c15b9
--- /dev/null
+++ b/graphics/pstoedit/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.5 2009/03/10 03:29:37 dmcmahill Exp $
+
+--- src/Makefile.in.orig 2007-09-09 16:07:30.000000000 +0000
++++ src/Makefile.in
+@@ -358,7 +358,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_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
new file mode 100644
index 00000000000..b94378d8af7
--- /dev/null
+++ b/graphics/pstoedit/patches/patch-ac
@@ -0,0 +1,20 @@
+$NetBSD: patch-ac,v 1.5 2009/03/10 03:29:37 dmcmahill Exp $
+
+Avoid this:
+
+/usr/pkgsrc/graphics/pstoedit/work/.buildlink/include/ImageMagick/magick/magick-type.h:120: error: ISO C++ does not support 'long long'
+/usr/pkgsrc/graphics/pstoedit/work/.buildlink/include/ImageMagick/magick/magick-type.h:121: error: ISO C++ does not support 'long long'
+
+on alpha (and probably others)
+
+--- configure.orig 2007-08-10 20:26:10.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 "
+ fi
+ CXXFLAGS="-g"
+ elif test `echo "$CXX" | egrep -c 'xlC$'` -eq 1; then
diff --git a/graphics/pstoedit/patches/patch-ba b/graphics/pstoedit/patches/patch-ba
deleted file mode 100644
index 017de804103..00000000000
--- a/graphics/pstoedit/patches/patch-ba
+++ /dev/null
@@ -1,32 +0,0 @@
-$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 == '#') ||
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-30 00:42:13 +0000