Index: head/Mk/bsd.ocaml.mk =================================================================== --- head/Mk/bsd.ocaml.mk (revision 385412) +++ head/Mk/bsd.ocaml.mk (revision 385413) @@ -1,189 +1,222 @@ # ex:ts=4 # # $MBSDlabs: portmk/bsd.ocaml.mk,v 1.18 2006/08/06 18:47:23 stas Exp $ # $FreeBSD$ # # bsd.ocaml.mk - Support for the Objective Caml language packages # # Author: Stanislav Sedov # # Feel free to send any comments and suggestions to maintainer. # # Currently recognised variables are: # # USE_OCAML - Set if your port uses OCaml to build/install. # NO_OCAML_BUILDDEPENDS - Don't add ocamlc to BUILD|EXTRACT|PATCH_DEPENDS. # NO_OCAML_RUNDEPENDS - Don't add ocamlc to RUN_DEPENDS. # USE_OCAML_FINDLIB - Set if your port uses ocamlfind to install # packages. Package direcories will be # automatically deleted. +# USE_OCAML_CAMLP4 - Set if your port uses camlp4 to build. +# USE_OCAML_TK - Set if you port needs ocaml-labltk. +# NO_OCAMLTK_BUILDDEPENDS - Don't add labltk to BUILD|EXTRACT|PATCH_DEPENDS. +# NO_OCAMLTK_RUNDEPENDS - Don't add labltk to RUN_DEPENDS. # USE_OCAML_LDCONFIG - Set if your port installs shared libraries # into ocaml site-lib dir. OCaml ld.conf file # will be automatically processed. # USE_OCAMLFIND_PLIST - Add contents of findlib target directories # automatically. # USE_OCAML_WASH - Set if your port wants to automatically # purge shared Ocaml dirs on uninstall. It's # useful when installing to non-standard PREFIX # OCAML_PKGDIRS - Directories under site-lib to be processed # if USE_OCAML_FINDLIB specified. # Default: ${PORTNAME} # OCAML_LDLIBS - Directories under PREFIX to be automatically # added/removed from ld.conf # Default: ${OCAML_SITELIBDIR}/${PORTNAME} .if !defined(OCAML_include) OCAML_MAINTAINER= ports@FreeBSD.org OCAML_include= bsd.ocaml.mk # # OCaml programs location # OCAMLC?= ${LOCALBASE}/bin/ocamlc OCAMLC_OPT?= ${LOCALBASE}/bin/ocamlc.opt OCAMLCP?= ${LOCALBASE}/bin/ocamlcp OCAMLFIND?= ${LOCALBASE}/bin/ocamlfind +CAMLP4?= ${LOCALBASE}/bin/camlp4 +OCAMLTK?= ${LOCALBASE}/bin/labltk # # OCaml library directory # OCAML_LIBDIR?= lib/ocaml # # Where to install site libraries # OCAML_SITELIBDIR?= ${OCAML_LIBDIR}/site-lib # # OCaml compiler port dependency # OCAMLC_PORT?= ${PORTSDIR}/lang/ocaml OCAMLC_DEPEND?= ${OCAMLC}:${OCAMLC_PORT} # # OCaml package manager port dependency # OCAMLFIND_PORT?= ${PORTSDIR}/devel/ocaml-findlib OCAMLFIND_DEPEND?= ${OCAMLFIND}:${OCAMLFIND_PORT} # +# OCaml camlp4 port dependency +# +CAMLP4_PORT?= ${PORTSDIR}/devel/ocaml-camlp4 +CAMLP4_DEPEND?= ${CAMLP4}:${CAMLP4_PORT} + +# +# OCaml TK bindings dependency +# +OCAMLTK_PORT?= ${PORTSDIR}/x11-toolkits/ocaml-labltk +OCAMLTK_DEPENDS?= ${OCAMLTK}:${OCAMLTK_PORT} + +# # Common OCaml examples and documents location # OCAML_DOCSDIR= ${PREFIX}/share/doc/ocaml OCAML_EXAMPLESDIR= ${PREFIX}/share/examples/ocaml # # Location of OCaml ld.conf file # OCAML_LDCONF?= ${OCAML_LIBDIR}/ld.conf # ocaml-findlib-1.4.1_1 wants to edit our ld.conf file, which does not # work well with staging. .if defined(USE_OCAML_LDCONFIG) . if !target(ocaml-ldconfig) OCAMLFIND_LDCONF?= /dev/null . endif .endif OCAMLFIND_DESTDIR?= ${PREFIX}/${OCAML_SITELIBDIR} OCAMLFIND_LDCONF?= ${PREFIX}/${OCAML_LDCONF} .if defined(USE_OCAML) . if !defined(NO_OCAML_BUILDDEPENDS) EXTRACT_DEPENDS+= ${OCAMLC_DEPEND} PATCH_DEPENDS+= ${OCAMLC_DEPEND} BUILD_DEPENDS+= ${OCAMLC_DEPEND} . endif . if !defined(NO_OCAML_RUNDEPENDS) RUN_DEPENDS+= ${OCAMLC_DEPEND} . endif PLIST_SUB+= OCAML_SITELIBDIR="${OCAML_SITELIBDIR}" .endif .if defined(USE_OCAML_FINDLIB) || defined(USE_OCAML_LDCONFIG) . if !target(post-install-script) post-install-script: ocaml-findlib ocaml-ldconfig ocaml-wash . endif .endif .if defined(USE_OCAML_FINDLIB) # # We'll additionally add ocamlfind to RUN_DEPENDS, since # if the port requires ocamlfind to install - it requires # some ocaml libraries and these libraries RUN_DEPENDS on # ocamlfind # BUILD_DEPENDS+= ${OCAMLFIND_DEPEND} RUN_DEPENDS+= ${OCAMLFIND_DEPEND} MAKE_ENV+= OCAMLFIND_DESTDIR="${STAGEDIR}${OCAMLFIND_DESTDIR}" \ OCAMLFIND_LDCONF="${OCAMLFIND_LDCONF}" # # Directories under site-lib to process automatically # OCAML_PKGDIRS?= ${PORTNAME} . if !target(ocaml-findlib) ocaml-findlib: . for DIR in ${OCAML_PKGDIRS} . if defined(USE_OCAMLFIND_PLIST) @${FIND} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${DIR}/ -type f -print | ${SED} -e \ 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} . endif @${ECHO_CMD} "@unexec ${OCAMLFIND} remove ${DIR} 2>/dev/null" \ >> ${TMPPLIST} . endfor +. endif +.endif + +.if defined(USE_OCAML_CAMLP4) +BUILD_DEPENDS+= ${CAMLP4_DEPEND} +.endif + +.if defined(USE_OCAML_TK) +. if !defined(NO_OCAMLTK_BUILDDEPENDS) +EXTRACT_DEPENDS+= ${OCAMLTK_DEPENDS} +PATCH_DEPENDS+= ${OCAMLTK_DEPENDS} +BUILD_DEPENDS+= ${OCAMLTK_DEPENDS} +. endif +. if !defined(NO_OCAMLTK_RUNDEPENDS) +RUN_DEPENDS+= ${OCAMLTK_DEPENDS} . endif .endif .if defined(USE_OCAML_LDCONFIG) # # Directories under PREFIX for appending to ld.conf # OCAML_LDLIBS?= ${OCAML_SITELIBDIR}/${PORTNAME} . if !target(ocaml-ldconfig) ocaml-ldconfig: . for LIB in ${OCAML_LDLIBS} @${ECHO_CMD} "@exec ${ECHO_CMD} "%D/${LIB}" >> %D/${OCAML_LDCONF}" \ >> ${TMPPLIST} @${ECHO_CMD} "@unexec ${SED} -i \"\" -e '/${LIB:S#/#\/#g}/d' %D/${OCAML_LDCONF}" >> ${TMPPLIST} . endfor . endif .endif .if defined(USE_OCAML_WASH) . if !target(ocaml-wash) ocaml-wash: # If ld.conf is empty @${ECHO_CMD} "@unexec if [ ! -s %D/${OCAML_LDCONF} ]; then ${RM} -f %D/${OCAML_LDCONF}; fi || true" >> ${TMPPLIST} . endif .endif .if !target(ocaml-findlib) ocaml-findlib: @${DO_NADA} .endif .if !target(ocaml-ldconfig) ocaml-ldconfig: @${DO_NADA} .endif .if !target(ocaml-wash) ocaml-wash: @${DO_NADA} .endif .endif #!defined(OCAML_include) .if defined(_POSTMKINCLUDED) .if defined(USE_OCAML_FINDLIB) pre-install: ${STAGEDIR}${OCAMLFIND_DESTDIR} ${STAGEDIR}${OCAMLFIND_DESTDIR}: @${MKDIR} ${.TARGET} .endif .endif # _POSTMKINCLUDED Index: head/astro/planets/Makefile =================================================================== --- head/astro/planets/Makefile (revision 385412) +++ head/astro/planets/Makefile (revision 385413) @@ -1,30 +1,32 @@ # Created by: Ying-Chieh Liao # $FreeBSD$ PORTNAME= planets PORTVERSION= 0.1.13 PORTREVISION= 1 CATEGORIES= astro MASTER_SITES= GENTOO/distfiles \ http://planets.homedns.org/dist/ MAINTAINER= ports@FreeBSD.org COMMENT= Orbital simulator LICENSE= GPLv2 USES= gmake tar:tgz USE_OCAML= yes +USE_OCAML_CAMLP4=yes +USE_OCAML_TK= yes USE_XORG= x11 ALL_TARGET= ${PORTNAME} OPTIONS_DEFINE= DOCS do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/planets.1 ${STAGEDIR}${MANPREFIX}/man/man1 @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/KEYBINDINGS.txt ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/getting_started.html ${STAGEDIR}${DOCSDIR} .include Index: head/databases/ocaml-mysql/Makefile =================================================================== --- head/databases/ocaml-mysql/Makefile (revision 385412) +++ head/databases/ocaml-mysql/Makefile (revision 385413) @@ -1,45 +1,46 @@ # Created by: Jyun-Yan You # $FreeBSD$ PORTNAME= mysql PORTVERSION= 1.1.1 CATEGORIES= databases MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/870/ PKGNAMEPREFIX= ocaml- DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= OCaml bindings to libmysqlclient USES= gmake USE_MYSQL= yes USE_OCAML= yes USE_OCAML_FINDLIB= yes +USE_OCAML_CAMLP4= yes USE_OCAMLFIND_PLIST= yes USE_OCAML_LDCONFIG= yes GNU_CONFIGURE= yes ALL_TARGET= all opt MAKE_JOBS_UNSAFE= yes DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME} PORTDOCS= * OPTIONS_DEFINE= DOCS .include .if ${PORT_OPTIONS:MDOCS} ALL_TARGET+= htdoc post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/mysql/html/* ${STAGEDIR}${DOCSDIR} .endif post-patch: ${REINPLACE_CMD} 's,OCAMLFIND_INSTFLAGS=,OCAMLFIND_INSTFLAGS=-ldconf ignore ,' \ ${WRKSRC}/Makefile.in .include Index: head/deskutils/wyrd/Makefile =================================================================== --- head/deskutils/wyrd/Makefile (revision 385412) +++ head/deskutils/wyrd/Makefile (revision 385413) @@ -1,39 +1,39 @@ # Created by: Russell A. Jackson # $FreeBSD$ PORTNAME= wyrd PORTVERSION= 1.4.6 PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= http://pessimization.com/software/wyrd/ MAINTAINER= h.skuhra@gmail.com COMMENT= Text-based front-end to Remind LICENSE= GPLv2 -BUILD_DEPENDS= camlp4o:${PORTSDIR}/devel/ocaml-camlp4 RUN_DEPENDS= remind:${PORTSDIR}/deskutils/remind USES= gmake ncurses USE_OCAML= yes +USE_OCAML_CAMLP4=yes GNU_CONFIGURE= yes PLIST_FILES= bin/wyrd etc/wyrdrc man/man1/wyrd.1.gz man/man5/wyrdrc.5.gz PORTDOCS= manual.html manual.pdf OPTIONS_DEFINE= UTF8 DOCS UTF8_CONFIGURE_ENABLE= utf8 post-patch: @${REINPLACE_CMD} 's|gcc|${CC}|' ${WRKSRC}/curses/curses.ml do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wyrd.opt ${STAGEDIR}${PREFIX}/bin/wyrd ${INSTALL_DATA} ${WRKSRC}/wyrdrc ${STAGEDIR}${PREFIX}/etc/wyrdrc ${INSTALL_MAN} ${WRKSRC}/doc/wyrd.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/doc/wyrdrc.5 ${STAGEDIR}${MAN5PREFIX}/man/man5 @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR} .include Index: head/devel/coccinelle/Makefile =================================================================== --- head/devel/coccinelle/Makefile (revision 385412) +++ head/devel/coccinelle/Makefile (revision 385413) @@ -1,23 +1,24 @@ # Created by: Andriy Gapon # $FreeBSD$ PORTNAME= coccinelle DISTVERSION= 1.0.0-rc22 CATEGORIES= devel MASTER_SITES= http://coccinelle.lip6.fr/distrib/ MAINTAINER= avg@icyb.net.ua COMMENT= Program matching and transformation engine LICENSE= GPLv2 LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre USES= gmake perl5 pkgconfig:build python tar:tgz GNU_CONFIGURE= yes USE_PERL5= build USE_OCAML= 3.0+ +USE_OCAML_CAMLP4=yes MAKE_ARGS+= PYTHON_VERSION=${PYTHON_VER} CONFIGURE_ENV+= PYVER=${PYTHON_VER} PYTHON=${PYTHON_CMD} .include Index: head/devel/frama-c/Makefile =================================================================== --- head/devel/frama-c/Makefile (revision 385412) +++ head/devel/frama-c/Makefile (revision 385413) @@ -1,55 +1,56 @@ # Created by: b.f. # $FreeBSD$ PORTNAME= frama-c DISTVERSIONPREFIX= Sodium- DISTVERSION= 20150201 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://frama-c.com/download/ MAINTAINER= ports@FreeBSD.org COMMENT= Extensible platform for source-code analysis of C LICENSE= LGPL21 EXTRACT_DEPENDS= gtar:${PORTSDIR}/archivers/gtar BUILD_DEPENDS= ${LOCALBASE}/lib/ocaml/ocamlgraph/graph.a:${PORTSDIR}/math/ocaml-ocamlgraph RUN_DEPENDS= ${LOCALBASE}/lib/ocaml/ocamlgraph/graph.a:${PORTSDIR}/math/ocaml-ocamlgraph USES= gmake USE_OCAML= yes GNU_CONFIGURE= yes EXTRACT_CMD= gtar EXTRACT_BEFORE_ARGS= -xf CONFIGURE_ARGS+=--with-cpp="${FRAMAC_DEFAULT_CPP}" MAKE_ENV+= FRAMAC_LIBDIR="${PREFIX}/lib/frama-c" FRAMAC_DEFAULT_CPP?= ${CPP} -C -I${DATADIR}/libc -I. post-patch: @cd ${WRKSRC}/tests; ${MKDIR} aorai report wp wp_acsl wp_bts \ wp_engine wp_hoare wp_plugin wp_runtime wp_store wp_typed @${REINPLACE_CMD} -e 's|@make |@${MAKE_CMD} |' \ ${WRKSRC}/src/aorai/Makefile.in @${REINPLACE_CMD} \ -e 's|$$(CP)|${INSTALL_DATA}|' \ -e 's|add_prefix|addprefix|' \ ${WRKSRC}/share/Makefile.plugin @${REINPLACE_CMD} \ -e '\|$$(CP) $$(TARGETS|s|$$(CP)|${INSTALL_DATA}|' \ -e '\|$$(CP) frama-c|s|$$(CP)|${INSTALL_SCRIPT}|' \ ${WRKSRC}/share/Makefile.dynamic @${REINPLACE_CMD} -e '\|^# Installation|,\|^# File headers|{ \ \|_LIBDIR|s|(FRAMAC_LIBDIR)|(DESTDIR)$$(FRAMAC_LIBDIR)|; \ \|_PLUGINDIR|s|(FRAMAC_PLUGINDIR)|(DESTDIR)$$(FRAMAC_PLUGINDIR)|; \ \|$$(CP).*bin|s|$$(CP)|${INSTALL_SCRIPT}|; \ \|$$(CP).*man/|s|$$(CP)|${INSTALL_MAN}|; \ s|$$(CP)|${INSTALL_DATA}|; }' \ ${WRKSRC}/Makefile check regression-test test: build @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV:NCPP=*} \ CPP="${CPP} -C -I${WRKSRC}/share/libc -I." \ ${MAKE_CMD} ${MAKE_ARGS} oracles fulltests .include Index: head/devel/monotone-viz/Makefile =================================================================== --- head/devel/monotone-viz/Makefile (revision 385412) +++ head/devel/monotone-viz/Makefile (revision 385413) @@ -1,34 +1,34 @@ # Created by: Tarasov Alexey # $FreeBSD$ PORTNAME= monotone-viz PORTVERSION= 1.0.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MASTER_SITES= http://oandrieu.nerim.net/monotone-viz/ MAINTAINER= ports@FreeBSD.org COMMENT= Visual interface for Monotone VCS with revision graphs LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 RUN_DEPENDS+= dot:${PORTSDIR}/graphics/graphviz \ mtn:${PORTSDIR}/devel/monotone \ lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 USES= gmake USE_OCAML= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-local-lablgtk ALL_TARGET= MAKE_JOBS_UNSAFE= yes PLIST_FILES= bin/monotone-viz post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/monotone-viz .include Index: head/devel/ocaml-camomile/Makefile =================================================================== --- head/devel/ocaml-camomile/Makefile (revision 385412) +++ head/devel/ocaml-camomile/Makefile (revision 385413) @@ -1,32 +1,33 @@ # Created by: Ying-Chieh Liao # $FreeBSD$ PORTNAME= camomile PORTVERSION= 0.8.3 CATEGORIES= devel MASTER_SITES= SF PKGNAMEPREFIX= ocaml- MAINTAINER= ports@FreeBSD.org COMMENT= Comprehensive Unicode library for Objective Caml LICENSE= LGPL21 USES= gmake tar:bzip2 USE_OCAML= yes USE_OCAML_FINDLIB=yes +USE_OCAML_CAMLP4=yes USE_OCAML_LDCONFIG=yes USE_OCAML_WASH= yes GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples/ocaml/${PORTNAME} post-install: @${FIND} ${STAGEDIR}${DATADIR} ! -type d | \ ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} @${FIND} ${STAGEDIR}${OCAMLFIND_DESTDIR}/${PORTNAME} ! -type d | \ ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} .include Index: head/devel/ocaml-deriving-ocsigen/Makefile =================================================================== --- head/devel/ocaml-deriving-ocsigen/Makefile (revision 385412) +++ head/devel/ocaml-deriving-ocsigen/Makefile (revision 385413) @@ -1,20 +1,21 @@ # Created by: Jaap Boender # $FreeBSD$ PORTNAME= deriving-ocsigen PORTVERSION= 0.3c CATEGORIES= devel www MASTER_SITES= http://ocsigen.org/download/ PKGNAMEPREFIX= ocaml- MAINTAINER= ports@FreeBSD.org COMMENT= Function derivation library USE_OCAML= yes USE_OCAML_FINDLIB= yes +USE_OCAML_CAMLP4= yes USE_OCAMLFIND_PLIST= yes USE_OCAML_LDCONFIG= yes USES= gmake .include Index: head/devel/ocaml-extlib/Makefile =================================================================== --- head/devel/ocaml-extlib/Makefile (revision 385412) +++ head/devel/ocaml-extlib/Makefile (revision 385413) @@ -1,34 +1,35 @@ # Created by: mukai # $FreeBSD$ PORTNAME= extlib PORTVERSION= 1.6.1 CATEGORIES= devel MASTER_SITES= GOOGLE_CODE PROJECTHOST= ${PKGNAMEPREFIX}${PORTNAME} PKGNAMEPREFIX= ocaml- MAINTAINER= ports@FreeBSD.org COMMENT= Complete - yet small - standard library for OCaml LICENSE= LGPL21 OPTIONS_DEFINE= DOCS USE_OCAML= yes USE_OCAML_FINDLIB=yes +USE_OCAML_CAMLP4=yes USE_OCAMLFIND_PLIST=yes USES= gmake ALL_TARGET= all opt doc MAKE_JOBS_UNSAFE= yes DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME} PORTDOCS= * post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}) .include Index: head/devel/ocaml-typeconv/Makefile =================================================================== --- head/devel/ocaml-typeconv/Makefile (revision 385412) +++ head/devel/ocaml-typeconv/Makefile (revision 385413) @@ -1,38 +1,39 @@ # Created by: Stanislav Sedov # $FreeBSD$ PORTNAME= type-conv PORTVERSION= 109.60.01 CATEGORIES= devel MASTER_SITES= https://ocaml.janestreet.com/ocaml-core/%SUBDIR%/ MASTER_SITE_SUBDIR= ${PORTVERSION:R}.00/individual PKGNAMEPREFIX= ocaml- DISTNAME= ${PORTNAME:S,-,_,}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Type conversion routines for OCaml LICENSE= APACHE20 BSD3CLAUSE LICENSE_COMB= multi USE_OCAML= yes USE_OCAML_FINDLIB=yes +USE_OCAML_CAMLP4=yes USE_OCAMLFIND_PLIST=yes OCAML_PKGDIRS= ${PORTNAME:S,-,_,} USES= gmake HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix ${PREFIX} --disable-docs MAKE_JOBS_UNSAFE=yes DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME:S,-,_,} PORTDOCS= * post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in CHANGES.txt README.md (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) .endfor .include Index: head/devel/ocaml-ulex/Makefile =================================================================== --- head/devel/ocaml-ulex/Makefile (revision 385412) +++ head/devel/ocaml-ulex/Makefile (revision 385413) @@ -1,40 +1,39 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= ulex PORTVERSION= 1.1 PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.cduce.org/download/ PKGNAMEPREFIX= ocaml- MAINTAINER= johans@FreeBSD.org COMMENT= Lexer generator for Unicode and OCaml -BUILD_DEPENDS= camlp4:${PORTSDIR}/devel/ocaml-camlp4 - USES= gmake USE_OCAML= true USE_OCAML_FINDLIB= true +USE_OCAML_CAMLP4= true USE_OCAML_LDCONFIG= true USE_OCAMLFIND_PLIST= yes ALL_TARGET= all all.opt MAKE_JOBS_UNSAFE= yes DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME} PORTDOCS= * OPTIONS_DEFINE= DOCS .include .if ${PORT_OPTIONS:MDOCS} ALL_TARGET+= doc post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/*.html ${WRKSRC}/*.css ${STAGEDIR}${DOCSDIR} .endif .include Index: head/devel/ocaml-xstrp4/Makefile =================================================================== --- head/devel/ocaml-xstrp4/Makefile (revision 385412) +++ head/devel/ocaml-xstrp4/Makefile (revision 385413) @@ -1,31 +1,32 @@ # Created by: Stanislav Sedov # $FreeBSD$ PORTNAME= xstrp4 PORTVERSION= 1.8 PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://download.camlcity.org/download/ PKGNAMEPREFIX= ocaml- MAINTAINER= ports@FreeBSD.org COMMENT= OCaml extension to expands brace expansions LICENSE= MIT OPTIONS_DEFINE= EXAMPLES USES= gmake USE_OCAML= yes USE_OCAML_FINDLIB= yes +USE_OCAML_CAMLP4= yes USE_OCAMLFIND_PLIST= yes HAS_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes PORTEXAMPLES= * EXAMPLESDIR= ${OCAML_EXAMPLESDIR}/${PORTNAME} post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC} && ${INSTALL_DATA} sample.* ${STAGEDIR}${EXAMPLESDIR}) .include Index: head/games/freetennis/Makefile =================================================================== --- head/games/freetennis/Makefile (revision 385412) +++ head/games/freetennis/Makefile (revision 385413) @@ -1,38 +1,38 @@ # Created by: Jean-Yves Lefort # $FreeBSD$ PORTNAME= freetennis PORTVERSION= 0.4.8 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= games MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Tennis simulation BUILD_DEPENDS= ocamlopt:${PORTSDIR}/lang/ocaml \ ocaml-images>3.0:${PORTSDIR}/graphics/ocaml-images \ ${OCAML_DEPENDS} RUN_DEPENDS= ${OCAML_DEPENDS} OCAML_DEPENDS= ${LOCALBASE}/lib/ocaml/site-lib/lablgtk2/gtk.ml:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 \ ${LOCALBASE}/lib/ocaml/lablGL/gl.ml:${PORTSDIR}/graphics/ocaml-lablgl \ ${LOCALBASE}/lib/ocaml/site-lib/sdl/sdl.mli:${PORTSDIR}/devel/ocaml-sdl USES= tar:bzip2 PLIST_FILES= bin/freetennis PORTDATA= * post-patch: @${REINPLACE_CMD} -e 's|sfxDir = "sfx"|sfxDir = "${DATADIR}/sfx"|; \ s|gfxDir = "graphics"|gfxDir = "${DATADIR}/graphics"|' \ ${WRKSRC}/freetennis.ml @${REINPLACE_CMD} -Ee 's@(\+)(lablgtk2)@\1site-lib/\2@' \ ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/freetennis ${STAGEDIR}${PREFIX}/bin (cd ${WRKSRC} && ${COPYTREE_SHARE} "graphics sfx" ${STAGEDIR}${DATADIR}) .include Index: head/graphics/ocaml-lablgl/Makefile =================================================================== --- head/graphics/ocaml-lablgl/Makefile (revision 385412) +++ head/graphics/ocaml-lablgl/Makefile (revision 385413) @@ -1,82 +1,83 @@ # Created by: Ronald Kuehn # $FreeBSD$ PORTNAME= lablgl -PORTVERSION= 20120306 -PORTREVISION= 3 +PORTVERSION= 1.05 +PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/ \ - https://forge.ocamlcore.org/frs/download.php/816/ + https://forge.ocamlcore.org/frs/download.php/1254/ PKGNAMEPREFIX= ocaml- MAINTAINER= bf@FreeBSD.org COMMENT= OpenGL interface for Objective Caml LICENSE= BSD3CLAUSE -CONFLICTS= ocaml-notk-[0-9]* ocaml-nox11-[0-9]* +CONFLICTS= ocaml-nox11-[0-9]* USES= gmake tk:84,85 USE_XORG= x11 xext xmu USE_GL= glut USE_OCAML= yes USE_OCAML_WASH= yes +USE_OCAML_CAMLP4=yes +USE_OCAML_TK= yes ALL_TARGET= all opt MAKE_JOBS_UNSAFE= yes -WRKSRC= ${WRKDIR}/lablGL DOCSDIR= ${PREFIX}/share/doc/ocaml/lablgl EXAMPLESDIR= ${PREFIX}/share/examples/ocaml/lablgl PATTERN= [[:space:]]*(do|then)?[[:space:]]*)cp([[:space:]] OPTIONS_DEFINE= THREADS DOCS OPTIONS_DEFAULT= THREADS THREADS_DESC= Threaded Tcl/Tk (must match lang/ocaml) .include .if ${PORT_OPTIONS:MTHREADS} THR_LD= -lpthread .endif post-extract: @${CP} ${WRKSRC}/Makefile.config.freebsd ${WRKSRC}/Makefile.config post-patch: @${REINPLACE_CMD} -e "s,/usr/X11R6,${LOCALBASE},g" \ -e "s,/usr/local,${LOCALBASE},g" \ -e "s,^\(BINDIR[ \t]*=\).*,\1${STAGEDIR}${PREFIX}/bin,g" \ -e "s,^\(RANLIB[ \t]*=\).*,\1ranlib,g" \ -e "s,^#\(LIBDIR[ \t]*=\).*,\1${PREFIX}/lib/ocaml,g" \ -e "s,^#\(DLLDIR[ \t]*=\).*,\1${STAGEDIR}${PREFIX}/lib/ocaml/stublibs,g" \ -e "s,^#\(INSTALLDIR[ \t]*=\).*,\1${STAGEDIR}${PREFIX}/lib/ocaml/lablGL,g" \ -e "s!^#\(COPTS[ \t]*=\).*!\1-c ${CFLAGS}!g" \ -e "/^TKINCLUDES/s,=.*$$,= -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}," \ -e "/^TKLIBS/s,=.*$$,= -L${LOCALBASE}/lib -ltk${TK_SHLIB_VER}\ -ltcl${TCL_SHLIB_VER} ${THR_LD}," \ ${WRKSRC}/Makefile.config @${REINPLACE_CMD} -E \ -e '/exec ocaml/s,\$$\(INSTALLDIR\),${PREFIX}/lib/ocaml/lablGL,' \ -e 's,^(${PATTERN}+.*INSTALLDIR),\1\$${BSD_INSTALL_DATA} \3,' \ -e 's,^(${PATTERN}+.*BINDIR),\1\$${BSD_INSTALL_SCRIPT} \3,' \ -e 's,^(${PATTERN}+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \3,' \ ${WRKSRC}/src/Makefile ${WRKSRC}/LablGlut/src/Makefile \ ${WRKSRC}/Togl/src/Makefile pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/ocaml/stublibs post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/lablglut @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/togl @(cd ${WRKSRC}/LablGlut/examples && ${COPYTREE_SHARE} . \ ${STAGEDIR}${EXAMPLESDIR}/lablglut '! -name Makefile') @(cd ${WRKSRC}/Togl/examples && ${COPYTREE_SHARE} . \ ${STAGEDIR}${EXAMPLESDIR}/togl '! -name Makefile') @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include Index: head/graphics/ocaml-lablgl/distinfo =================================================================== --- head/graphics/ocaml-lablgl/distinfo (revision 385412) +++ head/graphics/ocaml-lablgl/distinfo (revision 385413) @@ -1,2 +1,2 @@ -SHA256 (lablgl-20120306.tar.gz) = 39017555724ca67807e73543b9fca1fcf9aab285f723635c9eee4034ac88adf0 -SIZE (lablgl-20120306.tar.gz) = 423411 +SHA256 (lablgl-1.05.tar.gz) = d8ff03e35b970d2b23a942f9e6ed65da5a6c123986bd0ecf5424a6205af34b61 +SIZE (lablgl-1.05.tar.gz) = 296597 Index: head/graphics/ocaml-lablgl/pkg-descr =================================================================== --- head/graphics/ocaml-lablgl/pkg-descr (revision 385412) +++ head/graphics/ocaml-lablgl/pkg-descr (revision 385413) @@ -1,12 +1,12 @@ LablGL is an OpenGL interface for Objective Caml. Since it includes support for the Togl widget, you can comfortably use it with LablTk. All of the GL and GLU libraries are available. Read a good book about how to use these. Translating from OpenGL to LablGL is rather straightforward: there is a LablGL function for each OpenGL one. For ease of retrieving, both GL and GLU are cut in smaller modules of related functions. Please see ${PREFIX}/share/doc/ocaml/lablgl/README for further information. -WWW: http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html +WWW: https://forge.ocamlcore.org/projects/lablgl/ Index: head/graphics/ocaml-lablgl/pkg-plist =================================================================== --- head/graphics/ocaml-lablgl/pkg-plist (revision 385412) +++ head/graphics/ocaml-lablgl/pkg-plist (revision 385413) @@ -1,135 +1,133 @@ bin/lablgl bin/lablglut lib/ocaml/lablGL/build.ml lib/ocaml/lablGL/gl.cmi lib/ocaml/lablGL/gl.cmx lib/ocaml/lablGL/gl.ml lib/ocaml/lablGL/gl.mli lib/ocaml/lablGL/glArray.cmi lib/ocaml/lablGL/glArray.cmx lib/ocaml/lablGL/glArray.ml lib/ocaml/lablGL/glArray.mli lib/ocaml/lablGL/glClear.cmi lib/ocaml/lablGL/glClear.cmx lib/ocaml/lablGL/glClear.ml lib/ocaml/lablGL/glClear.mli lib/ocaml/lablGL/glDraw.cmi lib/ocaml/lablGL/glDraw.cmx lib/ocaml/lablGL/glDraw.ml lib/ocaml/lablGL/glDraw.mli lib/ocaml/lablGL/glFunc.cmi lib/ocaml/lablGL/glFunc.cmx lib/ocaml/lablGL/glFunc.ml lib/ocaml/lablGL/glFunc.mli lib/ocaml/lablGL/glLight.cmi lib/ocaml/lablGL/glLight.cmx lib/ocaml/lablGL/glLight.ml lib/ocaml/lablGL/glLight.mli lib/ocaml/lablGL/glList.cmi lib/ocaml/lablGL/glList.cmx lib/ocaml/lablGL/glList.ml lib/ocaml/lablGL/glList.mli lib/ocaml/lablGL/glMap.cmi lib/ocaml/lablGL/glMap.cmx lib/ocaml/lablGL/glMap.ml lib/ocaml/lablGL/glMap.mli lib/ocaml/lablGL/glMat.cmi lib/ocaml/lablGL/glMat.cmx lib/ocaml/lablGL/glMat.ml lib/ocaml/lablGL/glMat.mli lib/ocaml/lablGL/glMisc.cmi lib/ocaml/lablGL/glMisc.cmx lib/ocaml/lablGL/glMisc.ml lib/ocaml/lablGL/glMisc.mli lib/ocaml/lablGL/glPix.cmi lib/ocaml/lablGL/glPix.cmx lib/ocaml/lablGL/glPix.ml lib/ocaml/lablGL/glPix.mli lib/ocaml/lablGL/glShader.cmi lib/ocaml/lablGL/glShader.cmx lib/ocaml/lablGL/glShader.ml lib/ocaml/lablGL/glShader.mli lib/ocaml/lablGL/glTex.cmi lib/ocaml/lablGL/glTex.cmx lib/ocaml/lablGL/glTex.ml lib/ocaml/lablGL/glTex.mli lib/ocaml/lablGL/gluMat.cmi lib/ocaml/lablGL/gluMat.cmx lib/ocaml/lablGL/gluMat.ml lib/ocaml/lablGL/gluMat.mli lib/ocaml/lablGL/gluMisc.cmi lib/ocaml/lablGL/gluMisc.cmx lib/ocaml/lablGL/gluMisc.ml lib/ocaml/lablGL/gluMisc.mli lib/ocaml/lablGL/gluNurbs.cmi lib/ocaml/lablGL/gluNurbs.cmx lib/ocaml/lablGL/gluNurbs.ml lib/ocaml/lablGL/gluNurbs.mli lib/ocaml/lablGL/gluQuadric.cmi lib/ocaml/lablGL/gluQuadric.cmx lib/ocaml/lablGL/gluQuadric.ml lib/ocaml/lablGL/gluQuadric.mli lib/ocaml/lablGL/gluTess.cmi lib/ocaml/lablGL/gluTess.cmx lib/ocaml/lablGL/gluTess.ml lib/ocaml/lablGL/gluTess.mli lib/ocaml/lablGL/glut.cmi lib/ocaml/lablGL/glut.cmx lib/ocaml/lablGL/glut.ml lib/ocaml/lablGL/glut.mli lib/ocaml/lablGL/lablgl.a lib/ocaml/lablGL/lablgl.cma lib/ocaml/lablGL/lablgl.cmxa lib/ocaml/lablGL/lablglut.a lib/ocaml/lablGL/lablglut.cma lib/ocaml/lablGL/lablglut.cmxa lib/ocaml/lablGL/liblablgl.a lib/ocaml/lablGL/liblablglut.a lib/ocaml/lablGL/libtogl.a lib/ocaml/lablGL/raw.cmi lib/ocaml/lablGL/raw.cmx lib/ocaml/lablGL/raw.ml lib/ocaml/lablGL/raw.mli lib/ocaml/lablGL/togl.a lib/ocaml/lablGL/togl.cma lib/ocaml/lablGL/togl.cmi lib/ocaml/lablGL/togl.cmx lib/ocaml/lablGL/togl.cmxa lib/ocaml/lablGL/togl.ml lib/ocaml/lablGL/togl.mli lib/ocaml/stublibs/dlllablgl.so lib/ocaml/stublibs/dlllablglut.so lib/ocaml/stublibs/dlltogl.so %%PORTDOCS%%%%DOCSDIR%%/README %%EXAMPLESDIR%%/lablglut/README %%EXAMPLESDIR%%/lablglut/caml-images/ChangeLog %%EXAMPLESDIR%%/lablglut/caml-images/OCamlMakefile %%EXAMPLESDIR%%/lablglut/caml-images/main.ml %%EXAMPLESDIR%%/lablglut/caml-images/ppm.ppm -%%EXAMPLESDIR%%/lablglut/etc/draw2d.ml -%%EXAMPLESDIR%%/lablglut/etc/in-progress/scene_graph.ml %%EXAMPLESDIR%%/lablglut/lablGL/README %%EXAMPLESDIR%%/lablglut/lablGL/checker.ml %%EXAMPLESDIR%%/lablglut/lablGL/gears.ml %%EXAMPLESDIR%%/lablglut/lablGL/morph3d.ml %%EXAMPLESDIR%%/lablglut/lablGL/planet.ml %%EXAMPLESDIR%%/lablglut/lablGL/scene.ml %%EXAMPLESDIR%%/lablglut/lablGL/simple.ml %%EXAMPLESDIR%%/lablglut/lablGL/test_glsl.ml %%EXAMPLESDIR%%/lablglut/lablGL/texturesurf.ml %%EXAMPLESDIR%%/lablglut/nehe/lesson2.ml %%EXAMPLESDIR%%/lablglut/nehe/lesson3.ml %%EXAMPLESDIR%%/lablglut/nehe/lesson4.ml %%EXAMPLESDIR%%/lablglut/nehe/lesson5.ml %%EXAMPLESDIR%%/togl/README %%EXAMPLESDIR%%/togl/checker.ml %%EXAMPLESDIR%%/togl/double.ml %%EXAMPLESDIR%%/togl/gears.ml %%EXAMPLESDIR%%/togl/gears_a.ml %%EXAMPLESDIR%%/togl/morph3d.ml %%EXAMPLESDIR%%/togl/planet.ml %%EXAMPLESDIR%%/togl/scene.ml %%EXAMPLESDIR%%/togl/simple.ml %%EXAMPLESDIR%%/togl/tennis.ml %%EXAMPLESDIR%%/togl/tesselate.ml %%EXAMPLESDIR%%/togl/texturesurf.ml Index: head/math/alt-ergo/Makefile =================================================================== --- head/math/alt-ergo/Makefile (revision 385412) +++ head/math/alt-ergo/Makefile (revision 385413) @@ -1,60 +1,60 @@ # Created by: b.f. # $FreeBSD$ PORTNAME= alt-ergo PORTVERSION= 0.95.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= http://alt-ergo.ocamlpro.com/http/alt-ergo-${PORTVERSION}/ MAINTAINER= bf@FreeBSD.org 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}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept 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 OPTIONS_DEFINE= GUI OPTIONS_DEFAULT=GUI OPTIONS_SUB= yes .include .if ${PORT_OPTIONS:MGUI} BUILD_DEPENDS += lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 RUN_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 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}|; }' \ -e 's|make -C|${MAKE_CMD} -C|' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -Ee 's@(\+|/)(lablgtk2)@\1site-lib/\2@' \ ${WRKSRC}/configure .if ${PORT_OPTIONS:MGUI} pre-configure: @(if [ ! -e ${LOCALBASE}/${OCAML_SITELIBDIR}/lablgtk2/lablgtksourceview2.cmxa ] ; then \ ${ECHO_MSG} "==> The WITH_GUI option for ${PKGNAME} requires" ; \ ${ECHO_MSG} "==> x11-toolkits/ocaml-lablgtk2 to be built" ; \ ${ECHO_MSG} "==> WITH_GTKSOURCEVIEW2" ; \ exit 1; fi) .endif .include Index: head/math/coq/Makefile =================================================================== --- head/math/coq/Makefile (revision 385412) +++ head/math/coq/Makefile (revision 385413) @@ -1,62 +1,62 @@ # Created by: Rene Ladan # $FreeBSD$ PORTNAME= coq PORTVERSION= 8.4.5 -PORTEPOCH= 1 +PORTEPOCH= 2 CATEGORIES= math MASTER_SITES= http://coq.inria.fr/distrib/V${COQVERSION}/files/ \ ftp://ftp.stack.nl/pub/users/johans/coq/ DISTNAME= ${PORTNAME}-${COQVERSION} MAINTAINER= johans@FreeBSD.org COMMENT= Theorem prover based on lambda-C BUILD_DEPENDS= camlp5:${PORTSDIR}/devel/ocaml-camlp5 \ ocamlfind:${PORTSDIR}/devel/ocaml-findlib COQVERSION= ${PORTVERSION:R}pl${PORTVERSION:E} USES= gmake USE_OCAML= yes ALL_TARGET= world HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix ${PREFIX} \ --mandir ${PREFIX}/man \ --emacslib ${PREFIX}/share/emacs/site-lisp \ --opt MAKE_ENV= COQINSTALLPREFIX=${DESTDIR} OPTIONS_DEFINE= DOCS IDE OPTIONS_DEFAULT= DOCS IDE OPTIONS_SUB= yes IDE_DESC= Include desktop environment (coqide) IDE_BUILD_DEPENDS= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 IDE_RUN_DEPENDS:= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 IDE_CONFIGURE_OFF= --coqide no DOCS_USE= TEX=latex:build,dvipsk:build,texmf:build DOCS_BUILD_DEPENDS= hevea:${PORTSDIR}/textproc/hevea DOCS_CONFIGURE_OFF= --with-doc none PORTDOCS= * # Workaround bsd.ocaml.mk to fix packaging add-plist-post: @${DO_NADA} .include .if ${ARCH} == "powerpc" BROKEN= Does not link on powerpc .endif post-patch: @${REINPLACE_CMD} -e '/FreeBSD.*\.byte/s/^/#/' \ -e '1s:/bin/bash:/bin/sh:' \ -e '/^MAKE=/d' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's:/bin/bash:/bin/sh:' \ ${WRKSRC}/Makefile* ${WRKSRC}/install.sh @${REINPLACE_CMD} -e '/^#COQINSTALLPREFIX/{s/^#//;s|$$|$${DESTDIR}|;}' \ ${WRKSRC}/Makefile.build @${REINPLACE_CMD} -e '/show_latex_mes/s/)$$/; true)/' ${WRKSRC}/Makefile.doc .include Index: head/math/ocaml-ocamlgraph/Makefile =================================================================== --- head/math/ocaml-ocamlgraph/Makefile (revision 385412) +++ head/math/ocaml-ocamlgraph/Makefile (revision 385413) @@ -1,56 +1,57 @@ # Created by: Joseph Koshy # $FreeBSD$ PORTNAME= ocamlgraph PORTVERSION= 1.8.6 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= http://ocamlgraph.lri.fr/download/ \ ftp://ftp.stack.nl/pub/users/johans/ocamlgraph/ PKGNAMEPREFIX= ocaml- MAINTAINER= johans@FreeBSD.org COMMENT= Graph manipulation library for OCaml OPTIONS_DEFINE= GUI DOCS OPTIONS_DEFAULT=GUI OPTIONS_SUB= yes GUI_DESC= Include GUI user programs: viewer and editor GUI_BUILD_DEPENDS= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 GUI_RUN_DEPENDS= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 GUI_CONFIGURE_OFF= LABLGTK2=no USES= gmake USE_OCAML= yes USE_OCAML_FINDLIB= yes USE_OCAML_LDCONFIG= yes USE_OCAMLFIND_PLIST= yes GNU_CONFIGURE= yes PLIST_SUB+= OCAMLGRAPHDIR="${OCAML_LIBDIR}/${PORTNAME}" ALL_TARGET= all INSTALL_TARGET= install MAKE_JOBS_UNSAFE= yes PORTSCOUT= skipv:1.81 .include .if ${PORT_OPTIONS:MDOCS} ALL_TARGET+= doc DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME} PORTDOCS= * post-patch: @${REINPLACE_CMD} -e '/VIEWER_DIR. doc/d' ${WRKSRC}/Makefile.in .if empty(PORT_OPTIONS:MGUI) # Override auto-detection @${REINPLACE_CMD} -Ee 's/(LABLGTK2)=yes/\1=no/' ${WRKSRC}/configure .endif post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR} .endif .include Index: head/math/ocamlgsl/Makefile =================================================================== --- head/math/ocamlgsl/Makefile (revision 385412) +++ head/math/ocamlgsl/Makefile (revision 385413) @@ -1,36 +1,37 @@ # Created by: Klaus T. Aehlig # $FreeBSD$ PORTNAME= ocaml-gsl PORTVERSION= 1.15.1 PORTREVISION= 1 CATEGORIES= math MASTER_SITES= http://bitbucket.org/mmottl/gsl-ocaml/downloads/ DISTNAME= gsl-ocaml-${PORTVERSION} MAINTAINER= michipili@gmail.com COMMENT= Interface to GSL for the Objective Caml language LICENSE= GPLv3 LIB_DEPENDS= libgsl.so:${PORTSDIR}/math/gsl BUILD_DEPENDS= gawk:${PORTSDIR}/lang/gawk \ ${OCAMLC_DEPEND} RUN_DEPENDS= ocamlfind:${PORTSDIR}/devel/ocaml-findlib USES= gmake USE_OCAML= YES USE_OCAML_FINDLIB= YES +USE_OCAML_CAMLP4= YES USE_OCAML_LDCONFIG= YES OCAML_PKGDIRS= gsl HAS_CONFIGURE= YES MAKE_JOBS_UNSAFE= yes WRKSRC= ${WRKDIR}/gsl-ocaml-${PORTVERSION} OPTIONS_DEFINE= DOCS post-configure: @${ECHO_CMD} 'stagedir="${STAGEDIR}"' >> ${WRKSRC}/setup.data @${ECHO_CMD} 'docdir="$$datarootdir/doc/ocaml/$$pkg_name"' >> ${WRKSRC}/setup.data .include Index: head/math/orpie/Makefile =================================================================== --- head/math/orpie/Makefile (revision 385412) +++ head/math/orpie/Makefile (revision 385413) @@ -1,29 +1,30 @@ # Created by: Dylan Simon # $FreeBSD$ PORTNAME= orpie PORTVERSION= 1.5.2 PORTREVISION= 1 CATEGORIES+= math MASTER_SITES= http://pessimization.com/software/orpie/ MAINTAINER= ports@FreeBSD.org COMMENT= Fullscreen RPN calculator for the console LICENSE= GPLv2 LIB_DEPENDS= libgsl.so:${PORTSDIR}/math/gsl USES= gmake USE_OCAML= yes +USE_OCAML_CAMLP4=yes GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes PLIST_FILES= bin/orpie bin/orpie-curses-keys etc/orpierc \ man/man1/orpie.1.gz man/man1/orpie-curses-keys.1.gz \ man/man5/orpierc.5.gz post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* .include Index: head/net/unison/Makefile =================================================================== --- head/net/unison/Makefile (revision 385412) +++ head/net/unison/Makefile (revision 385413) @@ -1,77 +1,77 @@ # Created by: Dan Pelleg # $FreeBSD$ PORTNAME= unison PORTVERSION= 2.48.3 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= net MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS} DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.gz MAINTAINER?= madpilot@FreeBSD.org COMMENT?= User-level file synchronization tool LICENSE= GPLv3 -BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml - PLIST_SUB= PORTVERSION=${PORTVERSION} USES= gmake +USE_OCAML= yes +NO_OCAML_RUNDEPENDS=yes WANT_GNOME= yes MAKE_ARGS= CFLAGS="" CONFLICTS?= unison-devel-[0-9]* unison-nox11-[0-9]* MAKE_JOBS_UNSAFE= yes ALL_TARGET= unison all DOCS= BUGS.txt NEWS README EXTRA_DOCS= unison-${PORTVERSION}-manual.html \ unison-${PORTVERSION}-manual.pdf unison-${PORTVERSION}-manual.ps OPTIONS_DEFINE= DOCS X11 OPTIONS_DEFAULT?= DOCS X11 .include .if ${PORT_OPTIONS:MX11} MAKE_ARGS+= UISTYLE=gtk2 PLIST_SUB+= TEXT="" BUILD_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 \ icotool:${PORTSDIR}/graphics/icoutils RUN_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 SUB_FILES+= ${PORTNAME}.desktop .else MAKE_ARGS+= UISTYLE=text PLIST_SUB+= TEXT="@comment " PKGMESSAGE= ${PKGDIR}/pkg-message.nox11 .endif .if ${PORT_OPTIONS:MX11} post-patch: @${REINPLACE_CMD} -Ee 's@(\+|/)(lablgtk2)@\1site-lib/\2@' \ ${WRKSRC}/Makefile.OCaml post-build: @${ECHO} Building text-only version @${ECHO} ${WRKSRC} ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC} CFLAGS="" UISTYLE=text NAME=unison-text @cd ${WRKSRC}/win32rc && ${LOCALBASE}/bin/icotool -x U.ico .endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${STAGEDIR}${DOCSDIR} .if ${PORT_OPTIONS:MX11} ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-text ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png .endif .include Index: head/net/unison-devel/Makefile =================================================================== --- head/net/unison-devel/Makefile (revision 385412) +++ head/net/unison-devel/Makefile (revision 385413) @@ -1,83 +1,83 @@ # Created by: Dan Pelleg # $FreeBSD$ PORTNAME= unison PORTVERSION= 2.48.1 CATEGORIES= net MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ PKGNAMESUFFIX= -devel DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS} DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.gz MAINTAINER= madpilot@FreeBSD.org COMMENT= User-level file synchronization tool IGNORE= No devel release available. \ Install net/unison which is the latest stable version. LICENSE= GPLv3 -BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml - PLIST_SUB= PORTVERSION=${PORTVERSION} USES= gmake +USE_OCAML= yes +NO_OCAML_RUNDEPENDS=yes WANT_GNOME= yes MAKE_ARGS= CFLAGS="" CONFLICTS= unison-[0-9]* unison-nox11-[0-9]* DOCS= BUGS.txt NEWS README EXTRA_DOCS= unison-${PORTVERSION}-manual.html \ unison-${PORTVERSION}-manual.pdf unison-${PORTVERSION}-manual.ps OPTIONS_DEFINE= DOCS X11 OPTIONS_DEFAULT= DOCS X11 MAKE_JOBS_UNSAFE= yes ALL_TARGET= unison all .include .if ${PORT_OPTIONS:MX11} MAKE_ARGS+= UISTYLE=gtk2 PLIST_SUB+= TEXT="" BUILD_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 \ icotool:${PORTSDIR}/graphics/icoutils RUN_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 SUB_FILES+= ${PORTNAME}.desktop .else MAKE_ARGS+= UISTYLE=text PLIST_SUB+= TEXT="@comment " PKGMESSAGE= ${PKGDIR}/pkg-message.nox11 .endif .if ${PORT_OPTIONS:MX11} post-patch: @${REINPLACE_CMD} -Ee 's@(\+|/)(lablgtk2)@\1site-lib/\2@' \ ${WRKSRC}/Makefile.OCaml post-build: @${ECHO} Building text-only version @${ECHO} ${WRKSRC} ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC} CFLAGS="" UISTYLE=text NAME=unison-text @cd ${WRKSRC}/win32rc && ${LOCALBASE}/bin/icotool -x U.ico .endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/unison ${STAGEDIR}${PREFIX}/bin post-install: .if ${PORT_OPTIONS:MX11} ${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${STAGEDIR}${PREFIX}/bin .endif @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${STAGEDIR}${DOCSDIR} .if ${PORT_OPTIONS:MX11} ${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png .endif .include Index: head/net/unison232/Makefile =================================================================== --- head/net/unison232/Makefile (revision 385412) +++ head/net/unison232/Makefile (revision 385413) @@ -1,77 +1,77 @@ # Created by: Dan Pelleg # $FreeBSD$ PORTNAME= unison PORTVERSION= 2.32.52 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= net MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ PKGNAMESUFFIX= 232 DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS} DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.gz MAINTAINER= mandree@FreeBSD.org # Implicit approval for port changes granted to Guido Falsi COMMENT= User-level file synchronization tool LICENSE= GPLv3 -BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml - PLIST_SUB= PORTVERSION=${PORTVERSION} USES= gmake +USE_OCAML= yes +NO_OCAML_RUNDEPENDS=yes WANT_GNOME= yes MAKE_ARGS= CFLAGS="" MAKE_JOBS_UNSAFE= yes DOCS= BUGS.txt NEWS README DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} EXTRA_DOCS= ${PORTNAME}-${PORTVERSION}-manual.html \ ${PORTNAME}-${PORTVERSION}-manual.pdf ${PORTNAME}-${PORTVERSION}-manual.ps OPTIONS_DEFINE= DOCS X11 OPTIONS_DEFAULT= DOCS X11 .include .if ${PORT_OPTIONS:MX11} MAKE_ARGS+= UISTYLE=gtk2 PLIST_SUB+= TEXT="" BUILD_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 \ icotool:${PORTSDIR}/graphics/icoutils RUN_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 SUB_FILES+= ${PORTNAME}.desktop .else MAKE_ARGS+= UISTYLE=text PLIST_SUB+= TEXT="@comment " .endif .if ${PORT_OPTIONS:MX11} post-patch: @${REINPLACE_CMD} -Ee 's@(\+|/)(lablgtk2)@\1site-lib/\2@' \ ${WRKSRC}/Makefile.OCaml post-build: @${ECHO} Building text-only version @${ECHO} ${WRKSRC} ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC} CFLAGS="" UISTYLE=text NAME=${PORTNAME}-text @cd ${WRKSRC}/win32rc && ${LOCALBASE}/bin/icotool -x U.ico .endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${STAGEDIR}${DOCSDIR} .if ${PORT_OPTIONS:MX11} ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-text ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}-text ${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}/${PORTNAME}${PKGNAMESUFFIX}.desktop @${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}${PKGNAMESUFFIX}.png .endif .include Index: head/net/unison240/Makefile =================================================================== --- head/net/unison240/Makefile (revision 385412) +++ head/net/unison240/Makefile (revision 385413) @@ -1,78 +1,78 @@ # Created by: Dan Pelleg # $FreeBSD$ PORTNAME= unison PORTVERSION= 2.40.128 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ PKGNAMESUFFIX= 240 DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS} DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.gz MAINTAINER?= madpilot@FreeBSD.org COMMENT?= User-level file synchronization tool LICENSE= GPLv3 -BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml - PLIST_SUB= PORTVERSION=${PORTVERSION} USES= gmake +USE_OCAML= yes +NO_OCAML_RUNDEPENDS=yes WANT_GNOME= yes MAKE_ARGS= CFLAGS="" MAKE_JOBS_UNSAFE= yes ALL_TARGET= unison all DOCS= BUGS.txt NEWS README DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} EXTRA_DOCS= unison-${PORTVERSION}-manual.html \ unison-${PORTVERSION}-manual.pdf unison-${PORTVERSION}-manual.ps OPTIONS_DEFINE= DOCS X11 OPTIONS_DEFAULT?= DOCS X11 .include .if ${PORT_OPTIONS:MX11} MAKE_ARGS+= UISTYLE=gtk2 PLIST_SUB+= TEXT="" BUILD_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 \ icotool:${PORTSDIR}/graphics/icoutils RUN_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 SUB_FILES+= ${PORTNAME}.desktop .else MAKE_ARGS+= UISTYLE=text PLIST_SUB+= TEXT="@comment " PKGMESSAGE= ${PKGDIR}/pkg-message.nox11 .endif .if ${PORT_OPTIONS:MX11} post-patch: @${REINPLACE_CMD} -Ee 's@(\+|/)(lablgtk2)@\1site-lib/\2@' \ ${WRKSRC}/Makefile.OCaml post-build: @${ECHO} Building text-only version @${ECHO} ${WRKSRC} ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC} CFLAGS="" UISTYLE=text NAME=unison-text @cd ${WRKSRC}/win32rc && ${LOCALBASE}/bin/icotool -x U.ico .endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${STAGEDIR}${DOCSDIR} .if ${PORT_OPTIONS:MX11} ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-text ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}-text @${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}/${PORTNAME}${PKGNAMESUFFIX}.desktop ${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}${PKGNAMESUFFIX}.png .endif .include Index: head/net-p2p/liberator/Makefile =================================================================== --- head/net-p2p/liberator/Makefile (revision 385412) +++ head/net-p2p/liberator/Makefile (revision 385413) @@ -1,52 +1,53 @@ # Created by: Mario Sergio Fujikawa Ferreira # $FreeBSD$ PORTNAME= liberator PORTVERSION= 2.0.2 PORTREVISION= 1 CATEGORIES= net-p2p MASTER_SITES= SF/${PORTNAME}/ofcp/ofcp-${PORTVERSION} DISTNAME= ofcp-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Command line client to FreeNet Network USES= tar:bzip2 USE_OCAML= yes +USE_OCAML_CAMLP4=yes ALL_TARGET= all opt MAKE_JOBS_UNSAFE=yes DATA_FILES= liber_mimetypes DOC_FILES= COPYING FREESITE-HOWTO README TODO LIB_FILES= fcp.cma hlfi.cma asfi.cma fcp.cmxa hlfi.cmxa asfi.cmxa \ fcp.mli hlfreenet.mli asfreenet.mli fieldset.mli \ fstream.mli \ fcp.cmi hlfreenet.cmi asfreenet.cmi fieldset.cmi \ fstream.cmi OPTIONS_DEFINE= DOCS post-patch: @${SED} -e 's|%%PREFIX%%|${PREFIX}|; \ s|%%DATADIR%%|${DATADIR:S,^${PREFIX}/,,}|' \ ${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.sh do-configure: @${REINPLACE_CMD} -E \ -e 's|^(PREFIX).*$$|\1=${PREFIX}|; \ s|^(OCAML_PREFIX).*$$|\1=${PREFIX}/lib/ocaml|' \ ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/liber ${STAGEDIR}${PREFIX}/bin/liber-real ${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${STAGEDIR}${PREFIX}/bin/liber @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${DATA_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOC_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${PREFIX}/lib/ocaml ${INSTALL_DATA} ${LIB_FILES:S|^|${WRKSRC}/|} \ ${STAGEDIR}${PREFIX}/lib/ocaml .include Index: head/net-p2p/mldonkey/Makefile =================================================================== --- head/net-p2p/mldonkey/Makefile (revision 385412) +++ head/net-p2p/mldonkey/Makefile (revision 385413) @@ -1,163 +1,163 @@ # Created by: Holger Lamm # $FreeBSD$ PORTNAME= mldonkey PORTVERSION= 3.1.5 CATEGORIES+= net-p2p MASTER_SITES= SF MAINTAINER?= ports@FreeBSD.org COMMENT?= OCAML client for multiple peer-to-peer networks LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/Copying.txt -BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml - CONFLICTS= mldonkey{-{core,gui},}-devel-[0-9]* USES= iconv tar:bzip2 gmake USE_AUTOTOOLS= autoconf:env +USE_OCAML= yes +USE_OCAML_CAMLP4=yes GNU_CONFIGURE= yes ALL_TARGET= opt MAKE_ENV+= OCAMLRUNPARAM="l=256M" MAKE_JOBS_UNSAFE= yes CONFIGURE_ARGS+=${ICONV_CONFIGURE_ARG} CONFIGURE_ENV+= NEWCXX="${CXX}" \ PTHREAD_LIBS="-lpthread" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib SUB_FILES= pkg-message ### ## Options activation ### OPTIONS_DEFINE= GD DOCS EXAMPLES OPTIONS_DEFAULT=CORE GD GUI OPTIONS_MULTI= CLIENT OPTIONS_MULTI_CLIENT=CORE GUI CORE_DESC= Client 'core' support .include .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MCORE} CONFLICTS+= mldonkey-core-[0.9]* CONFLICTS+= mldonkey-gui-[0.9]* PLIST_SUB+= CORE="" GUI="" GUICORE="" .else # (${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MCORE}) . if !${PORT_OPTIONS:MGUI} PKGNAMESUFFIX= -core CONFLICTS+= mldonkey-gui-[0.9]* CONFIGURE_ARGS+=--disable-gui PLIST_SUB+= CORE="" GUI="@comment " GUICORE="@comment " . endif # !${PORT_OPTIONS:MGUI} . if !${PORT_OPTIONS:MCORE} PKGNAMESUFFIX= -gui CONFLICTS+= mldonkey-core-[0.9]* PLIST_SUB+= CORE="@comment " GUI="" GUICORE="@comment " . endif # !${PORT_OPTIONS:MCORE} .endif # ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MCORE} .if ${PORT_OPTIONS:MGUI} BUILD_DEPENDS+= ${LOCALBASE}/lib/ocaml/site-lib/lablgtk2/lablrsvg.cma:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 LIB_DEPENDS+= librsvg-2.so:${PORTSDIR}/graphics/librsvg2 CONFIGURE_ARGS+=--enable-gui=newgui2 # we don't need lablgtk as RUN dependency, but we need gtk+glib USE_GNOME= gtk20 .endif # ${PORT_OPTIONS:MGUI} .if ${PORT_OPTIONS:MCORE} USE_RC_SUBR= mlnet SUB_LIST+= SH=${SH:Q} . if ${PORT_OPTIONS:MGD} LIB_DEPENDS+= libgd.so:${PORTSDIR}/graphics/gd . else CONFIGURE_ARGS+=--disable-gd . endif .endif PORTDOCS= Authors.txt Bugs.txt ChangeLog Developers.txt \ Install.txt Todo.txt ed2k_links.txt # build additional tools ALL_TARGET+= \ mld_hash .include post-patch: @${SED} \ -e "s|%%PREFIX%%|${PREFIX}|" \ -e "s|%%SH%%|${SH}|" \ ${FILESDIR}/wrapper.sh > \ ${WRKDIR}/wrapper.sh @${REINPLACE_CMD} -E \ -e 's|%%AUTOCONF%%|${AUTOCONF}|' \ ${BUILD_WRKSRC}/config/Makefile.in @${REINPLACE_CMD} -E \ -e 's@(\+)(lablgtk2)@\1site-lib/\2@' \ -e 's@(\+)(labl\$$\(GTK\))@\1site-lib/\2@' \ -e 's@(OCAMLLIB/)(\$$LABLGTK_NAME)@\1site-lib/\2@' \ ${WRKSRC}/config/configure.in \ ${WRKSRC}/config/Makefile.in @${REINPLACE_CMD} -E \ -e 's@(#include <)(lablgtk2/)@\1site-lib/\2@' \ ${WRKSRC}/src/gtk2/gui/x11/systraystubs.c # update server.met provider @${REINPLACE_CMD} -E \ -e 's|http://www.gruk.org/server.met.gz|http://www.jd2k.com/server.met|' \ -e 's|http://www.bluetack.co.uk/config/antip2p.txt|http://www.bluetack.co.uk/config/level1.gz|' \ ${WRKSRC}/src/daemon/common/commonOptions.ml \ ${WRKSRC}/src/networks/donkey/donkeyServers.ml pre-configure: @cd ${WRKSRC}/config && ${AUTOCONF} do-install: .if ${PORT_OPTIONS:MCORE} ${INSTALL_PROGRAM} ${WRKSRC}/mld_hash ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/mlnet ${STAGEDIR}${PREFIX}/bin/mlnet-real ${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${STAGEDIR}${PREFIX}/bin/mlnet .if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_SCRIPT} ${FILESDIR}/kill_mldonkey ${STAGEDIR}${EXAMPLESDIR} .endif .endif .if ${PORT_OPTIONS:MGUI} ${INSTALL_PROGRAM} ${WRKSRC}/mlgui ${STAGEDIR}${PREFIX}/bin .endif .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MCORE} ${INSTALL_SCRIPT} ${WRKSRC}/distrib/mldonkey_previewer ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/mlguistarter ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/mlnet+gui ${STAGEDIR}${PREFIX}/bin .endif .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} .for _file in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/distrib/${_file} ${STAGEDIR}${DOCSDIR} .endfor .endif install-user: extract .if !defined(LANG) @${ECHO_MSG} "Please call as: make install-user LANG=" @${ECHO_MSG} "with one of en,de,fr,fr.noaccents,sp !" .else @${CP} ${WRKSRC}/distrib/i18n/gui_messages.ini.${LANG}\ ${HOME}/.mldonkey_gui_messages.ini .endif .include Index: head/security/sks/Makefile =================================================================== --- head/security/sks/Makefile (revision 385412) +++ head/security/sks/Makefile (revision 385413) @@ -1,52 +1,51 @@ # $FreeBSD$ PORTNAME= sks PORTVERSION= 1.1.5 PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://cdn.bitbucket.org/skskeyserver/sks-keyserver/downloads/ MAINTAINER= johans@FreeBSD.org COMMENT= Synchronizing Key Server, a fast OpenPGP keyserver -BUILD_DEPENDS= camlp4:${PORTSDIR}/devel/ocaml-camlp4 - PROJECTHOST= sks-keyserver USE_OCAML= yes +USE_OCAML_CAMLP4=yes USE_BDB= 5 USES= perl5 gmake shebangfix tar:tgz USE_PERL5= build MAKE_JOBS_UNSAFE=yes SHEBANG_FILES= sks_build.sh MAKE_ENV= BDBINCLUDE="-I${BDB_INCLUDE_DIR}" \ BDBLIB="-L${BDB_LIB_DIR}" \ LIBDB="-l${BDB_LIB_NAME}" \ MANDIR="${MANPREFIX}/man" SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS post-extract: @: > ${WRKSRC}/Makefile.local @${REINPLACE_CMD} 's/-ccopt -pg //' ${WRKSRC}/Makefile @cd ${WRKSRC} && ${RM} -f .depend post-patch: @${REINPLACE_CMD} -Ee '/^CC=/d; /^CFLAGS=/s/=/+=/' \ -e '/^install/,$$s/\$$\((PREFIX|MANDIR)\)/$$(DESTDIR)&/' \ -e '/patch/s/-p 0/-p0/' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e '/^CC=/d; /^CFLAGS=/s/=/+=/' ${WRKSRC}/bdb/Makefile pre-build: @cd ${WRKSRC} && test -f .depend || ${MAKE_CMD} dep post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} BUGS README.md TODO UPGRADING \ ${STAGEDIR}${DOCSDIR} @cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} sks sks_add_mail .include Index: head/textproc/ocaml-text/Makefile =================================================================== --- head/textproc/ocaml-text/Makefile (revision 385412) +++ head/textproc/ocaml-text/Makefile (revision 385413) @@ -1,49 +1,50 @@ # Created by: Jaap Boender # $FreeBSD$ PORTNAME= text PORTVERSION= 0.6 PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/937/ PKGNAMEPREFIX= ocaml- DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION} MAINTAINER= jaapb@kerguelen.org COMMENT= OCaml library for dealing with text USES= gmake HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix ${PREFIX} \ --destdir ${STAGEDIR} USE_OCAML= yes USE_OCAML_FINDLIB= yes +USE_OCAML_CAMLP4= yes USE_OCAML_LDCONFIG= yes USE_OCAMLFIND_PLIST= yes SA_DIR= ${LOCALBASE}/${OCAML_SITELIBDIR} DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} OPTIONS_DEFINE= PCRE OPTIONS_DEFAULT= PCRE PCRE_CONFIGURE_ENABLE= pcre PCRE_BUILD_DEPENDS= ${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre PCRE_RUN_DEPENDS= ${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre post-patch: @${REINPLACE_CMD} -e 's,"install" :: findlib_name,"install" :: "-destdir ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib" :: "-ldconf /dev/null" :: findlib_name,' \ ${WRKSRC}/setup.ml do-configure: (cd ${WRKSRC}; ocaml setup.ml -configure ${CONFIGURE_ARGS}) do-build: (cd ${WRKSRC}; ocaml setup.ml -build) do-install: ${MKDIR} ${STAGEDIR}${OCAMLFIND_DESTDIR} (cd ${WRKSRC}; ocaml setup.ml -install) .include Index: head/www/ocaml-net/Makefile =================================================================== --- head/www/ocaml-net/Makefile (revision 385412) +++ head/www/ocaml-net/Makefile (revision 385413) @@ -1,129 +1,130 @@ # Created by: Stephane Legrand # $FreeBSD$ PORTNAME= net PORTVERSION= 3.7.3 CATEGORIES= www MASTER_SITES= http://download.camlcity.org/download/ PKGNAMEPREFIX= ocaml- DISTNAME= ocaml${PORTNAME}-${PORTVERSION} MAINTAINER= jaapb@kerguelen.org COMMENT= OCaml modules for Internet applications LICENSE= GPLv2 BUILD_DEPENDS= ${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre RUN_DEPENDS= ${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre CONFLICTS= ocaml-equeue-2* ocaml-netclient-0* USES= gmake USE_OCAML= yes USE_OCAML_FINDLIB= yes +USE_OCAML_CAMLP4= yes USE_OCAML_LDCONFIG= yes USE_OCAMLFIND_PLIST= yes HAS_CONFIGURE= yes ALL_TARGET= all opt MAKE_JOBS_UNSAFE= yes PLIST_FILES= bin/netplex-admin \ bin/ocamlrpcgen DOCSDIR= ${PREFIX}/share/doc/ocaml/${PKGNAMEPREFIX}${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples/ocaml/${PKGNAMEPREFIX}${PORTNAME} SA_DIR= ${LOCALBASE}/${OCAML_SITELIBDIR} PORTDOCS= * PORTEXAMPLES= * OCAML_PKGDIRS= netsys netshm equeue shell netstring rpc-generator \ rpc pop smtp netclient netcgi2 netgssapi netplex \ netcgi2-plex netcamlbox netmulticore rpc-auth-local \ netstring-pcre OCAML_LDLIBS= ${OCAML_PKGDIRS:S/^/${OCAML_SITELIBDIR}\//} OPTIONS_DEFINE= SSL NETHTTPD AUTH_DH GTK2 APACHE ZIP SCRAM EXAMPLES DOCS OPTIONS_DEFAULT=SSL AUTH_DH_DESC= Diffie-Hellman authorization support NETHTTPD_DESC= Integrated HTTP daemon SCRAM_DESC= SCRAM support ZIP_DESC= Compression support APACHE_DESC= Apache mod connector (experimental) CONFIGURE_ARGS+=-disable-gtk \ -enable-pcre SSL_BUILD_DEPENDS= ${SA_DIR}/ssl/ssl.a:${PORTSDIR}/security/ocaml-ssl SSL_RUN_DEPENDS= ${SA_DIR}/ssl/ssl.a:${PORTSDIR}/security/ocaml-ssl AUTH_DH_BUILD_DEPENDS= ${SA_DIR}/cryptgps/cryptgps.a:${PORTSDIR}/security/ocaml-cryptgps AUTH_DH_RUN_DEPENDS= ${SA_DIR}/cryptgps/cryptgps.a:${PORTSDIR}/security/ocaml-cryptgps GTK2_BUILD_DEPENDS= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 GTK2_RUN_DEPENDS= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 ZIP_BUILD_DEPENDS= ${SA_DIR}/zip/zip.a:${PORTSDIR}/archivers/ocaml-zip ZIP_RUN_DEPENDS= ${SA_DIR}/zip/zip.a:${PORTSDIR}/archivers/ocaml-zip SCRAM_BUILD_DEPENDS= ${SA_DIR}/cryptokit/cryptokit.a:${PORTSDIR}/security/ocaml-cryptokit SCRAM_RUN_DEPENDS= ${SA_DIR}/cryptokit/cryptokit.a:${PORTSDIR}/security/ocaml-cryptokit .include .if ${PORT_OPTIONS:MSSL} CONFIGURE_ARGS+= -enable-ssl OCAML_PKGDIRS+= equeue-ssl rpc-ssl .endif .if ${PORT_OPTIONS:MNETHTTPD} CONFIGURE_ARGS+= -with-nethttpd OCAML_PKGDIRS+= nethttpd nethttpd-for-netcgi2 .endif .if ${PORT_OPTIONS:MAUTH_DH} CONFIGURE_ARGS+= -with-rpc-auth-dh OCAML_PKGDIRS+= rpc-auth-dh .endif .if ${PORT_OPTIONS:MGTK2} CONFIGURE_ARGS+= -enable-gtk2 OCAML_PKGDIRS+= equeue-gtk2 .endif .if ${PORT_OPTIONS:MAPACHE} USE_APACHE= 22+ CONFIGURE_ARGS+= -enable-apache -apxs ${APXS} -apache ${HTTPD} OCAML_PKGDIRS+= netcgi_apache .endif .if ${PORT_OPTIONS:MZIP} CONFIGURE_ARGS+= -enable-zip OCAML_PKGDIRS+= netzip .endif .if ${PORT_OPTIONS:MSCRAM} CONFIGURE_ARGS+= -enable-crypto OCAML_PKGDIRS+= netmech-scram .endif post-patch: ${REINPLACE_CMD} -e '/\.libs/d' \ ${WRKSRC}/src/netcgi2-apache/Makefile.def ${REINPLACE_CMD} -e 's/camlzip/zip/' \ ${WRKSRC}/configure \ ${WRKSRC}/src/netzip/META.in \ ${WRKSRC}/src/netzip/Makefile post-install: .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR}/ @(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/) .endif .if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ @(cd ${WRKSRC}/examples/ && \ ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}/) .endif .include Index: head/x11-toolkits/ocaml-lablgtk2/files/patch-20130219 =================================================================== --- head/x11-toolkits/ocaml-lablgtk2/files/patch-20130219 (revision 385412) +++ head/x11-toolkits/ocaml-lablgtk2/files/patch-20130219 (nonexistent) @@ -1,1744 +0,0 @@ -diff --git CHANGES CHANGES -index 33e393d..33c3e8b 100644 ---- CHANGES -+++ CHANGES -@@ -1,5 +1,17 @@ - LablGTK changes log - -+2013.2.19 [Jacques] -+ * fix compatibility with ocaml 4.01 (?lab for non-optional arguments) -+ -+2012.08.26 [Jacques] -+ * detect findlib during configuration -+ * support DESTDIR with findlib-install -+ -+2012.08.26 [Jacques] -+ * indicate that only old-install supports DESTDIR -+ * have old-install copy the META file too -+ * cleanup the two phases of findlib-install -+ - In Lablgtk-2.16.0: - - 2012.08.23 [Jacques] -diff --git README README -index a31230c..6c2719a 100755 ---- README -+++ README -@@ -67,10 +67,9 @@ How to compile: - override autodetected gtksourceview2 support - --enable-debug: enable debug mode - -- Type "make install" or "make install DESTDIR=..." to install using -- findlib. The commands lablgtk2, gdk_pixbuf_mlsource, and -- lablgladecc2, are copied directly to the configured executable -- directory. Installation paths are prefixed by DESTDIR when given. -+ Type "make install" to install using findlib. -+ The commands lablgtk2, gdk_pixbuf_mlsource, and lablgladecc2, -+ are copied directly to the configured executable directory. - - The following findlib packages are provided (according to configuration): - -@@ -87,10 +86,11 @@ How to compile: - lablgtk2.sourceview - lablgtk2.sourceview2 - -- You can alternatively use "make old-install" to use the old -+ You can alternatively use "make old-install" or -+ "make old-install DESTDIR=/my/prefix" to use the old - installation procedure, which does not rely on findlib. - By default, the library is installed at +lablgtk2. -- Again, installation paths are prefixed by DESTDIR when given. -+ All installation paths are prefixed by DESTDIR when given. - - Contents: - -diff --git config.make.in config.make.in -index e689bda..14d3cdd 100644 ---- config.make.in -+++ config.make.in -@@ -9,6 +9,9 @@ OCAMLDOC=@OCAMLDOC@ - CAMLMKTOP=@CAMLMKTOP@ - CAMLMKLIB=@CAMLMKLIB@ - CAMLP4O=@CAMLP4O@ -+OCAMLFIND=@OCAMLFIND@ -+FINDLIBDIR=@FINDLIBDIR@ -+OCAMLLDCONF=@OCAMLLDCONF@ - CAMLBEST=@OCAMLBEST@ - CAMLWIN32=@OCAMLWIN32@ - CAMLDEP=@OCAMLDEP@ -@@ -56,9 +59,11 @@ BINDIR=$(DESTDIR)@bindir@ - # where to install the man page - MANDIR=$(DESTDIR)@mandir@ - -+LABLGTKDIR=@LIBDIR@/lablgtk2 - INSTALLDIR=$(DESTDIR)@LIBDIR@/lablgtk2 - DLLDIR=$(DESTDIR)@LIBDIR@/stublibs - LABLGLDIR=@LABLGLDIR@ -+FLINSTALLDIR=$(DESTDIR)$(FINDLIBDIR)/lablgtk2 - - FILT = -Wl,--export-dynamic - clean_libs = $(subst -pthread,-ldopt -pthread -ccopt -pthread,$(subst --rpath,-rpath,$(filter-out $(FILT),$(1)))) -diff --git configure configure -index 44a943b..8cdc264 100755 ---- configure -+++ configure -@@ -1,11 +1,9 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.68. -+# Generated by GNU Autoconf 2.69. - # - # --# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, --# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software --# Foundation, Inc. -+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. - # - # - # This configure script is free software; the Free Software Foundation -@@ -134,6 +132,31 @@ export LANGUAGE - # CDPATH. - (unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -+# Use a proper internal environment variable to ensure we don't fall -+ # into an infinite loop, continuously re-executing ourselves. -+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then -+ _as_can_reexec=no; export _as_can_reexec; -+ # We cannot yet assume a decent shell, so we have to provide a -+# neutralization value for shells without unset; and this also -+# works around shells that cannot unset nonexistent variables. -+# Preserve -v and -x to the replacement shell. -+BASH_ENV=/dev/null -+ENV=/dev/null -+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+case $- in # (((( -+ *v*x* | *x*v* ) as_opts=-vx ;; -+ *v* ) as_opts=-v ;; -+ *x* ) as_opts=-x ;; -+ * ) as_opts= ;; -+esac -+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -+# Admittedly, this is quite paranoid, since all the known shells bail -+# out after a failed `exec'. -+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -+as_fn_exit 255 -+ fi -+ # We don't want this to propagate to other subprocesses. -+ { _as_can_reexec=; unset _as_can_reexec;} - if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : - emulate sh -@@ -167,7 +190,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : - else - exitcode=1; echo positional parameters were not saved. - fi --test x\$exitcode = x0 || exit 1" -+test x\$exitcode = x0 || exit 1 -+test -x / || exit 1" - as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO - as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO - eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && -@@ -211,21 +235,25 @@ IFS=$as_save_IFS - - - if test "x$CONFIG_SHELL" != x; then : -- # We cannot yet assume a decent shell, so we have to provide a -- # neutralization value for shells without unset; and this also -- # works around shells that cannot unset nonexistent variables. -- # Preserve -v and -x to the replacement shell. -- BASH_ENV=/dev/null -- ENV=/dev/null -- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -- export CONFIG_SHELL -- case $- in # (((( -- *v*x* | *x*v* ) as_opts=-vx ;; -- *v* ) as_opts=-v ;; -- *x* ) as_opts=-x ;; -- * ) as_opts= ;; -- esac -- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} -+ export CONFIG_SHELL -+ # We cannot yet assume a decent shell, so we have to provide a -+# neutralization value for shells without unset; and this also -+# works around shells that cannot unset nonexistent variables. -+# Preserve -v and -x to the replacement shell. -+BASH_ENV=/dev/null -+ENV=/dev/null -+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+case $- in # (((( -+ *v*x* | *x*v* ) as_opts=-vx ;; -+ *v* ) as_opts=-v ;; -+ *x* ) as_opts=-x ;; -+ * ) as_opts= ;; -+esac -+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -+# Admittedly, this is quite paranoid, since all the known shells bail -+# out after a failed `exec'. -+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -+exit 255 - fi - - if test x$as_have_required = xno; then : -@@ -327,6 +355,14 @@ $as_echo X"$as_dir" | - - - } # as_fn_mkdir_p -+ -+# as_fn_executable_p FILE -+# ----------------------- -+# Test if FILE is an executable regular file. -+as_fn_executable_p () -+{ -+ test -f "$1" && test -x "$1" -+} # as_fn_executable_p - # as_fn_append VAR VALUE - # ---------------------- - # Append the text in VALUE to the end of the definition contained in VAR. Take -@@ -448,6 +484,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - -+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have -+ # already done that, so ensure we don't try to do so again and fall -+ # in an infinite loop. This has already happened in practice. -+ _as_can_reexec=no; export _as_can_reexec - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). -@@ -482,16 +522,16 @@ if (echo >conf$$.file) 2>/dev/null; then - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -- # In both cases, we have to default to `cp -p'. -+ # In both cases, we have to default to `cp -pR'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi - rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file - rmdir conf$$.dir 2>/dev/null -@@ -503,28 +543,8 @@ else - as_mkdir_p=false - fi - --if test -x / >/dev/null 2>&1; then -- as_test_x='test -x' --else -- if ls -dL / >/dev/null 2>&1; then -- as_ls_L_option=L -- else -- as_ls_L_option= -- fi -- as_test_x=' -- eval sh -c '\'' -- if test -d "$1"; then -- test -d "$1/."; -- else -- case $1 in #( -- -*)set "./$1";; -- esac; -- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( -- ???[sx]*):;;*)false;;esac;fi -- '\'' sh -- ' --fi --as_executable_p=$as_test_x -+as_test_x='test -x' -+as_executable_p=as_fn_executable_p - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -568,6 +588,8 @@ DEBUG - USE_CC - HAVE_SVGZ - LABLGLDIR -+OCAMLLDCONF -+FINDLIBDIR - HAS_NATIVE_DYNLINK - HAS_DLL_SUPPORT - THREADS_LIB -@@ -623,6 +645,7 @@ CC - RANLIB - HAS_PRINTEXC_BACKTRACE - ODOC_DEF -+OCAMLFIND - CAMLP4O - CAMLMKLIB - CAMLMKTOP -@@ -1179,8 +1202,6 @@ target=$target_alias - if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe -- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. -- If a cross compiler is detected then cross compile mode will be used" >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -@@ -1471,9 +1492,9 @@ test -n "$ac_init_help" && exit $ac_status - if $ac_init_version; then - cat <<\_ACEOF - configure --generated by GNU Autoconf 2.68 -+generated by GNU Autoconf 2.69 - --Copyright (C) 2010 Free Software Foundation, Inc. -+Copyright (C) 2012 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF -@@ -1591,7 +1612,7 @@ $as_echo "$ac_try_echo"; } >&5 - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -+ test -x conftest$ac_exeext - }; then : - ac_retval=0 - else -@@ -1681,7 +1702,7 @@ This file contains any messages produced by compilers while - running configure, to aid debugging if configure makes a mistake. - - It was created by $as_me, which was --generated by GNU Autoconf 2.68. Invocation command line was -+generated by GNU Autoconf 2.69. Invocation command line was - - $ $0 $@ - -@@ -2048,7 +2069,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CAMLC="ocamlc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2116,7 +2137,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CAMLOPT="ocamlopt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2174,7 +2195,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OCAMLCDOTOPT="ocamlc.opt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2228,7 +2249,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OCAMLOPTDOTOPT="ocamlopt.opt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2282,7 +2303,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OCAMLRUN="ocamlrun" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2324,7 +2345,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OCAMLDEP="ocamldep" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2366,7 +2387,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OCAMLDOC="ocamldoc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2409,7 +2430,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OCAMLLEX="ocamllex" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2456,7 +2477,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OCAMLYACC="ocamlyacc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2498,7 +2519,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CAMLMKTOP="ocamlmktop" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2540,7 +2561,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CAMLMKLIB="ocamlmklib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2582,7 +2603,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CAMLP4O="camlp4o" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2608,6 +2629,60 @@ if test "$CAMLP4O" = no ; then - as_fn_error $? "Cannot find camlp4o." "$LINENO" 5 - fi - -+# Extract the first word of "ocamlfind", so it can be a program name with args. -+set dummy ocamlfind; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_OCAMLFIND+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$OCAMLFIND"; then -+ ac_cv_prog_OCAMLFIND="$OCAMLFIND" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_OCAMLFIND="ocamlfind" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+ test -z "$ac_cv_prog_OCAMLFIND" && ac_cv_prog_OCAMLFIND="no" -+fi -+fi -+OCAMLFIND=$ac_cv_prog_OCAMLFIND -+if test -n "$OCAMLFIND"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLFIND" >&5 -+$as_echo "$OCAMLFIND" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+if test "`$OCAMLFIND printconf stdlib`" != "`$CAMLC -where`"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring ocamlfind" >&5 -+$as_echo "$as_me: WARNING: Ignoring ocamlfind" >&2;} -+ OCAMLFIND=no -+fi -+ -+if test "$OCAMLFIND" = no; then -+FINDLIBDIR="" -+OCAMLLDCONF="" -+else -+FINDLIBDIR="`ocamlfind printconf destdir | tr -d '\\r'`" -+echo "$OCAMLFIND library path is $FINDLIBDIR" -+OCAMLLDCONF="`ocamlfind printconf ldconf | tr -d '\\r'`" -+echo "$OCAMLFIND ldconf path is $OCAMLLDCONF" -+fi -+ - if expr "$OCAMLVERSION" '>=' '4' > /dev/null ; then - ODOC_DEF="-D OCAML_400" - fi -@@ -2673,7 +2748,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2713,7 +2788,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2776,7 +2851,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2816,7 +2891,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2869,7 +2944,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2910,7 +2985,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -@@ -2968,7 +3043,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3012,7 +3087,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3458,8 +3533,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - #include --#include --#include -+struct stat; - /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ - struct buf { int x; }; - FILE * (*rcsopen) (struct buf *, struct stat *, int); -@@ -3615,7 +3689,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3867,7 +3941,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3910,7 +3984,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -5126,6 +5200,9 @@ fi - - - -+ -+ -+ - # Finally create the config.make from config.make.in - ac_config_files="$ac_config_files config.make" - -@@ -5572,16 +5649,16 @@ if (echo >conf$$.file) 2>/dev/null; then - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -- # In both cases, we have to default to `cp -p'. -+ # In both cases, we have to default to `cp -pR'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi - rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file - rmdir conf$$.dir 2>/dev/null -@@ -5641,28 +5718,16 @@ else - as_mkdir_p=false - fi - --if test -x / >/dev/null 2>&1; then -- as_test_x='test -x' --else -- if ls -dL / >/dev/null 2>&1; then -- as_ls_L_option=L -- else -- as_ls_L_option= -- fi -- as_test_x=' -- eval sh -c '\'' -- if test -d "$1"; then -- test -d "$1/."; -- else -- case $1 in #( -- -*)set "./$1";; -- esac; -- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( -- ???[sx]*):;;*)false;;esac;fi -- '\'' sh -- ' --fi --as_executable_p=$as_test_x -+ -+# as_fn_executable_p FILE -+# ----------------------- -+# Test if FILE is an executable regular file. -+as_fn_executable_p () -+{ -+ test -f "$1" && test -x "$1" -+} # as_fn_executable_p -+as_test_x='test -x' -+as_executable_p=as_fn_executable_p - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -5684,7 +5749,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - # values after options handling. - ac_log=" - This file was extended by $as_me, which was --generated by GNU Autoconf 2.68. Invocation command line was -+generated by GNU Autoconf 2.69. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -5737,10 +5802,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" - ac_cs_version="\\ - config.status --configured by $0, generated by GNU Autoconf 2.68, -+configured by $0, generated by GNU Autoconf 2.69, - with options \\"\$ac_cs_config\\" - --Copyright (C) 2010 Free Software Foundation, Inc. -+Copyright (C) 2012 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." - -@@ -5817,7 +5882,7 @@ fi - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - if \$ac_cs_recheck; then -- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 - CONFIG_SHELL='$SHELL' -diff --git configure.in configure.in -index ae12f7e..eec0913 100644 ---- configure.in -+++ configure.in -@@ -154,6 +154,22 @@ if test "$CAMLP4O" = no ; then - AC_MSG_ERROR(Cannot find camlp4o.) - fi - -+AC_CHECK_PROG(OCAMLFIND,ocamlfind,ocamlfind,no) -+if test "`$OCAMLFIND printconf stdlib`" != "`$CAMLC -where`"; then -+ AC_MSG_WARN(Ignoring ocamlfind, it uses a different OCaml installation.) -+ OCAMLFIND=no -+fi -+ -+if test "$OCAMLFIND" = no; then -+FINDLIBDIR="" -+OCAMLLDCONF="" -+else -+FINDLIBDIR="`ocamlfind printconf destdir | tr -d '\\r'`" -+echo "$OCAMLFIND library path is $FINDLIBDIR" -+OCAMLLDCONF="`ocamlfind printconf ldconf | tr -d '\\r'`" -+echo "$OCAMLFIND ldconf path is $OCAMLLDCONF" -+fi -+ - if expr "$OCAMLVERSION" '>=' '4' > /dev/null ; then - ODOC_DEF="-D OCAML_400" - fi -@@ -351,6 +367,9 @@ AC_SUBST(OCAMLDOC) - AC_SUBST(CAMLMKTOP) - AC_SUBST(CAMLMKLIB) - AC_SUBST(CAMLP4O) -+AC_SUBST(OCAMLFIND) -+AC_SUBST(FINDLIBDIR) -+AC_SUBST(OCAMLLDCONF) - AC_SUBST(LABLGLDIR) - AC_SUBST(HAVE_SVGZ) - AC_SUBST(USE_CC) -diff --git src/.depend src/.depend -index 873af00..0423dea 100644 ---- src/.depend -+++ src/.depend -@@ -1,441 +1,542 @@ --gaux.cmo: --gaux.cmx: --gpointer.cmo: gpointer.cmi --gpointer.cmx: gpointer.cmi --gutf8.cmo: gutf8.cmi --gutf8.cmx: gutf8.cmi --glib.cmo: gutf8.cmi glib.cmi --glib.cmx: gutf8.cmx glib.cmi --gobject.cmo: gpointer.cmi gaux.cmo gobject.cmi --gobject.cmx: gpointer.cmx gaux.cmx gobject.cmi --gdkEnums.cmo: gpointer.cmi gobject.cmi --gdkEnums.cmx: gpointer.cmx gobject.cmx --pangoEnums.cmo: gpointer.cmi gobject.cmi --pangoEnums.cmx: gpointer.cmx gobject.cmx --gtkEnums.cmo: gpointer.cmi gobject.cmi --gtkEnums.cmx: gpointer.cmx gobject.cmx --pango.cmo: gpointer.cmi gobject.cmi glib.cmi gaux.cmo --pango.cmx: gpointer.cmx gobject.cmx glib.cmx gaux.cmx --gdk.cmo: pango.cmo gpointer.cmi gobject.cmi gaux.cmo gdk.cmi --gdk.cmx: pango.cmx gpointer.cmx gobject.cmx gaux.cmx gdk.cmi --gdkEvent.cmo: gpointer.cmi gdk.cmi gaux.cmo --gdkEvent.cmx: gpointer.cmx gdk.cmx gaux.cmx --gdkKeysyms.cmo: gdk.cmi --gdkKeysyms.cmx: gdk.cmx --gdkPixbuf.cmo: gpointer.cmi gobject.cmi gdk.cmi gaux.cmo gdkPixbuf.cmi --gdkPixbuf.cmx: gpointer.cmx gobject.cmx gdk.cmx gaux.cmx gdkPixbuf.cmi --gtk.cmo: gpointer.cmi gobject.cmi --gtk.cmx: gpointer.cmx gobject.cmx --gtkSignal.cmo: gobject.cmi gtkSignal.cmi --gtkSignal.cmx: gobject.cmx gtkSignal.cmi --gtkStock.cmo: gtk.cmo gobject.cmi gdkPixbuf.cmi gdk.cmi gaux.cmo --gtkStock.cmx: gtk.cmx gobject.cmx gdkPixbuf.cmx gdk.cmx gaux.cmx --gtkObject.cmo: gtk.cmo gobject.cmi --gtkObject.cmx: gtk.cmx gobject.cmx --gtkData.cmo: gtkSignal.cmi gtkBaseProps.cmo gtk.cmo gobject.cmi gdk.cmi \ -+gaux.cmo : -+gaux.cmx : -+gpointer.cmo : gpointer.cmi -+gpointer.cmx : gpointer.cmi -+gutf8.cmo : gutf8.cmi -+gutf8.cmx : gutf8.cmi -+glib.cmo : gutf8.cmi glib.cmi -+glib.cmx : gutf8.cmx glib.cmi -+gobject.cmo : gpointer.cmi gaux.cmo gobject.cmi -+gobject.cmx : gpointer.cmx gaux.cmx gobject.cmi -+gdkEnums.cmo : gpointer.cmi gobject.cmi -+gdkEnums.cmx : gpointer.cmx gobject.cmx -+pangoEnums.cmo : gpointer.cmi gobject.cmi -+pangoEnums.cmx : gpointer.cmx gobject.cmx -+gtkEnums.cmo : gpointer.cmi gobject.cmi -+gtkEnums.cmx : gpointer.cmx gobject.cmx -+pango.cmo : gpointer.cmi gobject.cmi glib.cmi gaux.cmo -+pango.cmx : gpointer.cmx gobject.cmx glib.cmx gaux.cmx -+gdk.cmo : pango.cmo gpointer.cmi gobject.cmi gaux.cmo gdk.cmi -+gdk.cmx : pango.cmx gpointer.cmx gobject.cmx gaux.cmx gdk.cmi -+gdkEvent.cmo : gpointer.cmi gdk.cmi gaux.cmo -+gdkEvent.cmx : gpointer.cmx gdk.cmx gaux.cmx -+gdkKeysyms.cmo : gdk.cmi -+gdkKeysyms.cmx : gdk.cmx -+gdkPixbuf.cmo : gpointer.cmi gobject.cmi gdk.cmi gaux.cmo gdkPixbuf.cmi -+gdkPixbuf.cmx : gpointer.cmx gobject.cmx gdk.cmx gaux.cmx gdkPixbuf.cmi -+gtk.cmo : gpointer.cmi gobject.cmi -+gtk.cmx : gpointer.cmx gobject.cmx -+gtkSignal.cmo : gobject.cmi gtkSignal.cmi -+gtkSignal.cmx : gobject.cmx gtkSignal.cmi -+gtkStock.cmo : gtk.cmo gobject.cmi gdkPixbuf.cmi gdk.cmi gaux.cmo -+gtkStock.cmx : gtk.cmx gobject.cmx gdkPixbuf.cmx gdk.cmx gaux.cmx -+gtkObject.cmo : gtk.cmo gobject.cmi -+gtkObject.cmx : gtk.cmx gobject.cmx -+gtkBaseProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \ -+ gpointer.cmi gobject.cmi gdkPixbuf.cmi gdkEvent.cmo gdkEnums.cmo gdk.cmi -+gtkBaseProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \ -+ gpointer.cmx gobject.cmx gdkPixbuf.cmx gdkEvent.cmx gdkEnums.cmx gdk.cmx -+gtkBinProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \ -+ gobject.cmi gdk.cmi -+gtkBinProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \ -+ gobject.cmx gdk.cmx -+gtkButtonProps.cmo : gtkStock.cmo gtkSignal.cmi gtkObject.cmo gtkEnums.cmo \ -+ gtk.cmo gobject.cmi gdk.cmi -+gtkButtonProps.cmx : gtkStock.cmx gtkSignal.cmx gtkObject.cmx gtkEnums.cmx \ -+ gtk.cmx gobject.cmx gdk.cmx -+gtkEditProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \ -+ gobject.cmi -+gtkEditProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \ -+ gobject.cmx -+gtkListProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \ -+ gobject.cmi gdkEvent.cmo -+gtkListProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \ -+ gobject.cmx gdkEvent.cmx -+gtkMenuProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \ -+ gobject.cmi -+gtkMenuProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \ -+ gobject.cmx -+gtkMiscProps.cmo : pangoEnums.cmo gtkStock.cmo gtkSignal.cmi gtkObject.cmo \ -+ gtkEnums.cmo gtk.cmo gobject.cmi gdkPixbuf.cmi gdkEvent.cmo gdk.cmi -+gtkMiscProps.cmx : pangoEnums.cmx gtkStock.cmx gtkSignal.cmx gtkObject.cmx \ -+ gtkEnums.cmx gtk.cmx gobject.cmx gdkPixbuf.cmx gdkEvent.cmx gdk.cmx -+gtkPackProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \ -+ gobject.cmi gdk.cmi -+gtkPackProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \ -+ gobject.cmx gdk.cmx -+gtkRangeProps.cmo : pangoEnums.cmo gtkSignal.cmi gtkObject.cmo gtkEnums.cmo \ -+ gtk.cmo gobject.cmi -+gtkRangeProps.cmx : pangoEnums.cmx gtkSignal.cmx gtkObject.cmx gtkEnums.cmx \ -+ gtk.cmx gobject.cmx -+gtkTextProps.cmo : pangoEnums.cmo pango.cmo gtkSignal.cmi gtkObject.cmo \ -+ gtkEnums.cmo gtk.cmo gobject.cmi gdkPixbuf.cmi gdkEvent.cmo gdk.cmi -+gtkTextProps.cmx : pangoEnums.cmx pango.cmx gtkSignal.cmx gtkObject.cmx \ -+ gtkEnums.cmx gtk.cmx gobject.cmx gdkPixbuf.cmx gdkEvent.cmx gdk.cmx -+gtkTreeProps.cmo : pangoEnums.cmo pango.cmo gtkSignal.cmi gtkObject.cmo \ -+ gtkEnums.cmo gtk.cmo gobject.cmi gdkPixbuf.cmi gdk.cmi -+gtkTreeProps.cmx : pangoEnums.cmx pango.cmx gtkSignal.cmx gtkObject.cmx \ -+ gtkEnums.cmx gtk.cmx gobject.cmx gdkPixbuf.cmx gdk.cmx -+gtkFileProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \ -+ gobject.cmi -+gtkFileProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \ -+ gobject.cmx -+gtkActionProps.cmo : gtkStock.cmo gtkSignal.cmi gtkObject.cmo gtkEnums.cmo \ -+ gtk.cmo gobject.cmi -+gtkActionProps.cmx : gtkStock.cmx gtkSignal.cmx gtkObject.cmx gtkEnums.cmx \ -+ gtk.cmx gobject.cmx -+gtkBrokenProps.cmo : gtkSignal.cmi gtkObject.cmo gtk.cmo gobject.cmi -+gtkBrokenProps.cmx : gtkSignal.cmx gtkObject.cmx gtk.cmx gobject.cmx -+gtkAssistantProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \ -+ gobject.cmi gdkPixbuf.cmi -+gtkAssistantProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \ -+ gobject.cmx gdkPixbuf.cmx -+gtkData.cmo : gtkSignal.cmi gtkBaseProps.cmo gtk.cmo gobject.cmi gdk.cmi \ - gaux.cmo --gtkData.cmx: gtkSignal.cmx gtkBaseProps.cmx gtk.cmx gobject.cmx gdk.cmx \ -+gtkData.cmx : gtkSignal.cmx gtkBaseProps.cmx gtk.cmx gobject.cmx gdk.cmx \ - gaux.cmx --gtkBase.cmo: pango.cmo gtkStock.cmo gtkSignal.cmi gtkObject.cmo gtkEnums.cmo \ -- gtkBaseProps.cmo gtk.cmo gpointer.cmi gobject.cmi gdkPixbuf.cmi \ -- gdkEvent.cmo gdk.cmi gaux.cmo --gtkBase.cmx: pango.cmx gtkStock.cmx gtkSignal.cmx gtkObject.cmx gtkEnums.cmx \ -- gtkBaseProps.cmx gtk.cmx gpointer.cmx gobject.cmx gdkPixbuf.cmx \ -- gdkEvent.cmx gdk.cmx gaux.cmx --gtkPack.cmo: gtkPackProps.cmo gtkBase.cmo gtk.cmo gobject.cmi gaux.cmo --gtkPack.cmx: gtkPackProps.cmx gtkBase.cmx gtk.cmx gobject.cmx gaux.cmx --gtkButton.cmo: gtkStock.cmo gtkSignal.cmi gtkEnums.cmo gtkButtonProps.cmo \ -+gtkBase.cmo : pango.cmo gtkStock.cmo gtkSignal.cmi gtkObject.cmo \ -+ gtkEnums.cmo gtkBaseProps.cmo gtk.cmo gpointer.cmi gobject.cmi \ -+ gdkPixbuf.cmi gdkEvent.cmo gdk.cmi gaux.cmo -+gtkBase.cmx : pango.cmx gtkStock.cmx gtkSignal.cmx gtkObject.cmx \ -+ gtkEnums.cmx gtkBaseProps.cmx gtk.cmx gpointer.cmx gobject.cmx \ -+ gdkPixbuf.cmx gdkEvent.cmx gdk.cmx gaux.cmx -+gtkPack.cmo : gtkPackProps.cmo gtkBase.cmo gtk.cmo gobject.cmi gaux.cmo -+gtkPack.cmx : gtkPackProps.cmx gtkBase.cmx gtk.cmx gobject.cmx gaux.cmx -+gtkButton.cmo : gtkStock.cmo gtkSignal.cmi gtkEnums.cmo gtkButtonProps.cmo \ - gtkBase.cmo gtk.cmo gpointer.cmi gobject.cmi gaux.cmo --gtkButton.cmx: gtkStock.cmx gtkSignal.cmx gtkEnums.cmx gtkButtonProps.cmx \ -+gtkButton.cmx : gtkStock.cmx gtkSignal.cmx gtkEnums.cmx gtkButtonProps.cmx \ - gtkBase.cmx gtk.cmx gpointer.cmx gobject.cmx gaux.cmx --gtkAssistant.cmo: gtkBase.cmo gtkAssistantProps.cmo gtk.cmo gobject.cmi \ -+gtkAssistant.cmo : gtkBase.cmo gtkAssistantProps.cmo gtk.cmo gobject.cmi \ - gaux.cmo --gtkAssistant.cmx: gtkBase.cmx gtkAssistantProps.cmx gtk.cmx gobject.cmx \ -+gtkAssistant.cmx : gtkBase.cmx gtkAssistantProps.cmx gtk.cmx gobject.cmx \ - gaux.cmx --gtkMenu.cmo: gtkStock.cmo gtkMenuProps.cmo gtkBase.cmo gtk.cmo gpointer.cmi \ -+gtkMenu.cmo : gtkStock.cmo gtkMenuProps.cmo gtkBase.cmo gtk.cmo gpointer.cmi \ - gobject.cmi gaux.cmo --gtkMenu.cmx: gtkStock.cmx gtkMenuProps.cmx gtkBase.cmx gtk.cmx gpointer.cmx \ -+gtkMenu.cmx : gtkStock.cmx gtkMenuProps.cmx gtkBase.cmx gtk.cmx gpointer.cmx \ - gobject.cmx gaux.cmx --gtkMisc.cmo: gtkMiscProps.cmo gtkBase.cmo gtk.cmo gobject.cmi gaux.cmo --gtkMisc.cmx: gtkMiscProps.cmx gtkBase.cmx gtk.cmx gobject.cmx gaux.cmx --gtkWindow.cmo: gtkEnums.cmo gtkBaseProps.cmo gtkBase.cmo gtk.cmo gpointer.cmi \ -- gobject.cmi gdk.cmi gaux.cmo --gtkWindow.cmx: gtkEnums.cmx gtkBaseProps.cmx gtkBase.cmx gtk.cmx gpointer.cmx \ -- gobject.cmx gdk.cmx gaux.cmx --gtkList.cmo: gtkSignal.cmi gtkListProps.cmo gtkEnums.cmo gtkBase.cmo gtk.cmo \ -- gpointer.cmi gdk.cmi gaux.cmo --gtkList.cmx: gtkSignal.cmx gtkListProps.cmx gtkEnums.cmx gtkBase.cmx gtk.cmx \ -- gpointer.cmx gdk.cmx gaux.cmx --gtkBin.cmo: gtkBinProps.cmo gtkBase.cmo gtk.cmo gaux.cmo --gtkBin.cmx: gtkBinProps.cmx gtkBase.cmx gtk.cmx gaux.cmx --gtkEdit.cmo: gtkList.cmo gtkEditProps.cmo gtkBase.cmo gtk.cmo gpointer.cmi \ -+gtkMisc.cmo : gtkMiscProps.cmo gtkBase.cmo gtk.cmo gobject.cmi gaux.cmo -+gtkMisc.cmx : gtkMiscProps.cmx gtkBase.cmx gtk.cmx gobject.cmx gaux.cmx -+gtkWindow.cmo : gtkEnums.cmo gtkBaseProps.cmo gtkBase.cmo gtk.cmo \ -+ gpointer.cmi gobject.cmi gdk.cmi gaux.cmo -+gtkWindow.cmx : gtkEnums.cmx gtkBaseProps.cmx gtkBase.cmx gtk.cmx \ -+ gpointer.cmx gobject.cmx gdk.cmx gaux.cmx -+gtkList.cmo : gtkSignal.cmi gtkListProps.cmo gtkEnums.cmo gtkBase.cmo \ -+ gtk.cmo gpointer.cmi gdk.cmi gaux.cmo -+gtkList.cmx : gtkSignal.cmx gtkListProps.cmx gtkEnums.cmx gtkBase.cmx \ -+ gtk.cmx gpointer.cmx gdk.cmx gaux.cmx -+gtkBin.cmo : gtkBinProps.cmo gtkBase.cmo gtk.cmo gaux.cmo -+gtkBin.cmx : gtkBinProps.cmx gtkBase.cmx gtk.cmx gaux.cmx -+gtkEdit.cmo : gtkList.cmo gtkEditProps.cmo gtkBase.cmo gtk.cmo gpointer.cmi \ - gobject.cmi gaux.cmo --gtkEdit.cmx: gtkList.cmx gtkEditProps.cmx gtkBase.cmx gtk.cmx gpointer.cmx \ -+gtkEdit.cmx : gtkList.cmx gtkEditProps.cmx gtkBase.cmx gtk.cmx gpointer.cmx \ - gobject.cmx gaux.cmx --gtkRange.cmo: gtkRangeProps.cmo gtkBase.cmo gtk.cmo gaux.cmo --gtkRange.cmx: gtkRangeProps.cmx gtkBase.cmx gtk.cmx gaux.cmx --gtkText.cmo: pango.cmo gtkTextProps.cmo gtkBase.cmo gtk.cmo gpointer.cmi \ -+gtkRange.cmo : gtkRangeProps.cmo gtkBase.cmo gtk.cmo gaux.cmo -+gtkRange.cmx : gtkRangeProps.cmx gtkBase.cmx gtk.cmx gaux.cmx -+gtkText.cmo : pango.cmo gtkTextProps.cmo gtkBase.cmo gtk.cmo gpointer.cmi \ - gobject.cmi glib.cmi gdkPixbuf.cmi gdk.cmi gaux.cmo --gtkText.cmx: pango.cmx gtkTextProps.cmx gtkBase.cmx gtk.cmx gpointer.cmx \ -+gtkText.cmx : pango.cmx gtkTextProps.cmx gtkBase.cmx gtk.cmx gpointer.cmx \ - gobject.cmx glib.cmx gdkPixbuf.cmx gdk.cmx gaux.cmx --gtkTree.cmo: gtkTreeProps.cmo gtkEnums.cmo gtkBase.cmo gtk.cmo gobject.cmi \ -+gtkTree.cmo : gtkTreeProps.cmo gtkEnums.cmo gtkBase.cmo gtk.cmo gobject.cmi \ - gdk.cmi gaux.cmo --gtkTree.cmx: gtkTreeProps.cmx gtkEnums.cmx gtkBase.cmx gtk.cmx gobject.cmx \ -+gtkTree.cmx : gtkTreeProps.cmx gtkEnums.cmx gtkBase.cmx gtk.cmx gobject.cmx \ - gdk.cmx gaux.cmx --gtkFile.cmo: gtkObject.cmo gtkFileProps.cmo gtkEnums.cmo gtk.cmo --gtkFile.cmx: gtkObject.cmx gtkFileProps.cmx gtkEnums.cmx gtk.cmx --gtkMain.cmo: gtk.cmo glib.cmi gdkEvent.cmo gdk.cmi --gtkMain.cmx: gtk.cmx glib.cmx gdkEvent.cmx gdk.cmx --gtkBroken.cmo: gtkBrokenProps.cmo gtkBase.cmo gtk.cmo gdk.cmi gaux.cmo --gtkBroken.cmx: gtkBrokenProps.cmx gtkBase.cmx gtk.cmx gdk.cmx gaux.cmx --gPango.cmo: pango.cmo gaux.cmo --gPango.cmx: pango.cmx gaux.cmx --gDraw.cmo: gtkBase.cmo gpointer.cmi gobject.cmi gdkPixbuf.cmi gdk.cmi \ -+gtkFile.cmo : gtkObject.cmo gtkFileProps.cmo gtkEnums.cmo gtk.cmo -+gtkFile.cmx : gtkObject.cmx gtkFileProps.cmx gtkEnums.cmx gtk.cmx -+gtkMain.cmo : gtk.cmo glib.cmi gdkEvent.cmo gdk.cmi -+gtkMain.cmx : gtk.cmx glib.cmx gdkEvent.cmx gdk.cmx -+gtkBroken.cmo : gtkBrokenProps.cmo gtkBase.cmo gtk.cmo gdk.cmi gaux.cmo -+gtkBroken.cmx : gtkBrokenProps.cmx gtkBase.cmx gtk.cmx gdk.cmx gaux.cmx -+gPango.cmo : pango.cmo gaux.cmo -+gPango.cmx : pango.cmx gaux.cmx -+gDraw.cmo : gtkBase.cmo gpointer.cmi gobject.cmi gdkPixbuf.cmi gdk.cmi \ - gaux.cmo gDraw.cmi --gDraw.cmx: gtkBase.cmx gpointer.cmx gobject.cmx gdkPixbuf.cmx gdk.cmx \ -+gDraw.cmx : gtkBase.cmx gpointer.cmx gobject.cmx gdkPixbuf.cmx gdk.cmx \ - gaux.cmx gDraw.cmi --gObj.cmo: pango.cmo gtkStock.cmo gtkSignal.cmi gtkData.cmo gtkBase.cmo \ -+gObj.cmo : pango.cmo gtkStock.cmo gtkSignal.cmi gtkData.cmo gtkBase.cmo \ - gtk.cmo gpointer.cmi gobject.cmi gdk.cmi gaux.cmo gPango.cmo gDraw.cmi \ - gObj.cmi --gObj.cmx: pango.cmx gtkStock.cmx gtkSignal.cmx gtkData.cmx gtkBase.cmx \ -+gObj.cmx : pango.cmx gtkStock.cmx gtkSignal.cmx gtkData.cmx gtkBase.cmx \ - gtk.cmx gpointer.cmx gobject.cmx gdk.cmx gaux.cmx gPango.cmx gDraw.cmx \ - gObj.cmi --gData.cmo: gtkData.cmo gtkBin.cmo gtkBase.cmo gtk.cmo gpointer.cmi \ -+gData.cmo : gtkData.cmo gtkBin.cmo gtkBase.cmo gtk.cmo gpointer.cmi \ - gobject.cmi gaux.cmo gObj.cmi gData.cmi --gData.cmx: gtkData.cmx gtkBin.cmx gtkBase.cmx gtk.cmx gpointer.cmx \ -+gData.cmx : gtkData.cmx gtkBin.cmx gtkBase.cmx gtk.cmx gpointer.cmx \ - gobject.cmx gaux.cmx gObj.cmx gData.cmi --gMain.cmo: gtkMain.cmo gtk.cmo glib.cmi gdk.cmi gObj.cmi gData.cmi gMain.cmi --gMain.cmx: gtkMain.cmx gtk.cmx glib.cmx gdk.cmx gObj.cmx gData.cmx gMain.cmi --gContainer.cmo: ogtkBaseProps.cmo gtkBase.cmo gtk.cmo gpointer.cmi \ -+gMain.cmo : gtkMain.cmo gtk.cmo glib.cmi gdk.cmi gObj.cmi gData.cmi \ -+ gMain.cmi -+gMain.cmx : gtkMain.cmx gtk.cmx glib.cmx gdk.cmx gObj.cmx gData.cmx \ -+ gMain.cmi -+ogtkBaseProps.cmo : gtkSignal.cmi gtkBaseProps.cmo gobject.cmi gObj.cmi -+ogtkBaseProps.cmx : gtkSignal.cmx gtkBaseProps.cmx gobject.cmx gObj.cmx -+ogtkBinProps.cmo : gtkSignal.cmi gtkPackProps.cmo gtkBinProps.cmo \ -+ gobject.cmi gObj.cmi gData.cmi -+ogtkBinProps.cmx : gtkSignal.cmx gtkPackProps.cmx gtkBinProps.cmx \ -+ gobject.cmx gObj.cmx gData.cmx -+ogtkButtonProps.cmo : gtkSignal.cmi gtkButtonProps.cmo gobject.cmi gObj.cmi -+ogtkButtonProps.cmx : gtkSignal.cmx gtkButtonProps.cmx gobject.cmx gObj.cmx -+ogtkEditProps.cmo : gtkSignal.cmi gtkEditProps.cmo gobject.cmi gData.cmi -+ogtkEditProps.cmx : gtkSignal.cmx gtkEditProps.cmx gobject.cmx gData.cmx -+ogtkListProps.cmo : gtkSignal.cmi gtkListProps.cmo gobject.cmi -+ogtkListProps.cmx : gtkSignal.cmx gtkListProps.cmx gobject.cmx -+ogtkMenuProps.cmo : gtkSignal.cmi gtkMenuProps.cmo gobject.cmi -+ogtkMenuProps.cmx : gtkSignal.cmx gtkMenuProps.cmx gobject.cmx -+ogtkMiscProps.cmo : gtkSignal.cmi gtkMiscProps.cmo gobject.cmi gdkEvent.cmo \ -+ gObj.cmi -+ogtkMiscProps.cmx : gtkSignal.cmx gtkMiscProps.cmx gobject.cmx gdkEvent.cmx \ -+ gObj.cmx -+ogtkPackProps.cmo : gtkSignal.cmi gtkPackProps.cmo gobject.cmi gObj.cmi -+ogtkPackProps.cmx : gtkSignal.cmx gtkPackProps.cmx gobject.cmx gObj.cmx -+ogtkRangeProps.cmo : gtkSignal.cmi gtkRangeProps.cmo gobject.cmi gData.cmi -+ogtkRangeProps.cmx : gtkSignal.cmx gtkRangeProps.cmx gobject.cmx gData.cmx -+ogtkTextProps.cmo : gtkTextProps.cmo gtkSignal.cmi gobject.cmi gData.cmi -+ogtkTextProps.cmx : gtkTextProps.cmx gtkSignal.cmx gobject.cmx gData.cmx -+ogtkTreeProps.cmo : gtkTreeProps.cmo gtkSignal.cmi gobject.cmi gObj.cmi \ -+ gData.cmi -+ogtkTreeProps.cmx : gtkTreeProps.cmx gtkSignal.cmx gobject.cmx gObj.cmx \ -+ gData.cmx -+ogtkFileProps.cmo : gtkSignal.cmi gtkFileProps.cmo gobject.cmi gObj.cmi -+ogtkFileProps.cmx : gtkSignal.cmx gtkFileProps.cmx gobject.cmx gObj.cmx -+ogtkActionProps.cmo : gtkSignal.cmi gtkActionProps.cmo gobject.cmi gObj.cmi -+ogtkActionProps.cmx : gtkSignal.cmx gtkActionProps.cmx gobject.cmx gObj.cmx -+ogtkBrokenProps.cmo : gtkSignal.cmi gtkBrokenProps.cmo gobject.cmi gData.cmi -+ogtkBrokenProps.cmx : gtkSignal.cmx gtkBrokenProps.cmx gobject.cmx gData.cmx -+ogtkAssistantProps.cmo : gtkSignal.cmi gtkAssistantProps.cmo gobject.cmi -+ogtkAssistantProps.cmx : gtkSignal.cmx gtkAssistantProps.cmx gobject.cmx -+gContainer.cmo : ogtkBaseProps.cmo gtkBase.cmo gtk.cmo gpointer.cmi \ - gobject.cmi gaux.cmo gObj.cmi gData.cmi gContainer.cmi --gContainer.cmx: ogtkBaseProps.cmx gtkBase.cmx gtk.cmx gpointer.cmx \ -+gContainer.cmx : ogtkBaseProps.cmx gtkBase.cmx gtk.cmx gpointer.cmx \ - gobject.cmx gaux.cmx gObj.cmx gData.cmx gContainer.cmi --gPack.cmo: ogtkPackProps.cmo gtkPack.cmo gtkBase.cmo gtk.cmo gpointer.cmi \ -+gPack.cmo : ogtkPackProps.cmo gtkPack.cmo gtkBase.cmo gtk.cmo gpointer.cmi \ - gobject.cmi gaux.cmo gObj.cmi gData.cmi gContainer.cmi gPack.cmi --gPack.cmx: ogtkPackProps.cmx gtkPack.cmx gtkBase.cmx gtk.cmx gpointer.cmx \ -+gPack.cmx : ogtkPackProps.cmx gtkPack.cmx gtkBase.cmx gtk.cmx gpointer.cmx \ - gobject.cmx gaux.cmx gObj.cmx gData.cmx gContainer.cmx gPack.cmi --gButton.cmo: ogtkButtonProps.cmo gtkButtonProps.cmo gtkButton.cmo gtkBase.cmo \ -- gtk.cmo gobject.cmi gaux.cmo gObj.cmi gData.cmi gContainer.cmi \ -- gButton.cmi --gButton.cmx: ogtkButtonProps.cmx gtkButtonProps.cmx gtkButton.cmx gtkBase.cmx \ -- gtk.cmx gobject.cmx gaux.cmx gObj.cmx gData.cmx gContainer.cmx \ -- gButton.cmi --gText.cmo: pango.cmo ogtkTextProps.cmo gtkText.cmo gtkSignal.cmi gtkBase.cmo \ -- gtk.cmo gobject.cmi glib.cmi gdkPixbuf.cmi gdkEvent.cmo gdk.cmi gaux.cmo \ -- gObj.cmi gData.cmi gContainer.cmi gText.cmi --gText.cmx: pango.cmx ogtkTextProps.cmx gtkText.cmx gtkSignal.cmx gtkBase.cmx \ -- gtk.cmx gobject.cmx glib.cmx gdkPixbuf.cmx gdkEvent.cmx gdk.cmx gaux.cmx \ -- gObj.cmx gData.cmx gContainer.cmx gText.cmi --gMenu.cmo: ogtkMenuProps.cmo ogtkBaseProps.cmo gtkStock.cmo gtkMenu.cmo \ -+gButton.cmo : ogtkButtonProps.cmo gtkButtonProps.cmo gtkButton.cmo \ -+ gtkBase.cmo gtk.cmo gobject.cmi gaux.cmo gObj.cmi gData.cmi \ -+ gContainer.cmi gButton.cmi -+gButton.cmx : ogtkButtonProps.cmx gtkButtonProps.cmx gtkButton.cmx \ -+ gtkBase.cmx gtk.cmx gobject.cmx gaux.cmx gObj.cmx gData.cmx \ -+ gContainer.cmx gButton.cmi -+gText.cmo : pango.cmo ogtkTextProps.cmo gtkText.cmo gtkSignal.cmi \ -+ gtkBase.cmo gtk.cmo gobject.cmi glib.cmi gdkPixbuf.cmi gdkEvent.cmo \ -+ gdk.cmi gaux.cmo gObj.cmi gData.cmi gContainer.cmi gText.cmi -+gText.cmx : pango.cmx ogtkTextProps.cmx gtkText.cmx gtkSignal.cmx \ -+ gtkBase.cmx gtk.cmx gobject.cmx glib.cmx gdkPixbuf.cmx gdkEvent.cmx \ -+ gdk.cmx gaux.cmx gObj.cmx gData.cmx gContainer.cmx gText.cmi -+gMenu.cmo : ogtkMenuProps.cmo ogtkBaseProps.cmo gtkStock.cmo gtkMenu.cmo \ - gtkData.cmo gtkBase.cmo gtk.cmo gobject.cmi gaux.cmo gObj.cmi \ - gContainer.cmi gButton.cmi gMenu.cmi --gMenu.cmx: ogtkMenuProps.cmx ogtkBaseProps.cmx gtkStock.cmx gtkMenu.cmx \ -+gMenu.cmx : ogtkMenuProps.cmx ogtkBaseProps.cmx gtkStock.cmx gtkMenu.cmx \ - gtkData.cmx gtkBase.cmx gtk.cmx gobject.cmx gaux.cmx gObj.cmx \ - gContainer.cmx gButton.cmx gMenu.cmi --gMisc.cmo: ogtkMiscProps.cmo gtkSignal.cmi gtkMiscProps.cmo gtkMisc.cmo \ -+gMisc.cmo : ogtkMiscProps.cmo gtkSignal.cmi gtkMiscProps.cmo gtkMisc.cmo \ - gtkBase.cmo gtk.cmo gobject.cmi glib.cmi gaux.cmo gPack.cmi gObj.cmi \ - gDraw.cmi gContainer.cmi gMisc.cmi --gMisc.cmx: ogtkMiscProps.cmx gtkSignal.cmx gtkMiscProps.cmx gtkMisc.cmx \ -+gMisc.cmx : ogtkMiscProps.cmx gtkSignal.cmx gtkMiscProps.cmx gtkMisc.cmx \ - gtkBase.cmx gtk.cmx gobject.cmx glib.cmx gaux.cmx gPack.cmx gObj.cmx \ - gDraw.cmx gContainer.cmx gMisc.cmi --gTree.cmo: pango.cmo ogtkTreeProps.cmo ogtkBaseProps.cmo gtkTree.cmo \ -+gTree.cmo : pango.cmo ogtkTreeProps.cmo ogtkBaseProps.cmo gtkTree.cmo \ - gtkEnums.cmo gtkBase.cmo gtk.cmo gpointer.cmi gobject.cmi gdkPixbuf.cmi \ - gdkEnums.cmo gdk.cmi gaux.cmo gObj.cmi gData.cmi gContainer.cmi gTree.cmi --gTree.cmx: pango.cmx ogtkTreeProps.cmx ogtkBaseProps.cmx gtkTree.cmx \ -+gTree.cmx : pango.cmx ogtkTreeProps.cmx ogtkBaseProps.cmx gtkTree.cmx \ - gtkEnums.cmx gtkBase.cmx gtk.cmx gpointer.cmx gobject.cmx gdkPixbuf.cmx \ - gdkEnums.cmx gdk.cmx gaux.cmx gObj.cmx gData.cmx gContainer.cmx gTree.cmi --gList.cmo: ogtkListProps.cmo gtkList.cmo gtkBase.cmo gtk.cmo gpointer.cmi \ -+gList.cmo : ogtkListProps.cmo gtkList.cmo gtkBase.cmo gtk.cmo gpointer.cmi \ - gobject.cmi gaux.cmo gObj.cmi gDraw.cmi gData.cmi gContainer.cmi \ - gList.cmi --gList.cmx: ogtkListProps.cmx gtkList.cmx gtkBase.cmx gtk.cmx gpointer.cmx \ -+gList.cmx : ogtkListProps.cmx gtkList.cmx gtkBase.cmx gtk.cmx gpointer.cmx \ - gobject.cmx gaux.cmx gObj.cmx gDraw.cmx gData.cmx gContainer.cmx \ - gList.cmi --gFile.cmo: ogtkFileProps.cmo gtkSignal.cmi gtkFile.cmo gtkEnums.cmo gtk.cmo \ -+gFile.cmo : ogtkFileProps.cmo gtkSignal.cmi gtkFile.cmo gtkEnums.cmo gtk.cmo \ - gobject.cmi gaux.cmo gPack.cmi gObj.cmi gContainer.cmi gFile.cmi --gFile.cmx: ogtkFileProps.cmx gtkSignal.cmx gtkFile.cmx gtkEnums.cmx gtk.cmx \ -+gFile.cmx : ogtkFileProps.cmx gtkSignal.cmx gtkFile.cmx gtkEnums.cmx gtk.cmx \ - gobject.cmx gaux.cmx gPack.cmx gObj.cmx gContainer.cmx gFile.cmi --gWindow.cmo: ogtkFileProps.cmo ogtkBaseProps.cmo gtkWindow.cmo gtkStock.cmo \ -+gWindow.cmo : ogtkFileProps.cmo ogtkBaseProps.cmo gtkWindow.cmo gtkStock.cmo \ - gtkMisc.cmo gtkMain.cmo gtkFile.cmo gtkEnums.cmo gtkBaseProps.cmo \ - gtkBase.cmo gtk.cmo gobject.cmi gdk.cmi gaux.cmo gPack.cmi gObj.cmi \ - gMisc.cmi gList.cmi gFile.cmi gContainer.cmi gButton.cmi gWindow.cmi --gWindow.cmx: ogtkFileProps.cmx ogtkBaseProps.cmx gtkWindow.cmx gtkStock.cmx \ -+gWindow.cmx : ogtkFileProps.cmx ogtkBaseProps.cmx gtkWindow.cmx gtkStock.cmx \ - gtkMisc.cmx gtkMain.cmx gtkFile.cmx gtkEnums.cmx gtkBaseProps.cmx \ - gtkBase.cmx gtk.cmx gobject.cmx gdk.cmx gaux.cmx gPack.cmx gObj.cmx \ - gMisc.cmx gList.cmx gFile.cmx gContainer.cmx gButton.cmx gWindow.cmi --gAssistant.cmo: ogtkAssistantProps.cmo gtkWindow.cmo gtkMisc.cmo gtkBase.cmo \ -- gtkAssistant.cmo gtk.cmo gaux.cmo gWindow.cmi gObj.cmi gContainer.cmi \ -- gAssistant.cmi --gAssistant.cmx: ogtkAssistantProps.cmx gtkWindow.cmx gtkMisc.cmx gtkBase.cmx \ -- gtkAssistant.cmx gtk.cmx gaux.cmx gWindow.cmx gObj.cmx gContainer.cmx \ -- gAssistant.cmi --gBin.cmo: ogtkBinProps.cmo gtkBinProps.cmo gtkBin.cmo gtkBase.cmo gtk.cmo \ -+gAssistant.cmo : ogtkAssistantProps.cmo gtkWindow.cmo gtkMisc.cmo \ -+ gtkBase.cmo gtkAssistant.cmo gtk.cmo gaux.cmo gWindow.cmi gObj.cmi \ -+ gContainer.cmi gAssistant.cmi -+gAssistant.cmx : ogtkAssistantProps.cmx gtkWindow.cmx gtkMisc.cmx \ -+ gtkBase.cmx gtkAssistant.cmx gtk.cmx gaux.cmx gWindow.cmx gObj.cmx \ -+ gContainer.cmx gAssistant.cmi -+gBin.cmo : ogtkBinProps.cmo gtkBinProps.cmo gtkBin.cmo gtkBase.cmo gtk.cmo \ - gobject.cmi gaux.cmo gObj.cmi gData.cmi gContainer.cmi gBin.cmi --gBin.cmx: ogtkBinProps.cmx gtkBinProps.cmx gtkBin.cmx gtkBase.cmx gtk.cmx \ -+gBin.cmx : ogtkBinProps.cmx gtkBinProps.cmx gtkBin.cmx gtkBase.cmx gtk.cmx \ - gobject.cmx gaux.cmx gObj.cmx gData.cmx gContainer.cmx gBin.cmi --gEdit.cmo: ogtkEditProps.cmo gtkEdit.cmo gtkBase.cmo gtk.cmo gobject.cmi \ -+gEdit.cmo : ogtkEditProps.cmo gtkEdit.cmo gtkBase.cmo gtk.cmo gobject.cmi \ - gaux.cmo gTree.cmi gObj.cmi gMenu.cmi gList.cmi gData.cmi gContainer.cmi \ - gEdit.cmi --gEdit.cmx: ogtkEditProps.cmx gtkEdit.cmx gtkBase.cmx gtk.cmx gobject.cmx \ -+gEdit.cmx : ogtkEditProps.cmx gtkEdit.cmx gtkBase.cmx gtk.cmx gobject.cmx \ - gaux.cmx gTree.cmx gObj.cmx gMenu.cmx gList.cmx gData.cmx gContainer.cmx \ - gEdit.cmi --gRange.cmo: ogtkRangeProps.cmo gtkRange.cmo gtkBase.cmo gtk.cmo gaux.cmo \ -+gRange.cmo : ogtkRangeProps.cmo gtkRange.cmo gtkBase.cmo gtk.cmo gaux.cmo \ - gObj.cmi gData.cmi gRange.cmi --gRange.cmx: ogtkRangeProps.cmx gtkRange.cmx gtkBase.cmx gtk.cmx gaux.cmx \ -+gRange.cmx : ogtkRangeProps.cmx gtkRange.cmx gtkBase.cmx gtk.cmx gaux.cmx \ - gObj.cmx gData.cmx gRange.cmi --gAction.cmo: ogtkActionProps.cmo gtkSignal.cmi gtkActionProps.cmo gtk.cmo \ -+gAction.cmo : ogtkActionProps.cmo gtkSignal.cmi gtkActionProps.cmo gtk.cmo \ - gobject.cmi gaux.cmo gObj.cmi gAction.cmi --gAction.cmx: ogtkActionProps.cmx gtkSignal.cmx gtkActionProps.cmx gtk.cmx \ -+gAction.cmx : ogtkActionProps.cmx gtkSignal.cmx gtkActionProps.cmx gtk.cmx \ - gobject.cmx gaux.cmx gObj.cmx gAction.cmi --gBroken.cmo: ogtkEditProps.cmo ogtkBrokenProps.cmo ogtkBaseProps.cmo \ -+gBroken.cmo : ogtkEditProps.cmo ogtkBrokenProps.cmo ogtkBaseProps.cmo \ - gtkBroken.cmo gtkBase.cmo gtk.cmo gpointer.cmi gobject.cmi gaux.cmo \ - gObj.cmi gEdit.cmi gDraw.cmi gData.cmi gContainer.cmi gBroken.cmi --gBroken.cmx: ogtkEditProps.cmx ogtkBrokenProps.cmx ogtkBaseProps.cmx \ -+gBroken.cmx : ogtkEditProps.cmx ogtkBrokenProps.cmx ogtkBaseProps.cmx \ - gtkBroken.cmx gtkBase.cmx gtk.cmx gpointer.cmx gobject.cmx gaux.cmx \ - gObj.cmx gEdit.cmx gDraw.cmx gData.cmx gContainer.cmx gBroken.cmi --gUtil.cmo: gtkSignal.cmi gObj.cmi gUtil.cmi --gUtil.cmx: gtkSignal.cmx gObj.cmx gUtil.cmi --gToolbox.cmo: gdkKeysyms.cmo gdkEvent.cmo gWindow.cmi gText.cmi gPack.cmi \ -- gObj.cmi gMisc.cmi gMenu.cmi gMain.cmi gEdit.cmi gButton.cmi gBroken.cmi \ -- gBin.cmi gToolbox.cmi --gToolbox.cmx: gdkKeysyms.cmx gdkEvent.cmx gWindow.cmx gText.cmx gPack.cmx \ -- gObj.cmx gMisc.cmx gMenu.cmx gMain.cmx gEdit.cmx gButton.cmx gBroken.cmx \ -- gBin.cmx gToolbox.cmi --glGtk.cmo: gtkMisc.cmo gtkBase.cmo gtk.cmo gpointer.cmi gdkEvent.cmo gaux.cmo \ -- gObj.cmi glGtk.cmi --glGtk.cmx: gtkMisc.cmx gtkBase.cmx gtk.cmx gpointer.cmx gdkEvent.cmx gaux.cmx \ -- gObj.cmx glGtk.cmi --glade.cmo: gtkWindow.cmo gtkSignal.cmi gtkMain.cmo gtkBase.cmo gtk.cmo \ -+gUtil.cmo : gtkSignal.cmi gObj.cmi gUtil.cmi -+gUtil.cmx : gtkSignal.cmx gObj.cmx gUtil.cmi -+gToolbox.cmo : gtkSignal.cmi gtkMain.cmo gobject.cmi gdkKeysyms.cmo \ -+ gdkEvent.cmo gWindow.cmi gText.cmi gPack.cmi gObj.cmi gMisc.cmi gMenu.cmi \ -+ gMain.cmi gEdit.cmi gButton.cmi gBroken.cmi gBin.cmi gToolbox.cmi -+gToolbox.cmx : gtkSignal.cmx gtkMain.cmx gobject.cmx gdkKeysyms.cmx \ -+ gdkEvent.cmx gWindow.cmx gText.cmx gPack.cmx gObj.cmx gMisc.cmx gMenu.cmx \ -+ gMain.cmx gEdit.cmx gButton.cmx gBroken.cmx gBin.cmx gToolbox.cmi -+glGtk.cmo : gtkMisc.cmo gtkBase.cmo gtk.cmo gpointer.cmi gdkEvent.cmo \ -+ gaux.cmo gObj.cmi glGtk.cmi -+glGtk.cmx : gtkMisc.cmx gtkBase.cmx gtk.cmx gpointer.cmx gdkEvent.cmx \ -+ gaux.cmx gObj.cmx glGtk.cmi -+glade.cmo : gtkWindow.cmo gtkSignal.cmi gtkMain.cmo gtkBase.cmo gtk.cmo \ - gpointer.cmi gobject.cmi glade.cmi --glade.cmx: gtkWindow.cmx gtkSignal.cmx gtkMain.cmx gtkBase.cmx gtk.cmx \ -+glade.cmx : gtkWindow.cmx gtkSignal.cmx gtkMain.cmx gtkBase.cmx gtk.cmx \ - gpointer.cmx gobject.cmx glade.cmi --rsvg.cmo: gdkPixbuf.cmi gaux.cmo rsvg.cmi --rsvg.cmx: gdkPixbuf.cmx gaux.cmx rsvg.cmi --gnomeCanvas.cmo: gtkSignal.cmi gtkBase.cmo gtk.cmo gpointer.cmi gobject.cmi \ -+rsvg.cmo : gdkPixbuf.cmi gaux.cmo rsvg.cmi -+rsvg.cmx : gdkPixbuf.cmx gaux.cmx rsvg.cmi -+gnomeCanvas.cmo : gtkSignal.cmi gtkBase.cmo gtk.cmo gpointer.cmi gobject.cmi \ - gdkPixbuf.cmi gdk.cmi gaux.cmo gObj.cmi --gnomeCanvas.cmx: gtkSignal.cmx gtkBase.cmx gtk.cmx gpointer.cmx gobject.cmx \ -+gnomeCanvas.cmx : gtkSignal.cmx gtkBase.cmx gtk.cmx gpointer.cmx gobject.cmx \ - gdkPixbuf.cmx gdk.cmx gaux.cmx gObj.cmx --gnoCanvas.cmo: gtkEnums.cmo gtk.cmo gpointer.cmi gobject.cmi gnomeCanvas.cmo \ -- gdkPixbuf.cmi gdkEvent.cmo gdkEnums.cmo gdk.cmi gText.cmi gPack.cmi \ -- gObj.cmi gContainer.cmi gnoCanvas.cmi --gnoCanvas.cmx: gtkEnums.cmx gtk.cmx gpointer.cmx gobject.cmx gnomeCanvas.cmx \ -- gdkPixbuf.cmx gdkEvent.cmx gdkEnums.cmx gdk.cmx gText.cmx gPack.cmx \ -- gObj.cmx gContainer.cmx gnoCanvas.cmi --gnomeDruid.cmo: gtkSignal.cmi gtk.cmo gobject.cmi gdkPixbuf.cmi gdk.cmi --gnomeDruid.cmx: gtkSignal.cmx gtk.cmx gobject.cmx gdkPixbuf.cmx gdk.cmx --gnoDruid.cmo: gtk.cmo gobject.cmi gnomeDruid.cmo gPack.cmi gObj.cmi \ -+gnoCanvas.cmo : gtkEnums.cmo gtk.cmo gpointer.cmi gobject.cmi \ -+ gnomeCanvas.cmo gdkPixbuf.cmi gdkEvent.cmo gdkEnums.cmo gdk.cmi gText.cmi \ -+ gPack.cmi gObj.cmi gContainer.cmi gnoCanvas.cmi -+gnoCanvas.cmx : gtkEnums.cmx gtk.cmx gpointer.cmx gobject.cmx \ -+ gnomeCanvas.cmx gdkPixbuf.cmx gdkEvent.cmx gdkEnums.cmx gdk.cmx gText.cmx \ -+ gPack.cmx gObj.cmx gContainer.cmx gnoCanvas.cmi -+gnomeDruid.cmo : gtkSignal.cmi gtk.cmo gobject.cmi gdkPixbuf.cmi gdk.cmi -+gnomeDruid.cmx : gtkSignal.cmx gtk.cmx gobject.cmx gdkPixbuf.cmx gdk.cmx -+gnoDruid.cmo : gtk.cmo gobject.cmi gnomeDruid.cmo gPack.cmi gObj.cmi \ - gContainer.cmi gnoDruid.cmi --gnoDruid.cmx: gtk.cmx gobject.cmx gnomeDruid.cmx gPack.cmx gObj.cmx \ -+gnoDruid.cmx : gtk.cmx gobject.cmx gnomeDruid.cmx gPack.cmx gObj.cmx \ - gContainer.cmx gnoDruid.cmi --panel.cmo: gtkSignal.cmi gtkEnums.cmo gtk.cmo gobject.cmi gdk.cmi gObj.cmi \ -+panel.cmo : gtkSignal.cmi gtkEnums.cmo gtk.cmo gobject.cmi gdk.cmi gObj.cmi \ - gContainer.cmi panel.cmi --panel.cmx: gtkSignal.cmx gtkEnums.cmx gtk.cmx gobject.cmx gdk.cmx gObj.cmx \ -+panel.cmx : gtkSignal.cmx gtkEnums.cmx gtk.cmx gobject.cmx gdk.cmx gObj.cmx \ - gContainer.cmx panel.cmi --gtkSpell.cmo: gtk.cmo gtkSpell.cmi --gtkSpell.cmx: gtk.cmx gtkSpell.cmi --gtkSourceView2.cmo: sourceView2Enums.cmo gtkSourceView2_types.cmi \ -- gtkSourceView2Props.cmo gtkBase.cmo gtk.cmo gobject.cmi gdkPixbuf.cmi \ -- gdk.cmi gaux.cmo --gtkSourceView2.cmx: sourceView2Enums.cmx gtkSourceView2_types.cmi \ -- gtkSourceView2Props.cmx gtkBase.cmx gtk.cmx gobject.cmx gdkPixbuf.cmx \ -- gdk.cmx gaux.cmx --gSourceView2.cmo: ogtkSourceView2Props.cmo gtkText.cmo \ -+gtkSpell.cmo : gtk.cmo gtkSpell.cmi -+gtkSpell.cmx : gtk.cmx gtkSpell.cmi -+gtkSourceView2.cmo : gtkSourceView2_types.cmi gtkSourceView2Props.cmo \ -+ gtkBase.cmo gtk.cmo gobject.cmi gdkPixbuf.cmi gdk.cmi gaux.cmo -+gtkSourceView2.cmx : gtkSourceView2_types.cmi gtkSourceView2Props.cmx \ -+ gtkBase.cmx gtk.cmx gobject.cmx gdkPixbuf.cmx gdk.cmx gaux.cmx -+gSourceView2.cmo : ogtkSourceView2Props.cmo gtkText.cmo gtkStock.cmo \ - gtkSourceView2_types.cmi gtkSourceView2.cmo gtkBase.cmo gtk.cmo \ -- gobject.cmi gdk.cmi gaux.cmo gText.cmi gObj.cmi gContainer.cmi \ -- gSourceView2.cmi --gSourceView2.cmx: ogtkSourceView2Props.cmx gtkText.cmx \ -+ gobject.cmi gdkPixbuf.cmi gdk.cmi gaux.cmo gWindow.cmi gText.cmi gObj.cmi \ -+ gContainer.cmi gSourceView2.cmi -+gSourceView2.cmx : ogtkSourceView2Props.cmx gtkText.cmx gtkStock.cmx \ - gtkSourceView2_types.cmi gtkSourceView2.cmx gtkBase.cmx gtk.cmx \ -- gobject.cmx gdk.cmx gaux.cmx gText.cmx gObj.cmx gContainer.cmx \ -- gSourceView2.cmi --gtkInit.cmo: gtkMain.cmo --gtkInit.cmx: gtkMain.cmx --gtkBaseProps.cmo: gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \ -+ gobject.cmx gdkPixbuf.cmx gdk.cmx gaux.cmx gWindow.cmx gText.cmx gObj.cmx \ -+ gContainer.cmx gSourceView2.cmi -+gtkInit.cmo : gtkMain.cmo -+gtkInit.cmx : gtkMain.cmx -+gtkBaseProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \ - gpointer.cmi gobject.cmi gdkPixbuf.cmi gdkEvent.cmo gdkEnums.cmo gdk.cmi --gtkBaseProps.cmx: gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \ -+gtkBaseProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \ - gpointer.cmx gobject.cmx gdkPixbuf.cmx gdkEvent.cmx gdkEnums.cmx gdk.cmx --gtkBinProps.cmo: gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo gobject.cmi \ -- gdk.cmi --gtkBinProps.cmx: gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx gobject.cmx \ -- gdk.cmx --gtkButtonProps.cmo: gtkStock.cmo gtkSignal.cmi gtkObject.cmo gtkEnums.cmo \ -+gtkBinProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \ -+ gobject.cmi gdk.cmi -+gtkBinProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \ -+ gobject.cmx gdk.cmx -+gtkButtonProps.cmo : gtkStock.cmo gtkSignal.cmi gtkObject.cmo gtkEnums.cmo \ - gtk.cmo gobject.cmi gdk.cmi --gtkButtonProps.cmx: gtkStock.cmx gtkSignal.cmx gtkObject.cmx gtkEnums.cmx \ -+gtkButtonProps.cmx : gtkStock.cmx gtkSignal.cmx gtkObject.cmx gtkEnums.cmx \ - gtk.cmx gobject.cmx gdk.cmx --gtkEditProps.cmo: gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \ -+gtkEditProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \ - gobject.cmi --gtkEditProps.cmx: gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \ -+gtkEditProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \ - gobject.cmx --gtkListProps.cmo: gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \ -+gtkListProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \ - gobject.cmi gdkEvent.cmo --gtkListProps.cmx: gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \ -+gtkListProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \ - gobject.cmx gdkEvent.cmx --gtkMenuProps.cmo: gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \ -+gtkMenuProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \ - gobject.cmi --gtkMenuProps.cmx: gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \ -+gtkMenuProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \ - gobject.cmx --gtkMiscProps.cmo: pangoEnums.cmo gtkStock.cmo gtkSignal.cmi gtkObject.cmo \ -+gtkMiscProps.cmo : pangoEnums.cmo gtkStock.cmo gtkSignal.cmi gtkObject.cmo \ - gtkEnums.cmo gtk.cmo gobject.cmi gdkPixbuf.cmi gdkEvent.cmo gdk.cmi --gtkMiscProps.cmx: pangoEnums.cmx gtkStock.cmx gtkSignal.cmx gtkObject.cmx \ -+gtkMiscProps.cmx : pangoEnums.cmx gtkStock.cmx gtkSignal.cmx gtkObject.cmx \ - gtkEnums.cmx gtk.cmx gobject.cmx gdkPixbuf.cmx gdkEvent.cmx gdk.cmx --gtkPackProps.cmo: gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \ -+gtkPackProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \ - gobject.cmi gdk.cmi --gtkPackProps.cmx: gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \ -+gtkPackProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \ - gobject.cmx gdk.cmx --gtkRangeProps.cmo: pangoEnums.cmo gtkSignal.cmi gtkObject.cmo gtkEnums.cmo \ -+gtkRangeProps.cmo : pangoEnums.cmo gtkSignal.cmi gtkObject.cmo gtkEnums.cmo \ - gtk.cmo gobject.cmi --gtkRangeProps.cmx: pangoEnums.cmx gtkSignal.cmx gtkObject.cmx gtkEnums.cmx \ -+gtkRangeProps.cmx : pangoEnums.cmx gtkSignal.cmx gtkObject.cmx gtkEnums.cmx \ - gtk.cmx gobject.cmx --gtkTextProps.cmo: pangoEnums.cmo pango.cmo gtkSignal.cmi gtkObject.cmo \ -+gtkTextProps.cmo : pangoEnums.cmo pango.cmo gtkSignal.cmi gtkObject.cmo \ - gtkEnums.cmo gtk.cmo gobject.cmi gdkPixbuf.cmi gdkEvent.cmo gdk.cmi --gtkTextProps.cmx: pangoEnums.cmx pango.cmx gtkSignal.cmx gtkObject.cmx \ -+gtkTextProps.cmx : pangoEnums.cmx pango.cmx gtkSignal.cmx gtkObject.cmx \ - gtkEnums.cmx gtk.cmx gobject.cmx gdkPixbuf.cmx gdkEvent.cmx gdk.cmx --gtkTreeProps.cmo: pangoEnums.cmo pango.cmo gtkSignal.cmi gtkObject.cmo \ -+gtkTreeProps.cmo : pangoEnums.cmo pango.cmo gtkSignal.cmi gtkObject.cmo \ - gtkEnums.cmo gtk.cmo gobject.cmi gdkPixbuf.cmi gdk.cmi --gtkTreeProps.cmx: pangoEnums.cmx pango.cmx gtkSignal.cmx gtkObject.cmx \ -+gtkTreeProps.cmx : pangoEnums.cmx pango.cmx gtkSignal.cmx gtkObject.cmx \ - gtkEnums.cmx gtk.cmx gobject.cmx gdkPixbuf.cmx gdk.cmx --gtkFileProps.cmo: gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \ -+gtkFileProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \ - gobject.cmi --gtkFileProps.cmx: gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \ -+gtkFileProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \ - gobject.cmx --gtkActionProps.cmo: gtkStock.cmo gtkSignal.cmi gtkObject.cmo gtkEnums.cmo \ -+gtkActionProps.cmo : gtkStock.cmo gtkSignal.cmi gtkObject.cmo gtkEnums.cmo \ - gtk.cmo gobject.cmi --gtkActionProps.cmx: gtkStock.cmx gtkSignal.cmx gtkObject.cmx gtkEnums.cmx \ -+gtkActionProps.cmx : gtkStock.cmx gtkSignal.cmx gtkObject.cmx gtkEnums.cmx \ - gtk.cmx gobject.cmx --gtkBrokenProps.cmo: gtkSignal.cmi gtkObject.cmo gtk.cmo gobject.cmi --gtkBrokenProps.cmx: gtkSignal.cmx gtkObject.cmx gtk.cmx gobject.cmx --gtkAssistantProps.cmo: gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \ -+gtkBrokenProps.cmo : gtkSignal.cmi gtkObject.cmo gtk.cmo gobject.cmi -+gtkBrokenProps.cmx : gtkSignal.cmx gtkObject.cmx gtk.cmx gobject.cmx -+gtkAssistantProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \ - gobject.cmi gdkPixbuf.cmi --gtkAssistantProps.cmx: gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \ -+gtkAssistantProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \ - gobject.cmx gdkPixbuf.cmx --ogtkBaseProps.cmo: gtkSignal.cmi gtkBaseProps.cmo gobject.cmi gObj.cmi --ogtkBaseProps.cmx: gtkSignal.cmx gtkBaseProps.cmx gobject.cmx gObj.cmx --ogtkBinProps.cmo: gtkSignal.cmi gtkPackProps.cmo gtkBinProps.cmo gobject.cmi \ -- gObj.cmi gData.cmi --ogtkBinProps.cmx: gtkSignal.cmx gtkPackProps.cmx gtkBinProps.cmx gobject.cmx \ -- gObj.cmx gData.cmx --ogtkButtonProps.cmo: gtkSignal.cmi gtkButtonProps.cmo gobject.cmi gObj.cmi --ogtkButtonProps.cmx: gtkSignal.cmx gtkButtonProps.cmx gobject.cmx gObj.cmx --ogtkEditProps.cmo: gtkSignal.cmi gtkEditProps.cmo gobject.cmi gData.cmi --ogtkEditProps.cmx: gtkSignal.cmx gtkEditProps.cmx gobject.cmx gData.cmx --ogtkListProps.cmo: gtkSignal.cmi gtkListProps.cmo gobject.cmi --ogtkListProps.cmx: gtkSignal.cmx gtkListProps.cmx gobject.cmx --ogtkMenuProps.cmo: gtkSignal.cmi gtkMenuProps.cmo gobject.cmi --ogtkMenuProps.cmx: gtkSignal.cmx gtkMenuProps.cmx gobject.cmx --ogtkMiscProps.cmo: gtkSignal.cmi gtkMiscProps.cmo gobject.cmi gdkEvent.cmo \ -+ogtkBaseProps.cmo : gtkSignal.cmi gtkBaseProps.cmo gobject.cmi gObj.cmi -+ogtkBaseProps.cmx : gtkSignal.cmx gtkBaseProps.cmx gobject.cmx gObj.cmx -+ogtkBinProps.cmo : gtkSignal.cmi gtkPackProps.cmo gtkBinProps.cmo \ -+ gobject.cmi gObj.cmi gData.cmi -+ogtkBinProps.cmx : gtkSignal.cmx gtkPackProps.cmx gtkBinProps.cmx \ -+ gobject.cmx gObj.cmx gData.cmx -+ogtkButtonProps.cmo : gtkSignal.cmi gtkButtonProps.cmo gobject.cmi gObj.cmi -+ogtkButtonProps.cmx : gtkSignal.cmx gtkButtonProps.cmx gobject.cmx gObj.cmx -+ogtkEditProps.cmo : gtkSignal.cmi gtkEditProps.cmo gobject.cmi gData.cmi -+ogtkEditProps.cmx : gtkSignal.cmx gtkEditProps.cmx gobject.cmx gData.cmx -+ogtkListProps.cmo : gtkSignal.cmi gtkListProps.cmo gobject.cmi -+ogtkListProps.cmx : gtkSignal.cmx gtkListProps.cmx gobject.cmx -+ogtkMenuProps.cmo : gtkSignal.cmi gtkMenuProps.cmo gobject.cmi -+ogtkMenuProps.cmx : gtkSignal.cmx gtkMenuProps.cmx gobject.cmx -+ogtkMiscProps.cmo : gtkSignal.cmi gtkMiscProps.cmo gobject.cmi gdkEvent.cmo \ - gObj.cmi --ogtkMiscProps.cmx: gtkSignal.cmx gtkMiscProps.cmx gobject.cmx gdkEvent.cmx \ -+ogtkMiscProps.cmx : gtkSignal.cmx gtkMiscProps.cmx gobject.cmx gdkEvent.cmx \ - gObj.cmx --ogtkPackProps.cmo: gtkSignal.cmi gtkPackProps.cmo gobject.cmi --ogtkPackProps.cmx: gtkSignal.cmx gtkPackProps.cmx gobject.cmx --ogtkRangeProps.cmo: gtkSignal.cmi gtkRangeProps.cmo gobject.cmi gData.cmi --ogtkRangeProps.cmx: gtkSignal.cmx gtkRangeProps.cmx gobject.cmx gData.cmx --ogtkTextProps.cmo: gtkTextProps.cmo gtkSignal.cmi gobject.cmi gData.cmi --ogtkTextProps.cmx: gtkTextProps.cmx gtkSignal.cmx gobject.cmx gData.cmx --ogtkTreeProps.cmo: gtkTreeProps.cmo gtkSignal.cmi gobject.cmi gObj.cmi \ -+ogtkPackProps.cmo : gtkSignal.cmi gtkPackProps.cmo gobject.cmi gObj.cmi -+ogtkPackProps.cmx : gtkSignal.cmx gtkPackProps.cmx gobject.cmx gObj.cmx -+ogtkRangeProps.cmo : gtkSignal.cmi gtkRangeProps.cmo gobject.cmi gData.cmi -+ogtkRangeProps.cmx : gtkSignal.cmx gtkRangeProps.cmx gobject.cmx gData.cmx -+ogtkTextProps.cmo : gtkTextProps.cmo gtkSignal.cmi gobject.cmi gData.cmi -+ogtkTextProps.cmx : gtkTextProps.cmx gtkSignal.cmx gobject.cmx gData.cmx -+ogtkTreeProps.cmo : gtkTreeProps.cmo gtkSignal.cmi gobject.cmi gObj.cmi \ - gData.cmi --ogtkTreeProps.cmx: gtkTreeProps.cmx gtkSignal.cmx gobject.cmx gObj.cmx \ -+ogtkTreeProps.cmx : gtkTreeProps.cmx gtkSignal.cmx gobject.cmx gObj.cmx \ - gData.cmx --ogtkFileProps.cmo: gtkSignal.cmi gtkFileProps.cmo gobject.cmi gObj.cmi --ogtkFileProps.cmx: gtkSignal.cmx gtkFileProps.cmx gobject.cmx gObj.cmx --ogtkActionProps.cmo: gtkSignal.cmi gtkActionProps.cmo gobject.cmi gObj.cmi --ogtkActionProps.cmx: gtkSignal.cmx gtkActionProps.cmx gobject.cmx gObj.cmx --ogtkBrokenProps.cmo: gtkSignal.cmi gtkBrokenProps.cmo gobject.cmi gData.cmi --ogtkBrokenProps.cmx: gtkSignal.cmx gtkBrokenProps.cmx gobject.cmx gData.cmx --ogtkAssistantProps.cmo: gtkSignal.cmi gtkAssistantProps.cmo gobject.cmi --ogtkAssistantProps.cmx: gtkSignal.cmx gtkAssistantProps.cmx gobject.cmx --gtkThread.cmo: gtkSignal.cmi gtkMain.cmo glib.cmi gtkThread.cmi --gtkThread.cmx: gtkSignal.cmx gtkMain.cmx glib.cmx gtkThread.cmi --gtkThInit.cmo: gtkThread.cmi --gtkThInit.cmx: gtkThread.cmx --gtkSourceView.cmo: sourceViewEnums.cmo gtkSourceView_types.cmi \ -+ogtkFileProps.cmo : gtkSignal.cmi gtkFileProps.cmo gobject.cmi gObj.cmi -+ogtkFileProps.cmx : gtkSignal.cmx gtkFileProps.cmx gobject.cmx gObj.cmx -+ogtkActionProps.cmo : gtkSignal.cmi gtkActionProps.cmo gobject.cmi gObj.cmi -+ogtkActionProps.cmx : gtkSignal.cmx gtkActionProps.cmx gobject.cmx gObj.cmx -+ogtkBrokenProps.cmo : gtkSignal.cmi gtkBrokenProps.cmo gobject.cmi gData.cmi -+ogtkBrokenProps.cmx : gtkSignal.cmx gtkBrokenProps.cmx gobject.cmx gData.cmx -+ogtkAssistantProps.cmo : gtkSignal.cmi gtkAssistantProps.cmo gobject.cmi -+ogtkAssistantProps.cmx : gtkSignal.cmx gtkAssistantProps.cmx gobject.cmx -+gtkThread.cmo : gtkSignal.cmi gtkMain.cmo glib.cmi gtkThread.cmi -+gtkThread.cmx : gtkSignal.cmx gtkMain.cmx glib.cmx gtkThread.cmi -+gtkThTop.cmo : gtkThread.cmi -+gtkThTop.cmx : gtkThread.cmx -+gtkSourceView.cmo : sourceViewEnums.cmo gtkSourceView_types.cmi \ - gtkSourceViewProps.cmo gtkBase.cmo gtk.cmo gobject.cmi glib.cmi \ - gdkPixbuf.cmi gdk.cmi gaux.cmo --gtkSourceView.cmx: sourceViewEnums.cmx gtkSourceView_types.cmi \ -+gtkSourceView.cmx : sourceViewEnums.cmx gtkSourceView_types.cmi \ - gtkSourceViewProps.cmx gtkBase.cmx gtk.cmx gobject.cmx glib.cmx \ - gdkPixbuf.cmx gdk.cmx gaux.cmx --gSourceView.cmo: ogtkTextProps.cmo ogtkSourceViewProps.cmo gtkText.cmo \ -+gSourceView.cmo : ogtkTextProps.cmo ogtkSourceViewProps.cmo gtkText.cmo \ - gtkSourceView_types.cmi gtkSourceView.cmo gtkBase.cmo gtk.cmo gobject.cmi \ - gdk.cmi gaux.cmo gText.cmi gObj.cmi gContainer.cmi gSourceView.cmi --gSourceView.cmx: ogtkTextProps.cmx ogtkSourceViewProps.cmx gtkText.cmx \ -+gSourceView.cmx : ogtkTextProps.cmx ogtkSourceViewProps.cmx gtkText.cmx \ - gtkSourceView_types.cmi gtkSourceView.cmx gtkBase.cmx gtk.cmx gobject.cmx \ - gdk.cmx gaux.cmx gText.cmx gObj.cmx gContainer.cmx gSourceView.cmi --gtkSourceViewProps.cmo: gtkSourceView_types.cmi gtkSignal.cmi gtkObject.cmo \ -+gtkSourceViewProps.cmo : gtkSourceView_types.cmi gtkSignal.cmi gtkObject.cmo \ - gtk.cmo gobject.cmi gdk.cmi --gtkSourceViewProps.cmx: gtkSourceView_types.cmi gtkSignal.cmx gtkObject.cmx \ -+gtkSourceViewProps.cmx : gtkSourceView_types.cmi gtkSignal.cmx gtkObject.cmx \ - gtk.cmx gobject.cmx gdk.cmx --ogtkSourceViewProps.cmo: gtkSourceViewProps.cmo gtkSignal.cmi gobject.cmi --ogtkSourceViewProps.cmx: gtkSourceViewProps.cmx gtkSignal.cmx gobject.cmx --sourceViewEnums.cmo: gpointer.cmi gobject.cmi --sourceViewEnums.cmx: gpointer.cmx gobject.cmx --gtkSourceView2Props.cmo: sourceView2Enums.cmo gtkSourceView2_types.cmi \ -- gtkSignal.cmi gtkObject.cmo gtk.cmo gobject.cmi gdkPixbuf.cmi gdk.cmi --gtkSourceView2Props.cmx: sourceView2Enums.cmx gtkSourceView2_types.cmi \ -- gtkSignal.cmx gtkObject.cmx gtk.cmx gobject.cmx gdkPixbuf.cmx gdk.cmx --ogtkSourceView2Props.cmo: gtkSourceView2Props.cmo gtkSignal.cmi gobject.cmi --ogtkSourceView2Props.cmx: gtkSourceView2Props.cmx gtkSignal.cmx gobject.cmx --sourceViewEnums.cmo: gpointer.cmi gobject.cmi --sourceViewEnums.cmx: gpointer.cmx gobject.cmx --gtkSignal.cmo: gobject.cmi gtkSignal.cmi --gtkSignal.cmx: gobject.cmx gtkSignal.cmi --gAction.cmi: gtkStock.cmo gtkSignal.cmi gtkEnums.cmo gtk.cmo gobject.cmi \ -+ogtkSourceViewProps.cmo : gtkSourceViewProps.cmo gtkSignal.cmi gobject.cmi -+ogtkSourceViewProps.cmx : gtkSourceViewProps.cmx gtkSignal.cmx gobject.cmx -+sourceViewEnums.cmo : gpointer.cmi gobject.cmi -+sourceViewEnums.cmx : gpointer.cmx gobject.cmx -+gtkSourceView2Props.cmo : gtkSourceView2_types.cmi gtkSignal.cmi \ -+ gtkObject.cmo gtkEnums.cmo gtk.cmo gobject.cmi gdkPixbuf.cmi gdkEvent.cmo \ -+ gdk.cmi -+gtkSourceView2Props.cmx : gtkSourceView2_types.cmi gtkSignal.cmx \ -+ gtkObject.cmx gtkEnums.cmx gtk.cmx gobject.cmx gdkPixbuf.cmx gdkEvent.cmx \ -+ gdk.cmx -+ogtkSourceView2Props.cmo : gtkSourceView2Props.cmo gtkSignal.cmi gobject.cmi -+ogtkSourceView2Props.cmx : gtkSourceView2Props.cmx gtkSignal.cmx gobject.cmx -+sourceViewEnums.cmo : gpointer.cmi gobject.cmi -+sourceViewEnums.cmx : gpointer.cmx gobject.cmx -+gtkSignal.cmo : gobject.cmi gtkSignal.cmi -+gtkSignal.cmx : gobject.cmx gtkSignal.cmi -+gAction.cmi : gtkStock.cmo gtkSignal.cmi gtkEnums.cmo gtk.cmo gobject.cmi \ - gObj.cmi --gAssistant.cmi: gtkSignal.cmi gtkEnums.cmo gtk.cmo gdkPixbuf.cmi gdkEnums.cmo \ -- gdk.cmi gWindow.cmi gObj.cmi gContainer.cmi --gBin.cmi: gtkSignal.cmi gtk.cmo gObj.cmi gData.cmi gContainer.cmi --gBroken.cmi: gtkSignal.cmi gtk.cmo gobject.cmi gdk.cmi gObj.cmi gEdit.cmi \ -- gDraw.cmi gData.cmi gContainer.cmi --gButton.cmi: gtkStock.cmo gtkSignal.cmi gtkEnums.cmo gtk.cmo gdk.cmi gObj.cmi \ -- gData.cmi gContainer.cmi --gContainer.cmi: gtkSignal.cmi gtk.cmo gobject.cmi gObj.cmi gData.cmi --gData.cmi: gtkSignal.cmi gtk.cmo gobject.cmi gdkPixbuf.cmi gdk.cmi gObj.cmi --gDraw.cmi: pango.cmo gpointer.cmi gobject.cmi gdkPixbuf.cmi gdk.cmi --gEdit.cmi: gtkSignal.cmi gtk.cmo gTree.cmi gObj.cmi gMenu.cmi gList.cmi \ -- gData.cmi gContainer.cmi --gFile.cmi: gtkSignal.cmi gtkEnums.cmo gtk.cmo gPack.cmi gObj.cmi \ -- gContainer.cmi --gList.cmi: gtkSignal.cmi gtk.cmo gdkEvent.cmo gObj.cmi gDraw.cmi gData.cmi \ -+gAssistant.cmi : gtkSignal.cmi gtkEnums.cmo gtk.cmo gdkPixbuf.cmi \ -+ gdkEnums.cmo gdk.cmi gWindow.cmi gObj.cmi gContainer.cmi -+gBin.cmi : gtkSignal.cmi gtkEnums.cmo gtk.cmo gObj.cmi gData.cmi \ - gContainer.cmi --gMain.cmi: gtk.cmo glib.cmi gdkEvent.cmo gdk.cmi gObj.cmi gData.cmi --gMenu.cmi: gtkStock.cmo gtkSignal.cmi gtk.cmo gdk.cmi gObj.cmi gContainer.cmi \ -- gButton.cmi --gMisc.cmi: pangoEnums.cmo gtkStock.cmo gtkSignal.cmi gtk.cmo gobject.cmi \ -- gdkPixbuf.cmi gdkEvent.cmo gdk.cmi gPack.cmi gObj.cmi gDraw.cmi \ -+gBroken.cmi : gtkSignal.cmi gtk.cmo gobject.cmi gdk.cmi gObj.cmi gEdit.cmi \ -+ gDraw.cmi gData.cmi gContainer.cmi -+gButton.cmi : gtkStock.cmo gtkSignal.cmi gtkEnums.cmo gtk.cmo gdk.cmi \ -+ gObj.cmi gData.cmi gContainer.cmi -+gContainer.cmi : gtkSignal.cmi gtkEnums.cmo gtk.cmo gobject.cmi gObj.cmi \ -+ gData.cmi -+gData.cmi : gtkSignal.cmi gtk.cmo gobject.cmi gdkPixbuf.cmi gdk.cmi gObj.cmi -+gDraw.cmi : pango.cmo gpointer.cmi gobject.cmi gdkPixbuf.cmi gdk.cmi -+gEdit.cmi : gtkSignal.cmi gtkEnums.cmo gtk.cmo gTree.cmi gObj.cmi gMenu.cmi \ -+ gList.cmi gData.cmi gContainer.cmi -+gFile.cmi : gtkSignal.cmi gtkEnums.cmo gtk.cmo gPack.cmi gObj.cmi \ - gContainer.cmi --gObj.cmi: pango.cmo gtkStock.cmo gtkSignal.cmi gtk.cmo gobject.cmi \ -+gList.cmi : gtkSignal.cmi gtkEnums.cmo gtk.cmo gdkEvent.cmo gObj.cmi \ -+ gDraw.cmi gData.cmi gContainer.cmi -+gMain.cmi : gtk.cmo glib.cmi gdkEvent.cmo gdk.cmi gObj.cmi gData.cmi -+gMenu.cmi : gtkStock.cmo gtkSignal.cmi gtk.cmo gdk.cmi gObj.cmi \ -+ gContainer.cmi gButton.cmi -+gMisc.cmi : pangoEnums.cmo gtkStock.cmo gtkSignal.cmi gtkEnums.cmo gtk.cmo \ -+ gobject.cmi gdkPixbuf.cmi gdkEvent.cmo gdk.cmi gPack.cmi gObj.cmi \ -+ gDraw.cmi gContainer.cmi -+gObj.cmi : pango.cmo gtkStock.cmo gtkSignal.cmi gtk.cmo gobject.cmi \ - gdkPixbuf.cmi gdkEvent.cmo gdk.cmi gPango.cmo gDraw.cmi --gPack.cmi: gtkSignal.cmi gtkPack.cmo gtkEnums.cmo gtk.cmo gdk.cmi gObj.cmi \ -+gPack.cmi : gtkSignal.cmi gtkPack.cmo gtkEnums.cmo gtk.cmo gdk.cmi gObj.cmi \ - gData.cmi gContainer.cmi --gRange.cmi: pangoEnums.cmo gtkSignal.cmi gtk.cmo gObj.cmi gData.cmi --gSourceView.cmi: sourceViewEnums.cmo gtkSourceView_types.cmi gtkSignal.cmi \ -+gRange.cmi : pangoEnums.cmo gtkSignal.cmi gtkEnums.cmo gtk.cmo gObj.cmi \ -+ gData.cmi -+gSourceView.cmi : sourceViewEnums.cmo gtkSourceView_types.cmi gtkSignal.cmi \ - gtkEnums.cmo gtk.cmo glib.cmi gdkPixbuf.cmi gdk.cmi gText.cmi gObj.cmi --gSourceView2.cmi: sourceView2Enums.cmo ogtkSourceView2Props.cmo \ -+gSourceView2.cmi : ogtkSourceView2Props.cmo gtkStock.cmo \ - gtkSourceView2_types.cmi gtkSignal.cmi gtkEnums.cmo gtk.cmo gdkPixbuf.cmi \ -- gdk.cmi gText.cmi gObj.cmi --gText.cmi: pango.cmo gtkSignal.cmi gtk.cmo gobject.cmi glib.cmi gdkPixbuf.cmi \ -- gdkEvent.cmo gdk.cmi gObj.cmi gData.cmi --gToolbox.cmi: gtk.cmo gText.cmi gObj.cmi gMenu.cmi gList.cmi gBroken.cmi --gTree.cmi: pango.cmo gtkSignal.cmi gtkEnums.cmo gtk.cmo gobject.cmi \ -+ gdkEvent.cmo gdk.cmi gWindow.cmi gText.cmi gObj.cmi gContainer.cmi -+gText.cmi : pango.cmo gtkSignal.cmi gtkEnums.cmo gtk.cmo gobject.cmi \ -+ glib.cmi gdkPixbuf.cmi gdkEvent.cmo gdk.cmi gObj.cmi gData.cmi -+gToolbox.cmi : gtk.cmo gWindow.cmi gText.cmi gObj.cmi gMenu.cmi gList.cmi \ -+ gBroken.cmi -+gTree.cmi : pango.cmo gtkSignal.cmi gtkEnums.cmo gtk.cmo gobject.cmi \ - gdkPixbuf.cmi gdkEnums.cmo gdk.cmi gObj.cmi gData.cmi gContainer.cmi --gUtil.cmi: gtkSignal.cmi gtk.cmo gObj.cmi --gWindow.cmi: gtkStock.cmo gtkSignal.cmi gtkEnums.cmo gtk.cmo gdkPixbuf.cmi \ -+gUtil.cmi : gtkSignal.cmi gtk.cmo gObj.cmi -+gWindow.cmi : gtkStock.cmo gtkSignal.cmi gtkEnums.cmo gtk.cmo gdkPixbuf.cmi \ - gdkEnums.cmo gdk.cmi gPack.cmi gObj.cmi gMisc.cmi gList.cmi gFile.cmi \ - gContainer.cmi gButton.cmi --gdk.cmi: pango.cmo gpointer.cmi gobject.cmi --gdkPixbuf.cmi: gpointer.cmi gobject.cmi gdk.cmi --glGtk.cmi: gtkSignal.cmi gtk.cmo gpointer.cmi gObj.cmi --glade.cmi: gtk.cmo gobject.cmi --glib.cmi: --gnoCanvas.cmi: gtkSignal.cmi gtk.cmo gobject.cmi gnomeCanvas.cmo \ -+gdk.cmi : pango.cmo gpointer.cmi gobject.cmi -+gdkPixbuf.cmi : gpointer.cmi gobject.cmi gdk.cmi -+glGtk.cmi : gtkSignal.cmi gtk.cmo gpointer.cmi gObj.cmi -+glade.cmi : gtk.cmo gobject.cmi -+glib.cmi : -+gnoCanvas.cmi : gtkSignal.cmi gtk.cmo gobject.cmi gnomeCanvas.cmo \ - gdkPixbuf.cmi gdkEvent.cmo gdk.cmi gText.cmi gPack.cmi gObj.cmi --gnoDruid.cmi: gtkSignal.cmi gtk.cmo gnomeDruid.cmo gdkPixbuf.cmi gdk.cmi \ -+gnoDruid.cmi : gtkSignal.cmi gtk.cmo gnomeDruid.cmo gdkPixbuf.cmi gdk.cmi \ - gPack.cmi gObj.cmi gContainer.cmi --gobject.cmi: gpointer.cmi --gpointer.cmi: --gtkSignal.cmi: gobject.cmi --gtkSourceView2_types.cmi: gtk.cmo --gtkSourceView_types.cmi: gtk.cmo --gtkSpell.cmi: gText.cmi --gtkThread.cmi: --gutf8.cmi: --panel.cmi: gtkSignal.cmi gtkEnums.cmo gtk.cmo gdk.cmi gObj.cmi gContainer.cmi --rsvg.cmi: gdkPixbuf.cmi --xml_lexer.cmi: -+gobject.cmi : gpointer.cmi -+gpointer.cmi : -+gtkSignal.cmi : gobject.cmi -+gtkSourceView2_types.cmi : gtk.cmo -+gtkSourceView_types.cmi : gtk.cmo -+gtkSpell.cmi : gText.cmi -+gtkThread.cmi : -+gutf8.cmi : -+panel.cmi : gtkSignal.cmi gtkEnums.cmo gtk.cmo gdk.cmi gObj.cmi \ -+ gContainer.cmi -+rsvg.cmi : gdkPixbuf.cmi -+xml_lexer.cmi : -diff --git src/Makefile src/Makefile -index c498882..c4d1b75 100755 ---- src/Makefile -+++ src/Makefile -@@ -274,7 +274,7 @@ lablgtktop$(XE): $(MLLIBS) $(THOBJS) $(CONFIG) - endif - - lablgtk2: Makefile $(CONFIG) lablgtk2.in -- sed -e "s|@INSTALLDIR@|$(INSTALLDIR)|g" \ -+ sed -e "s|@INSTALLDIR@|$(LABLGTKDIR)|g" \ - -e "s|@LABLGLDIR@|$(LABLGLDIR)|g" \ - -e "s|@MLLIBS@|$(MLLINK) $(MLLIBS)|g" \ - -e "s|@INITOBJS@|$(INITOBJS)|g" \ -@@ -343,7 +343,7 @@ preinstall: - old-install: - mkdir -p "$(INSTALLDIR)" "$(BINDIR)" "$(DLLDIR)" - cp $(ALLOBJS:.cmo=.cmi) $(EXTRA_OBJS:.cmo=.cmi) "$(INSTALLDIR)" -- cp -p *.mli "$(INSTALLDIR)" -+ cp -p ../META *.mli "$(INSTALLDIR)" - cp -p $(ALLOBJS:.cmo=.ml) $(ALLTHOBJS:.cmo=.ml) \ - $(EXTRA_OBJS:.cmo=.ml) build.ml "$(INSTALLDIR)" - cp $(EXTRA_MLLIBS) $(MLLIBS) $(INITOBJS) "$(INSTALLDIR)" -@@ -390,8 +390,16 @@ old-uninstall: - - # Install using ocamlfind - findlib-install: -+ @if test "$(OCAMLFIND)" = no; then \ -+ echo "Cannot use ocamlfind, use old-install."; \ -+ exit 2; fi - mkdir -p "$(BINDIR)" -- ocamlfind install lablgtk2 ../META \ -+ mkdir -p "$(DESTDIR)$(FINDLIBDIR)" -+ @if test -f "$(DESTDIR)$(OCAMLLDCONF)"; then :; else \ -+ touch "$(DESTDIR)$(OCAMLLDCONF)"; fi -+ $(OCAMLFIND) install -destdir "$(DESTDIR)$(FINDLIBDIR)" \ -+ -ldconf "$(DESTDIR)$(OCAMLLDCONF)" \ -+ lablgtk2 ../META \ - build.ml \ - $(CLIBS) \ - $(ALLOBJS:.cmo=.cmi) $(EXTRA_OBJS:.cmo=.cmi) \ -@@ -427,19 +435,22 @@ findlib-install: - then \ - echo $(CLIBS:lib%$(XA)=dll%$(XA)) ; \ - fi` -- $(RANLIB) $(CLIBS:%="`ocamlfind query lablgtk2 | tr -d '\r'`"/%) -- @if test -f lablgtk.cmxa; \ -- then ($(RANLIB) $(MLLIBS:%.cma="`ocamlfind query lablgtk2 | tr -d '\r'`"/%$(XA)) $(EXTRA_MLLIBS:%.cma="`ocamlfind query lablgtk2 | tr -d '\r'`"/%$(XA)) ); fi -- rm lablgtk2$(XB) -- $(MAKE) INSTALLDIR=`ocamlfind query lablgtk2 | tr -d '\r'` lablgtk2$(XB) -+ rm -f lablgtk2 -+ $(MAKE) lablgtk2 LABLGTKDIR="$(FINDLIBDIR)/lablgtk2" - cp lablgtk2$(XB) "$(BINDIR)" - if test -f lablgladecc$(XE); then \ - cp lablgladecc$(XE) "$(BINDIR)/lablgladecc2$(XE)"; \ - fi - cp gdk_pixbuf_mlsource$(XE) "$(BINDIR)" -+ $(RANLIB) $(CLIBS:%=$(FLINSTALLDIR)/%) -+ @if test -f lablgtk.cmxa; then \ -+ echo "Execute $(RANLIB) in $(FLINSTALLDIR)"; \ -+ $(RANLIB) $(MLLIBS:%.cma=$(FLINSTALLDIR)/%$(XA)) \ -+ $(EXTRA_MLLIBS:%.cma=$(FLINSTALLDIR)/%$(XA)) ; \ -+ fi - - findlib-uninstall: -- ocamlfind remove lablgtk2 -+ $(OCAMLFIND) remove lablgtk2 - for f in lablgladecc2$(XE) lablgtk2$(XB) gdk_pixbuf_mlsource$(XE); \ - do rm -f "$(BINDIR)"/$$f; done - -diff --git src/gFile.ml src/gFile.ml -index d5eeb96..6346785 100644 ---- src/gFile.ml -+++ src/gFile.ml -@@ -179,7 +179,7 @@ let chooser_widget ~action ?backend ?packing ?show () = - FileChooser.P.file_system_backend backend - [ Gobject.param FileChooser.P.action action ]) in - let o = new chooser_widget w in -- GObj.pack_return o ?packing ?show -+ GObj.pack_return o ~packing ~show - - class chooser_button_signals obj = object - inherit GContainer.container_signals_impl obj -diff --git src/gMenu.ml src/gMenu.ml -index b280e58..e87b8da 100644 ---- src/gMenu.ml -+++ src/gMenu.ml -@@ -87,9 +87,9 @@ end - - class menu_item_skel = [menu_item] pre_menu_item_skel - --let pack_item self ~packing ~show = -+let pack_item ?packing ?(show=true) self = - may packing ~f:(fun f -> (f (self :> menu_item) : unit)); -- if show <> Some false then self#misc#show (); -+ if show then self#misc#show (); - self - - let menu_item ?use_mnemonic ?label ?right_justified ?packing ?show () = -diff --git src/gdk.ml src/gdk.ml -index b3f4b6c..cb5759b 100644 ---- src/gdk.ml -+++ src/gdk.ml -@@ -137,7 +137,8 @@ module Convert = struct - = "ml_test_GdkModifier_val" - let modifier i = - List.filter [`SHIFT;`LOCK;`CONTROL;`MOD1;`MOD2;`MOD3;`MOD4;`MOD5; -- `BUTTON1;`BUTTON2;`BUTTON3;`BUTTON4;`BUTTON5] -+ `BUTTON1;`BUTTON2;`BUTTON3;`BUTTON4;`BUTTON5;`SUPER; -+ `HYPER;`META;`RELEASE] - ~f:(fun m -> test_modifier m i) - external test_window_state : window_state -> int -> bool - = "ml_test_GdkWindowState_val" -diff --git src/gtkSignal.ml4 src/gtkSignal.ml4 -index 918a508..1e9e23e 100644 ---- src/gtkSignal.ml4 -+++ src/gtkSignal.ml4 -@@ -200,6 +200,6 @@ let connect ~sgn: ((sgn:('a, _) t)) ~callback ?after (obj : 'a obj) = - - let connect_property ~(prop:('a, _) property) ~callback (obj : 'a obj) = - let name = "notify::" ^ prop.Gobject.name in -- let callback = fun () -> callback (get prop obj) in -- connect_aux ~name ~marshaller:marshal_unit ~callback obj -+ let marshaller = marshal1 prop.conv name in -+ connect_aux ~name ~marshaller ~callback obj - -diff --git src/ml_glib.c src/ml_glib.c -index 82e1c36..b776c54 100644 ---- src/ml_glib.c -+++ src/ml_glib.c -@@ -243,7 +243,7 @@ ML_2(g_log_set_fatal_mask, String_option_val, Int_val, Unit) - - CAMLprim value ml_g_log (value domain, value level, value msg) - { -- g_log (String_option_val(domain), Int_val(level), "%s", String_val(msg)); -+ g_log (String_val(domain), Int_val(level), "%s", String_val(msg)); - return Val_unit; - } - -diff --git src/ml_gtkstock.c src/ml_gtkstock.c -index 8723ed1..f506ae6 100644 ---- src/ml_gtkstock.c -+++ src/ml_gtkstock.c -@@ -139,6 +139,8 @@ CAMLprim value ml_gtk_stock_lookup(value id) - TESTANDCONS(MOD4); TESTANDCONS(MOD5); - TESTANDCONS(BUTTON1); TESTANDCONS(BUTTON2); TESTANDCONS(BUTTON3); - TESTANDCONS(BUTTON4); TESTANDCONS(BUTTON5); -+ TESTANDCONS(SUPER); TESTANDCONS(HYPER); -+ TESTANDCONS(META); TESTANDCONS(RELEASE); - stock_result = alloc_tuple(4); - Store_field(stock_result,0,Val_string(r.stock_id)); - Store_field(stock_result,1,Val_string(r.label)); Property changes on: head/x11-toolkits/ocaml-lablgtk2/files/patch-20130219 ___________________________________________________________________ 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/x11-toolkits/ocaml-lablgtk2/Makefile =================================================================== --- head/x11-toolkits/ocaml-lablgtk2/Makefile (revision 385412) +++ head/x11-toolkits/ocaml-lablgtk2/Makefile (revision 385413) @@ -1,146 +1,146 @@ # Created by: Rene Ladan # $FreeBSD$ PORTNAME= lablgtk2 -PORTVERSION= 2.16.0 -PORTREVISION= 2 +PORTVERSION= 2.18.3 CATEGORIES= x11-toolkits -MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/979/ \ +MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1479/ \ LOCAL/bf PKGNAMEPREFIX= ocaml- DISTNAME= lablgtk-${PORTVERSION} MAINTAINER= bf@FreeBSD.org COMMENT= Objective Caml interface to GTK+ 2.x LICENSE= LGPL21 USES= gmake pkgconfig USE_GNOME= gtk20 USE_OCAML= yes USE_OCAML_FINDLIB= yes USE_OCAMLFIND_PLIST= yes +USE_OCAML_CAMLP4= yes USE_OCAML_LDCONFIG= yes USE_OCAML_WASH= yes OPTIONS_DEFINE= GLADE GNOMECANVAS GNOMEUI GTKGLAREA GTKSOURCEVIEW2 \ GTKSPELL LIBRSVG2 DOCS EXAMPLES OPTIONS_DEFAULT= GLADE GNOMECANVAS GNOMEUI GTKGLAREA GTKSOURCEVIEW2 \ GTKSPELL LIBRSVG2 GNOMECANVAS_DESC= GnomeCanvas support GNOMEUI_DESC= GNOME 2 UI support GTKGLAREA_DESC= GtkGLArea support GTKSOURCEVIEW2_DESC= GtkSourceView 2 support GTKSPELL_DESC= GtkSpell support #GNOMEPANEL_DESC= GNOME Panel support HAS_CONFIGURE= yes ALL_TARGET= all opt MAKE_JOBS_UNSAFE= yes CONFIGURE_ARGS= --prefix=${PREFIX} --with-libdir=${PREFIX}/${OCAML_LIBDIR} \ --without-gtksourceview CONFIGURE_ENV= CAMLP4O="camlp4 pa_o.cmo pa_op.cmo pr_dump.cmo" PATTERN= [[:space:]]*(do|then)?[[:space:]]*)cp([[:space:]] .include .if ${PORT_OPTIONS:MDOCS} DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME} PORTDOCS= COPYING README .endif .if ${PORT_OPTIONS:MEXAMPLES} EXAMPLESDIR= ${OCAML_EXAMPLESDIR}/${PORTNAME} PORTEXAMPLES= * .endif .if ${PORT_OPTIONS:MGTKGLAREA} CONFIGURE_ARGS+= --with-gl BUILD_DEPENDS+= lablgl:${PORTSDIR}/graphics/ocaml-lablgl RUN_DEPENDS+= lablgl:${PORTSDIR}/graphics/ocaml-lablgl LIB_DEPENDS+= libgtkgl-2.0.so:${PORTSDIR}/x11-toolkits/gtkglarea2 EXAMPLES_SUBDIRS+= GL .else CONFIGURE_ARGS+= --without-gl .endif .if ${PORT_OPTIONS:MGLADE} CONFIGURE_ARGS+= --with-glade USE_GNOME+= libglade2 PLIST_SUB+= GLADE="" EXAMPLES_SUBDIRS+= glade .else CONFIGURE_ARGS+= --without-glade PLIST_SUB+= GLADE="@comment " .endif .if ${PORT_OPTIONS:MGNOMEUI} CONFIGURE_ARGS+= --with-gnomeui USE_GNOME+= libgnomeui .else CONFIGURE_ARGS+= --without-gnomeui .endif .if ${PORT_OPTIONS:MGNOMECANVAS} CONFIGURE_ARGS+= --with-gnomecanvas USE_GNOME+= libgnomecanvas EXAMPLES_SUBDIRS+= canvas .else CONFIGURE_ARGS+= --without-gnomecanvas .endif .if ${PORT_OPTIONS:MLIBRSVG2} CONFIGURE_ARGS+= --with-rsvg USE_GNOME+= librsvg2 EXAMPLES_SUBDIRS+= rsvg .else CONFIGURE_ARGS+= --without-rsvg .endif #.if ${PORT_OPTIONS:MGNOMEPANEL} #CONFIGURE_ARGS+= --with-panel #USE_GNOME+= gnomepanel #EXAMPLES_SUBDIRS+= panel #.else CONFIGURE_ARGS+= --without-panel #.endif .if ${PORT_OPTIONS:MGTKSOURCEVIEW2} CONFIGURE_ARGS+= --with-gtksourceview2 USE_GNOME+= gtksourceview2 EXAMPLES_SUBDIRS+= sourceview .else CONFIGURE_ARGS+= --without-gtksourceview2 .endif .if ${PORT_OPTIONS:MGTKSPELL} LIB_DEPENDS+= libgtkspell.so:${PORTSDIR}/textproc/gtkspell CONFIGURE_ARGS+= --with-gtkspell .else CONFIGURE_ARGS+= --without-gtkspell .endif post-patch: @${REINPLACE_CMD} -E \ -e 's|^(CFLAGS[[:space:]]*\+=[[:space:]]*-O)|\1 ${CFLAGS}|' \ -e 's,^(${PATTERN}+.*INSTALLDIR),\1\$${BSD_INSTALL_DATA} \3,' \ -e 's,^(${PATTERN}+.*BINDIR),\1\$${BSD_INSTALL_SCRIPT} \3,' \ -e 's,^(${PATTERN}+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \3,' \ -e 's,(touch)( "\$$\(DESTDIR\)\$$\(OCAMLLDCONF\)"),${TRUE}\2,' \ -e 's,(-ldconf )("\$$\(DESTDIR\)\$$\(OCAMLLDCONF\)"),\1ignore,' \ ${WRKSRC}/src/Makefile post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} .if ${PORT_OPTIONS:MDOCS} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .endif @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} @cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \ "*.ml *.png *.rgb *.xpm text ${EXAMPLES_SUBDIRS}" \ ${STAGEDIR}${EXAMPLESDIR} .include Index: head/x11-toolkits/ocaml-lablgtk2/distinfo =================================================================== --- head/x11-toolkits/ocaml-lablgtk2/distinfo (revision 385412) +++ head/x11-toolkits/ocaml-lablgtk2/distinfo (revision 385413) @@ -1,2 +1,2 @@ -SHA256 (lablgtk-2.16.0.tar.gz) = a0ea9752eb257dadcfc2914408fff339d4c34357802f02c63329dd41b777de2f -SIZE (lablgtk-2.16.0.tar.gz) = 787217 +SHA256 (lablgtk-2.18.3.tar.gz) = 975bebf2f9ca74dc3bf7431ebb640ff6a924bb80c8ee5f4467c475a7e4b0cbaf +SIZE (lablgtk-2.18.3.tar.gz) = 788177