Attachment 214503 Details for Bug 246049 – Various fixes for math/giacxcas

[patch] Various fixes for math/giacxcas

math_giacxcas.diff (text/plain), 3.04 KB, created by Thierry Thomas on 2020-05-14 21:18:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Thomas

Created: 2020-05-14 21:18:41 UTC

Size: 3.04 KB

patch

obsolete

>Index: math/giacxcas/Makefile
>===================================================================
>--- math/giacxcas/Makefile	(revision 535006)
>+++ math/giacxcas/Makefile	(working copy)
>@@ -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 @@
> 		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 @@
> 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 @@
> 
> 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 @@
> 		'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} \

Actions: View | Diff

Attachments on bug 246049: 213939 | 214503 | 214504