Date: Wed, 1 Feb 2006 14:06:35 +0100 From: Christopher Illies <christopher.illies@ki.se> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/92591: Update port: math/gri to 2.12.10 Message-ID: <20060201130635.GA4643@Klabautermann.ks.se> In-Reply-To: <200601310850.k0V8o2jd038612@freefall.freebsd.org> References: <20060131084203.7DA22C6A5@Klabautermann.ks.se> <200601310850.k0V8o2jd038612@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Here is the update as a diff -u.
Please remove math/gri/files as no more patches are needed.
I hope this is OK now.
Thanks for your time,
Christopher
diff -ur gri.orig/Makefile gri/Makefile
--- gri.orig/Makefile Wed Feb 1 11:26:28 2006
+++ gri/Makefile Tue Jan 31 11:40:54 2006
@@ -6,44 +6,41 @@
#
PORTNAME= gri
-PORTVERSION= 2.12.1
+PORTVERSION= 2.12.10
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
-DISTNAME= gri-${PORTVERSION}-arch-indep
MAINTAINER= ports@FreeBSD.org
COMMENT= An extensible plotting language for producing scientific graphs
-LIB_DEPENDS= netcdf.1:${PORTSDIR}/math/netcdf
-BUILD_DEPENDS= gawk:${PORTSDIR}/lang/gawk
+LIB_DEPENDS= netcdf.1:${PORTSDIR}/science/netcdf
+.if !defined(NOPORTDOCS)
+BUILD_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick
+BUILD_DEPENDS= tex:${PORTSDIR}/print/teTeX-base
+BUILD_DEPENDS= dvips:${PORTSDIR}/print/dvips
+.endif
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_PERL5_BUILD= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --enable-FreeBSD
+USE_GMAKE= yes
USE_REINPLACE= yes
-GNU_CONFIGURE= YES
-PLIST_SUB+= PORTVERSION=${PORTVERSION}
+REINPLACE_ARGS= -Ei.bak
-.if defined(NOPORTDOCS)
-ALL_TARGET= gri
-INSTALL_TARGET= install-bin
-.endif
+MAN1= gri.1 gri_merge.1 gri_unpage.1
+INFO= gri
-MAN1= gri.1 gri_merge.1 gri_unpage.1
-
-post-extract:
- @${RM} -f ${WRKSRC}/doc/*.info* ${WRKSRC}/doc/info
- @${MV} -f ${WRKSRC}/doc/gri-manpage.1 ${WRKSRC}/doc/gri.1
+MAKE_ENV+= MAKEINFOFLAGS=--no-split
+.if defined(NOPORTDOCS)
post-patch:
- @${REINPLACE_CMD} -e "s/makeinfo/makeinfo --no-split/" ${WRKSRC}/doc/Makefile
+ ${REINPLACE_CMD} -e '/^(DIST_)?SUBDIRS/s/doc//' ${WRKSRC}/Makefile.in
post-install:
-.for file in ${MAN1}
- ${INSTALL_MAN} ${WRKSRC}/doc/${file} ${MANPREFIX}/man/man1
-.endfor
-.if !defined(NOPORTDOCS)
- @${INSTALL_DATA} ${WRKSRC}/doc/gri.info ${PREFIX}/info
+ ${INSTALL_MAN} ${WRKSRC}/doc/gri-manpage.1 ${MANPREFIX}/man/man1/gri.1
+ ${INSTALL_MAN} ${WRKSRC}/doc/gri_merge.1-skel ${MANPREFIX}/man/man1/gri_merge.1
+ ${INSTALL_MAN} ${WRKSRC}/doc/gri_unpage.1-skel ${MANPREFIX}/man/man1/gri_unpage.1
+ @${INSTALL_DATA} ${WRKSRC}/doc/gri.info* ${PREFIX}/info
install-info ${PREFIX}/info/gri.info ${PREFIX}/info/dir
.endif
diff -ur gri.orig/distinfo gri/distinfo
--- gri.orig/distinfo Wed Feb 1 11:26:28 2006
+++ gri/distinfo Mon Jan 30 15:21:56 2006
@@ -1,2 +1,3 @@
-MD5 (gri-2.12.1-arch-indep.tar.gz) = b66167ac59a5841dec52453c1f5b8c84
-SIZE (gri-2.12.1-arch-indep.tar.gz) = 2461656
+MD5 (gri-2.12.10.tar.gz) = e76c24aa55958cafbcf333388c6f0dd7
+SHA256 (gri-2.12.10.tar.gz) = c7b92156f1a2dab54b755c60cbb029054a06fd25c3abcd61d6fe86c09399c886
+SIZE (gri-2.12.10.tar.gz) = 1659103
Only in gri.orig: files
diff -ur gri.orig/pkg-plist gri/pkg-plist
--- gri.orig/pkg-plist Wed Feb 1 11:26:28 2006
+++ gri/pkg-plist Mon Jan 30 16:40:29 2006
@@ -1,15 +1,7 @@
bin/gri
bin/gri_merge
bin/gri_unpage
-bin/gri-%%PORTVERSION%%
-%%DATADIR%%/%%PORTVERSION%%/startup.msg
-%%DATADIR%%/%%PORTVERSION%%/gri.cmd
-%%DATADIR%%/%%PORTVERSION%%/logo.dat
-@dirrm %%DATADIR%%/%%PORTVERSION%%
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@unexec install-info --delete %D/info/gri.info %D/info/dir
-%%PORTDOCS%%info/gri.info
-%%PORTDOCS%%@exec install-info %D/info/gri.info %D/info/dir
+%%PORTDOCS%%%%DOCSDIR%%/cmdrefcard.ps
%%PORTDOCS%%%%DOCSDIR%%/html/AboutGriMode.html
%%PORTDOCS%%%%DOCSDIR%%/html/Acknowledgments.html
%%PORTDOCS%%%%DOCSDIR%%/html/AdjustingCharacterPosition.html
@@ -62,6 +54,7 @@
%%PORTDOCS%%%%DOCSDIR%%/html/Extras.html
%%PORTDOCS%%%%DOCSDIR%%/html/FAQ.html
%%PORTDOCS%%%%DOCSDIR%%/html/FEM-tiny.png
+%%PORTDOCS%%%%DOCSDIR%%/html/FEM.gri
%%PORTDOCS%%%%DOCSDIR%%/html/FEM.html
%%PORTDOCS%%%%DOCSDIR%%/html/FEM.png
%%PORTDOCS%%%%DOCSDIR%%/html/FancyPlot.html
@@ -191,56 +184,69 @@
%%PORTDOCS%%%%DOCSDIR%%/html/Write.html
%%PORTDOCS%%%%DOCSDIR%%/html/X-Y.html
%%PORTDOCS%%%%DOCSDIR%%/html/example1-tiny.png
+%%PORTDOCS%%%%DOCSDIR%%/html/example1.gri
%%PORTDOCS%%%%DOCSDIR%%/html/example1.html
%%PORTDOCS%%%%DOCSDIR%%/html/example1.png
%%PORTDOCS%%%%DOCSDIR%%/html/example10-tiny.png
+%%PORTDOCS%%%%DOCSDIR%%/html/example10.gri
%%PORTDOCS%%%%DOCSDIR%%/html/example10.html
%%PORTDOCS%%%%DOCSDIR%%/html/example10.png
%%PORTDOCS%%%%DOCSDIR%%/html/example10color-tiny.png
+%%PORTDOCS%%%%DOCSDIR%%/html/example10color.gri
%%PORTDOCS%%%%DOCSDIR%%/html/example10color.html
%%PORTDOCS%%%%DOCSDIR%%/html/example10color.png
%%PORTDOCS%%%%DOCSDIR%%/html/example11-tiny.png
+%%PORTDOCS%%%%DOCSDIR%%/html/example11.gri
%%PORTDOCS%%%%DOCSDIR%%/html/example11.html
%%PORTDOCS%%%%DOCSDIR%%/html/example11.png
%%PORTDOCS%%%%DOCSDIR%%/html/example12-tiny.png
+%%PORTDOCS%%%%DOCSDIR%%/html/example12.gri
%%PORTDOCS%%%%DOCSDIR%%/html/example12.html
%%PORTDOCS%%%%DOCSDIR%%/html/example12.png
%%PORTDOCS%%%%DOCSDIR%%/html/example13-tiny.png
+%%PORTDOCS%%%%DOCSDIR%%/html/example13.gri
%%PORTDOCS%%%%DOCSDIR%%/html/example13.html
%%PORTDOCS%%%%DOCSDIR%%/html/example13.png
%%PORTDOCS%%%%DOCSDIR%%/html/example2-tiny.png
+%%PORTDOCS%%%%DOCSDIR%%/html/example2.gri
%%PORTDOCS%%%%DOCSDIR%%/html/example2.html
%%PORTDOCS%%%%DOCSDIR%%/html/example2.png
%%PORTDOCS%%%%DOCSDIR%%/html/example3-tiny.png
+%%PORTDOCS%%%%DOCSDIR%%/html/example3.gri
%%PORTDOCS%%%%DOCSDIR%%/html/example3.html
%%PORTDOCS%%%%DOCSDIR%%/html/example3.png
%%PORTDOCS%%%%DOCSDIR%%/html/example4-tiny.png
+%%PORTDOCS%%%%DOCSDIR%%/html/example4.gri
%%PORTDOCS%%%%DOCSDIR%%/html/example4.html
%%PORTDOCS%%%%DOCSDIR%%/html/example4.png
%%PORTDOCS%%%%DOCSDIR%%/html/example5-tiny.png
+%%PORTDOCS%%%%DOCSDIR%%/html/example5.gri
%%PORTDOCS%%%%DOCSDIR%%/html/example5.html
%%PORTDOCS%%%%DOCSDIR%%/html/example5.png
%%PORTDOCS%%%%DOCSDIR%%/html/example6-tiny.png
+%%PORTDOCS%%%%DOCSDIR%%/html/example6.gri
%%PORTDOCS%%%%DOCSDIR%%/html/example6.html
%%PORTDOCS%%%%DOCSDIR%%/html/example6.png
-%%PORTDOCS%%%%DOCSDIR%%/html/example6color-tiny.png
-%%PORTDOCS%%%%DOCSDIR%%/html/example6color.html
-%%PORTDOCS%%%%DOCSDIR%%/html/example6color.png
%%PORTDOCS%%%%DOCSDIR%%/html/example6histogram-tiny.png
+%%PORTDOCS%%%%DOCSDIR%%/html/example6histogram.gri
%%PORTDOCS%%%%DOCSDIR%%/html/example6histogram.html
%%PORTDOCS%%%%DOCSDIR%%/html/example6histogram.png
%%PORTDOCS%%%%DOCSDIR%%/html/example7-tiny.png
+%%PORTDOCS%%%%DOCSDIR%%/html/example7.gri
%%PORTDOCS%%%%DOCSDIR%%/html/example7.html
%%PORTDOCS%%%%DOCSDIR%%/html/example7.png
%%PORTDOCS%%%%DOCSDIR%%/html/example8-tiny.png
+%%PORTDOCS%%%%DOCSDIR%%/html/example8.gri
%%PORTDOCS%%%%DOCSDIR%%/html/example8.html
%%PORTDOCS%%%%DOCSDIR%%/html/example8.png
%%PORTDOCS%%%%DOCSDIR%%/html/example9-tiny.png
+%%PORTDOCS%%%%DOCSDIR%%/html/example9.gri
%%PORTDOCS%%%%DOCSDIR%%/html/example9.html
%%PORTDOCS%%%%DOCSDIR%%/html/example9.png
%%PORTDOCS%%%%DOCSDIR%%/html/examples
%%PORTDOCS%%%%DOCSDIR%%/html/index.html
%%PORTDOCS%%%%DOCSDIR%%/html/linux-install.html
+%%PORTDOCS%%%%DOCSDIR%%/html/logo.gri
%%PORTDOCS%%%%DOCSDIR%%/html/logo.html
%%PORTDOCS%%%%DOCSDIR%%/html/logo.png
%%PORTDOCS%%%%DOCSDIR%%/html/mac-install.html
@@ -266,14 +272,11 @@
%%PORTDOCS%%%%DOCSDIR%%/html/tst_suite/tst_rpn.html
%%PORTDOCS%%%%DOCSDIR%%/html/tst_suite/tst_var_syn.html
%%PORTDOCS%%%%DOCSDIR%%/html/uncompiled-unix.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/resources
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/screenshots
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/tst_suite
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/license.txt
+%%PORTDOCS%%%%DOCSDIR%%/refcard.ps
+share/emacs/site-lisp/gri-mode.el
%%PORTDOCS%%%%EXAMPLESDIR%%/FEM.gri
%%PORTDOCS%%%%EXAMPLESDIR%%/FEM.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/FEM.ps
%%PORTDOCS%%%%EXAMPLESDIR%%/example1.dat
%%PORTDOCS%%%%EXAMPLESDIR%%/example1.gri
%%PORTDOCS%%%%EXAMPLESDIR%%/example1.ps
@@ -302,8 +305,6 @@
%%PORTDOCS%%%%EXAMPLESDIR%%/example5.ps
%%PORTDOCS%%%%EXAMPLESDIR%%/example6.gri
%%PORTDOCS%%%%EXAMPLESDIR%%/example6.ps
-%%PORTDOCS%%%%EXAMPLESDIR%%/example6color.gri
-%%PORTDOCS%%%%EXAMPLESDIR%%/example6color.ps
%%PORTDOCS%%%%EXAMPLESDIR%%/example6histogram.gri
%%PORTDOCS%%%%EXAMPLESDIR%%/example6histogram.ps
%%PORTDOCS%%%%EXAMPLESDIR%%/example6image.dat
@@ -326,7 +327,18 @@
%%PORTDOCS%%%%EXAMPLESDIR%%/example9a.dat
%%PORTDOCS%%%%EXAMPLESDIR%%/example9b.dat
%%PORTDOCS%%%%EXAMPLESDIR%%/logo.gri
-%%PORTDOCS%%%%EXAMPLESDIR%%/logo.ps
%%PORTDOCS%%%%EXAMPLESDIR%%/model.elements
%%PORTDOCS%%%%EXAMPLESDIR%%/model.nodes
+%%DATADIR%%/gri.cmd
+%%DATADIR%%/logo.dat
+%%DATADIR%%/startup.msg
+@dirrm %%DATADIR%%
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+@dirrm share/emacs/site-lisp
+@dirrm share/emacs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/tst_suite
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/screenshots
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/resources
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060201130635.GA4643>