Thu Dec 15 12:14:17 2022 UTC ()
sam: Fix build on SunOS.


(jperkin)
diff -r1.45 -r1.46 pkgsrc/editors/sam/Makefile
diff -r1.10 -r1.11 pkgsrc/editors/sam/distinfo
diff -r1.1 -r1.2 pkgsrc/editors/sam/patches/patch-sam_Makefile
cvs diff -r1.45 -r1.46 pkgsrc/editors/sam/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/sam/Makefile 2021/04/21 08:04:13 1.45
+++ pkgsrc/editors/sam/Makefile 2022/12/15 12:14:17 1.46
@@ -1,44 +1,29 @@ @@ -1,44 +1,29 @@
1# $NetBSD: Makefile,v 1.45 2021/04/21 08:04:13 wiz Exp $ 1# $NetBSD: Makefile,v 1.46 2022/12/15 12:14:17 jperkin Exp $
2 2
3DISTNAME= sam 3DISTNAME= sam
4PKGNAME= sam-4.3 4PKGNAME= sam-4.3
5PKGREVISION= 4 5PKGREVISION= 4
6CATEGORIES= editors plan9 6CATEGORIES= editors plan9
7MASTER_SITES= # ftp://ftp.ecf.toronto.edu/pub/plan9/matty/ 7MASTER_SITES= # ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
8EXTRACT_SUFX= .msg.gz 8EXTRACT_SUFX= .msg.gz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11COMMENT= Unix version of Rob Pike's editor for plan9 11COMMENT= Unix version of Rob Pike's editor for plan9
12 12
13DEPENDS+= libXgFonts>=1.0nb1:../../fonts/Xg 13DEPENDS+= libXgFonts>=1.0nb1:../../fonts/Xg
14 14
15MAKE_JOBS_SAFE= no 15MAKE_JOBS_SAFE= no
16 16
17WRKSRC= ${WRKDIR} 17WRKSRC= ${WRKDIR}
18EXTRACT_CMD= ${GZCAT} $$extract_file | ${SH} 18EXTRACT_CMD= ${GZCAT} $$extract_file | ${SH}
19 19
20MANCOMPRESSED= yes 20MANCOMPRESSED= yes
21 21
22INSTALLATION_DIRS= bin include lib/X11/app-defaults \ 22INSTALLATION_DIRS= bin include lib/X11/app-defaults \
23 ${PKGMANDIR}/man1 ${PKGMANDIR}/man3 ${PKGMANDIR}/man4 ${PKGMANDIR}/man6 23 ${PKGMANDIR}/man1 ${PKGMANDIR}/man3 ${PKGMANDIR}/man4 ${PKGMANDIR}/man6
24 24
25INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX} \ 25INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX} \
26 MAN=${PKGMANDIR} 26 MAN=${PKGMANDIR}
27 27
28.include "../../mk/bsd.prefs.mk" 
29 
30.if ${OPSYS} == "SunOS" 
31 
32. if ${X11BASE} != "/usr/openwin" 
33OTHER_X_LIBS= -lSM -lICE 
34. endif 
35 
36do-build: 
37 for d in libXg libframe sam samterm; do \ 
38 (cd ${WRKSRC}/$$d; ${MAKE_PROGRAM} -f Make.solaris \ 
39 OTHER_X_LIBS="${OTHER_X_LIBS}"); \ 
40 done 
41.endif # SunOS 
42 
43.include "../../x11/libXt/buildlink3.mk" 28.include "../../x11/libXt/buildlink3.mk"
44.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.11 pkgsrc/editors/sam/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/sam/distinfo 2021/10/26 10:21:39 1.10
+++ pkgsrc/editors/sam/distinfo 2022/12/15 12:14:17 1.11
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.10 2021/10/26 10:21:39 nia Exp $ 1$NetBSD: distinfo,v 1.11 2022/12/15 12:14:17 jperkin Exp $
2 2
3BLAKE2s (sam.msg.gz) = b56e3f9fcf66f569e2cf6bd3fa03609dddc459fcec6964298e3fcf4072dd2957 3BLAKE2s (sam.msg.gz) = b56e3f9fcf66f569e2cf6bd3fa03609dddc459fcec6964298e3fcf4072dd2957
4SHA512 (sam.msg.gz) = 279e9854a2177330fcb80a5ad2751b01629b35d33c759e9f2d707450753c4b5c6c3ec07cbbe4e01f1b9c43e167570e88de4f9f403f9c0fe58f360db99f40e666 4SHA512 (sam.msg.gz) = 279e9854a2177330fcb80a5ad2751b01629b35d33c759e9f2d707450753c4b5c6c3ec07cbbe4e01f1b9c43e167570e88de4f9f403f9c0fe58f360db99f40e666
5Size (sam.msg.gz) = 246311 bytes 5Size (sam.msg.gz) = 246311 bytes
6SHA1 (patch-aa) = cbc293b98847bc36d87a780cda487e88096a2dc4 6SHA1 (patch-aa) = cbc293b98847bc36d87a780cda487e88096a2dc4
7SHA1 (patch-ab) = 76fa25ab4737f925eefe2e3876d862e7814d3d31 7SHA1 (patch-ab) = 76fa25ab4737f925eefe2e3876d862e7814d3d31
8SHA1 (patch-ae) = b95056d090d73ffa8920669027b43d16d6cf81f5 8SHA1 (patch-ae) = b95056d090d73ffa8920669027b43d16d6cf81f5
9SHA1 (patch-af) = 9afde00ab2b86519dcf558c0e1e2232b3839b579 9SHA1 (patch-af) = 9afde00ab2b86519dcf558c0e1e2232b3839b579
10SHA1 (patch-ah) = 0126f1eee5bbcf59e3e08063d2cddffba83dc94b 10SHA1 (patch-ah) = 0126f1eee5bbcf59e3e08063d2cddffba83dc94b
11SHA1 (patch-ai) = ca76a0c22c4e962ec590e9aeff719c71bd6fdafc 11SHA1 (patch-ai) = ca76a0c22c4e962ec590e9aeff719c71bd6fdafc
12SHA1 (patch-aj) = 1f6270f7893fce0d1b213fcaa4b91c6c3e82c833 12SHA1 (patch-aj) = 1f6270f7893fce0d1b213fcaa4b91c6c3e82c833
13SHA1 (patch-ak) = 80f9399d23fb615da4d98488e93a58a101e57e4c 13SHA1 (patch-ak) = 80f9399d23fb615da4d98488e93a58a101e57e4c
14SHA1 (patch-include_libg.h) = eaa8b3831d44b5d96d2b1154d201576878ee8d81 14SHA1 (patch-include_libg.h) = eaa8b3831d44b5d96d2b1154d201576878ee8d81
15SHA1 (patch-sam_B.rc) = e6d774d230656bb6ae9800e35fe20c2760e8380e 15SHA1 (patch-sam_B.rc) = e6d774d230656bb6ae9800e35fe20c2760e8380e
16SHA1 (patch-sam_Makefile) = 378874943b4719cb434de56d4f5aa665c66121d1 16SHA1 (patch-sam_Makefile) = 31c5a78be30dc5557211f19d30ec85212b61b7fc
17SHA1 (patch-sam_io.c) = e7ca3a59b5a493db55397655aa1db5c3ac65c508 17SHA1 (patch-sam_io.c) = e7ca3a59b5a493db55397655aa1db5c3ac65c508
18SHA1 (patch-samterm_Makefile) = 6772ee78eb2e5512c2002b86a851a6e71bdbdaef 18SHA1 (patch-samterm_Makefile) = 6772ee78eb2e5512c2002b86a851a6e71bdbdaef
cvs diff -r1.1 -r1.2 pkgsrc/editors/sam/patches/patch-sam_Makefile (expand / switch to unified diff)

--- pkgsrc/editors/sam/patches/patch-sam_Makefile 2017/09/21 14:37:40 1.1
+++ pkgsrc/editors/sam/patches/patch-sam_Makefile 2022/12/15 12:14:17 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-sam_Makefile,v 1.1 2017/09/21 14:37:40 bsiegert Exp $ 1$NetBSD: patch-sam_Makefile,v 1.2 2022/12/15 12:14:17 jperkin Exp $
2 2
3--- sam/Makefile.orig 2017-09-21 13:54:42.000000000 +0000 3--- sam/Makefile.orig 2017-09-21 13:54:42.000000000 +0000
4+++ sam/Makefile 4+++ sam/Makefile
5@@ -1,18 +1,17 @@ 5@@ -1,18 +1,17 @@
6 # Copyright (c) 1992 AT&T - All rights reserved. 6 # Copyright (c) 1992 AT&T - All rights reserved.
7 # 7 #
8-# Prototype Makefile for sam 8-# Prototype Makefile for sam
9+# Prototype BSDi Makefile for sam 9+# Prototype BSDi Makefile for sam
10+# Courtesy of Boyd Roberts 10+# Courtesy of Boyd Roberts
11+# 11+#
12+# Define operating system type: -DBSDi 12+# Define operating system type: -DBSDi
13 # 13 #
14-# define operating system. ONE of: 14-# define operating system. ONE of:
@@ -50,20 +50,20 @@ $NetBSD: patch-sam_Makefile,v 1.1 2017/0 @@ -50,20 +50,20 @@ $NetBSD: patch-sam_Makefile,v 1.1 2017/0
50 RXNAME=rsh 50 RXNAME=rsh
51-RXPATHNAME=/usr/bsd/rsh 51-RXPATHNAME=/usr/bsd/rsh
52+RXPATHNAME=/usr/bin/rsh 52+RXPATHNAME=/usr/bin/rsh
53  53
54 SAMSAVE=/bin/sh\\n$(SAMSAVEDIR)/samsave 54 SAMSAVE=/bin/sh\\n$(SAMSAVEDIR)/samsave
55  55
56@@ -68,9 +67,10 @@ nuke: clean 56@@ -68,9 +67,10 @@ nuke: clean
57 rm -f sam 57 rm -f sam
58  58
59 install: sam 59 install: sam
60- cp sam $(SAMDIR)/$(RSAMNAME) 60- cp sam $(SAMDIR)/$(RSAMNAME)
61- cp samsave $(SAMSAVEDIR)/samsave 61- cp samsave $(SAMSAVEDIR)/samsave
62- chmod +x samsave 62- chmod +x samsave
63+ $(INSTALL) -c sam $(SAMDIR)/$(RSAMNAME) 63+ $(BSD_INSTALL) -c sam $(SAMDIR)/$(RSAMNAME)
64+ $(INSTALL) -c samsave $(SAMSAVEDIR)/samsave 64+ $(BSD_INSTALL) -c samsave $(SAMSAVEDIR)/samsave
65+ $(INSTALL) -c B.sh $(SAMDIR)/B 65+ $(BSD_INSTALL) -c B.sh $(SAMDIR)/B
66+ chmod +x $(SAMSAVEDIR)/samsave 66+ chmod +x $(SAMSAVEDIR)/samsave
67  67
68 $(OBJ): sam.h ../include/u.h ../include/libc.h errors.h mesg.h 68 $(OBJ): sam.h ../include/u.h ../include/libc.h errors.h mesg.h
69  69