5 files changed, 86 insertions, 91 deletions

diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 20a3f9a65579..a4facd7dfcbd 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	libgnomeprintui
-PORTVERSION=	1.116.3
+PORTVERSION=	2.2.1.1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.116
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gnomeprint-2.0:${PORTSDIR}/print/libgnomeprint \
-		gnomecanvas-2.0:${PORTSDIR}/graphics/libgnomecanvas
+LIB_DEPENDS=	gnomeprint-2-2.0:${PORTSDIR}/print/libgnomeprint \
+		gnomecanvas-2.200:${PORTSDIR}/graphics/libgnomecanvas
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -25,7 +25,7 @@ USE_GNOMENG=	yes
 USE_GNOME=	gnomeprefix gnomehack
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 USE_BISON=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/x11-toolkits/libgnomeprintui/distinfo b/x11-toolkits/libgnomeprintui/distinfo
index 9e71a6a29887..03477a7f497c 100644
--- a/x11-toolkits/libgnomeprintui/distinfo
+++ b/x11-toolkits/libgnomeprintui/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomeprintui-1.116.3.tar.bz2) = 4db8d9c405ab9717861463b333c01366
+MD5 (gnome2/libgnomeprintui-2.2.1.1.tar.bz2) = fda6586628c60693295b81cc3576ca23
diff --git a/x11-toolkits/libgnomeprintui/files/patch-configure b/x11-toolkits/libgnomeprintui/files/patch-configure
new file mode 100644
index 000000000000..188be53fea84
--- /dev/null
+++ b/x11-toolkits/libgnomeprintui/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Tue Dec 10 22:29:55 2002
++++ configure	Tue Dec 10 22:30:17 2002
+@@ -8158,6 +8158,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/libgnomeprintui/files/patch-ltmain.sh b/x11-toolkits/libgnomeprintui/files/patch-ltmain.sh
deleted file mode 100644
index 91713d2306f8..000000000000
--- a/x11-toolkits/libgnomeprintui/files/patch-ltmain.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
-+++ ltmain.sh	Sun Feb  3 01:44:17 2002
-@@ -1037,8 +1037,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
- 	;;
- 
-@@ -2412,6 +2420,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
-@@ -4179,10 +4190,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/libgnomeprintui/pkg-plist b/x11-toolkits/libgnomeprintui/pkg-plist
index 07649de3e14a..c89a4928adb1 100644
--- a/x11-toolkits/libgnomeprintui/pkg-plist
+++ b/x11-toolkits/libgnomeprintui/pkg-plist
@@ -1,40 +1,70 @@
-include/libgnomeprintui-2.0/libgnomeprintui/gnome-font-dialog.h
-include/libgnomeprintui-2.0/libgnomeprintui/gnome-print-copies.h
-include/libgnomeprintui-2.0/libgnomeprintui/gnome-print-dialog.h
-include/libgnomeprintui-2.0/libgnomeprintui/gnome-print-master-preview.h
-include/libgnomeprintui-2.0/libgnomeprintui/gnome-print-paper-selector.h
-include/libgnomeprintui-2.0/libgnomeprintui/gnome-print-preview.h
-include/libgnomeprintui-2.0/libgnomeprintui/gnome-printer-dialog.h
-lib/libgnomeprintui-2.a
-lib/libgnomeprintui-2.so
-lib/libgnomeprintui-2.so.0
-libdata/pkgconfig/libgnomeprintui-2.0.pc
-share/locale/am/LC_MESSAGES/libgnomeprintui.mo
-share/locale/az/LC_MESSAGES/libgnomeprintui.mo
-share/locale/be/LC_MESSAGES/libgnomeprintui.mo
-share/locale/bg/LC_MESSAGES/libgnomeprintui.mo
-share/locale/ca/LC_MESSAGES/libgnomeprintui.mo
-share/locale/cs/LC_MESSAGES/libgnomeprintui.mo
-share/locale/da/LC_MESSAGES/libgnomeprintui.mo
-share/locale/de/LC_MESSAGES/libgnomeprintui.mo
-share/locale/el/LC_MESSAGES/libgnomeprintui.mo
-share/locale/es/LC_MESSAGES/libgnomeprintui.mo
-share/locale/et/LC_MESSAGES/libgnomeprintui.mo
-share/locale/eu/LC_MESSAGES/libgnomeprintui.mo
-share/locale/hi/LC_MESSAGES/libgnomeprintui.mo
-share/locale/ko/LC_MESSAGES/libgnomeprintui.mo
-share/locale/lv/LC_MESSAGES/libgnomeprintui.mo
-share/locale/ms/LC_MESSAGES/libgnomeprintui.mo
-share/locale/pl/LC_MESSAGES/libgnomeprintui.mo
-share/locale/pt/LC_MESSAGES/libgnomeprintui.mo
-share/locale/ro/LC_MESSAGES/libgnomeprintui.mo
-share/locale/ru/LC_MESSAGES/libgnomeprintui.mo
-share/locale/sl/LC_MESSAGES/libgnomeprintui.mo
-share/locale/sv/LC_MESSAGES/libgnomeprintui.mo
-share/locale/ta/LC_MESSAGES/libgnomeprintui.mo
-share/locale/vi/LC_MESSAGES/libgnomeprintui.mo
-share/locale/wa/LC_MESSAGES/libgnomeprintui.mo
-share/locale/zh_CN/LC_MESSAGES/libgnomeprintui.mo
-share/locale/zh_TW/LC_MESSAGES/libgnomeprintui.mo
-@dirrm include/libgnomeprintui-2.0/libgnomeprintui
-@dirrm include/libgnomeprintui-2.0
+include/libgnomeprintui-2.2/libgnomeprintui/gnome-font-dialog.h
+include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-dialog.h
+include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-job-preview.h
+include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-paper-selector.h
+include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-preview.h
+include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-unit-selector.h
+lib/libgnomeprintui-2-2.a
+lib/libgnomeprintui-2-2.so
+lib/libgnomeprintui-2-2.so.0
+libdata/pkgconfig/libgnomeprintui-2.2.pc
+share/doc/libgnomeprintui/c7.html
+share/doc/libgnomeprintui/index.html
+share/doc/libgnomeprintui/index.sgml
+share/doc/libgnomeprintui/libgnomeprintui-gnome-font-dialog.html
+share/doc/libgnomeprintui/libgnomeprintui-gnome-print-copies.html
+share/doc/libgnomeprintui/libgnomeprintui-gnome-print-dialog.html
+share/doc/libgnomeprintui/libgnomeprintui-gnome-print-job-preview.html
+share/doc/libgnomeprintui/libgnomeprintui-gnome-print-paper-selector.html
+share/doc/libgnomeprintui/libgnomeprintui-gnome-print-preview.html
+share/doc/libgnomeprintui/libgnomeprintui-gnome-printer-selector.html
+share/doc/libgnomeprintui/libgnomeprintui.html
+share/locale/am/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/ar/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/az/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/be/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/bg/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/ca/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/cs/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/da/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/de/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/el/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/es/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/et/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/eu/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/fi/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/fr/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/ga/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/gl/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/he/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/hi/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/hr/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/hu/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/it/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/ja/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/ko/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/lt/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/lv/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/mn/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/ms/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/nl/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/nn/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/no/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/pl/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/pt/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/pt_BR/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/ro/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/ru/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/sk/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/sl/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/sv/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/ta/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/tr/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/uk/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/vi/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/wa/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/zh_CN/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/zh_TW/LC_MESSAGES/libgnomeprintui-2.2.mo
+@dirrm share/doc/libgnomeprintui
+@dirrm include/libgnomeprintui-2.2/libgnomeprintui
+@dirrm include/libgnomeprintui-2.2