Update to 2.1.3.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@254 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 56 insertions, 33 deletions

diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index a134dc8ea..17a6d1ce1 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libgnomeprint
-PORTVERSION=	2.1.2
+PORTVERSION=	2.1.3
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.1
@@ -30,6 +30,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
+PLIST_SUB=	VERSION=${PORTVERSION}
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index 58b5a4adc..671568356 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomeprint-2.1.2.tar.bz2) = dd3d7751fb5740fc2298732a0cfd98c6
+MD5 (gnome2/libgnomeprint-2.1.3.tar.bz2) = cdce4de5ae255c2812a030cc78efa49b
diff --git a/print/libgnomeprint/files/patch-configure b/print/libgnomeprint/files/patch-configure
index 0afc4f975..4ad2466b1 100644
--- a/print/libgnomeprint/files/patch-configure
+++ b/print/libgnomeprint/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Wed Dec  4 13:33:02 2002
-+++ configure	Wed Dec  4 23:10:38 2002
+--- configure.orig	Mon Dec  9 21:18:12 2002
++++ configure	Tue Dec 10 14:56:42 2002
 @@ -8160,6 +8160,7 @@
  
  # This can be used to rebuild libtool when needed
@@ -8,12 +8,15 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -10890,7 +10891,7 @@
+@@ -10932,9 +10933,9 @@
+ 
+ 
  if test "x${prefix}" = "xNONE"; then
-   GNOME_PRINT_DATA_DIR=${ac_default_prefix}/share/${gnome_print_datadir}
+-	GNOME_PRINT_DATA_DIR='${ac_default_prefix}/share/libgnomeprint/${VERSION}'
++	GNOME_PRINT_DATA_DIR='${ac_default_prefix}/share/gnome/libgnomeprint/${VERSION}'
  else
--  GNOME_PRINT_DATA_DIR="${prefix}/share/${gnome_print_datadir}"
-+  GNOME_PRINT_DATA_DIR="${prefix}/share/gnome/${gnome_print_datadir}"
+-	GNOME_PRINT_DATA_DIR='${prefix}/share/libgnomeprint/${VERSION}'
++	GNOME_PRINT_DATA_DIR='${prefix}/share/gnome/libgnomeprint/${VERSION}'
  fi
- GNOME_PRINT_DATA_DIR=`eval echo "$GNOME_PRINT_DATA_DIR"`
- cat >>confdefs.h <<_ACEOF
+ GNOME_PRINT_DATA_DIR=$GNOME_PRINT_DATA_DIR
+ 
diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist
index 82862145f..d9cfa83a0 100644
--- a/print/libgnomeprint/pkg-plist
+++ b/print/libgnomeprint/pkg-plist
@@ -19,21 +19,38 @@ include/libgnomeprint-2.2/libgnomeprint/private/gpa-utils.h
 lib/libgnomeprint-2-2.a
 lib/libgnomeprint-2-2.so
 lib/libgnomeprint-2-2.so.0
-lib/libgnomeprint/2.1.2/modules/drivers/libgnomeprint-fax.so
-lib/libgnomeprint/2.1.2/modules/transports/libgnomeprint-custom.so
-lib/libgnomeprint/2.1.2/modules/transports/libgnomeprint-file.so
-lib/libgnomeprint/2.1.2/modules/transports/libgnomeprint-lpr.so
+lib/libgnomeprint/%%VERSION%%/modules/drivers/libgnomeprint-fax.so
+lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-custom.so
+lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-file.so
+lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-lpr.so
 libdata/pkgconfig/libgnomeprint-2.2.pc
-share/gnome/gnome-print-2.2/models/GNOME-GENERIC-PS.model
-share/gnome/gnome-print-2.2/models/GNOME-PDF-WRITER.model
-share/gnome/gnome-print-2.2/models/HP-LASERJET-4ML.model
-share/gnome/gnome-print-2.2/models/STYLUS-COLOR-740.model
-share/gnome/gnome-print-2.2/printers/GENERIC.printer
-share/gnome/gnome-print-2.2/printers/PDF-WRITER.printer
-share/gnome/gnome-print-2.2/media/media.xml
-share/gnome/gnome-print-2.2/vendors/EPSON.vendor
-share/gnome/gnome-print-2.2/vendors/GNOME.vendor
-share/gnome/gnome-print-2.2/vendors/HP.vendor
+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-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
+share/gnome/libgnomeprint/%%VERSION%%/media/media.xml
+share/gnome/libgnomeprint/%%VERSION%%/models/GNOME-GENERIC-PS.model
+share/gnome/libgnomeprint/%%VERSION%%/models/GNOME-PDF-WRITER.model
+share/gnome/libgnomeprint/%%VERSION%%/models/HP-LASERJET-4ML.model
+share/gnome/libgnomeprint/%%VERSION%%/models/STYLUS-COLOR-740.model
+share/gnome/libgnomeprint/%%VERSION%%/printers/GENERIC.printer
+share/gnome/libgnomeprint/%%VERSION%%/printers/PDF-WRITER.printer
+share/gnome/libgnomeprint/%%VERSION%%/vendors/EPSON.vendor
+share/gnome/libgnomeprint/%%VERSION%%/vendors/GNOME.vendor
+share/gnome/libgnomeprint/%%VERSION%%/vendors/HP.vendor
 share/locale/az/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/be/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/bg/LC_MESSAGES/libgnomeprint-2.2.mo
@@ -68,16 +85,17 @@ share/locale/vi/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/wa/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/zh_CN/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.2.mo
-@dirrm share/gnome/gnome-print-2.2/vendors
-@dirrm share/gnome/gnome-print-2.2/media
-@dirrm share/gnome/gnome-print-2.2/printers
-@dirrm share/gnome/gnome-print-2.2/models
-@dirrm share/gnome/gnome-print-2.2
+@dirrm share/gnome/libgnomeprint/%%VERSION%%/vendors
+@dirrm share/gnome/libgnomeprint/%%VERSION%%/printers
+@dirrm share/gnome/libgnomeprint/%%VERSION%%/models
+@dirrm share/gnome/libgnomeprint/%%VERSION%%/media
+@dirrm share/gnome/libgnomeprint/%%VERSION%%
+@dirrm share/gnome/libgnomeprint
 @dirrm share/doc/libgnomeprint
-@dirrm lib/libgnomeprint/2.1.2/modules/transports
-@dirrm lib/libgnomeprint/2.1.2/modules/drivers
-@dirrm lib/libgnomeprint/2.1.2/modules
-@dirrm lib/libgnomeprint/2.1.2
+@dirrm lib/libgnomeprint/%%VERSION%%/modules/transports
+@dirrm lib/libgnomeprint/%%VERSION%%/modules/drivers
+@dirrm lib/libgnomeprint/%%VERSION%%/modules
+@dirrm lib/libgnomeprint/%%VERSION%%
 @dirrm lib/libgnomeprint
 @dirrm include/libgnomeprint-2.2/libgnomeprint/private
 @dirrm include/libgnomeprint-2.2/libgnomeprint