4 files changed, 32 insertions, 36 deletions

diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 13da9d1d6e25..03fbac0c70f7 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libgnomeprint
-PORTVERSION=	1.111.0
+PORTVERSION=	1.112.0
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -23,8 +23,8 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--localstatedir=/usr/X11R6/share/gnome2 \
-		--datadir=/usr/X11R6/share/gnome2
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
+		--datadir=${PREFIX}/share/gnome
 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 a6ab368b13bd..ec4c39111f96 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomeprint-1.111.0.tar.bz2) = 054583de93ba9713d8cc247f56e5268c
+MD5 (gnome2/libgnomeprint-1.112.0.tar.bz2) = 5e47284677d4ef0696c1132d494fd675
diff --git a/print/libgnomeprint/files/patch-configure b/print/libgnomeprint/files/patch-configure
index 0302dcdc83fd..92732781f26e 100644
--- a/print/libgnomeprint/files/patch-configure
+++ b/print/libgnomeprint/files/patch-configure
@@ -1,16 +1,11 @@
-
-$FreeBSD$
-
---- configure	2002/03/19 16:34:21	1.1
-+++ configure	2002/03/19 16:35:22
-@@ -9926,8 +9926,8 @@
+--- configure.orig	Thu Apr  4 14:55:34 2002
++++ configure	Thu Apr  4 14:55:48 2002
+@@ -7180,7 +7180,7 @@
    INSTALL_FONTS_TRUE='#'
    INSTALL_FONTS_FALSE=
  fi
 -FONTMAPDIR_STATIC=$datadir/gnome/libgnomeprint-2.0/fonts
--FONTMAPDIR_DYNAMIC=$sysconfdir/gnome/libgnomeprint-2.0/fonts
 +FONTMAPDIR_STATIC=$datadir/libgnomeprint-2.0/fonts
-+FONTMAPDIR_DYNAMIC=$sysconfdir/gnome2/libgnomeprint-2.0/fonts
+ FONTMAPDIR_DYNAMIC=$sysconfdir/gnome/libgnomeprint-2.0/fonts
+ 
  
- LIBGNOMEPRINT_CFLAGS="$FREETYPE_CFLAGS $CFLAGS $GLIB_CFLAGS $LIBART_CFLAGS $PANGO_CFLAGS $LIBXML_CFLAGS $LIBBONOBO_CFLAGS"
- LIBGNOMEPRINT_LIBS="$GLIB_LIBS $LIBART_LIBS $PANGO_LIBS $LIBXML_LIBS $FREETYPE_LIBS $LIBBONOBO_LIBS"
diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist
index b8c33fb2da43..036d639935ca 100644
--- a/print/libgnomeprint/pkg-plist
+++ b/print/libgnomeprint/pkg-plist
@@ -1,4 +1,5 @@
 bin/libgnomeprint-2.0-font-install
+etc/gnome/libgnomeprint-2.0/fonts/gnome-print.fontmap
 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
@@ -23,21 +24,21 @@ lib/libgnomeprint-2.a
 lib/libgnomeprint-2.so
 lib/libgnomeprint-2.so.0
 libdata/pkgconfig/libgnomeprint-2.0.pc
-share/gnome2/fonts/README.installer
-share/gnome2/gnome-print-2.0/media/media.xml
-share/gnome2/gnome-print-2.0/models/GNOME-GENERIC-PS.model
-share/gnome2/gnome-print-2.0/models/HP-LASERJET-4ML.model
-share/gnome2/gnome-print-2.0/models/STYLUS-COLOR-740.model
-share/gnome2/gnome-print-2.0/printers/GENERIC.printer
-share/gnome2/gnome-print-2.0/vendors/EPSON.vendor
-share/gnome2/gnome-print-2.0/vendors/GNOME.vendor
-share/gnome2/gnome-print-2.0/vendors/HP.vendor
-share/gnome2/libgnomeprint-2.0/fonts/adobe-urw.font
-share/gnome2/libgnomeprint-2.0/fonts/defaults.fontmap
-share/gnome2/libgnomeprint-2.0/fonts/gnome-print.fontmap
+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
+share/gnome/gnome-print-2.0/models/HP-LASERJET-4ML.model
+share/gnome/gnome-print-2.0/models/STYLUS-COLOR-740.model
+share/gnome/gnome-print-2.0/printers/GENERIC.printer
+share/gnome/gnome-print-2.0/vendors/EPSON.vendor
+share/gnome/gnome-print-2.0/vendors/GNOME.vendor
+share/gnome/gnome-print-2.0/vendors/HP.vendor
+share/gnome/libgnomeprint-2.0/fonts/adobe-urw.font
+share/gnome/libgnomeprint-2.0/fonts/defaults.fontmap
 share/locale/az/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/ca/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/es/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/et/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/hu/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/ms/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/nl/LC_MESSAGES/libgnomeprint-2.0.mo
@@ -47,6 +48,7 @@ share/locale/pl/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/pt/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/ru/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/sk/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/sl/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/sv/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/ta/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/tr/LC_MESSAGES/libgnomeprint-2.0.mo
@@ -54,15 +56,14 @@ share/locale/uk/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/wa/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.0.mo
-@dirrm share/gnome2/libgnomeprint-2.0/fonts
-@dirrm share/gnome2/libgnomeprint-2.0
-@dirrm share/gnome2/gnome-print-2.0/vendors
-@dirrm share/gnome2/gnome-print-2.0/printers
-@dirrm share/gnome2/gnome-print-2.0/models
-@dirrm share/gnome2/gnome-print-2.0/media
-@dirrm share/gnome2/gnome-print-2.0
-@dirrm share/gnome2/fonts
-@dirrm share/gnome2
+@dirrm share/gnome/libgnomeprint-2.0/fonts
+@dirrm share/gnome/libgnomeprint-2.0
+@dirrm share/gnome/gnome-print-2.0/vendors
+@dirrm share/gnome/gnome-print-2.0/printers
+@dirrm share/gnome/gnome-print-2.0/models
+@dirrm share/gnome/gnome-print-2.0/media
+@dirrm share/gnome/gnome-print-2.0
+@dirrm share/gnome/fonts
 @dirrm lib/gnome-print-2.0/transports
 @dirrm lib/gnome-print-2.0/drivers
 @dirrm lib/gnome-print-2.0