CVS commit: pkgsrc/devel/smake

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

Module Name:    pkgsrc
Committed By:   micha
Date:           Fri Feb 10 13:51:11 UTC 2023

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

Log Message:
devel/smake: Build fix for SunOS

Upstream patches added.
No revbump because patch is only for SunOS (where build was broken before).


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/smake/distinfo
cvs rdiff -u -r0 -r1.1 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/distinfo
diff -u pkgsrc/devel/smake/distinfo:1.23 pkgsrc/devel/smake/distinfo:1.24
--- pkgsrc/devel/smake/distinfo:1.23    Wed Jan 25 16:04:26 2023
+++ pkgsrc/devel/smake/distinfo Fri Feb 10 13:51:10 2023
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.23 2023/01/25 16:04:26 micha Exp $
+$NetBSD: distinfo,v 1.24 2023/02/10 13:51:10 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

Added files:

Index: pkgsrc/devel/smake/patches/patch-RULES_os-sunos5.def
diff -u /dev/null pkgsrc/devel/smake/patches/patch-RULES_os-sunos5.def:1.1
--- /dev/null   Fri Feb 10 13:51:11 2023
+++ pkgsrc/devel/smake/patches/patch-RULES_os-sunos5.def        Fri Feb 10 13:51:11 2023
@@ -0,0 +1,22 @@
+$NetBSD: patch-RULES_os-sunos5.def,v 1.1 2023/02/10 13:51:11 micha Exp $
+
+Upstream patch for "MANSTYLE not set" problem on SunOS.
+https://codeberg.org/schilytools/schilytools/issues/51
+
+--- RULES/os-sunos5.def.orig   2023-01-12 14:25:40.000000000 +0000
++++ RULES/os-sunos5.def
+@@ -7,7 +7,7 @@
+ #
+ ###########################################################################
+ # Copyright (c) 1997--2018 J. Schilling
+-# Copyright (c) 2022       the schilytools team
++# Copyright (c) 2022--2023 the schilytools team
+ ###########################################################################
+ # The contents of this file are subject to the terms of the
+ # Common Development and Distribution License, Version 1.0 only
+@@ -23,4 +23,4 @@
+ ###########################################################################
+ # MANSTYLE was switched to bsd in Solaris 11.4.
+ # Illumos switched in early 2022.
+-MANSTYLE      :sh=    [ -f /usr/share/man/man8/Intro.8 ] && echo bsd || echo sysv
++MANSTYLE=     $(SOLARIS_MANSTYLE)
Index: pkgsrc/devel/smake/patches/patch-autoconf_configure.in
diff -u /dev/null pkgsrc/devel/smake/patches/patch-autoconf_configure.in:1.1
--- /dev/null   Fri Feb 10 13:51:11 2023
+++ pkgsrc/devel/smake/patches/patch-autoconf_configure.in      Fri Feb 10 13:51:11 2023
@@ -0,0 +1,32 @@
+$NetBSD: patch-autoconf_configure.in,v 1.1 2023/02/10 13:51:11 micha Exp $
+
+Upstream patch for "MANSTYLE not set" problem on SunOS.
+https://codeberg.org/schilytools/schilytools/issues/51
+
+--- autoconf/configure.in.orig 2023-01-12 14:25:40.000000000 +0000
++++ autoconf/configure.in
+@@ -1118,6 +1118,17 @@ fi
+ fi    # <ext2fs/ext2_fs.h> was missing
+ fi    # Linux only tests
+ 
++dnl SunOS Manual Page Style Tests
++if test ".$UNAME" = ".SunOS"; then
++      AC_MSG_CHECKING([for manual page style on Solaris Systems])
++      if test -f /usr/share/man/man8/Intro.8; then
++              solaris_manstyle=bsd
++      else
++              solaris_manstyle=sysv
++      fi
++      AC_MSG_RESULT([$solaris_manstyle])
++fi
++
+ AC_SUBST(may_linux_src_include)
+ 
+ AC_SUBST(largefile_cc_opt)
+@@ -1149,5 +1160,6 @@ AC_SUBST(lib_dl)
+ AC_SUBST(lib_dir)
+ AC_SUBST(lib_cap)
+ AC_SUBST(lib_selinux)
++AC_SUBST(solaris_manstyle)
+ 
+ AC_OUTPUT(rules.cnf)
Index: pkgsrc/devel/smake/patches/patch-autoconf_rules.cnf.in
diff -u /dev/null pkgsrc/devel/smake/patches/patch-autoconf_rules.cnf.in:1.1
--- /dev/null   Fri Feb 10 13:51:11 2023
+++ pkgsrc/devel/smake/patches/patch-autoconf_rules.cnf.in      Fri Feb 10 13:51:11 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-autoconf_rules.cnf.in,v 1.1 2023/02/10 13:51:11 micha Exp $
+
+Upstream patch for "MANSTYLE not set" problem on SunOS.
+https://codeberg.org/schilytools/schilytools/issues/51
+
+--- autoconf/rules.cnf.in.orig 2023-01-12 14:25:40.000000000 +0000
++++ autoconf/rules.cnf.in
+@@ -28,6 +28,9 @@ HP_CC_ANSI_OPT= @hp_cc_ansi_opt@     # Used 
+ HP_CC_OPT_OPT= @hp_cc_opt_opt@        # Used on HP-UX
+ HP_CC_GPROF_OPT= @hp_cc_gprof_opt@    # Used on HP-UX
+ 
++# bsd/sysv manual page style, Solaris 11.4 switched to BSD style
++SOLARIS_MANSTYLE=@solaris_manstyle@
++
+ MAY_LINUX_SRC_INCLUDE= @may_linux_src_include@        # /usr/src/include useful
+ 
+ SCSILIB= @scsi_lib@           # IRIX libcam (outdated)