- Update to 0.5.2.1; fixes build with new ocaml libraries

- Use bsd.ocaml.mk features
- Use OPTIONS
- Grab maintainership

2 files changed, 39 insertions, 62 deletions

diff --git a/lang/cduce/Makefile b/lang/cduce/Makefile
index 8fef97a15f76..af071c9c0221 100644
--- a/lang/cduce/Makefile
+++ b/lang/cduce/Makefile
@@ -5,66 +5,68 @@
 # $FreeBSD$
 
 PORTNAME=	cduce
-PORTVERSION=	0.4.1
-PORTREVISION=	2
+PORTVERSION=	0.5.2.1
 CATEGORIES=	lang
-MASTER_SITES=	http://www.cduce.org/download/
+MASTER_SITES=	http://www.cduce.org/download/ \
+		ftp://ftp.stack.nl/pub/users/johans/cduce/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	johans@stack.nl
 COMMENT=	An efficient XML centric functionnal programming language
 
 LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
-BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
-		ocamlfind:${PORTSDIR}/devel/ocaml-findlib \
-		${LOCALBASE}/lib/ocaml/site-lib/ulex/ulexing.a:${PORTSDIR}/devel/ocaml-ulex \
-		${LOCALBASE}/lib/ocaml/site-lib/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre \
-		${LOCALBASE}/lib/ocaml/site-lib/netstring/netstring.a:${PORTSDIR}/www/ocaml-net
-RUN_DEPENDS=	ocamlfind:${PORTSDIR}/devel/ocaml-findlib
+BUILD_DEPENDS=	${SITELIBDIR}/ulex/ulexing.a:${PORTSDIR}/devel/ocaml-ulex \
+		${SITELIBDIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre \
+		${SITELIBDIR}/netstring/netstring.a:${PORTSDIR}/www/ocaml-net
+
+USE_OCAML=	true
+USE_OCAML_FINDLIB=	true
+USE_OCAML_LDCONFIG=	true
+
+OPTIONS=	OCURL		"Enable url support via ftp/ocaml-ocurl" Off \
+		OCAML_EXPAT	"Enable support for the Expat XML parser" Off \
+		MLIFACE		"Enable building OCaml/CDuce interface" On
+
+USE_GMAKE=	yes
+ALL_TARGET=	all
+INSTALL_TARGET=	install
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix=${PREFIX} --with-ocamlopt --with-cgi --without-netclient --without-pxp_wlex
+SITELIBDIR=	${LOCALBASE}/${OCAML_SITELIBDIR}
+WRKSRC=		${WRKDIR}/${DISTNAME:R}
+
+MAN1=		cduce.1 cduce_mktop.1 dtd2cduce.1
+
+PLIST_FILES=	bin/cduce bin/dtd2cduce
+
+.include <bsd.port.pre.mk>
 
 # Support for url via ftp/ocaml-ocurl
 .if defined(WITH_OCURL)
-BROKEN=		error while linking curl.cma - please do not enable Curl support until fixed.
-BUILD_DEPENDS+=	${LOCALBASE}/lib/ocaml/site-lib/curl/curl.cmi:${PORTSDIR}/ftp/ocaml-ocurl
+BUILD_DEPENDS+=	${SITELIBDIR}/curl/curl.cmi:${PORTSDIR}/ftp/ocaml-ocurl
 .endif
 
 # Support for the PXP XML parser
 .if defined(WITH_OCAML_EXPAT)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/ocaml/site-lib/expat/expat.cmi:${PORTSDIR}/textproc/ocaml-expat
+CONFIGURE_ARGS+=	--with-expat --without-pxp
+BUILD_DEPENDS+=		${SITELIBDIR}/expat/expat.cmi:${PORTSDIR}/textproc/ocaml-expat
 .else
-BUILD_DEPENDS+=	${LOCALBASE}/lib/ocaml/site-lib/pxp-engine/pxp_engine.cma:${PORTSDIR}/textproc/ocaml-pxp
+CONFIGURE_ARGS+=	--without-expat --with-pxp
+BUILD_DEPENDS+=		${SITELIBDIR}/pxp-engine/pxp_engine.cma:${PORTSDIR}/textproc/ocaml-pxp
 .endif
 
-# Configure : use ocamlopt and don't look for netclient or pxp_wlex
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} --with-ocamlopt --without-netclient --without-pxp_wlex
-
 # Be sure to not build ocurl support if WITH_OCURL is not defined,
 # even if ocurl is present.
 .if !defined(WITH_OCURL)
 CONFIGURE_ARGS+=	--without-curl
 .endif
 
-# Be sure to build with PXP or expat but not both.
-.if defined(WITH_OCAML_EXPAT)
-CONFIGURE_ARGS+=	--with-expat --without-pxp
-.else
-CONFIGURE_ARGS+=	--without-expat --with-pxp
-.endif
-
 # Support for OCaml/CDuce interface
 .if !defined(WITHOUT_MLIFACE)
+PLIST_FILES+=	bin/cduce_mktop
 BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/lang/ocaml:patch
 CONFIGURE_ARGS+=	--mliface=`cd ${PORTSDIR}/lang/ocaml; ${MAKE} -V WRKSRC`
 .endif
 
-USE_GMAKE=	yes
-
-ALL_TARGET=	all
-
-INSTALL_TARGET=	install
-
-MAKE_ENV=	OCAMLFIND_DESTDIR="${PREFIX}/lib/ocaml/site-lib"
-
 .if !defined(NOPORTDOCS)
 CONFIGURE_ARGS+=	--docdir=${PREFIX}/share/doc/${PORTNAME}
 ALL_TARGET+=		doc
@@ -72,23 +74,7 @@ INSTALL_TARGET+=	install_doc
 PORTDOCS=		*
 .endif
 
-MAN1=		cduce.1 cduce_mktop.1 dtd2cduce.1
-
-PKGDEINSTALL=	${PKGINSTALL}
-FINDLIB_PKGNAME=${PORTNAME}
-
-PLIST_FILES=	bin/cduce bin/dtd2cduce
-
-.if !defined(WITHOUT_MLIFACE)
-PLIST_FILES+=	bin/cduce_mktop
-.endif
-
 post-install:
-	@${FIND} ${PREFIX}/lib/ocaml/site-lib/${FINDLIB_PKGNAME} -type f | \
-		${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
-	@${ECHO_CMD} "@dirrm lib/ocaml/site-lib/${FINDLIB_PKGNAME}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ocamlfind remove ${FINDLIB_PKGNAME} 2>/dev/null || true" >> ${TMPPLIST}
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .if defined(WITH_OCAML_EXPAT)
 	@${ECHO_CMD} "****************************************************************"
 	@${ECHO_CMD} "* You choose Expat as XML parser, you may encounter some error *"
@@ -96,13 +82,4 @@ post-install:
 	@${ECHO_CMD} "****************************************************************"
 .endif
 
-pre-everything::
-	@${ECHO} ""
-	@${ECHO} "You may define the following build options:"
-	@${ECHO} ""
-	@${ECHO} "	WITH_CURL		Enable url support via ftp/ocaml-ocurl (=> no url support by default)"
-	@${ECHO} "	WITH_OCAML_EXPAT	Enable support for the Expat XML parser."
-	@${ECHO} "	WITHOUT_MLIFACE		Disable building OCaml/CDuce interface."
-	@${ECHO} ""
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/cduce/distinfo b/lang/cduce/distinfo
index 353a90f1c711..cc9696ba4a56 100644
--- a/lang/cduce/distinfo
+++ b/lang/cduce/distinfo
@@ -1,3 +1,3 @@
-MD5 (cduce-0.4.1.tar.gz) = f4d0f973c8e6311b08aa0d73e638caac
-SHA256 (cduce-0.4.1.tar.gz) = cb6b69f5903b55879ebb2cddb48cbe7d3c0408960c898ad1d7e7959cbfd3f1e2
-SIZE (cduce-0.4.1.tar.gz) = 382908
+MD5 (cduce-0.5.2.1.tar.gz) = d2d52bf536c1a8f4397b4c64794d9322
+SHA256 (cduce-0.5.2.1.tar.gz) = 4edd13db651a26d0ce4751f7634eec11b06284839c31f47299a99af7b162b683
+SIZE (cduce-0.5.2.1.tar.gz) = 595196