- Update to version 1.0.0

- Update CocoaLib dependency version to 9950
- Use the PORTDOCS and PORTDATA macros in Makefile
- Trim Makefile header, define LICENSE (GPLv3)
- Perform miscellaneous cleanups while I am at it

PR:		ports/175143
Submitted by:	maintainer

math/giacxcas/Makefile

@@ -1,24 +1,22 @@
-# New ports collection makefile for:	giacxcas
-# Date created:		2010-08-26
-# Whom:			Frederic Han <han@math.jussieu.fr>
-#
+# Created by: Frederic Han <han@math.jussieu.fr>
 # $FreeBSD$
-#
 
 PORTNAME=	giacxcas
-PORTVERSION=	0.9.8
+PORTVERSION=	1.0.0
 CATEGORIES=	math
 MASTER_SITES=	http://www-fourier.ujf-grenoble.fr/~parisse/giac/freebsd/ \
 		http://people.math.jussieu.fr/~han/xcas/sources/
-DISTFILES=	fltkdev.tgz CoCoALib.tgz giac-${PORTVERSION}.tar.gz
+DISTFILES=	fltk-giac.tar.gz CoCoALib-0.9950.tgz giac-${PORTVERSION}.tar.gz
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	han@math.jussieu.fr
 COMMENT=	Computer algebra system by Bernard Parisse
 
+LICENSE=	GPLv3
+
 BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
 		dvips:${PORTSDIR}/print/dvipsk-tetex \
-		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
+		bash:${PORTSDIR}/shells/bash \
 		${LOCALBASE}/lib/libntl.a:${PORTSDIR}/math/ntl
 LIB_DEPENDS=	gmp:${PORTSDIR}/math/gmp \
 		pari:${PORTSDIR}/math/pari \
@@ -26,7 +24,7 @@ LIB_DEPENDS=	gmp:${PORTSDIR}/math/gmp \
 		gsl:${PORTSDIR}/math/gsl \
 		lapack:${PORTSDIR}/math/lapack
 
-NO_CDROM=	The french documentation is for non commercial only use
+NO_CDROM=	French documentation is for non-commercial use only
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -36,20 +34,25 @@ USE_LDCONFIG=	yes
 USE_GETTEXT=	yes
 MAKE_JOBS_SAFE=	yes
 
+DOCSDIR=	${PREFIX}/share/doc/giac
+PORTDOCS=	*
+DATADIR=	${PREFIX}/share/giac
+PORTDATA=	*
+
 CPPFLAGS+=	-I${FLTKDEV-GIAC} -I${COCOALIB-GIAC}/include -I${LOCALBASE}/include
 LDFLAGS+=	-L${FLTKDEV-GIAC}/lib -L${COCOALIB-GIAC}/lib -L${LOCALBASE}/lib
 CXXFLAGS+=	-I${LOCALBASE}/include
 
 WRKSRC=		${WRKDIR}/giac-${PORTVERSION}
-FLTKDEV-GIAC=	${WRKDIR}/fltk-1.3.x-r6916
-COCOALIB-GIAC=	${WRKDIR}/CoCoALib-0.9937
+FLTKDEV-GIAC=	${WRKDIR}/fltk-1.3.0
+COCOALIB-GIAC=	${WRKDIR}/CoCoALib-0.9950
 
 INFO=		giac_es giac_us
 
 post-patch:
-	${REINPLACE_CMD} -e 's|make |${GMAKE} |g' `${GREP} -Rl 'make ' ${COCOALIB-GIAC}`;
-	${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|g' `${GREP} -Rl '/bin/bash' ${COCOALIB-GIAC}`;
-	${REINPLACE_CMD} -e 's|/usr/bin|${LOCALBASE}/bin|' \
+	@${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
 
 pre-configure:

math/giacxcas/distinfo

@@ -1,6 +1,6 @@
-SHA256 (giacxcas/fltkdev.tgz) = db32f8259a09ca9e94535cfefdc012fc70ecb86784a646be5baf1089be14c648
-SIZE (giacxcas/fltkdev.tgz) = 6391860
-SHA256 (giacxcas/CoCoALib.tgz) = 501048b46125e730c24b9733eb180531461bd9a045a6e3a640e9aae512ce0293
-SIZE (giacxcas/CoCoALib.tgz) = 1580875
-SHA256 (giacxcas/giac-0.9.8.tar.gz) = 33c88f8ca6c3ad330a6ff53b0bf591a32094b94f3b1d122c3a6f5d1557589423
-SIZE (giacxcas/giac-0.9.8.tar.gz) = 26962579
+SHA256 (giacxcas/fltk-giac.tar.gz) = 538243c536a62e562bc26dec1c54454f54ce614cc540371f5ccfe71d8ed27cf7
+SIZE (giacxcas/fltk-giac.tar.gz) = 4776876
+SHA256 (giacxcas/CoCoALib-0.9950.tgz) = b30d840593e1930c1629467918b508c429e0a983ef0d1343eab570f238275678
+SIZE (giacxcas/CoCoALib-0.9950.tgz) = 4120680
+SHA256 (giacxcas/giac-1.0.0.tar.gz) = 35bc4a366ad26a0ff8f96d728f625b4f7070fa8b64976c1b82d1392bd78be67b
+SIZE (giacxcas/giac-1.0.0.tar.gz) = 32735131

math/giacxcas/pkg-descr

@@ -1,13 +1,13 @@
-General purpose Computer algebra system by Bernard Parisse released
-under GPLv3. The french documentation by Renee De Graeve is for non
-commercial use only.
-it consists of:
+General purpose computer algebra system by Bernard Parisse released under
+GPLv3.  French documentation by Renee De Graeve is for non-commercial use
+only.  The package consists of:
+
  - a C++ library (libgiac).  It is build on C and C++ libraries:
    PARI, NTL (arithmetic), CoCoA (Groebner basis), GSL (numerics),
    GMP (big integers), MPFR (bigfloats) and provides algorithms for
    basic polynomial operations (product, GCD) and symbolic
    computations (simplifications, limits/series, symbolic
-   integration, sommation, ...). The library can be configured to
+   integration, summation, ...). The library can be configured to
    accept Maple or TI syntax to ease the transition for users of
    these systems.
  - a command line interpreter (icas or giac). It can be called from texmacs.
@@ -18,7 +18,7 @@ it consists of:
 
 Bernard Parisse is the main author of the CAS of HP40G and HP49G calculators.
 
-This port is statically linked against snapshots of FLTK-1.3.x 
+This port is statically linked against snapshots of FLTK-1.3.x
 (http://www.fltk.org) and of CoCoALib (http://cocoa.dima.unige.it/cocoalib)
 
-WWW:	http://www-fourier.ujf-grenoble.fr/~parisse/giac.html
+WWW: http://www-fourier.ujf-grenoble.fr/~parisse/giac.html