Hi again,

I had some problems dynamically linking against this library. Therefore
another diff for this port which fixes this (NO_CUSTOM=yes) and also
installs the Documentation. I also moved the .so file
to /usr/local/lib/ocaml/stublibs which is mentioned
in /usr/local/lib/ocaml/ld.conf.


Christopher


Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/ocaml-pcre/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile    22 May 2012 11:46:40 -0000      1.2
+++ Makefile    24 May 2012 18:10:36 -0000
@@ -6,6 +6,7 @@ CATEGORIES=     devel textproc
 V=             6.2.5
 DISTNAME=      pcre-ocaml-$V
 PKGNAME=       ocaml-pcre-$V
+REVISION=      1
 
 HOMEPAGE=      http://ocaml.info/home/ocaml_sources.html
 
@@ -24,17 +25,31 @@ BUILD_DEPENDS=      ${RUN_DEPENDS}
 LIB_DEPENDS=   devel/pcre
 WANTLIB=       pcre
 
+MAKE_FLAGS=    "NO_CUSTOM=y"
+
 NO_REGRESS=    Yes
 USE_GMAKE=     Yes
-MAKE_ENV+=     OCAMLFIND_INSTFLAGS="-ldconf ignore"
+
+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
+ALL_TARGET=    byte-code-library htdoc
 INSTALL_TARGET=        libinstall-byte-code
 .endif
Index: pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/devel/ocaml-pcre/pkg/PFRAG.shared,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PFRAG.shared
--- pkg/PFRAG.shared    15 Sep 2011 15:50:23 -0000      1.1.1.1
+++ pkg/PFRAG.shared    24 May 2012 18:10:36 -0000
@@ -1,2 +1,3 @@
 @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/
+lib/ocaml/stublibs/dllpcre_stubs.so
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/ocaml-pcre/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   15 Sep 2011 15:50:23 -0000      1.1.1.1
+++ pkg/PLIST   24 May 2012 18:10:36 -0000
@@ -7,3 +7,20 @@ lib/ocaml/site-lib/pcre/libpcre_stubs.a
 lib/ocaml/site-lib/pcre/pcre.cma
 lib/ocaml/site-lib/pcre/pcre.cmi
 lib/ocaml/site-lib/pcre/pcre.mli
+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


Reply via email to