[pkgsrc/trunk]: pkgsrc Convert to use the new pkginstall framework fonts-hand...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Convert to use the new pkginstall framework fonts-hand...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 02:47:33 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/ce61d7b8ed6c
branches:  trunk
changeset: 505030:ce61d7b8ed6c
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Dec 29 07:04:27 2005 +0000

description:
Convert to use the new pkginstall framework fonts-handling by renaming
FONTS_<TYPE>_DIRS variables to FONTS_DIRS.<type>, and by removing the
unnecessary inclusion of mk/fonts.mk.

diffstat:

 fonts/alee-ttf/Makefile            |   9 ++++-----
 fonts/arphic-ttf/Makefile          |  11 +++++------
 fonts/artwiz-fonts/Makefile        |   7 +++----
 fonts/baekmuk-ttf/Makefile         |   9 ++++-----
 fonts/biznet-iso8859_2/Makefile    |   5 ++---
 fonts/cyberbit-ttf/Makefile.common |  10 ++++------
 fonts/dbz-ttf/Makefile             |   9 ++++-----
 fonts/dejavu-ttf/Makefile          |   5 ++---
 fonts/geoslab703-ttf/Makefile      |   9 ++++-----
 fonts/ja-sazanami-ttf/Makefile     |  11 +++++------
 fonts/jisx0212fonts/Makefile       |   5 ++---
 fonts/jisx0213fonts/Makefile       |   5 ++---
 fonts/kochi-ttf/Makefile           |   5 ++---
 fonts/ms-ttf/Makefile              |   5 ++---
 fonts/profont/Makefile             |   7 +++----
 fonts/un-core-ttf/Makefile         |   9 ++++-----
 fonts/un-extra-ttf/Makefile        |   9 ++++-----
 fonts/vera-ttf/Makefile            |   7 +++----
 games/nethack-x11/Makefile         |   5 ++---
 19 files changed, 61 insertions(+), 81 deletions(-)

diffs (truncated from 482 to 300 lines):

diff -r c72e6c57763a -r ce61d7b8ed6c fonts/alee-ttf/Makefile
--- a/fonts/alee-ttf/Makefile   Thu Dec 29 06:21:30 2005 +0000
+++ b/fonts/alee-ttf/Makefile   Thu Dec 29 07:04:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/11/23 05:49:59 minskim Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/29 07:04:27 jlam Exp $
 #
 
 DISTNAME=      ttf-alee_6.0
@@ -15,14 +15,13 @@
 NO_BUILD=       YES
 
 WRKSRC=                ${WRKDIR}/${DISTNAME:S/_/-/}
-FONTS_TTF_DIRS= ${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf= ${PREFIX}/lib/X11/fonts/TTF
 DOCDIR=         ${PREFIX}/share/doc/alee-ttf
 
 do-install:
-       ${INSTALL_DATA_DIR} ${FONTS_TTF_DIRS}
-       ${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTS_TTF_DIRS}
+       ${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
+       ${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTS_DIRS.ttf}
        ${INSTALL_DATA_DIR} ${DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCDIR}
 
-.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c72e6c57763a -r ce61d7b8ed6c fonts/arphic-ttf/Makefile
--- a/fonts/arphic-ttf/Makefile Thu Dec 29 06:21:30 2005 +0000
+++ b/fonts/arphic-ttf/Makefile Thu Dec 29 07:04:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/07/15 18:27:49 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/29 07:04:27 jlam Exp $
 #
 
 DISTNAME=      arphic-ttf-2.11
@@ -24,19 +24,18 @@
 
 USE_TOOLS+=    gunzip
 
-FONTS_TTF_DIRS=        ${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf=        ${PREFIX}/lib/X11/fonts/TTF
 DOCDIR=                ${PREFIX}/share/doc/arphic-ttf
 
 do-install:
-       ${INSTALL_DATA_DIR} ${FONTS_TTF_DIRS}
+       ${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
        for f in ${FONT_FILES}; do \
-               ${INSTALL_DATA} ${_DISTDIR}/$$f ${FONTS_TTF_DIRS}; \
-               ${GUNZIP_CMD} ${FONTS_TTF_DIRS}/$$f; \
+               ${INSTALL_DATA} ${_DISTDIR}/$$f ${FONTS_DIRS.ttf}; \
+               ${GUNZIP_CMD} ${FONTS_DIRS.ttf}/$$f; \
        done
        ${INSTALL_DATA_DIR} ${DOCDIR}
        for f in ${MISC_FILES}; do \
                ${INSTALL_DATA} ${_DISTDIR}/$$f ${DOCDIR}; \
        done
 
-.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c72e6c57763a -r ce61d7b8ed6c fonts/artwiz-fonts/Makefile
--- a/fonts/artwiz-fonts/Makefile       Thu Dec 29 06:21:30 2005 +0000
+++ b/fonts/artwiz-fonts/Makefile       Thu Dec 29 07:04:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/12/29 06:21:40 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/29 07:04:27 jlam Exp $
 #
 
 DISTNAME=      artwiz-aleczapka-1.3
@@ -18,11 +18,10 @@
 NO_BUILD=      yes
 NO_CONFIGURE=  yes
 
-FONTS_X11_DIRS=        ${PREFIX}/lib/X11/fonts/artwiz
+FONTS_DIRS.x11=        ${PREFIX}/lib/X11/fonts/artwiz
 OWN_DIRS=      ${PREFIX}/lib/X11/fonts/artwiz
 
 do-install:
-       for i in ${WRKSRC}/*.pcf; do ${INSTALL_DATA} $$i ${FONTS_X11_DIRS}; done
+       for i in ${WRKSRC}/*.pcf; do ${INSTALL_DATA} $$i ${FONTS_DIRS.x11}; done
 
-.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c72e6c57763a -r ce61d7b8ed6c fonts/baekmuk-ttf/Makefile
--- a/fonts/baekmuk-ttf/Makefile        Thu Dec 29 06:21:30 2005 +0000
+++ b/fonts/baekmuk-ttf/Makefile        Thu Dec 29 07:04:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/12/28 14:38:03 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/29 07:04:27 jlam Exp $
 
 DISTNAME=      baekmuk-ttf-2.2
 PKGREVISION=   1
@@ -13,14 +13,13 @@
 NO_CONFIGURE=  YES
 NO_BUILD=      YES
 
-FONTS_TTF_DIRS=        ${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf=        ${PREFIX}/lib/X11/fonts/TTF
 DOCDIR=                ${PREFIX}/share/doc/baekmuk-ttf
 
 do-install:
-       ${INSTALL_DATA_DIR} ${FONTS_TTF_DIRS}
-       ${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${FONTS_TTF_DIRS}
+       ${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
+       ${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${FONTS_DIRS.ttf}
        ${INSTALL_DATA_DIR} ${DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/COPYRIGHT* ${DOCDIR}
 
-.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c72e6c57763a -r ce61d7b8ed6c fonts/biznet-iso8859_2/Makefile
--- a/fonts/biznet-iso8859_2/Makefile   Thu Dec 29 06:21:30 2005 +0000
+++ b/fonts/biznet-iso8859_2/Makefile   Thu Dec 29 07:04:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/15 18:27:49 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/29 07:04:27 jlam Exp $
 #
 
 DISTNAME=      ISO8859-2-pcf
@@ -18,7 +18,7 @@
 
 FONTDIR=       ${PREFIX}/lib/X11/fonts/biznet
 OWN_DIRS=      ${FONTDIR}
-FONTS_X11_DIRS=        ${FONTDIR}/75dpi ${FONTDIR}/100dpi ${FONTDIR}/misc
+FONTS_DIRS.x11=        ${FONTDIR}/75dpi ${FONTDIR}/100dpi ${FONTDIR}/misc
 
 do-install:
        @for d in 75dpi 100dpi misc; do \
@@ -31,5 +31,4 @@
                done; \
        done
 
-.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c72e6c57763a -r ce61d7b8ed6c fonts/cyberbit-ttf/Makefile.common
--- a/fonts/cyberbit-ttf/Makefile.common        Thu Dec 29 06:21:30 2005 +0000
+++ b/fonts/cyberbit-ttf/Makefile.common        Thu Dec 29 07:04:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2004/10/04 12:44:55 wiz Exp $
+# $NetBSD: Makefile.common,v 1.14 2005/12/29 07:04:27 jlam Exp $
 #
 
 DISTNAME=      # empty
@@ -30,13 +30,11 @@
 NO_CONFIGURE=  YES
 NO_BUILD=      YES
 
-FONTS_TTF_DIRS=        ${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf=        ${PREFIX}/lib/X11/fonts/TTF
 DOCDIR=                ${PREFIX}/share/doc/html/cyberbit-ttf
 
 do-install:
-       ${INSTALL_DATA_DIR} ${FONTS_TTF_DIRS}
-       ${INSTALL_DATA} ${WRKDIR}/*.ttf ${FONTS_TTF_DIRS}
+       ${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
+       ${INSTALL_DATA} ${WRKDIR}/*.ttf ${FONTS_DIRS.ttf}
        ${INSTALL_DATA_DIR} ${DOCDIR}
        ${INSTALL_DATA} ${_DISTDIR}/ReadMe.htm ${DOCDIR}
-
-.include "../../mk/fonts.mk"
diff -r c72e6c57763a -r ce61d7b8ed6c fonts/dbz-ttf/Makefile
--- a/fonts/dbz-ttf/Makefile    Thu Dec 29 06:21:30 2005 +0000
+++ b/fonts/dbz-ttf/Makefile    Thu Dec 29 07:04:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/09/29 13:46:16 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/29 07:04:27 jlam Exp $
 #
 
 DISTNAME=      dbz
@@ -22,14 +22,13 @@
 NO_BUILD=      YES
 NO_CONFIGURE=  YES
 
-FONTS_TTF_DIRS=        ${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf=        ${PREFIX}/lib/X11/fonts/TTF
 DOCDIR=                ${PREFIX}/share/doc/dbz-ttf
 
 do-install:
-       ${INSTALL_DATA_DIR} ${FONTS_TTF_DIRS}
-       ${INSTALL_DATA} ${WRKDIR}/*.ttf ${FONTS_TTF_DIRS}
+       ${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
+       ${INSTALL_DATA} ${WRKDIR}/*.ttf ${FONTS_DIRS.ttf}
        ${INSTALL_DATA_DIR} ${DOCDIR}
        ${INSTALL_DATA} ${WRKDIR}/readme.txt ${DOCDIR}
 
-.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c72e6c57763a -r ce61d7b8ed6c fonts/dejavu-ttf/Makefile
--- a/fonts/dejavu-ttf/Makefile Thu Dec 29 06:21:30 2005 +0000
+++ b/fonts/dejavu-ttf/Makefile Thu Dec 29 07:04:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/09/07 22:40:23 reed Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/29 07:04:27 jlam Exp $
 
 DISTNAME=      dejavu-ttf-1.13
 CATEGORIES=    fonts
@@ -12,7 +12,7 @@
 NO_CONFIGURE=  YES
 NO_BUILD=      YES
 
-FONTS_TTF_DIRS=        ${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf=        ${PREFIX}/lib/X11/fonts/TTF
 
 INSTALLATION_DIRS=     lib/X11/fonts/TTF share/doc/dejavu-ttf
 
@@ -21,5 +21,4 @@
        cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS BUGS LICENSE NEWS README \
                ${PREFIX}/share/doc/dejavu-ttf
 
-.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c72e6c57763a -r ce61d7b8ed6c fonts/geoslab703-ttf/Makefile
--- a/fonts/geoslab703-ttf/Makefile     Thu Dec 29 06:21:30 2005 +0000
+++ b/fonts/geoslab703-ttf/Makefile     Thu Dec 29 07:04:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/12/28 14:38:03 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/29 07:04:27 jlam Exp $
 #
 
 DISTNAME=      geoslab703-ttf-20010522
@@ -18,11 +18,10 @@
 NO_CONFIGURE=  YES
 NO_BUILD=      YES
 
-FONTS_TTF_DIRS=        ${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf=        ${PREFIX}/lib/X11/fonts/TTF
 
 do-install:
-       ${INSTALL_DATA_DIR} ${FONTS_TTF_DIRS}
-       ${INSTALL_DATA} ${_DISTDIR}/*.ttf ${FONTS_TTF_DIRS}
+       ${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
+       ${INSTALL_DATA} ${_DISTDIR}/*.ttf ${FONTS_DIRS.ttf}
 
-.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c72e6c57763a -r ce61d7b8ed6c fonts/ja-sazanami-ttf/Makefile
--- a/fonts/ja-sazanami-ttf/Makefile    Thu Dec 29 06:21:30 2005 +0000
+++ b/fonts/ja-sazanami-ttf/Makefile    Thu Dec 29 07:04:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/05 16:10:03 agc Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/29 07:04:27 jlam Exp $
 
 DISTNAME=              sazanami-${SAZANAMI_VERS}
 PKGNAME=               ja-sazanami-ttf-${SAZANAMI_VERS}
@@ -11,15 +11,14 @@
 COMMENT=               Truly free Japanese TrueType font
 
 SAZANAMI_VERS=         20040629
-FONTS_TTF_DIRS=                ${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf=                ${PREFIX}/lib/X11/fonts/TTF
 
 NO_BUILD=              YES
 NO_CONFIGURE=          YES
 
 do-install:
-       ${INSTALL_DATA_DIR} ${FONTS_TTF_DIRS}
-       ${INSTALL_DATA} ${WRKSRC}/sazanami-gothic.ttf ${FONTS_TTF_DIRS}
-       ${INSTALL_DATA} ${WRKSRC}/sazanami-mincho.ttf ${FONTS_TTF_DIRS}
+       ${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
+       ${INSTALL_DATA} ${WRKSRC}/sazanami-gothic.ttf ${FONTS_DIRS.ttf}
+       ${INSTALL_DATA} ${WRKSRC}/sazanami-mincho.ttf ${FONTS_DIRS.ttf}
 
-.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c72e6c57763a -r ce61d7b8ed6c fonts/jisx0212fonts/Makefile
--- a/fonts/jisx0212fonts/Makefile      Thu Dec 29 06:21:30 2005 +0000
+++ b/fonts/jisx0212fonts/Makefile      Thu Dec 29 07:04:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/07/15 18:27:50 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/29 07:04:28 jlam Exp $
 
 DISTNAME=      jisx0212fonts-0.0
 PKGREVISION=   1
@@ -19,7 +19,7 @@
 
 FONTS=         ${DISTFILES:C/\.bdf.*$//}
 FONTDIR=       ${PREFIX}/lib/X11/fonts/local
-FONTS_X11_DIRS=        ${FONTDIR}
+FONTS_DIRS.x11=        ${FONTDIR}
 
 USE_TOOLS+=    gzip gunzip
 
@@ -42,5 +42,4 @@
                ${INSTALL_DATA} ${WRKSRC}/$${f}.pcf.gz ${FONTDIR}; \
        done
 
-.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c72e6c57763a -r ce61d7b8ed6c fonts/jisx0213fonts/Makefile
--- a/fonts/jisx0213fonts/Makefile      Thu Dec 29 06:21:30 2005 +0000
+++ b/fonts/jisx0213fonts/Makefile      Thu Dec 29 07:04:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/07/15 18:27:50 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/29 07:04:28 jlam Exp $
 #
 
 DISTNAME=      jisx0213fonts-0.0
@@ -15,7 +15,7 @@
 
 FONTS=         K14-1 K14-2 jiskan16-2000-1 jiskan16-2000-2
Prev by Date: [pkgsrc/trunk]: pkgsrc/benchmarks/hbench Doesn't hide the output from the pos...
Next by Date: [pkgsrc/trunk]: pkgsrc/mk/install Allow avoiding the automatic update of the ...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/benchmarks/hbench Doesn't hide the output from the pos...
Next by Thread: [pkgsrc/trunk]: pkgsrc/mk/install Allow avoiding the automatic update of the ...
Indexes:
Home | Main Index | Thread Index | Old Index