Index: head/math/ocaml-zarith/Makefile =================================================================== --- head/math/ocaml-zarith/Makefile (revision 432804) +++ head/math/ocaml-zarith/Makefile (revision 432805) @@ -1,45 +1,43 @@ # Created by: John Marino # $FreeBSD$ PORTNAME= zarith PORTVERSION= 1.2.1 CATEGORIES= math MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1199/ PKGNAMEPREFIX= ocaml- MAINTAINER= ports@FreeBSD.org COMMENT= OCaml arithmetic library for arbitrary precision integers LICENSE= LGPL20 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= does not build - LIB_DEPENDS= libgmp.so:math/gmp USES= gmake perl5 shebangfix tar:tgz USE_PERL5= build USE_OCAML= yes USE_OCAML_FINDLIB= yes OCAMLFIND_LDCONF= /dev/null HAS_CONFIGURE= yes ALL_TARGET= all SHEBANG_FILES= z_pp.pl CONFIGURE_ENV= DESTDIR=${STAGEDIR} CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE= yes PORTDOCS= html DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME} OPTIONS_DEFINE= DOCS DOCS_ALL_TARGET=doc post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${MV} ${WRKSRC}/html ${STAGEDIR}${DOCSDIR} .include Index: head/math/ocaml-zarith/files/patch-configure =================================================================== --- head/math/ocaml-zarith/files/patch-configure (revision 432804) +++ head/math/ocaml-zarith/files/patch-configure (revision 432805) @@ -1,37 +1,46 @@ --- configure.orig 2013-06-12 07:13:59 UTC +++ configure @@ -127,6 +127,10 @@ searchbin() { if test "x$1" = "x"; then return 0; fi echo_n "binary $1: " + if test -x "$1"; then + echo "found" + return 1 + fi IFS=':' for i in $PATH do +@@ -258,7 +262,7 @@ searchbin ocamlfind + if test $? -eq 1 -a $ocamlfind != "no"; then + instmeth='findlib' + if test "$installdir" = "auto" +- then installdir=`ocamlfind printconf destdir`; fi ++ then installdir=`ocamlfind printconf destdir | sed 's/:.*//'`; fi + else + searchbin install + if test $? -eq 1; then instmeth='install' @@ -304,6 +308,14 @@ case $host in arch='i686' fi ;; + i386-*freebsd* | i386-*dragonfly*) + ccdef="-DZ_ELF -DZ_DOT_LABEL_PREFIX $ccdef" + arch='i686' + ;; + amd64-*freebsd* | x86_64-*dragonfly*) + ccdef="-DZ_ELF -DZ_DOT_LABEL_PREFIX $ccdef" + arch='x86_64' + ;; i386-*darwin* | x86_64-*darwin*) ccdef="-DZ_UNDERSCORE_PREFIX -DZ_MACOS $ccdef" if test "x$wordsize" = "x64"; then @@ -401,7 +413,7 @@ CFLAGS=$ccinc $ccdef $ccopt ASFLAGS=$ccdef $asopt LIBS=$cclib ARCH=$arch -INSTALLDIR=$installdir +INSTALLDIR=${DESTDIR}$installdir AR=$ar INSTALL=install OCAMLFIND=ocamlfind