pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/editors/sam sam: Fix build on SunOS.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f72ed64b0a20
branches:  trunk
changeset: 390048:f72ed64b0a20
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Dec 15 12:14:17 2022 +0000

description:
sam: Fix build on SunOS.

diffstat:

 editors/sam/Makefile                   |  17 +----------------
 editors/sam/distinfo                   |   4 ++--
 editors/sam/patches/patch-sam_Makefile |   8 ++++----
 3 files changed, 7 insertions(+), 22 deletions(-)

diffs (69 lines):

diff -r 19b20ff72930 -r f72ed64b0a20 editors/sam/Makefile
--- a/editors/sam/Makefile      Thu Dec 15 12:13:59 2022 +0000
+++ b/editors/sam/Makefile      Thu Dec 15 12:14:17 2022 +0000
@@ -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 @@
 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"
diff -r 19b20ff72930 -r f72ed64b0a20 editors/sam/distinfo
--- a/editors/sam/distinfo      Thu Dec 15 12:13:59 2022 +0000
+++ b/editors/sam/distinfo      Thu Dec 15 12:14:17 2022 +0000
@@ -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-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
diff -r 19b20ff72930 -r f72ed64b0a20 editors/sam/patches/patch-sam_Makefile
--- a/editors/sam/patches/patch-sam_Makefile    Thu Dec 15 12:13:59 2022 +0000
+++ b/editors/sam/patches/patch-sam_Makefile    Thu Dec 15 12:14:17 2022 +0000
@@ -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 @@
 -      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



Home | Main Index | Thread Index | Old Index