math/alt-ergo: Update version 0.94 => 0.95.2 and support stage

3 files changed, 25 insertions, 30 deletions

diff --git a/math/alt-ergo/Makefile b/math/alt-ergo/Makefile
index 126c6ba581cf..c895065d9afc 100644
--- a/math/alt-ergo/Makefile
+++ b/math/alt-ergo/Makefile
@@ -2,50 +2,46 @@
 # $FreeBSD$
 
 PORTNAME=	alt-ergo
-PORTVERSION=	0.94
-PORTREVISION=	2
+PORTVERSION=	0.95.2
 CATEGORIES=	math
-MASTER_SITES=	http://alt-ergo.lri.fr/http/alt-ergo-${PORTVERSION}/ LOCAL/bf
+MASTER_SITES=	http://alt-ergo.ocamlpro.com/http/alt-ergo-${PORTVERSION}/
 
 MAINTAINER=	bf@FreeBSD.org
-COMMENT=	An automatic theorem prover dedicated to program verification
+COMMENT=	Automatic solver of mathematical formulas for program verification
 
 LICENSE=	CeCILL-C
 LICENSE_NAME=	Ce[a] C[nrs] I[nria] L[ogiciel] L[ibre] C license, version 1
-LICENSE_FILE=	${WRKSRC}/CeCILL-C
+LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	auto-accept
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/ocaml/ocamlgraph/graph.a:${PORTSDIR}/math/ocaml-ocamlgraph
-RUN_DEPENDS=	${LOCALBASE}/lib/ocaml/ocamlgraph/graph.a:${PORTSDIR}/math/ocaml-ocamlgraph
+BUILD_DEPENDS=	ocaml-zarith>1.2:${PORTSDIR}/math/ocaml-zarith \
+		ocaml-ocamlgraph>1.8:${PORTSDIR}/math/ocaml-ocamlgraph
+RUN_DEPENDS=	ocaml-ocamlgraph>1.8:${PORTSDIR}/math/ocaml-ocamlgraph
 
 GNU_CONFIGURE=	yes
 USES=		gmake
 USE_OCAML=	yes
+ALL_TARGET=	opt pack xpack META
+INSTALL_TARGET=	install install-pack-opt install-pack-byte
 
-MAN1=	alt-ergo.1
+OPTIONS_DEFINE=	GUI
+OPTIONS_DEFAULT=GUI
+OPTIONS_SUB=	yes
 
-OPTIONS_DEFINE=		GUI
-OPTIONS_DEFAULT=	GUI
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGUI}
 BUILD_DEPENDS +=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
 RUN_DEPENDS+=		lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
-ALL_TARGET=	all gui
-INSTALL_TARGET =	install install-gui
-PLIST_SUB+=	GUI=""
-.else
-PLIST_SUB+=	GUI="@comment "
+ALL_TARGET+=		gui
+INSTALL_TARGET+=	install-gui
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '\|^# installation|,\|^# documentation|{ \
 		\|cp -f.*$$(BINDIR)|s|cp -f|${INSTALL_SCRIPT}|; \
 		\|cp -f.*$$(MANDIR)|s|cp -f|${INSTALL_MAN}|; \
-		\|cp -f.*$$(LIBDIR)|s|cp -f|${INSTALL_DATA}|; \
-		\|/usr/share/gtksourceview-2.0|s|/usr|${PREFIX}|; }' \
+		\|cp -f.*$$(LIBDIR)|s|cp -f|${INSTALL_DATA}|; }' \
 		-e 's|make -C|${GMAKE} -C|' \
 			${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -Ee 's@(\+|/)(lablgtk2)@\1site-lib/\2@' \
@@ -58,9 +54,6 @@ pre-configure:
 	${ECHO_MSG} "==> x11-toolkits/ocaml-lablgtk2 to be built" ; \
 	${ECHO_MSG} "==> WITH_GTKSOURCEVIEW2" ; \
 	exit 1; fi)
-
-pre-install:
-	@${MKDIR} ${PREFIX}/share/gtksourceview-2.0/language-specs
-
 .endif
+
 .include <bsd.port.mk>
diff --git a/math/alt-ergo/distinfo b/math/alt-ergo/distinfo
index adcc633d41fb..875a34eec404 100644
--- a/math/alt-ergo/distinfo
+++ b/math/alt-ergo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (alt-ergo-0.94.tar.gz) = bb6ddf947357d587eac4dc3375b712af2c58e46d3f5ab2c8eee5f25a99c2cd6e
-SIZE (alt-ergo-0.94.tar.gz) = 188414
+SHA256 (alt-ergo-0.95.2.tar.gz) = 5a6cd4349c144653be19a1ba4c254bbf626bdfd97c54d1c13ba63e396006eeac
+SIZE (alt-ergo-0.95.2.tar.gz) = 233778
diff --git a/math/alt-ergo/pkg-plist b/math/alt-ergo/pkg-plist
index de2ca2b20183..6e76d6ba3b64 100644
--- a/math/alt-ergo/pkg-plist
+++ b/math/alt-ergo/pkg-plist
@@ -1,10 +1,12 @@
 bin/alt-ergo
 %%GUI%%bin/altgr-ergo
-lib/alt-ergo/altErgo.cmi
-lib/alt-ergo/altErgo.cmo
-lib/alt-ergo/altErgo.cmx
-lib/alt-ergo/altErgo.o
+lib/ocaml/alt-ergo/META
+lib/ocaml/alt-ergo/altErgo.cmi
+lib/ocaml/alt-ergo/altErgo.cmo
+lib/ocaml/alt-ergo/altErgo.cmx
+lib/ocaml/alt-ergo/altErgo.o
+man/man1/alt-ergo.1.gz
 share/gtksourceview-2.0/language-specs/alt-ergo.lang
 @dirrmtry share/gtksourceview-2.0/language-specs
 @dirrmtry share/gtksourceview-2.0
-@dirrm lib/alt-ergo
+@dirrm lib/ocaml/alt-ergo