Hi,
sorry for the double posting, I forgot to insert the diff.
here again my update for devel/ocaml-pcre. Here's what I have changed:
* Convert to "new style" assignments in Makefine (COMMENT= -> COMMENT =)
* remove the custom flag from the library. (see ocamlc(1) -a option)
* add the same findlib hack I used for ocaml-net.
* Follow the new OCaml naming convention.
* install documentation
this also fixes a problem with ocaml-net when running dynamically
linked programs using Netstring_pcre.
Tested on i386 and amd64. ok?
Christopher
Only in devel/ocaml-pcre: CVS
diff -ru devel/ocaml-pcre/Makefile mystuff/devel/ocaml-pcre/Makefile
--- devel/ocaml-pcre/Makefile Tue May 22 13:46:40 2012
+++ mystuff/devel/ocaml-pcre/Makefile Mon Jul 9 19:38:48 2012
@@ -1,40 +1,55 @@
# $OpenBSD: Makefile,v 1.2 2012/05/22 11:46:40 jasper Exp $
-COMMENT= Objective Caml perl-compatible regexp library
-CATEGORIES= devel textproc
+COMMENT = OCaml perl-compatible regexp library
+CATEGORIES = devel textproc
-V= 6.2.5
-DISTNAME= pcre-ocaml-$V
-PKGNAME= ocaml-pcre-$V
+V = 6.2.5
+DISTNAME = pcre-ocaml-${V}
+PKGNAME = ocaml-pcre-${V}
+REVISION = 1
-HOMEPAGE= http://ocaml.info/home/ocaml_sources.html
+HOMEPAGE = http://ocaml.info/home/ocaml_sources.html
# GPLv2+
-PERMIT_PACKAGE_FTP= Yes
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_DISTFILES_FTP= Yes
-PERMIT_DISTFILES_CDROM= Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_DISTFILES_FTP = Yes
+PERMIT_DISTFILES_CDROM = Yes
-MODULES= lang/ocaml
+MODULES = lang/ocaml
-MASTER_SITES= https://bitbucket.org/mmottl/pcre-ocaml/downloads/
+MASTER_SITES = https://bitbucket.org/mmottl/pcre-ocaml/downloads/
-RUN_DEPENDS= sysutils/findlib
-BUILD_DEPENDS= ${RUN_DEPENDS}
-LIB_DEPENDS= devel/pcre
-WANTLIB= pcre
+RUN_DEPENDS = sysutils/findlib
+BUILD_DEPENDS = ${RUN_DEPENDS}
+LIB_DEPENDS = devel/pcre
+WANTLIB = pcre
-NO_REGRESS= Yes
-USE_GMAKE= Yes
-MAKE_ENV+= OCAMLFIND_INSTFLAGS="-ldconf ignore"
+MAKE_FLAGS = "NO_CUSTOM=y"
+NO_REGRESS = Yes
+USE_GMAKE = Yes
+
+ALL_TARGET = all htdoc
+
pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/ocaml/site-lib/pcre
+ ${INSTALL_DATA_DIR} ${PREFIX}/lib/ocaml/stublibs
+ ln -s ../stublibs ${PREFIX}/lib/ocaml/site-lib/
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ocaml-pcre/html/
+ ${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/ocaml-pcre/
+ ${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/ocaml-pcre/
+ ${INSTALL_DATA} \
+ ${WRKSRC}/lib/doc/pcre/html/* \
+ ${PREFIX}/share/doc/ocaml-pcre/html/
+post-install:
+
.include <bsd.port.mk>
.if ${MODOCAML_NATIVE:L:Mno}
-WRKSRC= ${WRKDIST}/lib
-ALL_TARGET= byte-code-library
-INSTALL_TARGET= libinstall-byte-code
+WRKSRC = ${WRKDIST}/lib
+ALL_TARGET = byte-code-library htdoc
+INSTALL_TARGET = libinstall-byte-code
.endif
Only in devel/ocaml-pcre/pkg: CVS
diff -ru devel/ocaml-pcre/pkg/DESCR mystuff/devel/ocaml-pcre/pkg/DESCR
--- devel/ocaml-pcre/pkg/DESCR Thu Sep 15 17:50:23 2011
+++ mystuff/devel/ocaml-pcre/pkg/DESCR Mon Jul 9 19:35:39 2012
@@ -1,13 +1,13 @@
-This OCaml-library interfaces the PCRE (Perl-compatible regular expression)
-library which is written in C. it can be used for matching regular expressions
-which are written in the PERL style.
+This OCaml-library interfaces the PCRE (Perl-compatible regular
+expression) library which is written in C. it can be used for matching
+regular expressions which are written in the PERL style.
-It is reentrant - and thus thread safe. This is not the case with the "Str"
-module of OCaml, which builds on the GNU "regex"-library. Using reentrant
-libraries also means more convenience for programmers. They do not have to
-reason about states in which the library might be in.
+It is reentrant - and thus thread safe. This is not the case with the
+"Str" module of OCaml, which builds on the GNU "regex"-library. Using
+reentrant libraries also means more convenience for programmers. They do
+not have to reason about states in which the library might be in.
-The high-level functions for replacement and substitution, all implemented
-in OCaml, are much faster than the ones of the "Str"-module. In fact, when
-compiled to native code, they even seem to be significantly faster than
-those of PERL.
+The high-level functions for replacement and substitution, all
+implemented in OCaml, are much faster than the ones of the "Str"-module.
+In fact, when compiled to native code, they even seem to be
+significantly faster than those of PERL.
diff -ru devel/ocaml-pcre/pkg/PFRAG.shared
mystuff/devel/ocaml-pcre/pkg/PFRAG.shared
--- devel/ocaml-pcre/pkg/PFRAG.shared Thu Sep 15 17:50:23 2011
+++ mystuff/devel/ocaml-pcre/pkg/PFRAG.shared Tue Jul 17 18:56:46 2012
@@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2011/09/15 15:50:23 sthen Exp $
-lib/ocaml/site-lib/pcre/dllpcre_stubs.so
+lib/ocaml/stublibs/dllpcre_stubs.so
diff -ru devel/ocaml-pcre/pkg/PLIST mystuff/devel/ocaml-pcre/pkg/PLIST
--- devel/ocaml-pcre/pkg/PLIST Thu Sep 15 17:50:23 2011
+++ mystuff/devel/ocaml-pcre/pkg/PLIST Tue Jul 17 18:58:04 2012
@@ -7,3 +7,23 @@
lib/ocaml/site-lib/pcre/pcre.cma
lib/ocaml/site-lib/pcre/pcre.cmi
lib/ocaml/site-lib/pcre/pcre.mli
+@comment lib/ocaml/site-lib/stublibs
+@comment lib/ocaml/stublibs/
+@comment lib/ocaml/stublibs/dllpcre_stubs.so.owner
+share/doc/ocaml-pcre/
+share/doc/ocaml-pcre/LICENSE
+share/doc/ocaml-pcre/README.txt
+share/doc/ocaml-pcre/html/
+share/doc/ocaml-pcre/html/Pcre.html
+share/doc/ocaml-pcre/html/index.html
+share/doc/ocaml-pcre/html/index_attributes.html
+share/doc/ocaml-pcre/html/index_class_types.html
+share/doc/ocaml-pcre/html/index_classes.html
+share/doc/ocaml-pcre/html/index_exceptions.html
+share/doc/ocaml-pcre/html/index_methods.html
+share/doc/ocaml-pcre/html/index_module_types.html
+share/doc/ocaml-pcre/html/index_modules.html
+share/doc/ocaml-pcre/html/index_types.html
+share/doc/ocaml-pcre/html/index_values.html
+share/doc/ocaml-pcre/html/style.css
+share/doc/ocaml-pcre/html/type_Pcre.html
