diff options
author | Vanilla I. Shu <vanilla@FreeBSD.org> | 2001-05-08 14:10:35 +0000 |
---|---|---|
committer | Vanilla I. Shu <vanilla@FreeBSD.org> | 2001-05-08 14:10:35 +0000 |
commit | a8391580d301b00c022595c8fe7431890ce92f97 (patch) | |
tree | 522c398f6ca67880d1c21b6324882ad2ebae1b23 /x11-toolkits/wxgtk/files | |
parent | 884fbd03713af54cf1c27e1f3373277dd3df0672 (diff) | |
download | ports-a8391580d301b00c022595c8fe7431890ce92f97.tar.gz ports-a8391580d301b00c022595c8fe7431890ce92f97.zip |
Upgrade to 2.2.6.
Approved by: nectar
Notes
Notes:
svn path=/head/; revision=42410
Diffstat (limited to 'x11-toolkits/wxgtk/files')
-rw-r--r-- | x11-toolkits/wxgtk/files/patch-aa | 12 | ||||
-rw-r--r-- | x11-toolkits/wxgtk/files/patch-ac | 20 |
2 files changed, 16 insertions, 16 deletions
diff --git a/x11-toolkits/wxgtk/files/patch-aa b/x11-toolkits/wxgtk/files/patch-aa index a7cf0245b477..4e735f88282d 100644 --- a/x11-toolkits/wxgtk/files/patch-aa +++ b/x11-toolkits/wxgtk/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.in.orig Sun Aug 20 17:52:52 2000 -+++ configure.in Sat Aug 26 02:03:38 2000 -@@ -1999,16 +1999,12 @@ +--- configure.in.orig Tue Mar 13 00:29:09 2001 ++++ configure.in Mon May 7 07:12:45 2001 +@@ -1948,16 +1948,12 @@ WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a" dnl the name of the shared library @@ -21,7 +21,7 @@ dnl shared library settings SHARED_LD= -@@ -2742,24 +2738,6 @@ +@@ -2729,24 +2725,6 @@ fi fi @@ -46,7 +46,7 @@ dnl --------------------------------------------------------------------------- dnl Optional libraries dnl --------------------------------------------------------------------------- -@@ -3784,8 +3762,6 @@ +@@ -3788,8 +3766,6 @@ AC_SUBST(WX_LIBRARY) AC_SUBST(WX_TARGET_LIBRARY) AC_SUBST(WX_LIBRARY_LINK1) @@ -55,7 +55,7 @@ AC_SUBST(PROGRAM_EXT) dnl global gl options -@@ -3795,8 +3771,6 @@ +@@ -3799,8 +3775,6 @@ AC_SUBST(WX_LIBRARY_GL) AC_SUBST(WX_TARGET_LIBRARY_GL) AC_SUBST(WX_LIBRARY_LINK1_GL) diff --git a/x11-toolkits/wxgtk/files/patch-ac b/x11-toolkits/wxgtk/files/patch-ac index ae25a9c7982d..1657f8b71cb3 100644 --- a/x11-toolkits/wxgtk/files/patch-ac +++ b/x11-toolkits/wxgtk/files/patch-ac @@ -1,7 +1,7 @@ ---- Makefile.in.orig Wed Mar 22 13:12:38 2000 -+++ Makefile.in Sun Apr 23 08:08:08 2000 -@@ -311,39 +311,23 @@ - +--- Makefile.in.orig Mon May 7 07:14:03 2001 ++++ Makefile.in Mon May 7 07:14:46 2001 +@@ -365,39 +365,23 @@ + CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@ @$(RM) ./lib/@WX_LIBRARY_LINK1@ - @$(RM) ./lib/@WX_LIBRARY_LINK2@ @@ -11,7 +11,7 @@ - && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ \ - && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK3@ + && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ - + CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@ @$(RM) ./lib/@WX_LIBRARY_LINK1_GL@ - @$(RM) ./lib/@WX_LIBRARY_LINK2_GL@ @@ -21,7 +21,7 @@ - && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ \ - && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK3_GL@ + && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ - + CREATE_INSTALLED_LINKS: preinstall $(RM) $(libdir)/@WX_LIBRARY_LINK1@ - $(RM) $(libdir)/@WX_LIBRARY_LINK2@ @@ -31,7 +31,7 @@ - && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ \ - && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK3@ + && $(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@ @@ -41,10 +41,10 @@ - && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ \ - && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK3_GL@ + && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ - + $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h -@@ -437,13 +421,9 @@ +@@ -499,13 +483,9 @@ @echo " Removing library..." @$(RM) $(libdir)/@WX_TARGET_LIBRARY@ @$(RM) $(libdir)/@WX_LIBRARY_LINK1@ @@ -56,5 +56,5 @@ - @$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@ - @$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@ @echo " Removing helper files..." - @$(RM) $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h + @$(RM) $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h @$(RM) $(bindir)/wx-config |