pkgsrc-WIP-changes archive

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

montserrat: use mk/fonts.mk framework



Module Name:	pkgsrc-wip
Committed By:	pin <voidpin%protonmail.com@localhost>
Pushed By:	pin
Date:		Thu Aug 6 10:52:53 2020 +0200
Changeset:	adc138f1cd3e9f997ef57a64f9334f49e4291e8d

Modified Files:
	montserrat/Makefile
	montserrat/PLIST

Log Message:
montserrat: use mk/fonts.mk framework

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=adc138f1cd3e9f997ef57a64f9334f49e4291e8d

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

diffstat:
 montserrat/Makefile | 17 ++++-------------
 montserrat/PLIST    | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 13 deletions(-)

diffs:
diff --git a/montserrat/Makefile b/montserrat/Makefile
index 5ab01bb8b0..83ee7dfb74 100644
--- a/montserrat/Makefile
+++ b/montserrat/Makefile
@@ -12,22 +12,13 @@ COMMENT=	Geometric sans-serif typeface font by Julieta Ulanovsky
 LICENSE=	ofl-v1.1
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
-USE_LANGUAGES=	# none
-NO_BUILD=	yes
-NO_CONFIGURE=	yes
 
-DOCDIR=		${PREFIX}/share/doc/${PKGBASE}
-FONTDIR=	${PREFIX}/share/fonts/X11/TTF
-FONTS_DIRS.ttf=	${FONTDIR}
-
-INSTALLATION_DIRS=	${DOCDIR} ${FONTDIR}
+.include "../../mk/fonts.mk"
 
-do-install:
-	set -e; \
-	cd ${WRKSRC}/fonts/ttf && for f in *.ttf ; do \
-		${INSTALL_DATA} $$f ${DESTDIR}${FONTDIR}/$$f ; \
-	done
+DOCDIR=		${PREFIX}/share/doc/${PKGBASE}
+INSTALLATION_DIRS+= ${DOCDIR}
 
+post-install:
 	${INSTALL_DATA} ${WRKSRC}/AUTHORS.txt ${WRKSRC}/CONTRIBUTORS.txt \
 		${WRKSRC}/OFL.txt ${WRKSRC}/README.md \
 		${DESTDIR}${DOCDIR}
diff --git a/montserrat/PLIST b/montserrat/PLIST
index c32ef3c74a..3eb15942ab 100644
--- a/montserrat/PLIST
+++ b/montserrat/PLIST
@@ -3,6 +3,42 @@ share/doc/montserrat/AUTHORS.txt
 share/doc/montserrat/CONTRIBUTORS.txt
 share/doc/montserrat/OFL.txt
 share/doc/montserrat/README.md
+share/fonts/X11/OTF/Montserrat-Black.otf
+share/fonts/X11/OTF/Montserrat-BlackItalic.otf
+share/fonts/X11/OTF/Montserrat-Bold.otf
+share/fonts/X11/OTF/Montserrat-BoldItalic.otf
+share/fonts/X11/OTF/Montserrat-ExtraBold.otf
+share/fonts/X11/OTF/Montserrat-ExtraBoldItalic.otf
+share/fonts/X11/OTF/Montserrat-ExtraLight.otf
+share/fonts/X11/OTF/Montserrat-ExtraLightItalic.otf
+share/fonts/X11/OTF/Montserrat-Italic.otf
+share/fonts/X11/OTF/Montserrat-Light.otf
+share/fonts/X11/OTF/Montserrat-LightItalic.otf
+share/fonts/X11/OTF/Montserrat-Medium.otf
+share/fonts/X11/OTF/Montserrat-MediumItalic.otf
+share/fonts/X11/OTF/Montserrat-Regular.otf
+share/fonts/X11/OTF/Montserrat-SemiBold.otf
+share/fonts/X11/OTF/Montserrat-SemiBoldItalic.otf
+share/fonts/X11/OTF/Montserrat-Thin.otf
+share/fonts/X11/OTF/Montserrat-ThinItalic.otf
+share/fonts/X11/OTF/MontserratAlternates-Black.otf
+share/fonts/X11/OTF/MontserratAlternates-BlackItalic.otf
+share/fonts/X11/OTF/MontserratAlternates-Bold.otf
+share/fonts/X11/OTF/MontserratAlternates-BoldItalic.otf
+share/fonts/X11/OTF/MontserratAlternates-ExtraBold.otf
+share/fonts/X11/OTF/MontserratAlternates-ExtraBoldItalic.otf
+share/fonts/X11/OTF/MontserratAlternates-ExtraLight.otf
+share/fonts/X11/OTF/MontserratAlternates-ExtraLightItalic.otf
+share/fonts/X11/OTF/MontserratAlternates-Italic.otf
+share/fonts/X11/OTF/MontserratAlternates-Light.otf
+share/fonts/X11/OTF/MontserratAlternates-LightItalic.otf
+share/fonts/X11/OTF/MontserratAlternates-Medium.otf
+share/fonts/X11/OTF/MontserratAlternates-MediumItalic.otf
+share/fonts/X11/OTF/MontserratAlternates-Regular.otf
+share/fonts/X11/OTF/MontserratAlternates-SemiBold.otf
+share/fonts/X11/OTF/MontserratAlternates-SemiBoldItalic.otf
+share/fonts/X11/OTF/MontserratAlternates-Thin.otf
+share/fonts/X11/OTF/MontserratAlternates-ThinItalic.otf
 share/fonts/X11/TTF/Montserrat-Black.ttf
 share/fonts/X11/TTF/Montserrat-BlackItalic.ttf
 share/fonts/X11/TTF/Montserrat-Bold.ttf


Home | Main Index | Thread Index | Old Index