Update to 3.31

PR:		35791
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

6 files changed, 48 insertions, 74 deletions

diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index f74548556db0..c5f4a410242f 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -6,29 +6,38 @@
 #
 
 PORTNAME=	pstoedit
-PORTVERSION=	3.30
+PORTVERSION=	3.31
 CATEGORIES=	graphics print
 MASTER_SITES=	http://home.t-online.de/home/helga.glunz/wglunz/pstoedit/
 DISTNAME=	${PORTNAME}_${PORTVERSION:S/./_/}
 
 MAINTAINER=	ports@FreeBSD.org
 
-RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu
-LIB_DEPENDS=	plot.4:${PORTSDIR}/graphics/plotutils \
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/graphics/ming:extract
+LIB_DEPENDS=	ming.3:${PORTSDIR}/graphics/ming \
+		plot.4:${PORTSDIR}/graphics/plotutils \
 		plotter.4:${PORTSDIR}/graphics/plotutils
+RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}/src
 
-USE_ZIP=		yes
+USE_ZIP=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	../config/configure
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-CONFIGURE_ARGS=	--libdir=${DATADIR}
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 ALL_TARGET=	default
 
 MAN1=	pstoedit.1
 
+CPPFLAGS=	-I${LOCALBASE}/include/ming -I${LOCALBASE}/include \
+		-I${X11BASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib
+
+post-extract:
+	@${LN} -sf `cd ${PORTSDIR}/graphics/ming && ${MAKE} -V WRKSRC`/../util \
+		${WRKSRC}/util
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/graphics/pstoedit/distinfo b/graphics/pstoedit/distinfo
index cf7460660989..885ac1ca4ac5 100644
--- a/graphics/pstoedit/distinfo
+++ b/graphics/pstoedit/distinfo
@@ -1 +1 @@
-MD5 (pstoedit_3_30.zip) = cbdbc85209fbf5b4abf9c6bf2a03ae9c
+MD5 (pstoedit_3_31.zip) = d1d44bdb21ffafdd767191e8789787a2
diff --git a/graphics/pstoedit/files/patch-Makefile.in b/graphics/pstoedit/files/patch-Makefile.in
index f07e84d2b443..f22be5533f06 100644
--- a/graphics/pstoedit/files/patch-Makefile.in
+++ b/graphics/pstoedit/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Wed Oct  4 04:51:25 2000
-+++ Makefile.in	Sat Apr 14 08:24:02 2001
-@@ -16,7 +16,7 @@
+--- Makefile.in.orig	Sat Dec 29 01:34:06 2001
++++ Makefile.in	Sat Mar  9 03:58:24 2002
+@@ -19,7 +19,7 @@
  GS=@GS@
  
  # Choose a compiler + linker
@@ -9,25 +9,35 @@
  CCC=@CXX@ @SPECIAL_CXXFLAGS@
  LDLIBS=$(LOCALLIBS) @LDLIBS@ -lm @LDL@
  LINK=@LINK@
-@@ -54,9 +54,9 @@
+@@ -57,9 +57,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_PROGRAM=@INSTALL_PROGRAM@
 +INSTALL_DATA=@INSTALL_DATA@
 +INSTALL_DIR=mkdir -p
  OBJEXT=o
  EXEEXT=
  OUTPUT=-o pstoedit
-@@ -68,7 +68,7 @@
+@@ -71,7 +71,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@
+ LOCALDEFINES=@PLOTCOMPILEFLAGS@ @MINGCOMPILEFLAGS@ @PNGCOMPILEFLAGS@
+-LOCALLIBS=-L/path/to/libplot @LPLOTTER@ @LMING@ @PNGLINKFLAGS@
++LOCALLIBS=@LDFLAGS@ @LIBS@ @LPLOTTER@ @LMING@ @PNGLINKFLAGS@
  #############################################################
  
  ## IRIX 5.3
+@@ -367,8 +367,7 @@
+ 	if [ ! -d $(DESTDIR)$(MANDIR) ] ; then \
+ 		$(INSTALL_DIR) $(DESTDIR)$(MANDIR); \
+ 	fi
+-	$(INSTALL_DATA) ../doc/pstoedit.1  $(DESTDIR)$(MANDIR)/pstoedit.$(MANEXT);
+-	$(INSTALL_DATA) ../doc/pstoedit.htm  $(DESTDIR)$(datadir)
++	$(INSTALL_DATA) ../doc/pstoedit.1  $(DESTDIR)$(MANDIR)/pstoedit.$(MANEXT)
+ 
+ 
+ #	echo "please copy ../doc/pstoedit.htm to a suitable place"
diff --git a/graphics/pstoedit/files/patch-drvswf.cpp b/graphics/pstoedit/files/patch-drvswf.cpp
new file mode 100644
index 000000000000..f8b7c394c9bf
--- /dev/null
+++ b/graphics/pstoedit/files/patch-drvswf.cpp
@@ -0,0 +1,11 @@
+--- drvswf.cpp.orig	Mon Dec 31 05:35:23 2001
++++ drvswf.cpp	Sat Mar  9 05:54:59 2002
+@@ -415,7 +415,7 @@
+ 
+ 	// if the fontnames ends with .fdb, then the file is read, otherwise browser fonts are used.
+ 
+-	SWFFont *f = new SWFFont(fontfilename.value());
++	SWFFont *f = new SWFFont((char *)fontfilename.value());
+ 	if ((f == NULL) || (f->font == NULL)) {
+ 		errf << "Loading font " << fontfilename.value() << " failed !" << endl;
+ 		return;
diff --git a/graphics/pstoedit/files/patch-dynload.cpp b/graphics/pstoedit/files/patch-dynload.cpp
deleted file mode 100644
index 8d83bc8eb4ed..000000000000
--- a/graphics/pstoedit/files/patch-dynload.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
---- 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-plist b/graphics/pstoedit/pkg-plist
index 051f64989b09..8668ba075356 100644
--- a/graphics/pstoedit/pkg-plist
+++ b/graphics/pstoedit/pkg-plist
@@ -4,6 +4,7 @@ bin/pstoedit
 %%PORTDOCS%%share/doc/pstoedit/pstoedit.htm
 share/pstoedit/latex2e.fmp
 share/pstoedit/mpost.fmp
+share/pstoedit/svg.fmp
 share/pstoedit/swffonts/default.fdb
 @dirrm share/pstoedit/swffonts
 @dirrm share/pstoedit