Use USE_GNOMENG.

8 files changed, 68 insertions, 72 deletions

diff --git a/x11-toolkits/py-gnome/files/patch-configure b/x11-toolkits/py-gnome/files/patch-configure
new file mode 100644
index 00000000000..7865ce50d7f
--- /dev/null
+++ b/x11-toolkits/py-gnome/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure.orig	Thu Jan  3 15:20:36 2002
++++ configure	Sun Jul 14 15:25:29 2002
+@@ -6322,6 +6322,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/x11-toolkits/py-gnome/files/patch-ltmain.sh b/x11-toolkits/py-gnome/files/patch-ltmain.sh
deleted file mode 100644
index 98cb05e4ddb..00000000000
--- a/x11-toolkits/py-gnome/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-toolkits/py-gnome/files/patch-pygtk::configure b/x11-toolkits/py-gnome/files/patch-pygtk::configure
new file mode 100644
index 00000000000..ca4f17c4ef8
--- /dev/null
+++ b/x11-toolkits/py-gnome/files/patch-pygtk::configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- pygtk/configure.orig	Thu Jan  3 15:20:58 2002
++++ pygtk/configure	Sun Jul 14 15:24:57 2002
+@@ -6321,6 +6321,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/x11-toolkits/py-gnome/pkg-plist b/x11-toolkits/py-gnome/pkg-plist
index d2bad0343ae..92f764fb872 100644
--- a/x11-toolkits/py-gnome/pkg-plist
+++ b/x11-toolkits/py-gnome/pkg-plist
@@ -81,13 +81,13 @@ share/examples/py-gnome/stock_demo.py
 share/examples/py-gnome/ted_demo.py
 share/examples/py-gnome/uiinfo_demo.py
 share/examples/py-gnome/zterm.py
-share/gnome/pygtk/1.2/defs/applet.defs
-share/gnome/pygtk/1.2/defs/capplet.defs
-share/gnome/pygtk/1.2/defs/gnome-enums.defs
-share/gnome/pygtk/1.2/defs/gnome.defs
-share/gnome/pygtk/1.2/defs/gnomeui.defs
-share/gnome/pygtk/1.2/defs/gtkhtml.defs
-share/gnome/pygtk/1.2/defs/xmhtml.defs
-share/gnome/pygtk/1.2/defs/zvt.defs
+share/pygtk/1.2/defs/applet.defs
+share/pygtk/1.2/defs/capplet.defs
+share/pygtk/1.2/defs/gnome-enums.defs
+share/pygtk/1.2/defs/gnome.defs
+share/pygtk/1.2/defs/gnomeui.defs
+share/pygtk/1.2/defs/gtkhtml.defs
+share/pygtk/1.2/defs/xmhtml.defs
+share/pygtk/1.2/defs/zvt.defs
 @dirrm share/examples/py-gnome
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/gnome
diff --git a/x11-toolkits/py-gnome2/files/patch-configure b/x11-toolkits/py-gnome2/files/patch-configure
new file mode 100644
index 00000000000..7865ce50d7f
--- /dev/null
+++ b/x11-toolkits/py-gnome2/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure.orig	Thu Jan  3 15:20:36 2002
++++ configure	Sun Jul 14 15:25:29 2002
+@@ -6322,6 +6322,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/x11-toolkits/py-gnome2/files/patch-ltmain.sh b/x11-toolkits/py-gnome2/files/patch-ltmain.sh
deleted file mode 100644
index 98cb05e4ddb..00000000000
--- a/x11-toolkits/py-gnome2/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-toolkits/py-gnome2/files/patch-pygtk::configure b/x11-toolkits/py-gnome2/files/patch-pygtk::configure
new file mode 100644
index 00000000000..ca4f17c4ef8
--- /dev/null
+++ b/x11-toolkits/py-gnome2/files/patch-pygtk::configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- pygtk/configure.orig	Thu Jan  3 15:20:58 2002
++++ pygtk/configure	Sun Jul 14 15:24:57 2002
+@@ -6321,6 +6321,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/x11-toolkits/py-gnome2/pkg-plist b/x11-toolkits/py-gnome2/pkg-plist
index d2bad0343ae..92f764fb872 100644
--- a/x11-toolkits/py-gnome2/pkg-plist
+++ b/x11-toolkits/py-gnome2/pkg-plist
@@ -81,13 +81,13 @@ share/examples/py-gnome/stock_demo.py
 share/examples/py-gnome/ted_demo.py
 share/examples/py-gnome/uiinfo_demo.py
 share/examples/py-gnome/zterm.py
-share/gnome/pygtk/1.2/defs/applet.defs
-share/gnome/pygtk/1.2/defs/capplet.defs
-share/gnome/pygtk/1.2/defs/gnome-enums.defs
-share/gnome/pygtk/1.2/defs/gnome.defs
-share/gnome/pygtk/1.2/defs/gnomeui.defs
-share/gnome/pygtk/1.2/defs/gtkhtml.defs
-share/gnome/pygtk/1.2/defs/xmhtml.defs
-share/gnome/pygtk/1.2/defs/zvt.defs
+share/pygtk/1.2/defs/applet.defs
+share/pygtk/1.2/defs/capplet.defs
+share/pygtk/1.2/defs/gnome-enums.defs
+share/pygtk/1.2/defs/gnome.defs
+share/pygtk/1.2/defs/gnomeui.defs
+share/pygtk/1.2/defs/gtkhtml.defs
+share/pygtk/1.2/defs/xmhtml.defs
+share/pygtk/1.2/defs/zvt.defs
 @dirrm share/examples/py-gnome
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/gnome