pkgsrc-WIP-changes archive

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

bdf2psf: various tweaks pointed out by kamil@.



Module Name:	pkgsrc-wip
Committed By:	Frederic Cambus <fred%statdns.com@localhost>
Pushed By:	fcambus
Date:		Fri Aug 16 15:52:41 2019 +0200
Changeset:	d9f2f40230dd3f52a73bdce7d31349badd671ae7

Modified Files:
	bdf2psf/Makefile

Log Message:
bdf2psf: various tweaks pointed out by kamil@.

- Use ${PKGVERSION_NOREV} in WRKSRC
- Remove AUTO_MKDIRS directive
- Remove ${RUN} and use ${PKGBASE} in the do-install target

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

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

diffstat:
 bdf2psf/Makefile | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diffs:
diff --git a/bdf2psf/Makefile b/bdf2psf/Makefile
index aca3b6e0b5..7bd958b441 100644
--- a/bdf2psf/Makefile
+++ b/bdf2psf/Makefile
@@ -11,24 +11,23 @@ HOMEPAGE=	https://packages.debian.org/sid/bdf2psf
 COMMENT=	Convert a BDF font to PSF format for the Linux console
 LICENSE=	gnu-gpl-v2
 
-WRKSRC=		${WRKDIR}/console-setup-${PKGVERSION}
+WRKSRC=		${WRKDIR}/console-setup-${PKGVERSION_NOREV}
 
 NO_BUILD=	yes
 
-REPLACE_PERL=	Fonts/bdf2psf
+REPLACE_PERL+=	Fonts/${PKGBASE}
 
 SHAREDIR=	${PREFIX}/share/${PKGBASE}
 
-AUTO_MKDIRS=		yes
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1 ${SHAREDIR}/fontsets
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/Fonts/bdf2psf ${DESTDIR}${PREFIX}/bin
-	${RUN}${INSTALL_MAN} ${WRKSRC}/man/bdf2psf.1 \
+	${INSTALL_SCRIPT} ${WRKSRC}/Fonts/${PKGBASE} ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/${PKGBASE}.1 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${RUN}${INSTALL_DATA} ${WRKSRC}/Fonts/standard.equivalents \
+	${INSTALL_DATA} ${WRKSRC}/Fonts/standard.equivalents \
 		${DESTDIR}${SHAREDIR}
-	${RUN}${INSTALL_DATA} ${WRKSRC}/Fonts/fontsets/* \
+	${INSTALL_DATA} ${WRKSRC}/Fonts/fontsets/* \
 		${DESTDIR}${SHAREDIR}/fontsets
 
 .include "../../mk/bsd.pkg.mk"


Home | Main Index | Thread Index | Old Index