cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to parmap-1.0-rc7, patches committed upstream. ok sthen@

Browse Source 
While here, also tweak the license marker.
This commit is contained in:
jca 2015-09-18 10:43:27 +00:00
parent bcdccc43c2
commit 53bbc8aef2
4 changed files with 5 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devel/ocaml-parmap/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.2 2015/09/17 17:18:34 jca Exp $
# $OpenBSD: Makefile,v 1.3 2015/09/18 10:43:27 jca Exp $
COMMENT = OCaml parallel map primitive for multicores
CATEGORIES = devel
V = 1.0-rc6
REVISION = 0
V = 1.0-rc7
NAME = ocaml-parmap
DISTNAME = ocaml-parmap-$V
DISTFILES = ${DISTNAME}{$V}.tar.gz
@ -14,7 +13,7 @@ MASTER_SITES = https://github.com/rdicosmo/parmap/archive/
HOMEPAGE = https://github.com/rdicosmo/parmap
# GPLv2+
# LGPLv2+ + static linking exception
PERMIT_PACKAGE_CDROM = Yes
MODULES = lang/ocaml
@ -23,11 +22,6 @@ USE_GMAKE = Yes
CONFIGURE_STYLE = gnu
.include <bsd.port.arch.mk>
.if !${PROPERTIES:Mocaml_native_dynlink}
MAKE_FLAGS+= CMXSLIBS=
.endif
FAKE_FLAGS = DESTDIR=${WRKINST}${TRUEPREFIX}
TEST_TARGET = tests

4
devel/ocaml-parmap/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ocaml-parmap-1.0-rc6.tar.gz) = JeLusuyLHe3IBnRD3c3fSrD/Ljgh2oiDOBRq9p6P2eY=
SIZE (ocaml-parmap-1.0-rc6.tar.gz) = 97083
SHA256 (ocaml-parmap-1.0-rc7.tar.gz) = uZPUe4uOU0KDm4UbRqulImS0+MUn2wjzEk7Xp95+GRI=
SIZE (ocaml-parmap-1.0-rc7.tar.gz) = 97799

29
devel/ocaml-parmap/patches/patch-Makefile_in
View File

@ -1,29 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.1 2015/09/17 17:18:34 jca Exp $
Fixed in https://github.com/rdicosmo/parmap/commit/58f56f50c3af179c33bb3e55b0b22190e85208a3
--- Makefile.in.orig Mon Feb 9 11:42:28 2015
+++ Makefile.in Wed Sep 16 21:19:13 2015
@@ -46,12 +46,11 @@ CMXSLIBS=
ALIBS=
ifeq ("@OCAMLBEST@","opt")
+ ALIBS = $(BYTELIBS:%.cma=%.a)
OPTLIBS += $(BYTELIBS:%.cma=%.cmxa)
CMXSLIBS += $(BYTELIBS:%.cma=%.cmxs)
endif
-ALIBS = $(BYTELIBS:%.cma=%.a)
-
all:
$(OCAMLBUILD) $(OBFLAGS) $(BYTELIBS) $(OPTLIBS) $(CMXSLIBS) $(ALIBS)
@@ -86,7 +85,7 @@ install: $(LIBS) META
$(INSTALL) -patch-version $(VERSION) $(NAME) $(INSTALL_STUFF)
(cd _build; ocamldoc -man -man-mini parmap.ml parmap.mli)
test -d $(MANDIR) || mkdir -p $(MANDIR)
- cp -a _build/Parmap.3o $(MANDIR)
+ cp -p _build/Parmap.3o $(MANDIR)
uninstall:
$(UNINSTALL) $(NAME)

17
devel/ocaml-parmap/patches/patch-configure
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-configure,v 1.1 2015/09/17 17:18:34 jca Exp $
Fixed in https://github.com/rdicosmo/parmap/commit/a276c4ac61d5f06f1f966a88a551892f290bbb40
--- configure.orig Mon Sep 14 20:17:21 2015
+++ configure Mon Sep 14 20:18:32 2015
@@ -4379,8 +4379,8 @@ _ACEOF
ac_config_headers="$ac_config_headers config.h"
-t=`$OCAMLBUILD -use-ocamlfind &> /dev/null; echo $?`
-if test $t == 0 ; then
+t=`$OCAMLBUILD -use-ocamlfind >/dev/null 2>&1; echo $?`
+if test "$t" = 0 ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ocaml version $OCAMLVERSION. Use standard Makefile" >&5
$as_echo "ocaml version $OCAMLVERSION. Use standard Makefile" >&6; }
ac_config_files="$ac_config_files Makefile"