Fri Jan 8 19:19:55 2021 UTC ()
nono: Restore patches to fix install
The patches were accidentally removed from distinfo during the last update.
(ryoon)
diff -r1.2 -r1.3 pkgsrc/emulators/nono/distinfo
diff -r0 -r1.3 pkgsrc/emulators/nono/patches/patch-cli_Makefile
diff -r0 -r1.3 pkgsrc/emulators/nono/patches/patch-po_Makefile
diff -r0 -r1.3 pkgsrc/emulators/nono/patches/patch-wx_Makefile.in
--- pkgsrc/emulators/nono/distinfo 2021/01/05 18:47:24 1.2
+++ pkgsrc/emulators/nono/distinfo 2021/01/08 19:19:54 1.3
| @@ -1,6 +1,9 @@ | | | @@ -1,6 +1,9 @@ |
| 1 | $NetBSD: distinfo,v 1.2 2021/01/05 18:47:24 ryoon Exp $ | | 1 | $NetBSD: distinfo,v 1.3 2021/01/08 19:19:54 ryoon Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (nono-0.1.5.tar.gz) = 42339b97b62a3bdc9858560db5cc378277646397 | | 3 | SHA1 (nono-0.1.5.tar.gz) = 42339b97b62a3bdc9858560db5cc378277646397 |
| 4 | RMD160 (nono-0.1.5.tar.gz) = 8188533f2b430d7d78f8f0f222303f0ae442e7c2 | | 4 | RMD160 (nono-0.1.5.tar.gz) = 8188533f2b430d7d78f8f0f222303f0ae442e7c2 |
| 5 | SHA512 (nono-0.1.5.tar.gz) = 94c5dc660cbee150382f5a54e8b168c79d4ec817b8b94f537eb02dd5cfaa7af51a673f8b8292e54afbc8c04d9c0bfddf76ea7d06f7cbf6ebde3b7004a9e77aad | | 5 | SHA512 (nono-0.1.5.tar.gz) = 94c5dc660cbee150382f5a54e8b168c79d4ec817b8b94f537eb02dd5cfaa7af51a673f8b8292e54afbc8c04d9c0bfddf76ea7d06f7cbf6ebde3b7004a9e77aad |
| 6 | Size (nono-0.1.5.tar.gz) = 2403971 bytes | | 6 | Size (nono-0.1.5.tar.gz) = 2403971 bytes |
| | | 7 | SHA1 (patch-cli_Makefile) = a9597bc1c8c5376ea78c35415abae4bab7c086f3 |
| | | 8 | SHA1 (patch-po_Makefile) = 76a7d30858d1afd27fcfed512f00bfb4b9dd0f13 |
| | | 9 | SHA1 (patch-wx_Makefile.in) = 982a4cff11d453bdb7924d05c81173b7c43ad010 |
$NetBSD: patch-cli_Makefile,v 1.3 2021/01/08 19:19:54 ryoon Exp $
* Fix non-root installation with pkgsrc-specific macro.
--- cli/Makefile.orig 2020-11-20 12:50:31.000000000 +0000
+++ cli/Makefile
@@ -24,6 +24,6 @@ nono-cli: ${MYLIBS} ${OBJS}
install: nono-cli
${INSTALL} -d ${DESTDIR}${BINDIR}
- ${INSTALL} -m 755 -o 0 -g 0 nono-cli ${DESTDIR}${BINDIR}
+ ${BSD_INSTALL_PROGRAM} nono-cli ${DESTDIR}${BINDIR}
.include "../Makefile.rule"
$NetBSD: patch-po_Makefile,v 1.3 2021/01/08 19:19:54 ryoon Exp $
* Fix non-root installation with pkgsrc-specific macro.
--- po/Makefile.orig 2020-11-20 12:50:31.000000000 +0000
+++ po/Makefile
@@ -21,7 +21,7 @@ CAT= LC_MESSAGES
install: ${TARGETS}
.for L in ${LANGUAGES}
${INSTALL} -d ${DESTDIR}${LOCALEDIR}/${L}/${CAT}
- ${INSTALL} -m 644 -o 0 -g 0 ${L}/nono.mo ${DESTDIR}${LOCALEDIR}/${L}/${CAT}
+ ${BSD_INSTALL_DATA} ${L}/nono.mo ${DESTDIR}${LOCALEDIR}/${L}/${CAT}
.endfor
depend:
$NetBSD: patch-wx_Makefile.in,v 1.3 2021/01/08 19:19:54 ryoon Exp $
* Fix non-root installation with pkgsrc-specific macro.
--- wx/Makefile.in.orig 2020-11-20 12:50:31.000000000 +0000
+++ wx/Makefile.in
@@ -48,7 +48,7 @@ nono: ${MYLIBS} ${OBJS}
install: nono
${INSTALL} -d ${DESTDIR}${BINDIR}
- ${INSTALL} -m 755 -o 0 -g 0 nono ${DESTDIR}${BINDIR}
+ ${BSD_INSTALL_PROGRAM} nono ${DESTDIR}${BINDIR}
# make pot はトップディレクトリで行う必要がある (実行した位置からの相対パスが
# ファイルにコメントで残されるため、毎回違うと diff が出てしまう)。