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

update to cudf-0.9

Browse Source 
ok chrisz@ krw@
This commit is contained in:
jasper 2017-09-16 09:03:15 +00:00
parent be3af1625e
commit 65e0a4d731
4 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
devel/cudf/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2016/08/19 12:51:19 krw Exp $
# $OpenBSD: Makefile,v 1.8 2017/09/16 09:03:15 jasper Exp $
MULTI_PACKAGES = -ocaml -main
@ -7,13 +7,12 @@ COMMENT-main = CUDF library (C bindings)
CATEGORIES = devel sysutils
VERSION = 0.8
VERSION = 0.9
DISTNAME = cudf-${VERSION}
PKGNAME-ocaml = ocaml-cudf-${VERSION}
PKGNAME-main = libcudf-${VERSION}
REVISION= 0
MASTER_SITES = https://gforge.inria.fr/frs/download.php/latestfile/4606/
MASTER_SITES = https://gforge.inria.fr/frs/download.php/file/36602/
HOMEPAGE = http://www.mancoosi.org/cudf/
@ -49,12 +48,10 @@ TEST_TARGET += c-lib-test
docdir = ${PREFIX}/share/doc/cudf/
post-install:
-rm -f ${PREFIX}/lib/ocaml/cudf/*.o
-rm ${PREFIX}/lib/ocaml/cudf/*.o
${INSTALL_DATA_DIR} ${docdir}/api/
${INSTALL_DATA} ${WRKSRC}/{ChangeLog,COPYING,README} ${docdir}
${INSTALL_DATA} ${WRKSRC}/cudf.docdir/* ${docdir}/api/
.include <bsd.port.mk>

4
devel/cudf/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (cudf-0.8.tar.gz) = BvjOAZyHiT4n1UW1z43DgEFlekxIVsAr5OmegXWHQik=
SIZE (cudf-0.8.tar.gz) = 55147
SHA256 (cudf-0.9.tar.gz) = mTLk2V3OI1sUNIYv84nM3reiirf0AuozG5ZzLCmn4Rw=
SIZE (cudf-0.9.tar.gz) = 55124

11
devel/cudf/patches/patch-Makefile
View File

@ -1,8 +1,9 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2014/10/25 12:50:29 chrisz Exp $
$OpenBSD: patch-Makefile,v 1.2 2017/09/16 09:03:15 jasper Exp $
- subdirs need gmake too
--- Makefile.orig Tue Apr 29 20:52:44 2014
+++ Makefile Tue Sep 2 19:57:12 2014
@@ -39,13 +39,13 @@ doc/cudf-check.1: doc/cudf-check.pod
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -47,13 +47,13 @@ doc/cudf-check.1: doc/cudf-check.pod
.PHONY: c-lib c-lib-opt doc
c-lib:
@ -20,7 +21,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2014/10/25 12:50:29 chrisz Exp $
$(OCAMLBUILD) $(OBFLAGS) -clean
rm -rf $(NAME)-*.gz $(NAME)_*.gz $(NAME)-*/
@@ -64,7 +64,7 @@ test: test.byte
@@ -72,7 +72,7 @@ test: test.byte
./$< -verbose
@echo
c-lib-test:

23
devel/cudf/patches/patch-c-lib_Makefile
View File

@ -1,12 +1,13 @@
$OpenBSD: patch-c-lib_Makefile,v 1.1.1.1 2014/10/25 12:50:29 chrisz Exp $
$OpenBSD: patch-c-lib_Makefile,v 1.2 2017/09/16 09:03:15 jasper Exp $
- OpenBSD doesn't need libdl
- use pkg-config to find glib libs
- make sure libcamlrun.a is writable after copying it from system libs
- don't attempt to overwrite an optimized library with a non-existant one
- fix .pc datarootdir
--- c-lib/Makefile.orig Tue Apr 29 20:52:44 2014
+++ c-lib/Makefile Tue Sep 2 20:17:50 2014
@@ -9,7 +9,7 @@ PROG_CFLAGS = -Wall
Index: c-lib/Makefile
--- c-lib/Makefile.orig
+++ c-lib/Makefile
@@ -13,7 +13,7 @@ PROG_CFLAGS = -Wall
OCAML_LIBDIR := $(shell ocamlc -where)
INCLUDES = -I . -I $(OCAML_LIBDIR) $(shell pkg-config --cflags glib-2.0)
CUDF_LDFLAGS = -L$(OCAML_LIBDIR) -L$(CURDIR)
@ -15,7 +16,7 @@ $OpenBSD: patch-c-lib_Makefile,v 1.1.1.1 2014/10/25 12:50:29 chrisz Exp $
OCAMLC = ocamlfind ocamlc -package unix,extlib
OCAMLOPT = ocamlfind ocamlopt -package unix,extlib
@@ -17,9 +17,11 @@ INSTALL_STUFF = libcudf.a cudf.h cudf.pc
@@ -21,9 +21,11 @@ INSTALL_STUFF = libcudf.a cudf.h cudf.pc
libcudf.a: cudf-caml.o cudf.o
cp $(OCAML_LIBDIR)/libcamlrun.a $@
@ -27,7 +28,7 @@ $OpenBSD: patch-c-lib_Makefile,v 1.1.1.1 2014/10/25 12:50:29 chrisz Exp $
ar r $@ $^
../_build/%:
@@ -49,6 +51,7 @@ cudf.pc: cudf.pc.in
@@ -53,6 +55,7 @@ cudf.pc: cudf.pc.in
-e "s,@VERSION@,$(VERSION),g" \
-e "s,@LIBDIR@,$(LIBDIR),g" \
-e "s,@INCDIR@,$(INCDIR),g" \
@ -35,11 +36,11 @@ $OpenBSD: patch-c-lib_Makefile,v 1.1.1.1 2014/10/25 12:50:29 chrisz Exp $
> $@
%.o: %.c
@@ -68,7 +71,6 @@ install: cudf.pc
@@ -72,7 +75,6 @@ install: cudf.pc
else \
cp libcudf.a $(DESTDIR)/$(LIBDIR)/libcudf.a ; \
cp libcudf.a $(DESTDIR)$(LIBDIR)/libcudf.a ; \
fi
- cp libcudf.a $(DESTDIR)/$(LIBDIR)
cp cudf.h $(DESTDIR)/$(INCDIR)
cp cudf.pc $(DESTDIR)/$(PCDIR)
- cp libcudf.a $(DESTDIR)$(LIBDIR)
cp cudf.h $(DESTDIR)$(INCDIR)
cp cudf.pc $(DESTDIR)$(PCDIR)