CVS commit: pkgsrc/emulators/hercules

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Wed Dec 13 21:15:13 UTC 2017

Modified Files:
        pkgsrc/emulators/hercules: distinfo
        pkgsrc/emulators/hercules/patches: patch-configure.ac

Log Message:
hercules: treat all other operating systems not listed as if
they were something nix-y. This means we will build hercifc on
SmartOS, which is failing due to a PLIST mismatch.

Now we don't need to add a case for dragonfly now, so remove that
hunk.

Describe patch.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/emulators/hercules/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/emulators/hercules/patches/patch-configure.ac

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

Modified files:

Index: pkgsrc/emulators/hercules/distinfo
diff -u pkgsrc/emulators/hercules/distinfo:1.19 pkgsrc/emulators/hercules/distinfo:1.20
--- pkgsrc/emulators/hercules/distinfo:1.19     Tue Nov  3 20:30:58 2015
+++ pkgsrc/emulators/hercules/distinfo  Wed Dec 13 21:15:12 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2015/11/03 20:30:58 agc Exp $
+$NetBSD: distinfo,v 1.20 2017/12/13 21:15:12 maya Exp $
 
 SHA1 (hercules-3.11.tar.gz) = f846995600e1be3f851790afa1e3e0f47e59f21a
 RMD160 (hercules-3.11.tar.gz) = 759799fb17e344fd3db7ad9e55473ce0580ea415
@@ -6,7 +6,7 @@ SHA512 (hercules-3.11.tar.gz) = 593594cd
 Size (hercules-3.11.tar.gz) = 2623956 bytes
 SHA1 (patch-Makefile.in) = 16a9b4e47456b789a906f03c942d4e683f18b87a
 SHA1 (patch-autoconf_libtool.m4) = 713bc12bfd176e908fc01b401ee0163660f20da8
-SHA1 (patch-configure.ac) = 945119267aceba66bc82b2192fb6785f09be1bdb
+SHA1 (patch-configure.ac) = 038dde8c7f0ff16b7a7661104c5e7fa613261045
 SHA1 (patch-crypto_Makefile.in) = 0e9fa3ce7e2f629d9eaed21dcfe7625087f7103b
 SHA1 (patch-decNumber_Makefile.in) = 98228044642007e894fde580e010c6da874454af
 SHA1 (patch-hercifc.h) = 29674ad8f23f69032248098647811e30438c2e98

Index: pkgsrc/emulators/hercules/patches/patch-configure.ac
diff -u pkgsrc/emulators/hercules/patches/patch-configure.ac:1.2 pkgsrc/emulators/hercules/patches/patch-configure.ac:1.3
--- pkgsrc/emulators/hercules/patches/patch-configure.ac:1.2    Tue Mar 31 15:22:40 2015
+++ pkgsrc/emulators/hercules/patches/patch-configure.ac        Wed Dec 13 21:15:12 2017
@@ -1,17 +1,24 @@
-$NetBSD: patch-configure.ac,v 1.2 2015/03/31 15:22:40 joerg Exp $
+$NetBSD: patch-configure.ac,v 1.3 2017/12/13 21:15:12 maya Exp $
+
+Assume all other operating systems are nix-like
+(SmartOS, dragonflybsd)
+
+Improve portability of test (==)
+
+Don't let package add its optimization flags
 
 --- configure.ac.orig  2010-03-07 12:22:36.000000000 +0000
 +++ configure.ac
-@@ -320,7 +320,7 @@ case "$host_os" in
-         fi
+@@ -319,7 +319,7 @@ case "$host_os" in
          ;;
  
--    *bsd*)
-+    *bsd* | dragonfly*)
-         hc_cv_is_nix=yes
+     *)
+-        hc_cv_is_nix=no
++        hc_cv_is_nix=yes
          hc_cv_is_windows=no
          hc_cv_is_mingw32=no
-@@ -558,7 +558,7 @@ AC_CHECK_DECLS( SIOCADDRT,            [h
+         hc_cv_is_apple=no
+@@ -546,7 +546,7 @@ AC_CHECK_DECLS( SIOCADDRT,            [h
  AC_CHECK_DECLS( SIOCDELRT,            [hc_cv_have_siocdelrt=yes],           [hc_cv_have_siocdelrt=no],           [#include <linux/sockios.h>] )
  AC_CHECK_DECLS( SIOCDIFADDR,          [hc_cv_have_siocdifaddr=yes],         [hc_cv_have_siocdifaddr=no],         [#include <linux/sockios.h>] )
  
@@ -20,7 +27,7 @@ $NetBSD: patch-configure.ac,v 1.2 2015/0
      AC_CHECK_DECLS( MTEWARN,          [hc_cv_have_mtewarn=yes],             [hc_cv_have_mtewarn=no],             [#include <sys/mtio.h>] )
  else
      hc_cv_have_mtewarn=no
-@@ -1749,7 +1749,7 @@ if test "$hc_cv_auto_optimize" = "yes"; 
+@@ -1742,7 +1742,7 @@ if test "$hc_cv_auto_optimize" = "yes"; 
          xscale-yes|arm*-yes)
  
              hc_cv_is_intel_x86_arch=no