- Update to 5.1.24

PR:		193899
Submitted by:	tkato432@yahoo.com

5 files changed, 47 insertions, 58 deletions

diff --git a/math/grace/Makefile b/math/grace/Makefile
index 8e611f24de9f..8007b72abb13 100644
--- a/math/grace/Makefile
+++ b/math/grace/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	grace
-PORTVERSION=	5.1.23
-PORTREVISION=	6
+PORTVERSION=	5.1.24
 CATEGORIES=	math print
 MASTER_SITES=	ftp://ftp.fu-berlin.de/unix/graphics/grace/src/stable/ \
 		ftp://ftp.ntua.gr/pub/graphics/grace/src/stable/ \
@@ -21,7 +20,6 @@ LIB_DEPENDS=	libt1.so:${PORTSDIR}/devel/t1lib \
 		libXbae.so:${PORTSDIR}/x11-toolkits/xbae
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 
-USE_GCC=	any
 USES=		gmake motif
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-grace-home=${DATADIR} \
@@ -29,44 +27,53 @@ CONFIGURE_ARGS=	--enable-grace-home=${DATADIR} \
 		--with-extra-ldpath=${LOCALBASE}/lib \
 		--with-helpviewer="xdg-open %s" \
 		--without-bundled-xbae
-ALL_TARGET=	# empty
+MAKE_ARGS=	LINUXDOC="${TRUE}" PDFLATEX="${TRUE}"
 
-OPTIONS_DEFINE=	FFTW NETCDF PDF XMHTML DOCS EXAMPLES
-OPTIONS_DEFAULT=FFTW NETCDF PDF XMHTML
+DESKTOP_ENTRIES="XMgrace" "2D Plotting tool for scientific data" \
+		"${PREFIX}/share/pixmaps/mini-xmgr3.xpm" "xmgrace" \
+		 "" ""
+
+OPTIONS_DEFINE=		DOCS EXAMPLES FFTW NETCDF PDF XMHTML
+OPTIONS_DEFAULT=	FFTW NETCDF PDF XMHTML
 
 FFTW_CONFIGURE_WITH=	fftw
 FFTW_LIB_DEPENDS=	libfftw.so:${PORTSDIR}/math/fftw
-
-NETCDF_CONFIGURE_ENABLE=netcdf
+NETCDF_CONFIGURE_ENABLE=	netcdf
 NETCDF_LIB_DEPENDS=	libnetcdf.so:${PORTSDIR}/science/netcdf
-
 PDF_DESC=		PDF output
 PDF_CONFIGURE_ENABLE=	pdfdrv
 PDF_LIB_DEPENDS=	libpdf.so:${PORTSDIR}/print/pdflib
-
 XMHTML_DESC=		XmHTML based on-line help
-XMHTML_CONFIGURE_ENABLE=xmhtml
+XMHTML_CONFIGURE_ENABLE=	xmhtml
 XMHTML_LIB_DEPENDS=	libXmHTML.so:${PORTSDIR}/x11-toolkits/xmhtml
 
 post-configure:
-	@${REINPLACE_CMD} -e '/SCRIPTS/ s|INSTALL_PROGRAM|BSD_INSTALL_SCRIPT|' \
+	@${REINPLACE_CMD} -e \
+		'/SCRIPTS/s|INSTALL_PROGRAM|INSTALL_SCRIPT|' \
 		${WRKSRC}/auxiliary/Makefile
-	@${REINPLACE_CMD} -e '/cd /! s|$$(GRACE_HOME)/doc|${DOCSDIR}|' \
-		-e '/cd / s|$$(GRACE_HOME)/doc|$$(DESTDIR)$$(PREFIX)/man/man1|' \
-		-e '/^install/ s|$$(MANPAGES)||' \
+	@${REINPLACE_CMD} -e \
+		'/cd /!s|$$(GRACE_HOME)/doc|${DOCSDIR}| ; \
+		 /cd /s|$$(GRACE_HOME)/doc|$$(DESTDIR)$$(PREFIX)/man/man1| ; \
+		 /^install/s|$$(MANPAGES)||' \
 		${WRKSRC}/doc/Makefile
-	@${REINPLACE_CMD} -e 's|$$(GRACE_HOME)/examples|${EXAMPLESDIR}|' \
-		-e '/DOTEST/ s|INSTALL_PROGRAM|BSD_INSTALL_SCRIPT|' \
+	@${REINPLACE_CMD} -e \
+		's|$$(GRACE_HOME)/examples|${EXAMPLESDIR}| ; \
+		 /DOTEST/s|INSTALL_PROGRAM|INSTALL_SCRIPT|' \
 		${WRKSRC}/examples/Makefile
-	@${REINPLACE_CMD} -e 's|$$(GRACE_HOME)/include|$$(PREFIX)/include|' \
-		-e 's|$$(GRACE_HOME)/lib|$$(PREFIX)/lib|' \
+	@${REINPLACE_CMD} -e \
+		's|$$(GRACE_HOME)/include|$$(PREFIX)/include| ; \
+		 s|$$(GRACE_HOME)/lib|$$(PREFIX)/lib|' \
 		${WRKSRC}/grace_np/Makefile
-	@${FIND} ${WRKSRC} -name Makefile -exec ${REINPLACE_CMD} \
-		's|$$(GRACE_HOME)/bin|$$(PREFIX)/bin|' {} \;
+	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \
+		's|$$(GRACE_HOME)/bin|$$(PREFIX)/bin|'
 
 post-install:
+	(cd ${WRKSRC}/doc && ${INSTALL_MAN} [c-g]*.1 \
+		${STAGEDIR}${MANPREFIX}/man/man1)
+	(cd ${FILESDIR} && ${INSTALL_MAN} mini-xmgr3.xpm \
+		${STAGEDIR}${PREFIX}/share/pixmaps)
 	@${LN} -sf xmgrace ${STAGEDIR}${PREFIX}/bin/grace
-	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	@${LN} -sf xmgrace.1 ${STAGEDIR}${MANPREFIX}/man/man1/xmgrace.1
 	@${LN} -sf ${DOCSDIR} ${STAGEDIR}${DATADIR}/doc
 	@${LN} -sf ${EXAMPLESDIR} ${STAGEDIR}${DATADIR}/examples
 
diff --git a/math/grace/distinfo b/math/grace/distinfo
index f7bf84502ee9..d2a2be32ac90 100644
--- a/math/grace/distinfo
+++ b/math/grace/distinfo
@@ -1,2 +1,2 @@
-SHA256 (grace-5.1.23.tar.gz) = 69527950fd9c056a76b7a6bf4ac37a9b87acc565c12a941ffae3c9c5a822ca10
-SIZE (grace-5.1.23.tar.gz) = 2501364
+SHA256 (grace-5.1.24.tar.gz) = 25767a0d465e2fe999c50b05001aef1f4bf99315c55fdaecf1c52cb0e9be5fec
+SIZE (grace-5.1.24.tar.gz) = 2956384
diff --git a/math/grace/files/patch-ac-tools__Make.conf.in b/math/grace/files/patch-ac-tools__Make.conf.in
new file mode 100644
index 000000000000..5c5d19378ed3
--- /dev/null
+++ b/math/grace/files/patch-ac-tools__Make.conf.in
@@ -0,0 +1,10 @@
+--- ac-tools/Make.conf.in.orig
++++ ac-tools/Make.conf.in
+@@ -87,6 +87,7 @@
+ # BSD install
+ INSTALL=@INSTALL@
+ INSTALL_PROGRAM=@INSTALL_PROGRAM@
++INSTALL_SCRIPT=@INSTALL_SCRIPT@
+ INSTALL_DATA=@INSTALL_DATA@
+ MKINSTALLDIRS=@MKINSTALLDIRS@
+ 
diff --git a/math/grace/files/patch-configure b/math/grace/files/patch-configure
deleted file mode 100644
index 71e9b196a5d8..000000000000
--- a/math/grace/files/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.orig	Fri Feb 16 23:44:49 2007
-+++ configure	Tue Apr 24 21:04:24 2007
-@@ -8184,7 +8184,7 @@
- # It thinks the first close brace ends the variable substitution.
- test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
- 
--test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 555'
- 
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
-@@ -15181,7 +15181,8 @@
-       int main(void) {
-         char *vlib;
-         vlib = nc_inq_libvers();
--        if (strcmp(vlib, "3.0") < 0) {
-+	// FreeBSD: only check the major == 3
-+        if (vlib[1] != '3') {
-           exit(1);
-         }
-         exit(0);
diff --git a/math/grace/pkg-plist b/math/grace/pkg-plist
index 88f831154358..9fefda4b5951 100644
--- a/math/grace/pkg-plist
+++ b/math/grace/pkg-plist
@@ -21,13 +21,13 @@ man/man1/xmgrace.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/7.1.3.agr
 %%PORTDOCS%%%%DOCSDIR%%/8.2.dat
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES.html
-%%PORTDOCS%%%%DOCSDIR%%/FAQ.dvi
 %%PORTDOCS%%%%DOCSDIR%%/FAQ.html
+%%PORTDOCS%%%%DOCSDIR%%/FAQ.pdf
 %%PORTDOCS%%%%DOCSDIR%%/GPL.html
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial.dvi
 %%PORTDOCS%%%%DOCSDIR%%/Tutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/UsersGuide.dvi
+%%PORTDOCS%%%%DOCSDIR%%/Tutorial.pdf
 %%PORTDOCS%%%%DOCSDIR%%/UsersGuide.html
+%%PORTDOCS%%%%DOCSDIR%%/UsersGuide.pdf
 %%PORTDOCS%%%%DOCSDIR%%/mygraph.png
 %%PORTDOCS%%%%DOCSDIR%%/nohelp.html
 %%PORTDOCS%%%%DOCSDIR%%/philosophical-gnu-sm.jpg
@@ -88,6 +88,8 @@ man/man1/xmgrace.1.gz
 %%DATADIR%%/auxiliary/README
 %%DATADIR%%/auxiliary/convcal.c
 %%DATADIR%%/auxiliary/magic.grace
+%%PORTDOCS%%%%DATADIR%%/doc
+%%PORTEXAMPLES%%%%DATADIR%%/examples
 %%DATADIR%%/fonts/FontDataBase
 %%DATADIR%%/fonts/enc/CP1251.enc
 %%DATADIR%%/fonts/enc/IsoLatin1.enc
@@ -132,13 +134,4 @@ man/man1/xmgrace.1.gz
 %%DATADIR%%/gracerc
 %%DATADIR%%/gracerc.user
 %%DATADIR%%/templates/Default.agr
-%%PORTEXAMPLES%%%%DATADIR%%/examples
-%%PORTDOCS%%%%DATADIR%%/doc
-@dirrm %%DATADIR%%/templates
-@dirrm %%DATADIR%%/fonts/type1
-@dirrm %%DATADIR%%/fonts/enc
-@dirrm %%DATADIR%%/fonts
-@dirrm %%DATADIR%%/auxiliary
-@dirrm %%DATADIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+share/pixmaps/mini-xmgr3.xpm