CVS commit: pkgsrc/devel/omake

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Mon Feb 12 11:03:35 UTC 2018

Modified Files:
        pkgsrc/devel/omake: Makefile PLIST distinfo
        pkgsrc/devel/omake/patches: patch-lib_build_OCaml.om
Added Files:
        pkgsrc/devel/omake/patches: patch-src_clib_fam__pseudo.h
Removed Files:
        pkgsrc/devel/omake/patches: patch-aa patch-ab patch-ac patch-ad
            patch-ae patch-af patch-ag patch-ah patch-ai patch-aj patch-ak
            patch-al patch-am patch-an patch-ao patch-ap patch-aq patch-ar
            patch-as patch-at patch-au patch-av patch-aw patch-ax
            patch-src_libmojave-external_cutil_fam__pseudo.h

Log Message:
Update to 0.10.3 to fix build with current OCaml.
New HOMEPAGE, MASTER_SITES.

The only upstream change log I can find is empty, but as this update
represents several years of maintenance that is probably inaccurate.

Almost all the pkgsrc patches were from upstream and are thus now
rolled in.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/omake/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/omake/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/omake/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/devel/omake/patches/patch-aa
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/devel/omake/patches/patch-ab
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/omake/patches/patch-ac \
    pkgsrc/devel/omake/patches/patch-ad pkgsrc/devel/omake/patches/patch-ae \
    pkgsrc/devel/omake/patches/patch-af pkgsrc/devel/omake/patches/patch-ag \
    pkgsrc/devel/omake/patches/patch-ah pkgsrc/devel/omake/patches/patch-ai \
    pkgsrc/devel/omake/patches/patch-aj pkgsrc/devel/omake/patches/patch-ak \
    pkgsrc/devel/omake/patches/patch-al pkgsrc/devel/omake/patches/patch-am \
    pkgsrc/devel/omake/patches/patch-an pkgsrc/devel/omake/patches/patch-ao \
    pkgsrc/devel/omake/patches/patch-ap pkgsrc/devel/omake/patches/patch-aq \
    pkgsrc/devel/omake/patches/patch-ar pkgsrc/devel/omake/patches/patch-as \
    pkgsrc/devel/omake/patches/patch-at pkgsrc/devel/omake/patches/patch-au \
    pkgsrc/devel/omake/patches/patch-av pkgsrc/devel/omake/patches/patch-aw \
    pkgsrc/devel/omake/patches/patch-ax \
    pkgsrc/devel/omake/patches/patch-src_libmojave-external_cutil_fam__pseudo.h
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/omake/patches/patch-lib_build_OCaml.om
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/omake/patches/patch-src_clib_fam__pseudo.h

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

Modified files:

Index: pkgsrc/devel/omake/Makefile
diff -u pkgsrc/devel/omake/Makefile:1.18 pkgsrc/devel/omake/Makefile:1.19
--- pkgsrc/devel/omake/Makefile:1.18    Sun Feb  4 08:06:22 2018
+++ pkgsrc/devel/omake/Makefile Mon Feb 12 11:03:34 2018
@@ -1,26 +1,24 @@
-# $NetBSD: Makefile,v 1.18 2018/02/04 08:06:22 dholland Exp $
+# $NetBSD: Makefile,v 1.19 2018/02/12 11:03:34 dholland Exp $
 #
 
-DISTNAME=      omake-${VERSION}-0.rc1
-PKGNAME=       omake-${VERSION}.0rc1
-PKGREVISION=   13
+DISTNAME=      omake-0.10.3
 CATEGORIES=    devel
-MASTER_SITES=  http://omake.metaprl.org/downloads/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=ocaml-omake/}
+GITHUB_TAG=    ${PKGNAME}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://omake.metaprl.org/index.html
+HOMEPAGE=      http://projects.camlcity.org/projects/omake.html
 COMMENT=       Build system designed for scalability and portability
 LICENSE=       gnu-gpl-v2 AND mit AND gnu-lgpl-v2.1
 
-BROKEN=                Does not build with ocaml 4.06.
-
+HAS_CONFIGURE= yes
 MAKE_JOBS_SAFE=        no
 
-WRKSRC=                ${WRKDIR}/omake-${VERSION}
-
-MAKE_ENV+=     INSTALL_ROOT=${DESTDIR}
+WRKSRC=                ${WRKDIR}/omake-${DISTNAME}
 
-VERSION=       0.9.8.6
+CONFIGURE_ARGS+=       -prefix=${PREFIX}
+BUILD_TARGET=          force-bootstrap
+MAKE_ENV+=             INSTALL_ROOT=${DESTDIR}
 
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/readline.buildlink3.mk"

Index: pkgsrc/devel/omake/PLIST
diff -u pkgsrc/devel/omake/PLIST:1.2 pkgsrc/devel/omake/PLIST:1.3
--- pkgsrc/devel/omake/PLIST:1.2        Fri Dec 17 09:40:14 2010
+++ pkgsrc/devel/omake/PLIST    Mon Feb 12 11:03:34 2018
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2010/12/17 09:40:14 wiz Exp $
-bin/cvs_realclean
+@comment $NetBSD: PLIST,v 1.3 2018/02/12 11:03:34 dholland Exp $
 bin/omake
 bin/osh
 lib/omake/OMakefile.default
@@ -15,7 +14,9 @@ lib/omake/configure/Configure.om
 lib/omake/configure/X.om
 lib/omake/configure/fam.om
 lib/omake/configure/fs_case_sensitive.om
+lib/omake/configure/moncontrol.om
 lib/omake/configure/ncurses.om
+lib/omake/configure/posix_spawn.om
 lib/omake/configure/readline.om
 lib/omake/configure/snprintf.om
 lib/omake/parse/C/Lex.om

Index: pkgsrc/devel/omake/distinfo
diff -u pkgsrc/devel/omake/distinfo:1.5 pkgsrc/devel/omake/distinfo:1.6
--- pkgsrc/devel/omake/distinfo:1.5     Tue Nov  3 03:27:53 2015
+++ pkgsrc/devel/omake/distinfo Mon Feb 12 11:03:34 2018
@@ -1,32 +1,8 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 03:27:53 agc Exp $
+$NetBSD: distinfo,v 1.6 2018/02/12 11:03:34 dholland Exp $
 
-SHA1 (omake-0.9.8.6-0.rc1.tar.gz) = f714fa992bf391b8bac49a488bc654128962d1cc
-RMD160 (omake-0.9.8.6-0.rc1.tar.gz) = b7ceebea6f4c40460625e2e9528257e200676bca
-SHA512 (omake-0.9.8.6-0.rc1.tar.gz) = 10a7ef6746c656d25852d408fafdd67a95acc59b73c892f0dbc316f2a01949b5349d5203c9fe2400cc7c05e14a7b1bc075603bd462ab74b60427d944f8e177d0
-Size (omake-0.9.8.6-0.rc1.tar.gz) = 3254283 bytes
-SHA1 (patch-aa) = 1cc195874da3db9f909993818b347211c9f3ff77
-SHA1 (patch-ab) = 449aae3ff362efbc50f188cba8a76a13334eb964
-SHA1 (patch-ac) = 21f4d1b8d822cebbd19ab2226193f137d66dfd7e
-SHA1 (patch-ad) = d522e9cd5fbbf74c876314afecbfecc85434210c
-SHA1 (patch-ae) = 2b0a400b4da3e557d6a14eab9fa76913059c084a
-SHA1 (patch-af) = 24731dd649379f22de0fd34d46d68e7acf6c8a61
-SHA1 (patch-ag) = e7c9e2e0826dc2ca69df4830f449a4d0946fd278
-SHA1 (patch-ah) = 35ffade097aa37b37be1e73b3f1521d57b9d1880
-SHA1 (patch-ai) = ea06c43ea427508f6eef0e0ade9b569977bd7ac1
-SHA1 (patch-aj) = 9c33be37c2dff423890b132984414c1fd1da457f
-SHA1 (patch-ak) = 20af5574290a4ee1dd98bcaff63ed7d93945029e
-SHA1 (patch-al) = 86b3e0bb348ad6d5813df20bad5ec8e0c77e372b
-SHA1 (patch-am) = 15f572056b66dc565cba65da04899909be784bf8
-SHA1 (patch-an) = 493e5e9bb25371b066aafe8aac70defee13370b7
-SHA1 (patch-ao) = 5f70ae344d3d0d822ed5a6ed21c75c33b2b10d0d
-SHA1 (patch-ap) = 93db626ca9bee439d513014c9aa23212d3e42a70
-SHA1 (patch-aq) = 9531c72e6d6c417b10059dabbf37b8e3a1324b02
-SHA1 (patch-ar) = 936c185d4a290ae2acb0b6f6788cef9996d2e197
-SHA1 (patch-as) = fa7a7720867a5e5b53df8c3d80f35d0aa27b5b80
-SHA1 (patch-at) = cb81d50d1a85dac9cb0fa81046b8a7b255387a4c
-SHA1 (patch-au) = efb7a298c259e645d2031fee5b016a47389621dd
-SHA1 (patch-av) = 10edbea63bca8788f922c9debb2ebc50655760a5
-SHA1 (patch-aw) = 4999a863230373cca75a6e5cbc4203430823468d
-SHA1 (patch-ax) = 0a91c5d1a561b319885e848def2a3c54d52751d7
-SHA1 (patch-lib_build_OCaml.om) = 19cf48d1480086db866e7f5d095ace4edf3db8c9
-SHA1 (patch-src_libmojave-external_cutil_fam__pseudo.h) = cffac5428d8ff93db0773e5604176df974321b2e
+SHA1 (omake-0.10.3.tar.gz) = 5a48e4cade84b2e7224c18cf22115e7168caaebd
+RMD160 (omake-0.10.3.tar.gz) = f1281155c9b88817a9ac5a1abcb95dd96ff847fe
+SHA512 (omake-0.10.3.tar.gz) = 8fc042cccd9d3b03fc16e29ac19368e078d0f8c14ed60862fe787248c5a4f88995ffd43ab0a9b416ec7f4b7762ab57c293ef3ea0b9dcbbd21c1c767ab41c2cc3
+Size (omake-0.10.3.tar.gz) = 1491587 bytes
+SHA1 (patch-lib_build_OCaml.om) = 59e5e40e745be24556f9f545d51a2403118a5847
+SHA1 (patch-src_clib_fam__pseudo.h) = 2e09ebe793d16c6877a4810559a54dd56e1e676b

Index: pkgsrc/devel/omake/patches/patch-lib_build_OCaml.om
diff -u pkgsrc/devel/omake/patches/patch-lib_build_OCaml.om:1.1 pkgsrc/devel/omake/patches/patch-lib_build_OCaml.om:1.2
--- pkgsrc/devel/omake/patches/patch-lib_build_OCaml.om:1.1     Fri Nov 23 22:55:22 2012
+++ pkgsrc/devel/omake/patches/patch-lib_build_OCaml.om Mon Feb 12 11:03:35 2018
@@ -1,19 +1,16 @@
-$NetBSD: patch-lib_build_OCaml.om,v 1.1 2012/11/23 22:55:22 marino Exp $
+$NetBSD: patch-lib_build_OCaml.om,v 1.2 2018/02/12 11:03:35 dholland Exp $
 
-Omake will break in over a dozen places on gcc 4.7.x if warnings are
-treated as errors.  All valid but unreferenced functions and constants
-are warned about in gcc 4.7, and the alternative to removing the
-warn-error flag is to remove all these unreferenced functions and
-constants via patches.
+Fix build failure. Apparently $(c_comp) is an array and it needs
+to be a string.
 
---- lib/build/OCaml.om.orig    2008-03-05 01:07:25.000000000 +0000
+--- lib/build/OCaml.om~        2017-10-29 11:36:41.000000000 +0000
 +++ lib/build/OCaml.om
-@@ -176,7 +176,7 @@ public.PREFIXED_OCAMLPACKS =\
- #
- declare OCAMLDEPFLAGS
- public.OCAMLPPFLAGS  =
--public.OCAMLFLAGS    = -warn-error A
-+public.OCAMLFLAGS    =
- public.OCAMLCFLAGS   = -g
- public.OCAMLOPTFLAGS =
- public.OCAMLCPPFLAGS =
+@@ -181,7 +181,7 @@ private.get_bytecomp_c_comp() =
+     # Figure out the params for the C compiler
+     #
+     private.c_comp = $(get_c_comp)
+-    if $(equal X$(c_comp)X, XX)
++    if $(equal X$(string $(c_comp))X, XX)
+         private.bytecomp_c_comp = $(get_bytecomp_c_comp)
+         OCAML_CC = $(nth-hd 1, $(bytecomp_c_comp))
+         OCAML_CFLAGS = $(nth-tl 1, $(bytecomp_c_comp))

Added files:

Index: pkgsrc/devel/omake/patches/patch-src_clib_fam__pseudo.h
diff -u /dev/null pkgsrc/devel/omake/patches/patch-src_clib_fam__pseudo.h:1.1
--- /dev/null   Mon Feb 12 11:03:35 2018
+++ pkgsrc/devel/omake/patches/patch-src_clib_fam__pseudo.h     Mon Feb 12 11:03:35 2018
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_clib_fam__pseudo.h,v 1.1 2018/02/12 11:03:35 dholland Exp $
+
+Don't define own NAME_MAX.
+
+--- src/clib/fam_pseudo.h.orig 2012-11-08 22:16:13.000000000 +0000
++++ src/clib/fam_pseudo.h
+@@ -43,7 +43,10 @@
+ /*
+  * Maximum file name length.
+  */
++#include <limits.h>
++#ifndef NAME_MAX
+ #define NAME_MAX                1024
++#endif
+ 
+ /*
+  * Possible events.