pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk mk/fonts.mk: don't add NO_CONFIGURE and NO_BUILD, h...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d514459a0cc0
branches:  trunk
changeset: 441588:d514459a0cc0
user:      maya <maya%pkgsrc.org@localhost>
date:      Fri Nov 06 18:04:24 2020 +0000

description:
mk/fonts.mk: don't add NO_CONFIGURE and NO_BUILD, have packages set it.

This makes it easier to use the mk fragment with fonts that need a build
step, like new liberation-ttf.

While here switch some fonts using post-install unnecessarily to do-install
(Committed at the same time as it wasn't tested separately)

No PLIST changes to the packages/build breakage, so no changes expected
to the packages.

diffstat:

 fonts/UnifrakturMaguntia-ttf/Makefile |  5 ++++-
 fonts/alee-ttf/Makefile               |  5 ++++-
 fonts/cantarell-fonts/Makefile        |  5 ++++-
 fonts/cascadia-ttf/Makefile           |  5 ++++-
 fonts/comic-neue/Makefile             |  5 ++++-
 fonts/culmus/Makefile                 |  5 ++++-
 fonts/cyberbit-ttf/Makefile           |  5 ++++-
 fonts/evermono-ttf/Makefile           |  7 +++++--
 fonts/ibm-plex-otf/Makefile           |  5 ++++-
 fonts/ibm-plex-ttf/Makefile           |  5 ++++-
 fonts/inconsolata-ttf/Makefile        |  5 ++++-
 fonts/koruri-ttf/Makefile             |  5 ++++-
 fonts/linux-libertine-ttf/Makefile    |  5 ++++-
 fonts/montserrat/Makefile             |  7 +++++--
 fonts/ms-ttf/Makefile                 |  5 ++++-
 fonts/overpass/Makefile               |  5 ++++-
 fonts/paratype-ttf/Makefile           |  5 ++++-
 fonts/public-sans/Makefile            |  5 ++++-
 fonts/recursive-ttf/Makefile          |  5 ++++-
 fonts/roboto-fonts/Makefile           |  5 ++++-
 fonts/symbola-ttf/Makefile            |  5 ++++-
 fonts/twemoji-color-font-ttf/Makefile |  5 ++++-
 fonts/ubuntu-fonts/Makefile           |  7 +++++--
 fonts/umefont-ttf/Makefile            |  5 ++++-
 fonts/un-core-ttf/Makefile            |  5 ++++-
 fonts/un-extra-ttf/Makefile           |  5 ++++-
 fonts/uralic-ttf/Makefile             |  5 ++++-
 fonts/urbanrenewal-ttf/Makefile       |  5 ++++-
 fonts/vera-ttf/Makefile               |  5 ++++-
 fonts/vlgothic-ttf/Makefile           |  5 ++++-
 mk/fonts.mk                           |  4 +---
 31 files changed, 124 insertions(+), 36 deletions(-)

diffs (truncated from 582 to 300 lines):

diff -r c1b7beba8166 -r d514459a0cc0 fonts/UnifrakturMaguntia-ttf/Makefile
--- a/fonts/UnifrakturMaguntia-ttf/Makefile     Fri Nov 06 17:48:05 2020 +0000
+++ b/fonts/UnifrakturMaguntia-ttf/Makefile     Fri Nov 06 18:04:24 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/03/20 11:57:38 nia Exp $
+# $NetBSD: Makefile,v 1.4 2020/11/06 18:04:24 maya Exp $
 
 DISTNAME=      UnifrakturMaguntia.2017-03-19
 PKGNAME=       ${DISTNAME:S/-//g:S/./-ttf-0./}
@@ -11,5 +11,8 @@
 COMMENT=       Unicode Fraktur Font
 LICENSE=       ofl-v1.1
 
+NO_CONFIGURE=  yes
+NO_BUILD=      yes
+
 .include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c1b7beba8166 -r d514459a0cc0 fonts/alee-ttf/Makefile
--- a/fonts/alee-ttf/Makefile   Fri Nov 06 17:48:05 2020 +0000
+++ b/fonts/alee-ttf/Makefile   Fri Nov 06 18:04:24 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2020/03/24 14:01:18 nia Exp $
+# $NetBSD: Makefile,v 1.26 2020/11/06 18:04:24 maya Exp $
 
 DISTNAME=      fonts-alee_13.3
 PKGNAME=       ${DISTNAME:S/fonts-alee_/alee-ttf-/1}
@@ -13,5 +13,8 @@
 
 WRKSRC=                ${WRKDIR}/${DISTNAME:S/_/-/g}
 
+NO_CONFIGURE=  yes
+NO_BUILD=      yes
+
 .include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c1b7beba8166 -r d514459a0cc0 fonts/cantarell-fonts/Makefile
--- a/fonts/cantarell-fonts/Makefile    Fri Nov 06 17:48:05 2020 +0000
+++ b/fonts/cantarell-fonts/Makefile    Fri Nov 06 18:04:24 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/03/22 09:48:36 nia Exp $
+# $NetBSD: Makefile,v 1.12 2020/11/06 18:04:24 maya Exp $
 
 DISTNAME=      cantarell-fonts-0.201
 CATEGORIES=    fonts gnome
@@ -10,5 +10,8 @@
 COMMENT=       Contemporary Humanist sans serif font designed for on-screen reading
 LICENSE=       ofl-v1.1
 
+NO_CONFIGURE=  yes
+NO_BUILD=      yes
+
 .include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c1b7beba8166 -r d514459a0cc0 fonts/cascadia-ttf/Makefile
--- a/fonts/cascadia-ttf/Makefile       Fri Nov 06 17:48:05 2020 +0000
+++ b/fonts/cascadia-ttf/Makefile       Fri Nov 06 18:04:24 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/10/08 12:41:10 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2020/11/06 18:04:24 maya Exp $
 
 DISTNAME=      CascadiaCode-2009.22
 PKGNAME=       ${DISTNAME:S/CascadiaCode/cascadia-ttf/}
@@ -15,5 +15,8 @@
 
 WRKSRC=                ${WRKDIR}
 
+NO_CONFIGURE=  yes
+NO_BUILD=      yes
+
 .include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c1b7beba8166 -r d514459a0cc0 fonts/comic-neue/Makefile
--- a/fonts/comic-neue/Makefile Fri Nov 06 17:48:05 2020 +0000
+++ b/fonts/comic-neue/Makefile Fri Nov 06 18:04:24 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/03/05 14:14:27 nia Exp $
+# $NetBSD: Makefile,v 1.2 2020/11/06 18:04:25 maya Exp $
 
 DISTNAME=      comic-neue-2.3
 CATEGORIES=    fonts
@@ -12,6 +12,9 @@
 
 WRKSRC=                ${WRKDIR}
 
+NO_CONFIGURE=  yes
+NO_BUILD=      yes
+
 post-install:
        ${FIND} ${DESTDIR}${PREFIX} -name '.*' -print0 | ${XARGS} -0 rm -f
 
diff -r c1b7beba8166 -r d514459a0cc0 fonts/culmus/Makefile
--- a/fonts/culmus/Makefile     Fri Nov 06 17:48:05 2020 +0000
+++ b/fonts/culmus/Makefile     Fri Nov 06 18:04:24 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2020/11/05 08:31:29 maya Exp $
+# $NetBSD: Makefile,v 1.7 2020/11/06 18:04:25 maya Exp $
 
 DISTNAME=      culmus-0.133
 CATEGORIES=    fonts
@@ -9,5 +9,8 @@
 COMMENT=       Culmus Hebrew fonts
 LICENSE=       gnu-gpl-v2
 
+NO_CONFIGURE=  yes
+NO_BUILD=      yes
+
 .include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c1b7beba8166 -r d514459a0cc0 fonts/cyberbit-ttf/Makefile
--- a/fonts/cyberbit-ttf/Makefile       Fri Nov 06 17:48:05 2020 +0000
+++ b/fonts/cyberbit-ttf/Makefile       Fri Nov 06 18:04:24 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/04/06 08:44:07 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2020/11/06 18:04:25 maya Exp $
 
 PKGNAME=       cyberbit-ttf-2.0
 PKGREVISION=   8
@@ -8,5 +8,8 @@
 
 CONFLICTS=     cyberbase-ttf-[0-9]*
 
+NO_CONFIGURE=  yes
+NO_BUILD=      yes
+
 .include "../../fonts/cyberbit-ttf/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff -r c1b7beba8166 -r d514459a0cc0 fonts/evermono-ttf/Makefile
--- a/fonts/evermono-ttf/Makefile       Fri Nov 06 17:48:05 2020 +0000
+++ b/fonts/evermono-ttf/Makefile       Fri Nov 06 18:04:24 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/04/06 08:46:04 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2020/11/06 18:04:25 maya Exp $
 
 DISTNAME=      evermono
 VERSION=       7.0.0
@@ -17,9 +17,12 @@
 WRKSRC=                ${WRKDIR}/evermono-${VERSION}
 USE_LANGUAGES= # none
 
+NO_CONFIGURE=  yes
+NO_BUILD=      yes
+
 INSTALLATION_DIRS+=    ${FONTDIR} share/doc/evermono-ttf
 
-post-install:
+do-install:
        ${INSTALL_DATA} ${WRKSRC}/emono-licence.txt ${DESTDIR}${PREFIX}/share/doc/evermono-ttf/
 
 .include "../../mk/fonts.mk"
diff -r c1b7beba8166 -r d514459a0cc0 fonts/ibm-plex-otf/Makefile
--- a/fonts/ibm-plex-otf/Makefile       Fri Nov 06 17:48:05 2020 +0000
+++ b/fonts/ibm-plex-otf/Makefile       Fri Nov 06 18:04:24 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/04/28 11:46:29 nikita Exp $
+# $NetBSD: Makefile,v 1.5 2020/11/06 18:04:25 maya Exp $
 
 PKGNAME=       ibm-plex-otf-4.0.2
 GITHUB_PROJECT=        plex
@@ -16,5 +16,8 @@
 
 USE_LANGUAGES= # none
 
+NO_CONFIGURE=  yes
+NO_BUILD=      yes
+
 .include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c1b7beba8166 -r d514459a0cc0 fonts/ibm-plex-ttf/Makefile
--- a/fonts/ibm-plex-ttf/Makefile       Fri Nov 06 17:48:05 2020 +0000
+++ b/fonts/ibm-plex-ttf/Makefile       Fri Nov 06 18:04:24 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/04/28 11:46:29 nikita Exp $
+# $NetBSD: Makefile,v 1.6 2020/11/06 18:04:25 maya Exp $
 
 PKGNAME=       ibm-plex-ttf-4.0.2
 GITHUB_PROJECT=        plex
@@ -16,5 +16,8 @@
 
 USE_LANGUAGES= # none
 
+NO_CONFIGURE=  yes
+NO_BUILD=      yes
+
 .include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c1b7beba8166 -r d514459a0cc0 fonts/inconsolata-ttf/Makefile
--- a/fonts/inconsolata-ttf/Makefile    Fri Nov 06 17:48:05 2020 +0000
+++ b/fonts/inconsolata-ttf/Makefile    Fri Nov 06 18:04:24 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/07/29 08:43:17 nia Exp $
+# $NetBSD: Makefile,v 1.15 2020/11/06 18:04:25 maya Exp $
 
 PKGNAME=       inconsolata-ttf-2.001
 CATEGORIES=    fonts
@@ -25,5 +25,8 @@
        ${CP} ${_DISTDIR}/${file} ${WRKSRC}/${file}
 .endfor
 
+NO_CONFIGURE=  yes
+NO_BUILD=      yes
+
 .include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c1b7beba8166 -r d514459a0cc0 fonts/koruri-ttf/Makefile
--- a/fonts/koruri-ttf/Makefile Fri Nov 06 17:48:05 2020 +0000
+++ b/fonts/koruri-ttf/Makefile Fri Nov 06 18:04:24 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/07/27 15:02:55 nia Exp $
+# $NetBSD: Makefile,v 1.15 2020/11/06 18:04:25 maya Exp $
 
 DISTNAME=      Koruri-${KORURI_VERSION}
 PKGNAME=       koruri-ttf-${KORURI_VERSION}
@@ -17,5 +17,8 @@
 
 USE_LANGUAGES= # none
 
+NO_CONFIGURE=  yes
+NO_BUILD=      yes
+
 .include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c1b7beba8166 -r d514459a0cc0 fonts/linux-libertine-ttf/Makefile
--- a/fonts/linux-libertine-ttf/Makefile        Fri Nov 06 17:48:05 2020 +0000
+++ b/fonts/linux-libertine-ttf/Makefile        Fri Nov 06 18:04:24 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/03/24 14:06:49 nia Exp $
+# $NetBSD: Makefile,v 1.10 2020/11/06 18:04:25 maya Exp $
 
 DISTNAME=      LinLibertineTTF_5.3.0_2012_07_02
 PKGNAME=       ${DISTNAME:S/LinLibertineTTF_/linux-libertine-ttf-/:C/_[^_].*$//}
@@ -13,5 +13,8 @@
 
 WRKSRC=                ${WRKDIR}
 
+NO_CONFIGURE=  yes
+NO_BUILD=      yes
+
 .include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c1b7beba8166 -r d514459a0cc0 fonts/montserrat/Makefile
--- a/fonts/montserrat/Makefile Fri Nov 06 17:48:05 2020 +0000
+++ b/fonts/montserrat/Makefile Fri Nov 06 18:04:24 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/08/06 11:06:42 pin Exp $
+# $NetBSD: Makefile,v 1.2 2020/11/06 18:04:26 maya Exp $
 
 DISTNAME=      Montserrat-7.210
 PKGNAME=       ${DISTNAME:tl}
@@ -16,7 +16,10 @@
 DOCDIR=                        ${PREFIX}/share/doc/${PKGBASE}
 INSTALLATION_DIRS+=    ${DOCDIR}
 
-post-install:
+NO_CONFIGURE=  yes
+NO_BUILD=      yes
+
+do-install:
        ${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${DOCDIR}
 
 .include "../../mk/fonts.mk"
diff -r c1b7beba8166 -r d514459a0cc0 fonts/ms-ttf/Makefile
--- a/fonts/ms-ttf/Makefile     Fri Nov 06 17:48:05 2020 +0000
+++ b/fonts/ms-ttf/Makefile     Fri Nov 06 18:04:24 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2020/03/20 11:57:39 nia Exp $
+# $NetBSD: Makefile,v 1.27 2020/11/06 18:04:26 maya Exp $
 
 DISTNAME=      # empty
 PKGNAME=       ms-ttf-20020306
@@ -26,6 +26,9 @@
 EXTRACT_CMD=   ${LOCALBASE}/bin/cabextract -q $${extract_file}
 DOCDIR=                ${PREFIX}/share/doc/ms-ttf
 
+NO_CONFIGURE=  yes
+NO_BUILD=      yes
+
 INSTALLATION_DIRS+=    ${DOCDIR}
 
 post-extract:
diff -r c1b7beba8166 -r d514459a0cc0 fonts/overpass/Makefile
--- a/fonts/overpass/Makefile   Fri Nov 06 17:48:05 2020 +0000
+++ b/fonts/overpass/Makefile   Fri Nov 06 18:04:24 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/11/05 08:31:29 maya Exp $
+# $NetBSD: Makefile,v 1.6 2020/11/06 18:04:26 maya Exp $
 
 DISTNAME=      Overpass-3.0.4
 CATEGORIES=    fonts
@@ -9,5 +9,8 @@
 COMMENT=       Font family inspired by Highway Gothic
 LICENSE=       ofl-v1.1 AND gnu-lgpl-v2.1
 
+NO_CONFIGURE=  yes
+NO_BUILD=      yes
+
 .include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c1b7beba8166 -r d514459a0cc0 fonts/paratype-ttf/Makefile
--- a/fonts/paratype-ttf/Makefile       Fri Nov 06 17:48:05 2020 +0000



Home | Main Index | Thread Index | Old Index