10 files changed, 247 insertions, 215 deletions

diff --git a/graphics/pgplot/Makefile b/graphics/pgplot/Makefile
index 9e4086712414..6e93eadc3abd 100644
--- a/graphics/pgplot/Makefile
+++ b/graphics/pgplot/Makefile
@@ -7,30 +7,91 @@
 
 PORTNAME=	pgplot
 PORTVERSION=	5.2.2
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.astro.caltech.edu/pub/pgplot/
 DISTNAME=	${PORTNAME}${PORTVERSION:R}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bf@FreeBSD.org
 COMMENT=	A C/FORTRAN library for drawing graphs on a variety of display devices
 
 LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
 
 MAKE_JOBS_UNSAFE=	yes
 
-USE_PERL5_BUILD=yes
+USE_FORTRAN=	yes
 USE_LDCONFIG=	yes
+USE_XORG=	x11 xproto xt
+
+MAKE_ENV=	SSP_CFLAGS=
+SUFFIXES=	flib clib bin
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 .include <bsd.port.pre.mk>
 
-USE_XORG=	x11 xproto xt
-USE_FORTRAN=	yes
+.ifndef(NOPORTDATA)
+PORTDATA=	grfont.dat
+.endif
+
+.ifndef(NOPORTDOCS)
+DOCS=	cpg/cpgplot.doc pgplot-routines.tex pgplot.doc pgplot.html \
+	readme.pgdisp rgb.txt
+SUFFIXES+=	doc
+PORTDOCS=	${DOCS:C|.*/||}
+USE_PERL5_BUILD=	yes
+.endif
 
-post-install:
+.ifndef(NOPORTEXAMPLES)
+EXAMPLES=	Makefile.demo cpg/cpgdemo.c examples/pgdemo*.f
+PORTEXAMPLES=	${EXAMPLES:C|.*/||}
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/local/bin/perl|${PERL}|' \
+		${WRKSRC}/makehtml ${WRKSRC}/maketex
+	@${REINPLACE_CMD} -e 's|png_ptr->jmpbuf|png_jmpbuf(png_ptr)|' \
+		${WRKSRC}/drivers/pndriv.c
+	@${REINPLACE_CMD} -e 's|/usr/local/pgplot|${DATADIR}|g' \
+		${WRKSRC}/src/grgfil.f
+	@cd ${FILESDIR}; ${CP} Makefile* drivers.list grexec.f ${WRKSRC}
+	@${CP} ${WRKSRC}/src/*.inc ${WRKSRC}
+
+do-build:
+.for s in ${SUFFIXES}
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
+	Makefile.${s} ${_MAKE_JOBS} ${MAKE_ARGS}
+.endfor
+
+do-install:
+	@cd ${WRKSRC}; \
+	${INSTALL_PROGRAM} pgxwin_server pgdisp ${PREFIX}/bin; \
+	${INSTALL_LIB} *.a *.so.5* ${PREFIX}/lib; \
+	${INSTALL_DATA} cpgplot.h ${PREFIX}/include
 .for f in libcpgplot.so libpgplot.so
-	${LN} -sf $f.5 ${PREFIX}/lib/$f
+	@${LN} -sf ${f}.5 ${PREFIX}/lib/${f}
 .endfor
+.ifndef(NOPORTDATA)
+	@${MKDIR} ${DATADIR}
+	@cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDATA} ${DATADIR}
+.endif
+.ifndef(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@cd ${WRKSRC}; ${CP} pgdispd/aaaread.me readme.pgdisp; \
+	${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+.endif
+.ifndef(NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}
+	@cd ${WRKSRC}; ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
+.endif
+
+.if defined(MAINTAINER_MODE) && !defined(BATCH)
+
+check test: build
+	@cd ${WRKSRC}; ${CP} cpg/cpgdemo.c examples/pgdemo*.f ${WRKSRC}; \
+	${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
+	Makefile.demo ${_MAKE_JOBS} ${MAKE_ARGS}
+	@${SETENV} LD_LIBRARY_PATH="${LOCALBASE}/lib:${WRKSRC}" \
+	PGPLOT_DIR="${WRKSRC}" PGPLOT_DEV="/xwin" ${WRKSRC}/cpgdemo
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/pgplot/files/Makefile b/graphics/pgplot/files/Makefile
deleted file mode 100644
index e1abc0b5ffea..000000000000
--- a/graphics/pgplot/files/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-all:
-	make -f Makefile.flib LOCALBASE="${LOCALBASE}"
-	make -f Makefile.clib
-	make -f Makefile.bin LOCALBASE="${LOCALBASE}"
-	make -f Makefile.doc
-
-install:
-	install -c *.a *.so.5* ${PREFIX}/lib
-	mkdir -p ${PREFIX}/share/pgplot
-	install -c grfont.dat rgb.txt pgplot.doc pgplot.html pgplot-routines.tex cpg/cpgplot.doc ${PREFIX}/share/pgplot
-	install -c cpgplot.h ${PREFIX}/include
-	install -c  Makefile.demo examples/pgdemo*.f cpg/cpgdemo.c  ${PREFIX}/share/pgplot
-	cp pgdispd/aaaread.me ${PREFIX}/share/pgplot/readme.pgdisp
-	install -c -s  pgxwin_server pgdisp ${PREFIX}/bin
diff --git a/graphics/pgplot/files/Makefile.bin b/graphics/pgplot/files/Makefile.bin
index 0e668c9828ab..5f1e0b23c74a 100644
--- a/graphics/pgplot/files/Makefile.bin
+++ b/graphics/pgplot/files/Makefile.bin
@@ -1,21 +1,24 @@
-DRVDIR=./drivers
-LIBS=-L${LOCALBASE}/lib -lX11 -lm
-XINCL=-I${LOCALBASE}/include
+DRVDIR =	./drivers
+LIBS=	-L${LOCALBASE}/lib -lX11 -lm
+XINCL=	-I${LOCALBASE}/include
 
-CFLAGS+= $(XINCL) -DPGDISP 
+CFLAGS+=	${XINCL} -DPGDISP 
 .PATH: . ./pgdispd
 
-PGDISP_ROUTINES= cleanup.o pgdisp.o figcurs.o getdata.o getvisuals.o handlexevent.o proccom.o resdb.o exposelgwin.o getcolors.o initlgluts.o initlgwin.o initlock.o initwmattr.o mainloop.o resizelgwin.o returnbuf.o waitevent.o updatelgtitle.o
-
+PGDISP_ROUTINES=	cleanup.o pgdisp.o figcurs.o getdata.o getvisuals.o \
+	handlexevent.o proccom.o resdb.o exposelgwin.o getcolors.o initlgluts.o \
+	initlgwin.o initlock.o initwmattr.o mainloop.o resizelgwin.o \
+	returnbuf.o waitevent.o updatelgtitle.o
 
 all: grfont.dat pgxwin_server pgdisp
 
 grfont.dat: fonts/grfont.txt fonts/pgpack.f
-	$(FC) -o pgpack fonts/pgpack.f
+	${FC} ${FFLAGS} ${LDFLAGS} -o pgpack fonts/pgpack.f
 	./pgpack <fonts/grfont.txt
 
-pgxwin_server: $(DRVDIR)/pgxwin_server.c
-	$(CC) $(CFLAGS) -o pgxwin_server $(DRVDIR)/pgxwin_server.c $(LIBS)
+pgxwin_server: ${DRVDIR}/pgxwin_server.c
+	${CC} ${CFLAGS} ${LDFLAGS} -o pgxwin_server ${DRVDIR}/pgxwin_server.c \
+	${LIBS}
 
-pgdisp: $(PGDISP_ROUTINES)
-	$(CC) $(CFLAGS) -o pgdisp $(PGDISP_ROUTINES) $(LIBS)
+pgdisp: ${PGDISP_ROUTINES}
+	${CC} ${CFLAGS} ${LDFLAGS} -o pgdisp ${PGDISP_ROUTINES} ${LIBS}
diff --git a/graphics/pgplot/files/Makefile.clib b/graphics/pgplot/files/Makefile.clib
index 4111ad2724d3..ae9c327c1cec 100644
--- a/graphics/pgplot/files/Makefile.clib
+++ b/graphics/pgplot/files/Makefile.clib
@@ -1,36 +1,53 @@
-LIB=cpgplot
-
-SHLIB_MAJOR=    5
-SHLIB_MINOR=    2
-NOPROFILE=     no_way
-
-CFLAGS+=-DPG_PPU
-
-SRCDIR=./src
-PG_SOURCE=  $(SRCDIR)/pgarro.f $(SRCDIR)/pgask.f  $(SRCDIR)/pgband.f $(SRCDIR)/pgbbuf.f $(SRCDIR)/pgbeg.f  $(SRCDIR)/pgbin.f  $(SRCDIR)/pgbox.f  $(SRCDIR)/pgbox1.f $(SRCDIR)/pgcirc.f $(SRCDIR)/pgcl.f   $(SRCDIR)/pgclos.f $(SRCDIR)/pgcn01.f $(SRCDIR)/pgcnsc.f $(SRCDIR)/pgconb.f $(SRCDIR)/pgconl.f $(SRCDIR)/pgcons.f $(SRCDIR)/pgcont.f $(SRCDIR)/pgconx.f $(SRCDIR)/pgcp.f   $(SRCDIR)/pgctab.f $(SRCDIR)/pgcurs.f $(SRCDIR)/pgdraw.f $(SRCDIR)/pgebuf.f $(SRCDIR)/pgend.f  $(SRCDIR)/pgenv.f  $(SRCDIR)/pgeras.f $(SRCDIR)/pgerrb.f $(SRCDIR)/pgerrx.f $(SRCDIR)/pgerry.f $(SRCDIR)/pgetxt.f $(SRCDIR)/pgfunt.f $(SRCDIR)/pgfunx.f $(SRCDIR)/pgfuny.f $(SRCDIR)/pggray.f $(SRCDIR)/pghi2d.f $(SRCDIR)/pghis1.f $(SRCDIR)/pghist.f $(SRCDIR)/pghtch.f $(SRCDIR)/pgiden.f $(SRCDIR)/pgimag.f $(SRCDIR)/pginit.f $(SRCDIR)/pglab.f  $(SRCDIR)/pglcur.f $(SRCDIR)/pgldev.f $(SRCDIR)/pglen.f  $(SRCDIR)/pgline.f $(SRCDIR)/pgmove.f $(SRCDIR)/pgmtxt.f $(SRCDIR)/pgncur.f $(SRCDIR)/pgnoto.f $(SRCDIR)/pgnpl.f  $(SRCDIR)/pgnumb.f $(SRCDIR)/pgolin.f $(SRCDIR)/pgopen.f $(SRCDIR)/pgpage.f $(SRCDIR)/pgpanl.f $(SRCDIR)/pgpap.f  $(SRCDIR)/pgpixl.f $(SRCDIR)/pgpnts.f $(SRCDIR)/pgpoly.f $(SRCDIR)/pgpt.f   $(SRCDIR)/pgptxt.f $(SRCDIR)/pgqah.f  $(SRCDIR)/pgqcf.f  $(SRCDIR)/pgqch.f  $(SRCDIR)/pgqci.f  $(SRCDIR)/pgqcir.f $(SRCDIR)/pgqcol.f $(SRCDIR)/pgqcr.f  $(SRCDIR)/pgqcs.f  $(SRCDIR)/pgqfs.f  $(SRCDIR)/pgqhs.f  $(SRCDIR)/pgqid.f  $(SRCDIR)/pgqinf.f $(SRCDIR)/pgqitf.f $(SRCDIR)/pgqls.f  $(SRCDIR)/pgqlw.f  $(SRCDIR)/pgqpos.f $(SRCDIR)/pgqtbg.f $(SRCDIR)/pgqtxt.f $(SRCDIR)/pgqvp.f  $(SRCDIR)/pgqvsz.f $(SRCDIR)/pgqwin.f $(SRCDIR)/pgrect.f $(SRCDIR)/pgrnd.f  $(SRCDIR)/pgrnge.f $(SRCDIR)/pgsah.f  $(SRCDIR)/pgsave.f $(SRCDIR)/pgscf.f  $(SRCDIR)/pgsch.f  $(SRCDIR)/pgsci.f  $(SRCDIR)/pgscir.f $(SRCDIR)/pgscr.f  $(SRCDIR)/pgscrn.f $(SRCDIR)/pgsfs.f  $(SRCDIR)/pgshls.f $(SRCDIR)/pgshs.f  $(SRCDIR)/pgsitf.f $(SRCDIR)/pgslct.f $(SRCDIR)/pgsls.f  $(SRCDIR)/pgslw.f  $(SRCDIR)/pgstbg.f $(SRCDIR)/pgsubp.f $(SRCDIR)/pgsvp.f  $(SRCDIR)/pgswin.f $(SRCDIR)/pgtbox.f $(SRCDIR)/pgtext.f $(SRCDIR)/pgupdt.f $(SRCDIR)/pgvect.f $(SRCDIR)/pgvsiz.f $(SRCDIR)/pgvstd.f $(SRCDIR)/pgvw.f   $(SRCDIR)/pgwedg.f $(SRCDIR)/pgwnad.f  $(SRCDIR)/pgadvance.f $(SRCDIR)/pgbegin.f   $(SRCDIR)/pgcurse.f   $(SRCDIR)/pglabel.f   $(SRCDIR)/pgmtext.f   $(SRCDIR)/pgncurse.f  $(SRCDIR)/pgpaper.f   $(SRCDIR)/pgpoint.f   $(SRCDIR)/pgptext.f   $(SRCDIR)/pgvport.f   $(SRCDIR)/pgvsize.f   $(SRCDIR)/pgvstand.f  $(SRCDIR)/pgwindow.f $(SRCDIR)/pgaxis.f $(SRCDIR)/pgconf.f $(SRCDIR)/pgerr1.f $(SRCDIR)/pgpt1.f $(SRCDIR)/pgqclp.f $(SRCDIR)/pgqdt.f $(SRCDIR)/pgqndt.f $(SRCDIR)/pgsclp.f $(SRCDIR)/pgscrl.f $(SRCDIR)/pgtick.f
-
-SRCS=	cpgarro.c cpgask.c cpgband.c cpgbbuf.c cpgbeg.c cpgbin.c cpgbox.c\
-	cpgcirc.c cpgclos.c cpgconb.c cpgconl.c cpgcons.c cpgcont.c cpgctab.c\
-	cpgcurs.c cpgdraw.c cpgebuf.c cpgend.c cpgenv.c cpgeras.c cpgerrb.c\
-	cpgerrx.c cpgerry.c cpgetxt.c cpggray.c cpghi2d.c cpghist.c cpgiden.c\
-	cpgimag.c cpglab.c cpglcur.c cpgldev.c cpglen.c cpgline.c cpgmove.c\
-	cpgmtxt.c cpgncur.c cpgnumb.c cpgolin.c cpgopen.c cpgpage.c cpgpanl.c\
-	cpgpap.c cpgpixl.c cpgpnts.c cpgpoly.c cpgpt.c cpgptxt.c cpgqah.c\
-	cpgqcf.c cpgqch.c cpgqci.c cpgqcir.c cpgqcol.c cpgqcr.c cpgqcs.c\
-	cpgqfs.c cpgqhs.c cpgqid.c cpgqinf.c cpgqitf.c cpgqls.c cpgqlw.c\
-	cpgqpos.c cpgqtbg.c cpgqtxt.c cpgqvp.c cpgqvsz.c cpgqwin.c cpgrect.c\
-	cpgrnd.c cpgrnge.c cpgsah.c cpgsave.c cpgscf.c cpgsch.c cpgsci.c\
-	cpgscir.c cpgscr.c cpgscrn.c cpgsfs.c cpgshls.c cpgshs.c cpgsitf.c\
-	cpgslct.c cpgsls.c cpgslw.c cpgstbg.c cpgsubp.c cpgsvp.c cpgswin.c\
-	cpgtbox.c cpgtext.c cpgunsa.c cpgupdt.c cpgvect.c cpgvsiz.c cpgvstd.c\
-	cpgwedg.c cpgwnad.c cpgaxis.c cpgconf.c cpgerr1.c cpgpt1.c cpgqclp.c\
+LIB=	cpgplot
+
+SHLIB_MAJOR=	5
+SHLIB_MINOR=	2
+NO_PROFILE=	1
+
+CFLAGS+=	-DPG_PPU
+
+SRCDIR =	./src
+
+PG_SOURCE=	pgarro.f pgask.f pgband.f pgbbuf.f pgbeg.f pgbin.f pgbox.f \
+	pgbox1.f pgcirc.f pgcl.f pgclos.f pgcn01.f pgcnsc.f pgconb.f pgconl.f \
+	pgcons.f pgcont.f pgconx.f pgcp.f pgctab.f pgcurs.f pgdraw.f pgebuf.f \
+	pgend.f pgenv.f pgeras.f pgerrb.f pgerrx.f pgerry.f pgetxt.f pgfunt.f \
+	pgfunx.f pgfuny.f pggray.f pghi2d.f pghis1.f pghist.f pghtch.f \
+	pgiden.f pgimag.f pginit.f pglab.f pglcur.f pgldev.f pglen.f pgline.f \
+	pgmove.f pgmtxt.f pgncur.f pgnoto.f pgnpl.f pgnumb.f pgolin.f pgopen.f \
+	pgpage.f pgpanl.f pgpap.f pgpixl.f pgpnts.f pgpoly.f pgpt.f pgptxt.f \
+	pgqah.f pgqcf.f pgqch.f pgqci.f pgqcir.f pgqcol.f pgqcr.f pgqcs.f \
+	pgqfs.f pgqhs.f pgqid.f pgqinf.f pgqitf.f pgqls.f pgqlw.f pgqpos.f \
+	pgqtbg.f pgqtxt.f pgqvp.f pgqvsz.f pgqwin.f pgrect.f pgrnd.f pgrnge.f \
+	pgsah.f pgsave.f pgscf.f pgsch.f pgsci.f pgscir.f pgscr.f pgscrn.f \
+	pgsfs.f pgshls.f pgshs.f pgsitf.f pgslct.f pgsls.f pgslw.f pgstbg.f \
+	pgsubp.f pgsvp.f pgswin.f pgtbox.f pgtext.f pgupdt.f pgvect.f pgvsiz.f \
+	pgvstd.f pgvw.f pgwedg.f pgwnad.f 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 pgaxis.f pgconf.f pgerr1.f pgpt1.f \
+	pgqclp.f pgqdt.f pgqndt.f pgsclp.f pgscrl.f pgtick.f
+
+SRCS=	cpgarro.c cpgask.c cpgband.c cpgbbuf.c cpgbeg.c cpgbin.c cpgbox.c \
+	cpgcirc.c cpgclos.c cpgconb.c cpgconl.c cpgcons.c cpgcont.c cpgctab.c \
+	cpgcurs.c cpgdraw.c cpgebuf.c cpgend.c cpgenv.c cpgeras.c cpgerrb.c \
+	cpgerrx.c cpgerry.c cpgetxt.c cpggray.c cpghi2d.c cpghist.c cpgiden.c \
+	cpgimag.c cpglab.c cpglcur.c cpgldev.c cpglen.c cpgline.c cpgmove.c \
+	cpgmtxt.c cpgncur.c cpgnumb.c cpgolin.c cpgopen.c cpgpage.c cpgpanl.c \
+	cpgpap.c cpgpixl.c cpgpnts.c cpgpoly.c cpgpt.c cpgptxt.c cpgqah.c \
+	cpgqcf.c cpgqch.c cpgqci.c cpgqcir.c cpgqcol.c cpgqcr.c cpgqcs.c \
+	cpgqfs.c cpgqhs.c cpgqid.c cpgqinf.c cpgqitf.c cpgqls.c cpgqlw.c \
+	cpgqpos.c cpgqtbg.c cpgqtxt.c cpgqvp.c cpgqvsz.c cpgqwin.c cpgrect.c \
+	cpgrnd.c cpgrnge.c cpgsah.c cpgsave.c cpgscf.c cpgsch.c cpgsci.c \
+	cpgscir.c cpgscr.c cpgscrn.c cpgsfs.c cpgshls.c cpgshs.c cpgsitf.c \
+	cpgslct.c cpgsls.c cpgslw.c cpgstbg.c cpgsubp.c cpgsvp.c cpgswin.c \
+	cpgtbox.c cpgtext.c cpgunsa.c cpgupdt.c cpgvect.c cpgvsiz.c cpgvstd.c \
+	cpgwedg.c cpgwnad.c cpgaxis.c cpgconf.c cpgerr1.c cpgpt1.c cpgqclp.c \
 	cpgqdt.c cpgqndt.c cpgsclp.c cpgscrl.c cpgtick.c
 
-
 ${SRCS}: pgbind
-	./pgbind bsd -h -w $(PG_SOURCE)
+	./pgbind bsd -h -w ${PG_SOURCE:S|^|${SRCDIR}/|}
 
 pgbind: ./cpg/pgbind.c
-	$(CC) -o pgbind ./cpg/pgbind.c
+	${CC} ${CFLAGS} ${LDFLAGS} -o pgbind ./cpg/pgbind.c
 
 .include <bsd.lib.mk>
diff --git a/graphics/pgplot/files/Makefile.demo b/graphics/pgplot/files/Makefile.demo
index 7b7455923034..47bdfa1498f4 100644
--- a/graphics/pgplot/files/Makefile.demo
+++ b/graphics/pgplot/files/Makefile.demo
@@ -1,48 +1,66 @@
-PGPLOT_LIB = -L/usr/local/lib -lpgplot
-CPGPLOT_LIB = -L/usr/local/lib  -lcpgplot
-LIBS= -L${LOCALBASE}/lib -lX11 -lm
+PGPLOT_LIB=	-lpgplot
+CPGPLOT_LIB=	-lcpgplot
+LIBS=	-lX11 -lm
 
 FFLAGS+=	-fno-backslash
+LDFLAGS+=	-L. -L${LOCALBASE}/lib
 
 all: cpgdemo pgdemo1 pgdemo2 pgdemo3 pgdemo4 pgdemo5 pgdemo6 pgdemo7 pgdemo8 \
 	pgdemo9 pgdemo10 pgdemo11 pgdemo12 pgdemo13 pgdemo14 pgdemo15 \
 	pgdemo16 pgdemo17
 
 pgdemo1: pgdemo1.f libpgplot.a
-	$(FC) $(FFLAGS) -o pgdemo1 pgdemo1.f $(PGPLOT_LIB) $(LIBS)
+	${FC} ${FFLAGS} ${LDFLAGS} -o pgdemo1 pgdemo1.f ${PGPLOT_LIB} ${LIBS}
+
 pgdemo2: pgdemo2.f libpgplot.a
-	$(FC) $(FFLAGS) -o pgdemo2 pgdemo2.f $(PGPLOT_LIB) $(LIBS)
+	${FC} ${FFLAGS} ${LDFLAGS} -o pgdemo2 pgdemo2.f ${PGPLOT_LIB} ${LIBS}
+
 pgdemo3: pgdemo3.f libpgplot.a
-	$(FC) $(FFLAGS) -o pgdemo3 pgdemo3.f $(PGPLOT_LIB) $(LIBS)
+	${FC} ${FFLAGS} ${LDFLAGS} -o pgdemo3 pgdemo3.f ${PGPLOT_LIB} ${LIBS}
+
 pgdemo4: pgdemo4.f libpgplot.a
-	$(FC) $(FFLAGS) -o pgdemo4 pgdemo4.f $(PGPLOT_LIB) $(LIBS)
+	${FC} ${FFLAGS} ${LDFLAGS} -o pgdemo4 pgdemo4.f ${PGPLOT_LIB} ${LIBS}
+
 pgdemo5: pgdemo5.f libpgplot.a
-	$(FC) $(FFLAGS) -o pgdemo5 pgdemo5.f $(PGPLOT_LIB) $(LIBS)
+	${FC} ${FFLAGS} ${LDFLAGS} -o pgdemo5 pgdemo5.f ${PGPLOT_LIB} ${LIBS}
+
 pgdemo6: pgdemo6.f libpgplot.a
-	$(FC) $(FFLAGS) -o pgdemo6 pgdemo6.f $(PGPLOT_LIB) $(LIBS)
+	${FC} ${FFLAGS} ${LDFLAGS} -o pgdemo6 pgdemo6.f ${PGPLOT_LIB} ${LIBS}
+
 pgdemo7: pgdemo7.f libpgplot.a
-	$(FC) $(FFLAGS) -o pgdemo7 pgdemo7.f $(PGPLOT_LIB) $(LIBS)
+	${FC} ${FFLAGS} ${LDFLAGS} -o pgdemo7 pgdemo7.f ${PGPLOT_LIB} ${LIBS}
+
 pgdemo8: pgdemo8.f libpgplot.a
-	$(FC) $(FFLAGS) -o pgdemo8 pgdemo8.f $(PGPLOT_LIB) $(LIBS)
+	${FC} ${FFLAGS} ${LDFLAGS} -o pgdemo8 pgdemo8.f ${PGPLOT_LIB} ${LIBS}
+
 pgdemo9: pgdemo9.f libpgplot.a
-	$(FC) $(FFLAGS) -o pgdemo9 pgdemo9.f $(PGPLOT_LIB) $(LIBS)
+	${FC} ${FFLAGS} ${LDFLAGS} -o pgdemo9 pgdemo9.f ${PGPLOT_LIB} ${LIBS}
+
 pgdemo10: pgdemo10.f libpgplot.a
-	$(FC) $(FFLAGS) -o pgdemo10 pgdemo10.f $(PGPLOT_LIB) $(LIBS)
+	${FC} ${FFLAGS} ${LDFLAGS} -o pgdemo10 pgdemo10.f ${PGPLOT_LIB} ${LIBS}
+
 pgdemo11: pgdemo11.f libpgplot.a
-	$(FC) $(FFLAGS) -o pgdemo11 pgdemo11.f $(PGPLOT_LIB) $(LIBS)
+	${FC} ${FFLAGS} ${LDFLAGS} -o pgdemo11 pgdemo11.f ${PGPLOT_LIB} ${LIBS}
+
 pgdemo12: pgdemo12.f libpgplot.a
-	$(FC) $(FFLAGS) -o pgdemo12 pgdemo12.f $(PGPLOT_LIB) $(LIBS)
+	${FC} ${FFLAGS} ${LDFLAGS} -o pgdemo12 pgdemo12.f ${PGPLOT_LIB} ${LIBS}
+
 pgdemo13: pgdemo13.f libpgplot.a
-	$(FC) $(FFLAGS) -o pgdemo13 pgdemo13.f $(PGPLOT_LIB) $(LIBS)
+	${FC} ${FFLAGS} ${LDFLAGS} -o pgdemo13 pgdemo13.f ${PGPLOT_LIB} ${LIBS}
+
 pgdemo14: pgdemo14.f libpgplot.a
-	$(FC) $(FFLAGS) -o pgdemo14 pgdemo14.f $(PGPLOT_LIB) $(LIBS)
+	${FC} ${FFLAGS} ${LDFLAGS} -o pgdemo14 pgdemo14.f ${PGPLOT_LIB} ${LIBS}
+
 pgdemo15: pgdemo15.f libpgplot.a
-	$(FC) $(FFLAGS) -o pgdemo15 pgdemo15.f $(PGPLOT_LIB) $(LIBS)
+	${FC} ${FFLAGS} ${LDFLAGS} -o pgdemo15 pgdemo15.f ${PGPLOT_LIB} ${LIBS}
+
 pgdemo16: pgdemo16.f libpgplot.a
-	$(FC) $(FFLAGS) -o pgdemo16 pgdemo16.f $(PGPLOT_LIB) $(LIBS)
+	${FC} ${FFLAGS} ${LDFLAGS} -o pgdemo16 pgdemo16.f ${PGPLOT_LIB} ${LIBS}
+
 pgdemo17: pgdemo17.f libpgplot.a
-	$(FC) $(FFLAGS) -o pgdemo17 pgdemo17.f $(PGPLOT_LIB) $(LIBS)
+	${FC} ${FFLAGS} ${LDFLAGS} -o pgdemo17 pgdemo17.f ${PGPLOT_LIB} ${LIBS}
 
 cpgdemo: cpgdemo.c 
-	$(CC) $(CFLAGS) -c -I/usr/local/include cpgdemo.c
-	$(FC) -o cpgdemo cpgdemo.o $(PGPLOT_LIB) $(CPGPLOT_LIB) $(LIBS)
+	${CC} ${CFLAGS} -c -I${LOCALBASE}/include cpgdemo.c
+	${FC} ${FFLAGS} ${LDFLAGS} -o cpgdemo cpgdemo.o ${CPGPLOT_LIB} \
+	${PGPLOT_LIB} ${LIBS}
diff --git a/graphics/pgplot/files/Makefile.doc b/graphics/pgplot/files/Makefile.doc
index 3303090a3070..225891b75015 100644
--- a/graphics/pgplot/files/Makefile.doc
+++ b/graphics/pgplot/files/Makefile.doc
@@ -1,11 +1,32 @@
-SRCDIR=./src
-PG_SOURCE=  $(SRCDIR)/pgarro.f $(SRCDIR)/pgask.f  $(SRCDIR)/pgaxis.f $(SRCDIR)/pgaxlg.f $(SRCDIR)/pgband.f $(SRCDIR)/pgbbuf.f $(SRCDIR)/pgbeg.f  $(SRCDIR)/pgbin.f  $(SRCDIR)/pgbox.f  $(SRCDIR)/pgbox1.f $(SRCDIR)/pgcirc.f $(SRCDIR)/pgcl.f   $(SRCDIR)/pgclos.f $(SRCDIR)/pgcn01.f $(SRCDIR)/pgcnsc.f $(SRCDIR)/pgconb.f $(SRCDIR)/pgconf.f $(SRCDIR)/pgconl.f $(SRCDIR)/pgcons.f $(SRCDIR)/pgcont.f $(SRCDIR)/pgconx.f $(SRCDIR)/pgcp.f   $(SRCDIR)/pgctab.f $(SRCDIR)/pgcurs.f $(SRCDIR)/pgdraw.f $(SRCDIR)/pgebuf.f $(SRCDIR)/pgend.f  $(SRCDIR)/pgenv.f  $(SRCDIR)/pgeras.f $(SRCDIR)/pgerr1.f $(SRCDIR)/pgerrb.f $(SRCDIR)/pgerrx.f $(SRCDIR)/pgerry.f $(SRCDIR)/pgetxt.f $(SRCDIR)/pgfunt.f $(SRCDIR)/pgfunx.f $(SRCDIR)/pgfuny.f $(SRCDIR)/pggray.f $(SRCDIR)/pghi2d.f $(SRCDIR)/pghis1.f $(SRCDIR)/pghist.f $(SRCDIR)/pghtch.f $(SRCDIR)/pgiden.f $(SRCDIR)/pgimag.f $(SRCDIR)/pginit.f $(SRCDIR)/pglab.f  $(SRCDIR)/pglcur.f $(SRCDIR)/pgldev.f $(SRCDIR)/pglen.f  $(SRCDIR)/pgline.f $(SRCDIR)/pgmove.f $(SRCDIR)/pgmtxt.f $(SRCDIR)/pgncur.f $(SRCDIR)/pgnoto.f $(SRCDIR)/pgnpl.f  $(SRCDIR)/pgnumb.f $(SRCDIR)/pgolin.f $(SRCDIR)/pgopen.f $(SRCDIR)/pgpage.f $(SRCDIR)/pgpanl.f $(SRCDIR)/pgpap.f  $(SRCDIR)/pgpixl.f $(SRCDIR)/pgpnts.f $(SRCDIR)/pgpoly.f $(SRCDIR)/pgpt.f   $(SRCDIR)/pgpt1.f  $(SRCDIR)/pgptxt.f $(SRCDIR)/pgqah.f  $(SRCDIR)/pgqcf.f  $(SRCDIR)/pgqch.f  $(SRCDIR)/pgqci.f  $(SRCDIR)/pgqcir.f $(SRCDIR)/pgqclp.f $(SRCDIR)/pgqcol.f $(SRCDIR)/pgqcr.f  $(SRCDIR)/pgqcs.f  $(SRCDIR)/pgqdt.f  $(SRCDIR)/pgqfs.f  $(SRCDIR)/pgqhs.f  $(SRCDIR)/pgqid.f  $(SRCDIR)/pgqinf.f $(SRCDIR)/pgqitf.f $(SRCDIR)/pgqls.f  $(SRCDIR)/pgqlw.f  $(SRCDIR)/pgqndt.f $(SRCDIR)/pgqpos.f $(SRCDIR)/pgqtbg.f $(SRCDIR)/pgqtxt.f $(SRCDIR)/pgqvp.f  $(SRCDIR)/pgqvsz.f $(SRCDIR)/pgqwin.f $(SRCDIR)/pgrect.f $(SRCDIR)/pgrnd.f  $(SRCDIR)/pgrnge.f $(SRCDIR)/pgsah.f  $(SRCDIR)/pgsave.f $(SRCDIR)/pgscf.f  $(SRCDIR)/pgsch.f  $(SRCDIR)/pgsci.f  $(SRCDIR)/pgscir.f $(SRCDIR)/pgsclp.f $(SRCDIR)/pgscr.f  $(SRCDIR)/pgscrl.f $(SRCDIR)/pgscrn.f $(SRCDIR)/pgsfs.f  $(SRCDIR)/pgshls.f $(SRCDIR)/pgshs.f  $(SRCDIR)/pgsitf.f $(SRCDIR)/pgslct.f $(SRCDIR)/pgsls.f  $(SRCDIR)/pgslw.f  $(SRCDIR)/pgstbg.f $(SRCDIR)/pgsubp.f $(SRCDIR)/pgsvp.f  $(SRCDIR)/pgswin.f $(SRCDIR)/pgtbox.f $(SRCDIR)/pgtext.f $(SRCDIR)/pgtick.f $(SRCDIR)/pgtikl.f $(SRCDIR)/pgupdt.f $(SRCDIR)/pgvect.f $(SRCDIR)/pgvsiz.f $(SRCDIR)/pgvstd.f $(SRCDIR)/pgvw.f   $(SRCDIR)/pgwedg.f $(SRCDIR)/pgwnad.f  $(SRCDIR)/pgadvance.f $(SRCDIR)/pgbegin.f   $(SRCDIR)/pgcurse.f   $(SRCDIR)/pglabel.f   $(SRCDIR)/pgmtext.f   $(SRCDIR)/pgncurse.f  $(SRCDIR)/pgpaper.f   $(SRCDIR)/pgpoint.f   $(SRCDIR)/pgptext.f   $(SRCDIR)/pgvport.f   $(SRCDIR)/pgvsize.f   $(SRCDIR)/pgvstand.f  $(SRCDIR)/pgwindow.f 
+SRCDIR =	./src
+
+PG_SOURCE=      pgarro.f pgask.f pgaxis.f pgaxlg.f pgband.f pgbbuf.f pgbeg.f \
+	pgbin.f pgbox.f pgbox1.f pgcirc.f pgcl.f pgclos.f pgcn01.f pgcnsc.f \
+	pgconb.f pgconf.f pgconl.f pgcons.f pgcont.f pgconx.f pgcp.f pgctab.f \
+	pgcurs.f pgdraw.f pgebuf.f pgend.f pgenv.f pgeras.f pgerr1.f pgerrb.f \
+	pgerrx.f pgerry.f pgetxt.f pgfunt.f pgfunx.f pgfuny.f pggray.f \
+	pghi2d.f pghis1.f pghist.f pghtch.f pgiden.f pgimag.f pginit.f pglab.f \
+	pglcur.f pgldev.f pglen.f pgline.f pgmove.f pgmtxt.f pgncur.f pgnoto.f \
+	pgnpl.f pgnumb.f pgolin.f pgopen.f pgpage.f pgpanl.f pgpap.f pgpixl.f \
+	pgpnts.f pgpoly.f pgpt.f pgpt1.f pgptxt.f pgqah.f pgqcf.f pgqch.f \
+	pgqci.f pgqcir.f pgqclp.f pgqcol.f pgqcr.f pgqcs.f pgqdt.f pgqfs.f \
+	pgqhs.f pgqid.f pgqinf.f pgqitf.f pgqls.f pgqlw.f pgqndt.f pgqpos.f \
+	pgqtbg.f pgqtxt.f pgqvp.f pgqvsz.f pgqwin.f pgrect.f pgrnd.f pgrnge.f \
+	pgsah.f pgsave.f pgscf.f pgsch.f pgsci.f pgscir.f pgsclp.f pgscr.f \
+	pgscrl.f pgscrn.f pgsfs.f pgshls.f pgshs.f pgsitf.f pgslct.f pgsls.f \
+	pgslw.f pgstbg.f pgsubp.f pgsvp.f pgswin.f pgtbox.f pgtext.f pgtick.f \
+	pgtikl.f pgupdt.f pgvect.f pgvsiz.f pgvstd.f pgvw.f pgwedg.f pgwnad.f \
+	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
 
 all: pgplot.doc pgplot.html pgplot-routines.tex
 
-pgplot.doc: $(PG_SOURCE)
-	./makedoc $(PG_SOURCE) > pgplot.doc
-pgplot.html: $(PG_SOURCE)
-	./makehtml $(PG_SOURCE) > pgplot.html
-pgplot-routines.tex: $(PG_SOURCE)
-	./maketex $(PG_SOURCE) > pgplot-routines.tex
+pgplot.doc: ${PG_SOURCE:S|^|${SRCDIR}/|}
+	./makedoc ${PG_SOURCE:S|^|${SRCDIR}/|} > pgplot.doc
+
+pgplot.html: ${PG_SOURCE:S|^|${SRCDIR}/|}
+	./makehtml ${PG_SOURCE:S|^|${SRCDIR}/|} > pgplot.html
+
+pgplot-routines.tex: ${PG_SOURCE:S|^|${SRCDIR}/|}
+	./maketex ${PG_SOURCE:S|^|${SRCDIR}/|} > pgplot-routines.tex
diff --git a/graphics/pgplot/files/Makefile.flib b/graphics/pgplot/files/Makefile.flib
index 24ce5f8bf0d1..86093d44778d 100644
--- a/graphics/pgplot/files/Makefile.flib
+++ b/graphics/pgplot/files/Makefile.flib
@@ -1,21 +1,57 @@
-LIB=pgplot
+LIB=	pgplot
 
-SHLIB_MAJOR=    5
-SHLIB_MINOR=    2
-NOPROFILE=     no_way
+SHLIB_MAJOR=	5
+SHLIB_MINOR=	2
+NO_PROFILE=	1
 
-PG_ROUTINES= pgarro.f pgask.f pgaxis.f pgaxlg.f  pgband.f pgbbuf.f pgbeg.f  pgbin.f  pgbox.f  pgbox1.f pgcirc.f pgcl.f   pgclos.f pgcn01.f pgcnsc.f pgconb.f pgconf.f pgconl.f pgcons.f pgcont.f pgconx.f pgcp.f   pgctab.f pgcurs.f pgdraw.f pgebuf.f pgend.f  pgenv.f  pgeras.f pgerr1.f pgerrb.f pgerrx.f pgerry.f pgetxt.f pgfunt.f pgfunx.f pgfuny.f pggray.f pghi2d.f pghis1.f pghist.f pghtch.f pgiden.f pgimag.f pginit.f pglab.f  pglcur.f pgldev.f pglen.f  pgline.f pgmove.f pgmtxt.f pgncur.f pgnoto.f pgnpl.f  pgnumb.f pgolin.f pgopen.f pgpage.f pgpanl.f pgpap.f  pgpixl.f pgpnts.f pgpoly.f pgpt.f   pgpt1.f pgptxt.f pgqah.f  pgqcf.f  pgqch.f  pgqci.f  pgqcir.f pgqclp.f pgqcol.f pgqcr.f  pgqcs.f  pgqdt.f pgqfs.f  pgqhs.f  pgqid.f  pgqinf.f pgqitf.f pgqls.f  pgqlw.f  pgqndt.f  pgqpos.f pgqtbg.f pgqtxt.f pgqvp.f  pgqvsz.f pgqwin.f pgrect.f pgrnd.f  pgrnge.f pgsah.f  pgsave.f pgscf.f  pgsch.f  pgsci.f  pgscir.f pgsclp.f pgscr.f  pgscrl.f pgscrn.f pgsfs.f  pgshls.f pgshs.f  pgsitf.f pgslct.f pgsls.f  pgslw.f  pgstbg.f pgsubp.f pgsvp.f  pgswin.f pgtbox.f pgtext.f pgtick.f pgtikl.f pgupdt.f pgvect.f pgvsiz.f pgvstd.f pgvw.f   pgwedg.f pgwnad.f
-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.c 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 cgdriv.c pndriv.c xadriv.c
+CFLAGS+=	-DPG_PPU -I${PREFIX}/include -I${LOCALBASE}/include 
+LDADD=	-lpng
+LDFLAGS+=	-L${LOCALBASE}/lib
+.PATH: ./src ./examples ./fonts ./drivers ./sys_freebsd ./pgdispd ./sys
 
-.PATH:./src ./examples ./fonts ./drivers ./sys_freebsd ./pgdispd ./sys
+PG_ROUTINES=	pgarro.f pgask.f pgaxis.f pgaxlg.f pgband.f pgbbuf.f pgbeg.f \
+	pgbin.f pgbox.f pgbox1.f pgcirc.f pgcl.f pgclos.f pgcn01.f pgcnsc.f \
+	pgconb.f pgconf.f pgconl.f pgcons.f pgcont.f pgconx.f pgcp.f pgctab.f \
+	pgcurs.f pgdraw.f pgebuf.f pgend.f pgenv.f pgeras.f pgerr1.f pgerrb.f \
+	pgerrx.f pgerry.f pgetxt.f pgfunt.f pgfunx.f pgfuny.f pggray.f \
+	pghi2d.f pghis1.f pghist.f pghtch.f pgiden.f pgimag.f pginit.f pglab.f \
+	pglcur.f pgldev.f pglen.f pgline.f pgmove.f pgmtxt.f pgncur.f pgnoto.f \
+	pgnpl.f pgnumb.f pgolin.f pgopen.f pgpage.f pgpanl.f pgpap.f pgpixl.f \
+	pgpnts.f pgpoly.f pgpt.f pgpt1.f pgptxt.f pgqah.f pgqcf.f pgqch.f \
+	pgqci.f pgqcir.f pgqclp.f pgqcol.f pgqcr.f pgqcs.f pgqdt.f pgqfs.f \
+	pgqhs.f pgqid.f pgqinf.f pgqitf.f pgqls.f pgqlw.f pgqndt.f pgqpos.f \
+	pgqtbg.f pgqtxt.f pgqvp.f pgqvsz.f pgqwin.f pgrect.f pgrnd.f pgrnge.f \
+	pgsah.f pgsave.f pgscf.f pgsch.f pgsci.f pgscir.f pgsclp.f pgscr.f \
+	pgscrl.f pgscrn.f pgsfs.f pgshls.f pgshs.f pgsitf.f pgslct.f pgsls.f \
+	pgslw.f pgstbg.f pgsubp.f pgsvp.f pgswin.f pgtbox.f pgtext.f pgtick.f \
+	pgtikl.f pgupdt.f pgvect.f pgvsiz.f pgvstd.f pgvw.f pgwedg.f pgwnad.f
 
-SRCS= ${PG_ROUTINES} ${PG_NON_STANDARD} ${GR_ROUTINES} ${SYSTEM_ROUTINES} \
-	${DRIVERS} grexec.f
+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.c iand.c
 
-CFLAGS+=-DPG_PPU -I${LOCALBASE}/include -I${PREFIX}/include
-LDADD=-L${PREFIX}/lib -lpng
+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
+
+SRCS=	${PG_ROUTINES} ${PG_NON_STANDARD} ${GR_ROUTINES} ${SYSTEM_ROUTINES} \
+	${DRIVERS} grexec.f
 
 .include <bsd.lib.mk>
diff --git a/graphics/pgplot/files/xf77 b/graphics/pgplot/files/xf77
deleted file mode 100644
index 6e04a2ebdca7..000000000000
--- a/graphics/pgplot/files/xf77
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/perl
-
-$ftxt = "ipercent_val";
-$ctxt = $ftxt . "__";
-$myname = $0;
-
-@names = ();
-$count = 0;
-
-while ($ARGV[0] =~ /^-/) {
-    $opt .= " $ARGV[0]";
-    if ($ARGV[0] eq "-o") {
-	shift;
-	$opt .= " $ARGV[0]";
-    }
-    shift;
-}
-if ("$opt" eq " -1") {&phase1;}
-elsif ("$opt" eq " -2") {&phase2;}
-else {
-    $src = $ARGV[0];
-    $tmp = $src;
-    $tmp =~ s:.*/::;
-    $tmp =~ s:f$:c:;
-    $tmp = "/tmp/$tmp";
-    system "$myname -1 < $src | f2c -f | $myname -2 > $tmp";
-    system "cc -c $opt $tmp";
-    unlink $tmp;
-}
-exit 0;
-
-sub phase1 {
-    while (<>) {
-	s/%[Vv][Aa][Ll]/$ftxt/g;
-	print $_;
-    }
-}
-sub phase2 {
-    while (<>) {
-	if (/(\s*)(\w*)(\s*=\s*)($ctxt)/) {
-	    $p = $2;
-	    s/$ctxt\(&/\(/;
-	    $names[$count] = $p;
-	    $count++;
-	    print $_;
-	} else {
-	    if ($count && /(\s*)(\w*)_\(/) {
-		&repl ($_);
-	    } else {
-		print $_;
-	    }
-	}
-    }
-}
-
-sub repl {
-    $l = shift;
-    while ($l) {
-        foreach (@names) {
-            $l =~ s/&$_/$_/g;
-        }
-        print $l;
-        if ($l =~ /\);/) {
-            @names = ();
-            $count = 0;
-            return;
-        }
-        $l = <>;
-    }
-}
-
diff --git a/graphics/pgplot/pkg-plist b/graphics/pgplot/pkg-plist
index 392ed16ad83b..0997b846f951 100644
--- a/graphics/pgplot/pkg-plist
+++ b/graphics/pgplot/pkg-plist
@@ -7,30 +7,3 @@ lib/libcpgplot.so.5
 lib/libpgplot.a
 lib/libpgplot.so
 lib/libpgplot.so.5
-share/pgplot/Makefile.demo
-share/pgplot/cpgdemo.c
-share/pgplot/cpgplot.doc
-share/pgplot/grfont.dat
-share/pgplot/pgplot.doc
-share/pgplot/pgplot.html
-share/pgplot/pgplot-routines.tex
-share/pgplot/readme.pgdisp
-share/pgplot/rgb.txt
-share/pgplot/pgdemo1.f
-share/pgplot/pgdemo2.f
-share/pgplot/pgdemo3.f
-share/pgplot/pgdemo4.f
-share/pgplot/pgdemo5.f
-share/pgplot/pgdemo6.f
-share/pgplot/pgdemo7.f
-share/pgplot/pgdemo8.f
-share/pgplot/pgdemo9.f
-share/pgplot/pgdemo10.f
-share/pgplot/pgdemo11.f
-share/pgplot/pgdemo12.f
-share/pgplot/pgdemo13.f
-share/pgplot/pgdemo14.f
-share/pgplot/pgdemo15.f
-share/pgplot/pgdemo16.f
-share/pgplot/pgdemo17.f
-@dirrm share/pgplot
diff --git a/graphics/pgplot/scripts/configure b/graphics/pgplot/scripts/configure
deleted file mode 100644
index 267020654340..000000000000
--- a/graphics/pgplot/scripts/configure
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-cd $WRKSRC/src || exit 1
-mv grgfil.f grgfil.f.orig
-sed -e s:/usr/local/pgplot/:$PREFIX/share/pgplot/: < grgfil.f.orig >grgfil.f
-
-cp $FILESDIR/Makefile* $FILESDIR/drivers.list $FILESDIR/grexec.f $FILESDIR/xf77  $WRKSRC
-chmod u+x $WRKSRC/xf77
-cp $WRKSRC/src/*.inc $WRKSRC
-exit 0
-