Hi, here comes an update to Camomile 0.8.5. The Camomile build system relies on the cppo OCaml preprocessor, which is not available on OpenBSD. Therefore I use cpp as substitute. To allow this, the indentation of preprocessor directives needs to be removed. This port should be ready for OCaml 4.02. OK?
Christopher Index: Makefile =================================================================== RCS file: /cvs/ports/devel/ocaml-camomile/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- Makefile 22 Aug 2014 22:21:53 -0000 1.5 +++ Makefile 25 Aug 2014 15:25:52 -0000 @@ -4,31 +4,42 @@ COMMENT = unicode library for objective CATEGORIES = devel -V = 0.8.3 -REVISION = 2 -DISTNAME = camomile-${V} -PKGNAME = ocaml-camomile-${V} -EXTRACT_SUFX = .tar.bz2 +V = 0.8.5 +GH_ACCOUNT = yoriyuki +GH_PROJECT = Camomile +GH_TAGNAME = rel-${V} +GH_COMMIT = 07415d3049eaad11914523468904ee117db149e3 +DISTNAME = ${GH_PROJECT}-${V} +WRKSRC = ${WRKDIST}/Camomile +PKGNAME = ocaml-${DISTNAME} -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=camomile/} +HOMEPAGE = https://github.com/yoriyuki/Camomile -HOMEPAGE = http://camomile.sourceforge.net/ - -MAINTAINER = Christopher Zimmermann <madro...@gmerlin.de> +MAINTAINER = Christopher Zimmermann <chr...@openbsd.org> # LGPL >= 2 PERMIT_PACKAGE_CDROM = Yes MODULES = lang/ocaml -BUILD_DEPENDS = sysutils/findlib +BUILD_DEPENDS = sysutils/findlib lang/ocaml,-camlp4 -CONFIGURE_STYLE = gnu dest +CONFIGURE_STYLE = gnu dest autoconf no-autoheader +AUTOCONF_VERSION = 2.69 NO_TEST = Yes USE_GMAKE = Yes +# don't want to port cppo - use cpp as cppo substitute +CONFIGURE_ENV = CPPO="cpp -P" + ALL_TARGET = all dochtml + +post-extract: + touch ${WRKSRC}/.depend + # for cpp remove indentation before preprocessor directives. + echo '1;$$s/^ *#/#/\nwq' |ed -s ${WRKSRC}/camomileLibrary.mlp + echo '1;$$s/^ *#/#/\nwq' |ed -s ${WRKSRC}/camomileLibrary.mlip pre-fake: ${INSTALL_DATA_DIR} ${PREFIX}/lib/ocaml Index: distinfo =================================================================== RCS file: /cvs/ports/devel/ocaml-camomile/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo 18 Aug 2012 22:13:17 -0000 1.2 +++ distinfo 25 Aug 2014 15:25:52 -0000 @@ -1,2 +1,2 @@ -SHA256 (camomile-0.8.3.tar.bz2) = lMjWXUF8kDAfazsh5LAOFRxDSj4tQGw9WzNjhZA08ns= -SIZE (camomile-0.8.3.tar.bz2) = 2646968 +SHA256 (Camomile-0.8.5.tar.gz) = C5UB/Em+B2tpwPmMln+VpcoTACCLGBAjBsaT5FAGVI0= +SIZE (Camomile-0.8.5.tar.gz) = 7302354 Index: patches/patch-Makefile_in =================================================================== RCS file: patches/patch-Makefile_in diff -N patches/patch-Makefile_in --- patches/patch-Makefile_in 13 Jul 2012 08:38:10 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2012/07/13 08:38:10 edd Exp $ - -Upstream bug: -http://sourceforge.net/tracker/?func=detail&aid=3318291&group_id=40603&atid=428416 - ---- Makefile.in.orig Mon Jul 9 19:29:06 2012 -+++ Makefile.in Mon Jul 9 19:29:09 2012 -@@ -70,7 +70,7 @@ OFLAGS = $(OOPTIONS) $(INCLUDES) - # Generic targets - ################# - --all : byte $(OCAMLBEST) opt unidata unimaps charmap_data locale_data -+all : byte $(OCAMLBEST) unidata unimaps charmap_data locale_data - - # Build the library - ################### Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/ocaml-camomile/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 18 Aug 2012 22:13:17 -0000 1.2 +++ pkg/PLIST 25 Aug 2014 15:25:53 -0000 @@ -998,6 +998,7 @@ share/doc/camomile/html/CamomileLibrary. share/doc/camomile/html/CamomileLibrary.CharEncoding.html share/doc/camomile/html/CamomileLibrary.ConfigInt.Type.html share/doc/camomile/html/CamomileLibrary.ConfigInt.html +share/doc/camomile/html/CamomileLibrary.DefaultConfig.html share/doc/camomile/html/CamomileLibrary.Locale.html share/doc/camomile/html/CamomileLibrary.Make.html share/doc/camomile/html/CamomileLibrary.OOChannel.channel_of_stream-c.html @@ -1178,6 +1179,7 @@ share/doc/camomile/html/type_CamomileLib share/doc/camomile/html/type_CamomileLibrary.CharEncoding.html share/doc/camomile/html/type_CamomileLibrary.ConfigInt.Type.html share/doc/camomile/html/type_CamomileLibrary.ConfigInt.html +share/doc/camomile/html/type_CamomileLibrary.DefaultConfig.html share/doc/camomile/html/type_CamomileLibrary.Locale.html share/doc/camomile/html/type_CamomileLibrary.Make.html share/doc/camomile/html/type_CamomileLibrary.OOChannel.channel_of_stream.html -- http://gmerlin.de OpenPGP: http://gmerlin.de/christopher.pub F190 D013 8F01 AA53 E080 3F3C F17F B0A1 D44E 4FEE -- http://gmerlin.de OpenPGP: http://gmerlin.de/christopher.pub F190 D013 8F01 AA53 E080 3F3C F17F B0A1 D44E 4FEE
signature.asc
Description: PGP signature