Update to 3.33.

PR:		ports/47331
Submitted by:	Ports Fury

5 files changed, 15 insertions, 28 deletions

diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 3c09c1d9f183..a133e6a3ee7c 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	pstoedit
-PORTVERSION=	3.32
-PORTREVISION=	1
+PORTVERSION=	3.33
 CATEGORIES=	graphics print
 MASTER_SITES=	http://home.t-online.de/home/helga.glunz/wglunz/pstoedit/
 
@@ -22,15 +21,15 @@ RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig \
 		gs:${PORTSDIR}/print/ghostscript-gnu
 
 USE_LIBTOOL=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
 
 MAN1=	pstoedit.1
 
-CPPFLAGS=	-I${LOCALBASE}/include/ming -I${LOCALBASE}/include \
-		-I${X11BASE}/include -fpermissive
-LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include/ming -I${LOCALBASE}/include \
+		-I${X11BASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/pstoedit.1 ${MANPREFIX}/man/man1
diff --git a/graphics/pstoedit/distinfo b/graphics/pstoedit/distinfo
index 753504264ba3..21a78a9c8365 100644
--- a/graphics/pstoedit/distinfo
+++ b/graphics/pstoedit/distinfo
@@ -1 +1 @@
-MD5 (pstoedit-3.32.tar.gz) = 3cc02f27c6030448f7b3705f85cba34e
+MD5 (pstoedit-3.33.tar.gz) = 6a671ef165bf7d1611a2ad3f0499ff5b
diff --git a/graphics/pstoedit/files/patch-configure b/graphics/pstoedit/files/patch-configure
index 20088411ee6a..dc6191ca0367 100644
--- a/graphics/pstoedit/files/patch-configure
+++ b/graphics/pstoedit/files/patch-configure
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure	2002/09/12 16:53:58	1.1
-+++ configure	2002/09/12 16:54:04
-@@ -7031,6 +7031,7 @@
+--- 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"
@@ -11,22 +11,22 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -8016,16 +8017,15 @@
+@@ -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:8021: result: AIX xlC" >&5
+   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:8025: result: OSF/1 cxx" >&5
+   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:8031: result: Irix 5.3" >&5
+     echo "$as_me:$LINENO: result: Irix 5.3" >&5
diff --git a/graphics/pstoedit/files/patch-src::Makefile.in b/graphics/pstoedit/files/patch-src::Makefile.in
deleted file mode 100644
index 1901bd028200..000000000000
--- a/graphics/pstoedit/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/Makefile.in	2002/09/12 17:11:07	1.1
-+++ src/Makefile.in	2002/09/12 17:13:02
-@@ -191,7 +191,7 @@
- 	psimage.h
- 
- 
--CPPFLAGS = \
-+CPPFLAGS = @CPPFLAGS@ \
- 	${LIBPLOTTER_CFLAGS}			\
- 	${LIBMING_CFLAGS}			\
- 	${LIBMAGICK_CFLAGS}			\
diff --git a/graphics/pstoedit/pkg-plist b/graphics/pstoedit/pkg-plist
index 44952909cf9b..c74c49def90e 100644
--- a/graphics/pstoedit/pkg-plist
+++ b/graphics/pstoedit/pkg-plist
@@ -5,6 +5,7 @@ include/pstoedit/cppcomp.h
 include/pstoedit/drvbase.h
 include/pstoedit/drvfuncs.h
 include/pstoedit/miscutil.h
+include/pstoedit/ordlist.h
 include/pstoedit/poptions.h
 include/pstoedit/psimage.h
 include/pstoedit/pstoedit.h
@@ -27,6 +28,7 @@ lib/pstoedit/libp2edrvswf.a
 lib/pstoedit/libp2edrvswf.so
 lib/pstoedit/libp2edrvswf.so.0
 libdata/pkgconfig/pstoedit.pc
+share/aclocal/pstoedit.m4
 %%PORTDOCS%%share/doc/pstoedit/changelog.htm
 %%PORTDOCS%%share/doc/pstoedit/index.htm
 %%PORTDOCS%%share/doc/pstoedit/pstoedit.htm