head 1.5; access; symbols pkgsrc-2015Q3:1.4.0.6 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.4 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.2 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.3.0.10 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.8 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.6 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.4 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.2 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.2.0.68 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.66 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.64 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.62 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.60 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.58 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.56 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.54 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.52 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.50 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.48 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.46 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.44 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.42 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.40 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.38 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.36 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.34 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.32 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.30 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.28 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.26 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.24 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.22 pkgsrc-2008Q1:1.2.0.20 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.18 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.16 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.14 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.12 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.10 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.8 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.6 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.4 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.2 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.1.0.8 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.6 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.4 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.2 pkgsrc-2004Q4-base:1.1; locks; strict; comment @# @; 1.5 date 2015.10.24.19.18.45; author joerg; state dead; branches; next 1.4; commitid gqKjh0T5uvD6AoGy; 1.4 date 2015.02.20.23.39.31; author joerg; state Exp; branches; next 1.3; commitid yXirQAfOxdwMVNay; 1.3 date 2013.12.14.08.26.30; author dholland; state Exp; branches; next 1.2; commitid umzlp0mtiiUbN4hx; 1.2 date 2005.10.23.20.29.42; author rillig; state Exp; branches; next 1.1; 1.1 date 2004.11.20.23.18.26; author augustss; state Exp; branches; next ; desc @@ 1.5 log @Remove Haskell binding for old wxGTK versions, which doesn't work with modern GHC anyway. @ text @$NetBSD: patch-aa,v 1.4 2015/02/20 23:39:31 joerg Exp $ - Add an extra arg to compile-hs so we can control whether -i is passed. This is needed for building wxcore but not wx. - Add the version to the wxcore package name. XXX: it is hardcoded, which is bad, but it's likely that the next update to this package will remove most of this patch. - Run fixup.sh to create a dummy package installation to make ghc happy importing wxcore interfaces while building wx. - Add X11BASE to the include path. --- makefile.orig 2005-04-29 09:31:37.000000000 +0000 +++ makefile @@@@ -424,7 +424,7 @@@@ $(WXD-EXE): $(WXD-OBJS) # create an object file from source files. $(WXD-OBJS): $(WXD-OUTDIR)/%.o: $(WXD-SRCDIR)/%.hs - @@$(call compile-hs,$@@,$<,$(HCFLAGS) $(PKG-PARSEC),$(WXD-OUTDIR),-i$(WXD-SRCDIR)) + @@$(call compile-hs,$@@,$<,$(HCFLAGS) $(PKG-PARSEC),$(WXD-OUTDIR),-i$(WXD-SRCDIR),-i$(WXD-OUTDIR)) # automatically include all dependency information. -include $(WXD-DEPS) @@@@ -471,11 +471,12 @@@@ WXCORE-NONGEN-HS=$(filter-out $(WXCORE-G WXCORE-BINS =$(WXCORE-HIS) $(WXCORE-LIBS) WXCORE-DOCS =$(filter-out $(WXCORE-SRCDIR)/$(WXCORE-HPATH)/IntMap.hs,$(WXCORE-HS)) -WXCORE-HCFLAGS =$(HCFLAGS) -fvia-C -package-name $(WXCORE) +WXCORE-HCFLAGS =$(HCFLAGS) -fvia-C -package-name $(WXCORE)-0.9.4 # build main library wxcore: wxc wxd wxcore-dirs $(WXCORE-LIBS) + sh fixup.sh wxcore-dirs: @@$(call ensure-dirs-of-files,$(WXCORE-OBJS)) @@@@ -553,7 +554,7 @@@@ $(WXCORE-CORE-C-LIB): $(WXCORE-CORE-C-OB # create an object file from source files. $(WXCORE-CORE-A-OBJS) $(WXCORE-CORE-B-OBJS) $(WXCORE-CORE-C-OBJS) $(WXCORE-OBJS): $(WXCORE-IMPORTSDIR)/%.o: $(WXCORE-SRCDIR)/%.hs - @@$(call compile-hs,$@@,$<,$(WXCORE-HCFLAGS) -Iwxc/include,$(WXCORE-IMPORTSDIR),$(WXCORE-HSDIRS) ) + @@$(call compile-hs,$@@,$<,$(WXCORE-HCFLAGS) -Iwxc/include,$(WXCORE-IMPORTSDIR),$(WXCORE-HSDIRS),-i$(WXCORE-IMPORTSDIR) ) $(WXCORE-STUB-OBJS): $(WXCORE-IMPORTSDIR)/%_stub.o: $(WXCORE-SRCDIR)/%.hs $(HC) -c $(basename $@@).c @@@@ -626,7 +627,7 @@@@ $(WX-LIB): $(WX-OBJS) # create an object file from source files. $(WX-OBJS): $(WX-IMPORTSDIR)/%.o: $(WX-SRCDIR)/%.hs - @@$(call compile-hs,$@@,$<,$(WX-HCFLAGS) -i$(WXCORE-IMPORTSDIR),$(WX-IMPORTSDIR),$(WX-HSDIRS)) + @@$(call compile-hs,$@@,$<,$(WX-HCFLAGS) -package-conf tmp-pkgdb -package wxcore,$(WX-IMPORTSDIR),$(WX-HSDIRS),-i$(patsubst out/%,out2/%,$(WX-IMPORTSDIR))) # automatically include all dependency information. -include $(WX-DEPS) @@@@ -651,7 +652,7 @@@@ WXC-LIB =$(WXC-OUTDIR)/$(LIB)$(WXC-LIBN 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 -fPIC wxc: wxc-dirs $(WXC-LIB) @@@@ -711,7 +712,7 @@@@ endif # dynamic link library on unix: generates single .so file $(basename $(WXC-LIB)).so: $(WXC-OBJS) - $(CXX) -shared -o $@@ $^ $(WXC-LIBS) -Wl --soname=$(SHARED-PREFIX)$(notdir $@@) + $(CXX) -shared -o $@@ $^ $(WXC-LIBS) -Wl,--soname=$(SHARED-PREFIX)$(notdir $@@) # dynamic link library on macOSX: generates single .so file $(basename $(WXC-LIB)).dylib: $(WXC-OBJS) @ 1.4 log @Build shared library. Fix soname passing. Fix format strings. Explicitly truncate pointers (XXX revisit by somewhere with more Haskellfu). Fix bit masking. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2013/12/14 08:26:30 dholland Exp $ @ 1.3 log @Turn on DESTDIR mode, clear BROKEN. Deploy a pile of horrible hacks to more or less fix the build; this version of this package does not seem to be fully compatible with even the ancient ghc we have in pkgsrc. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2005/10/23 20:29:42 rillig Exp $ d16 1 a16 1 +++ makefile 2013-12-14 04:26:08.000000000 +0000 d63 1 a63 1 +WXC-CXXFLAGS =$(WXWIN-CXXFLAGS) -I$(WXC-INCDIR) -I$(X11BASE)/include d67 9 @ 1.2 log @Added RCS Id to patch-aa. Converted patch-aa to a unified patch. @ text @d1 1 a1 1 $NetBSD$ d3 56 a58 3 --- makefile.orig Tue Jul 27 16:12:15 2004 +++ makefile Sat Nov 20 16:35:27 2004 @@@@ -632,7 +632,7 @@@@ @ 1.1 log @Add wxhaskell, a package with Haskell bindings for wxGTK. Not quite ready for general use yet. @ text @d1 13 a13 19 *** makefile.orig Tue Jul 27 16:12:15 2004 --- makefile Sat Nov 20 16:35:27 2004 *************** *** 632,638 **** 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: wxc-dirs $(WXC-LIB) --- 632,638 ---- 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) -I$(X11BASE)/include wxc: wxc-dirs $(WXC-LIB) @