Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 8 Dec 2012 06:13:56 +0000 (UTC)
From:      Beech Rintoul <beech@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r308462 - head/math/grace
Message-ID:  <201212080613.qB86DuEi081622@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: beech
Date: Sat Dec  8 06:13:55 2012
New Revision: 308462
URL: http://svnweb.freebsd.org/changeset/ports/308462

Log:
  - Update MASTER_SITES
  - Fix LIB_DEPENDS
  - Add option for XmHTML support
  
  Feature safe: yes
  
  PR:		ports/174177
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Modified:
  head/math/grace/Makefile

Modified: head/math/grace/Makefile
==============================================================================
--- head/math/grace/Makefile	Sat Dec  8 04:04:47 2012	(r308461)
+++ head/math/grace/Makefile	Sat Dec  8 06:13:55 2012	(r308462)
@@ -5,11 +5,10 @@ PORTNAME=	grace
 PORTVERSION=	5.1.23
 PORTREVISION=	1
 CATEGORIES=	math print
-#
-MASTER_SITES=	ftp://plasma-gate.weizmann.ac.il/pub/grace/src/stable/ \
-		ftp://ftp.fu-berlin.de/unix/graphics/grace/src/stable/ \
+MASTER_SITES=	ftp://ftp.fu-berlin.de/unix/graphics/grace/src/stable/ \
 		ftp://ftp.ntua.gr/pub/graphics/grace/src/stable/ \
-		ftp://ftp.u-aizu.ac.jp/pub/SciEng/math/grace/src/stable/
+		ftp://ftp.u-aizu.ac.jp/pub/SciEng/math/grace/src/stable/ \
+		ftp://plasma-gate.weizmann.ac.il/pub/grace/src/stable/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Powerful 2D plotting tool (successor of xmgr)
@@ -19,10 +18,14 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	t1:${PORTSDIR}/devel/t1lib \
 		jpeg:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png \
-		Xbae:${PORTSDIR}/x11-toolkits/xbae \
-		XmHTML:${PORTSDIR}/x11-toolkits/xmhtml
+		Xbae:${PORTSDIR}/x11-toolkits/xbae
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 
+OPTIONS_DEFINE=	FFTW NETCDF PDF XMHTML DOCS EXAMPLES
+OPTIONS_DEFAULT=FFTW NETCDF PDF XMHTML
+PDF_DESC=	PDF output
+XMHTML_DESC=	Use XmHTML widget for on-line help
+
 USE_MOTIF=	yes
 USE_GCC=	any
 USE_GMAKE=	yes
@@ -39,10 +42,6 @@ MAN1=		convcal.1 grace.1 grconvert.1
 MLINKS=		grace.1 gracebat.1 \
 		grace.1 xmgrace.1
 
-OPTIONS_DEFINE=	FFTW NETCDF PDF DOCS EXAMPLES
-OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
-PDF_DESC=	PDF output
-
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFFTW}
@@ -66,6 +65,13 @@ CONFIGURE_ARGS+=	--enable-pdfdrv
 CONFIGURE_ARGS+=	--disable-pdfdrv
 .endif
 
+.if ${PORT_OPTIONS:MXMHTML}
+LIB_DEPENDS+=	XmHTML:${PORTSDIR}/x11-toolkits/xmhtml
+CONFIGURE_ARGS+=	--enable-xmhtml
+.else
+CONFIGURE_ARGS+=	--disable-xmhtml
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/xmgrace ${PREFIX}/bin
 	@${LN} -sf xmgrace ${PREFIX}/bin/grace



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212080613.qB86DuEi081622>