CVS commit: pkgsrc/time/memo

["Pierre Pronchery" <khorben%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   khorben
Date:           Sat Sep 15 15:51:15 UTC 2018

Modified Files:
        pkgsrc/time/memo: Makefile PLIST

Log Message:
Simplify the package

This removes the need for AUTO_MKDIRS and bsd.prefs.mk. It also
leverages ${INSTALL_SCRIPT}, ${INSTALL_MAN_DIR}, ${INSTALL_MAN} and
${INSTALL_DATA} instead of just ${INSTALL}.

No change to PKGREVISION as the final binary should be identical.

With suggestions from leot@, thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/time/memo/Makefile pkgsrc/time/memo/PLIST

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

Modified files:

Index: pkgsrc/time/memo/Makefile
diff -u pkgsrc/time/memo/Makefile:1.1 pkgsrc/time/memo/Makefile:1.2
--- pkgsrc/time/memo/Makefile:1.1       Sat Sep 15 15:14:26 2018
+++ pkgsrc/time/memo/Makefile   Sat Sep 15 15:51:14 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/09/15 15:14:26 khorben Exp $
+# $NetBSD: Makefile,v 1.2 2018/09/15 15:51:14 khorben Exp $
 
 GITHUB_PROJECT=        memo
 DISTNAME=      0.6
@@ -19,18 +19,17 @@ DEPENDS+=   bash-[0-9]*:../../shells/bash
 DEPENDS+=      git-base-[0-9]*:../../devel/git-base
 
 NO_BUILD=      yes
-AUTO_MKDIRS=   yes
+INSTALLATION_DIRS=     bin share/doc/memo
 
 REPLACE_INTERPRETER+=  envbash
 REPLACE.envbash.old=   '/bin/bash'
 REPLACE.envbash.new=   ${PREFIX}/bin/bash
 REPLACE_FILES.envbash= memo
 
-.include "../../mk/bsd.prefs.mk"
-
 do-install:
-       ${INSTALL} -m 0755 ${WRKSRC}/memo ${DESTDIR}${PREFIX}/bin/memo
-       ${INSTALL} -m 0644 ${WRKSRC}/doc/memo.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/memo.1
-       ${INSTALL} -m 0644 ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/memo/README.md
+       ${INSTALL_SCRIPT} ${WRKSRC}/memo ${DESTDIR}${PREFIX}/bin/memo
+       ${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_MAN} ${WRKSRC}/doc/memo.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/memo.1
+       ${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/memo/README.md
 
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/time/memo/PLIST
diff -u pkgsrc/time/memo/PLIST:1.1 pkgsrc/time/memo/PLIST:1.2
--- pkgsrc/time/memo/PLIST:1.1  Sat Sep 15 15:14:26 2018
+++ pkgsrc/time/memo/PLIST      Sat Sep 15 15:51:14 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2018/09/15 15:14:26 khorben Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/09/15 15:51:14 khorben Exp $
 bin/memo
 man/man1/memo.1
 share/doc/memo/README.md