6 files changed, 50 insertions, 37 deletions

diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 45f5e9065058..e177b972b8a8 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libgnomeprint
-PORTVERSION=	1.113.0
+PORTVERSION=	1.115.0
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020607
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -24,7 +24,9 @@ USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
+		--datadir=${PREFIX}/share/gnome \
+		--with-html-dir=${PREFIX}/share/doc \
+		--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index e35ad5e2380e..b4055f4259ee 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomeprint-1.113.0.tar.bz2) = fc99e013dd40450c8ff93ed2cb58f908
+MD5 (gnome2/libgnomeprint-1.115.0.tar.bz2) = e44cf8558c5d82a49c495a894f48539a
diff --git a/print/libgnomeprint/files/patch-ab b/print/libgnomeprint/files/patch-ab
index c20623cb30c4..0abd2128a5d0 100644
--- a/print/libgnomeprint/files/patch-ab
+++ b/print/libgnomeprint/files/patch-ab
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Mon Feb 11 12:42:17 2002
-+++ Makefile.in	Tue Mar 19 18:17:21 2002
-@@ -116,7 +116,7 @@
+--- Makefile.in.orig	Mon Jun 10 22:13:33 2002
++++ Makefile.in	Mon Jun 10 22:14:58 2002
+@@ -105,7 +105,7 @@
  WARN_CFLAGS = @WARN_CFLAGS@
  cxxflags_set = @cxxflags_set@
  
--SUBDIRS = libgnomeprint fonts installer tests data po
-+SUBDIRS = libgnomeprint fonts installer data po
+-SUBDIRS = libgnomeprint fonts installer tests data po doc
++SUBDIRS = libgnomeprint fonts installer data po doc
  
  EXTRA_DIST = message-of-doom ChangeLog ChangeLog.old ChangeLog.old.2
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/print/libgnomeprint/files/patch-libgnomeprint::gnome-print-meta.c b/print/libgnomeprint/files/patch-libgnomeprint::gnome-print-meta.c
deleted file mode 100644
index fc5f161554aa..000000000000
--- a/print/libgnomeprint/files/patch-libgnomeprint::gnome-print-meta.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- libgnomeprint/gnome-print-meta.c	2002/03/19 16:19:47	1.1
-+++ libgnomeprint/gnome-print-meta.c	2002/03/19 16:20:00
-@@ -28,8 +28,8 @@
- 
- #include <math.h>
- #include <string.h>
--#include <sys/mman.h>
- #include <sys/types.h>
-+#include <sys/mman.h>
- #include <sys/stat.h>
- #include <unistd.h>
- #include <fcntl.h>
diff --git a/print/libgnomeprint/files/patch-libgnomeprint::transports::Makefile.in b/print/libgnomeprint/files/patch-libgnomeprint::transports::Makefile.in
index 9ced5d89bd2a..fd2c0da7ea23 100644
--- a/print/libgnomeprint/files/patch-libgnomeprint::transports::Makefile.in
+++ b/print/libgnomeprint/files/patch-libgnomeprint::transports::Makefile.in
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- libgnomeprint/transports/Makefile.in	2002/03/19 16:46:00	1.1
-+++ libgnomeprint/transports/Makefile.in	2002/03/19 16:48:02
-@@ -131,7 +131,7 @@
+--- libgnomeprint/transports/Makefile.in.orig	Mon Jun 10 22:16:36 2002
++++ libgnomeprint/transports/Makefile.in	Mon Jun 10 22:22:35 2002
+@@ -121,7 +121,7 @@
  
  libgnomeprint_file_la_SOURCES = $(FILE_SRC)
  
@@ -12,7 +9,7 @@ $FreeBSD$
  
  libgnomeprint_file_la_LIBADD = 
  
-@@ -142,7 +142,7 @@
+@@ -132,7 +132,7 @@
  
  libgnomeprint_lpr_la_SOURCES = $(LPR_SRC)
  
@@ -20,4 +17,13 @@ $FreeBSD$
 +libgnomeprint_lpr_la_LDFLAGS = -avoid-version -module
  
  libgnomeprint_lpr_la_LIBADD = 
+ 
+@@ -143,7 +143,7 @@
+ 
+ libgnomeprint_custom_la_SOURCES = $(CUSTOM_SRC)
+ 
+-libgnomeprint_custom_la_LDFLAGS = -version-info 0:0:0 -module
++libgnomeprint_custom_la_LDFLAGS = -avoid-version -module
+ 
+ libgnomeprint_custom_la_LIBADD = 
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist
index 876f27c60a1a..6455b5accdb1 100644
--- a/print/libgnomeprint/pkg-plist
+++ b/print/libgnomeprint/pkg-plist
@@ -4,26 +4,43 @@ include/libgnomeprint-2.0/libgnomeprint/gnome-font-face.h
 include/libgnomeprint-2.0/libgnomeprint/gnome-font.h
 include/libgnomeprint-2.0/libgnomeprint/gnome-glyphlist.h
 include/libgnomeprint-2.0/libgnomeprint/gnome-pgl.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-print-bonobo-client.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-print-bonobo.h
 include/libgnomeprint-2.0/libgnomeprint/gnome-print-config.h
 include/libgnomeprint-2.0/libgnomeprint/gnome-print-master.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-print-meta.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-print-multipage.h
 include/libgnomeprint-2.0/libgnomeprint/gnome-print-paper.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-print-private.h
 include/libgnomeprint-2.0/libgnomeprint/gnome-print-unit.h
 include/libgnomeprint-2.0/libgnomeprint/gnome-print.h
 include/libgnomeprint-2.0/libgnomeprint/gnome-rfont.h
 include/libgnomeprint-2.0/libgnomeprint/gp-gc.h
-include/libgnomeprint-2.0/libgnomeprint/gpa-private.h
+include/libgnomeprint-2.0/libgnomeprint/private/gnome-font-private.h
+include/libgnomeprint-2.0/libgnomeprint/private/gnome-print-private.h
+include/libgnomeprint-2.0/libgnomeprint/private/gp-gc-private.h
+include/libgnomeprint-2.0/libgnomeprint/private/gpa-private.h
 lib/gnome-print-2.0/drivers/libgnomeprint-fax.so
+lib/gnome-print-2.0/transports/libgnomeprint-custom.so
 lib/gnome-print-2.0/transports/libgnomeprint-file.so
 lib/gnome-print-2.0/transports/libgnomeprint-lpr.so
 lib/libgnomeprint-2.a
 lib/libgnomeprint-2.so
 lib/libgnomeprint-2.so.0
 libdata/pkgconfig/libgnomeprint-2.0.pc
+share/doc/libgnomeprint/index.html
+share/doc/libgnomeprint/index.sgml
+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-master.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-question-index.html
+share/doc/libgnomeprint/libgnomeprint-resources.html
+share/doc/libgnomeprint/libgnomeprint.html
+share/doc/libgnomeprint/libgnomeprintunsorted.html
 share/gnome/fonts/README.installer
 share/gnome/gnome-print-2.0/media/media.xml
 share/gnome/gnome-print-2.0/models/GNOME-GENERIC-PS.model
@@ -42,6 +59,7 @@ share/locale/et/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/fr/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/hu/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/hi/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/it/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/ko/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/ms/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/nl/LC_MESSAGES/libgnomeprint-2.0.mo
@@ -68,8 +86,10 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.0.mo
 @dirrm share/gnome/gnome-print-2.0/media
 @dirrm share/gnome/gnome-print-2.0
 @dirrm share/gnome/fonts
+@dirrm share/doc/libgnomeprint
 @dirrm lib/gnome-print-2.0/transports
 @dirrm lib/gnome-print-2.0/drivers
 @dirrm lib/gnome-print-2.0
+@dirrm include/libgnomeprint-2.0/libgnomeprint/private
 @dirrm include/libgnomeprint-2.0/libgnomeprint
 @dirrm include/libgnomeprint-2.0