[pkgsrc/trunk]: pkgsrc/x11/wxhaskell Fixed build errors for the recent bulk b...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/80f075aeb80a
branches:  trunk
changeset: 515157:80f075aeb80a
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Jun 26 12:45:31 2006 +0000

description:
Fixed build errors for the recent bulk build on NetBSD 3.0. Since the
PLIST changed, bump PKGREVISION.

diffstat:

 x11/wxhaskell/Makefile |  13 ++++++++-----
 x11/wxhaskell/PLIST    |   4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diffs (56 lines):

diff -r 0923b9016bee -r 80f075aeb80a x11/wxhaskell/Makefile
--- a/x11/wxhaskell/Makefile    Mon Jun 26 12:27:09 2006 +0000
+++ b/x11/wxhaskell/Makefile    Mon Jun 26 12:45:31 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2006/05/18 20:30:02 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2006/06/26 12:45:31 rillig Exp $
 
 DISTNAME=              wxhaskell-src-0.9.4
 PKGNAME=               ${DISTNAME:S/-src//}
-PKGREVISION=           6
+PKGREVISION=           7
 CATEGORIES=            x11
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=wxhaskell/}
 EXTRACT_SUFX=          .zip
@@ -11,8 +11,7 @@
 HOMEPAGE=              http://wxhaskell.sourceforge.net/index.html
 COMMENT=               wxGTK binding for Haskell
 
-BROKEN_IN=             pkgsrc-2006Q1
-
+USE_LANGUAGES=         c c++
 USE_TOOLS+=            gmake
 
 WRKSRC=                        ${WRKDIR}/${PKGNAME_NOREV}
@@ -20,8 +19,12 @@
 MAKEFILE=              makefile
 MAKE_FLAGS+=           X11BASE=${X11BASE:Q}
 
+# I don't know where that number comes from, but it changes sometimes.
+PLIST_SUBST+=          GTKVERSION=2.6.3
+CHECK_FILES_SKIP+=     lib/ghc-6.4.1/package.conf.old
+
 pre-configure:
-       cd ${WRKSRC}; ./configure --prefix=${PREFIX} --with-opengl
+       cd ${WRKSRC} && ./configure --prefix=${PREFIX} --with-opengl
 
 .include "../../lang/ghc/buildlink3.mk"
 .include "../../x11/wxGTK/buildlink3.mk"
diff -r 0923b9016bee -r 80f075aeb80a x11/wxhaskell/PLIST
--- a/x11/wxhaskell/PLIST       Mon Jun 26 12:27:09 2006 +0000
+++ b/x11/wxhaskell/PLIST       Mon Jun 26 12:45:31 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2005/10/11 01:03:57 minskim Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/06/26 12:45:31 rillig Exp $
 lib/imports/Graphics/UI/WX.hi
 lib/imports/Graphics/UI/WX/Attributes.hi
 lib/imports/Graphics/UI/WX/Classes.hi
@@ -38,7 +38,7 @@
 lib/imports/Graphics/UI/WXCore/WxcObject.hi
 lib/imports/Graphics/UI/WXCore/WxcTypes.hi
 lib/libwx.a
-lib/libwxc-gtk2.6.2-${PKGVERSION}.so
+lib/libwxc-gtk${GTKVERSION}-${PKGVERSION}.so
 lib/libwxcore.a
 lib/libwxcore0.a
 lib/libwxcore1.a