From e3d663dbadc27cbbf44ad5c66cd028a4487a3bf2 Mon Sep 17 00:00:00 2001
From: pav <pav@FreeBSD.org>
Date: Mon, 6 Dec 2010 21:05:20 +0000
Subject: - Fix build with new tix

---
 lang/ohugs/Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'lang')

diff --git a/lang/ohugs/Makefile b/lang/ohugs/Makefile
index 6e1cb69d3168..4fed82fe5447 100644
--- a/lang/ohugs/Makefile
+++ b/lang/ohugs/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	ohugs
 PORTVERSION=	0.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	lang haskell
 MASTER_SITES=	http://www.math.chalmers.se/~nordland/ohugs/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
@@ -16,7 +16,7 @@ COMMENT=	Interpreter for Haskell with object-oriented features
 
 LIB_DEPENDS=	readline.6:${PORTSDIR}/devel/readline
 .if !defined(WITHOUT_X11)
-LIB_DEPENDS+=	tix8184:${PORTSDIR}/x11-toolkits/tix
+LIB_DEPENDS=	Tix8.4.3.0:${PORTSDIR}/x11-toolkits/tix
 .endif
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/.src//}
@@ -24,8 +24,9 @@ BUILD_WRKSRC=	${WRKSRC}/src
 USE_BISON=	build
 LDFLAGS+=	-lm -lreadline -ltermcap
 .if !defined(WITHOUT_X11)
-CFLAGS+=	-I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -ltk84 -ltcl84 -ltix8184
+USE_TK=		84+
+CFLAGS+=	-I${TK_INCLUDEDIR} -I${TCL_INCLUDEDIR} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -ltk${TK_VER:S/.//} -ltcl${TCL_VER:S/.//} -lTix8.4.3
 .endif
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
 		INSTBIN=${PREFIX}/bin INSTLIB=${PREFIX}/lib/ohugs
-- 
cgit