Revision: 110542 https://trac.macports.org/changeset/110542 Author: mojca@macports.org Date: 2013-09-01 14:35:57 -0700 (Sun, 01 Sep 2013) Log Message: ----------- mojca/wxWidgets-2.8/3.0: increase revision, rename patches, add empty folder to wxWidgets-2.8 Modified Paths: -------------- users/mojca/wxports/graphics/wxWidgets-2.8/Portfile users/mojca/wxports/graphics/wxWidgets-3.0/Portfile Added Paths: ----------- users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-Makefile.in.294.diff users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-Makefile.in.295.diff Removed Paths: ------------- users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-Makefile.in.294.patch users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-Makefile.in.295.patch Modified: users/mojca/wxports/graphics/wxWidgets-2.8/Portfile =================================================================== --- users/mojca/wxports/graphics/wxWidgets-2.8/Portfile 2013-09-01 21:23:32 UTC (rev 110541) +++ users/mojca/wxports/graphics/wxWidgets-2.8/Portfile 2013-09-01 21:35:57 UTC (rev 110542) @@ -9,6 +9,7 @@ name wxWidgets-2.8 version 2.8.12 +revision 1 set branch [join [lrange [split ${version} .] 0 1] .] set wxpythonsubset wxPython-2.8.12.1-MacPorts-subset @@ -157,7 +158,12 @@ xinstall -m 644 -W ${workpath}/${distname}-${version} \ install-mac.txt readme-mac.txt \ install-gtk.txt readme-gtk.txt ${destdocdir} + + # otherwise 'port select --set wxWidgets wxWidgets-3.0' doesn't work + # it would be nice to fix that at some other level + xinstall -m 755 -d ${destroot}${prefix}/share/bakefile/presets } +destroot.keepdirs ${destroot}${prefix}/share/bakefile/presets variant aui description {add support for AUI docking library} { configure.args-append --enable-aui Modified: users/mojca/wxports/graphics/wxWidgets-3.0/Portfile =================================================================== --- users/mojca/wxports/graphics/wxWidgets-3.0/Portfile 2013-09-01 21:23:32 UTC (rev 110541) +++ users/mojca/wxports/graphics/wxWidgets-3.0/Portfile 2013-09-01 21:35:57 UTC (rev 110542) @@ -10,7 +10,7 @@ subport wxPython-3.0 {} subport wxgtk-3.0 {} version 2.9.5 -revision 1 +revision 2 set installname wxWidgets set wxtype osx_cocoa Copied: users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-Makefile.in.294.diff (from rev 110541, users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-Makefile.in.294.patch) =================================================================== --- users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-Makefile.in.294.diff (rev 0) +++ users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-Makefile.in.294.diff 2013-09-01 21:35:57 UTC (rev 110542) @@ -0,0 +1,12 @@ +http://trac.wxwidgets.org/ticket/15463 +--- Makefile.in.orig ++++ Makefile.in +@@ -15662,7 +15662,7 @@ install-wxconfig: + $(INSTALL_DIR) $(DESTDIR)$(bindir) + $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config + $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config +- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) ++ (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) + + locale_install: + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale Deleted: users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-Makefile.in.294.patch =================================================================== --- users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-Makefile.in.294.patch 2013-09-01 21:23:32 UTC (rev 110541) +++ users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-Makefile.in.294.patch 2013-09-01 21:35:57 UTC (rev 110542) @@ -1,12 +0,0 @@ -http://trac.wxwidgets.org/ticket/15463 ---- Makefile.in.orig -+++ Makefile.in -@@ -15662,7 +15662,7 @@ install-wxconfig: - $(INSTALL_DIR) $(DESTDIR)$(bindir) - $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config - $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config -- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) -+ (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) - - locale_install: - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale Copied: users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-Makefile.in.295.diff (from rev 110541, users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-Makefile.in.295.patch) =================================================================== --- users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-Makefile.in.295.diff (rev 0) +++ users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-Makefile.in.295.diff 2013-09-01 21:35:57 UTC (rev 110542) @@ -0,0 +1,12 @@ +http://trac.wxwidgets.org/ticket/15463 +--- Makefile.in.orig ++++ Makefile.in +@@ -16098,7 +16098,7 @@ install-wxconfig: + $(INSTALL_DIR) $(DESTDIR)$(bindir) + $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config + $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config +- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) ../`basename $(libdir)`/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) ++ (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) + + locale_install: + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale Deleted: users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-Makefile.in.295.patch =================================================================== --- users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-Makefile.in.295.patch 2013-09-01 21:23:32 UTC (rev 110541) +++ users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-Makefile.in.295.patch 2013-09-01 21:35:57 UTC (rev 110542) @@ -1,12 +0,0 @@ -http://trac.wxwidgets.org/ticket/15463 ---- Makefile.in.orig -+++ Makefile.in -@@ -16098,7 +16098,7 @@ install-wxconfig: - $(INSTALL_DIR) $(DESTDIR)$(bindir) - $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config - $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config -- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) ../`basename $(libdir)`/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) -+ (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) - - locale_install: - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale