9 files changed, 61 insertions, 116 deletions

diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index a8d2243c07e9..db1658395785 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ORBit
-PORTVERSION=	0.5.16
+PORTVERSION=	0.5.17
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/ORBit
@@ -22,7 +22,8 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GLIB=	yes
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+LIBTOOLFILES=	configure popt/configure libIDL/configure
 CONFIGURE_ARGS= --disable-indent
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/ORBit/distinfo b/devel/ORBit/distinfo
index 43db32bc9538..e712c9d51f03 100644
--- a/devel/ORBit/distinfo
+++ b/devel/ORBit/distinfo
@@ -1 +1 @@
-MD5 (gnome/ORBit-0.5.16.tar.bz2) = 0a9bec660d3db58f82e3fa40ae42d766
+MD5 (gnome/ORBit-0.5.17.tar.bz2) = 35acc6f8d49d930b566104fcceb893d3
diff --git a/devel/ORBit/files/patch-ae b/devel/ORBit/files/patch-ae
index 9890cee4a057..326dcfe4b651 100644
--- a/devel/ORBit/files/patch-ae
+++ b/devel/ORBit/files/patch-ae
@@ -1,9 +1,17 @@
 
 $FreeBSD$
 
---- configure.orig	Wed Mar 20 16:45:48 2002
-+++ configure	Mon Mar 25 15:05:17 2002
-@@ -7189,9 +7189,9 @@
+--- configure.orig	Thu Jun  6 14:27:24 2002
++++ configure	Fri Jun  7 19:30:22 2002
+@@ -6430,6 +6430,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'
+@@ -7396,9 +7397,9 @@
  
    rm -f conf.glibtest
  
@@ -15,7 +23,7 @@ $FreeBSD$
  
  for ac_prog in 'bison -y' byacc
  do
-@@ -9037,9 +9037,11 @@
+@@ -9244,9 +9245,11 @@
  
  fi
  
@@ -29,8 +37,8 @@ $FreeBSD$
  EOF
  
  else
-@@ -9047,29 +9049,23 @@
- #line 9047 "configure"
+@@ -9254,29 +9257,23 @@
+ #line 9254 "configure"
  #include "confdefs.h"
  
 -#include <fcntl.h>
@@ -72,9 +80,9 @@ $FreeBSD$
  }
  
  _ACEOF
-@@ -9084,18 +9080,16 @@
+@@ -9291,18 +9288,16 @@
    ac_status=$?
-   echo "$as_me:9085: \$? = $ac_status" >&5
+   echo "$as_me:9292: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  :
 +  MAXIOV=`cat conftestval`
@@ -94,7 +102,7 @@ $FreeBSD$
  
  #######################
  # type alignment test #
-@@ -10493,7 +10487,7 @@
+@@ -10700,7 +10695,7 @@
  s,@LIB_WRAP@,$LIB_WRAP,;t t
  s,@HAVE_HOSTS_ACCESS_TRUE@,$HAVE_HOSTS_ACCESS_TRUE,;t t
  s,@HAVE_HOSTS_ACCESS_FALSE@,$HAVE_HOSTS_ACCESS_FALSE,;t t
diff --git a/devel/ORBit/files/patch-libIDL::configure b/devel/ORBit/files/patch-libIDL::configure
new file mode 100644
index 000000000000..18f6a992dc08
--- /dev/null
+++ b/devel/ORBit/files/patch-libIDL::configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- libIDL/configure	2002/06/07 16:28:12	1.1
++++ libIDL/configure	2002/06/07 16:30:32
+@@ -7418,6 +7418,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/devel/ORBit/files/patch-libIDL::ltmain.sh b/devel/ORBit/files/patch-libIDL::ltmain.sh
deleted file mode 100644
index e27c1baf1c8f..000000000000
--- a/devel/ORBit/files/patch-libIDL::ltmain.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-
-$FreeBSD$
-
---- libIDL/ltmain.sh.orig	Mon Mar 11 14:42:53 2002
-+++ libIDL/ltmain.sh	Tue Mar 12 16:39:28 2002
-@@ -1042,6 +1042,9 @@
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
-+	  *-*-freebsd*)
-+	    # has libc, but it shouldn't be explicitly linked in
-+	    ;;
- 	  esac
- 	fi
- 	deplibs="$deplibs $arg"
-@@ -2438,6 +2441,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # has libc, but it shouldn't be explicitly linked in
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4223,10 +4229,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/devel/ORBit/files/patch-ltmain.sh b/devel/ORBit/files/patch-ltmain.sh
deleted file mode 100644
index ea6bf0c18bb8..000000000000
--- a/devel/ORBit/files/patch-ltmain.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig	Mon Mar 11 14:42:39 2002
-+++ ltmain.sh	Tue Mar 12 16:38:49 2002
-@@ -1042,6 +1042,9 @@
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
-+	  *-*-freebsd*)
-+	    # has libc, but it shouldn't be explicitly linked in
-+	    ;;
- 	  esac
- 	fi
- 	deplibs="$deplibs $arg"
-@@ -2438,6 +2441,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # has libc, but it shouldn't be explicitly linked in
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4223,10 +4229,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/devel/ORBit/files/patch-popt::configure b/devel/ORBit/files/patch-popt::configure
new file mode 100644
index 000000000000..acebe068e265
--- /dev/null
+++ b/devel/ORBit/files/patch-popt::configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- popt/configure	2002/06/07 16:28:12	1.1
++++ popt/configure	2002/06/07 16:30:28
+@@ -7339,6 +7339,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/devel/ORBit/files/patch-popt::ltmain.sh b/devel/ORBit/files/patch-popt::ltmain.sh
deleted file mode 100644
index 18f548da39f5..000000000000
--- a/devel/ORBit/files/patch-popt::ltmain.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- popt/ltmain.sh	2001/08/27 09:51:26	1.1
-+++ popt/ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,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/devel/ORBit/files/patch-src::ORBitutil::orbit-os-config.h b/devel/ORBit/files/patch-src::ORBitutil::orbit-os-config.h
new file mode 100644
index 000000000000..fdccae00114d
--- /dev/null
+++ b/devel/ORBit/files/patch-src::ORBitutil::orbit-os-config.h
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/ORBitutil/orbit-os-config.h	2002/06/07 16:45:41	1.1
++++ src/ORBitutil/orbit-os-config.h	2002/06/07 16:46:08
+@@ -1,7 +1,7 @@
+ #ifndef OS_CONFIG_H
+ #define OS_CONFIG_H 1
+ 
+-#define ORBIT_HAVE_ALLOCA_H 0
++#undef ORBIT_HAVE_ALLOCA_H
+ #define MAXIOV 1024
+ 
+ #endif