CVS commit: pkgsrc/devel/smake

["Michael Baeuerle" <micha%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   micha
Date:           Fri Sep 30 15:27:14 UTC 2022

Modified Files:
        pkgsrc/devel/smake: Makefile Makefile.common distinfo

Log Message:
devel/smake: Update to 1.6nb2

Makefile.common:
- Declare WRKSRC for schilytools releases from Codeberg
- Declare MAKE_JOBS_SAFE=no (smake ignores -j option).
- Force link mode to static (on all operating systems).
  Required to get same behaviour as before on FreeBSD.

Bump PKGREVISION.

Changelog from AN-2022-09-18:
With great sadness we report the death of schilytools main author and
long time maintainer Jörg Schilling (1955-03-27--2021-10-10).  Jörg, we
miss you!  After his passing, development has been picked up by a group
of volunteers who would like to keep the project alive and well.  Our
goal is to carefully preserve the portability and compatibility of this
project while extending it to new platforms and implementing new tools
and features that fit the tool set.

As a part of the change in management, the schilytools project has moved
from Sourceforge to Codeberg.

- general: Explain how to contribute and update README

- general: Add list of contributors

- all: Misc spelling fixes
  Submitted by Friedhelm Mehnert.

- all: Update E-Mail address and project URL in many places.
  Jörg's old joerg%schily.net@localhost address is defunct and so is his
  postal address.  As a part of an ongoing documentation cleanup,
  these addresses have been replaced by our new project pages in
  many locations.
  Submitted by Nico Sonack.

- man pages: work around buggy syntax highlighting by adding
  \" " comments into various places.
  Submitted by Nico Sonack.

- RULES: Fix build on macOS 12.4

- RULES: add i386-openbsd-clang.rul
  This should permit compilation on modern OpenBSD using clang as
  the system compiler.

- autoconf: Work around clang bug in #pragma weak detection.
  A clang compiler bug causing a crash in the configure test for
  #pragma weak has been worked around, permitting use of weak
  symbols when compiling with clang.

- tests: fix arm64/aarch64 architecture confusion on OpenBSD
  Submitted by Nico Sonack.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/smake/Makefile \
    pkgsrc/devel/smake/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/smake/Makefile.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/smake/Makefile
diff -u pkgsrc/devel/smake/Makefile:1.20 pkgsrc/devel/smake/Makefile:1.21
--- pkgsrc/devel/smake/Makefile:1.20    Sun Nov 21 14:09:19 2021
+++ pkgsrc/devel/smake/Makefile Fri Sep 30 15:27:14 2022
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.20 2021/11/21 14:09:19 ryoon Exp $
+# $NetBSD: Makefile,v 1.21 2022/09/30 15:27:14 micha Exp $
 
-DISTNAME=      schily-2021-09-18
+DISTNAME=      2022-09-18
 PKGNAME=       smake-1.6
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=schilytools/}
-EXTRACT_SUFX=  .tar.bz2
+MASTER_SITES=  https://codeberg.org/schilytools/schilytools/archive/
+DIST_SUBDIR=   schilytools
 
 MAINTAINER=    micha%NetBSD.org@localhost
-HOMEPAGE=      https://sourceforge.net/projects/schilytools/
+HOMEPAGE=      https://codeberg.org/schilytools/schilytools/
 COMMENT=       Highly portable UNIX make implementation
 LICENSE=       cddl-1.0
 
-MAKE_JOBS_SAFE=        no
 MAKE_FLAGS+=   GMAKE_NOWARN=true
 
 USE_TOOLS+=    gmake
Index: pkgsrc/devel/smake/distinfo
diff -u pkgsrc/devel/smake/distinfo:1.20 pkgsrc/devel/smake/distinfo:1.21
--- pkgsrc/devel/smake/distinfo:1.20    Tue Oct 26 10:19:56 2021
+++ pkgsrc/devel/smake/distinfo Fri Sep 30 15:27:14 2022
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.20 2021/10/26 10:19:56 nia Exp $
+$NetBSD: distinfo,v 1.21 2022/09/30 15:27:14 micha Exp $
 
-BLAKE2s (schily-2021-09-18.tar.bz2) = 1ee4b41d2f684e695d40cf03e4335ad0e699cbf0bb99b46e197e202d79ccc949
-SHA512 (schily-2021-09-18.tar.bz2) = d25765074ac39ca2db63cb9841288dd4457f55588e0389a58ad78da62f745a766b4608d3d137a1908e2ca60511784d5f0af67bab1d1612478dbf120188ed5f31
-Size (schily-2021-09-18.tar.bz2) = 4952788 bytes
+BLAKE2s (schilytools/2022-09-18.tar.gz) = b081f23ec688681a17d035a6b0a684affe36f41aa1594934755ba2972c2850af
+SHA512 (schilytools/2022-09-18.tar.gz) = 48550db10e428b1430094a18bfad4781d1f6614eb5c273df7d579fff3e062a8d7ff8ff782c97e6929aaa9ad96b9d0c4f9fde62be0a3ae7fdd99c3f8336e24bde
+Size (schilytools/2022-09-18.tar.gz) = 5904117 bytes

Index: pkgsrc/devel/smake/Makefile.common
diff -u pkgsrc/devel/smake/Makefile.common:1.8 pkgsrc/devel/smake/Makefile.common:1.9
--- pkgsrc/devel/smake/Makefile.common:1.8      Fri Dec  3 15:15:39 2021
+++ pkgsrc/devel/smake/Makefile.common  Fri Sep 30 15:27:14 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2021/12/03 15:15:39 micha Exp $
+# $NetBSD: Makefile.common,v 1.9 2022/09/30 15:27:14 micha Exp $
 # used by archivers/star/Makefile
 # used by archivers/tartest/Makefile
 # used by devel/smake/Makefile
@@ -10,6 +10,11 @@
 # All packages based on the schilytools tarball should include this Makefile
 # fragment to inherit and share the same pkgsrc platform specific code.
 
+WRKSRC=                ${WRKDIR}/schilytools
+
+# smake ignores the "-j" option
+MAKE_JOBS_SAFE=        no
+
 # Map PKGSRC_COMPILER to CCOM used by schilytools build system.
 .if !empty(PKGSRC_COMPILER:Mgcc)
 MAKE_FLAGS+=   CCOM=gcc
@@ -20,6 +25,8 @@ MAKE_FLAGS+=  CCOM=clang
 MAKE_FLAGS+=   CCOM=cc
 .endif
 
+MAKE_FLAGS+=   LINKMODE=static
+
 # OS rules
 # Some rules were copied from old packages (that are now part of schilytools
 # too) to not break what people have done in the past.