diff options
| author | joerg <joerg@pkgsrc.org> | 2009-07-08 16:55:21 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2009-07-08 16:55:21 +0000 |
| commit | 32cd30a8c07a63671125deccef0009e68e0d0265 (patch) | |
| tree | dbab8ae6bb65e880d0c5045c23ca913a7bac53e5 /fonts/mozilla-fonts | |
| parent | c52270a48433cc7d512a6190da5beed012349492 (diff) | |
| download | pkgsrc-32cd30a8c07a63671125deccef0009e68e0d0265.tar.gz | |
user-destdir support
Diffstat (limited to 'fonts/mozilla-fonts')
| -rw-r--r-- | fonts/mozilla-fonts/Makefile | 9 | ||||
| -rw-r--r-- | fonts/mozilla-fonts/distinfo | 4 | ||||
| -rw-r--r-- | fonts/mozilla-fonts/patches/patch-aa | 26 |
3 files changed, 22 insertions, 17 deletions
diff --git a/fonts/mozilla-fonts/Makefile b/fonts/mozilla-fonts/Makefile index a161f7d9c7b..d833a7cee95 100644 --- a/fonts/mozilla-fonts/Makefile +++ b/fonts/mozilla-fonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2008/01/22 17:09:55 tnn Exp $ +# $NetBSD: Makefile,v 1.9 2009/07/08 16:57:05 joerg Exp $ DISTNAME= mozilla-fonts-1.0 PKGREVISION= 3 @@ -9,12 +9,15 @@ MAINTAINER= rxg@NetBSD.org #HOMEPAGE= http://www.myrddin.demon.co.uk/dist/ COMMENT= Optimized fonts for Netscape/Mozilla +PKG_DESTDIR_SUPPORT= user-destdir + USE_TOOLS+= bdftopcf gzip FONTS_DIRS.x11+= ${PREFIX}/lib/X11/fonts/Mozilla REQD_DIRS+= ${PREFIX}/lib/X11/fonts/Mozilla +INSTALLATION_DIRS= share/doc/mozilla-fonts + post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mozilla-fonts - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/mozilla-fonts + ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/mozilla-fonts .include "../../mk/bsd.pkg.mk" diff --git a/fonts/mozilla-fonts/distinfo b/fonts/mozilla-fonts/distinfo index 122567791c3..be460222649 100644 --- a/fonts/mozilla-fonts/distinfo +++ b/fonts/mozilla-fonts/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2005/02/23 19:18:28 agc Exp $ +$NetBSD: distinfo,v 1.4 2009/07/08 16:57:05 joerg Exp $ SHA1 (mozilla-fonts-1.0.tar.gz) = 78bdf7d984f4d3fb63f1ab2ae6313be5adf297a0 RMD160 (mozilla-fonts-1.0.tar.gz) = acc0875c52a9e37318775188980d7e9a4bda5a41 Size (mozilla-fonts-1.0.tar.gz) = 646850 bytes -SHA1 (patch-aa) = b31f0e75bf4326f0aaaa66ffb29bf866ccd9e015 +SHA1 (patch-aa) = 6da124dc3abaa3eab7240c5f2251b78373bd2545 diff --git a/fonts/mozilla-fonts/patches/patch-aa b/fonts/mozilla-fonts/patches/patch-aa index 7f73a9088ec..efb1a6ef3ed 100644 --- a/fonts/mozilla-fonts/patches/patch-aa +++ b/fonts/mozilla-fonts/patches/patch-aa @@ -1,32 +1,34 @@ -$NetBSD: patch-aa,v 1.2 2004/06/16 16:45:21 minskim Exp $ +$NetBSD: patch-aa,v 1.3 2009/07/08 16:57:05 joerg Exp $ ---- Makefile.orig 2000-09-23 21:57:57.000000000 -0500 +--- Makefile.orig 2000-09-24 04:57:57.000000000 +0200 +++ Makefile @@ -1,6 +1,6 @@ # Makefile for mozilla-fonts -DESTDIR = /usr/local/lib/X11/fonts/Mozilla -+DESTDIR = $(PREFIX)/lib/X11/fonts/Mozilla ++DEST = $(PREFIX)/lib/X11/fonts/Mozilla INSTALL = install -@@ -111,12 +111,15 @@ all: $(PCFFILES) +@@ -111,13 +111,16 @@ all: $(PCFFILES) bdftopcf $< -o $@ install: $(PCFFILES) - mkdir -p $(DESTDIR) -+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR) ++ $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(DEST) @for font in $(PCFFILES) ; do \ - echo " $(INSTALL) -m 644 $$font $(DESTDIR)/$$font" ; \ - $(INSTALL) -m 644 $$font $(DESTDIR)/$$font || exit 1 ; \ -+ echo " $(BSD_INSTALL_DATA) $$font $(DESTDIR)/$$font" ; \ -+ $(BSD_INSTALL_DATA) -m 644 $$font $(DESTDIR)/$$font || exit 1 ; \ -+ rm -f $(DESTDIR)/$$font.* ; \ -+ echo " Compressing $(DESTDIR)/$$font" ; \ -+ gzip $(DESTDIR)/$$font ; \ ++ echo " $(BSD_INSTALL_DATA) $$font ${DESTDIR}$(DEST)/$$font" ; \ ++ $(BSD_INSTALL_DATA) -m 644 $$font ${DESTDIR}$(DEST)/$$font || exit 1 ; \ ++ rm -f ${DESTDIR}$(DEST)/$$font.* ; \ ++ echo " Compressing ${DESTDIR}$(DEST)/$$font" ; \ ++ gzip ${DESTDIR}$(DEST)/$$font ; \ done - $(INSTALL) -m 644 fonts.alias $(DESTDIR)/fonts.alias -+ $(BSD_INSTALL_DATA) fonts.alias $(DESTDIR)/fonts.alias - cd $(DESTDIR) && mkfontdir +- cd $(DESTDIR) && mkfontdir ++ $(BSD_INSTALL_DATA) fonts.alias ${DESTDIR}$(DEST)/fonts.alias ++ cd ${DESTDIR}$(DEST) && mkfontdir clean: + rm -f *.pcf |