Switch to using new files Mk/bsd.ocaml.mk [1] and Mk/bsd.xfce.mk [2].

PR:	101029 [1], 108862 [2]

Submitted by:	Stanislav Sedov <ssedov at mbsd dot msk dot ru> [1], oliver [2]

15 files changed, 3 insertions, 21 deletions

diff --git a/devel/aifad/Makefile b/devel/aifad/Makefile
index 1eb594d9ca81..4fd66ec8eb0d 100644
--- a/devel/aifad/Makefile
+++ b/devel/aifad/Makefile
@@ -31,7 +31,6 @@ SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}
 DOCS=	README.txt TODO
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin/
diff --git a/devel/ocaml-annexlib/Makefile b/devel/ocaml-annexlib/Makefile
index 1263af59168b..9269f9790d11 100644
--- a/devel/ocaml-annexlib/Makefile
+++ b/devel/ocaml-annexlib/Makefile
@@ -34,7 +34,6 @@ PORTDOCS=	*
 .endif
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk"
 
 post-extract:
 # For nonstandard prefixes
diff --git a/devel/ocaml-camljava/Makefile b/devel/ocaml-camljava/Makefile
index 800da4d3a516..0499eaa97500 100644
--- a/devel/ocaml-camljava/Makefile
+++ b/devel/ocaml-camljava/Makefile
@@ -20,7 +20,6 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk"
 
 post-extract:
 	@${REINPLACE_CMD} -e "s,^\(JAVAC=\).*,\1${JAVAC},g" \
diff --git a/devel/ocaml-camomile/Makefile b/devel/ocaml-camomile/Makefile
index 6f9cbaf422e7..3687f93ae9de 100644
--- a/devel/ocaml-camomile/Makefile
+++ b/devel/ocaml-camomile/Makefile
@@ -31,7 +31,6 @@ PLIST_FILES=	bin/camomilecharmap \
 		bin/camomilelocaledef
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk"
 
 .if ${OSVERSION} < 500000
 BROKEN=		Need working <wctype.h>
diff --git a/devel/ocaml-cfg/Makefile b/devel/ocaml-cfg/Makefile
index 9e3eb5af37fd..993f312324df 100644
--- a/devel/ocaml-cfg/Makefile
+++ b/devel/ocaml-cfg/Makefile
@@ -33,7 +33,6 @@ COPYTREE_SHARE=	${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \
 		${FIND} $$1/ -type f -exec ${CHMOD} ${SHAREMODE} {} \;' --
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk"
 
 post-extract:
 # For nonstandard prefixes
diff --git a/devel/ocaml-lacaml/Makefile b/devel/ocaml-lacaml/Makefile
index b15e36c399f7..2e3523ae2501 100644
--- a/devel/ocaml-lacaml/Makefile
+++ b/devel/ocaml-lacaml/Makefile
@@ -40,7 +40,6 @@ COPYTREE_SHARE=	${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \
 		${FIND} $$1/ -type f -exec ${CHMOD} ${SHAREMODE} {} \;' --
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk"
 
 post-extract:
 #
diff --git a/devel/ocaml-pcre/Makefile b/devel/ocaml-pcre/Makefile
index 66a77a08da2d..a31919e189bf 100644
--- a/devel/ocaml-pcre/Makefile
+++ b/devel/ocaml-pcre/Makefile
@@ -40,6 +40,4 @@ post-install:
 	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}/)
 .endif
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/ocaml-pomap/Makefile b/devel/ocaml-pomap/Makefile
index d7eee5680e2f..7a1d0b6526da 100644
--- a/devel/ocaml-pomap/Makefile
+++ b/devel/ocaml-pomap/Makefile
@@ -33,7 +33,6 @@ COPYTREE_SHARE=	${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \
 		${FIND} $$1/ -type f -exec ${CHMOD} ${SHAREMODE} {} \;' --
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk"
 
 post-extract:
 # For nonstandard prefixes
diff --git a/devel/ocaml-res/Makefile b/devel/ocaml-res/Makefile
index 5d6d74ab7dfb..f08718d20f23 100644
--- a/devel/ocaml-res/Makefile
+++ b/devel/ocaml-res/Makefile
@@ -33,7 +33,6 @@ COPYTREE_SHARE=	${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \
 		${FIND} $$1/ -type f -exec ${CHMOD} ${SHAREMODE} {} \;' --
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk"
 
 post-extract:
 # For nonstandard prefixes
diff --git a/devel/ocaml-sdl/Makefile b/devel/ocaml-sdl/Makefile
index 27961a703c38..1460abf69c1b 100644
--- a/devel/ocaml-sdl/Makefile
+++ b/devel/ocaml-sdl/Makefile
@@ -40,7 +40,6 @@ INFO=	ocamlsdl
 .endif
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk"
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/devel/ocaml-sexplib/Makefile b/devel/ocaml-sexplib/Makefile
index 57dbd7c2e9fc..8ec611b929a9 100644
--- a/devel/ocaml-sexplib/Makefile
+++ b/devel/ocaml-sexplib/Makefile
@@ -22,7 +22,6 @@ USE_OCAML_FINDLIB=yes
 DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk"
 
 post-extract:
 # For nonstandard prefixes
diff --git a/devel/ocaml-xstr/Makefile b/devel/ocaml-xstr/Makefile
index 6b35c17ae54a..a301c997f7c1 100644
--- a/devel/ocaml-xstr/Makefile
+++ b/devel/ocaml-xstr/Makefile
@@ -20,6 +20,4 @@ USE_GMAKE=	yes
 USE_OCAML=	yes
 USE_OCAML_FINDLIB=yes
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/ocaml-xstrp4/Makefile b/devel/ocaml-xstrp4/Makefile
index a4929d9a7e45..b3d575ae92e1 100644
--- a/devel/ocaml-xstrp4/Makefile
+++ b/devel/ocaml-xstrp4/Makefile
@@ -22,7 +22,6 @@ USE_OCAML_FINDLIB=yes
 EXAMPLESDIR=	${PREFIX}/share/examples/ocaml/${PORTNAME}
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk"
 
 post-extract:
 # For nonstandard prefixes
diff --git a/devel/omake/Makefile b/devel/omake/Makefile
index 00b292490909..092b9e1e1ab1 100644
--- a/devel/omake/Makefile
+++ b/devel/omake/Makefile
@@ -27,7 +27,6 @@ MAN1=	omake-base.1 omake-doc.1 omake-language.1 omake-options.1 \
 	omake-shell.1 omake-system.1 omake.1 osh.1
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk"
 
 .if ${OSVERSION} > 500000 && exists(${LOCALBASE}/lib/libreadline.so.5)
 LIB_DEPENDS+=	readline.5:${PORTSDIR}/devel/readline
diff --git a/devel/xfce4-dev-tools/Makefile b/devel/xfce4-dev-tools/Makefile
index 4ba181e944f6..57896b4db1c5 100644
--- a/devel/xfce4-dev-tools/Makefile
+++ b/devel/xfce4-dev-tools/Makefile
@@ -25,6 +25,4 @@ post-patch:
 	@${REINPLACE_CMD} -e '12s|^$$|PATH="$${PATH}:${LOCALBASE}/gnu-autotools/bin"|' \
 		${WRKSRC}/scripts/xdt-autogen.in
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>