7 files changed, 50 insertions, 39 deletions

diff --git a/graphics/gts/Makefile b/graphics/gts/Makefile
index af5093528b7b..1045ed78a3d7 100644
--- a/graphics/gts/Makefile
+++ b/graphics/gts/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gts
-PORTVERSION=	0.7.0
+PORTVERSION=	0.7.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,8 +16,9 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNU Triangulated Surface Library
 
 USE_GNOME=	glib12
-USE_LIBTOOL=	yes
-LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
+USE_GETOPT_LONG=	yes
+USE_REINPLACE=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
@@ -25,10 +26,9 @@ INSTALLS_SHLIB=	yes
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 
-.if !exists(/usr/include/getopt.h)
-LIB_DEPENDS+=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-LDFLAGS+=	-lgnugetopt
-.endif
+post-patch:
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-release \$$(LT_RELEASE)||g'
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/graphics/gts/distinfo b/graphics/gts/distinfo
index 991e429b6337..e9ce626af083 100644
--- a/graphics/gts/distinfo
+++ b/graphics/gts/distinfo
@@ -1 +1 @@
-MD5 (gts-0.7.0.tar.gz) = 33ded8bc4fbf5a675fa71ed5c06a74d8
+MD5 (gts-0.7.1.tar.gz) = bce972e7172399385628b8e50e45be12
diff --git a/graphics/gts/files/patch-configure b/graphics/gts/files/patch-configure
index 8deca27509b2..e69de29bb2d1 100644
--- a/graphics/gts/files/patch-configure
+++ b/graphics/gts/files/patch-configure
@@ -1,10 +0,0 @@
---- configure.orig	Mon Sep 16 09:53:32 2002
-+++ configure	Sat Nov  9 14:36:52 2002
-@@ -7361,6 +7361,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'
diff --git a/graphics/gts/files/patch-isotetra.c b/graphics/gts/files/patch-isotetra.c
index 65c6ffdd09c1..e69de29bb2d1 100644
--- a/graphics/gts/files/patch-isotetra.c
+++ b/graphics/gts/files/patch-isotetra.c
@@ -1,10 +0,0 @@
---- src/isotetra.c.orig	Thu Nov 21 16:27:11 2002
-+++ src/isotetra.c	Thu Nov 21 16:27:34 2002
-@@ -18,6 +18,7 @@
-  */
- 
- #include <math.h>
-+#include <string.h>
- #include <gts.h>
- #ifdef NATIVE_WIN32
- # include <memory.h>
diff --git a/graphics/gts/files/patch-ltmain.sh b/graphics/gts/files/patch-ltmain.sh
new file mode 100644
index 000000000000..5e96702f11f5
--- /dev/null
+++ b/graphics/gts/files/patch-ltmain.sh
@@ -0,0 +1,41 @@
+--- ltmain.sh.orig	Wed Dec 18 17:59:18 2002
++++ ltmain.sh	Thu Apr 24 02:59:06 2003
+@@ -1043,14 +1043,14 @@
+ 	    # These systems don't actually have a C library (as such)
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -2441,7 +2441,7 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
+ 	  *)
+@@ -4210,10 +4210,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/graphics/gts/files/patch-stl2gts.c b/graphics/gts/files/patch-stl2gts.c
index 1f9eb205e0e1..e69de29bb2d1 100644
--- a/graphics/gts/files/patch-stl2gts.c
+++ b/graphics/gts/files/patch-stl2gts.c
@@ -1,10 +0,0 @@
---- tools/stl2gts.c.orig	Thu Nov 21 16:30:54 2002
-+++ tools/stl2gts.c	Thu Nov 21 16:31:06 2002
-@@ -19,6 +19,7 @@
- 
- #include <math.h>
- #include <stdlib.h>
-+#include <string.h>
- #include "config.h"
- #ifdef HAVE_GETOPT_H
- #  include <getopt.h>
diff --git a/graphics/gts/pkg-plist b/graphics/gts/pkg-plist
index e12e6ef681c0..0f1e14767fd3 100644
--- a/graphics/gts/pkg-plist
+++ b/graphics/gts/pkg-plist
@@ -9,7 +9,7 @@ include/gts.h
 include/gtsconfig.h
 lib/libgts.a
 lib/libgts.so
-lib/libgts.so.0
+lib/libgts.so.1
 share/aclocal/gts.m4
 %%PORTDOCS%%share/doc/gts/book1.html
 %%PORTDOCS%%share/doc/gts/c10143.html