kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix botch in last commit.

Browse source
This commit is contained in:
thorpej 2023-01-15 16:04:50 +00:00
parent 20cdead64c
commit 64497de372
3 changed files with 61 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sysutils/cpmtools/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:16:02 joerg Exp $
@comment $NetBSD: PLIST,v 1.3 2023/01/15 16:04:50 thorpej Exp $
bin/cpmchattr
bin/cpmchmod
bin/cpmcp
@ -16,4 +16,5 @@ man/man1/fsck.cpm.1
man/man1/fsed.cpm.1
man/man1/mkfs.cpm.1
man/man5/cpm.5
man/man5/diskdefs.5
share/cpmtools/diskdefs

3
sysutils/cpmtools/distinfo
View file

@ -1,8 +1,9 @@
$NetBSD: distinfo,v 1.8 2023/01/15 15:41:46 thorpej Exp $
$NetBSD: distinfo,v 1.9 2023/01/15 16:04:50 thorpej Exp $
BLAKE2s (cpmtools-2.23.tar.gz) = 831befdbf98cc7037b462374c9e9b2758c7d0b529606a9d8ea24f0eded240e01
SHA512 (cpmtools-2.23.tar.gz) = 14ead54e78ae1d99bad67f665d9c962ea3e928d4147dda41a8620d0f65cca76323768b0006d58b2f1710fbe15d1f8d102c5624b97fd5d441537770d997ea953e
Size (cpmtools-2.23.tar.gz) = 177636 bytes
SHA1 (patch-Makefile.in) = cf8cf19b867941a10a830be74700842b92e50eed
SHA1 (patch-cpmcp.c) = 4a250548df328a187814488616d45292c1c2ef59
SHA1 (patch-cpmfs.c) = ee90077d46db59e8070097db0fc1cb71ea194de7
SHA1 (patch-term_curses.c) = 6e8d760f2de731804093f963134a441a9c195afc

57
sysutils/cpmtools/patches/patch-Makefile.in Normal file
View file

@ -0,0 +1,57 @@
$NetBSD: patch-Makefile.in,v 1.1 2023/01/15 16:04:50 thorpej Exp $
Remove over-aggressive use of DESTDIR. (It's only needed for the non-standard
installation directory.)
--- Makefile.in.orig 2023-01-15 15:58:09.407149245 +0000
+++ Makefile.in 2023-01-15 15:59:54.728007711 +0000
@@ -80,28 +80,28 @@ fsck.test: fsck.cpm
-./fsck.cpm -f pcw -n badfs/label
install: all
- [ -d $(DESTDIR)$(MANDIR)/man1 ] || $(INSTALL) -m 755 -d $(DESTDIR)$(MANDIR)/man1
- [ -d $(DESTDIR)$(MANDIR)/man5 ] || $(INSTALL) -m 755 -d $(DESTDIR)$(MANDIR)/man5
- [ -d $(DESTDIR)$(BINDIR) ] || $(INSTALL) -m 755 -d $(DESTDIR)$(BINDIR)
- $(INSTALL) -s -m 755 cpmls $(DESTDIR)$(BINDIR)/cpmls
- $(INSTALL) -s -m 755 cpmcp $(DESTDIR)$(BINDIR)/cpmcp
- $(INSTALL) -s -m 755 cpmrm $(DESTDIR)$(BINDIR)/cpmrm
- $(INSTALL) -s -m 755 cpmchmod $(DESTDIR)$(BINDIR)/cpmchmod
- $(INSTALL) -s -m 755 cpmchattr $(DESTDIR)$(BINDIR)/cpmchattr
- $(INSTALL) -s -m 755 mkfs.cpm $(DESTDIR)$(BINDIR)/mkfs.cpm
- $(INSTALL) -s -m 755 fsck.cpm $(DESTDIR)$(BINDIR)/fsck.cpm
- [ "$(FSED_CPM)" = '' ] || $(INSTALL) -s -m 755 fsed.cpm $(DESTDIR)$(BINDIR)/fsed.cpm
+ [ -d $(MANDIR)/man1 ] || $(INSTALL) -m 755 -d $(MANDIR)/man1
+ [ -d $(MANDIR)/man5 ] || $(INSTALL) -m 755 -d $(MANDIR)/man5
+ [ -d $(BINDIR) ] || $(INSTALL) -m 755 -d $(BINDIR)
+ $(INSTALL) -s -m 755 cpmls $(BINDIR)/cpmls
+ $(INSTALL) -s -m 755 cpmcp $(BINDIR)/cpmcp
+ $(INSTALL) -s -m 755 cpmrm $(BINDIR)/cpmrm
+ $(INSTALL) -s -m 755 cpmchmod $(BINDIR)/cpmchmod
+ $(INSTALL) -s -m 755 cpmchattr $(BINDIR)/cpmchattr
+ $(INSTALL) -s -m 755 mkfs.cpm $(BINDIR)/mkfs.cpm
+ $(INSTALL) -s -m 755 fsck.cpm $(BINDIR)/fsck.cpm
+ [ "$(FSED_CPM)" = '' ] || $(INSTALL) -s -m 755 fsed.cpm $(BINDIR)/fsed.cpm
$(INSTALL_DATA) diskdefs $(DESTDIR)@datarootdir@/diskdefs
- $(INSTALL_DATA) cpmls.1 $(DESTDIR)$(MANDIR)/man1/cpmls.1
- $(INSTALL_DATA) cpmcp.1 $(DESTDIR)$(MANDIR)/man1/cpmcp.1
- $(INSTALL_DATA) cpmrm.1 $(DESTDIR)$(MANDIR)/man1/cpmrm.1
- $(INSTALL_DATA) cpmchmod.1 $(DESTDIR)$(MANDIR)/man1/cpmchmod.1
- $(INSTALL_DATA) cpmchattr.1 $(DESTDIR)$(MANDIR)/man1/cpmchattr.1
- $(INSTALL_DATA) mkfs.cpm.1 $(DESTDIR)$(MANDIR)/man1/mkfs.cpm.1
- $(INSTALL_DATA) fsck.cpm.1 $(DESTDIR)$(MANDIR)/man1/fsck.cpm.1
- $(INSTALL_DATA) fsed.cpm.1 $(DESTDIR)$(MANDIR)/man1/fsed.cpm.1
- $(INSTALL_DATA) cpm.5 $(DESTDIR)$(MANDIR)/man5/cpm.5
- $(INSTALL_DATA) diskdefs.5 $(DESTDIR)$(MANDIR)/man5/diskdefs.5
+ $(INSTALL_DATA) cpmls.1 $(MANDIR)/man1/cpmls.1
+ $(INSTALL_DATA) cpmcp.1 $(MANDIR)/man1/cpmcp.1
+ $(INSTALL_DATA) cpmrm.1 $(MANDIR)/man1/cpmrm.1
+ $(INSTALL_DATA) cpmchmod.1 $(MANDIR)/man1/cpmchmod.1
+ $(INSTALL_DATA) cpmchattr.1 $(MANDIR)/man1/cpmchattr.1
+ $(INSTALL_DATA) mkfs.cpm.1 $(MANDIR)/man1/mkfs.cpm.1
+ $(INSTALL_DATA) fsck.cpm.1 $(MANDIR)/man1/fsck.cpm.1
+ $(INSTALL_DATA) fsed.cpm.1 $(MANDIR)/man1/fsed.cpm.1
+ $(INSTALL_DATA) cpm.5 $(MANDIR)/man5/cpm.5
+ $(INSTALL_DATA) diskdefs.5 $(MANDIR)/man5/diskdefs.5
clean:
rm -f *$(OBJEXT)