CVS commit: pkgsrc/fonts

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/fonts
From: "Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>
Date: Mon, 5 May 2025 18:37:14 +0000

Module Name:    pkgsrc
Committed By:   vins
Date:           Mon May  5 18:37:14 UTC 2025

Modified Files:
        pkgsrc/fonts/cmvnd-fonts: Makefile PLIST distinfo
        pkgsrc/fonts/leahfonts: Makefile PLIST distinfo
        pkgsrc/fonts/suxus: Makefile PLIST distinfo
Removed Files:
        pkgsrc/fonts/cmvnd-fonts: MESSAGE
        pkgsrc/fonts/leahfonts: MESSAGE
        pkgsrc/fonts/leahfonts/files: fonts.alias
        pkgsrc/fonts/suxus: MESSAGE

Log Message:
fonts/*: move bitmap fonts to X11/PCF

Use common 'PCF' FONTS_DIRS.x11 for those *.pcf bitmap fonts I commited.
Remove MESSAGE, simplify Makefile and bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 pkgsrc/fonts/cmvnd-fonts/MESSAGE
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/cmvnd-fonts/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/fonts/cmvnd-fonts/PLIST \
    pkgsrc/fonts/cmvnd-fonts/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/fonts/leahfonts/MESSAGE
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/leahfonts/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/fonts/leahfonts/PLIST \
    pkgsrc/fonts/leahfonts/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/fonts/leahfonts/files/fonts.alias
cvs rdiff -u -r1.1 -r0 pkgsrc/fonts/suxus/MESSAGE
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/suxus/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/fonts/suxus/PLIST pkgsrc/fonts/suxus/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/fonts/cmvnd-fonts/Makefile
diff -u pkgsrc/fonts/cmvnd-fonts/Makefile:1.2 pkgsrc/fonts/cmvnd-fonts/Makefile:1.3
--- pkgsrc/fonts/cmvnd-fonts/Makefile:1.2       Thu Aug  1 18:50:46 2024
+++ pkgsrc/fonts/cmvnd-fonts/Makefile   Mon May  5 18:37:14 2025
@@ -1,15 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2024/08/01 18:50:46 vins Exp $
+# $NetBSD: Makefile,v 1.3 2025/05/05 18:37:14 vins Exp $
 
-DISTNAME=      fonts
-PKGVER=                20211030
-PKGNAME=       ${DISTNAME:S/^/cmvnd-/}-${PKGVER}
+DISTNAME=      fonts-20211030
+PKGNAME=       ${DISTNAME:S/^/cmvnd-/}
+PKGREVISION=   1
 CATEGORIES=    fonts
-DIST_SUBDIR=   ${PKGNAME_NOREV}
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=cmvnd/}
 GITHUB_PROJECT=        fonts
 GITHUB_TAG=    0480a776c8a0b9c05cba4037084f74c5f8c042f6
 
-
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/cmvnd/fonts/
 COMMENT=       Tiny bitmap fonts
@@ -23,11 +21,11 @@ NO_CONFIGURE=       yes
 FONTS=         antidote berry berryBold \
                lemon limey uushi
 
-FONTDIR=               share/fonts/X11/cmvnd
+FONTDIR=               share/fonts/X11/PCF
 REQD_DIRS=             ${FONTDIR}
 FONTS_DIRS.x11=                ${FONTDIR}
+
 INSTALLATION_DIRS=     ${FONTDIR}
-MESSAGE_SUBST+=                FONTDIR=${FONTDIR:Q}
 
 WRKSRC=        ${WRKDIR}/fonts-${GITHUB_TAG}
 
@@ -40,18 +38,14 @@ post-extract:
 do-build:
        ${RUN}cd ${WRKSRC} &&                           \
        for FONT in ${FONTS}; do                        \
-         ${ECHO_N} "Compiling font $${FONT} ... ";     \
          bdftopcf $${FONT}.bdf |                       \
                ${GZIP_CMD} -c >$${FONT}.pcf.gz;        \
-         ${ECHO} "done";                               \
        done
 
 do-install:
        ${RUN}for FONT in ${FONTS}; do                  \
-         ${ECHO_N} "Installing font $${FONT} ... ";    \
          ${INSTALL_DATA} ${WRKSRC}/$${FONT}.pcf.gz     \
                ${DESTDIR}${PREFIX}/${FONTDIR};         \
-         ${ECHO} "done";                               \
        done
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/cmvnd-fonts/PLIST
diff -u pkgsrc/fonts/cmvnd-fonts/PLIST:1.1 pkgsrc/fonts/cmvnd-fonts/PLIST:1.2
--- pkgsrc/fonts/cmvnd-fonts/PLIST:1.1  Tue Aug 29 06:27:08 2023
+++ pkgsrc/fonts/cmvnd-fonts/PLIST      Mon May  5 18:37:14 2025
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2023/08/29 06:27:08 vins Exp $
-share/fonts/X11/cmvnd/antidote.pcf.gz
-share/fonts/X11/cmvnd/berry.pcf.gz
-share/fonts/X11/cmvnd/berryBold.pcf.gz
-share/fonts/X11/cmvnd/lemon.pcf.gz
-share/fonts/X11/cmvnd/limey.pcf.gz
-share/fonts/X11/cmvnd/uushi.pcf.gz
+@comment $NetBSD: PLIST,v 1.2 2025/05/05 18:37:14 vins Exp $
+share/fonts/X11/PCF/antidote.pcf.gz
+share/fonts/X11/PCF/berry.pcf.gz
+share/fonts/X11/PCF/berryBold.pcf.gz
+share/fonts/X11/PCF/lemon.pcf.gz
+share/fonts/X11/PCF/limey.pcf.gz
+share/fonts/X11/PCF/uushi.pcf.gz
Index: pkgsrc/fonts/cmvnd-fonts/distinfo
diff -u pkgsrc/fonts/cmvnd-fonts/distinfo:1.1 pkgsrc/fonts/cmvnd-fonts/distinfo:1.2
--- pkgsrc/fonts/cmvnd-fonts/distinfo:1.1       Tue Aug 29 06:27:08 2023
+++ pkgsrc/fonts/cmvnd-fonts/distinfo   Mon May  5 18:37:14 2025
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2023/08/29 06:27:08 vins Exp $
+$NetBSD: distinfo,v 1.2 2025/05/05 18:37:14 vins Exp $
 
-BLAKE2s (cmvnd-fonts-20211030/fonts-0480a776c8a0b9c05cba4037084f74c5f8c042f6.tar.gz) = dcc61cc56fd8353261be9001c4089f95fdc9a04e89c23eb6c467600f44428074
-SHA512 (cmvnd-fonts-20211030/fonts-0480a776c8a0b9c05cba4037084f74c5f8c042f6.tar.gz) = 
9c2f15c7dd3e88781940e2f0fe6dc55e775ad9b9486b30654b5c7db006f5959ba31329ca39609dc92cd14e50b25ae0e5a0c33b203a7344cd83b199cadff0f02e
-Size (cmvnd-fonts-20211030/fonts-0480a776c8a0b9c05cba4037084f74c5f8c042f6.tar.gz) = 315288 bytes
+BLAKE2s (fonts-20211030-0480a776c8a0b9c05cba4037084f74c5f8c042f6.tar.gz) = dcc61cc56fd8353261be9001c4089f95fdc9a04e89c23eb6c467600f44428074
+SHA512 (fonts-20211030-0480a776c8a0b9c05cba4037084f74c5f8c042f6.tar.gz) = 
9c2f15c7dd3e88781940e2f0fe6dc55e775ad9b9486b30654b5c7db006f5959ba31329ca39609dc92cd14e50b25ae0e5a0c33b203a7344cd83b199cadff0f02e
+Size (fonts-20211030-0480a776c8a0b9c05cba4037084f74c5f8c042f6.tar.gz) = 315288 bytes

Index: pkgsrc/fonts/leahfonts/Makefile
diff -u pkgsrc/fonts/leahfonts/Makefile:1.2 pkgsrc/fonts/leahfonts/Makefile:1.3
--- pkgsrc/fonts/leahfonts/Makefile:1.2 Thu Aug  1 18:50:46 2024
+++ pkgsrc/fonts/leahfonts/Makefile     Mon May  5 18:37:14 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2024/08/01 18:50:46 vins Exp $
+# $NetBSD: Makefile,v 1.3 2025/05/05 18:37:14 vins Exp $
 
 PKGNAME=       leahfonts-20170708
+PKGREVISION=   1
 CATEGORIES=    fonts
 MASTER_SITES=  https://git.vuxu.org/
 DIST_SUBDIR=   ${PKGNAME_NOREV}
@@ -23,12 +24,12 @@ USE_TOOLS+= bdftopcf gzip
 NO_CONFIGURE=  yes
 
 FONTS=         5x13 smalltalk10 sq sqb
-FONTDIR=       share/fonts/X11/${PKGBASE}
-REQD_DIRS=     ${FONTDIR}
-FONTS_DIRS.x11=        ${FONTDIR}
+FONTDIR=       share/fonts/X11/PCF
+
+REQD_DIRS=             ${FONTDIR}
+FONTS_DIRS.x11=                ${FONTDIR}
 
 INSTALLATION_DIRS=     ${FONTDIR}
-MESSAGE_SUBST+=                FONTDIR=${FONTDIR:Q}
 
 post-extract:
        ${RUN}${MKDIR} ${WRKDIR}/${PKGNAME_NOREV}
@@ -41,23 +42,14 @@ post-extract:
 do-build:
        ${RUN}cd ${WRKSRC} &&                           \
        for FONT in ${FONTS}; do                        \
-         ${ECHO_N} "Compiling font $${FONT} ... ";     \
          bdftopcf $${FONT}.bdf |                       \
                ${GZIP_CMD} -c >$${FONT}.pcf.gz;        \
-         ${ECHO} "done";                               \
        done
 
 do-install:
        ${RUN}for FONT in ${FONTS}; do                  \
-         ${ECHO_N} "Installing font $${FONT} ... ";    \
          ${INSTALL_DATA} ${WRKSRC}/$${FONT}.pcf.gz     \
                ${DESTDIR}${PREFIX}/${FONTDIR};         \
-         ${ECHO} "done";                               \
        done
 
-post-install:
-       ${RUN}${ECHO_N} "Installing font aliases ... "; \
-       ${INSTALL_DATA} ${FILESDIR}/fonts.alias         \
-               ${DESTDIR}${PREFIX}/${FONTDIR};
-
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/leahfonts/PLIST
diff -u pkgsrc/fonts/leahfonts/PLIST:1.1 pkgsrc/fonts/leahfonts/PLIST:1.2
--- pkgsrc/fonts/leahfonts/PLIST:1.1    Sun Oct  1 13:57:49 2023
+++ pkgsrc/fonts/leahfonts/PLIST        Mon May  5 18:37:14 2025
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2023/10/01 13:57:49 vins Exp $
-share/fonts/X11/leahfonts/5x13.pcf.gz
-share/fonts/X11/leahfonts/fonts.alias
-share/fonts/X11/leahfonts/smalltalk10.pcf.gz
-share/fonts/X11/leahfonts/sq.pcf.gz
-share/fonts/X11/leahfonts/sqb.pcf.gz
+@comment $NetBSD: PLIST,v 1.2 2025/05/05 18:37:14 vins Exp $
+share/fonts/X11/PCF/5x13.pcf.gz
+share/fonts/X11/PCF/smalltalk10.pcf.gz
+share/fonts/X11/PCF/sq.pcf.gz
+share/fonts/X11/PCF/sqb.pcf.gz
Index: pkgsrc/fonts/leahfonts/distinfo
diff -u pkgsrc/fonts/leahfonts/distinfo:1.1 pkgsrc/fonts/leahfonts/distinfo:1.2
--- pkgsrc/fonts/leahfonts/distinfo:1.1 Sun Oct  1 13:57:49 2023
+++ pkgsrc/fonts/leahfonts/distinfo     Mon May  5 18:37:14 2025
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.1 2023/10/01 13:57:49 vins Exp $
+$NetBSD: distinfo,v 1.2 2025/05/05 18:37:14 vins Exp $
 
-BLAKE2s (leahfonts-20170708/5x13-master.tar.xz) = 41443c90a806e85a6fcefb6ea23cb82db7c0bc252580fd211885cfba216f8701
-SHA512 (leahfonts-20170708/5x13-master.tar.xz) = 4e4d1e0e9f4a42704ec5cfb9676b32d6865bee68dcd18902640e3bc40763c94ba43300996e18a3c0b4e0266a008c651cfde4757dfb71b614250815ba3e2ec2d2
-Size (leahfonts-20170708/5x13-master.tar.xz) = 3464 bytes
+BLAKE2s (leahfonts-20170708/5x13-master.tar.xz) = 96a7b1d538f67caa706ccbfc0da8bbb07517f59e9bd76a78e608ed0d4a78db76
+SHA512 (leahfonts-20170708/5x13-master.tar.xz) = 861be058a8a44f5d2e13295a5e442fb516afcb7aed6f70104398be218321aaff04623a1dfc7deb0333bd631456f3f2e8e9c7bd5078b952d00ceaf77b5f70f05a
+Size (leahfonts-20170708/5x13-master.tar.xz) = 3472 bytes
 BLAKE2s (leahfonts-20170708/smalltalk10.bdf) = b50f424ba5536d33c3b13080fa808c18a8ebf03f85e1fc59ab0fe5ca0fec5469
 SHA512 (leahfonts-20170708/smalltalk10.bdf) = 12efdb9fbb9722b2e3aeb562a39eb834b986ff93eade45bfc2569788d89c4b0adc62a02fa4cbd5624b222b3cf9dfd394d37094decf1cd9c4403b125a2c6d6e11
 Size (leahfonts-20170708/smalltalk10.bdf) = 10261 bytes
-BLAKE2s (leahfonts-20170708/sq-master.tar.xz) = c94a6229fbd1f2564cbfa4beb87f7bb1afe90ff474ede69c3d3166014781864d
-SHA512 (leahfonts-20170708/sq-master.tar.xz) = 3a187adf3d8a7af2acd7f3e0bf17bf0a57fe1cf543cd2822c5b2d750ab74dc67fda8fc47c00b84fa1c0b1faa9d6881d2663a980791326c4298ecc4dda4f810f0
-Size (leahfonts-20170708/sq-master.tar.xz) = 119068 bytes
+BLAKE2s (leahfonts-20170708/sq-master.tar.xz) = 3db6fef67b0b482c9e0419a87b44254c0b49ca5845df55f9470ae8127da84e09
+SHA512 (leahfonts-20170708/sq-master.tar.xz) = 4ad9bc1a8ed04dc22bfa58f3eff238d3409f5546496fc01da8b1bf5f4881f06ba39905d1c1b3a0882b6b86f587d5f30d6c782941f9535be28d96e5171d065ec1
+Size (leahfonts-20170708/sq-master.tar.xz) = 119076 bytes

Index: pkgsrc/fonts/suxus/Makefile
diff -u pkgsrc/fonts/suxus/Makefile:1.2 pkgsrc/fonts/suxus/Makefile:1.3
--- pkgsrc/fonts/suxus/Makefile:1.2     Thu Aug  1 18:50:46 2024
+++ pkgsrc/fonts/suxus/Makefile Mon May  5 18:37:13 2025
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2024/08/01 18:50:46 vins Exp $
+# $NetBSD: Makefile,v 1.3 2025/05/05 18:37:13 vins Exp $
 
 DISTNAME=      suxus-1.5
+PKGREVISION=   1
 CATEGORIES=    fonts
 MASTER_SITES=  http://oldhome.schmorp.de/marc/data/
 DIST_SUBDIR=   ${PKGNAME_NOREV}
 EXTRACT_SUFX=  .gz
 DISTFILES=     suxus-iso-8859-1.bdf.gz \
-               suxus-iso-8859-15.bdf.gz \
-               fonts.alias
+               suxus-iso-8859-15.bdf.gz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://oldhome.schmorp.de/marc/suxus.html
@@ -20,35 +20,26 @@ USE_TOOLS+= bdftopcf gzip
 NO_CONFIGURE=  yes
 
 FONTS=         suxus-iso-8859-1 suxus-iso-8859-15
-FONTDIR=       share/fonts/X11/${PKGBASE}
+FONTDIR=       share/fonts/X11/PCF
+
 REQD_DIRS=     ${FONTDIR}
 FONTS_DIRS.x11=        ${FONTDIR}
 
 INSTALLATION_DIRS=     ${FONTDIR}
-MESSAGE_SUBST+=                FONTDIR=${FONTDIR:Q}
 
 WRKSRC=                ${WRKDIR}
 
 do-build:
        ${RUN}cd ${WRKSRC} &&                           \
        for FONT in ${FONTS}; do                        \
-         ${ECHO_N} "Compiling font $${FONT} ... ";     \
          bdftopcf $${FONT}.bdf |                       \
                ${GZIP_CMD} -c >$${FONT}.pcf.gz;        \
-         ${ECHO} "done";                               \
        done
 
 do-install:
        ${RUN}for FONT in ${FONTS}; do                  \
-         ${ECHO_N} "Installing font $${FONT} ... ";    \
          ${INSTALL_DATA} ${WRKSRC}/$${FONT}.pcf.gz     \
                ${DESTDIR}${PREFIX}/${FONTDIR};         \
-         ${ECHO} "done";                               \
        done
 
-post-install:
-       ${RUN}${ECHO_N} "Installing font aliases ... "; \
-       ${INSTALL_DATA} ${WRKDIR}/fonts.alias           \
-         ${DESTDIR}${PREFIX}/${FONTDIR};
-
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/suxus/PLIST
diff -u pkgsrc/fonts/suxus/PLIST:1.1 pkgsrc/fonts/suxus/PLIST:1.2
--- pkgsrc/fonts/suxus/PLIST:1.1        Tue Aug 29 05:58:08 2023
+++ pkgsrc/fonts/suxus/PLIST    Mon May  5 18:37:13 2025
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2023/08/29 05:58:08 vins Exp $
-share/fonts/X11/suxus/fonts.alias
-share/fonts/X11/suxus/suxus-iso-8859-1.pcf.gz
-share/fonts/X11/suxus/suxus-iso-8859-15.pcf.gz
+@comment $NetBSD: PLIST,v 1.2 2025/05/05 18:37:13 vins Exp $
+share/fonts/X11/PCF/suxus-iso-8859-1.pcf.gz
+share/fonts/X11/PCF/suxus-iso-8859-15.pcf.gz
Index: pkgsrc/fonts/suxus/distinfo
diff -u pkgsrc/fonts/suxus/distinfo:1.1 pkgsrc/fonts/suxus/distinfo:1.2
--- pkgsrc/fonts/suxus/distinfo:1.1     Tue Aug 29 05:58:08 2023
+++ pkgsrc/fonts/suxus/distinfo Mon May  5 18:37:13 2025
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.1 2023/08/29 05:58:08 vins Exp $
+$NetBSD: distinfo,v 1.2 2025/05/05 18:37:13 vins Exp $
 
-BLAKE2s (suxus-1.5/fonts.alias) = 27fff95ac969a2c90fdc864a75f9f8435513f1f32acf5c40729c9e5dcc7ef45a
-SHA512 (suxus-1.5/fonts.alias) = e7a45df0d0613177c74fc068329b675f2952e1c6b822a86cb01f2f2fefa6420f19a8af35a380bdb5d018d175971b1b9599d480e9e0806a9eae77dab6239a33ae
-Size (suxus-1.5/fonts.alias) = 141 bytes
 BLAKE2s (suxus-1.5/suxus-iso-8859-1.bdf.gz) = 117d597f8e80647f0b310c2e8ec4d225c20d4873b2553047f07414f3b58143f2
 SHA512 (suxus-1.5/suxus-iso-8859-1.bdf.gz) = 5719be36155480913e1f76f3200a5c15786fb3c2f1869263a480aac9194f37637fcee09ae9276918d5a9902e73e145ed4e8824bd40c0198a89c58e06841e8b35
 Size (suxus-1.5/suxus-iso-8859-1.bdf.gz) = 3182 bytes

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/wm/marswm
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/wm/marswm
Indexes:

Home | Main Index | Thread Index | Old Index