[22249] trunk/dports/x11/wxgtk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Feb 23 19:20:09 PST 2007
Revision: 22249
http://trac.macosforge.org/projects/macports/changeset/22249
Author: markd at macports.org
Date: 2007-02-23 19:20:09 -0800 (Fri, 23 Feb 2007)
Log Message:
-----------
Closes #10595. Update to 2.8.0.
Modified Paths:
--------------
trunk/dports/x11/wxgtk/Portfile
Added Paths:
-----------
trunk/dports/x11/wxgtk/files/patch-Makefile.in
Removed Paths:
-------------
trunk/dports/x11/wxgtk/files/darwin-shared-ld-sh
Modified: trunk/dports/x11/wxgtk/Portfile
===================================================================
--- trunk/dports/x11/wxgtk/Portfile 2007-02-24 03:19:52 UTC (rev 22248)
+++ trunk/dports/x11/wxgtk/Portfile 2007-02-24 03:20:09 UTC (rev 22249)
@@ -2,7 +2,7 @@
PortSystem 1.0
name wxgtk
-version 2.4.2
+version 2.8.0
categories x11
maintainers nomaintainer at macports.org
description The wxWindows GUI toolkit with GTK+ bindings
@@ -13,20 +13,20 @@
platforms darwin
master_sites sourceforge:wxwindows
distname wxGTK-${version}
-checksums md5 cdadfe82fc93f8a65a2ae18a95b0b0e3
+checksums md5 9de30aeaad9bac6f8869907fa42fe950
use_bzip2 yes
-depends_lib lib:libgtk.1:gtk1 lib:libtiff:tiff lib:libjpeg:jpeg \
- lib:libpng:libpng lib:libfreetype.6:freetype \
- lib:libz:zlib
+depends_lib port:gtk2 port:tiff port:jpeg \
+ port:libpng port:freetype \
+ port:zlib
+patchfiles patch-Makefile.in
+
configure.env LDFLAGS="-L${prefix}/lib" \
CPPFLAGS="-I${prefix}/include -I${x11prefix}/include"
configure.args --with-gtk --with-libpng --with-libjpeg --with-libtiff \
--with-freetype --with-zlib
-destroot.destdir prefix=${destroot}/${prefix}
-
post-destroot {
xinstall -m 755 -d ${destroot}/${prefix}/share/doc/${name}
eval xinstall -m 644 [glob ${worksrcpath}/*.txt] \
@@ -37,11 +37,3 @@
depends_lib-append lib:libGL:XFree86
configure.args-append --with-opengl
}
-
-variant darwin {
- patchfiles darwin-shared-ld-sh
- post-patch {
- system "chmod 755 distrib/mac/shared-ld-sh"
- }
-}
-
Deleted: trunk/dports/x11/wxgtk/files/darwin-shared-ld-sh
===================================================================
--- trunk/dports/x11/wxgtk/files/darwin-shared-ld-sh 2007-02-24 03:19:52 UTC (rev 22248)
+++ trunk/dports/x11/wxgtk/files/darwin-shared-ld-sh 2007-02-24 03:20:09 UTC (rev 22249)
@@ -1,91 +0,0 @@
-diff -ruN distrib/mac/shared-ld-sh distrib/mac/shared-ld-sh
---- distrib/mac/shared-ld-sh Wed Dec 31 19:00:00 1969
-+++ distrib/mac/shared-ld-sh Sat Dec 14 19:45:03 2002
-@@ -0,0 +1,87 @@
-+#!/bin/sh
-+#-----------------------------------------------------------------------------
-+#-- Name: distrib/mac/shared-ld-sh
-+#-- Purpose: Link a mach-o dynamic shared library for Darwin / Mac OS X
-+#-- Author: Gilles Depeyrot
-+#-- Modified by:
-+#-- Created: 05.05.2002
-+#-- RCS-ID: $Id: darwin-shared-ld-sh,v 1.1 2003/04/09 22:17:58 jpm Exp $
-+#-- Copyright: (c) 2002 Gilles Depeyrot
-+#-- Licence: wxWindows licence
-+#-----------------------------------------------------------------------------
-+
-+verbose=0
-+args=""
-+objects=""
-+
-+while test $# -gt 0; do
-+ case $1 in
-+
-+ -v)
-+ verbose=1
-+ ;;
-+
-+ -o|-compatibility_version|-current_version|-framework|-undefined|-install_name)
-+ # collect these options and values
-+ args="$args $1 $2"
-+ shift
-+ ;;
-+
-+ -l*|-L*|-flat_namespace)
-+ # collect these options
-+ args="$args $1"
-+ ;;
-+
-+ -dynamiclib)
-+ # skip these options
-+ ;;
-+
-+ -*)
-+ echo "shared-ld: unhandled option '$1'"
-+ exit 1
-+ ;;
-+
-+ *.o)
-+ # collect object files
-+ objects="$objects $1"
-+ ;;
-+
-+ *)
-+ echo "shared-ld: unhandled argument '$1'"
-+ exit 1
-+ ;;
-+
-+ esac
-+ shift
-+done
-+
-+#
-+# Link one module containing all the others
-+#
-+if test $verbose = 1; then
-+ echo "c++ -r -keep_private_externs -nostdlib $objects -o master.$$.o"
-+fi
-+c++ -r -keep_private_externs -nostdlib $objects -o master.$$.o
-+status=$?
-+if test $status != 0; then
-+ exit $status
-+fi
-+
-+#
-+# Link the shared library from the single module created
-+#
-+if test $verbose = 1; then
-+ echo "cc -dynamiclib master.$$.o $args"
-+fi
-+c++ -dynamiclib master.$$.o $args
-+status=$?
-+if test $status != 0; then
-+ exit $status
-+fi
-+
-+#
-+# Remove intermediate module
-+#
-+rm -f master.$$.o
-+
-+exit 0
Added: trunk/dports/x11/wxgtk/files/patch-Makefile.in
===================================================================
--- trunk/dports/x11/wxgtk/files/patch-Makefile.in (rev 0)
+++ trunk/dports/x11/wxgtk/files/patch-Makefile.in 2007-02-24 03:20:09 UTC (rev 22249)
@@ -0,0 +1,46 @@
+--- Makefile.in.orig 2006-11-13 11:58:04.000000000 +0100
++++ Makefile.in 2006-11-14 21:45:39.000000000 +0100
+@@ -4901,8 +4901,8 @@
+ @COND_PLATFORM_MACOSX_1 at __HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o
+ @COND_PLATFORM_UNIX_1 at __HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o
+ @COND_TOOLKIT_MSW at __HTML_SRC_PLATFORM_OBJECTS = monodll_helpbest.o
+- at COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS \
+- at COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = monodll_sound_sdl.o
++ at COND_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS \
++ at COND_USE_PLUGINS_0@ = monodll_sound_sdl.o
+ COND_MONOLITHIC_1_SHARED_0___monolib___depname = \
+ $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+ @COND_MONOLITHIC_1_SHARED_0 at __monolib___depname = $(COND_MONOLITHIC_1_SHARED_0___monolib___depname)
+@@ -6667,8 +6667,8 @@
+ @COND_PLATFORM_MACOSX_1 at __HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o
+ @COND_PLATFORM_UNIX_1 at __HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o
+ @COND_TOOLKIT_MSW at __HTML_SRC_PLATFORM_OBJECTS_1 = monolib_helpbest.o
+- at COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_1 \
+- at COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = monolib_sound_sdl.o
++ at COND_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_1 \
++ at COND_USE_PLUGINS_0@ = monolib_sound_sdl.o
+ COND_MONOLITHIC_0_SHARED_1___basedll___depname = \
+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+ @COND_MONOLITHIC_0_SHARED_1 at __basedll___depname = $(COND_MONOLITHIC_0_SHARED_1___basedll___depname)
+@@ -10130,8 +10130,8 @@
+ @COND_TOOLKIT_MSW@ = advdll_datectrl.o
+ @COND_TOOLKIT_WINCE at __ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 \
+ @COND_TOOLKIT_WINCE@ = advdll_datectrl.o
+- at COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_2 \
+- at COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = advdll_sound_sdl.o
++ at COND_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_2 \
++ at COND_USE_PLUGINS_0@ = advdll_sound_sdl.o
+ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \
+ $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+ @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 at __advlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname)
+@@ -10195,8 +10195,8 @@
+ @COND_TOOLKIT_MSW@ = advlib_datectrl.o
+ @COND_TOOLKIT_WINCE at __ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 \
+ @COND_TOOLKIT_WINCE@ = advlib_datectrl.o
+- at COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_3 \
+- at COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = advlib_sound_sdl.o
++ at USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_3 \
++ at USE_PLUGINS_0@ = advlib_sound_sdl.o
+ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1___mediadll___depname = \
+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+ @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1 at __mediadll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1___mediadll___depname)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070223/217ddb9b/attachment.html
More information about the macports-changes
mailing list