[pkgsrc/trunk]: pkgsrc/print/gnome-print Use X11BASE in run-gnome-font-instal...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/26148b788c35
branches:  trunk
changeset: 513679:26148b788c35
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Jun 01 16:04:58 2006 +0000

description:
Use X11BASE in run-gnome-font-install and depend on xorg's Truetype
and Type1 package at build time when xorg is used.

Ideally the font database would be created at install time, but this
adds a lot more work.

Also depend on msgfmt.

diffstat:

 print/gnome-print/Makefile         |  16 ++++++++++++++--
 print/gnome-print/distinfo         |   3 ++-
 print/gnome-print/patches/patch-ac |  13 +++++++++++++
 3 files changed, 29 insertions(+), 3 deletions(-)

diffs (70 lines):

diff -r 3f8958964a8a -r 26148b788c35 print/gnome-print/Makefile
--- a/print/gnome-print/Makefile        Thu Jun 01 15:31:27 2006 +0000
+++ b/print/gnome-print/Makefile        Thu Jun 01 16:04:58 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2006/04/17 13:46:01 wiz Exp $
+# $NetBSD: Makefile,v 1.73 2006/06/01 16:04:58 joerg Exp $
 
 DISTNAME=              gnome-print-0.37
 PKGREVISION=           2
@@ -12,7 +12,7 @@
 USE_DIRS+=             gnome1-1.5
 USE_PKGLOCALEDIR=      YES
 USE_LIBTOOL=           YES
-USE_TOOLS+=            gs:run
+USE_TOOLS+=            gs:run msgfmt
 
 GNU_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --without-admin         # currently unstable
@@ -20,6 +20,18 @@
 # override HOME to avoid trying to install ${HOME}/.gnome
 MAKE_ENV+=             HOME=${WRKSRC:Q}
 
+.include "../../mk/bsd.prefs.mk"
+
+SUBST_CLASSES+=                x11path
+SUBST_FILES.x11path+=  run-gnome-font-install
+SUBST_SED.x11path+=    -e 's,@X11BASE@,${X11BASE},g'
+SUBST_STAGE.x11path=   pre-configure
+
+.if ${X11_TYPE} == "xorg"
+BUILD_DEPENDS+=        xorg-fontsTruetype-[0-9]*:../../fonts/xorg-fontsTruetype
+BUILD_DEPENDS+=        xorg-fontsType1-[0-9]*:../../fonts/xorg-fontsType1
+.endif
+
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf-gnome/buildlink3.mk"
 .include "../../textproc/libunicode/buildlink3.mk"
diff -r 3f8958964a8a -r 26148b788c35 print/gnome-print/distinfo
--- a/print/gnome-print/distinfo        Thu Jun 01 15:31:27 2006 +0000
+++ b/print/gnome-print/distinfo        Thu Jun 01 16:04:58 2006 +0000
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.10 2005/02/24 12:51:43 agc Exp $
+$NetBSD: distinfo,v 1.11 2006/06/01 16:04:58 joerg Exp $
 
 SHA1 (gnome-print-0.37.tar.gz) = 119bb335669dfa0d6b264055fe8b7b3094b1cfec
 RMD160 (gnome-print-0.37.tar.gz) = 3f3acaa783b448c5b5d256182472e7a8934e6cd1
 Size (gnome-print-0.37.tar.gz) = 953260 bytes
 SHA1 (patch-aa) = 50ae2e216931e5b49ecd737cc5e3f621c9eca611
 SHA1 (patch-ab) = fac04fb71ccdc1a639c3b23b118ea32f0263ca00
+SHA1 (patch-ac) = 8860630d03c9a93b6f6c0857442b1f023ac6b5e0
 SHA1 (patch-ad) = 1484232e28d37923bd41d96e2b90816f2ba5501f
 SHA1 (patch-ae) = b4ace016c4cf99b217a77987a46c5b9c885455c8
 SHA1 (patch-af) = bc7f4ea0be2e0954bc976f65329bff7d25c8a61c
diff -r 3f8958964a8a -r 26148b788c35 print/gnome-print/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/gnome-print/patches/patch-ac        Thu Jun 01 16:04:58 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.4 2006/06/01 16:04:58 joerg Exp $
+
+--- run-gnome-font-install.orig        2005-12-03 01:43:55.000000000 +0000
++++ run-gnome-font-install
+@@ -127,7 +127,7 @@ my @options = (
+              "--aliases=$datadir/fonts/adobe-urw.font",
+              "--aliases=$datadir/gnome/fonts/adobe-urw.font",
+              "$datadir/fonts/afms",
+-             '/usr/X11R6/lib/X11/fonts'
++             '@X11BASE@/lib/X11/fonts'
+              );
+ print "Info: running \"$installer ", join (' ', @options), "\".\n";
+ system ($installer, @options);