Revert the previous updates since they require APIs present in libgnomeui-2.7.

While I'm here, use the new libtool scheme.

Reported by:	Franz Klammer <klammer@webonaut.com>

8 files changed, 11 insertions, 95 deletions

diff --git a/print/gnome-cups-manager/Makefile b/print/gnome-cups-manager/Makefile
index 9b493c4838b3..a0cd43a29b64 100644
--- a/print/gnome-cups-manager/Makefile
+++ b/print/gnome-cups-manager/Makefile
@@ -5,10 +5,11 @@
 # $FreeBSD$
 
 PORTNAME=	gnome-cups-manager
-PORTVERSION=	0.19
+PORTVERSION=	0.18
+PORTEPOCH=	1
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.19
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.18
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -21,7 +22,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeprintui libgnomeui
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
 CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/print/gnome-cups-manager/distinfo b/print/gnome-cups-manager/distinfo
index ffc6cb3ad8b7..6bb50b3f22b4 100644
--- a/print/gnome-cups-manager/distinfo
+++ b/print/gnome-cups-manager/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-cups-manager-0.19.tar.bz2) = f497e46628a69c30dd815b6e8fa55968
-SIZE (gnome2/gnome-cups-manager-0.19.tar.bz2) = 490861
+MD5 (gnome2/gnome-cups-manager-0.18.tar.bz2) = d8508654ed956de73fa62a72b4358a1a
+SIZE (gnome2/gnome-cups-manager-0.18.tar.bz2) = 472324
diff --git a/print/gnome-cups-manager/files/patch-ltmain.sh b/print/gnome-cups-manager/files/patch-ltmain.sh
deleted file mode 100644
index 8be265f01f40..000000000000
--- a/print/gnome-cups-manager/files/patch-ltmain.sh
+++ /dev/null
@@ -1,51 +0,0 @@
---- ltmain.sh.old	Tue Jun  8 19:21:45 2004
-+++ ltmain.sh	Tue Jun  8 19:40:03 2004
-@@ -1356,7 +1356,7 @@
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -1371,8 +1371,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+        compile_command="$compile_command -pthread"
-+        finalize_command="$finalize_command -pthread"
-+        compiler_flags="$compiler_flags -pthread"
-+        continue
-+        ;;
-+
-       -module)
- 	module=yes
-+        build_old_libs=no
- 	continue
- 	;;
- 
-@@ -3200,6 +3208,9 @@
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
-+          *-*-freebsd*)
-+            # FreeBSD doesn't need this . . .
-+            ;;
-  	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -5550,10 +5561,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/print/gnome-cups-manager/pkg-plist b/print/gnome-cups-manager/pkg-plist
index aa515b5e73cd..7b19f15cd34e 100644
--- a/print/gnome-cups-manager/pkg-plist
+++ b/print/gnome-cups-manager/pkg-plist
@@ -1,10 +1,8 @@
 bin/gnome-cups-add
 bin/gnome-cups-icon
 bin/gnome-cups-manager
-include/libgnomecups-1/libgnomecups/gnome-cups-ui-driver.h
 include/libgnomecups-1/libgnomecups/gnome-cups-ui-init.h
 include/libgnomecups-1/libgnomecups/gnome-cups-ui-print.h
-include/libgnomecups-1/libgnomecups/gnome-cups-ui-util.h
 lib/libgnomecupsui-1.0.a
 lib/libgnomecupsui-1.0.so
 lib/libgnomecupsui-1.0.so.1
@@ -13,9 +11,7 @@ libdata/pkgconfig/libgnomecupsui-1.0.pc
 sbin/gnome-cups-switch
 share/gnome/applications/gnome-cups-manager.desktop
 share/gnome/gnome-cups-manager/gnome-cups-add.glade
-share/gnome/gnome-cups-manager/gnome-cups-add-druid.png
 share/gnome/gnome-cups-manager/gnome-cups-manager.glade
-share/gnome/gnome-cups-manager/gnome-cups-ui-driver.glade
 share/gnome/gnome-cups-manager/xd2-testpage-a4.eps
 share/gnome/gnome-cups-manager/xd2-testpage-letter.eps
 share/gnome/pixmaps/gnome-cups-manager/printer-tray-normal.png
@@ -34,7 +30,6 @@ share/locale/fi/LC_MESSAGES/gnome-cups-manager.mo
 share/locale/fr/LC_MESSAGES/gnome-cups-manager.mo
 share/locale/he/LC_MESSAGES/gnome-cups-manager.mo
 share/locale/hr/LC_MESSAGES/gnome-cups-manager.mo
-share/locale/hu/LC_MESSAGES/gnome-cups-manager.mo
 share/locale/it/LC_MESSAGES/gnome-cups-manager.mo
 share/locale/ja/LC_MESSAGES/gnome-cups-manager.mo
 share/locale/ko/LC_MESSAGES/gnome-cups-manager.mo
diff --git a/print/libgnomecups/Makefile b/print/libgnomecups/Makefile
index 871fac90c142..c21d72a923ac 100644
--- a/print/libgnomecups/Makefile
+++ b/print/libgnomecups/Makefile
@@ -5,7 +5,8 @@
 # $FreeBSD$
 
 PORTNAME=	libgnomecups
-PORTVERSION=	0.1.9
+PORTVERSION=	0.1.8
+PORTEPOCH=	1
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.1
@@ -21,7 +22,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack glib20
 INSTALLS_SHLIB=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/print/libgnomecups/distinfo b/print/libgnomecups/distinfo
index 491a96469693..1c85e11b117c 100644
--- a/print/libgnomecups/distinfo
+++ b/print/libgnomecups/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgnomecups-0.1.9.tar.bz2) = b846a90ba66242565174ca0e317a0f17
-SIZE (gnome2/libgnomecups-0.1.9.tar.bz2) = 299258
+MD5 (gnome2/libgnomecups-0.1.8.tar.bz2) = 6e05022bfe400d3730515b848e663bdc
+SIZE (gnome2/libgnomecups-0.1.8.tar.bz2) = 289254
diff --git a/print/libgnomecups/files/patch-configure b/print/libgnomecups/files/patch-configure
deleted file mode 100644
index 257f45996729..000000000000
--- a/print/libgnomecups/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Tue Jul 15 11:59:06 2003
-+++ configure	Tue Jul 15 11:59:32 2003
-@@ -7558,6 +7558,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/print/libgnomecups/pkg-plist b/print/libgnomecups/pkg-plist
index c7062e4e97da..ceb6309a2ae1 100644
--- a/print/libgnomecups/pkg-plist
+++ b/print/libgnomecups/pkg-plist
@@ -7,26 +7,6 @@ lib/libgnomecups-1.0.a
 lib/libgnomecups-1.0.so
 lib/libgnomecups-1.0.so.1
 libdata/pkgconfig/libgnomecups-1.0.pc
-share/locale/ca/LC_MESSAGES/libgnomecups.mo
-share/locale/cs/LC_MESSAGES/libgnomecups.mo
-share/locale/de/LC_MESSAGES/libgnomecups.mo
-share/locale/en_CA/LC_MESSAGES/libgnomecups.mo
-share/locale/en_GB/LC_MESSAGES/libgnomecups.mo
-share/locale/es/LC_MESSAGES/libgnomecups.mo
-share/locale/eu/LC_MESSAGES/libgnomecups.mo
-share/locale/fr/LC_MESSAGES/libgnomecups.mo
-share/locale/hr/LC_MESSAGES/libgnomecups.mo
-share/locale/hu/LC_MESSAGES/libgnomecups.mo
-share/locale/is/LC_MESSAGES/libgnomecups.mo
-share/locale/it/LC_MESSAGES/libgnomecups.mo
 share/locale/ja/LC_MESSAGES/libgnomecups.mo
-share/locale/nl/LC_MESSAGES/libgnomecups.mo
-share/locale/no/LC_MESSAGES/libgnomecups.mo
-share/locale/pt/LC_MESSAGES/libgnomecups.mo
-share/locale/pt_BR/LC_MESSAGES/libgnomecups.mo
-share/locale/sr/LC_MESSAGES/libgnomecups.mo
-share/locale/sr@Latn/LC_MESSAGES/libgnomecups.mo
-share/locale/sv/LC_MESSAGES/libgnomecups.mo
-share/locale/uk/LC_MESSAGES/libgnomecups.mo
 @dirrm include/libgnomecups-1/libgnomecups
 @dirrm include/libgnomecups-1