Convert to buildlink3.

2 files changed, 55 insertions, 53 deletions

diff --git a/x11/wxhaskell/Makefile b/x11/wxhaskell/Makefile
index 77c28ee8673..1e3805d0d15 100644
--- a/x11/wxhaskell/Makefile
+++ b/x11/wxhaskell/Makefile
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.2 2004/11/21 17:46:02 augustss Exp $
+# $NetBSD: Makefile,v 1.3 2004/12/25 21:20:29 wiz Exp $
 
-DISTNAME=		wxhaskell-0.8
+DISTNAME=		wxhaskell-src-0.8
+PKGNAME=		${DISTNAME:S/-src//}
 CATEGORIES=		x11
-MASTER_SITES=		http://voxel.dl.sourceforge.net/sourceforge/wxhaskell/
-DISTFILES=		wxhaskell-src-0.8.zip
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=wxhaskell/}
+EXTRACT_SUFX=		.zip
 
 MAINTAINER=		augustss@NetBSD.org
 HOMEPAGE=		http://wxhaskell.sourceforge.net/index.html
 COMMENT=		wxGTK binding for Haskell
 
-BUILD_DEPENDS=          ghc>=6.2:../../lang/ghc
-BUILD_DEPENDS+=		wxGTK>=2.4.2:../../x11/wxGTK
-
-### USE_BUILDLINK3=		YES
+USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 USE_X11=		yes
 
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
+
 MAKEFILE=		makefile
 MAKE_FLAGS=		X11BASE=${X11BASE}
 
@@ -23,7 +23,6 @@ pre-configure:
 	cd ${WRKSRC}; ./configure --prefix=${PREFIX} --with-opengl
 
 
-### no buildlink3 for ghc yet
-### .include "../../x11/wxGTK/buildlink3.mk"
-
+.include "../../lang/ghc/buildlink3.mk"
+.include "../../x11/wxGTK/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wxhaskell/PLIST b/x11/wxhaskell/PLIST
index 85136ff5684..ae266abe26d 100644
--- a/x11/wxhaskell/PLIST
+++ b/x11/wxhaskell/PLIST
@@ -1,55 +1,58 @@
-@comment $NetBSD: PLIST,v 1.1 2004/11/20 23:18:25 augustss Exp $
-lib/libwxc-gtk2.4.2-0.8.so
-lib/imports/Graphics/UI/WXCore/WxcObject.hi
-lib/imports/Graphics/UI/WXCore/WxcClassTypes.hi
-lib/imports/Graphics/UI/WXCore/WxcTypes.hi
-lib/imports/Graphics/UI/WXCore/WxcClassesAL.hi
-lib/imports/Graphics/UI/WXCore/WxcClassesMZ.hi
-lib/imports/Graphics/UI/WXCore/WxcClasses.hi
-lib/imports/Graphics/UI/WXCore/WxcClassInfo.hi
-lib/imports/Graphics/UI/WXCore/WxcDefs.hi
-lib/imports/Graphics/UI/WXCore/IntMap.hi
-lib/imports/Graphics/UI/WXCore/Types.hi
+@comment $NetBSD: PLIST,v 1.2 2004/12/25 21:20:29 wiz Exp $
+lib/imports/Graphics/UI/WX.hi
+lib/imports/Graphics/UI/WX/Attributes.hi
+lib/imports/Graphics/UI/WX/Classes.hi
+lib/imports/Graphics/UI/WX/Controls.hi
+lib/imports/Graphics/UI/WX/Dialogs.hi
+lib/imports/Graphics/UI/WX/Draw.hi
+lib/imports/Graphics/UI/WX/Events.hi
+lib/imports/Graphics/UI/WX/Frame.hi
+lib/imports/Graphics/UI/WX/Layout.hi
+lib/imports/Graphics/UI/WX/Media.hi
+lib/imports/Graphics/UI/WX/Menu.hi
+lib/imports/Graphics/UI/WX/Timer.hi
+lib/imports/Graphics/UI/WX/Types.hi
+lib/imports/Graphics/UI/WX/Variable.hi
+lib/imports/Graphics/UI/WX/Window.hi
+lib/imports/Graphics/UI/WXCore.hi
+lib/imports/Graphics/UI/WXCore/Controls.hi
+lib/imports/Graphics/UI/WXCore/Db.hi
 lib/imports/Graphics/UI/WXCore/Defines.hi
+lib/imports/Graphics/UI/WXCore/Dialogs.hi
 lib/imports/Graphics/UI/WXCore/Draw.hi
 lib/imports/Graphics/UI/WXCore/Events.hi
 lib/imports/Graphics/UI/WXCore/Frame.hi
-lib/imports/Graphics/UI/WXCore/Layout.hi
-lib/imports/Graphics/UI/WXCore/Process.hi
-lib/imports/Graphics/UI/WXCore/Dialogs.hi
 lib/imports/Graphics/UI/WXCore/Image.hi
-lib/imports/Graphics/UI/WXCore/Controls.hi
-lib/imports/Graphics/UI/WXCore/Db.hi
+lib/imports/Graphics/UI/WXCore/IntMap.hi
+lib/imports/Graphics/UI/WXCore/Layout.hi
 lib/imports/Graphics/UI/WXCore/OpenGL.hi
-lib/imports/Graphics/UI/WXCore.hi
+lib/imports/Graphics/UI/WXCore/Process.hi
+lib/imports/Graphics/UI/WXCore/Types.hi
+lib/imports/Graphics/UI/WXCore/WxcClassInfo.hi
+lib/imports/Graphics/UI/WXCore/WxcClassTypes.hi
+lib/imports/Graphics/UI/WXCore/WxcClasses.hi
+lib/imports/Graphics/UI/WXCore/WxcClassesAL.hi
+lib/imports/Graphics/UI/WXCore/WxcClassesMZ.hi
+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.4.2-0.8.so
+lib/libwxcore.a
 lib/libwxcore0.a
-lib/wxcore0.o
 lib/libwxcore1.a
-lib/wxcore1.o
 lib/libwxcore2.a
-lib/wxcore2.o
-lib/libwxcore.a
-lib/wxcore.o
-lib/wxcore.pkg
-lib/imports/Graphics/UI/WX/Types.hi
-lib/imports/Graphics/UI/WX/Attributes.hi
-lib/imports/Graphics/UI/WX/Layout.hi
-lib/imports/Graphics/UI/WX/Classes.hi
-lib/imports/Graphics/UI/WX/Variable.hi
-lib/imports/Graphics/UI/WX/Events.hi
-lib/imports/Graphics/UI/WX/Window.hi
-lib/imports/Graphics/UI/WX/Frame.hi
-lib/imports/Graphics/UI/WX/Media.hi
-lib/imports/Graphics/UI/WX/Menu.hi
-lib/imports/Graphics/UI/WX/Timer.hi
-lib/imports/Graphics/UI/WX/Draw.hi
-lib/imports/Graphics/UI/WX/Controls.hi
-lib/imports/Graphics/UI/WX/Dialogs.hi
-lib/imports/Graphics/UI/WX.hi
-lib/libwx.a
 lib/wx.o
 lib/wx.pkg
+lib/wxcore.o
+lib/wxcore.pkg
+lib/wxcore0.o
+lib/wxcore1.o
+lib/wxcore2.o
 @dirrm lib/imports/Graphics/UI/WXCore
 @dirrm lib/imports/Graphics/UI/WX
-@unexec ghc-pkg -r wxcore
-@unexec ghc-pkg -r wx
+@dirrm lib/imports/Graphics/UI
+@dirrm lib/imports/Graphics
+@dirrm lib/imports
+@unexec %D/bin/ghc-pkg -r wxcore
+@unexec %D/bin/ghc-pkg -r wx