summaryrefslogtreecommitdiff
path: root/x11-toolkits/wxd/files
diff options
context:
space:
mode:
authorRong-En Fan <rafan@FreeBSD.org>2006-11-22 08:54:36 +0000
committerRong-En Fan <rafan@FreeBSD.org>2006-11-22 08:54:36 +0000
commit8fa0e8d5704950bb2ef3cb4b95bc4d66156485c2 (patch)
tree2d2555eb40dccf3a3c43d40641b09f6b7a3f6898 /x11-toolkits/wxd/files
parentRemove expired leaf port: (diff)
- Update to 0.8
- Put %%PORTDOCS%% before @dirrm PR: ports/105705 Submitted by: Jona Joachim <walkingshadow at grummel.net> (maintainer)
Notes
Notes: svn path=/head/; revision=177791
Diffstat (limited to 'x11-toolkits/wxd/files')
-rw-r--r--x11-toolkits/wxd/files/patch-Makefile35
-rw-r--r--x11-toolkits/wxd/files/patch-wx-Makefile46
-rw-r--r--x11-toolkits/wxd/files/patch-wxc-Makefile32
3 files changed, 18 insertions, 95 deletions
diff --git a/x11-toolkits/wxd/files/patch-Makefile b/x11-toolkits/wxd/files/patch-Makefile
deleted file mode 100644
index 54c4328f087a..000000000000
--- a/x11-toolkits/wxd/files/patch-Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
---- /home/default/ports/wxd/work/wxd/GNUmakefile Sat Aug 26 23:30:32 2006
-+++ Makefile Thu Aug 31 19:14:34 2006
-@@ -1,26 +1,21 @@
--MAKE=make
--
-+#Makefile
-+#call: gmake MAKE=gmake WX_CONFIG=wxgtk2-2.6-config (wxgtk2u-2.6-config)
- OS=$(shell uname)
--ARCH=$(shell (arch 2>/dev/null || echo i386) | sed -e s/i.86/x86/ )
-+ARCH=$(shell (uname -m) | sed -e s/i.86/x86/ )
-
--ifeq ("$(OS) $(ARCH)","Linux x86")
--COMPILER=DMD
--DMD=dmd
--else
- COMPILER=GDC
--DMD=gdmd
--endif
-+DMD=gdc
-
- PLATFORM=$(shell cat wxc/platform 2>/dev/null )
- export PLATFORM
-
- CXX_WXD = $(CXX) -D__$(COMPILER)__
--DMD_WXD = $(DMD) -version=__$(PLATFORM)__
-+DMD_WXD = $(DMD) -fversion=__$(PLATFORM)__
-
- all: wxc/platform
- $(MAKE) CXX="$(CXX_WXD)" -C wxc
- $(MAKE) DMD="$(DMD_WXD)" -C wx
-- $(MAKE) DMD="$(DMD_WXD)" -C Samples
-+# $(MAKE) DMD="$(DMD_WXD)" -C Samples
-
- install:
- $(MAKE) CXX="$(CXX_WXD)" install -C wxc
diff --git a/x11-toolkits/wxd/files/patch-wx-Makefile b/x11-toolkits/wxd/files/patch-wx-Makefile
index a63c2f30dbba..a5fe9601ef7e 100644
--- a/x11-toolkits/wxd/files/patch-wx-Makefile
+++ b/x11-toolkits/wxd/files/patch-wx-Makefile
@@ -1,38 +1,20 @@
---- /home/default/ports/wxd/work/wxd/wx/GNUmakefile Sat Aug 26 23:26:21 2006
-+++ wx/Makefile Thu Aug 31 19:36:21 2006
-@@ -1,3 +1,4 @@
-+#wx/Makefile
- LIBTARGET = ../libwxd.a
-
- OBJECTS = \
-@@ -167,10 +168,10 @@
-
- all: $(LIBTARGET)
-
--DMD = dmd
--DFLAGS = -O -w -g
-+DMD = gdc
-+DFLAGS += -O2
+--- wxd/wx/GNUmakefile Fri Sep 8 13:12:52 2006
++++ wx/Makefile Thu Nov 16 14:40:05 2006
+@@ -179,7 +179,7 @@
+ else
+ DC?=gdc
+ DMD?=gdmd
+-DFLAGS?=-O2 -g
++DFLAGS?=-O2 -fno-strict-aliasing -g
+ version=-fversion
+ output=-o $@
+ endif
+@@ -188,7 +188,7 @@
+ STCFLAGS = -$(version)=WXD_STYLEDTEXTCTRL
+ endif
-prefix=/usr/local
+prefix=$(PREFIX)
exec_prefix=$(prefix)
includedir=$(prefix)/include
libdir=$(exec_prefix)/lib
-@@ -179,11 +180,11 @@
- RANLIB = ranlib
-
- install: $(LIBTARGET)
-- $(INSTALL) -d $(DESTDIR)$(libdir)
-- $(INSTALL) -p $(LIBTARGET) $(DESTDIR)$(libdir)
-- $(INSTALL) -d $(DESTDIR)$(includedir)/d/wx
-- $(INSTALL) -p *.d $(DESTDIR)$(libdir)/d/wx
-- -$(RANLIB) $(DESTDIR)$(libdir)/`basename $(LIBTARGET)`
-+ $(INSTALL) -d $(libdir)
-+ $(INSTALL) -p $(LIBTARGET) $(libdir)
-+ $(INSTALL) -d $(includedir)/d/wx
-+ $(INSTALL) -p *.d $(includedir)/d/wx/
-+ -$(RANLIB) $(libdir)/`basename $(LIBTARGET)`
-
- ddoc:
- $(DMD) -c -o- -D $(DFLAGS) -I.. $(SOURCES)
diff --git a/x11-toolkits/wxd/files/patch-wxc-Makefile b/x11-toolkits/wxd/files/patch-wxc-Makefile
index 2f2c6707a8ac..ac2f2be68de5 100644
--- a/x11-toolkits/wxd/files/patch-wxc-Makefile
+++ b/x11-toolkits/wxd/files/patch-wxc-Makefile
@@ -1,35 +1,11 @@
---- /home/default/ports/wxd/work/wxd/wxc/GNUmakefile Sat Aug 26 23:25:11 2006
-+++ wxc/Makefile Thu Aug 31 19:09:15 2006
-@@ -1,3 +1,4 @@
-+#wxc/Makefile
- LIBTARGET=../libwxc.a
+--- wxd/wxc/GNUmakefile Fri Sep 8 11:46:33 2006
++++ wxc/Makefile Thu Nov 16 15:09:32 2006
+@@ -183,7 +183,7 @@
- OBJECTS = \
-@@ -158,12 +159,10 @@
-
- all: platform $(LIBTARGET)
-
--WX_CONFIG = wx-config
--
- CXX = $(shell $(WX_CONFIG) --cxx)
--CXXFLAGS = -O2 -Wall
-+CXXFLAGS += -O2 -Wall -I/usr/X11R6/include
+ WXFLAGS = `$(WX_CONFIG) --cxxflags`
-prefix=/usr/local
+prefix=$(PREFIX)
exec_prefix=$(prefix)
includedir=$(prefix)/include
libdir=$(exec_prefix)/lib
-@@ -172,9 +171,9 @@
- RANLIB = ranlib
-
- install: $(LIBTARGET)
-- $(INSTALL) -d $(DESTDIR)$(libdir)
-- $(INSTALL) -p $(LIBTARGET) $(DESTDIR)$(libdir)
-- -$(RANLIB) $(DESTDIR)$(libdir)/`basename $(LIBTARGET)`
-+ $(INSTALL) -d $(libdir)
-+ $(INSTALL) -p $(LIBTARGET) $(libdir)
-+ -$(RANLIB) $(libdir)/`basename $(LIBTARGET)`
-
- platform:
- $(WX_CONFIG) --cflags | sed -e 's/.*\-D__\(WX.*\)__.*/\1/' > $@