Edd Barrett wrote (2023-12-06 21:47 CET): > Hi, > > The do-install is the same for all iosevka sub-packages. I wonder why we don't > lift it up into Makefile.inc? > > OK?
That makes sense. OK sdk@ > Index: Makefile.inc > =================================================================== > RCS file: /cvs/ports/fonts/iosevka-fonts/Makefile.inc,v > diff -u -p -r1.7 Makefile.inc > --- Makefile.inc 21 Sep 2023 15:28:05 -0000 1.7 > +++ Makefile.inc 6 Dec 2023 20:39:31 -0000 > @@ -18,3 +18,7 @@ WRKDIST = ${WRKDIR} > PKG_ARCH = * > > FONTDIR = ${PREFIX}/share/fonts/iosevka > + > +do-install: > + ${INSTALL_DATA_DIR} ${FONTDIR} > + ${INSTALL_DATA} ${WRKDIST}/*.ttc ${FONTDIR} > Index: aile/Makefile > =================================================================== > RCS file: /cvs/ports/fonts/iosevka-fonts/aile/Makefile,v > diff -u -p -r1.1 Makefile > --- aile/Makefile 11 Nov 2023 09:02:29 -0000 1.1 > +++ aile/Makefile 6 Dec 2023 20:39:52 -0000 > @@ -2,8 +2,4 @@ COMMENT = slender typeface for code (ai > PKGNAME = iosevka-aile-${V} > DISTFILES = ttc-iosevka-aile-${V}${EXTRACT_SUFX} > > -do-install: > - ${INSTALL_DATA_DIR} ${FONTDIR} > - ${INSTALL_DATA} ${WRKDIST}/*.ttc ${FONTDIR} > - > .include <bsd.port.mk> > Index: default/Makefile > =================================================================== > RCS file: /cvs/ports/fonts/iosevka-fonts/default/Makefile,v > diff -u -p -r1.2 Makefile > --- default/Makefile 11 Mar 2022 19:00:20 -0000 1.2 > +++ default/Makefile 6 Dec 2023 20:39:05 -0000 > @@ -2,8 +2,4 @@ COMMENT = slender typeface for code (de > PKGNAME = iosevka-${V} > DISTFILES = ttc-iosevka-${V}${EXTRACT_SUFX} > > -do-install: > - ${INSTALL_DATA_DIR} ${FONTDIR} > - ${INSTALL_DATA} ${WRKDIST}/*.ttc ${FONTDIR} > - > .include <bsd.port.mk> > Index: etoile/Makefile > =================================================================== > RCS file: /cvs/ports/fonts/iosevka-fonts/etoile/Makefile,v > diff -u -p -r1.1 Makefile > --- etoile/Makefile 2 Nov 2023 17:13:16 -0000 1.1 > +++ etoile/Makefile 6 Dec 2023 20:39:39 -0000 > @@ -2,8 +2,4 @@ COMMENT = slender typeface for code (et > PKGNAME = iosevka-etoile-${V} > DISTFILES = ttc-iosevka-etoile-${V}${EXTRACT_SUFX} > > -do-install: > - ${INSTALL_DATA_DIR} ${FONTDIR} > - ${INSTALL_DATA} ${WRKDIST}/*.ttc ${FONTDIR} > - > .include <bsd.port.mk> > Index: slab/Makefile > =================================================================== > RCS file: /cvs/ports/fonts/iosevka-fonts/slab/Makefile,v > diff -u -p -r1.1 Makefile > --- slab/Makefile 17 Nov 2023 12:28:09 -0000 1.1 > +++ slab/Makefile 6 Dec 2023 20:39:45 -0000 > @@ -3,8 +3,4 @@ PKGNAME = iosevka-slab-${V} > DISTFILES = ttc-iosevka-slab-${V}${EXTRACT_SUFX} > REVISION = 0 > > -do-install: > - ${INSTALL_DATA_DIR} ${FONTDIR} > - ${INSTALL_DATA} ${WRKDIST}/*.ttc ${FONTDIR} > - > .include <bsd.port.mk> > > -- > Best Regards > Edd Barrett > > https://www.theunixzoo.co.uk >