- Remove unneeded dependency from gtk12/gtk20 [1]

- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+

Thanks to all Helpers:
	Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
	ehaupt, nox, itetcu, flz, pav

PR:		116263
Tested on:	pointyhat
Approved by:	portmgr (pav)

5 files changed, 8 insertions, 9 deletions

diff --git a/graphics/pgplot/Makefile b/graphics/pgplot/Makefile
index 6b3f7c0419b6..8ed51dc5e2af 100644
--- a/graphics/pgplot/Makefile
+++ b/graphics/pgplot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pgplot
 PORTVERSION=	5.2.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.astro.caltech.edu/pub/pgplot/
 DISTNAME=	${PORTNAME}${PORTVERSION:R}
@@ -17,15 +17,14 @@ COMMENT=	A C/FORTRAN library for drawing graphs on a variety of display devices
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
-USE_XLIB=	yes
 USE_PERL5_BUILD=yes
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 .include <bsd.port.pre.mk>
 
+USE_XORG=	x11 xproto xt
 USE_FORTRAN=	yes
-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 90f6b4358de3..e1abc0b5ffea 100644
--- a/graphics/pgplot/files/Makefile
+++ b/graphics/pgplot/files/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 all:
-	make -f Makefile.flib X11BASE="${X11BASE}"
+	make -f Makefile.flib LOCALBASE="${LOCALBASE}"
 	make -f Makefile.clib
-	make -f Makefile.bin X11BASE="${X11BASE}"
+	make -f Makefile.bin LOCALBASE="${LOCALBASE}"
 	make -f Makefile.doc
 
 install:
diff --git a/graphics/pgplot/files/Makefile.bin b/graphics/pgplot/files/Makefile.bin
index e2ccc80b3986..0e668c9828ab 100644
--- a/graphics/pgplot/files/Makefile.bin
+++ b/graphics/pgplot/files/Makefile.bin
@@ -1,6 +1,6 @@
 DRVDIR=./drivers
-LIBS=-L${X11BASE}/lib -lX11 -lm
-XINCL=-I${X11BASE}/include
+LIBS=-L${LOCALBASE}/lib -lX11 -lm
+XINCL=-I${LOCALBASE}/include
 
 CFLAGS+= $(XINCL) -DPGDISP 
 .PATH: . ./pgdispd
diff --git a/graphics/pgplot/files/Makefile.demo b/graphics/pgplot/files/Makefile.demo
index 080127040544..2d2ff02104a1 100644
--- a/graphics/pgplot/files/Makefile.demo
+++ b/graphics/pgplot/files/Makefile.demo
@@ -1,6 +1,6 @@
 PGPLOT_LIB = -L/usr/local/lib -lpgplot
 CPGPLOT_LIB = -L/usr/local/lib  -lcpgplot
-LIBS= -L${X11BASE}/lib -lX11 -lm
+LIBS= -L${LOCALBASE}/lib -lX11 -lm
 
 OSVERSION!=	/sbin/sysctl -n kern.osreldate
 .if ${OSVERSION} > 400004
diff --git a/graphics/pgplot/files/Makefile.flib b/graphics/pgplot/files/Makefile.flib
index f1f653772045..24ce5f8bf0d1 100644
--- a/graphics/pgplot/files/Makefile.flib
+++ b/graphics/pgplot/files/Makefile.flib
@@ -15,7 +15,7 @@ DRIVERS=gidriv.f gldriv.f hgdriv.f lxdriv.f nudriv.f ppdriv.f psdriv.f ttdriv.f
 SRCS= ${PG_ROUTINES} ${PG_NON_STANDARD} ${GR_ROUTINES} ${SYSTEM_ROUTINES} \
 	${DRIVERS} grexec.f
 
-CFLAGS+=-DPG_PPU -I${X11BASE}/include -I${PREFIX}/include
+CFLAGS+=-DPG_PPU -I${LOCALBASE}/include -I${PREFIX}/include
 LDADD=-L${PREFIX}/lib -lpng
 
 .include <bsd.lib.mk>