summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2006-06-26 12:45:31 +0000
committerrillig <rillig@pkgsrc.org>2006-06-26 12:45:31 +0000
commit96d4decb331551ebefd7557f012a5065c33b32e9 (patch)
treeeddfa883610b921886b0c2001148c5c143f8549c /x11
parent9a366288baf66c8038f725f3a0042ec5eb39d050 (diff)
downloadpkgsrc-96d4decb331551ebefd7557f012a5065c33b32e9.tar.gz
Fixed build errors for the recent bulk build on NetBSD 3.0. Since the
PLIST changed, bump PKGREVISION.
Diffstat (limited to 'x11')
-rw-r--r--x11/wxhaskell/Makefile13
-rw-r--r--x11/wxhaskell/PLIST4
2 files changed, 10 insertions, 7 deletions
diff --git a/x11/wxhaskell/Makefile b/x11/wxhaskell/Makefile
index 9e2b7c9e752..740585ee7e2 100644
--- a/x11/wxhaskell/Makefile
+++ b/x11/wxhaskell/Makefile
@@ -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 @@ MAINTAINER= augustss@NetBSD.org
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 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
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 --git a/x11/wxhaskell/PLIST b/x11/wxhaskell/PLIST
index 4b3472dc689..98e565ca65c 100644
--- a/x11/wxhaskell/PLIST
+++ b/x11/wxhaskell/PLIST
@@ -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/WxcDefs.hi
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