From bce9b81f9d6099820f3839d7809d6b08c1d2ae7b Mon Sep 17 00:00:00 2001
From: miwi <miwi@FreeBSD.org>
Date: Sat, 19 Apr 2008 17:56:05 +0000
Subject: - 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)
---
 math/xgfe/Makefile       | 3 +--
 math/xgfe/files/patch-aa | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'math/xgfe')

diff --git a/math/xgfe/Makefile b/math/xgfe/Makefile
index 3d059a3d727d..74976a48d6be 100644
--- a/math/xgfe/Makefile
+++ b/math/xgfe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xgfe
 PORTVERSION=	2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	graphics/gnuplot/contrib
@@ -18,7 +18,6 @@ COMMENT=	An X11 front-end for Gnuplot
 RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 
 USE_QT_VER=	3
-USE_X_PREFIX=	yes
 
 MAKE_ENV+=	DOCSDIR=$(DOCSDIR) PTHREAD_CFLAGS="$(PTHREAD_CFLAGS)" \
 		PTHREAD_LIBS="$(PTHREAD_LIBS)" QT_PREFIX="${QT_PREFIX}"
diff --git a/math/xgfe/files/patch-aa b/math/xgfe/files/patch-aa
index 41d270410049..fa5c9eabf804 100644
--- a/math/xgfe/files/patch-aa
+++ b/math/xgfe/files/patch-aa
@@ -11,12 +11,12 @@
 +#CC	=	gcc
 +CXXFLAGS	+=	${PTHREAD_CFLAGS}
 +QTDIR	=	$(QT_PREFIX)
-+INCPATH	=	-I$(X11BASE)/include
++INCPATH	=	-I$(LOCALBASE)/include
 +LINK	=	$(CXX)
  LFLAGS	=	
 -LIBS	=	-L$(QTDIR)/lib -lqt -L/usr/X11R6/lib -lX11
 -MOC	=	moc
-+LIBS	=	-L$(X11BASE)/lib -lqt-mt -lX11 ${PTHREAD_LIBS}
++LIBS	=	-L$(LOCALBASE)/lib -lqt-mt -lX11 ${PTHREAD_LIBS}
 +MOC	=	${QTDIR}/bin/moc
  
  ####### Files
-- 
cgit