CVS commit: pkgsrc/devel/smake

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

Module Name:    pkgsrc
Committed By:   micha
Date:           Fri Apr 21 12:57:19 UTC 2023

Modified Files:
        pkgsrc/devel/smake: Makefile Makefile.common distinfo
Removed Files:
        pkgsrc/devel/smake/patches: patch-RULES_os-sunos5.def
            patch-autoconf_configure.in patch-autoconf_rules.cnf.in

Log Message:
devel/smake: Update to 1.7nb2

Remove patches (merged upstream).
Remove custom OS rules (no longer required according to upstream).

New features with AN-2023-04-19:

- RULES/os-sunos5.def: the manstyle detection code for sunos5 and
  newer was broken for GNU make.  Fix the code by moving the
  detection to a configure test setting the new make macro
  SOLARIS_MANSTYLE.  Users building with other make implementations
  or those using the bootstrap smake were not affected.
  Reported by: Michael Bäuerle.  Submitted by: Nico Sonack.

- libschily: no longer provide the symbols fgetline, getline.
  libschily used to provide these symbols as alternative names for
  js_getline and js_fgetline for compatibility with UNOS.  As
  their POSIX-incompatible signature causes problems when linking
  against musl statically, we now no longer provide these symbols
  by default.  Users wishing to restore the old behaviour should
  remove -DNO_GETLINE_COMPAT from CPPOPTS when compiling libschily.

- libschily: accordingly, the man pages getline(3) and fgetline(3)
  have been renamed to js_getline(3) and js_fgetline(3).

- RULES: fix HCC_COM expansion when CCOM=clang.  This fixes builds
  with GNU make when CCOM=clang.
  Submitted by: Nico Sonack.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/smake/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/smake/Makefile.common
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/smake/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/smake/patches/patch-RULES_os-sunos5.def \
    pkgsrc/devel/smake/patches/patch-autoconf_configure.in \
    pkgsrc/devel/smake/patches/patch-autoconf_rules.cnf.in

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.25 pkgsrc/devel/smake/Makefile:1.26
--- pkgsrc/devel/smake/Makefile:1.25    Fri Feb 17 12:27:45 2023
+++ pkgsrc/devel/smake/Makefile Fri Apr 21 12:57:19 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2023/02/17 12:27:45 nikita Exp $
+# $NetBSD: Makefile,v 1.26 2023/04/21 12:57:19 micha Exp $
 
-DISTNAME=      2023-01-12
+DISTNAME=      2023-04-19
 PKGNAME=       smake-1.7
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  https://codeberg.org/schilytools/schilytools/archive/
 DIST_SUBDIR=   schilytools

Index: pkgsrc/devel/smake/Makefile.common
diff -u pkgsrc/devel/smake/Makefile.common:1.11 pkgsrc/devel/smake/Makefile.common:1.12
--- pkgsrc/devel/smake/Makefile.common:1.11     Wed Jan 25 16:04:26 2023
+++ pkgsrc/devel/smake/Makefile.common  Fri Apr 21 12:57:19 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2023/01/25 16:04:26 micha Exp $
+# $NetBSD: Makefile.common,v 1.12 2023/04/21 12:57:19 micha Exp $
 # used by archivers/star/Makefile
 # used by archivers/tartest/Makefile
 # used by devel/smake/Makefile
@@ -27,46 +27,6 @@ MAKE_FLAGS+= CCOM=cc
 
 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.
-pre-configure:
-       printf "Create OS rules...\n"
-       cd ${WRKSRC}/RULES && . ${WRKSRC}/RULES/MKLINKS
-       printf "Create pkgsrc OS rules...\n"
-       cd ${WRKSRC}/RULES && unset r ;                                 \
-       for i in arm mipsel mips64eb x86_64 sparc64 powerpc ;           \
-       do                                                              \
-               r="$$r i386-netbsd-gcc.rul@$$i-netbsd-gcc.rul" ;        \
-               r="$$r i386-netbsd-cc.rul@$$i-netbsd-cc.rul" ;          \
-       done ;                                                          \
-       r="$$r i386-freebsd-gcc.rul@x86_64-freebsd-gcc.rul" ;           \
-       r="$$r i386-freebsd-cc.rul@x86_64-freebsd-cc.rul" ;             \
-       for i in netbsd-clang.rul netbsd-cc.rul netbsd-gcc.rul ;        \
-       do                                                              \
-               r="$$r i386-$$i@${MACHINE}-$$i" ;                       \
-       done ;                                                          \
-                                                                       \
-       for i in $$r ;                                                  \
-       do                                                              \
-               existing=`printf "%s\\n" $$i | ${SED} -e 's/@.*//'` ;   \
-               target=`printf "%s\\n" $$i | ${SED} -e 's/.*@//'` ;     \
-               printf "%s " "$$target";                                \
-               if ${TEST} -e "$$existing" ; then : ;                   \
-               else                                                    \
-                       printf "(Link target %s not present)\n"         \
-                               "$$existing";                           \
-                       continue ;                                      \
-               fi;                                                     \
-               if ${TEST} -e "$$target" ;                              \
-               then                                                    \
-                       printf "(already present)\n" ;                  \
-               else                                                    \
-                       ${LN} -s "$$existing" "$$target" ;              \
-                       printf "(created)\n" ;                          \
-               fi;                                                     \
-       done
-
 # Man pages with documentation of file formats should go to section 4 on
 # SysV based systems. All supported systems that are treated by schilytools
 # with "MANSTYLE= sysv" in the RULES/os-${OPSYS}.def" files must be caught

Index: pkgsrc/devel/smake/distinfo
diff -u pkgsrc/devel/smake/distinfo:1.24 pkgsrc/devel/smake/distinfo:1.25
--- pkgsrc/devel/smake/distinfo:1.24    Fri Feb 10 13:51:10 2023
+++ pkgsrc/devel/smake/distinfo Fri Apr 21 12:57:19 2023
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.24 2023/02/10 13:51:10 micha Exp $
+$NetBSD: distinfo,v 1.25 2023/04/21 12:57:19 micha Exp $
 
-BLAKE2s (schilytools/2023-01-12.tar.gz) = 14493310db8fe55fcb16f4b13cb6a4bb45ace541254c35e5b4d6d3fb178fc640
-SHA512 (schilytools/2023-01-12.tar.gz) = a1eb37d5df8d2298ba4da6ccbf4bb937da13e8d9e4d7a8420b4d54a319c028c682e76a85c800d57a35d5f4b81a51b19600bbc2edb94641fa5e721ae23134ce15
-Size (schilytools/2023-01-12.tar.gz) = 5895061 bytes
-SHA1 (patch-RULES_os-sunos5.def) = 2d279c8d9e10a13d5ee1f1fce7682b6eae133390
-SHA1 (patch-autoconf_configure.in) = 60c676124b885c0ee69c4a8bf0299252573bac5e
-SHA1 (patch-autoconf_rules.cnf.in) = e5be0d25ad5a114ab300fc85d1680ac1aa40e520
+BLAKE2s (schilytools/2023-04-19.tar.gz) = 61bd4ce5c989eacd5ffffc8e6dd5435ba3594573c310405f2ff78bd52194b1e6
+SHA512 (schilytools/2023-04-19.tar.gz) = 79e5d59ad84fefd32b689dc60db42cb522bfb2c544e7f5b8c2b85c3597c758519071ec043532d3e9e8b745bf4ff1ad32b4e1103eaac391282435e42a2ef94de5
+Size (schilytools/2023-04-19.tar.gz) = 5896292 bytes