CVS commit: pkgsrc/devel/verifast

["Sebastian Wiedenroth" <wiedi%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiedi
Date:           Tue Sep 26 17:49:10 UTC 2017

Modified Files:
        pkgsrc/devel/verifast: Makefile distinfo
        pkgsrc/devel/verifast/patches: patch-src_GNUmakefile

Log Message:
verifast: fix build on SunOS

The changes for NetBSD also works on SunOS


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/verifast/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/verifast/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/verifast/patches/patch-src_GNUmakefile

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

Modified files:

Index: pkgsrc/devel/verifast/Makefile
diff -u pkgsrc/devel/verifast/Makefile:1.4 pkgsrc/devel/verifast/Makefile:1.5
--- pkgsrc/devel/verifast/Makefile:1.4  Mon Sep 18 09:53:19 2017
+++ pkgsrc/devel/verifast/Makefile      Tue Sep 26 17:49:10 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2017/09/18 09:53:19 maya Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/26 17:49:10 wiedi Exp $
 
 DISTNAME=              verifast-17.06
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            devel
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=verifast/}
 GITHUB_PROJECT=                verifast

Index: pkgsrc/devel/verifast/distinfo
diff -u pkgsrc/devel/verifast/distinfo:1.2 pkgsrc/devel/verifast/distinfo:1.3
--- pkgsrc/devel/verifast/distinfo:1.2  Sat Sep  9 21:57:46 2017
+++ pkgsrc/devel/verifast/distinfo      Tue Sep 26 17:49:10 2017
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2017/09/09 21:57:46 dholland Exp $
+$NetBSD: distinfo,v 1.3 2017/09/26 17:49:10 wiedi Exp $
 
 SHA1 (verifast-17.06.tar.gz) = 9c918c6fa88ab11315fe80abfa097dcc8d0f85cd
 RMD160 (verifast-17.06.tar.gz) = 8808173823c6697272450ba0eac71cfc4824af54
 SHA512 (verifast-17.06.tar.gz) = f4ffe75cf5d47e48f565c34b12dd134f6ffd527a12146484f8cf14549b0e5292c8e4b4e077fe1c8ae93c0f045ba8760e42369ddaea2b47fef9f37e0403202193
 Size (verifast-17.06.tar.gz) = 1698045 bytes
-SHA1 (patch-src_GNUmakefile) = ceb2071c030d6120e6c25b497deba75fcf53d8ba
+SHA1 (patch-src_GNUmakefile) = d1ac3b421af71ddabb761e4ae98bd1edb7dda5f9
 SHA1 (patch-src_linux_caml__stopwatch.c) = 5c5587f7af0b99717fa192544c0b1e3f5165c24b

Index: pkgsrc/devel/verifast/patches/patch-src_GNUmakefile
diff -u pkgsrc/devel/verifast/patches/patch-src_GNUmakefile:1.1 pkgsrc/devel/verifast/patches/patch-src_GNUmakefile:1.2
--- pkgsrc/devel/verifast/patches/patch-src_GNUmakefile:1.1     Wed Jul 12 01:54:16 2017
+++ pkgsrc/devel/verifast/patches/patch-src_GNUmakefile Tue Sep 26 17:49:10 2017
@@ -1,29 +1,34 @@
-$NetBSD: patch-src_GNUmakefile,v 1.1 2017/07/12 01:54:16 ryoon Exp $
+$NetBSD: patch-src_GNUmakefile,v 1.2 2017/09/26 17:49:10 wiedi Exp $
 
-* Fix build under NetBSD
+* Fix build under NetBSD and SunOS
 
 --- src/GNUmakefile.orig       2017-06-13 16:58:54.000000000 +0000
 +++ src/GNUmakefile
-@@ -41,6 +41,8 @@ else
+@@ -41,6 +41,10 @@ else
            OS = Darwin
    else ifeq ($(shell uname -o), Cygwin)
            OS = Cygwin
 +  else ifeq ($(shell uname -s), NetBSD)
 +          OS = NetBSD
++  else ifeq ($(shell uname -s), SunOS)
++          OS = SunOS
    else
            $(error "Could not recognize your platform")
    endif
-@@ -50,6 +52,9 @@ endif
+@@ -50,6 +54,12 @@ endif
  ifndef WITHOUT_LABLGTK
    ifeq ($(OS), Cygwin)
      LABLGTK_FLAGS += -I +site-lib/lablgtk2 lablgtk.cmxa
 +  else ifeq ($(OS), NetBSD)
 +    LABLGTK_FLAGS_ += -I +site-lib/lablgtk2
 +    LABLGTK_FLAGS += ${LABLGTK_FLAGS_} lablgtk.cmxa
++  else ifeq ($(OS), SunOS)
++    LABLGTK_FLAGS_ += -I +site-lib/lablgtk2
++    LABLGTK_FLAGS += ${LABLGTK_FLAGS_} lablgtk.cmxa
    else
      LABLGTK_FLAGS_ += -I +../lablgtk2 -I +lablgtk2
      LABLGTK_FLAGS  += ${LABLGTK_FLAGS_} lablgtk.cmxa
-@@ -137,11 +142,7 @@ OCAML        = ${OCAMLBIN}/ocaml
+@@ -137,11 +147,7 @@ OCAML        = ${OCAMLBIN}/ocaml
  OCAMLC       = $(firstword $(wildcard ${OCAMLBIN}/ocamlc.opt ${OCAMLBIN}/ocamlc))
  OCAMLOPT     = $(firstword $(wildcard ${OCAMLBIN}/ocamlopt.opt ${OCAMLBIN}/ocamlopt))
  OCAMLDEP     = $(firstword $(wildcard ${OCAMLBIN}/ocamldep.opt ${OCAMLBIN}/ocamldep))
@@ -36,17 +41,20 @@ $NetBSD: patch-src_GNUmakefile,v 1.1 201
  
  # Do we build with "-I ./linux" or "-I ./win":
  ifeq ($(OS), Cygwin)
-@@ -198,6 +199,9 @@ endif
+@@ -198,6 +204,12 @@ endif
  ifeq ($(OS), Cygwin)
    include win/GNUmakefile
  endif
 +ifeq ($(OS), NetBSD)
 +  include linux/GNUmakefile
 +endif
++ifeq ($(OS), SunOS)
++  include linux/GNUmakefile
++endif
  
  include java_frontend/GNUmakefile
  
-@@ -378,7 +382,7 @@ clean::
+@@ -378,7 +390,7 @@ clean::
  ifndef WITHOUT_LABLGTK
  
  clean::
@@ -55,7 +63,7 @@ $NetBSD: patch-src_GNUmakefile,v 1.1 201
  
  branchleft_png.ml: branch-left.png
        gdk_pixbuf_mlsource branch-left.png > branchleft_png.ml
-@@ -396,7 +400,7 @@ branchright_png.cmx: branchright_png.ml
+@@ -396,7 +408,7 @@ branchright_png.cmx: branchright_png.ml
  vfide.cmx: branchleft_png.cmx branchright_png.cmx Fonts.cmx vfide.ml $(GTKSOURCEVIEW_DEPS)
        @echo "  OCAMLOPT " $@
  ifndef WITHOUT_GTKSOURCEVIEW
@@ -64,7 +72,7 @@ $NetBSD: patch-src_GNUmakefile,v 1.1 201
  endif
        $(SET_LDD); $(OCAMLOPT) $(OCAMLCFLAGS) -thread -c -w p -warn-error FSU -c $(INCLUDES) \
        -pp ${CAMLP4O} nums.cmxa $(LABLGTK_FLAGS) $(GTKSOURCEVIEW_LFLAGS) vfide.ml
-@@ -404,7 +408,7 @@ endif
+@@ -404,7 +416,7 @@ endif
  ../bin/vfide$(DOTEXE): vfide.cmx redux.cmx $(Z3DEPS) plugins2.cmx $(GTKSOURCEVIEW_DEPS)
        @echo "  OCAMLOPT " $@
  ifndef WITHOUT_GTKSOURCEVIEW