6 files changed, 113 insertions, 20 deletions

diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 85558ff1760f..f74548556db0 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	pstoedit
-PORTVERSION=	3.21
+PORTVERSION=	3.30
 CATEGORIES=	graphics print
-MASTER_SITES=	http://www.geocities.com/SiliconValley/Network/1958/pstoedit/
+MASTER_SITES=	http://home.t-online.de/home/helga.glunz/wglunz/pstoedit/
 DISTNAME=	${PORTNAME}_${PORTVERSION:S/./_/}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -17,24 +17,22 @@ RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu
 LIB_DEPENDS=	plot.4:${PORTSDIR}/graphics/plotutils \
 		plotter.4:${PORTSDIR}/graphics/plotutils
 
+WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}/src
+
 USE_ZIP=		yes
-WRKSRC=		${WRKDIR}/pstoedit_${PORTVERSION}/src
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${PREFIX}/include -I${X11BASE}/include" \
-		CXXFLAGS="${CFLAGS} -I${PREFIX}/include -I${X11BASE}/include" \
-		LDLIBS="-L${PREFIX}/lib -L${X11BASE}/lib" \
-		LIBS="-L${PREFIX}/lib -L${X11BASE}/lib"
+CONFIGURE_SCRIPT=	../config/configure
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ARGS=	--libdir=${DATADIR}
 ALL_TARGET=	default
 
 MAN1=	pstoedit.1
 
-post-extract:
-	${CP} ${WRKSRC}/../config/* ${WRKSRC}
-
-.if !defined(NOPORTDOCS)
 post-install:
-	@${MKDIR} ${PREFIX}/share/doc/pstoedit
-	${INSTALL_DATA} ${WRKSRC}/../*.htm ${PREFIX}/share/doc/pstoedit
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/../*.htm ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/pstoedit/distinfo b/graphics/pstoedit/distinfo
index fd1d7bfc5f98..cf7460660989 100644
--- a/graphics/pstoedit/distinfo
+++ b/graphics/pstoedit/distinfo
@@ -1 +1 @@
-MD5 (pstoedit_3_21.zip) = da439846a3a9eddce0d310d2ceaf4f45
+MD5 (pstoedit_3_30.zip) = cbdbc85209fbf5b4abf9c6bf2a03ae9c
diff --git a/graphics/pstoedit/files/patch-Makefile.in b/graphics/pstoedit/files/patch-Makefile.in
new file mode 100644
index 000000000000..f07e84d2b443
--- /dev/null
+++ b/graphics/pstoedit/files/patch-Makefile.in
@@ -0,0 +1,33 @@
+--- Makefile.in.orig	Wed Oct  4 04:51:25 2000
++++ Makefile.in	Sat Apr 14 08:24:02 2001
+@@ -16,7 +16,7 @@
+ GS=@GS@
+ 
+ # Choose a compiler + linker
+-CXXFLAGS=@CXXFLAGS@
++CXXFLAGS=@CXXFLAGS@ @CPPFLAGS@
+ CCC=@CXX@ @SPECIAL_CXXFLAGS@
+ LDLIBS=$(LOCALLIBS) @LDLIBS@ -lm @LDL@
+ LINK=@LINK@
+@@ -54,9 +54,9 @@
+ # without shared libs use LDFLAGS=-lm 
+ #LDLIBS= $(LOCALLIBS) -lm @LDL@
+ 
+-INSTALL_PROGRAM=$(INSTALL) 
+-INSTALL_DATA=$(INSTALL) -m 644
+-INSTALL_DIR=$(INSTALL) -d -m755     # or: mkdir -p
++INSTALL_PROGRAM=@INSTALL_PROGRAM@ 
++INSTALL_DATA=@INSTALL_DATA@
++INSTALL_DIR=mkdir -p
+ OBJEXT=o
+ EXEEXT=
+ OUTPUT=-o pstoedit
+@@ -68,7 +68,7 @@
+ #LOCALDEFINES=-DHAVE_LIBPLOTTER -I/path/to/plotter.h
+ # add -DOLD_LIBPLOTTER for libplot older than 2.3
+ LOCALDEFINES=@PLOTCOMPILEFLAGS@ @PNGCOMPILEFLAGS@
+-LOCALLIBS=-L/path/to/libplot @LPLOTTER@ @PNGLINKFLAGS@
++LOCALLIBS=@LIBS@ @LPLOTTER@ @PNGLINKFLAGS@
+ #############################################################
+ 
+ ## IRIX 5.3
diff --git a/graphics/pstoedit/files/patch-dynload.cpp b/graphics/pstoedit/files/patch-dynload.cpp
new file mode 100644
index 000000000000..8d83bc8eb4ed
--- /dev/null
+++ b/graphics/pstoedit/files/patch-dynload.cpp
@@ -0,0 +1,57 @@
+--- dynload.cpp.orig	Thu Aug  9 03:39:30 2001
++++ dynload.cpp	Fri Oct  5 03:02:16 2001
+@@ -24,7 +24,7 @@
+ 
+ // we need __linux instead of just linux since the latter is not defined when -ansi is used.
+ 
+-#if defined(__sparc) || defined(__linux) || defined(_WIN32) || defined(__OS2__)
++#if defined(__sparc) || defined(__linux) || defined(__FreeBSD__) || defined(_WIN32) || defined(__OS2__)
+ #define HAVESHAREDLIBS
+ #endif
+ 
+@@ -48,6 +48,8 @@
+ #include <dlfcn.h>
+ typedef void (*initfunctype) ();
+ //  static const char * const libsuffix = ".so";
++#elif defined(__FreeBSD__)
++#include <dlfcn.h>
+ #elif defined(__sparc)
+ #if defined(__SVR4)
+ #include <dlfcn.h>
+@@ -101,6 +103,9 @@
+ #if defined(__linux)
+ 	int loadmode = RTLD_LAZY;	// RTLD_NOW
+ 	handle = dlopen(fulllibname, loadmode);
++#elif defined(__FreeBSD__)
++	int loadmode = RTLD_LAZY;	// RTLD_NOW
++	handle = dlopen(fulllibname, loadmode);
+ #elif defined(__sparc)
+ 	int loadmode = RTLD_LAZY;	// RTLD_NOW
+ 	handle = dlopen(fulllibname, loadmode);
+@@ -136,6 +141,8 @@
+ 	if (handle) {
+ #if defined(__linux)
+ 		dlclose(handle);
++#elif defined(__FreeBSD__)
++		dlclose(handle);
+ #elif defined(__sparc)
+ 		dlclose(handle);
+ #elif defined(__OS2__)
+@@ -163,6 +170,8 @@
+ {
+ #if defined(__linux)
+ 	DynLoader::fptr rfptr = (DynLoader::fptr) dlsym(handle, name);	//lint !e611 //: Suspicious cast
++#elif defined(__FreeBSD__)
++	DynLoader::fptr rfptr = (DynLoader::fptr) dlsym(handle, name);	//lint !e611 //: Suspicious cast
+ #elif defined(__sparc)
+ 	DynLoader::fptr rfptr = (DynLoader::fptr) dlsym(handle, name);	//lint !e611 //: Suspicious cast
+ #elif defined(__OS2__)
+@@ -245,7 +254,7 @@
+ //          globalRp->explainformats(errstream);
+ }
+ 
+-#if defined(__linux) || defined(__sparc) || defined(__OS2__)
++#if defined(__linux) || defined(__sparc) || defined(__FreeBSD__) || defined(__OS2__)
+ // for directory search
+ #include <dirent.h>
+ 
diff --git a/graphics/pstoedit/pkg-descr b/graphics/pstoedit/pkg-descr
index 35837bfb5b6f..145875869c17 100644
--- a/graphics/pstoedit/pkg-descr
+++ b/graphics/pstoedit/pkg-descr
@@ -3,3 +3,5 @@ formats so that they can be edited graphically.
 
 Copyright (C) 1993,1994,1995,1996,1997
 Wolfgang Glunz, Wolfgang.Glunz@mchp.siemens.de
+
+WWW: http://pstoedit.net/pstoedit/
diff --git a/graphics/pstoedit/pkg-plist b/graphics/pstoedit/pkg-plist
index 20eab76a9e48..051f64989b09 100644
--- a/graphics/pstoedit/pkg-plist
+++ b/graphics/pstoedit/pkg-plist
@@ -1,7 +1,10 @@
 bin/pstoedit
-lib/latex2e.fmp
-lib/mpost.fmp
-share/doc/pstoedit/changelog.htm
-share/doc/pstoedit/index.htm
-share/doc/pstoedit/pstoedit.htm
-@dirrm share/doc/pstoedit
+%%PORTDOCS%%share/doc/pstoedit/changelog.htm
+%%PORTDOCS%%share/doc/pstoedit/index.htm
+%%PORTDOCS%%share/doc/pstoedit/pstoedit.htm
+share/pstoedit/latex2e.fmp
+share/pstoedit/mpost.fmp
+share/pstoedit/swffonts/default.fdb
+@dirrm share/pstoedit/swffonts
+@dirrm share/pstoedit
+%%PORTDOCS%%@dirrm share/doc/pstoedit