Received: by mail.netbsd.org (Postfix, from userid 605) id 7F35C84EC6; Thu, 15 Dec 2022 12:14:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id AF64D84E55 for ; Thu, 15 Dec 2022 12:14:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 6sfvxfbF4aB3 for ; Thu, 15 Dec 2022 12:14:18 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 1696184D35 for ; Thu, 15 Dec 2022 12:14:18 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 0E0C8FA90; Thu, 15 Dec 2022 12:14:18 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_16711064581310" MIME-Version: 1.0 Date: Thu, 15 Dec 2022 12:14:18 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/editors/sam To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20221215121418.0E0C8FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_16711064581310 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Thu Dec 15 12:14:17 UTC 2022 Modified Files: pkgsrc/editors/sam: Makefile distinfo pkgsrc/editors/sam/patches: patch-sam_Makefile Log Message: sam: Fix build on SunOS. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 pkgsrc/editors/sam/Makefile cvs rdiff -u -r1.10 -r1.11 pkgsrc/editors/sam/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/sam/patches/patch-sam_Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_16711064581310 Content-Disposition: inline Content-Length: 3145 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/editors/sam/Makefile diff -u pkgsrc/editors/sam/Makefile:1.45 pkgsrc/editors/sam/Makefile:1.46 --- pkgsrc/editors/sam/Makefile:1.45 Wed Apr 21 08:04:13 2021 +++ pkgsrc/editors/sam/Makefile Thu Dec 15 12:14:17 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2021/04/21 08:04:13 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2022/12/15 12:14:17 jperkin Exp $ DISTNAME= sam PKGNAME= sam-4.3 @@ -25,20 +25,5 @@ INSTALLATION_DIRS= bin include lib/X11/a INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX} \ MAN=${PKGMANDIR} -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" - -. if ${X11BASE} != "/usr/openwin" -OTHER_X_LIBS= -lSM -lICE -. endif - -do-build: - for d in libXg libframe sam samterm; do \ - (cd ${WRKSRC}/$$d; ${MAKE_PROGRAM} -f Make.solaris \ - OTHER_X_LIBS="${OTHER_X_LIBS}"); \ - done -.endif # SunOS - .include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/editors/sam/distinfo diff -u pkgsrc/editors/sam/distinfo:1.10 pkgsrc/editors/sam/distinfo:1.11 --- pkgsrc/editors/sam/distinfo:1.10 Tue Oct 26 10:21:39 2021 +++ pkgsrc/editors/sam/distinfo Thu Dec 15 12:14:17 2022 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2021/10/26 10:21:39 nia Exp $ +$NetBSD: distinfo,v 1.11 2022/12/15 12:14:17 jperkin Exp $ BLAKE2s (sam.msg.gz) = b56e3f9fcf66f569e2cf6bd3fa03609dddc459fcec6964298e3fcf4072dd2957 SHA512 (sam.msg.gz) = 279e9854a2177330fcb80a5ad2751b01629b35d33c759e9f2d707450753c4b5c6c3ec07cbbe4e01f1b9c43e167570e88de4f9f403f9c0fe58f360db99f40e666 @@ -13,6 +13,6 @@ SHA1 (patch-aj) = 1f6270f7893fce0d1b213f SHA1 (patch-ak) = 80f9399d23fb615da4d98488e93a58a101e57e4c SHA1 (patch-include_libg.h) = eaa8b3831d44b5d96d2b1154d201576878ee8d81 SHA1 (patch-sam_B.rc) = e6d774d230656bb6ae9800e35fe20c2760e8380e -SHA1 (patch-sam_Makefile) = 378874943b4719cb434de56d4f5aa665c66121d1 +SHA1 (patch-sam_Makefile) = 31c5a78be30dc5557211f19d30ec85212b61b7fc SHA1 (patch-sam_io.c) = e7ca3a59b5a493db55397655aa1db5c3ac65c508 SHA1 (patch-samterm_Makefile) = 6772ee78eb2e5512c2002b86a851a6e71bdbdaef Index: pkgsrc/editors/sam/patches/patch-sam_Makefile diff -u pkgsrc/editors/sam/patches/patch-sam_Makefile:1.1 pkgsrc/editors/sam/patches/patch-sam_Makefile:1.2 --- pkgsrc/editors/sam/patches/patch-sam_Makefile:1.1 Thu Sep 21 14:37:40 2017 +++ pkgsrc/editors/sam/patches/patch-sam_Makefile Thu Dec 15 12:14:17 2022 @@ -1,4 +1,4 @@ -$NetBSD: patch-sam_Makefile,v 1.1 2017/09/21 14:37:40 bsiegert Exp $ +$NetBSD: patch-sam_Makefile,v 1.2 2022/12/15 12:14:17 jperkin Exp $ --- sam/Makefile.orig 2017-09-21 13:54:42.000000000 +0000 +++ sam/Makefile @@ -60,9 +60,9 @@ $NetBSD: patch-sam_Makefile,v 1.1 2017/0 - cp sam $(SAMDIR)/$(RSAMNAME) - cp samsave $(SAMSAVEDIR)/samsave - chmod +x samsave -+ $(INSTALL) -c sam $(SAMDIR)/$(RSAMNAME) -+ $(INSTALL) -c samsave $(SAMSAVEDIR)/samsave -+ $(INSTALL) -c B.sh $(SAMDIR)/B ++ $(BSD_INSTALL) -c sam $(SAMDIR)/$(RSAMNAME) ++ $(BSD_INSTALL) -c samsave $(SAMSAVEDIR)/samsave ++ $(BSD_INSTALL) -c B.sh $(SAMDIR)/B + chmod +x $(SAMSAVEDIR)/samsave $(OBJ): sam.h ../include/u.h ../include/libc.h errors.h mesg.h --_----------=_16711064581310--