Index: head/devel/ocaml-pcre/files/extra-patch--Wno-keyword-macro =================================================================== --- head/devel/ocaml-pcre/files/extra-patch--Wno-keyword-macro (revision 430928) +++ head/devel/ocaml-pcre/files/extra-patch--Wno-keyword-macro (nonexistent) @@ -1,35 +0,0 @@ ---- _oasis.orig 2016-02-25 15:20:15 UTC -+++ _oasis -@@ -32,7 +32,7 @@ Library pcre - BuildDepends: bytes - CCOpt: -g -O2 -fPIC -DPIC - if flag(strict) && ccomp_type(cc) -- CCOpt+: -Wall -pedantic -Wextra -Wunused -Wno-long-long -Wno-keyword-macro -+ CCOpt+: -Wall -pedantic -Wextra -Wunused -Wno-long-long - - - # Examples ---- myocamlbuild.ml.orig 2016-02-25 15:20:15 UTC -+++ myocamlbuild.ml -@@ -648,8 +648,6 @@ let package_default = - A "-Wunused"; - A "-ccopt"; -- A "-Wno-long-long"; -- A "-ccopt"; -- A "-Wno-keyword-macro" -+ A "-Wno-long-long" - ]) - ]) - ]; ---- setup.ml.orig 2016-02-25 15:20:15 UTC -+++ setup.ml -@@ -6785,8 +6785,7 @@ let setup_t = - "-pedantic"; - "-Wextra"; - "-Wunused"; -- "-Wno-long-long"; -- "-Wno-keyword-macro" -+ "-Wno-long-long" - ]) - ]; - bs_cclib = [(OASISExpr.EBool true, [])]; Property changes on: head/devel/ocaml-pcre/files/extra-patch--Wno-keyword-macro ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/ocaml-pcre/Makefile =================================================================== --- head/devel/ocaml-pcre/Makefile (revision 430928) +++ head/devel/ocaml-pcre/Makefile (revision 430929) @@ -1,45 +1,38 @@ # Created by: Henrik Motakef # $FreeBSD$ PORTNAME= pcre PORTVERSION= 7.2.3 DISTVERSIONPREFIX= v CATEGORIES= devel PKGNAMEPREFIX= ocaml- MAINTAINER= ports@FreeBSD.org COMMENT= Perl compatible regular expressions for Objective Caml LIB_DEPENDS= libpcre.so:devel/pcre USE_GITHUB= yes GH_ACCOUNT= mmottl GH_PROJECT= ${PORTNAME}-ocaml USE_OCAML= yes USE_OCAML_FINDLIB= yes USE_OCAML_LDCONFIG= yes EXAMPLESDIR= ${OCAML_EXAMPLESDIR}/${PORTNAME} DOCSDIR= ${PREFIX}/share/doc/pcre-ocaml OPTIONS_DEFINE= DOCS EXAMPLES -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -# unknown warning flag for old gcc -EXTRA_PATCHES+= ${FILESDIR}/extra-patch--Wno-keyword-macro -.endif - post-patch: @${REINPLACE_CMD} -e 's|$$prefix"/"share|${STAGEDIR}${PREFIX}/share|' \ - -e '/datarootdir/s|$$pkg_name|&-ocaml|' \ + -e '/datarootdir/s|$$pkg_name|&-ocaml|' \ ${WRKSRC}/setup.ml @${REINPLACE_CMD} -e 's| safe_string,||' ${WRKSRC}/_tags -post-install: +post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - @cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR} + @cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .include