head 1.4; access; symbols pkgsrc-2022Q2:1.3.0.36 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.34 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.32 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.30 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.28 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.26 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.24 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.22 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.20 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.16 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.18 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.14 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.12 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.10 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.8 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.6 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.4 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.2 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.2.0.2 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.1.0.4 pkgsrc-2017Q3-base:1.1; locks; strict; comment @# @; 1.4 date 2022.06.29.07.54.40; author wiz; state dead; branches; next 1.3; commitid mi8IBwWu4raDmUJD; 1.3 date 2018.03.13.05.45.25; author dholland; state Exp; branches; next 1.2; commitid PLrd33hjVeOt4guA; 1.2 date 2017.09.26.17.49.10; author wiedi; state Exp; branches; next 1.1; commitid GifUZhPM820AuJ8A; 1.1 date 2017.07.12.01.54.16; author ryoon; state Exp; branches; next ; commitid nMId7vLBLSYrESYz; desc @@ 1.4 log @camlp4: remove camlp4 is an outdated way to build packages with caml and does not work with pkgsrc ocaml versions for more than a year. Remove camlp4 and all packages using it. Ok jaapb@@ @ text @$NetBSD: patch-src_GNUmakefile,v 1.3 2018/03/13 05:45:25 dholland Exp $ * Fix build under NetBSD and SunOS --- src/GNUmakefile.orig 2018-03-05 10:56:03.000000000 +0000 +++ src/GNUmakefile @@@@ -42,17 +42,26 @@@@ else OS = Darwin else ifeq ($(shell uname -o), Cygwin) OS = Windows_NT + else ifeq ($(shell uname -s), NetBSD) + OS = NetBSD + else ifeq ($(shell uname -s), SunOS) + OS = SunOS else $(error "Could not recognize your platform") endif endif +# what is the point of this extra copy? ifeq ($(OS), Linux) PLATFORM = Linux else ifeq ($(OS), Darwin) PLATFORM = MacOS else ifeq ($(OS), Windows_NT) PLATFORM = Windows +else ifeq ($(OS), NetBSD) + PLATFORM = NetBSD +else ifeq ($(OS), SunOS) + PLATFORM = SunOS endif # Lablgtk configuration @@@@ -180,23 +189,21 @@@@ 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)) -ifeq ($(OS), Windows_NT) - CAMLP4O = camlp4o.opt -else - CAMLP4O = $(firstword $(wildcard ${OCAMLBIN}/camlp4o.opt ${OCAMLBIN}/camlp4o)) -endif +CAMLP4O = camlp4o.opt # Do we build with "-I ./linux" or "-I ./win": ifeq ($(OS), Windows_NT) INCLUDE_OS_DIR = win else -# Also for mac. +# Also for mac, bsd, etc. INCLUDE_OS_DIR = linux endif # Number of CPUs ifeq ($(OS), Darwin) NUMCPU ?= $(shell sysctl -n hw.ncpu) +else ifeq ($(OS), NetBSD) + NUMCPU ?= $(shell sysctl -n hw.ncpu) else # Works on Linux and Cygwin (Cygwin has no /sys). NUMCPU ?= $(shell cat /proc/cpuinfo | grep 'processor' | wc -l) @@@@ -244,6 +251,12 @@@@ endif ifeq ($(OS), Windows_NT) include win/GNUmakefile endif +ifeq ($(OS), NetBSD) + include linux/GNUmakefile +endif +ifeq ($(OS), SunOS) + include linux/GNUmakefile +endif include java_frontend/GNUmakefile @@@@ -304,7 +317,7 @@@@ clean:: %.cmx: %.ml $(INCLUDE_OS_DIR)/Perf.cmxa @@echo " OCAMLOPT " $@@ - ${OCAMLOPT} $(OCAMLCFLAGS) -thread -c -w p -warn-error FSU -c $(INCLUDES) -pp ${CAMLP4O} nums.cmxa $*.ml + ${OCAMLOPT} $(OCAMLCFLAGS) -thread -c -w p -warn-error FSU -c $(INCLUDES) -pp ${CAMLP4O} $*.ml clean:: rm -f *.cmx rm -f *.o @@@@ -340,7 +353,7 @@@@ clean:: rm -f vfversion.ml AUTOGENERATE_TARGETS += vfversion_autogen -VFCONFIG_CONTENT=let z3_present = $(Z3PRESENT);; let z3v4dot5_present = $(Z3V4DOT5PRESENT);; type platform = Windows | MacOS | Linux;; let platform = $(PLATFORM) +VFCONFIG_CONTENT=let z3_present = $(Z3PRESENT);; let z3v4dot5_present = $(Z3V4DOT5PRESENT);; type platform = Windows | MacOS | Linux | NetBSD | SunOS;; let platform = $(PLATFORM) vfconfig_autogen: if [ ! -e vfconfig.ml ] || [ "$$(cat vfconfig.ml)" != "$(VFCONFIG_CONTENT)" ]; then \ echo "$(VFCONFIG_CONTENT)" > vfconfig.ml ;\ @@@@ -389,7 +402,7 @@@@ clean:: ifndef WITHOUT_LABLGTK clean:: - cd linemarks; make clean + cd linemarks; $(MAKE) clean branchleft_png.ml: branch-left.png gdk_pixbuf_mlsource branch-left.png > branchleft_png.ml @@@@ -407,7 +420,7 @@@@ branchright_png.cmx: branchright_png.ml vfide.cmx: branchleft_png.cmx branchright_png.cmx vfide.ml $(GTKSOURCEVIEW_DEPS) @@echo " OCAMLOPT " $@@ ifndef WITHOUT_GTKSOURCEVIEW - make -C linemarks OCAMLOPT=${OCAMLOPT} OCAMLCFLAGS="${OCAMLCFLAGS}" LABLGTK_FLAGS="$(LABLGTK_FLAGS_)" linemarks.cmxa + $(MAKE) -C linemarks OCAMLOPT=${OCAMLOPT} OCAMLCFLAGS="${OCAMLCFLAGS}" LABLGTK_FLAGS="$(LABLGTK_FLAGS_)" linemarks.cmxa endif $(SET_LDD); $(OCAMLOPT) $(OCAMLCFLAGS) -thread -c -w p -warn-error FSU -c $(INCLUDES) \ -pp ${CAMLP4O} nums.cmxa $(LABLGTK_FLAGS) $(GTKSOURCEVIEW_LFLAGS) vfide.ml @@@@ -423,7 +436,7 @@@@ endif ../bin/vfide$(DOTEXE): vfide.cmx $(VERIFAST_PLUGINS:%=verifastPlugin%.cmx) $(Z3DEPS) $(GTKSOURCEVIEW_DEPS) @@echo " OCAMLOPT " $@@ ifndef WITHOUT_GTKSOURCEVIEW - cd linemarks; make linemarks.cmxa + cd linemarks; $(MAKE) linemarks.cmxa endif $(SET_LDD); ${OCAMLOPT} $(OCAMLOPT_LINKFLAGS) $(OCAMLCFLAGS) -warn-error F -pp ${CAMLP4O} -o ../bin/vfide$(DOTEXE) \ $(LABLGTK_FLAGS) $(GTKSOURCEVIEW_LFLAGS) unix.cmxa \ @ 1.3 log @Update to 18.02 to fix build with ocaml 4.06. pkgsrc changes: - depends on z3; theoretically optional but build fails without it - needs ocaml-findlib now - use ocaml.mk No upstream changelog that I can find besides the github history. @ text @d1 1 a1 1 $NetBSD: patch-src_GNUmakefile,v 1.2 2017/09/26 17:49:10 wiedi Exp $ @ 1.2 log @verifast: fix build on SunOS The changes for NetBSD also works on SunOS @ text @d1 1 a1 1 $NetBSD: patch-src_GNUmakefile,v 1.1 2017/07/12 01:54:16 ryoon Exp $ d5 1 a5 1 --- src/GNUmakefile.orig 2017-06-13 16:58:54.000000000 +0000 d7 1 a7 1 @@@@ -41,6 +41,10 @@@@ else d10 1 a10 1 OS = Cygwin d18 17 a34 14 @@@@ -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 +147,7 @@@@ OCAML = ${OCAMLBIN}/ocaml d38 1 a38 1 -ifeq ($(OS), Cygwin) d46 18 a63 3 ifeq ($(OS), Cygwin) @@@@ -198,6 +204,12 @@@@ endif ifeq ($(OS), Cygwin) d75 19 a93 1 @@@@ -378,7 +390,7 @@@@ clean:: d98 1 a98 1 + cd linemarks; ${MAKE} clean d102 2 a103 2 @@@@ -396,7 +408,7 @@@@ branchright_png.cmx: branchright_png.ml vfide.cmx: branchleft_png.cmx branchright_png.cmx Fonts.cmx vfide.ml $(GTKSOURCEVIEW_DEPS) d107 1 a107 1 + ${MAKE} -C linemarks OCAMLOPT=${OCAMLOPT} OCAMLCFLAGS="${OCAMLCFLAGS}" LABLGTK_FLAGS="$(LABLGTK_FLAGS_)" linemarks.cmxa d111 2 a112 2 @@@@ -404,7 +416,7 @@@@ endif ../bin/vfide$(DOTEXE): vfide.cmx redux.cmx $(Z3DEPS) plugins2.cmx $(GTKSOURCEVIEW_DEPS) d116 1 a116 1 + cd linemarks; ${MAKE} linemarks.cmxa d118 1 a118 1 $(SET_LDD); ${OCAMLOPT} $(OCAMLCFLAGS) -warn-error F -pp ${CAMLP4O} -o ../bin/vfide$(DOTEXE) \ @ 1.1 log @Import verifast-17.06 as devel/verifast. VeriFast is a research prototype of a tool for modular formal verification of correctness properties of single-threaded and multithreaded C and Java programs annotated with preconditions and postconditions written in separation logic. This is recommended by Kiwamu Okabe in Japan NetBSD Users' Group BOF 2017 at the University of Tokyo. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 * Fix build under NetBSD d7 1 a7 1 @@@@ -41,6 +41,8 @@@@ else d13 2 d18 1 a18 1 @@@@ -50,6 +52,9 @@@@ endif d25 3 d31 1 a31 1 @@@@ -137,11 +142,7 @@@@ OCAML = ${OCAMLBIN}/ocaml d44 1 a44 1 @@@@ -198,6 +199,9 @@@@ endif d51 3 d57 1 a57 1 @@@@ -378,7 +382,7 @@@@ clean:: d66 1 a66 1 @@@@ -396,7 +400,7 @@@@ branchright_png.cmx: branchright_png.ml d75 1 a75 1 @@@@ -404,7 +408,7 @@@@ endif @