Update to 1.0.2.

8 files changed, 178 insertions, 138 deletions

diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile
index 1ef4450c0570..4c93f124c0ba 100644
--- a/x11-toolkits/eel/Makefile
+++ b/x11-toolkits/eel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	eel
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/eel
@@ -19,7 +19,7 @@ LIB_DEPENDS=	rsvg.1:${PORTSDIR}/graphics/librsvg
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_ARGS=	--enable-shared --enable-static
diff --git a/x11-toolkits/eel/distinfo b/x11-toolkits/eel/distinfo
index 420a15c7b478..89fa5a78ec65 100644
--- a/x11-toolkits/eel/distinfo
+++ b/x11-toolkits/eel/distinfo
@@ -1 +1 @@
-MD5 (eel-1.0.1.tar.gz) = 9737c6a06dc03706e3567f19e53ea980
+MD5 (eel-1.0.2.tar.gz) = 9e4e4d9d3b688ea34351f2aa6112fd81
diff --git a/x11-toolkits/eel/files/patch-ltmain.sh b/x11-toolkits/eel/files/patch-ltmain.sh
new file mode 100644
index 000000000000..33bc7983f107
--- /dev/null
+++ b/x11-toolkits/eel/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/08/27 09:51:26	1.1
++++ ltmain.sh	2001/08/27 09:51:42
+@@ -4175,10 +4175,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/eel/pkg-plist b/x11-toolkits/eel/pkg-plist
index 26bc5c399bab..048b46f8d4cd 100644
--- a/x11-toolkits/eel/pkg-plist
+++ b/x11-toolkits/eel/pkg-plist
@@ -1,69 +1,70 @@
 bin/eel-config
 etc/eelConf.sh
-include/eel/eel-art-extensions.h
-include/eel/eel-art-gtk-extensions.h
-include/eel/eel-background.h
-include/eel/eel-canvas-rect.h
-include/eel/eel-caption-table.h
-include/eel/eel-caption.h
-include/eel/eel-clickable-image.h
-include/eel/eel-clist.h
-include/eel/eel-ctree.h
-include/eel/eel-dateedit-extensions.h
-include/eel/eel-debug-drawing.h
-include/eel/eel-debug.h
-include/eel/eel-dnd.h
-include/eel/eel-ellipsizing-label.h
-include/eel/eel-enumeration.h
-include/eel/eel-font-manager.h
-include/eel/eel-font-picker.h
-include/eel/eel-gconf-extensions.h
-include/eel/eel-gdk-extensions.h
-include/eel/eel-gdk-font-extensions.h
-include/eel/eel-gdk-pixbuf-extensions.h
-include/eel/eel-generous-bin.h
-include/eel/eel-glib-extensions.h
-include/eel/eel-glyph.h
-include/eel/eel-gnome-extensions.h
-include/eel/eel-graphic-effects.h
-include/eel/eel-gtk-container.h
-include/eel/eel-gtk-extensions.h
-include/eel/eel-gtk-macros.h
-include/eel/eel-image-chooser.h
-include/eel/eel-image-table.h
-include/eel/eel-image-with-background.h
-include/eel/eel-image.h
-include/eel/eel-label-with-background.h
-include/eel/eel-label.h
-include/eel/eel-labeled-image.h
-include/eel/eel-list-column-title.h
-include/eel/eel-list.h
-include/eel/eel-password-dialog.h
-include/eel/eel-preferences-box.h
-include/eel/eel-preferences-group.h
-include/eel/eel-preferences-item.h
-include/eel/eel-preferences-pane.h
-include/eel/eel-preferences.h
-include/eel/eel-radio-button-group.h
-include/eel/eel-region.h
-include/eel/eel-scalable-font-private.h
-include/eel/eel-scalable-font.h
-include/eel/eel-self-checks.h
-include/eel/eel-smooth-text-layout-cache.h
-include/eel/eel-smooth-text-layout.h
-include/eel/eel-smooth-widget.h
-include/eel/eel-stock-dialogs.h
-include/eel/eel-string-list.h
-include/eel/eel-string-picker.h
-include/eel/eel-string.h
-include/eel/eel-text-caption.h
-include/eel/eel-type-builtins.h
-include/eel/eel-types.h
-include/eel/eel-vfs-extensions.h
-include/eel/eel-viewport.h
-include/eel/eel-wrap-table.h
-include/eel/eel-xml-extensions.h
-include/eel/eel.h
+include/eel-1/eel/eel-art-extensions.h
+include/eel-1/eel/eel-art-gtk-extensions.h
+include/eel-1/eel/eel-background.h
+include/eel-1/eel/eel-canvas-rect.h
+include/eel-1/eel/eel-caption-table.h
+include/eel-1/eel/eel-caption.h
+include/eel-1/eel/eel-clickable-image.h
+include/eel-1/eel/eel-clist.h
+include/eel-1/eel/eel-ctree.h
+include/eel-1/eel/eel-dateedit-extensions.h
+include/eel-1/eel/eel-debug-drawing.h
+include/eel-1/eel/eel-debug.h
+include/eel-1/eel/eel-dnd.h
+include/eel-1/eel/eel-ellipsizing-label.h
+include/eel-1/eel/eel-enumeration.h
+include/eel-1/eel/eel-features.h
+include/eel-1/eel/eel-font-manager.h
+include/eel-1/eel/eel-font-picker.h
+include/eel-1/eel/eel-gconf-extensions.h
+include/eel-1/eel/eel-gdk-extensions.h
+include/eel-1/eel/eel-gdk-font-extensions.h
+include/eel-1/eel/eel-gdk-pixbuf-extensions.h
+include/eel-1/eel/eel-generous-bin.h
+include/eel-1/eel/eel-glib-extensions.h
+include/eel-1/eel/eel-glyph.h
+include/eel-1/eel/eel-gnome-extensions.h
+include/eel-1/eel/eel-graphic-effects.h
+include/eel-1/eel/eel-gtk-container.h
+include/eel-1/eel/eel-gtk-extensions.h
+include/eel-1/eel/eel-gtk-macros.h
+include/eel-1/eel/eel-image-chooser.h
+include/eel-1/eel/eel-image-table.h
+include/eel-1/eel/eel-image-with-background.h
+include/eel-1/eel/eel-image.h
+include/eel-1/eel/eel-label-with-background.h
+include/eel-1/eel/eel-label.h
+include/eel-1/eel/eel-labeled-image.h
+include/eel-1/eel/eel-list-column-title.h
+include/eel-1/eel/eel-list.h
+include/eel-1/eel/eel-password-dialog.h
+include/eel-1/eel/eel-preferences-box.h
+include/eel-1/eel/eel-preferences-group.h
+include/eel-1/eel/eel-preferences-item.h
+include/eel-1/eel/eel-preferences-pane.h
+include/eel-1/eel/eel-preferences.h
+include/eel-1/eel/eel-radio-button-group.h
+include/eel-1/eel/eel-region.h
+include/eel-1/eel/eel-scalable-font-private.h
+include/eel-1/eel/eel-scalable-font.h
+include/eel-1/eel/eel-self-checks.h
+include/eel-1/eel/eel-smooth-text-layout-cache.h
+include/eel-1/eel/eel-smooth-text-layout.h
+include/eel-1/eel/eel-smooth-widget.h
+include/eel-1/eel/eel-stock-dialogs.h
+include/eel-1/eel/eel-string-list.h
+include/eel-1/eel/eel-string-picker.h
+include/eel-1/eel/eel-string.h
+include/eel-1/eel/eel-text-caption.h
+include/eel-1/eel/eel-type-builtins.h
+include/eel-1/eel/eel-types.h
+include/eel-1/eel/eel-vfs-extensions.h
+include/eel-1/eel/eel-viewport.h
+include/eel-1/eel/eel-wrap-table.h
+include/eel-1/eel/eel-xml-extensions.h
+include/eel-1/eel/eel.h
 lib/libeel.a
 lib/libeel.so
 lib/libeel.so.0
@@ -109,8 +110,9 @@ share/locale/sv/LC_MESSAGES/eel.mo
 share/locale/ta/LC_MESSAGES/eel.mo
 share/locale/tr/LC_MESSAGES/eel.mo
 share/locale/uk/LC_MESSAGES/eel.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/eel.mo
+share/locale/zh_TW/LC_MESSAGES/eel.mo
 @dirrm share/gnome/eel/fonts/urw
 @dirrm share/gnome/eel/fonts
 @dirrm share/gnome/eel
-@dirrm include/eel
+@dirrm include/eel-1/eel
+@dirrm include/eel-1
diff --git a/x11-toolkits/eel2/Makefile b/x11-toolkits/eel2/Makefile
index 1ef4450c0570..4c93f124c0ba 100644
--- a/x11-toolkits/eel2/Makefile
+++ b/x11-toolkits/eel2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	eel
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/eel
@@ -19,7 +19,7 @@ LIB_DEPENDS=	rsvg.1:${PORTSDIR}/graphics/librsvg
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_ARGS=	--enable-shared --enable-static
diff --git a/x11-toolkits/eel2/distinfo b/x11-toolkits/eel2/distinfo
index 420a15c7b478..89fa5a78ec65 100644
--- a/x11-toolkits/eel2/distinfo
+++ b/x11-toolkits/eel2/distinfo
@@ -1 +1 @@
-MD5 (eel-1.0.1.tar.gz) = 9737c6a06dc03706e3567f19e53ea980
+MD5 (eel-1.0.2.tar.gz) = 9e4e4d9d3b688ea34351f2aa6112fd81
diff --git a/x11-toolkits/eel2/files/patch-ltmain.sh b/x11-toolkits/eel2/files/patch-ltmain.sh
new file mode 100644
index 000000000000..33bc7983f107
--- /dev/null
+++ b/x11-toolkits/eel2/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/08/27 09:51:26	1.1
++++ ltmain.sh	2001/08/27 09:51:42
+@@ -4175,10 +4175,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/eel2/pkg-plist b/x11-toolkits/eel2/pkg-plist
index 26bc5c399bab..048b46f8d4cd 100644
--- a/x11-toolkits/eel2/pkg-plist
+++ b/x11-toolkits/eel2/pkg-plist
@@ -1,69 +1,70 @@
 bin/eel-config
 etc/eelConf.sh
-include/eel/eel-art-extensions.h
-include/eel/eel-art-gtk-extensions.h
-include/eel/eel-background.h
-include/eel/eel-canvas-rect.h
-include/eel/eel-caption-table.h
-include/eel/eel-caption.h
-include/eel/eel-clickable-image.h
-include/eel/eel-clist.h
-include/eel/eel-ctree.h
-include/eel/eel-dateedit-extensions.h
-include/eel/eel-debug-drawing.h
-include/eel/eel-debug.h
-include/eel/eel-dnd.h
-include/eel/eel-ellipsizing-label.h
-include/eel/eel-enumeration.h
-include/eel/eel-font-manager.h
-include/eel/eel-font-picker.h
-include/eel/eel-gconf-extensions.h
-include/eel/eel-gdk-extensions.h
-include/eel/eel-gdk-font-extensions.h
-include/eel/eel-gdk-pixbuf-extensions.h
-include/eel/eel-generous-bin.h
-include/eel/eel-glib-extensions.h
-include/eel/eel-glyph.h
-include/eel/eel-gnome-extensions.h
-include/eel/eel-graphic-effects.h
-include/eel/eel-gtk-container.h
-include/eel/eel-gtk-extensions.h
-include/eel/eel-gtk-macros.h
-include/eel/eel-image-chooser.h
-include/eel/eel-image-table.h
-include/eel/eel-image-with-background.h
-include/eel/eel-image.h
-include/eel/eel-label-with-background.h
-include/eel/eel-label.h
-include/eel/eel-labeled-image.h
-include/eel/eel-list-column-title.h
-include/eel/eel-list.h
-include/eel/eel-password-dialog.h
-include/eel/eel-preferences-box.h
-include/eel/eel-preferences-group.h
-include/eel/eel-preferences-item.h
-include/eel/eel-preferences-pane.h
-include/eel/eel-preferences.h
-include/eel/eel-radio-button-group.h
-include/eel/eel-region.h
-include/eel/eel-scalable-font-private.h
-include/eel/eel-scalable-font.h
-include/eel/eel-self-checks.h
-include/eel/eel-smooth-text-layout-cache.h
-include/eel/eel-smooth-text-layout.h
-include/eel/eel-smooth-widget.h
-include/eel/eel-stock-dialogs.h
-include/eel/eel-string-list.h
-include/eel/eel-string-picker.h
-include/eel/eel-string.h
-include/eel/eel-text-caption.h
-include/eel/eel-type-builtins.h
-include/eel/eel-types.h
-include/eel/eel-vfs-extensions.h
-include/eel/eel-viewport.h
-include/eel/eel-wrap-table.h
-include/eel/eel-xml-extensions.h
-include/eel/eel.h
+include/eel-1/eel/eel-art-extensions.h
+include/eel-1/eel/eel-art-gtk-extensions.h
+include/eel-1/eel/eel-background.h
+include/eel-1/eel/eel-canvas-rect.h
+include/eel-1/eel/eel-caption-table.h
+include/eel-1/eel/eel-caption.h
+include/eel-1/eel/eel-clickable-image.h
+include/eel-1/eel/eel-clist.h
+include/eel-1/eel/eel-ctree.h
+include/eel-1/eel/eel-dateedit-extensions.h
+include/eel-1/eel/eel-debug-drawing.h
+include/eel-1/eel/eel-debug.h
+include/eel-1/eel/eel-dnd.h
+include/eel-1/eel/eel-ellipsizing-label.h
+include/eel-1/eel/eel-enumeration.h
+include/eel-1/eel/eel-features.h
+include/eel-1/eel/eel-font-manager.h
+include/eel-1/eel/eel-font-picker.h
+include/eel-1/eel/eel-gconf-extensions.h
+include/eel-1/eel/eel-gdk-extensions.h
+include/eel-1/eel/eel-gdk-font-extensions.h
+include/eel-1/eel/eel-gdk-pixbuf-extensions.h
+include/eel-1/eel/eel-generous-bin.h
+include/eel-1/eel/eel-glib-extensions.h
+include/eel-1/eel/eel-glyph.h
+include/eel-1/eel/eel-gnome-extensions.h
+include/eel-1/eel/eel-graphic-effects.h
+include/eel-1/eel/eel-gtk-container.h
+include/eel-1/eel/eel-gtk-extensions.h
+include/eel-1/eel/eel-gtk-macros.h
+include/eel-1/eel/eel-image-chooser.h
+include/eel-1/eel/eel-image-table.h
+include/eel-1/eel/eel-image-with-background.h
+include/eel-1/eel/eel-image.h
+include/eel-1/eel/eel-label-with-background.h
+include/eel-1/eel/eel-label.h
+include/eel-1/eel/eel-labeled-image.h
+include/eel-1/eel/eel-list-column-title.h
+include/eel-1/eel/eel-list.h
+include/eel-1/eel/eel-password-dialog.h
+include/eel-1/eel/eel-preferences-box.h
+include/eel-1/eel/eel-preferences-group.h
+include/eel-1/eel/eel-preferences-item.h
+include/eel-1/eel/eel-preferences-pane.h
+include/eel-1/eel/eel-preferences.h
+include/eel-1/eel/eel-radio-button-group.h
+include/eel-1/eel/eel-region.h
+include/eel-1/eel/eel-scalable-font-private.h
+include/eel-1/eel/eel-scalable-font.h
+include/eel-1/eel/eel-self-checks.h
+include/eel-1/eel/eel-smooth-text-layout-cache.h
+include/eel-1/eel/eel-smooth-text-layout.h
+include/eel-1/eel/eel-smooth-widget.h
+include/eel-1/eel/eel-stock-dialogs.h
+include/eel-1/eel/eel-string-list.h
+include/eel-1/eel/eel-string-picker.h
+include/eel-1/eel/eel-string.h
+include/eel-1/eel/eel-text-caption.h
+include/eel-1/eel/eel-type-builtins.h
+include/eel-1/eel/eel-types.h
+include/eel-1/eel/eel-vfs-extensions.h
+include/eel-1/eel/eel-viewport.h
+include/eel-1/eel/eel-wrap-table.h
+include/eel-1/eel/eel-xml-extensions.h
+include/eel-1/eel/eel.h
 lib/libeel.a
 lib/libeel.so
 lib/libeel.so.0
@@ -109,8 +110,9 @@ share/locale/sv/LC_MESSAGES/eel.mo
 share/locale/ta/LC_MESSAGES/eel.mo
 share/locale/tr/LC_MESSAGES/eel.mo
 share/locale/uk/LC_MESSAGES/eel.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/eel.mo
+share/locale/zh_TW/LC_MESSAGES/eel.mo
 @dirrm share/gnome/eel/fonts/urw
 @dirrm share/gnome/eel/fonts
 @dirrm share/gnome/eel
-@dirrm include/eel
+@dirrm include/eel-1/eel
+@dirrm include/eel-1