From owner-svn-ports-head@freebsd.org Fri May 15 10:19:26 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 52D9D2F1206; Fri, 15 May 2020 10:19:26 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49Nksp1L8kz4d7k; Fri, 15 May 2020 10:19:26 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2492022A02; Fri, 15 May 2020 10:19:26 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04FAJPDF087495; Fri, 15 May 2020 10:19:25 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04FAJPlg087494; Fri, 15 May 2020 10:19:25 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <202005151019.04FAJPlg087494@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: thierry set sender to thierry@FreeBSD.org using -f From: Thierry Thomas Date: Fri, 15 May 2020 10:19:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r535281 - head/math/giacxcas X-SVN-Group: ports-head X-SVN-Commit-Author: thierry X-SVN-Commit-Paths: head/math/giacxcas X-SVN-Commit-Revision: 535281 X-SVN-Commit-Repository: ports 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.33 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: Fri, 15 May 2020 10:19:26 -0000 Author: thierry Date: Fri May 15 10:19:25 2020 New Revision: 535281 URL: https://svnweb.freebsd.org/changeset/ports/535281 Log: - Fix an initial problem encountered with libgiac: it could not be linked with other libraries. + several other fixes and improvments for math/giacxcas: - do not link cocoalib with the static libgmp (other binaries are linked against the dynamic one) - fixes Fl::set_fonts for some badly registered fonts - remove USE_GCC: a runtime has been done and it seems OK - add USES=localbase to simplify the flags - add 2 missing libraries (libecm and libmpf): unless explicitely disabled they are used - Makefiles had been patched to install the in-line docs under $docdir => make programs and files coherent with that - add a TEST_TARGET: all tests but 2 pass - add USE_PERL5=run, because pgiac is a Perl script. PR: 246049 Submitted by: /me Approved by: yuri@ (maintainer) Modified: head/math/giacxcas/Makefile Modified: head/math/giacxcas/Makefile ============================================================================== --- head/math/giacxcas/Makefile Fri May 15 09:32:43 2020 (r535280) +++ head/math/giacxcas/Makefile Fri May 15 10:19:25 2020 (r535281) @@ -3,6 +3,7 @@ PORTNAME= giacxcas DISTVERSION= 1.5.0-87 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= http://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/:giac \ http://cocoa.dima.unige.it/cocoalib/tgz/:cocoa \ @@ -25,7 +26,9 @@ LIB_DEPENDS= libao.so:audio/libao \ libgsl.so:math/gsl \ libglpk.so:math/glpk \ libgmp.so:math/gmp \ + libecm.so:math/gmp-ecm \ libmpfr.so:math/mpfr \ + libmpfi.so:math/mpfi \ libpari.so:math/pari \ libpng.so:graphics/png \ libsamplerate.so:audio/libsamplerate @@ -34,14 +37,15 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils NO_CDROM= French documentation is for non-commercial use only USES= blaslapack desktop-file-utils fortran gettext gl gmake gnome jpeg \ - libtool ncurses readline shebangfix xorg + libtool localbase ncurses perl5 readline shebangfix xorg GNU_CONFIGURE= yes USE_GL= gl USE_XORG= x11 xcursor xext xft xi xinerama USE_TEX= latex:build dvipsk:build +USE_PERL5= run USE_LDCONFIG= yes # Warning: don't remove the USE_GCC without a runtime test *after* make install -USE_GCC= yes +#USE_GCC= yes CONFIGURE_ENV= ac_cv_lib_X11_main=yes \ ac_cv_lib_cocoa_main=yes \ ac_cv_lib_fltk_gl_main=yes \ @@ -54,17 +58,16 @@ INSTALLS_ICONS= yes COCOA_LIB_VERSION= 0.99700 -CXXFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${COCOALIB-GIAC}/include \ -I${FLTKDEV-GIAC} \ - -I${LOCALBASE}/include + -Wno-narrowing LDFLAGS+= -L${COCOALIB-GIAC}/lib \ - -L${FLTKDEV-GIAC}/lib \ - -L${LOCALBASE}/lib + -L${FLTKDEV-GIAC}/lib WRKSRC= ${WRKDIR}/giac-${DISTVERSION:C/-[0-9]*//} FLTKDEV-GIAC= ${WRKDIR}/fltk-1.3.0 COCOALIB-GIAC= ${WRKDIR}/CoCoALib-${COCOA_LIB_VERSION} +TEST_TARGET= check DATADIR= ${PREFIX}/share/giac DOCSDIR= ${PREFIX}/share/doc/giac @@ -102,10 +105,23 @@ post-patch: 's|\($$(MAKE) \)-s |\1|; s|\([[:blank:]]\)@|\1|' @${REINPLACE_CMD} -e '/.SILENT:/s|^|#|' \ ${FLTKDEV-GIAC}/makeinclude.in + ${SED} -i ".orig" -Ee 's|char \*last = style \+ strlen\(style\) - 2|char *last = pretty|' \ + -Ee 's|\*style = 0|last = style + strnlen(style, ENDOFBUFFER) - 2; *style = 0|' \ + ${FLTKDEV-GIAC}/src/fl_set_fonts_xft.cxx pre-configure: + ${REINPLACE_CMD} -e 's|/usr/lib /usr/lib64 /usr/lib32 /usr/local /opt/local/lib /sw/lib /usr/sfw/lib|${LOCALBASE}/lib|' \ + -e '/libgmp.a/s|find|#find|' \ + -e 's|-name libgmp.so|-type f -name "libgmp.so.*"|' \ + ${COCOALIB-GIAC}/configuration/gmp-find.sh + ${REINPLACE_CMD} -e 's|^protected:|public:|' ${FLTKDEV-GIAC}/FL/Fl_Widget.H +.for f in icas.cc path.h + ${REINPLACE_CMD} -e 's|/usr/local/share/giac/doc|${DOCSDIR}|' \ + ${WRKSRC}/src/${f} +.endfor + ${FIND} ${WRKSRC}/doc -type f | ${XARGS} ${GREP} -l 'share/giac/doc' | \ + ${XARGS} ${REINPLACE_CMD} -e 's|/usr/local/share/giac/doc|${DOCSDIR}|' @(cd ${COCOALIB-GIAC} && ${SETENV} ${CONFIGURE_ENV} ./configure \ - --with-libgmp=${LOCALBASE}/lib/libgmp.a \ --with-cxx="${CXX}") @(cd ${FLTKDEV-GIAC} && ${SETENV} ${CONFIGURE_ENV} ./configure \ --prefix=${FLTKDEV-GIAC} \