diff options
author | cvs2svn <cvs2svn@FreeBSD.org> | 2005-01-21 15:36:45 +0000 |
---|---|---|
committer | cvs2svn <cvs2svn@FreeBSD.org> | 2005-01-21 15:36:45 +0000 |
commit | 7011c19a8c96a2f8fb7c04d61cb28cdc507584a6 (patch) | |
tree | 22c0efaf2b6bb5b461389f9bac9542c7e3a5909a /x11-toolkits/wxgtk24/files/patch-ac | |
parent | Now buildable on 4.x, still broken on >= 5.x. (diff) |
This commit was manufactured by cvs2svn to create tag 'RELEASE_4_11_0'.release/4.11.0
Notes
Notes:
svn path=/head/; revision=127022
svn path=/tags/RELEASE_4_11_0/; revision=127023; tag=release/4.11.0
Diffstat (limited to 'x11-toolkits/wxgtk24/files/patch-ac')
-rw-r--r-- | x11-toolkits/wxgtk24/files/patch-ac | 124 |
1 files changed, 0 insertions, 124 deletions
diff --git a/x11-toolkits/wxgtk24/files/patch-ac b/x11-toolkits/wxgtk24/files/patch-ac deleted file mode 100644 index b95baddfc8c5..000000000000 --- a/x11-toolkits/wxgtk24/files/patch-ac +++ /dev/null @@ -1,124 +0,0 @@ ---- Makefile.in.orig Sun Sep 21 18:31:27 2003 -+++ Makefile.in Tue Nov 4 22:33:54 2003 -@@ -332,17 +332,13 @@ - - $(build_libdir)/@WX_LIBRARY_LINK1@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED@ - @$(RM) $(build_libdir)/@WX_LIBRARY_LINK1@ -- @$(RM) $(build_libdir)/@WX_LIBRARY_LINK2@ - cd $(build_libdir) \ -- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \ -- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ -+ && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ - - $(build_libdir)/@WX_LIBRARY_LINK1_GL@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@ - @$(RM) $(build_libdir)/@WX_LIBRARY_LINK1_GL@ -- @$(RM) $(build_libdir)/@WX_LIBRARY_LINK2_GL@ - cd $(build_libdir) \ -- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \ -- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ -+ && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ - - $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h - -@@ -371,28 +367,23 @@ - - CREATE_INSTALLED_LINKS: preinstall - $(RM) $(libdir)/@WX_LIBRARY_LINK1@ -- $(RM) $(libdir)/@WX_LIBRARY_LINK2@ - cd $(libdir) \ -- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \ -- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ -+ && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ - - CREATE_INSTALLED_LINKS_GL: preinstall_gl - $(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@ -- $(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@ - cd $(libdir) \ -- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \ -- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ -+ && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ - --afminstall: preinstall -+afminstall: - @if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi - $(INSTALL) -d $(datadir)/wx -- $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN) -- $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/afm -- $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/gs_afm -- $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/afm -- $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/gs_afm -+ $(INSTALL) -d $(datadir)/wx/afm -+ $(INSTALL) -d $(datadir)/wx/gs_afm -+ $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm -+ $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm - --m4datainstall: preinstall -+m4datainstall: - $(INSTALL) -d $(datadir)/aclocal - $(INSTALL_DATA) $(top_srcdir)/wxwin.m4 $(datadir)/aclocal - -@@ -410,7 +401,7 @@ - - # this is the real install target: copies the library, wx-config and the - # headers to the installation directory --preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config -+install-common: @AFMINSTALL@ m4datainstall @WIN32INSTALL@ - @echo " " - @echo " Installing wxWindows..." - @echo " " -@@ -419,26 +410,11 @@ - @if test ! -d $(bindir); then $(INSTALL) -d $(bindir); fi - @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi - -- $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config -- cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config -- @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@ -- @if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \ -- $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi -- -- $(INSTALL) -d $(libdir)/wx -- $(INSTALL) -d $(libdir)/wx/include -- $(INSTALL) -d $(libdir)/wx/include/univ -- $(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@ -- $(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx -- $(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \ -- $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h -- - $(INSTALL) -d $(includedir)/wx - @# FIXME: This will erroneously install a wx/base dir for wxBase.. - @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi - @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi - @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi -- @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/univ; fi - @if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL) -d $(includedir)/wx/msw/ole; fi - - @# always install msw headers for wxBase, it's much simpler -@@ -459,6 +435,19 @@ - echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \ - done - -+preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config -+ $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config -+ @if test "$(WXGTK_FLAVOR)" = "gtk2"; then \ -+ cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config; \ -+ fi -+ @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@ -+ @if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \ -+ $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi -+ $(INSTALL) -d $(prefix)/include/wx/@TOOLCHAIN_NAME@ -+ $(INSTALL) -d $(prefix)/include/wx/@TOOLCHAIN_NAME@/wx -+ $(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \ -+ $(prefix)/include/wx/@TOOLCHAIN_NAME@/wx/setup.h -+ - preinstall_res: $(build_libdir)/@WX_RESOURCES_MACOSX_ASCII@ $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@ - @echo " " - @echo " Installing wxWindows Mac resource ..." -@@ -474,7 +463,7 @@ - @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi - @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@ - --install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall @WIN32INSTALL@ -+install: @WX_ALL_INSTALLED@ - @echo " " - @echo " The installation of wxWindows is finished. On certain" - @echo " platforms (e.g. Linux) you'll now have to run ldconfig" |