Put USE_LIBTOOL back.

8 files changed, 40 insertions, 72 deletions

diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 3cf672e20f9a..75d4cfb3df4f 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -37,7 +37,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -fno-rtti -fno-exceptions" \
 		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv" \
 		LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}"
diff --git a/x11-fm/nautilus/files/patch-aa b/x11-fm/nautilus/files/patch-aa
index d50ac2068a3a..4b4c5bec6e52 100644
--- a/x11-fm/nautilus/files/patch-aa
+++ b/x11-fm/nautilus/files/patch-aa
@@ -1,9 +1,17 @@
 
 $FreeBSD$
 
---- configure.orig	Thu Feb 21 14:19:32 2002
-+++ configure	Wed Feb 27 00:22:58 2002
-@@ -7005,7 +7005,7 @@
+--- configure.orig	Thu Apr 25 22:34:32 2002
++++ configure	Thu Apr 25 22:35:04 2002
+@@ -5335,6 +5335,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'
+@@ -7005,7 +7006,7 @@
  
  CC="$_save_cc"
  
@@ -12,7 +20,7 @@ $FreeBSD$
  _mozilla_gtk_super_win_libs=
  echo $ac_n "checking for gdk_superwin_get_type in -lgtksuperwin""... $ac_c" 1>&6
  echo "configure:7012: checking for gdk_superwin_get_type in -lgtksuperwin" >&5
-@@ -7048,7 +7048,7 @@
+@@ -7048,7 +7049,7 @@
  fi
  
  
@@ -21,7 +29,7 @@ $FreeBSD$
  _mozilla_gtk_moz_embed_libs=
  echo $ac_n "checking for gtk_moz_embed_get_type in -lgtkembedmoz""... $ac_c" 1>&6
  echo "configure:7055: checking for gtk_moz_embed_get_type in -lgtkembedmoz" >&5
-@@ -7057,7 +7057,7 @@
+@@ -7057,7 +7058,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
@@ -30,7 +38,7 @@ $FreeBSD$
  cat > conftest.$ac_ext <<EOF
  #line 7063 "configure"
  #include "confdefs.h"
-@@ -9141,7 +9141,7 @@
+@@ -9141,7 +9142,7 @@
  fi
  
  if test x$SCROLLKEEPER_CONFIG = xno; then
@@ -39,7 +47,7 @@ $FreeBSD$
  fi
  
  
-@@ -12061,6 +12061,7 @@
+@@ -12061,6 +12062,7 @@
  s%@MOZILLA_COMPONENT_RPATH_FLAGS@%$MOZILLA_COMPONENT_RPATH_FLAGS%g
  s%@MOZILLA_COMPONENT_LDFLAGS@%$MOZILLA_COMPONENT_LDFLAGS%g
  s%@MOZILLA_COMPONENT_LIBS@%$MOZILLA_COMPONENT_LIBS%g
diff --git a/x11-fm/nautilus/files/patch-ltmain.sh b/x11-fm/nautilus/files/patch-ltmain.sh
deleted file mode 100644
index 98cb05e4ddb3..000000000000
--- a/x11-fm/nautilus/files/patch-ltmain.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ 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/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index 0327497f7bd4..7c27654f0a88 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -49,12 +49,16 @@ include/libnautilus/nautilus-undo.h
 include/libnautilus/nautilus-view-component.h
 include/libnautilus/nautilus-view-standard-main.h
 include/libnautilus/nautilus-view.h
+lib/libnautilus-adapter.a
 lib/libnautilus-adapter.so
 lib/libnautilus-adapter.so.0
+lib/libnautilus-private.a
 lib/libnautilus-private.so
 lib/libnautilus-private.so.0
+lib/libnautilus-tree-view.a
 lib/libnautilus-tree-view.so
 lib/libnautilus-tree-view.so.0
+lib/libnautilus.a
 lib/libnautilus.so
 lib/libnautilus.so.0
 lib/vfs/modules/libvfs-help.so
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index 3cf672e20f9a..75d4cfb3df4f 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -37,7 +37,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -fno-rtti -fno-exceptions" \
 		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv" \
 		LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}"
diff --git a/x11-fm/nautilus2/files/patch-aa b/x11-fm/nautilus2/files/patch-aa
index d50ac2068a3a..4b4c5bec6e52 100644
--- a/x11-fm/nautilus2/files/patch-aa
+++ b/x11-fm/nautilus2/files/patch-aa
@@ -1,9 +1,17 @@
 
 $FreeBSD$
 
---- configure.orig	Thu Feb 21 14:19:32 2002
-+++ configure	Wed Feb 27 00:22:58 2002
-@@ -7005,7 +7005,7 @@
+--- configure.orig	Thu Apr 25 22:34:32 2002
++++ configure	Thu Apr 25 22:35:04 2002
+@@ -5335,6 +5335,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'
+@@ -7005,7 +7006,7 @@
  
  CC="$_save_cc"
  
@@ -12,7 +20,7 @@ $FreeBSD$
  _mozilla_gtk_super_win_libs=
  echo $ac_n "checking for gdk_superwin_get_type in -lgtksuperwin""... $ac_c" 1>&6
  echo "configure:7012: checking for gdk_superwin_get_type in -lgtksuperwin" >&5
-@@ -7048,7 +7048,7 @@
+@@ -7048,7 +7049,7 @@
  fi
  
  
@@ -21,7 +29,7 @@ $FreeBSD$
  _mozilla_gtk_moz_embed_libs=
  echo $ac_n "checking for gtk_moz_embed_get_type in -lgtkembedmoz""... $ac_c" 1>&6
  echo "configure:7055: checking for gtk_moz_embed_get_type in -lgtkembedmoz" >&5
-@@ -7057,7 +7057,7 @@
+@@ -7057,7 +7058,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
@@ -30,7 +38,7 @@ $FreeBSD$
  cat > conftest.$ac_ext <<EOF
  #line 7063 "configure"
  #include "confdefs.h"
-@@ -9141,7 +9141,7 @@
+@@ -9141,7 +9142,7 @@
  fi
  
  if test x$SCROLLKEEPER_CONFIG = xno; then
@@ -39,7 +47,7 @@ $FreeBSD$
  fi
  
  
-@@ -12061,6 +12061,7 @@
+@@ -12061,6 +12062,7 @@
  s%@MOZILLA_COMPONENT_RPATH_FLAGS@%$MOZILLA_COMPONENT_RPATH_FLAGS%g
  s%@MOZILLA_COMPONENT_LDFLAGS@%$MOZILLA_COMPONENT_LDFLAGS%g
  s%@MOZILLA_COMPONENT_LIBS@%$MOZILLA_COMPONENT_LIBS%g
diff --git a/x11-fm/nautilus2/files/patch-ltmain.sh b/x11-fm/nautilus2/files/patch-ltmain.sh
deleted file mode 100644
index 98cb05e4ddb3..000000000000
--- a/x11-fm/nautilus2/files/patch-ltmain.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ 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/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
index 0327497f7bd4..7c27654f0a88 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus2/pkg-plist
@@ -49,12 +49,16 @@ include/libnautilus/nautilus-undo.h
 include/libnautilus/nautilus-view-component.h
 include/libnautilus/nautilus-view-standard-main.h
 include/libnautilus/nautilus-view.h
+lib/libnautilus-adapter.a
 lib/libnautilus-adapter.so
 lib/libnautilus-adapter.so.0
+lib/libnautilus-private.a
 lib/libnautilus-private.so
 lib/libnautilus-private.so.0
+lib/libnautilus-tree-view.a
 lib/libnautilus-tree-view.so
 lib/libnautilus-tree-view.so.0
+lib/libnautilus.a
 lib/libnautilus.so
 lib/libnautilus.so.0
 lib/vfs/modules/libvfs-help.so