diff options
| author | joerg <joerg@pkgsrc.org> | 2006-06-01 16:04:58 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-06-01 16:04:58 +0000 |
| commit | acb9f6c8b3537703eaf9c132a23b5f31738dbbf5 (patch) | |
| tree | 39e5c3b6dc1214dbeb7e5963c22970923961c29c /print | |
| parent | 385a0f70fb6e9136aac965599f30f94b5fad43aa (diff) | |
| download | pkgsrc-acb9f6c8b3537703eaf9c132a23b5f31738dbbf5.tar.gz | |
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 (limited to 'print')
| -rw-r--r-- | print/gnome-print/Makefile | 16 | ||||
| -rw-r--r-- | print/gnome-print/distinfo | 3 | ||||
| -rw-r--r-- | print/gnome-print/patches/patch-ac | 13 |
3 files changed, 29 insertions, 3 deletions
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile index ae73e073e2b..58130aac514 100644 --- a/print/gnome-print/Makefile +++ b/print/gnome-print/Makefile @@ -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 @@ COMMENT= Prototype implementation of the Gnome Printing Architecture 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 @@ CONFIGURE_ARGS+= --without-admin # currently unstable # 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 --git a/print/gnome-print/distinfo b/print/gnome-print/distinfo index d330fb0cc45..86fb176bccd 100644 --- a/print/gnome-print/distinfo +++ b/print/gnome-print/distinfo @@ -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 --git a/print/gnome-print/patches/patch-ac b/print/gnome-print/patches/patch-ac new file mode 100644 index 00000000000..155a30c9e94 --- /dev/null +++ b/print/gnome-print/patches/patch-ac @@ -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); |