From owner-svn-ports-head@FreeBSD.ORG Sun Feb 2 22:31:11 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BC0405C8; Sun, 2 Feb 2014 22:31:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8E5F51675; Sun, 2 Feb 2014 22:31:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s12MVB8C002452; Sun, 2 Feb 2014 22:31:11 GMT (envelope-from matthew@svn.freebsd.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s12MVB5x002451; Sun, 2 Feb 2014 22:31:11 GMT (envelope-from matthew@svn.freebsd.org) Message-Id: <201402022231.s12MVB5x002451@svn.freebsd.org> From: Matthew Seaman Date: Sun, 2 Feb 2014 22:31:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r342370 - head/math/giacxcas X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Feb 2014 22:31:11 -0000 Author: matthew Date: Sun Feb 2 22:31:11 2014 New Revision: 342370 URL: http://svnweb.freebsd.org/changeset/ports/342370 QAT: https://qat.redports.org/buildarchive/r342370/ Log: Fix build on 10.x While here: * Stagify * stage-qa fixes: USE shebangfix desktop-file-utils PR: 182431 Submitted by: Han Frederic (maintainer) Modified: head/math/giacxcas/Makefile Modified: head/math/giacxcas/Makefile ============================================================================== --- head/math/giacxcas/Makefile Sun Feb 2 22:20:34 2014 (r342369) +++ head/math/giacxcas/Makefile Sun Feb 2 22:31:11 2014 (r342370) @@ -3,7 +3,7 @@ PORTNAME= giacxcas PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= http://www-fourier.ujf-grenoble.fr/~parisse/giac/freebsd/ \ http://www.math.jussieu.fr/~han/xcas/sources/ @@ -18,6 +18,8 @@ LICENSE= GPLv3 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,12 +32,13 @@ USE_GL= gl USE_XORG= xcursor xft xi USE_TEX= latex:build dvipsk:build USE_LDCONFIG= yes -USES= gettext gmake - +USES= gettext gmake shebangfix desktop-file-utils +USE_GCC= yes DOCSDIR= ${PREFIX}/share/doc/giac PORTDOCS= * DATADIR= ${PREFIX}/share/giac PORTDATA= * +SHEBANG_FILES= src/pgiac CPPFLAGS+= -I${FLTKDEV-GIAC} -I${COCOALIB-GIAC}/include -I${LOCALBASE}/include LDFLAGS+= -L${FLTKDEV-GIAC}/lib -L${COCOALIB-GIAC}/lib -L${LOCALBASE}/lib @@ -47,19 +50,27 @@ COCOALIB-GIAC= ${WRKDIR}/CoCoALib-0.9950 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