8 files changed, 115 insertions, 89 deletions

diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 2d5a44fdc3df..7e50ffaf5f4a 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -6,26 +6,24 @@
 #
 
 PORTNAME=	pstoedit
-PORTVERSION=	3.33
-PORTREVISION=	4
+PORTVERSION=	3.41
 CATEGORIES=	graphics print
-MASTER_SITES=	http://home.t-online.de/home/helga.glunz/wglunz/pstoedit/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convert PostScript to other vector graphic formats
 
-USE_GHOSTSCRIPT=yes
+OPTIONS=	IMAGEMAGICK "Enable magick++ interface" on \
+		EMF "Enable emf interface" on \
+		MING "Enable swf interface" on \
+		PLOTUTILS "Enable libplot interface" on
 
-LIB_DEPENDS=	Magick++.8:${PORTSDIR}/graphics/ImageMagick \
-		ming.3:${PORTSDIR}/graphics/ming \
-		plotter.4:${PORTSDIR}/graphics/plotutils \
-		EMF.1:${PORTSDIR}/graphics/libemf
-
-USE_GNOME=	gnometarget pkgconfig
-USE_LIBTOOL_VER=15
+USE_GNOME=	gnomehack gnometarget pkgconfig
+USE_GHOSTSCRIPT=	yes
 USE_REINPLACE=	yes
+USE_LIBTOOL_VER=	15
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS+=	--with-libemf-include=${LOCALBASE}/include/libEMF
 INSTALLS_SHLIB=	yes
 
 MAN1=	pstoedit.1
@@ -34,6 +32,45 @@ CPPFLAGS=	-I${LOCALBASE}/include/ming -I${LOCALBASE}/include \
 		-I${X11BASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500035
+CFLAGS+=	-DHAVESTL -DHAVETYPENAME -DUSE_NEWSTRSTREAM
+.endif
+
+.if defined(WITHOUT_IMAGEMAGICK)
+CONFIGURE_ARGS+=	--without-magick
+PLIST_SUB+=	IMAGEMAGICK="@comment "
+.else
+LIB_DEPENDS+=	Magick++.8:${PORTSDIR}/graphics/ImageMagick
+PLIST_SUB+=	IMAGEMAGICK=""
+.endif
+
+.if defined(WITHOUT_EMF)
+CONFIGURE_ARGS+=	--without-emf
+PLIST_SUB+=	EMF="@comment "
+.else
+LIB_DEPENDS+=	EMF.1:${PORTSDIR}/graphics/libemf
+CONFIGURE_ARGS+=	--with-libemf-include=${LOCALBASE}/include/libEMF
+PLIST_SUB+=	EMF=""
+.endif
+
+.if defined(WITHOUT_MING)
+CONFIGURE_ARGS+=	--without-swf
+PLIST_SUB+=	MING="@comment "
+.else
+LIB_DEPENDS+=	ming.3:${PORTSDIR}/graphics/ming
+PLIST_SUB+=	MING=""
+.endif
+
+.if defined(WITHOUT_PLOTUTILS)
+CONFIGURE_ARGS+=	--without-libplot
+PLIST_SUB+=	PLOTUTILS="@comment "
+.else
+LIB_DEPENDS+=	plotter.4:${PORTSDIR}/graphics/plotutils
+PLIST_SUB+=	PLOTUTILS=""
+.endif
+
 pre-everything::
 .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
 	@${ECHO_MSG} ""
@@ -43,15 +80,14 @@ pre-everything::
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-pedantic||g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|CXXFLAGS="-g"|CXXFLAGS="$$CXXFLAGS"|g ; \
+		 s|-pedantic||g' ${WRKSRC}/configure
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/pstoedit.1 ${MANPREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/changelog.htm ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/index.htm ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/pstoedit.htm ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.htm ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/pstoedit/distinfo b/graphics/pstoedit/distinfo
index 22d59435e5f2..a6ff77bbaf0c 100644
--- a/graphics/pstoedit/distinfo
+++ b/graphics/pstoedit/distinfo
@@ -1,2 +1,2 @@
-MD5 (pstoedit-3.33.tar.gz) = 6a671ef165bf7d1611a2ad3f0499ff5b
-SIZE (pstoedit-3.33.tar.gz) = 729661
+MD5 (pstoedit-3.41.tar.gz) = dc2f8b756299422bfefc5c18fa0d33d3
+SIZE (pstoedit-3.41.tar.gz) = 797596
diff --git a/graphics/pstoedit/files/patch-config::Makefile.in b/graphics/pstoedit/files/patch-config::Makefile.in
deleted file mode 100644
index d4dad0c930c1..000000000000
--- a/graphics/pstoedit/files/patch-config::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- config/Makefile.in	2002/09/12 17:18:05	1.1
-+++ config/Makefile.in	2002/09/12 17:18:20
-@@ -98,7 +98,7 @@
- 
- EXTRA_DIST = pstoedit.pc.in pstoedit-config.af pstoedit-config.in
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = pstoedit.pc
- 
- bin_SCRIPTS = pstoedit-config
diff --git a/graphics/pstoedit/files/patch-configure b/graphics/pstoedit/files/patch-configure
deleted file mode 100644
index dc6191ca0367..000000000000
--- a/graphics/pstoedit/files/patch-configure
+++ /dev/null
@@ -1,32 +0,0 @@
-
-$FreeBSD$
-
---- configure.orig	Tue Jan  7 06:21:27 2003
-+++ configure	Sat Jan 18 13:25:14 2003
-@@ -17286,6 +17286,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -18852,16 +18853,15 @@
- echo "${ECHO_T}GNU" >&6
-     SPECIAL_CXXFLAGS="-DBUGGYGPP -pedantic -Wall -Wwrite-strings -Wcast-qual -Wpointer-arith -Wstrict-prototypes"
-   fi
--  CXXFLAGS="-g"
- elif test `echo "$CXX" | egrep -c 'xlC$'` -eq 1; then
-   echo "$as_me:$LINENO: result: AIX xlC" >&5
- echo "${ECHO_T}AIX xlC" >&6
--  CXXFLAGS="-D__unix__ -g -+ -I/usr/lpp/xlC/src/nihC/aixinclude"
-+  CXXFLAGS="$CXXFLAGS -D__unix__ -+ -I/usr/lpp/xlC/src/nihC/aixinclude"
- elif test `echo "$CXX" | egrep -c 'cxx$'` -eq 1; then
-   echo "$as_me:$LINENO: result: OSF/1 cxx" >&5
- echo "${ECHO_T}OSF/1 cxx" >&6
-   SPECIAL_CXXFLAGS=-w
--  CXXFLAGS=-define_templates
-+  CXXFLAGS="$CXXFLAGS -define_templates"
- elif test `echo "$CXX" | egrep -c 'CC$'` -eq 1; then
-   if test "$host_os" = irix5.3; then
-     echo "$as_me:$LINENO: result: Irix 5.3" >&5
diff --git a/graphics/pstoedit/files/patch-src-drvasy.cpp b/graphics/pstoedit/files/patch-src-drvasy.cpp
new file mode 100644
index 000000000000..ae7096b0a2a8
--- /dev/null
+++ b/graphics/pstoedit/files/patch-src-drvasy.cpp
@@ -0,0 +1,10 @@
+--- src/drvasy.cpp.orig	Sat Mar 12 22:28:38 2005
++++ src/drvasy.cpp	Tue Aug 23 00:05:16 2005
+@@ -37,6 +37,7 @@
+ 
+ #include <limits.h>				// PATH_MAX for MSVC
+ #include <ctype.h>				// Need definition of ispunct()
++#include <unistd.h>
+ #include <sstream>
+ 
+ #if !(defined(unix) || defined(__unix__) || defined(_unix) || defined(__unix) || defined(__EMX__) || defined (NetBSD)  )
diff --git a/graphics/pstoedit/files/patch-src-drvlatex2e.cpp b/graphics/pstoedit/files/patch-src-drvlatex2e.cpp
new file mode 100644
index 000000000000..43b498b9a9d4
--- /dev/null
+++ b/graphics/pstoedit/files/patch-src-drvlatex2e.cpp
@@ -0,0 +1,30 @@
+--- src/drvlatex2e.cpp.pre_tr	Sat Jun 18 22:35:42 2005
++++ src/drvlatex2e.cpp	Tue Aug 23 00:30:01 2005
+@@ -284,27 +284,6 @@
+ 	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 == '#') ||
diff --git a/graphics/pstoedit/pkg-descr b/graphics/pstoedit/pkg-descr
index 145875869c17..8544a3266712 100644
--- a/graphics/pstoedit/pkg-descr
+++ b/graphics/pstoedit/pkg-descr
@@ -1,7 +1,7 @@
 pstoedit converts Postscript(TM) and PDF files to other vector graphic
 formats so that they can be edited graphically.
 
-Copyright (C) 1993,1994,1995,1996,1997
-Wolfgang Glunz, Wolfgang.Glunz@mchp.siemens.de
+Copyright (C) 1993 - 2005
+Wolfgang Glunz, wglunz34_AT_pstoedit.net
 
-WWW: http://pstoedit.net/pstoedit/
+WWW: http://www.pstoedit.net/
diff --git a/graphics/pstoedit/pkg-plist b/graphics/pstoedit/pkg-plist
index 42a45582cd09..0bf25b3d7ba9 100644
--- a/graphics/pstoedit/pkg-plist
+++ b/graphics/pstoedit/pkg-plist
@@ -15,34 +15,30 @@ include/pstoedit/pstoedll.h
 lib/libpstoedit.a
 lib/libpstoedit.so
 lib/libpstoedit.so.0
-lib/pstoedit/libp2edrvlplot.a
-lib/pstoedit/libp2edrvlplot.so
-lib/pstoedit/libp2edrvlplot.so.0
-lib/pstoedit/libp2edrvmagick++.a
-lib/pstoedit/libp2edrvmagick++.so
-lib/pstoedit/libp2edrvmagick++.so.0
-lib/pstoedit/libp2edrvstd.a
+%%PLOTUTILS%%lib/pstoedit/libp2edrvlplot.so
+%%PLOTUTILS%%lib/pstoedit/libp2edrvlplot.so.0
+%%IMAGEMAGICK%%lib/pstoedit/libp2edrvmagick++.so
+%%IMAGEMAGICK%%lib/pstoedit/libp2edrvmagick++.so.0
 lib/pstoedit/libp2edrvstd.so
 lib/pstoedit/libp2edrvstd.so.0
-lib/pstoedit/libp2edrvswf.a
-lib/pstoedit/libp2edrvswf.so
-lib/pstoedit/libp2edrvswf.so.0
-lib/pstoedit/libp2edrvwmf.a
-lib/pstoedit/libp2edrvwmf.so
-lib/pstoedit/libp2edrvwmf.so.0
+%%MING%%lib/pstoedit/libp2edrvswf.so
+%%MING%%lib/pstoedit/libp2edrvswf.so.0
+%%EMF%%lib/pstoedit/libp2edrvwmf.so
+%%EMF%%lib/pstoedit/libp2edrvwmf.so.0
 libdata/pkgconfig/pstoedit.pc
 share/aclocal/pstoedit.m4
 %%PORTDOCS%%%%DOCSDIR%%/changelog.htm
 %%PORTDOCS%%%%DOCSDIR%%/index.htm
 %%PORTDOCS%%%%DOCSDIR%%/pstoedit.htm
-share/pstoedit/latex2e.fmp
-share/pstoedit/mpost.fmp
-share/pstoedit/safer.ps
-share/pstoedit/svg.fmp
-share/pstoedit/swffonts/default.fdb
-share/pstoedit/wemf.fmp
-@dirrm share/pstoedit/swffonts
-@dirrm share/pstoedit
+%%DATADIR%%/examplefigmap.fmp
+%%DATADIR%%/latex2e.fmp
+%%DATADIR%%/mpost.fmp
+%%DATADIR%%/safer.ps
+%%DATADIR%%/svg.fmp
+%%DATADIR%%/swffonts/default.fdb
+%%DATADIR%%/wemf.fmp
+@dirrm %%DATADIR%%/swffonts
+@dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/pstoedit
 @dirrm include/pstoedit