diff -ruN giacxcas/Makefile giacxcas.new/Makefile --- giacxcas/Makefile 2013-09-20 22:55:04.000000000 +0200 +++ giacxcas.new/Makefile 2013-09-26 23:01:22.000000000 +0200 @@ -1,8 +1,9 @@ # Created by: Frederic Han -# $FreeBSD: math/giacxcas/Makefile 327746 2013-09-20 20:55:04Z bapt $ +# $FreeBSD: math/giacxcas/Makefile 326854 2013-09-10 01:23:13Z wg $ PORTNAME= giacxcas PORTVERSION= 1.1.0 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= http://www-fourier.ujf-grenoble.fr/~parisse/giac/freebsd/ \ http://www.math.jussieu.fr/~han/xcas/sources/ @@ -17,6 +18,8 @@ BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \ ${LOCALBASE}/lib/libntl.a:${PORTSDIR}/math/ntl LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp \ + libpng.so:${PORTSDIR}/graphics/png \ + libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpari.so:${PORTSDIR}/math/pari \ libmpfr.so:${PORTSDIR}/math/mpfr \ libgsl.so:${PORTSDIR}/math/gsl \ @@ -30,7 +33,7 @@ USE_TEX= latex:build dvipsk:build USE_LDCONFIG= yes USES= gettext gmake - +USE_GCC= yes DOCSDIR= ${PREFIX}/share/doc/giac PORTDOCS= * DATADIR= ${PREFIX}/share/giac @@ -47,18 +50,28 @@ INFO= giac_es giac_us NO_STAGE= yes + +.include +.if ${OSVERSION} >= 1000000 +CONFIGURE_ARGS+= --disable-ntl +.endif + post-patch: @${GREP} -Rl --null /bin/bash ${COCOALIB-GIAC} | ${XARGS} -0 \ ${REINPLACE_CMD} -e 's|/bin/bash|/usr/bin/env bash|' @${REINPLACE_CMD} -e 's|/usr/bin|${LOCALBASE}/bin|' \ ${WRKSRC}/xcas.applications ${WRKSRC}/xcas.desktop +.if ${OSVERSION} >= 1000000 + @${REINPLACE_CMD} -e 's|friend class Fl_Group;|friend class Fl_Group;friend class Fl_X;|' \ + ${FLTKDEV-GIAC}/FL/Fl_Widget.H +.endif pre-configure: cd ${COCOALIB-GIAC} && \ - ./configure --with-libgmp=${LOCALBASE}/lib/libgmp.a && \ + ./configure --with-libgmp=${LOCALBASE}/lib/libgmp.a --with-cxx=${CXX}&& \ ${GMAKE} library && \ cd ${FLTKDEV-GIAC} && \ ./configure --prefix=${FLTKDEV-GIAC} \ && ${MAKE} -.include +.include