7 files changed, 32 insertions, 30 deletions

diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index f8cb51cd89aa..e214b6558af9 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	libgnomeprint
-PORTVERSION=	2.4.2
-PORTREVISION=	1
+PORTVERSION=	2.6.0
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.4
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -20,7 +19,8 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier libbonobo libartlgpl2 gtk20
+USE_GNOME=	gnomeprefix intlhack gnomehack gnomehier libbonobo libartlgpl2 \
+		gtk20 lthack
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index a5e9875af9c2..bd04e8a8d382 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgnomeprint-2.4.2.tar.bz2) = d58534de6c0c6c953b42d82eec0ebfe8
-SIZE (gnome2/libgnomeprint-2.4.2.tar.bz2) = 639654
+MD5 (gnome2/libgnomeprint-2.6.0.tar.bz2) = f2010f398d12e9c589a8a7d05ef37d39
+SIZE (gnome2/libgnomeprint-2.6.0.tar.bz2) = 685974
diff --git a/print/libgnomeprint/files/patch-configure b/print/libgnomeprint/files/patch-configure
deleted file mode 100644
index 1aa2a531a053..000000000000
--- a/print/libgnomeprint/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Tue Mar 11 18:33:02 2003
-+++ configure	Wed Mar 12 00:58:23 2003
-@@ -8580,6 +8580,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/libgnomeprint/files/patch-libgnomeprint::gnome-meta.c b/print/libgnomeprint/files/patch-libgnomeprint::gnome-meta.c
new file mode 100644
index 000000000000..5526dceaa446
--- /dev/null
+++ b/print/libgnomeprint/files/patch-libgnomeprint::gnome-meta.c
@@ -0,0 +1,10 @@
+--- libgnomeprint/gnome-print-meta.c.orig	Wed Oct 29 00:53:15 2003
++++ libgnomeprint/gnome-print-meta.c	Wed Oct 29 01:06:23 2003
+@@ -312,6 +312,7 @@
+ 	gpm_encode_int (pc, w);
+ 	gpm_encode_int (pc, ch);
+ 
++	gpm_ensure_space(pc, w * ch * h);
+ 	for (y = 0; y < h; y++){
+ 		gpm_encode_block (pc, px, w * ch);
+ 		px += rowstride;
diff --git a/print/libgnomeprint/files/patch-libgnomeprint_gnome-print.c b/print/libgnomeprint/files/patch-libgnomeprint_gnome-print.c
deleted file mode 100644
index 6aa2b9a4fd79..000000000000
--- a/print/libgnomeprint/files/patch-libgnomeprint_gnome-print.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- libgnomeprint/gnome-print.c.orig	Tue Jan  7 14:39:24 2003
-+++ libgnomeprint/gnome-print.c	Tue Jan  7 14:39:35 2003
-@@ -38,8 +38,8 @@
- #include <libgnomeprint/gnome-print-frgba.h>
- 
- /* For the buffer stuff, remove when the buffer stuff is moved out here */
--#include <sys/mman.h>
- #include <sys/types.h>
-+#include <sys/mman.h>
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <unistd.h>
diff --git a/print/libgnomeprint/pkg-descr b/print/libgnomeprint/pkg-descr
index f7ae47f42231..ad9ac2ec1f10 100644
--- a/print/libgnomeprint/pkg-descr
+++ b/print/libgnomeprint/pkg-descr
@@ -1,4 +1,3 @@
-This is a prototype implementation of the Gnome Printing Architecture,
-as described in:
+The basis for the Gnome Printing Architecture as described in:
 
 WWW: http://www.gnome.org/projects/gnome-print/
diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist
index 23e1585f32e1..bc6bb735e7ef 100644
--- a/print/libgnomeprint/pkg-plist
+++ b/print/libgnomeprint/pkg-plist
@@ -15,6 +15,7 @@ include/libgnomeprint-2.2/libgnomeprint/private/gnome-font-private.h
 include/libgnomeprint-2.2/libgnomeprint/private/gnome-fontmap.h
 include/libgnomeprint-2.2/libgnomeprint/private/gnome-glyphlist-private.h
 include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-config-private.h
+include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-pango.h
 include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-private.h
 include/libgnomeprint-2.2/libgnomeprint/private/gp-gc-private.h
 include/libgnomeprint-2.2/libgnomeprint/private/gpa-config.h
@@ -43,6 +44,16 @@ share/doc/libgnomeprint/index.sgml
 share/doc/libgnomeprint/left.png
 share/doc/libgnomeprint/libgnomeprint-building.html
 share/doc/libgnomeprint/libgnomeprint-compiling.html
+share/doc/libgnomeprint/libgnomeprint-gnome-font-face.html
+share/doc/libgnomeprint/libgnomeprint-gnome-font.html
+share/doc/libgnomeprint/libgnomeprint-gnome-glyphlist.html
+share/doc/libgnomeprint/libgnomeprint-gnome-pgl.html
+share/doc/libgnomeprint/libgnomeprint-gnome-print-config.html
+share/doc/libgnomeprint/libgnomeprint-gnome-print-job.html
+share/doc/libgnomeprint/libgnomeprint-gnome-print-paper.html
+share/doc/libgnomeprint/libgnomeprint-gnome-print-unit.html
+share/doc/libgnomeprint/libgnomeprint-gnome-print.html
+share/doc/libgnomeprint/libgnomeprint-gnome-rfont.html
 share/doc/libgnomeprint/libgnomeprint-resources.html
 share/doc/libgnomeprint/libgnomeprint.html
 share/doc/libgnomeprint/libgnomeprintunsorted.html
@@ -67,6 +78,8 @@ share/locale/cy/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/da/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/de/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/el/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/en_CA/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/en_GB/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/es/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/et/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/fa/LC_MESSAGES/libgnomeprint-2.2.mo
@@ -74,6 +87,7 @@ share/locale/fi/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/fr/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/ga/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/he/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/hr/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/hu/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/hi/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/id/LC_MESSAGES/libgnomeprint-2.2.mo
@@ -91,6 +105,7 @@ share/locale/ms/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/nl/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/nn/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/no/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/pa/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/pl/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/pt/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/pt_BR/LC_MESSAGES/libgnomeprint-2.2.mo