[pkgsrc/trunk]: pkgsrc/fonts user-destdir support

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/fonts user-destdir support
From: joerg <joerg%pkgsrc.org@localhost>
Date: Mon, 16 Jan 2023 19:28:42 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/4d8aa784769a
branches:  trunk
changeset: 395550:4d8aa784769a
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Jul 08 16:55:21 2009 +0000

description:
user-destdir support

diffstat:

 fonts/ko-baekmuk/Makefile            |   8 ++++++--
 fonts/ko-hanyang/Makefile            |   9 +++++----
 fonts/ko-kaist/Makefile              |  11 ++++++-----
 fonts/monafonts/Makefile             |   6 ++++--
 fonts/mozilla-fonts/Makefile         |   9 ++++++---
 fonts/mozilla-fonts/distinfo         |   4 ++--
 fonts/mozilla-fonts/patches/patch-aa |  26 ++++++++++++++------------
 fonts/oto/Makefile                   |   9 ++++++---
 8 files changed, 49 insertions(+), 33 deletions(-)

diffs (247 lines):

diff -r 3b57fa567895 -r 4d8aa784769a fonts/ko-baekmuk/Makefile
--- a/fonts/ko-baekmuk/Makefile Wed Jul 08 16:40:08 2009 +0000
+++ b/fonts/ko-baekmuk/Makefile Wed Jul 08 16:55:21 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2008/08/23 07:47:00 obache Exp $
+# $NetBSD: Makefile,v 1.20 2009/07/08 16:59:46 joerg Exp $
 #
 
 DISTNAME=      baekmuk-2.1
@@ -9,11 +9,13 @@
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       X11 fonts for KSX 1001 Korean standard (baekmuk foundry)
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 CONFLICTS+=    ksc5601fonts-[0-9]*
 
 USE_TOOLS+=    bdftopcf gzip
 
-MAKE_ENV+=     FONTDIR=${FONTDIR:Q} GZIP_CMD=${GZIP_CMD:Q}
+MAKE_ENV+=     FONTDIR=${DESTDIR}${FONTDIR:Q} GZIP_CMD=${GZIP_CMD:Q}
 
 # fonts
 BAEKMUK_BDF=   batang10.bdf batang10b.bdf batang12.bdf batang12b.bdf \
@@ -30,6 +32,8 @@
 FONTS_DIRS.x11+=       ${FONTDIR}
 REQD_DIRS+=            ${FONTDIR}
 
+INSTALLATION_DIRS=     ${FONTDIR}
+
 post-extract:
        ${MKDIR} ${WRKSRC}
        ${CP} ${.CURDIR}/../../fonts/ko-x11fonts/files/Makefile ${WRKSRC}
diff -r 3b57fa567895 -r 4d8aa784769a fonts/ko-hanyang/Makefile
--- a/fonts/ko-hanyang/Makefile Wed Jul 08 16:40:08 2009 +0000
+++ b/fonts/ko-hanyang/Makefile Wed Jul 08 16:55:21 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/07/25 15:12:27 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/08 16:56:29 joerg Exp $
 #
 
 DISTNAME=      hanyang-font-pcf
@@ -11,13 +11,15 @@
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       X11 fonts for KSC 5601 standard
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 CONFLICTS+=    ksc5601fonts-[0-9]*
 
 USE_X11BASE=   yes
 USE_TOOLS+=    gzip
 EXTRACT_ONLY=  # empty
 
-MAKE_ENV+=     FONTDIR=${FONTDIR:Q} GZIP_CMD=${GZIP_CMD:Q}
+MAKE_ENV+=     FONTDIR=${DESTDIR}${FONTDIR:Q} GZIP_CMD=${GZIP_CMD:Q}
 
 # fonts
 EXTRACT_ONLY+= hanyang-font-pcf.tar.gz
@@ -39,7 +41,6 @@
                ${MV} ${WRKDIR}/$$i ${WRKSRC}; \
        done
 
-pre-install:
-       [ -d ${FONTDIR} ] || ${INSTALL_DATA_DIR} ${FONTDIR}
+INSTALLATION_DIRS=     ${FONTDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff -r 3b57fa567895 -r 4d8aa784769a fonts/ko-kaist/Makefile
--- a/fonts/ko-kaist/Makefile   Wed Jul 08 16:40:08 2009 +0000
+++ b/fonts/ko-kaist/Makefile   Wed Jul 08 16:55:21 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/12/17 22:34:18 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2009/07/08 17:00:40 joerg Exp $
 #
 
 DISTNAME=      ko-kaist-20010718
@@ -11,17 +11,21 @@
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       X11 fonts for Korean KSC 5601 standard (kaist foundry)
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 CONFLICTS+=    ksc5601fonts-[0-9]*
 
 USE_X11BASE=           yes
 USE_TOOLS+=            gzip gunzip bdftopcf
 EXTRACT_ONLY=          # empty
 
-MAKE_ENV+=     FONTDIR=${FONTDIR:Q} GZIP_CMD=${GZIP_CMD:Q}
+MAKE_ENV+=     FONTDIR=${DESTDIR}${FONTDIR:Q} GZIP_CMD=${GZIP_CMD:Q}
 
 FONTDIR=       ${PREFIX}/lib/X11/fonts/local
 FONTS_DIRS.x11=        ${FONTDIR}
 
+INSTALLATION_DIRS=     ${FONTDIR}
+
 do-extract:
        ${MKDIR} ${WRKSRC}
        for i in ${DISTFILES}; do \
@@ -32,7 +36,4 @@
 do-configure:
        cd ${WRKSRC}; ${MAKE} prepare
 
-pre-install:
-       [ -d ${FONTDIR} ] || ${INSTALL_DATA_DIR} ${FONTDIR}
-
 .include "../../mk/bsd.pkg.mk"
diff -r 3b57fa567895 -r 4d8aa784769a fonts/monafonts/Makefile
--- a/fonts/monafonts/Makefile  Wed Jul 08 16:40:08 2009 +0000
+++ b/fonts/monafonts/Makefile  Wed Jul 08 16:55:21 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/01/24 15:23:26 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2009/07/08 16:55:21 joerg Exp $
 
 DISTNAME=      monafont-2.90
 PKGNAME=       ${DISTNAME:S/font/fonts/}
@@ -11,10 +11,12 @@
 HOMEPAGE=      http://monafont.sourceforge.net/
 COMMENT=       Japanese fonts for "Mona" seen at 2ch.net
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 BUILD_TARGET=  bdf
 USE_TOOLS+=    bdftopcf gzip mkdirhier mkfontdir perl sed
 
-MAKE_FLAGS+=   X11FONTDIR=${PREFIX:Q}/${FONTS_SUBDIR:Q}
+MAKE_FLAGS+=   X11FONTDIR=${DESTDIR}${PREFIX}/${FONTS_SUBDIR:Q}
 MAKE_FLAGS+=   SED_CMD=${SED:Q}
 MAKE_FLAGS+=   PERL_CMD=${PERL5:Q}
 MAKE_FLAGS+=   GZIP_CMD=${GZIP_CMD:Q}
diff -r 3b57fa567895 -r 4d8aa784769a fonts/mozilla-fonts/Makefile
--- a/fonts/mozilla-fonts/Makefile      Wed Jul 08 16:40:08 2009 +0000
+++ b/fonts/mozilla-fonts/Makefile      Wed Jul 08 16:55:21 2009 +0000
@@ -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 @@
 #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 -r 3b57fa567895 -r 4d8aa784769a fonts/mozilla-fonts/distinfo
--- a/fonts/mozilla-fonts/distinfo      Wed Jul 08 16:40:08 2009 +0000
+++ b/fonts/mozilla-fonts/distinfo      Wed Jul 08 16:55:21 2009 +0000
@@ -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 -r 3b57fa567895 -r 4d8aa784769a fonts/mozilla-fonts/patches/patch-aa
--- a/fonts/mozilla-fonts/patches/patch-aa      Wed Jul 08 16:40:08 2009 +0000
+++ b/fonts/mozilla-fonts/patches/patch-aa      Wed Jul 08 16:55:21 2009 +0000
@@ -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
diff -r 3b57fa567895 -r 4d8aa784769a fonts/oto/Makefile
--- a/fonts/oto/Makefile        Wed Jul 08 16:40:08 2009 +0000
+++ b/fonts/oto/Makefile        Wed Jul 08 16:55:21 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/01/22 13:36:30 obache Exp $
+# $NetBSD: Makefile,v 1.14 2009/07/08 16:57:50 joerg Exp $
 #
 
 DISTNAME=      oto-0.4
@@ -10,12 +10,15 @@
 HOMEPAGE=      http://sourceforge.net/projects/oto/
 COMMENT=       List and modify OpenType font files
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE= yes
 USE_TOOLS+=    gmake
 
+INSTALLATION_DIRS=     share/doc/oto
+
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/oto
-       ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/oto
+       ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/oto
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/libgetopt/buildlink3.mk"
Prev by Date: [pkgsrc/trunk]: pkgsrc user-destdir support
Next by Date: [pkgsrc/trunk]: pkgsrc/games user-destdir support
Previous by Thread: [pkgsrc/trunk]: pkgsrc user-destdir support
Next by Thread: [pkgsrc/trunk]: pkgsrc/games user-destdir support
Indexes:
Home | Main Index | Thread Index | Old Index