From 29747f458a1eb2ce23b4594b09d0256dd62760b8 Mon Sep 17 00:00:00 2001
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Sat, 14 Oct 2006 08:54:54 +0000
Subject: Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the
 new freetype2 where needed.

Submitted by:	mezz, ahze, pav, and many others
Approved by:	portmgr (implicit, kris)
---
 audio/terminatorx/Makefile                 | 6 ++----
 audio/terminatorx/files/patch-src::main.cc | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'audio/terminatorx')

diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile
index ed9fd90fa05e..951eb49237cc 100644
--- a/audio/terminatorx/Makefile
+++ b/audio/terminatorx/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	terminatorx
 PORTVERSION=	3.82
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://terminatorx.org/dist/
 DISTNAME=	terminatorX-${PORTVERSION}
@@ -21,7 +21,7 @@ LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile \
 		jack.0:${PORTSDIR}/audio/jack
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 INSTALLS_OMF=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget gtk20 libxml2
 USE_GMAKE=	yes
@@ -72,8 +72,6 @@ post-patch:
 		's|malloc\.h|stdlib.h|g'
 	@${GREP} -lR "%%LOCALBASE%%" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
 		's|%%LOCALBASE%%|${LOCALBASE}|g'
-	@${GREP} -lR "%%X11BASE%%" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
-		's|%%X11BASE%%|${LOCALBASE}|g'
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/terminatorX ${PREFIX}/bin
diff --git a/audio/terminatorx/files/patch-src::main.cc b/audio/terminatorx/files/patch-src::main.cc
index 834b59e3ad6f..4b8a777e90f5 100644
--- a/audio/terminatorx/files/patch-src::main.cc
+++ b/audio/terminatorx/files/patch-src::main.cc
@@ -5,7 +5,7 @@
  */
  
 -#define TX_GTKRC "/usr/share/themes/terminatorX/gtk/gtkrc"
-+#define TX_GTKRC "%%X11BASE%%/share/themes/terminatorX/gtk/gtkrc"
++#define TX_GTKRC "%%LOCALBASE%%/share/themes/terminatorX/gtk/gtkrc"
  
  #define BENCH_CYCLES 100000
  
-- 
cgit v1.2.3