Attachment 147644 Details for Bug 193899 – math_grace.diff

[patch] math_grace.diff

math_grace.diff (text/plain), 6.96 KB, created by tkato432 on 2014-09-24 18:32:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-09-24 18:32:36 UTC

Size: 6.96 KB

patch

obsolete

>diff -urN /usr/ports/math/grace/Makefile math/grace/Makefile
>--- /usr/ports/math/grace/Makefile	2014-09-11 15:43:05.000000000 +0900
>+++ math/grace/Makefile	2014-09-25 00:00:00.000000000 +0900
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/math/grace/Makefile 367888 2014-09-10 20:50:31Z gerald $
> 
> 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 @@
> 		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 @@
> 		--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 -urN /usr/ports/math/grace/distinfo math/grace/distinfo
>--- /usr/ports/math/grace/distinfo	2014-06-21 17:46:42.000000000 +0900
>+++ math/grace/distinfo	2014-09-25 00:00:00.000000000 +0900
>@@ -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 -urN /usr/ports/math/grace/files/patch-ac-tools__Make.conf.in math/grace/files/patch-ac-tools__Make.conf.in
>--- /usr/ports/math/grace/files/patch-ac-tools__Make.conf.in	1970-01-01 09:00:00.000000000 +0900
>+++ math/grace/files/patch-ac-tools__Make.conf.in	2014-09-25 00:00:00.000000000 +0900
>@@ -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 -urN /usr/ports/math/grace/files/patch-configure math/grace/files/patch-configure
>--- /usr/ports/math/grace/files/patch-configure	2014-06-21 17:46:42.000000000 +0900
>+++ math/grace/files/patch-configure	1970-01-01 09:00:00.000000000 +0900
>@@ -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 -urN /usr/ports/math/grace/pkg-plist math/grace/pkg-plist
>--- /usr/ports/math/grace/pkg-plist	2014-06-21 17:46:42.000000000 +0900
>+++ math/grace/pkg-plist	2014-09-25 00:00:00.000000000 +0900
>@@ -21,13 +21,13 @@
> %%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 @@
> %%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 @@
> %%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

Actions: View | Diff

Attachments on bug 193899: 147644