diff options
author | Thierry Thomas <thierry@FreeBSD.org> | 2006-02-13 22:09:20 +0000 |
---|---|---|
committer | Thierry Thomas <thierry@FreeBSD.org> | 2006-02-13 22:09:20 +0000 |
commit | 5e6a738f0401b1e38a313d471fd5a3152294a9b1 (patch) | |
tree | a063833ef5bed2c1278e365cfe1cb51929d4bc07 /math | |
parent | Netgen builds fine with gcc-3.4, that should make it packageable on (diff) |
- Upgrade to 2.12.10;
- Assign maintainership.
PR: 92591
Submitted by: Christopher Illies <christopher.illies (at) ki.se>
Notes
Notes:
svn path=/head/; revision=155966
Diffstat (limited to 'math')
-rw-r--r-- | math/gri/Makefile | 41 | ||||
-rw-r--r-- | math/gri/distinfo | 5 | ||||
-rw-r--r-- | math/gri/files/patch-aa | 24 | ||||
-rw-r--r-- | math/gri/files/patch-ab | 21 | ||||
-rw-r--r-- | math/gri/files/patch-ac | 20 | ||||
-rw-r--r-- | math/gri/pkg-plist | 48 |
6 files changed, 52 insertions, 107 deletions
diff --git a/math/gri/Makefile b/math/gri/Makefile index 16ff8ce10d50..11da39cafe12 100644 --- a/math/gri/Makefile +++ b/math/gri/Makefile @@ -6,47 +6,44 @@ # 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 +MAINTAINER= christopher.illies@ki.se COMMENT= An extensible plotting language for producing scientific graphs LIB_DEPENDS= netcdf.1:${PORTSDIR}/science/netcdf -BUILD_DEPENDS= gawk:${PORTSDIR}/lang/gawk -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_PERL5_BUILD= yes -USE_REINPLACE= yes -GNU_CONFIGURE= YES -PLIST_SUB+= PORTVERSION=${PORTVERSION} - -.if defined(NOPORTDOCS) -ALL_TARGET= gri -INSTALL_TARGET= install-bin +.if !defined(NOPORTDOCS) +BUILD_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick \ + dvips:${PORTSDIR}/print/dvipsk-tetex .endif +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-FreeBSD +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +USE_GMAKE= yes +REINPLACE_ARGS= -Ei.bak +MAKE_ENV+= MAKEINFOFLAGS=--no-split + MAN1= gri.1 gri_merge.1 gri_unpage.1 .if !defined(NOPORTDOCS) INFO= gri .endif -post-extract: - @${RM} -f ${WRKSRC}/doc/*.info* ${WRKSRC}/doc/info - @${MV} -f ${WRKSRC}/doc/gri-manpage.1 ${WRKSRC}/doc/gri.1 - post-patch: - @${REINPLACE_CMD} -e "s/makeinfo/makeinfo --no-split/" ${WRKSRC}/doc/Makefile +.if defined(NOPORTDOCS) + ${REINPLACE_CMD} -e '/^(DIST_)?SUBDIRS/s/doc//' ${WRKSRC}/Makefile.in +.endif 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 .endif .include <bsd.port.mk> diff --git a/math/gri/distinfo b/math/gri/distinfo index 2c05b281e6c9..c9b90428363e 100644 --- a/math/gri/distinfo +++ b/math/gri/distinfo @@ -1,3 +1,4 @@ -MD5 (gri-2.12.1-arch-indep.tar.gz) = b66167ac59a5841dec52453c1f5b8c84 -SHA256 (gri-2.12.1-arch-indep.tar.gz) = 0d8fd9018b68bc496b704d831a54a96d9e90461941c54d63b3e31956e6699618 +MD5 (gri-2.12.10.tar.gz) = e76c24aa55958cafbcf333388c6f0dd7 +SHA256 (gri-2.12.10.tar.gz) = c7b92156f1a2dab54b755c60cbb029054a06fd25c3abcd61d6fe86c09399c886 +SIZE (gri-2.12.10.tar.gz) = 1659103 SIZE (gri-2.12.1-arch-indep.tar.gz) = 2461656 diff --git a/math/gri/files/patch-aa b/math/gri/files/patch-aa deleted file mode 100644 index 54687d739a75..000000000000 --- a/math/gri/files/patch-aa +++ /dev/null @@ -1,24 +0,0 @@ ---- Makefile.in.orig Thu Sep 26 01:01:17 2002 -+++ Makefile.in Sat Jan 4 01:34:54 2003 -@@ -118,17 +118,16 @@ - - install-bin: - cat startup.msg | sed -e s,VSN,${VERSION}, -e s,PREFIX,$(prefix), > tmp -- $(INSTALL_PROGRAM) -d $(libdir) -+ -@mkdir -p $(libdir) - $(INSTALL_DATA) tmp $(libdir)/startup.msg - rm -f tmp - $(INSTALL_DATA) gri.cmd $(libdir)/gri.cmd - $(INSTALL_DATA) logo.dat $(libdir)/logo.dat -- $(INSTALL_DATA) license.txt $(libdir)/license.txt -- $(INSTALL_PROGRAM) -d $(prefix)/bin -+ -@mkdir -p $(prefix)/bin - $(INSTALL_PROGRAM) gri $(prefix)/bin/gri-$(VERSION) - (cd $(prefix)/bin/ ; rm -f gri ; ln -sf gri-$(VERSION) gri) -- $(INSTALL_PROGRAM) gri_merge $(prefix)/bin/gri_merge -- $(INSTALL_PROGRAM) gri_unpage $(prefix)/bin/gri_unpage -+ $(BSD_INSTALL_SCRIPT) gri_merge $(prefix)/bin/gri_merge -+ $(BSD_INSTALL_SCRIPT) gri_unpage $(prefix)/bin/gri_unpage - - debian-lib = $(debian)/usr/share/gri/$(VERSION) - install_linux_debian: gri diff --git a/math/gri/files/patch-ab b/math/gri/files/patch-ab deleted file mode 100644 index fee34610b805..000000000000 --- a/math/gri/files/patch-ab +++ /dev/null @@ -1,21 +0,0 @@ ---- doc/Makefile.orig Fri Jan 3 22:45:06 2003 -+++ doc/Makefile Fri Jan 3 22:46:28 2003 -@@ -1,8 +1,8 @@ - # Makefile for Gri documentation files. - -- DOC_DIR = $(prefix)/share/gri/doc -+ DOC_DIR = $(prefix)/share/doc/gri - HTML_DIR = $(DOC_DIR)/html -- EXAMPLES_DIR = $(DOC_DIR)/examples -+ EXAMPLES_DIR = $(prefix)/share/examples/gri - RM = rm -f - REFCARD = refcard - CMD_REFCARD = cmdrefcard -@@ -17,7 +17,6 @@ - make html - - install: -- make info-install - make html-install - - read: diff --git a/math/gri/files/patch-ac b/math/gri/files/patch-ac deleted file mode 100644 index dec3f2a58867..000000000000 --- a/math/gri/files/patch-ac +++ /dev/null @@ -1,20 +0,0 @@ ---- gr.hh.orig Sun Jun 2 02:37:59 2002 -+++ gr.hh Fri Jan 3 21:12:13 2003 -@@ -28,7 +28,7 @@ - #if STDC_HEADERS - #include <stdlib.h> - #else --#ifndef MSDOS -+#if !defined(MSDOS) && !defined(__FreeBSD__) - #include <malloc.h> - #endif // not MSDOS - #endif // Doesn't have stdlib -@@ -345,7 +345,7 @@ - #endif - - // Time type (time_t, int, or long) varies per machine (ug). --#if defined(VMS) || defined(MSDOS) || defined(IS_DEC_ALPHA) || defined(AIX) -+#if defined(VMS) || defined(MSDOS) || defined(IS_DEC_ALPHA) || defined(AIX) || defined(__FreeBSD__) - #define SECOND_TYPE time_t - #else - #if defined(__DECCXX) diff --git a/math/gri/pkg-plist b/math/gri/pkg-plist index 8ff909cced01..a8e1ff150fbf 100644 --- a/math/gri/pkg-plist +++ b/math/gri/pkg-plist @@ -1,12 +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%%%%DOCSDIR%%/cmdrefcard.ps %%PORTDOCS%%%%DOCSDIR%%/html/AboutGriMode.html %%PORTDOCS%%%%DOCSDIR%%/html/Acknowledgments.html %%PORTDOCS%%%%DOCSDIR%%/html/AdjustingCharacterPosition.html @@ -59,6 +54,7 @@ bin/gri-%%PORTVERSION%% %%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 @@ -188,56 +184,69 @@ bin/gri-%%PORTVERSION%% %%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 @@ -263,14 +272,11 @@ bin/gri-%%PORTVERSION%% %%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 @@ -299,8 +305,6 @@ bin/gri-%%PORTVERSION%% %%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 @@ -323,7 +327,15 @@ bin/gri-%%PORTVERSION%% %%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%% +%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/tst_suite +%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/screenshots +%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/resources +%%PORTDOCS%%@dirrm %%DOCSDIR%%/html +%%PORTDOCS%%@dirrm %%DOCSDIR%% |