Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Mar 2010 19:13:19 GMT
From:      Andrius Morkunas <hinokind@gmail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/144666: [patch] graphics/epix update to 1.2.7
Message-ID:  <201003111913.o2BJDJUN079578@www.freebsd.org>
Resent-Message-ID: <201003111920.o2BJK1tV020632@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         144666
>Category:       ports
>Synopsis:       [patch] graphics/epix update to 1.2.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 11 19:20:00 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Andrius Morkunas
>Release:        
>Organization:
>Environment:
>Description:
Update graphics/epix 1.0.0 -> 1.2.7
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN graphics/epix.orig/Makefile graphics/epix/Makefile
--- graphics/epix.orig/Makefile	2010-02-05 11:38:22.000000000 +0000
+++ graphics/epix/Makefile	2010-03-11 14:52:16.594458546 +0000
@@ -7,35 +7,30 @@
 #
 
 PORTNAME=	epix
-PORTVERSION=	1.0.0
-PORTREVISION=	3
+PORTVERSION=	1.2.7
 CATEGORIES=	graphics
 MASTER_SITES=	http://mathcs.holycross.edu/~ahwang/epix/
-DISTNAME=	${PORTNAME}-${PORTVERSION}_src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Creates math plots and line figures using easy-to-learn syntax
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
+		latex:${PORTSDIR}/print/teTeX
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		latex:${PORTSDIR}/print/teTeX
 
 USE_BZIP2=	yes
-USE_GCC=	3.4
-MAKE_ARGS=	CXX="${CXX}" CFLAGS="${CXXFLAGS} -c" \
-		prefix=${PREFIX} \
-		INSTALL_PROGRAM="${INSTALL_DATA}" \
-		INSTALL_BIN="${INSTALL_SCRIPT}"
-PLIST_SUB=	VERSION="${PORTVERSION}"
-
-MAN1=		epix.1
-
-post-patch:
-	@${REINPLACE_CMD} -e \
-		's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/newbash.sh
-	@${REINPLACE_CMD} -e 's|COPYING ||g' ${WRKSRC}/helpfiles.sh
-
-pre-build:
-	@(cd ${WRKSRC} ; ./newbash.sh)
+USE_GMAKE=	yes
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS+=--prefix="${PREFIX}" --mandir="${PREFIX}/man" \
+		--infodir="${PREFIX}/info"
+
+MAN1=		elaps.1 epix.1 flix.1 laps.1
+INFO=		epix
+
+pre-install:
+	@${REINPLACE_CMD} -e 's|/usr/local/bin/bash|${LOCALBASE}/bin/bash|g' \
+		${WRKSRC}/elaps ${WRKSRC}/epix ${WRKSRC}/flix ${WRKSRC}/laps \
+		${WRKSRC}/epix-lib.sh
 
 .include <bsd.port.mk>
diff -ruN graphics/epix.orig/distinfo graphics/epix/distinfo
--- graphics/epix.orig/distinfo	2005-11-26 01:47:36.000000000 +0000
+++ graphics/epix/distinfo	2010-03-10 17:46:31.371316011 +0000
@@ -1,3 +1,3 @@
-MD5 (epix-1.0.0_src.tar.bz2) = 6da4c68ce0bea32fc2d069502893b85c
-SHA256 (epix-1.0.0_src.tar.bz2) = 8bc2f7404759e2a0d71b090e9af3af7ea3486c9c95073e1e5d82cdd9f73d446f
-SIZE (epix-1.0.0_src.tar.bz2) = 117612
+MD5 (epix-1.2.7.tar.bz2) = bbd83e83148f572dc64d3c737ceaa49b
+SHA256 (epix-1.2.7.tar.bz2) = b114393fd7b1457b280b66ed9ea75ce795e6c54159803ce186d573fbbf028880
+SIZE (epix-1.2.7.tar.bz2) = 494954
diff -ruN graphics/epix.orig/files/patch-epix-lib.sh graphics/epix/files/patch-epix-lib.sh
--- graphics/epix.orig/files/patch-epix-lib.sh	1970-01-01 00:00:00.000000000 +0000
+++ graphics/epix/files/patch-epix-lib.sh	2010-03-11 11:05:40.507918048 +0000
@@ -0,0 +1,8 @@
+--- epix-lib.sh	2010-01-25 02:48:26.000000000 +0000
++++ epix-lib.sh	2010-03-11 11:04:43.528709348 +0000
+@@ -1,3 +1,4 @@
++#!/usr/local/bin/bash
+ # Common functions for ePiX's shell scripts
+ #
+ PROG=$(basename $0)
+
diff -ruN graphics/epix.orig/files/patch-newbash.sh graphics/epix/files/patch-newbash.sh
--- graphics/epix.orig/files/patch-newbash.sh	2004-11-05 19:55:49.000000000 +0000
+++ graphics/epix/files/patch-newbash.sh	2010-03-10 17:46:31.391322347 +0000
@@ -1,15 +0,0 @@
---- newbash.sh.orig	Thu Aug 26 21:41:44 2004
-+++ newbash.sh	Wed Nov  3 00:52:21 2004
-@@ -1,10 +1,10 @@
- #!/bin/sh
- #
- for FILE in elaps laps make_header post-uninst.sh pre-install.sh preflix \
--    prepix samples/sample.sh samples/makefigs Makefile
-+    prepix helpfiles.sh samples/sample.sh samples/makefigs Makefile
- do
- 	mv $FILE $FILE.orig
--	sed 's+/bin/bash+/usr/local/bin/bash+g' $FILE.orig > $FILE
-+	sed 's+/bin/bash+%%LOCALBASE%%/bin/bash+g' $FILE.orig > $FILE
- ##                       ^-----------------^
- ## Replace the portion from + to + of the line above with the path to
- ## bash on your system. Sample replacement line:
diff -ruN graphics/epix.orig/files/patch-newbash.sh.orig graphics/epix/files/patch-newbash.sh.orig
--- graphics/epix.orig/files/patch-newbash.sh.orig	1970-01-01 00:00:00.000000000 +0000
+++ graphics/epix/files/patch-newbash.sh.orig	2004-11-05 19:55:49.000000000 +0000
@@ -0,0 +1,15 @@
+--- newbash.sh.orig	Thu Aug 26 21:41:44 2004
++++ newbash.sh	Wed Nov  3 00:52:21 2004
+@@ -1,10 +1,10 @@
+ #!/bin/sh
+ #
+ for FILE in elaps laps make_header post-uninst.sh pre-install.sh preflix \
+-    prepix samples/sample.sh samples/makefigs Makefile
++    prepix helpfiles.sh samples/sample.sh samples/makefigs Makefile
+ do
+ 	mv $FILE $FILE.orig
+-	sed 's+/bin/bash+/usr/local/bin/bash+g' $FILE.orig > $FILE
++	sed 's+/bin/bash+%%LOCALBASE%%/bin/bash+g' $FILE.orig > $FILE
+ ##                       ^-----------------^
+ ## Replace the portion from + to + of the line above with the path to
+ ## bash on your system. Sample replacement line:
diff -ruN graphics/epix.orig/pkg-plist graphics/epix/pkg-plist
--- graphics/epix.orig/pkg-plist	2006-01-22 02:14:46.000000000 +0000
+++ graphics/epix/pkg-plist	2010-03-11 14:51:57.454722311 +0000
@@ -1,36 +1,113 @@
 bin/elaps
 bin/epix
 bin/flix
-bin/keywords
 bin/laps
 include/epix.h
-lib/libepix.a
-%%DATADIR%%/config/bash_completions
-%%DATADIR%%/config/epix.el
-%%DATADIR%%/config/epix.spec
-%%DATADIR%%/config/update_figs.sh
-%%DATADIR%%/notes/BUGS
-%%DATADIR%%/notes/CHANGELOG
-%%DATADIR%%/notes/INSTALL
-%%DATADIR%%/notes/POST-INSTALL
-%%DATADIR%%/notes/README
-%%DATADIR%%/notes/README-changes
-%%DATADIR%%/notes/THANKS
-%%DATADIR%%/notes/TODO
-%%DATADIR%%/samples/epix-%%VERSION%%_samples.tar
-%%DATADIR%%/tutorial/contrib/CartesianCoord.cc
-%%DATADIR%%/tutorial/contrib/CoordAxis.cc
-%%DATADIR%%/tutorial/contrib/CoordSystem.cc
-%%DATADIR%%/tutorial/contrib/DoubleLogCoord.cc
-%%DATADIR%%/tutorial/contrib/Hatch.cc
-%%DATADIR%%/tutorial/contrib/LinearAxis.cc
-%%DATADIR%%/tutorial/contrib/LogaritmicAxis.cc
-%%DATADIR%%/tutorial/contrib/Makefile
-%%DATADIR%%/tutorial/contrib/PicCommand.cc
-%%DATADIR%%/tutorial/contrib/SingleLogCoord.cc
-@dirrm %%DATADIR%%/tutorial/contrib
-@dirrm %%DATADIR%%/samples
-@dirrm %%DATADIR%%/notes
-@dirrm %%DATADIR%%/config
-@dirrmtry %%DATADIR%%/tutorial
-@dirrmtry %%DATADIR%%
+include/epix/Color.h
+include/epix/Color_Base.h
+include/epix/Color_CMY.h
+include/epix/Color_CMYK.h
+include/epix/Color_Gray.h
+include/epix/Color_Neutral.h
+include/epix/Color_RGB.h
+include/epix/Color_Sep.h
+include/epix/Color_Utils.h
+include/epix/active_screen.h
+include/epix/affine.h
+include/epix/angle_units.h
+include/epix/arrow_data.h
+include/epix/arrow_style.h
+include/epix/axis.h
+include/epix/camera.h
+include/epix/circle.h
+include/epix/clipping.h
+include/epix/constants.h
+include/epix/crop_algorithms.h
+include/epix/cropping.h
+include/epix/curves.h
+include/epix/data_bins.h
+include/epix/data_file.h
+include/epix/data_mask.h
+include/epix/deriv.h
+include/epix/domain.h
+include/epix/edge_data.h
+include/epix/eepic.h
+include/epix/enums.h
+include/epix/errors.h
+include/epix/facet.h
+include/epix/format.h
+include/epix/frac.h
+include/epix/frame.h
+include/epix/functions.h
+include/epix/geometry.h
+include/epix/glyph.h
+include/epix/halfspace.h
+include/epix/hatching.h
+include/epix/intersections.h
+include/epix/interval.h
+include/epix/label_data.h
+include/epix/label_style.h
+include/epix/legend.h
+include/epix/legend_item.h
+include/epix/legend_tile.h
+include/epix/length.h
+include/epix/lens.h
+include/epix/map.h
+include/epix/marker_style.h
+include/epix/markers.h
+include/epix/mask_diamond.h
+include/epix/mask_ellipse.h
+include/epix/mask_rectangle.h
+include/epix/paint_style.h
+include/epix/pairs.h
+include/epix/path.h
+include/epix/path_data.h
+include/epix/path_style.h
+include/epix/pen_arrow.h
+include/epix/pen_data.h
+include/epix/pen_fill.h
+include/epix/pen_line.h
+include/epix/picture.h
+include/epix/picture_data.h
+include/epix/plane.h
+include/epix/plot_algorithms.h
+include/epix/plots.h
+include/epix/pst.h
+include/epix/screen.h
+include/epix/screen_crop.h
+include/epix/screen_data.h
+include/epix/screen_mask.h
+include/epix/segment.h
+include/epix/sphere.h
+include/epix/spline.h
+include/epix/spline_data.h
+include/epix/state.h
+include/epix/surface.h
+include/epix/tikz.h
+include/epix/tile.h
+include/epix/triples.h
+include/epix/utils.h
+include/epix/verbatim.h
+lib/epix/epix-lib.sh
+lib/epix/libepix.a
+%%PORTDOCS%%%%DOCSDIR%%/config/bash_completions
+%%PORTDOCS%%%%DOCSDIR%%/config/epix.el
+%%PORTDOCS%%%%DOCSDIR%%/manual.pdf.gz
+%%PORTDOCS%%%%DOCSDIR%%/manual.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/manual_src.tar.gz
+%%PORTDOCS%%%%DOCSDIR%%/notes/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/notes/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/notes/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/notes/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/notes/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/notes/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/notes/POST-INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/notes/README
+%%PORTDOCS%%%%DOCSDIR%%/notes/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/notes/VERSION
+%%PORTDOCS%%%%DOCSDIR%%/sample_src.tar.gz
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/notes
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/config
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm lib/epix
+@dirrm include/epix


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003111913.o2BJDJUN079578>