- X11BASE clean

- properly link libpgplot.so against -lpng (so that each program which
  links with libpgplot.so does not have to specify -lpng)
- a bit cleaner (use macros where possible, etc.)

Submitted by:	knu

5 files changed, 16 insertions, 15 deletions

diff --git a/graphics/pgplot/Makefile b/graphics/pgplot/Makefile
index 1749fdf890e2..f9a12f7a8f02 100644
--- a/graphics/pgplot/Makefile
+++ b/graphics/pgplot/Makefile
@@ -7,16 +7,17 @@
 
 PORTNAME=	pgplot
 PORTVERSION=	5.2.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.astro.caltech.edu/pub/pgplot/
-DISTNAME=	${PORTNAME}5.2
+DISTNAME=	${PORTNAME}${PORTVERSION:R}
 
 MAINTAINER=	jmz@FreeBSD.org
 
 LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png
 USE_XLIB=	yes
 INSTALLS_SHLIB=	yes
-WRKSRC=		${WRKDIR}/pgplot
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 .include <bsd.port.pre.mk>
 
@@ -33,6 +34,7 @@ FC=	f77
 .endif
 
 MAKE_ENV+=	FC=${FC}
+MAKE_ARGS+=	X11BASE="${X11BASE}"
 
 post-install:
 .for f in libcpgplot.so libpgplot.so
diff --git a/graphics/pgplot/files/Makefile b/graphics/pgplot/files/Makefile
index d2d5a3776722..90f6b4358de3 100644
--- a/graphics/pgplot/files/Makefile
+++ b/graphics/pgplot/files/Makefile
@@ -1,8 +1,8 @@
-D=examples/
+# $FreeBSD$
 all:
-	make -f Makefile.flib
+	make -f Makefile.flib X11BASE="${X11BASE}"
 	make -f Makefile.clib
-	make -f Makefile.bin 
+	make -f Makefile.bin X11BASE="${X11BASE}"
 	make -f Makefile.doc
 
 install:
@@ -13,4 +13,3 @@ install:
 	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 fe8a92f51745..6e2f5993a7f0 100644
--- a/graphics/pgplot/files/Makefile.bin
+++ b/graphics/pgplot/files/Makefile.bin
@@ -1,7 +1,6 @@
 DRVDIR=./drivers
-
-LIBS=-L/usr/X11R6/lib -lX11 -lm
-XINCL=-I/usr/X11R6/include
+LIBS=-L${X11BASE}/lib -lX11 -lm
+XINCL=-I${X11BASE}/include
 
 CFLAGS+= $(XINCL) -DPGDISP 
 .PATH: . ./pgdispd
diff --git a/graphics/pgplot/files/Makefile.demo b/graphics/pgplot/files/Makefile.demo
index 29b3ff673bff..080127040544 100644
--- a/graphics/pgplot/files/Makefile.demo
+++ b/graphics/pgplot/files/Makefile.demo
@@ -1,6 +1,6 @@
-PGPLOT_LIB = -L/usr/local/lib -lpgplot -lpng
-CPGPLOT_LIB = -L/usr/local/lib  -lcpgplot -lpng
-LIBS= -L/usr/X11R6/lib -lX11 -lm
+PGPLOT_LIB = -L/usr/local/lib -lpgplot
+CPGPLOT_LIB = -L/usr/local/lib  -lcpgplot
+LIBS= -L${X11BASE}/lib -lX11 -lm
 
 OSVERSION!=	/sbin/sysctl -n kern.osreldate
 .if ${OSVERSION} > 400004
@@ -10,7 +10,7 @@ FFLAGS+=	-fno-backslash
 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)
 pgdemo2: pgdemo2.f libpgplot.a
diff --git a/graphics/pgplot/files/Makefile.flib b/graphics/pgplot/files/Makefile.flib
index e8c3998b5d90..169b7028b9e1 100644
--- a/graphics/pgplot/files/Makefile.flib
+++ b/graphics/pgplot/files/Makefile.flib
@@ -9,12 +9,13 @@ PG_NON_STANDARD= pgadvance.f pgbegin.f   pgcurse.f   pglabel.f   pgmtext.f   pgn
 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 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 -I${PREFIX}/include
+CFLAGS+=-DPG_PPU -I${X11BASE}/include -I${PREFIX}/include
+LDADD=-L${PREFIX}/lib -lpng
 
 .include <bsd.lib.mk>