From 0fcb7144a972c46943665e904ef7aa9e72ef71f6 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Sun, 29 Sep 2002 10:12:48 +0000
Subject: Use gcc/buildlink2.mk instead of Makefile.gcc and note that this
 package uses X11.

---
 print/cjk-lyx/Makefile | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'print/cjk-lyx/Makefile')

diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index 923ef3f7569..bbb3b10c737 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/09/21 06:30:45 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/29 10:12:48 jlam Exp $
 
 DISTNAME=	lyx-${LYX_VERS}
 PKGNAME=	cjk-${DISTNAME}
@@ -22,14 +22,10 @@ CONFLICTS=	lyx-[0-9]*
 DEPENDS+=	ispell-base-[0-9]*:../../textproc/ispell-base
 DEPENDS+=	teTeX-bin>=1.0.7nb1:../../print/teTeX-bin
 
-GCC_VERSION!=	gcc --version
-.if (${GCC_VERSION:C/-.*$$//} == egcs)
-# "egcs" cannot be used, as this package tickles c++ compiler bugs
-.include "../../lang/gcc/Makefile.gcc"
-.endif
-
 USE_BUILDLINK2=		yes
 USE_PERL5=		yes
+USE_X11=		yes
+USE_CXX=		yes
 GNU_CONFIGURE=		yes
 
 USE_LIBTOOL=		yes
@@ -38,6 +34,7 @@ LIBTOOL_OVERRIDE+=	${WRKSRC}/sigc++/libtool
 
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/xpm/buildlink2.mk"
+.include "../../lang/gcc/buildlink2.mk"
 .include "../../x11/xforms/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3