Attachment 27276 Details for Bug 46310 – file.diff

[patch] file.diff

file.diff (text/plain), 10.00 KB, created by tkato on 2002-12-16 20:40:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2002-12-16 20:40:10 UTC

Size: 10.00 KB

patch

obsolete

>diff -urN /usr/ports/math/ploticus/Makefile math/ploticus/Makefile
>--- /usr/ports/math/ploticus/Makefile	Mon Nov 11 19:00:23 2002
>+++ math/ploticus/Makefile	Sat Dec 14 01:32:39 2002
>@@ -7,7 +7,7 @@
> #
> 
> PORTNAME=	ploticus
>-PORTVERSION=	2.04
>+PORTVERSION=	2.10
> CATEGORIES=	math
> MASTER_SITES=	http://ploticus.sourceforge.net/download/
> DISTNAME=	plsrc${PORTVERSION:S/.//}
>@@ -15,29 +15,25 @@
> MAINTAINER=	ports@FreeBSD.org
> 
> LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd \
>-		png:${PORTSDIR}/graphics/png \
>-		jpeg:${PORTSDIR}/graphics/jpeg \
>-		freetype:${PORTSDIR}/print/freetype2
>+		jpeg.9:${PORTSDIR}/graphics/jpeg \
>+		png.5:${PORTSDIR}/graphics/png \
>+		freetype.9:${PORTSDIR}/print/freetype2
> 
>-USE_XLIB=	yes
>-USE_REINPLACE=	yes
> WRKSRC=		${WRKDIR}/${DISTNAME}/src
>-ALL_TARGET=	# empty
>-MAKE_ENV=	LIBS="-L${LOCALBASE}/lib"
> 
>-MAN1=	pl.1
>+USE_XLIB=	yes
>+ALL_TARGET=	${PORTNAME}
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e "s,^CC,#CC,g" ${WRKSRC}/Makefile
>+MAN1=	pl.1
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/pl ${PREFIX}/bin
> 	@${MKDIR} ${DATADIR}
>-	${CP} ${WRKSRC}/../prefabs/* ${DATADIR}
>-	${INSTALL_MAN} ${WRKSRC}/../man/man1/${MAN1} ${MAN1PREFIX}/man/man1
>+	${INSTALL_DATA} ${WRKSRC}/../prefabs/* ${DATADIR}
>+	${INSTALL_MAN} ${WRKSRC}/../man/man1/${MAN1} ${MANPREFIX}/man/man1
> .if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
>-	${CP} -R ${WRKSRC}/../doc/* ${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/../doc/* ${DOCSDIR}
> .endif
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/math/ploticus/distinfo math/ploticus/distinfo
>--- /usr/ports/math/ploticus/distinfo	Tue Sep 10 20:19:32 2002
>+++ math/ploticus/distinfo	Sat Dec 14 01:20:32 2002
>@@ -1 +1 @@
>-MD5 (plsrc204.tar.gz) = 005fe1cd6fafceafe02f6353a4ad8a99
>+MD5 (plsrc210.tar.gz) = 2f37a537f998e8894399871ebffb7711
>diff -urN /usr/ports/math/ploticus/files/patch-Makefile math/ploticus/files/patch-Makefile
>--- /usr/ports/math/ploticus/files/patch-Makefile	Tue Sep 10 20:19:32 2002
>+++ math/ploticus/files/patch-Makefile	Sat Dec 14 01:39:28 2002
>@@ -1,13 +1,22 @@
>---- Makefile.orig	Fri Jun 14 21:58:53 2002
>-+++ Makefile	Mon Jun 17 00:12:22 2002
>-@@ -23,14 +23,14 @@
>- ######## Choose one of the following.   All others should be commented out.
>+--- Makefile.orig	Wed Dec 11 22:24:51 2002
>++++ Makefile	Sat Dec 14 01:30:46 2002
>+@@ -12,7 +12,7 @@
>+ ######## Covered by GPL; see the file ./Copyright for details. 
>+ 
>+ # defaults..
>+-CC = gcc
>++CC ?= gcc
>+ PLATFORM = UNIX
>+ RMCOM = rm -f
>+ XOBJ = x11.o interact.o
>+@@ -25,14 +25,15 @@
>+ ########         Choose one of the following.   All others should be commented out.
>  
>  #### For Solaris 2.x uncomment the following..
> -XLIBS = -L/usr/openwin/lib -lX11
> -XINCLUDEDIR = -I/usr/openwin/include
>-+#XLIBS = -L/usr/openwin/lib -lX11
>-+#XINCLUDEDIR = -I/usr/openwin/include
>++# XLIBS = -L/usr/openwin/lib -lX11
>++# XINCLUDEDIR = -I/usr/openwin/include
>  
>  #### For Linux and FreeBSD uncomment the following..
> -# XLIBS = -L/usr/X11R6/lib -lX11
>@@ -16,23 +25,24 @@
> +XINCLUDEDIR = -I${X11BASE}/include
>  #### For FreeBSD uncomment the following and find GD16H or GD18H below and set to -I/usr/local/include
> -# ADDLIBS = -L/usr/local/lib
>++FLAGS = -I${LOCALBASE}/include
> +ADDLIBS = -L${LOCALBASE}/lib
>  
>  #### For Cygwin uncomment the following..
>  # PLATFORM = WIN32
>-@@ -78,7 +78,7 @@
>- ######## Choose ONE of the following.  All others should be commented out.
>+@@ -79,7 +80,7 @@
>+ ########         Choose ONE of the following.  All others should be commented out.
>  
>- #### For pseudo-GIF uncomment the following..  (no libs required)
>+ #### For pseudo-GIF (only) uncomment the following..  (no libs required)
> -ploticus: pl 
>-+#ploticus: pl 
>++# ploticus: pl 
>  
>- #### For PNG uncomment the following.. (you must have libpng and zlib)
>+ #### For PNG (only) uncomment the following.. (you must have libpng and zlib)
>  # ploticus: plpng 
>-@@ -103,11 +103,11 @@
>- #### For JPEG, WBMP, and PNG & FreeType2 using your copy of GD 1.84+ uncomment the following..
>- #### (you must have gd 1.84+, libpng, zlib, libjpeg, libfreetype)
>- #### Before using set environment var GDFONTPATH to directory containing .ttf files
>+@@ -104,11 +105,11 @@
>+ #### For JPEG, WBMP, PNG, with FreeType2, using your copy of GD 1.84 or higher,
>+ ####  uncomment the following..   (you must have gd 1.84+, libpng, zlib, libjpeg, libfreetype)
>+ ####  (set environment var GDFONTPATH to directory containing .ttf files)
> -# ploticus: plgd18 
> -# GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype
> -# GD18H = 
>@@ -44,14 +54,14 @@
> +GDFREETYPE = -DGDFREETYPE
> +ZFLAG = -DWZ
>  
>- #### To disable GD image support (no GIF, PNG, JPEG, etc) uncomment the following..
>+ #### To disable all GD image support (no GIF, PNG, JPEG, etc) uncomment the following..
>  # ploticus: plnogd 
>-@@ -125,11 +125,11 @@
>+@@ -126,11 +127,11 @@
>  #### To set a hard-coded directory for prefabs files, uncomment & edit the following.. 
>  #### If done, users won't be required to have PLOTICUS_PREFABS environment variable defined.
>  #### This option not available for win32
> -# PREFABS_DIR = "/usr/lib/ploticus"
>-+PREFABS_DIR = "${LOCALBASE}/share/ploticus"
>++PREFABS_DIR = "${PREFIX}/share/ploticus"
>  
>  #### For LOCALE support (non-roman alphabets & collation), uncomment the following..
> -# LOCALEOBJ = localef.o
>@@ -61,15 +71,12 @@
>  
>  #### If you want compressed svg (.svgz), and you selected "GIF only", "GIF & PNG", or "disable GD" above, 
>  #### uncomment the following.  You need to have zlib.  If necessary change -lz to location of zlib.
>-@@ -156,9 +156,9 @@
>- GD = gdfontg.o gdfontl.o gdfontmb.o gdfonts.o gdfontt.o
>+@@ -165,7 +166,7 @@
>  
>- 
>--LIBS = $(XLIBS) -lm $(ADDLIBS) 
>-+LIBS += $(XLIBS) -lm $(ADDLIBS) 
>+ LIBS = $(XLIBS) -lm $(ADDLIBS) 
>  
> -CFLAGS = -DPLOTICUS -D$(PLATFORM) -DTDH_NOREC $(ZFLAG) $(FLAGS) $(LOCALE_FLAG) \
> +CFLAGS += -DPLOTICUS -D$(PLATFORM) -DTDH_NOREC $(ZFLAG) $(FLAGS) $(LOCALE_FLAG) \
>    $(NOGDFLAG) $(NOXFLAG) $(XINCLUDEDIR) $(NORLIMFLAG) -DPREFABS_DIR=\"$(PREFABS_DIR)\"
>  
>- OBJ = 	proc_annotate.o proc_areadef.o proc_axis.o proc_bars.o proc_rect.o proc_breakaxis.o \
>+ OBJ = proc_annotate.o proc_areadef.o proc_axis.o proc_bars.o proc_rect.o proc_breakaxis.o \
>diff -urN /usr/ports/math/ploticus/pkg-plist math/ploticus/pkg-plist
>--- /usr/ports/math/ploticus/pkg-plist	Tue Sep 10 20:19:32 2002
>+++ math/ploticus/pkg-plist	Sat Dec 14 01:59:50 2002
>@@ -1,23 +1,4 @@
> bin/pl
>-share/ploticus/README
>-share/ploticus/chron.pl
>-share/ploticus/chunk_area
>-share/ploticus/chunk_logstubs
>-share/ploticus/chunk_logtics
>-share/ploticus/chunk_read
>-share/ploticus/chunk_setstd
>-share/ploticus/chunk_title
>-share/ploticus/chunk_xaxis
>-share/ploticus/chunk_yaxis
>-share/ploticus/dist.pl
>-share/ploticus/draw.pl
>-share/ploticus/lines.pl
>-share/ploticus/multidist.pl
>-share/ploticus/pie.pl
>-share/ploticus/scat.pl
>-share/ploticus/stack.pl
>-share/ploticus/vbars.pl
>-@dirrm share/ploticus
> %%PORTDOCS%%share/doc/ploticus/Changelog.html
> %%PORTDOCS%%share/doc/ploticus/Contents.html
> %%PORTDOCS%%share/doc/ploticus/Copyright.html
>@@ -30,6 +11,7 @@
> %%PORTDOCS%%share/doc/ploticus/Versions.html
> %%PORTDOCS%%share/doc/ploticus/Welcome.html
> %%PORTDOCS%%share/doc/ploticus/annotate.html
>+%%PORTDOCS%%share/doc/ploticus/api.html
> %%PORTDOCS%%share/doc/ploticus/areadef.html
> %%PORTDOCS%%share/doc/ploticus/attributetypes.html
> %%PORTDOCS%%share/doc/ploticus/autorange.html
>@@ -52,11 +34,8 @@
> %%PORTDOCS%%share/doc/ploticus/defineunits.html
> %%PORTDOCS%%share/doc/ploticus/drawcommands.html
> %%PORTDOCS%%share/doc/ploticus/dynamic.html
>-%%PORTDOCS%%share/doc/ploticus/endproc.html
> %%PORTDOCS%%share/doc/ploticus/fonts.html
> %%PORTDOCS%%share/doc/ploticus/functions.html
>-%%PORTDOCS%%share/doc/ploticus/gall.lineplot.html
>-%%PORTDOCS%%share/doc/ploticus/gall.scat.html
> %%PORTDOCS%%share/doc/ploticus/getdata.html
> %%PORTDOCS%%share/doc/ploticus/gifpatent.html
> %%PORTDOCS%%share/doc/ploticus/gpl.gif
>@@ -64,24 +43,20 @@
> %%PORTDOCS%%share/doc/ploticus/index.html
> %%PORTDOCS%%share/doc/ploticus/interactive.html
> %%PORTDOCS%%share/doc/ploticus/legend.html
>-%%PORTDOCS%%share/doc/ploticus/legenddriven.html
> %%PORTDOCS%%share/doc/ploticus/legendentry.html
> %%PORTDOCS%%share/doc/ploticus/license.jpg
> %%PORTDOCS%%share/doc/ploticus/limits.html
> %%PORTDOCS%%share/doc/ploticus/line.html
> %%PORTDOCS%%share/doc/ploticus/linedetails.html
> %%PORTDOCS%%share/doc/ploticus/lineplot.html
>-%%PORTDOCS%%share/doc/ploticus/missingdata.html
> %%PORTDOCS%%share/doc/ploticus/new.gif
> %%PORTDOCS%%share/doc/ploticus/nonunix.html
>-%%PORTDOCS%%share/doc/ploticus/originaldata.html
> %%PORTDOCS%%share/doc/ploticus/page.html
> %%PORTDOCS%%share/doc/ploticus/paper.html
> %%PORTDOCS%%share/doc/ploticus/pie.html
> %%PORTDOCS%%share/doc/ploticus/pl.1.html
> %%PORTDOCS%%share/doc/ploticus/ploticus.1.html
> %%PORTDOCS%%share/doc/ploticus/ploticus.gif
>-%%PORTDOCS%%share/doc/ploticus/plpng.1.html
> %%PORTDOCS%%share/doc/ploticus/plshellsql.html
> %%PORTDOCS%%share/doc/ploticus/pltab.1.html
> %%PORTDOCS%%share/doc/ploticus/posters.html
>@@ -106,6 +81,7 @@
> %%PORTDOCS%%share/doc/ploticus/scatterplot.html
> %%PORTDOCS%%share/doc/ploticus/scripts.html
> %%PORTDOCS%%share/doc/ploticus/settings.html
>+%%PORTDOCS%%share/doc/ploticus/settings.inc.html
> %%PORTDOCS%%share/doc/ploticus/shell.html
> %%PORTDOCS%%share/doc/ploticus/slides.html
> %%PORTDOCS%%share/doc/ploticus/specialchars.html
>@@ -116,7 +92,27 @@
> %%PORTDOCS%%share/doc/ploticus/textdetails.html
> %%PORTDOCS%%share/doc/ploticus/times.html
> %%PORTDOCS%%share/doc/ploticus/trailer.html
>-%%PORTDOCS%%share/doc/ploticus/transform.html
>+%%PORTDOCS%%share/doc/ploticus/usedata.html
> %%PORTDOCS%%share/doc/ploticus/variables.html
>+%%PORTDOCS%%share/doc/ploticus/vector.html
> %%PORTDOCS%%share/doc/ploticus/web.html
>+share/ploticus/README
>+share/ploticus/chron.pl
>+share/ploticus/chunk_area
>+share/ploticus/chunk_logstubs
>+share/ploticus/chunk_logtics
>+share/ploticus/chunk_read
>+share/ploticus/chunk_setstd
>+share/ploticus/chunk_title
>+share/ploticus/chunk_xaxis
>+share/ploticus/chunk_yaxis
>+share/ploticus/dist.pl
>+share/ploticus/draw.pl
>+share/ploticus/lines.pl
>+share/ploticus/multidist.pl
>+share/ploticus/pie.pl
>+share/ploticus/scat.pl
>+share/ploticus/stack.pl
>+share/ploticus/vbars.pl
>+@dirrm share/ploticus
> %%PORTDOCS%%@dirrm share/doc/ploticus

Actions: View | Diff

Attachments on bug 46310: 27276