ports/172245: math/grace: Update to version 5.1.23

KATO Tsuguru tkato432 at yahoo.com
Mon Oct 1 18:10:14 UTC 2012 

>Number:         172245
>Category:       ports
>Synopsis:       math/grace: Update to version 5.1.23
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 01 18:10:13 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Update to version 5.1.23

Remove file:
files/patch-src-motifutils.c
files/patch-src-rstdev.c

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/math/grace/Makefile math/grace/Makefile
--- /usr/ports/math/grace/Makefile	2012-06-01 14:21:36.000000000 +0900
+++ math/grace/Makefile	2012-10-02 00:54:33.000000000 +0900
@@ -1,13 +1,8 @@
-# New ports collection makefile for: grace
-# Date created:		Dec 28 1998
-# Whom:			Lars K_ller <Lars.Koeller at Uni-Bielefeld.de>
-#
+# Created by: Lars K_ller <Lars.Koeller at Uni-Bielefeld.de>
 # $FreeBSD: ports/math/grace/Makefile,v 1.66 2012/06/01 05:21:36 dinoex Exp $
-#
 
 PORTNAME=	grace
-PORTVERSION=	5.1.22
-PORTREVISION=	8
+PORTVERSION=	5.1.23
 CATEGORIES=	math print
 #
 MASTER_SITES=	ftp://plasma-gate.weizmann.ac.il/pub/grace/src/stable/ \
@@ -20,15 +15,19 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A powerful plotting tool (successor of xmgr)
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	t1:${PORTSDIR}/devel/t1lib		\
-		jpeg.11:${PORTSDIR}/graphics/jpeg	\
+		jpeg:${PORTSDIR}/graphics/jpeg	\
 		png15:${PORTSDIR}/graphics/png		\
-		tiff.4:${PORTSDIR}/graphics/tiff	\
-		fftw.2:${PORTSDIR}/math/fftw		\
-		pdf.6:${PORTSDIR}/print/pdflib		\
-		netcdf.4:${PORTSDIR}/science/netcdf	\
-		Xbae.4:${PORTSDIR}/x11-toolkits/xbae	\
-		XmHTML.1:${PORTSDIR}/x11-toolkits/xmhtml
+		tiff:${PORTSDIR}/graphics/tiff	\
+		fftw:${PORTSDIR}/math/fftw		\
+		pdf:${PORTSDIR}/print/pdflib		\
+		netcdf:${PORTSDIR}/science/netcdf	\
+		Xbae:${PORTSDIR}/x11-toolkits/xbae	\
+		XmHTML:${PORTSDIR}/x11-toolkits/xmhtml
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 USE_MOTIF=	yes
 USE_GMAKE=	yes
@@ -38,11 +37,14 @@
 		--with-extra-ldpath=${LOCALBASE}/lib \
 		--without-bundled-xbae
 ALL_TARGET=	# empty
+MAKE_JOBS_SAFE=	yes
 
 MAN1=		convcal.1 grace.1 grconvert.1
 MLINKS=		grace.1 gracebat.1 \
 		grace.1 xmgrace.1
 
+.include <bsd.port.options.mk>
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/xmgrace ${PREFIX}/bin
 	@${LN} -sf xmgrace ${PREFIX}/bin/grace
@@ -69,7 +71,7 @@
 	${INSTALL_DATA} ${WRKSRC}/fonts/type1/*.pfb ${DATADIR}/fonts/type1
 	@${MKDIR} ${DATADIR}/templates
 	${INSTALL_DATA} ${WRKSRC}/templates/*.agr ${DATADIR}/templates
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${TAR} -C ${WRKSRC}/doc --exclude "*Makefile*" --exclude "*.1" \
 		-cf - . | ${TAR} -C ${DOCSDIR} --unlink -xf -
@@ -77,7 +79,7 @@
 	@${FIND} ${DOCSDIR} -type f -exec ${CHMOD} ${SHAREMODE} {} \;
 	@${LN} -sf ${DOCSDIR} ${DATADIR}/doc
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	@${TAR} -C ${WRKSRC}/examples --exclude "*Makefile*" \
 		-cf - . | ${TAR} -C ${EXAMPLESDIR} --unlink -xf -
diff -urN /usr/ports/math/grace/distinfo math/grace/distinfo
--- /usr/ports/math/grace/distinfo	2011-03-20 21:50:08.000000000 +0900
+++ math/grace/distinfo	2012-10-02 01:03:09.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (grace-5.1.22.tar.gz) = 4ce8f058b6c1267a842419a3edbf471421dea9cf5744783745b6cb375cdf5f25
-SIZE (grace-5.1.22.tar.gz) = 2516576
+SHA256 (grace-5.1.23.tar.gz) = 69527950fd9c056a76b7a6bf4ac37a9b87acc565c12a941ffae3c9c5a822ca10
+SIZE (grace-5.1.23.tar.gz) = 2501364
diff -urN /usr/ports/math/grace/files/patch-src-motifutils.c math/grace/files/patch-src-motifutils.c
--- /usr/ports/math/grace/files/patch-src-motifutils.c	2010-06-06 04:29:56.000000000 +0900
+++ math/grace/files/patch-src-motifutils.c	1970-01-01 09:00:00.000000000 +0900
@@ -1,39 +0,0 @@
-
---- src/motifutils.c.orig	2010-03-15 20:05:12.742336241 -0700
-+++ src/motifutils.c	2010-03-15 20:12:53.885346709 -0700
-@@ -118,7 +118,6 @@
- 
- extern unsigned long xvlibcolors[];
- 
--
- static OptionItem *color_option_items = NULL;
- static int ncolor_option_items = 0;
- static OptionStructure **color_selectors = NULL;
-@@ -1621,6 +1620,12 @@
-     graph_popup_menu = xmalloc(sizeof(GraphPopupMenu));
- 
-     popup = XmCreatePopupMenu(listp->list, "graphPopupMenu", NULL, 0);
-+#if XmVersion >= 2000
-+    XtVaSetValues(popup, XmNpopupEnabled, XmPOPUP_DISABLED, NULL);
-+    XtUngrabButton(listp->list, AnyButton, AnyModifier);
-+#else
-+    XtVaSetValues(popup, XmNpopupEnabled, False, NULL);
-+#endif
-     graph_popup_menu->popup = popup;
-     
-     graph_popup_menu->label_item = CreateMenuLabel(popup, "Selection:");
-@@ -2243,6 +2248,12 @@
-     
-     set_popup_menu = xmalloc(sizeof(SetPopupMenu));
-     popup = XmCreatePopupMenu(listp->list, "setPopupMenu", NULL, 0);
-+#if XmVersion >= 2000
-+    XtVaSetValues(popup, XmNpopupEnabled, XmPOPUP_DISABLED, NULL);
-+    XtUngrabButton(listp->list, AnyButton, AnyModifier);
-+#else
-+    XtVaSetValues(popup, XmNpopupEnabled, False, NULL);
-+#endif
-     set_popup_menu->popup = popup;
-     
-     set_popup_menu->label_item = CreateMenuLabel(popup, "Selection:");
-
-
diff -urN /usr/ports/math/grace/files/patch-src-rstdrv.c math/grace/files/patch-src-rstdrv.c
--- /usr/ports/math/grace/files/patch-src-rstdrv.c	2012-06-01 14:21:36.000000000 +0900
+++ math/grace/files/patch-src-rstdrv.c	1970-01-01 09:00:00.000000000 +0900
@@ -1,19 +0,0 @@
---- src/rstdrv.c.orig	2004-07-03 22:47:46.000000000 +0200
-+++ src/rstdrv.c	2012-04-27 20:54:10.000000000 +0200
-@@ -54,6 +54,7 @@
- 
- #ifdef HAVE_LIBPNG
- #  include <png.h>
-+#  include <zlib.h>
- #endif
- 
- #ifndef NONE_GUI
-@@ -885,7 +886,7 @@
-         return;
-     }
- 
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
-         png_destroy_write_struct(&png_ptr, &info_ptr);
-         return;
-     }
diff -urN /usr/ports/math/grace/pkg-descr math/grace/pkg-descr
--- /usr/ports/math/grace/pkg-descr	2004-04-16 03:09:15.000000000 +0900
+++ math/grace/pkg-descr	2012-10-02 00:55:56.000000000 +0900
@@ -1,16 +1,18 @@
 Grace is a WYSIWYG 2D plotting tool for the X Window System and M*tif,
 successor of ACE/gr (Xmgr). A few of its features are:
 
-    * User defined scaling, tick marks, labels, symbols, line styles, colors.
+    * User defined scaling, tick marks, labels, symbols, line styles,
+	colors.
     * Batch mode for unattended plotting.
     * Read and write parameters used during a session.
     * Polynomial regression, splines, running averages, DFT/FFT,
 	cross/auto-correlation.
-    * Exports high-resolution graphics to (E)PS, PDF, MIF, and SVG formats
+    * Exports high-resolution graphics to (E)PS, PDF, MIF, and SVG
+	formats
     * Supports cross-platform PNM, JPEG and PNG formats
 
-While grace has a convenient point-and-click interface, most parameter settings
-and operations are available through a command line interface (found in
-Data/Commands).
+While grace has a convenient point-and-click interface, most parameter
+settings and operations are available through a command line interface
+(found in Data/Commands).
 
 WWW: http://plasma-gate.weizmann.ac.il/Grace/ 
>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list