Upgrade to version 5.2.2 (the distfile still has version 5.2)

Add a lib depend on png since this version has a png driver.
Fix minors bugs in Makefile.demo

4 files changed, 11 insertions, 9 deletions

diff --git a/graphics/pgplot/Makefile b/graphics/pgplot/Makefile
index 23fc7b658cc5..1749fdf890e2 100644
--- a/graphics/pgplot/Makefile
+++ b/graphics/pgplot/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	pgplot
-PORTVERSION=	5.2
+PORTVERSION=	5.2.2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.astro.caltech.edu/pub/pgplot/
-DISTNAME=	${PORTNAME}${PORTVERSION}
+DISTNAME=	${PORTNAME}5.2
 
 MAINTAINER=	jmz@FreeBSD.org
 
+LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png
 USE_XLIB=	yes
 INSTALLS_SHLIB=	yes
 WRKSRC=		${WRKDIR}/pgplot
diff --git a/graphics/pgplot/distinfo b/graphics/pgplot/distinfo
index 208eeb512b01..8ac63be54130 100644
--- a/graphics/pgplot/distinfo
+++ b/graphics/pgplot/distinfo
@@ -1 +1 @@
-MD5 (pgplot5.2.tar.gz) = 69168c92b14aa0c92fc03105be568902
+MD5 (pgplot5.2.tar.gz) = e8a6e8d0d5ef9d1709dfb567724525ae
diff --git a/graphics/pgplot/files/Makefile.demo b/graphics/pgplot/files/Makefile.demo
index 449f9116020c..29b3ff673bff 100644
--- a/graphics/pgplot/files/Makefile.demo
+++ b/graphics/pgplot/files/Makefile.demo
@@ -1,5 +1,5 @@
-PGPLOT_LIB = -L/usr/local/lib -lpgplot
-CPGPLOT_LIB = -L/usr/local/lib  -lcpgplot
+PGPLOT_LIB = -L/usr/local/lib -lpgplot -lpng
+CPGPLOT_LIB = -L/usr/local/lib  -lcpgplot -lpng
 LIBS= -L/usr/X11R6/lib -lX11 -lm
 
 OSVERSION!=	/sbin/sysctl -n kern.osreldate
@@ -8,7 +8,8 @@ FFLAGS+=	-fno-backslash
 .endif
 
 all: cpgdemo pgdemo1 pgdemo2 pgdemo3 pgdemo4 pgdemo5 pgdemo6 pgdemo7 pgdemo8 \
-	pgdemo9 pgdemo10 pgdemo11 pgdemo12 pgdemo13 pgdemo14
+	pgdemo9 pgdemo10 pgdemo11 pgdemo12 pgdemo13 pgdemo14 pgdemo15 \
+	pgdemo16 pgdemo17
 		
 pgdemo1: pgdemo1.f libpgplot.a
 	$(FC) $(FFLAGS) -o pgdemo1 pgdemo1.f $(PGPLOT_LIB) $(LIBS)
@@ -39,7 +40,7 @@ pgdemo13: pgdemo13.f libpgplot.a
 pgdemo14: pgdemo14.f libpgplot.a
 	$(FC) $(FFLAGS) -o pgdemo14 pgdemo14.f $(PGPLOT_LIB) $(LIBS)
 pgdemo15: pgdemo15.f libpgplot.a
-	$(FC) $(FFLAGS) -o pgdemo15 pgdemo16.f $(PGPLOT_LIB) $(LIBS)
+	$(FC) $(FFLAGS) -o pgdemo15 pgdemo15.f $(PGPLOT_LIB) $(LIBS)
 pgdemo16: pgdemo16.f libpgplot.a
 	$(FC) $(FFLAGS) -o pgdemo16 pgdemo16.f $(PGPLOT_LIB) $(LIBS)
 pgdemo17: pgdemo17.f libpgplot.a
diff --git a/graphics/pgplot/files/Makefile.flib b/graphics/pgplot/files/Makefile.flib
index 640d41535ec3..e8c3998b5d90 100644
--- a/graphics/pgplot/files/Makefile.flib
+++ b/graphics/pgplot/files/Makefile.flib
@@ -8,13 +8,13 @@ PG_ROUTINES= pgarro.f pgask.f pgaxis.f pgaxlg.f  pgband.f pgbbuf.f pgbeg.f  pgbi
 PG_NON_STANDARD= pgadvance.f pgbegin.f   pgcurse.f   pglabel.f   pgmtext.f   pgncurse.f  pgpaper.f   pgpoint.f   pgptext.f   pgvport.f   pgvsize.f   pgvstand.f  pgwindow.f 
 GR_ROUTINES= grarea.f grbpic.f grchsz.f grclip.f grclos.f grclpl.f grctoi.f grcurs.f grdot0.f grdot1.f grdtyp.f gresc.f  grepic.f gretxt.f grfa.f   grfao.f  grgfil.f grgray.f grimg0.f grimg1.f grimg2.f grimg3.f grinit.f gritoc.f grldev.f grlen.f  grlin0.f grlin1.f grlin2.f grlin3.f grlina.f grmcur.f grmker.f grmova.f grmsg.f gropen.f grpage.f grpars.f grpixl.f grpocl.f grprom.f grpxpo.f grpxps.f grpxpx.f grpxre.f grqcap.f grqci.f  grqcol.f grqcr.f  grqdev.f grqdt.f  grqfnt.f grqls.f  grqlw.f  grqpos.f grqtxt.f grqtyp.f grquit.f grrec0.f grrect.f grsci.f  grscr.f  grsetc.f grscrl.f grsetc.f grsets.f grsfnt.f grsize.f grskpb.f grslct.f grsls.f  grslw.f  grsyds.f grsymk.f grsyxd.f grterm.f grtext.f grtoup.f grtrim.f grtrn0.f grtxy0.f grvct0.f grwarn.f grxhls.f grxrgb.f
 SYSTEM_ROUTINES= grdate.c grfileio.c grflun.f grgcom.f grgenv.f grgetc.c grglun.f grgmem.c grgmsg.f grlgtr.f groptx.f grsy00.f grtermio.c grtrml.f grtter.f gruser.f iand.c
-DRIVERS=gidriv.f gldriv.f hgdriv.f lxdriv.f nudriv.f ppdriv.f psdriv.f ttdriv.f wddriv.f x2driv.c figdisp_comm.c xwdriv.c
+DRIVERS=gidriv.f gldriv.f hgdriv.f lxdriv.f nudriv.f ppdriv.f psdriv.f ttdriv.f wddriv.f x2driv.c figdisp_comm.c xwdriv.c cgdriv.c pndriv.c xadriv.c
  
 .PATH:./src ./examples ./fonts ./drivers ./sys_freebsd ./pgdispd ./sys
 
 SRCS= ${PG_ROUTINES} ${PG_NON_STANDARD} ${GR_ROUTINES} ${SYSTEM_ROUTINES} \
 	${DRIVERS} grexec.f
 
-CFLAGS+=-DPG_PPU -I/usr/X11R6/include
+CFLAGS+=-DPG_PPU -I/usr/X11R6/include -I${PREFIX}/include
 
 .include <bsd.lib.mk>