pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: wxGTK24 and wxGTK26 removal



On Wed, Sep 02, 2009 at 08:11:14AM +0000, David Holland wrote:
 > On Wed, Aug 26, 2009 at 05:58:08PM +0200, Joerg Sonnenberger wrote:
 >  > I am looking for someone to test David Holland's update for wxhaskell,
 >  > which would remove it from the list.
 > 
 > YM "my quick hack at an update" :-)
 > 
 > I may be able to at least compile-test it; the machine I currently
 > have a working ghc on grew gtk2 packages after the emacs23 update.

Here's an updated version that builds and installs cleanly.

I don't have any test programs to run it with, so I'm not going to
commit just yet. If someone has the ability to try running it, let us
know how things go.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/wxhaskell/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile    26 Aug 2009 19:58:41 -0000      1.24
+++ Makefile    7 Sep 2009 17:00:41 -0000
@@ -1,11 +1,9 @@
 # $NetBSD: Makefile,v 1.24 2009/08/26 19:58:41 sno Exp $
 
-DISTNAME=              wxhaskell-src-0.9.4
+DISTNAME=              wxhaskell-src-0.11.1.2
 PKGNAME=               ${DISTNAME:S/-src//}
-PKGREVISION=           9
 CATEGORIES=            x11
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=wxhaskell/}
-EXTRACT_SUFX=          .zip
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://haskell.org/haskellwiki/WxHaskell
@@ -14,18 +12,17 @@ COMMENT=            wxGTK binding for Haskell
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            gmake
 
-WRKSRC=                        ${WRKDIR}/${PKGNAME_NOREV}
+WRKSRC=                        ${WRKDIR}/${PKGNAME}
 
 MAKE_FILE=             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
+PLIST_SUBST+=          GTKVERSION=2.8.10
 
 pre-configure:
        cd ${WRKSRC} && ./configure --prefix=${PREFIX} --with-opengl
 
 .include "../../lang/ghc/buildlink3.mk"
-.include "../../x11/wxGTK26/buildlink3.mk"
+.include "../../x11/wxGTK28/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/x11/wxhaskell/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- PLIST       14 Jun 2009 18:25:09 -0000      1.8
+++ PLIST       7 Sep 2009 17:00:41 -0000
@@ -1,29 +1,14 @@
 @comment $NetBSD: PLIST,v 1.8 2009/06/14 18:25:09 joerg 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/DragAndDrop.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/Image.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/Print.hi
@@ -37,18 +22,14 @@ lib/imports/Graphics/UI/WXCore/WxcClasse
 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-gtk${GTKVERSION}-${PKGVERSION}.so
 lib/libwxcore.a
 lib/libwxcore0.a
 lib/libwxcore1.a
 lib/libwxcore2.a
-lib/wx.o
-lib/wx.pkg
 lib/wxcore.o
 lib/wxcore.pkg
 lib/wxcore0.o
 lib/wxcore1.o
 lib/wxcore2.o
 @unexec %D/bin/ghc-pkg -r wxcore
-@unexec %D/bin/ghc-pkg -r wx
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/wxhaskell/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo    23 Oct 2005 20:29:42 -0000      1.5
+++ distinfo    7 Sep 2009 17:00:41 -0000
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.5 2005/10/23 20:29:42 rillig Exp $
 
-SHA1 (wxhaskell-src-0.9.4.zip) = 6133991fb1e6c76a3b5b2bf175277ce56c2adad3
-RMD160 (wxhaskell-src-0.9.4.zip) = 70c386cb2451509dbd5bca652435bab35b808ed1
-Size (wxhaskell-src-0.9.4.zip) = 569954 bytes
-SHA1 (patch-aa) = 3949a41757a2e37e692746acab1ece5f775a574a
+SHA1 (wxhaskell-src-0.11.1.2.tar.gz) = 82efd56b7c4a37ade43d3225f61615f994102d36
+RMD160 (wxhaskell-src-0.11.1.2.tar.gz) = 
ecbb3f0e606f5765c88fe98dbcf4e02e5b940535
+Size (wxhaskell-src-0.11.1.2.tar.gz) = 498605 bytes
+SHA1 (patch-aa) = 326421872c0288ffb7ba709493c46b67d6e1f68b
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/x11/wxhaskell/patches/patch-aa,v
retrieving revision 1.2
diff -u -p -r1.2 patch-aa
--- patches/patch-aa    23 Oct 2005 20:29:42 -0000      1.2
+++ patches/patch-aa    7 Sep 2009 17:00:41 -0000
@@ -1,13 +1,16 @@
 $NetBSD: patch-aa,v 1.2 2005/10/23 20:29:42 rillig Exp $
 
---- makefile.orig      Tue Jul 27 16:12:15 2004
-+++ makefile   Sat Nov 20 16:35:27 2004
-@@ -632,7 +632,7 @@
+Use proper X11 path for pkgsrc.
+upstream: inappropriate
+
+--- makefile.orig      2009-03-01 02:37:24.000000000 -0500
++++ makefile   2009-08-07 02:39:16.000000000 -0400
+@@ -818,7 +818,7 @@
  WXC-OBJS      =$(call make-objs, $(WXC-OUTDIR), $(WXC-SOURCES))
  WXC-DEPS      =$(call make-deps, $(WXC-OUTDIR), $(WXC-SOURCES))
  WXC-LIBS      =$(WXWIN-LIBS)
--WXC-CXXFLAGS  =$(WXWIN-CXXFLAGS) -I$(WXC-INCDIR)
-+WXC-CXXFLAGS  =$(WXWIN-CXXFLAGS) -I$(WXC-INCDIR) -I$(X11BASE)/include
+-WXC-CXXFLAGS  =$(WXWIN-CXXFLAGS) $(WXC-CONTRIB) -fPIC -I$(WXC-INCDIR)
++WXC-CXXFLAGS  =$(WXWIN-CXXFLAGS) $(WXC-CONTRIB) -fPIC -I$(WXC-INCDIR) 
-I$(X11BASE)/include
  
  
  wxc: wxc-dirs $(WXC-LIB)


-- 
David A. Holland
dholland%netbsd.org@localhost


Home | Main Index | Thread Index | Old Index