[60534] trunk/dports
ryandesign at macports.org
ryandesign at macports.org
Sat Nov 14 15:10:03 PST 2009
Revision: 60534
http://trac.macports.org/changeset/60534
Author: ryandesign at macports.org
Date: 2009-11-14 15:10:00 -0800 (Sat, 14 Nov 2009)
Log Message:
-----------
Remove darwin 7 bits; MacPorts itself no longer compiles on Panther.
Modified Paths:
--------------
trunk/dports/aqua/Fluid/Portfile
trunk/dports/aqua/mkconsole/Portfile
trunk/dports/devel/gpgme/Portfile
trunk/dports/devel/macstl/Portfile
trunk/dports/devel/pnetC/Portfile
trunk/dports/devel/pnetlib/Portfile
trunk/dports/devel/poco/Portfile
trunk/dports/devel/subversion-python25bindings/Portfile
trunk/dports/devel/unsermake/Portfile
trunk/dports/java/gnu-classpath/Portfile
trunk/dports/java/gnu-classpath-inetlib/Portfile
trunk/dports/java/gnu-classpathx-comm/Portfile
trunk/dports/java/gnu-classpathx-javamail/Portfile
trunk/dports/kde/koffice/Portfile
trunk/dports/lang/XOTcl/Portfile
trunk/dports/lang/itcl/Portfile
trunk/dports/lang/lua/Portfile
trunk/dports/lang/python25-doc/Portfile
trunk/dports/lang/python26-doc/Portfile
trunk/dports/lang/ruby186/Portfile
trunk/dports/mail/cyrus-imapd/Portfile
trunk/dports/mail/dovecot/Portfile
trunk/dports/mail/imap-uw/Portfile
trunk/dports/math/gsl/Portfile
trunk/dports/math/gsl-devel/Portfile
trunk/dports/net/dsocks/Portfile
trunk/dports/net/rsync/Portfile
trunk/dports/print/ghostscript-fonts-hiragino/Portfile
trunk/dports/science/xloops/Portfile
trunk/dports/security/dirmngr/Portfile
trunk/dports/security/gpg-agent/Portfile
trunk/dports/security/ike-scan/Portfile
trunk/dports/textproc/html2text/Portfile
trunk/dports/x11/gtk2/Portfile
trunk/dports/x11/itk/Portfile
trunk/dports/x11/mowitz/Portfile
trunk/dports/x11/openmotif/Portfile
trunk/dports/x11/qt3/Portfile
Removed Paths:
-------------
trunk/dports/kde/koffice/files/koffice-panther.patch.bz2
trunk/dports/lang/lua/files/
trunk/dports/mail/cyrus-imapd/files/patch-no_msg_h.diff
trunk/dports/mail/imap-uw/files/patch-src-osdep-unix-Makefile.diff
trunk/dports/mail/imap-uw/files/patch-src-osdep-unix-ckp_osx.c.diff
trunk/dports/net/dsocks/files/patch-dsocks.h.diff
trunk/dports/textproc/html2text/files/patch-configure-panther.diff
trunk/dports/x11/openmotif/files/patch-freetype.diff
trunk/dports/x11/qt3/files/qt3-panther.patch
Modified: trunk/dports/aqua/Fluid/Portfile
===================================================================
--- trunk/dports/aqua/Fluid/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/aqua/Fluid/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -24,13 +24,6 @@
distname ${name}_${version}
use_zip yes
-platform darwin 7 {
-pre-fetch {
-return -code error "\n
- ${name} requires Mac OS X 10.5 or later.\n"
-}
-}
-
platform darwin 8 {
pre-fetch {
return -code error "\n
Modified: trunk/dports/aqua/mkconsole/Portfile
===================================================================
--- trunk/dports/aqua/mkconsole/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/aqua/mkconsole/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -51,10 +51,6 @@
xcode.destroot.settings-append SKIP_INSTALL=no
-platform darwin 7 {
- xcode.configuration "Deployment 10.3"
-}
-
livecheck.type regex
livecheck.url ${homepage}
livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)-s"
Modified: trunk/dports/devel/gpgme/Portfile
===================================================================
--- trunk/dports/devel/gpgme/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/devel/gpgme/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -53,10 +53,6 @@
${destroot}${prefix}/share/doc/${name}
}
-platform darwin 7 {
- configure.env-append LIBS="-lpth"
-}
-
# S/MIME needs gpgsm which comes with gnupg2 only; so use all gnupg2 here
variant smime description {Enable S/MIME support} {
depends_lib-append port:gnupg2
Modified: trunk/dports/devel/macstl/Portfile
===================================================================
--- trunk/dports/devel/macstl/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/devel/macstl/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -46,7 +46,3 @@
}
}
}
-
-platform darwin 7 {
- xcode.project macstl.xcode
-}
Modified: trunk/dports/devel/pnetC/Portfile
===================================================================
--- trunk/dports/devel/pnetC/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/devel/pnetC/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -12,10 +12,3 @@
patchfiles patch_Makefile.in
depends_build bin:csunit:pnetlib
configure.args --infodir=${prefix}/share/info --mandir=${prefix}/share/man
-
-#platform darwin 7 {
-#configure.env LIBTOOL=glibtool
-#build.args LIBTOOL=glibtool
-#destroot.args LIBTOOL=glibtool
-#}
-
Modified: trunk/dports/devel/pnetlib/Portfile
===================================================================
--- trunk/dports/devel/pnetlib/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/devel/pnetlib/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -16,9 +16,3 @@
checksums sha1 289432378c5783be8f3c8880efec14c7cc4d3ef6
depends_lib lib:libILAsm.a:pnet port:xorg-libs
configure.args --enable-shared --with-x
-
-#platform darwin 7 {
-#build.args LIBTOOL=glibtool
-#destroot.args LIBTOOL=glibtool
-#}
-
Modified: trunk/dports/devel/poco/Portfile
===================================================================
--- trunk/dports/devel/poco/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/devel/poco/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -157,9 +157,4 @@
}
}
-platform darwin 7 {
- set config Darwin7
- configure.args-append --config=${config}
-}
-
livecheck.regex "<title>sources ${name}-(.*) released.*</title>"
Modified: trunk/dports/devel/subversion-python25bindings/Portfile
===================================================================
--- trunk/dports/devel/subversion-python25bindings/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/devel/subversion-python25bindings/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -100,8 +100,3 @@
file rename "${destroot}/${prefix}/lib/svn-python" \
"${destroot}/${prefix}/lib/svn-python2.5"
}
-
-# 10.3 says -> CarbonCore/MacTypes.h: No such file or directory
-platform darwin 7 { configure.args-append \
- --disable-keychain
- }
Modified: trunk/dports/devel/unsermake/Portfile
===================================================================
--- trunk/dports/devel/unsermake/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/devel/unsermake/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -42,10 +42,3 @@
xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
xinstall -m 644 -W ${worksrcpath} COPYING README TODO ${destroot}${prefix}/share/doc/${name}
}
-
-platform darwin 7 {
- depends_run-append port:coreutils
- post-patch {
- reinplace "s|`readlink|`greadlink|" ${worksrcpath}/unsermake
- }
-}
Modified: trunk/dports/java/gnu-classpath/Portfile
===================================================================
--- trunk/dports/java/gnu-classpath/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/java/gnu-classpath/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -47,9 +47,4 @@
${destroot}${prefix}/share/java/glibj.jar
}
-platform darwin 7 {
- # jikes on 10.3 is < 1.22
- depends_build-append port:jikes
-}
-
livecheck.name ${my_name}
Modified: trunk/dports/java/gnu-classpath-inetlib/Portfile
===================================================================
--- trunk/dports/java/gnu-classpath-inetlib/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/java/gnu-classpath-inetlib/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -22,10 +22,6 @@
depends_lib port:gnu-classpath \
port:gnu-crypto
-platform darwin 7 {
- depends_build port:jikes
-}
-
worksrcdir inetlib
configure.env JAVAC=${prefix}/bin/jikes \
Modified: trunk/dports/java/gnu-classpathx-comm/Portfile
===================================================================
--- trunk/dports/java/gnu-classpathx-comm/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/java/gnu-classpathx-comm/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -20,10 +20,6 @@
depends_lib port:gnu-classpath
-platform darwin 7 {
- depends_build port:jikes
-}
-
worksrcdir comm
configure.env JAVAC=${prefix}/bin/jikes \
Modified: trunk/dports/java/gnu-classpathx-javamail/Portfile
===================================================================
--- trunk/dports/java/gnu-classpathx-javamail/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/java/gnu-classpathx-javamail/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -22,10 +22,6 @@
port:gnu-classpath-inetlib \
port:gnu-classpathx-activation
-platform darwin 7 {
- depends_build port:jikes
-}
-
configure.env JAVAC=${prefix}/bin/jikes \
BOOTCLASSPATH=${prefix}/share/java/glibj.jar
configure.args --with-activation-jar=${prefix}/share/java/ \
Modified: trunk/dports/kde/koffice/Portfile
===================================================================
--- trunk/dports/kde/koffice/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/kde/koffice/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -93,16 +93,6 @@
xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING COPYING.LIB INSTALL README ${destroot}${prefix}/share/doc/${name}
}
-platform darwin 7 {
- patchfiles-delete koffice-tiger.patch.bz2
- patchfiles-append koffice-panther.patch.bz2
- post-patch {
-# if {[variant_isset with_ruby]} {
- system "perl -pi -e \"s|-bundle|-bundle -bundle_loader /usr/lib/crt1.o|g\" ${worksrcpath}/admin/libtool.m4.in"
-# }
- }
-}
-
platform darwin 9 {
post-patch {
reinplace "s|CFLAGS=\"-Os -fPIC\"|CFLAGS=\"-Os -fPIC -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib\"|" ${worksrcpath}/environment-helper.sh
Deleted: trunk/dports/kde/koffice/files/koffice-panther.patch.bz2
===================================================================
(Binary files differ)
Modified: trunk/dports/lang/XOTcl/Portfile
===================================================================
--- trunk/dports/lang/XOTcl/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/lang/XOTcl/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -19,9 +19,3 @@
# Use a reasonable default
set tclconfig ${prefix}/lib
configure.args --enable-threads --with-tcl=${tclconfig} --with-tk=${prefix}/lib
-
-platform darwin 7 {
- global tclconfig
-
- set tclconfig /System/Library/Frameworks/Tcl.framework
-}
Modified: trunk/dports/lang/itcl/Portfile
===================================================================
--- trunk/dports/lang/itcl/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/lang/itcl/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -35,12 +35,6 @@
configure.args --with-tcl=${tclconfig} --with-tk=${prefix}/lib
-platform darwin 7 {
- global tclconfig
-
- set tclconfig /System/Library/Frameworks/Tcl.framework
-}
-
post-patch {
reinplace "s|@itcl_LIB_FILE@|${prefix}/lib/libitcl3.3.dylib|g" \
${worksrcpath}/itclConfig.sh.in
Modified: trunk/dports/lang/lua/Portfile
===================================================================
--- trunk/dports/lang/lua/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/lang/lua/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -67,11 +67,6 @@
xinstall -m 0644 ${worksrcpath}/etc/lua.pc ${destroot}${prefix}/lib/pkgconfig/lua.pc
}
-platform darwin 7 {
- depends_lib-delete port:readline
- patchfiles-append patch-readline_darwin7.diff
-}
-
livecheck.type regex
livecheck.url ${master_sites}
livecheck.regex {lua-(\d+(?:\.\d+)*)}
Modified: trunk/dports/lang/python25-doc/Portfile
===================================================================
--- trunk/dports/lang/python25-doc/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/lang/python25-doc/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -51,13 +51,6 @@
file copy $worksrcpath/Doc/html ${destroot}${prefix}/share/doc/${name}
}
-platform darwin 7 {
- # there is no SystemStubs on 10.3
- post-patch { reinplace "s|-lSystemStubs||g" ${worksrcpath}/Makefile.pre.in }
- # To avoid GCC incompatibility issue. See http://nxg.me.uk/note/2004/restFP/ (by ebgssth at gmail.com, ticket #13322)
- configure.ldflags-append "-lcc_dynamic"
-}
-
platform darwin 8 {
configure.args-append --with-cxx=/usr/bin/g++-4.0
}
Modified: trunk/dports/lang/python26-doc/Portfile
===================================================================
--- trunk/dports/lang/python26-doc/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/lang/python26-doc/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -48,13 +48,6 @@
file copy $worksrcpath/Doc/build/html ${destroot}${prefix}/share/doc/${name}
}
-platform darwin 7 {
- # there is no SystemStubs on 10.3
- post-patch { reinplace "s|-lSystemStubs||g" ${worksrcpath}/Makefile.pre.in }
- # To avoid GCC incompatibility issue. See http://nxg.me.uk/note/2004/restFP/ (by ebgssth at gmail.com, ticket #13322)
- configure.ldflags-append "-lcc_dynamic"
-}
-
platform darwin 8 {
configure.args-append --with-cxx=/usr/bin/g++-4.0
}
Modified: trunk/dports/lang/ruby186/Portfile
===================================================================
--- trunk/dports/lang/ruby186/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/lang/ruby186/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -80,11 +80,6 @@
destroot.env DYLD_LIBRARY_PATH=${destroot}${prefix}/lib
}
-platform darwin 7 {
- # pthreads is being called with an unavailable function call
- configure.args-delete --enable-pthread
-}
-
platform darwin 9 {
patchfiles-append dot-darwin.diff \
etc-irbrc.diff \
Modified: trunk/dports/mail/cyrus-imapd/Portfile
===================================================================
--- trunk/dports/mail/cyrus-imapd/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/mail/cyrus-imapd/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -78,8 +78,6 @@
${destroot}${prefix}/var/spool/imap ${destroot}${prefix}/var/log
}
-platform darwin 7 { patchfiles-append patch-no_msg_h.diff }
-
platform powerpc { configure.args-append --build=powerpc }
variant murder { configure.args-append --enable-murder }
Deleted: trunk/dports/mail/cyrus-imapd/files/patch-no_msg_h.diff
===================================================================
--- trunk/dports/mail/cyrus-imapd/files/patch-no_msg_h.diff 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/mail/cyrus-imapd/files/patch-no_msg_h.diff 2009-11-14 23:10:00 UTC (rev 60534)
@@ -1,75 +0,0 @@
---- imap/cvt_cyrusdb.c.orig Fri May 21 23:45:48 2004
-+++ imap/cvt_cyrusdb.c Fri Mar 4 15:13:18 2005
-@@ -60,7 +60,6 @@
- #include <syslog.h>
-
- #include <sys/ipc.h>
--#include <sys/msg.h>
-
- #include "acl.h"
- #include "assert.h"
-
---- imap/mboxlist.c.orig Tue Jun 21 00:34:44 2005
-+++ imap/mboxlist.c Tue Jun 21 00:36:53 2005
-@@ -60,7 +60,6 @@
- #include <syslog.h>
-
- #include <sys/ipc.h>
--#include <sys/msg.h>
-
- #include "acl.h"
- #include "annotate.h"
-
---- imtest/imtest.c.orig Tue Dec 7 15:26:22 2004
-+++ imtest/imtest.c Fri Mar 4 15:22:16 2005
-@@ -47,7 +47,6 @@
- #include <sys/time.h>
- #include <sys/types.h>
- #include <sys/ipc.h>
--#include <sys/msg.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-
---- installsieve/installscript.c.orig Thu Feb 13 16:15:37 2003
-+++ installsieve/installscript.c Tue Jun 21 01:30:34 2005
-@@ -47,7 +47,6 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/ipc.h>
--#include <sys/msg.h>
-
- #include <stdlib.h>
- #include <stdio.h>
-
---- installsieve/request.c.orig Tue Jun 21 01:20:13 2005
-+++ installsieve/request.c Tue Jun 21 01:21:04 2005
-@@ -47,7 +47,6 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/ipc.h>
--#include <sys/msg.h>
-
- #include <stdlib.h>
- #include <stdio.h>
-
---- netnews/remotepurge.c.orig Thu Feb 13 16:15:47 2003
-+++ netnews/remotepurge.c Tue Jun 21 01:35:12 2005
-@@ -48,7 +48,6 @@
-
- #include <sys/types.h>
- #include <sys/ipc.h>
--#include <sys/msg.h>
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <ctype.h>
-
---- perl/sieve/lib/request.c.orig Thu Feb 13 16:15:53 2003
-+++ perl/sieve/lib/request.c Tue Jun 21 01:38:26 2005
-@@ -51,7 +51,6 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/ipc.h>
--#include <sys/msg.h>
-
- #include <stdlib.h>
- #include <stdio.h>
Modified: trunk/dports/mail/dovecot/Portfile
===================================================================
--- trunk/dports/mail/dovecot/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/mail/dovecot/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -30,17 +30,11 @@
configure.args --sysconfdir=${prefix}/etc/dovecot \
--localstatedir=${prefix}/var \
+ --with-ioloop=kqueue \
--with-ssl=openssl --with-ssl-dir=${prefix}/etc/ssl
configure.cppflags "-I${prefix}/include/openssl"
-post-configure {
- # madvise fails on darwin 7 and earlier, but is fixed on darwin 8
- if { ${os.platform} == "darwin" && [rpm-vercomp ${os.version} 8.0] < 0 } {
- reinplace "s|#define HAVE_MADVISE 1|/* #undef HAVE_MADVISE */|" ${worksrcpath}/config.h
- }
-}
-
post-destroot {
# Create the dovecot user and group
addgroup dovecot
@@ -48,23 +42,6 @@
adduser dovecot gid=${gid} realname=Dovecot
}
-platform darwin 7 {
- # Avoid broken poll
- configure.args-append --with-ioloop=select
-}
-
-platform darwin 8 {
- configure.args-append --with-ioloop=kqueue
-}
-
-platform darwin 9 {
- configure.args-append --with-ioloop=kqueue
-}
-
-platform darwin 10 {
- configure.args-append --with-ioloop=kqueue
-}
-
variant postgres {
depends_lib-append port:postgresql80
configure.args-append --with-pgsql
Modified: trunk/dports/mail/imap-uw/Portfile
===================================================================
--- trunk/dports/mail/imap-uw/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/mail/imap-uw/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -32,13 +32,6 @@
# Enable IPv6 support
build.args-append IP=6
-# Patches for Darwin 7.x/Mac OS X 10.3.x support
-platform darwin 7 {
- patchfiles patch-src-osdep-unix-Makefile.diff \
- patch-src-osdep-unix-ckp_osx.c.diff
- build.target osx
-}
-
# Default is to enable SSL support and plaintext authentication
# permitted only in SSL/TLS sessions.
Deleted: trunk/dports/mail/imap-uw/files/patch-src-osdep-unix-Makefile.diff
===================================================================
--- trunk/dports/mail/imap-uw/files/patch-src-osdep-unix-Makefile.diff 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/mail/imap-uw/files/patch-src-osdep-unix-Makefile.diff 2009-11-14 23:10:00 UTC (rev 60534)
@@ -1,16 +0,0 @@
---- src/osdep/unix/Makefile.orig 2008-01-12 19:23:42.000000000 +0100
-+++ src/osdep/unix/Makefile 2008-01-12 19:24:48.000000000 +0100
-@@ -581,10 +581,11 @@
-
- osx: # Mac OS X
- $(BUILD) `$(CAT) SPECIALS` OS=$@ \
-- CRXTYPE=nfs \
-+ CHECKPW=osx CRXTYPE=nfs \
- SPOOLDIR=/var/spool MAILSPOOL=/var/mail \
- RSHPATH=/usr/bin/rsh \
-- BASECFLAGS="$(GCC4CFLAGS)"
-+ BASECFLAGS="$(GCC4CFLAGS) -Wno-pointer-sign" \
-+ EXTRALDFLAGS="-framework DirectoryService"
-
- ptx: # PTX
- $(BUILD) `$(CAT) SPECIALS` OS=$@ \
Deleted: trunk/dports/mail/imap-uw/files/patch-src-osdep-unix-ckp_osx.c.diff
===================================================================
--- trunk/dports/mail/imap-uw/files/patch-src-osdep-unix-ckp_osx.c.diff 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/mail/imap-uw/files/patch-src-osdep-unix-ckp_osx.c.diff 2009-11-14 23:10:00 UTC (rev 60534)
@@ -1,475 +0,0 @@
-diff -ruP src/osdep/unix-orig/ckp_osx.c src/osdep/unix/ckp_osx.c
---- src/osdep/unix-orig/ckp_osx.c Thu Jan 1 01:00:00 1970
-+++ src/osdep/unix/ckp_osx.c Wed Nov 5 00:18:14 2003
-@@ -0,0 +1,471 @@
-+/*
-+ * Program: OS X check password
-+ *
-+ * Author: Mark Crispin
-+ * Networks and Distributed Computing
-+ * Computing & Communications
-+ * University of Washington
-+ * Administration Building, AG-44
-+ * Seattle, WA 98195
-+ * Internet: MRC at CAC.Washington.EDU
-+ *
-+ * Modified by: Tom Brown
-+ * tb000 at maczipit.com
-+ * (Modifications provided as-is, with no warranties, including the warranty
-+ * of merchantability or fitness for a particular purpose.)
-+ *
-+ * Date: 1 August 1988
-+ * Last Edited: October 26, 2003
-+ *
-+ * The IMAP toolkit provided in this Distribution is
-+ * Copyright 2000 University of Washington.
-+ * The full text of our legal notices is contained in the file called
-+ * CPYRIGHT, included with this Distribution.
-+ *
-+ * This file contains code adapted from Apple's sample code. The following notice applies
-+ * to the Apple-derived portion of this file.
-+ *
-+ Copyright: \xA9 2000-2001 by Apple Computer, Inc., all rights reserved.
-+
-+ IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in
-+ consideration of your agreement to the following terms, and your use, installation,
-+ modification or redistribution of this Apple software constitutes acceptance of these
-+ terms. If you do not agree with these terms, please do not use, install, modify or
-+ redistribute this Apple software.
-+
-+ In consideration of your agreement to abide by the following terms, and subject to these
-+ terms, Apple grants you a personal, non-exclusive license, under Apple\xD5s copyrights in
-+ this original Apple software (the "Apple Software"), to use, reproduce, modify and
-+ redistribute the Apple Software, with or without modifications, in source and/or binary
-+ forms; provided that if you redistribute the Apple Software in its entirety and without
-+ modifications, you must retain this notice and the following text and disclaimers in all
-+ such redistributions of the Apple Software. Neither the name, trademarks, service marks
-+ or logos of Apple Computer, Inc. may be used to endorse or promote products derived from
-+ the Apple Software without specific prior written permission from Apple. Except as expressly
-+ stated in this notice, no other rights or licenses, express or implied, are granted by Apple
-+ herein, including but not limited to any patent rights that may be infringed by your
-+ derivative works or by other works in which the Apple Software may be incorporated.
-+
-+ The Apple Software is provided by Apple on an "AS IS" basis. APPLE MAKES NO WARRANTIES,
-+ EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF NON-INFRINGEMENT,
-+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS
-+ USE AND OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
-+
-+ IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR CONSEQUENTIAL
-+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE,
-+ REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND
-+ WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR
-+ OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+*/
-+ #include <CoreServices/CoreServices.h>
-+#include <DirectoryService/DirServices.h>
-+#include <DirectoryService/DirServicesUtils.h>
-+#include <DirectoryService/DirServicesConst.h>
-+
-+ // Liberally borrowed from Apple's Open Directory SDK
-+
-+typedef enum {
-+ // NULL allocation errors
-+ kErrDataBufferAllocate = 1,
-+ kErrDataNodeAllocateBlock,
-+ kErrDataNodeAllocateString,
-+ kErrDataListAllocate,
-+ kErrBuildFromPath,
-+ kErrGetPathFromList,
-+ kErrBuildListFromNodes,
-+ kErrBuildListFromStrings,
-+ kErrBuildListFromStringsAlloc,
-+ kErrDataListCopyList,
-+ kErrAllocAttributeValueEntry,
-+
-+ // Error associations
-+ kErrOpenDirSrvc,
-+ kErrCloseDirSrvc,
-+ kErrDataListDeallocate,
-+ kErrDataBufferDeAllocate,
-+ kErrFindDirNodes,
-+ kErrOpenRecord,
-+ kErrCreateRecordAndOpen,
-+ kErrCloseRecord,
-+ kErrDeleteRecord,
-+ kErrDataNodeDeAllocate,
-+
-+ kErrDataBuffDealloc,
-+ kErrCreateRecord,
-+ kErrAddAttribute,
-+ kErrAddAttributeValue,
-+ kErrSetAttributeValue,
-+ kErrGetRecAttrValueByIndex,
-+ kErrGetDirNodeName,
-+ kErrOpenDirNode,
-+ kErrCloseDirNode,
-+ kErrGetRecordList,
-+
-+ kErrGetRecordEntry,
-+ kErrGetAttributeEntry,
-+ kErrGetAttributeValue,
-+ kErrDeallocAttributeValueEntry,
-+ kErrDoDirNodeAuth,
-+ kErrGetRecordNameFromEntry,
-+ kErrGetRecordTypeFromEntry,
-+ kErrGetRecordAttributeInfo,
-+ kErrGetRecordReferenceInfo,
-+ kErrGetDirNodeInfo,
-+
-+ kErrGetDirNodeCount,
-+ kErrGetDirNodeList,
-+ kErrRemoveAttributeValue,
-+ kErr,
-+
-+ kErrMemoryAlloc,
-+ kErrEmptyDataBuff,
-+ kErrEmptyDataParam,
-+ kErrBuffTooSmall,
-+ kErrMaxErrors,
-+ kUnknownErr = 0xFF
-+} eErrCodes;
-+
-+long SetUpAuthBuffs ( tDirReference dsRef, tDataBuffer **outAuthBuff,
-+ unsigned long inAuthBuffSize,
-+ tDataBuffer **outStepBuff,
-+ unsigned long inStepBuffSize,
-+ tDataBuffer **outTypeBuff,
-+ const char *inAuthMethod )
-+{
-+ long error = eDSNoErr;
-+ long error2 = eDSNoErr;
-+
-+ if ( (outAuthBuff == nil) || (outStepBuff == nil) ||
-+ (outTypeBuff == nil) || (inAuthMethod == nil) )
-+ {
-+ return( kErrEmptyDataParam );
-+ }
-+
-+ *outAuthBuff = dsDataBufferAllocate( dsRef, inAuthBuffSize );
-+ if ( *outAuthBuff != nil )
-+ {
-+ *outStepBuff = dsDataBufferAllocate( dsRef, inStepBuffSize );
-+ if ( *outStepBuff != nil )
-+ {
-+ *outTypeBuff = dsDataNodeAllocateString( dsRef, inAuthMethod );
-+ if ( *outTypeBuff == nil )
-+ {
-+ error = kErrDataNodeAllocateString;
-+ }
-+ }
-+ else
-+ {
-+ error = kErrDataBufferAllocate;
-+ }
-+ }
-+ else
-+ {
-+ error = kErrDataBufferAllocate;
-+ }
-+
-+ if ( error != eDSNoErr )
-+ {
-+ if ( *outAuthBuff != nil )
-+ {
-+ error2 = dsDataBufferDeAllocate( dsRef, *outAuthBuff );
-+ }
-+
-+ if ( *outStepBuff != nil )
-+ {
-+ error2 = dsDataBufferDeAllocate( dsRef, *outStepBuff );
-+ }
-+
-+ if ( *outTypeBuff != nil )
-+ {
-+ error2 = dsDataBufferDeAllocate( dsRef, *outTypeBuff );
-+ }
-+ }
-+
-+ return( error );
-+
-+} // SetUpAuthBuffs
-+
-+long FillAuthBuff ( tDataBuffer *inAuthBuff, unsigned long inCount, unsigned long inLen, void *inData, ... )
-+{
-+ long error = eDSNoErr;
-+ unsigned long curr = 0;
-+ unsigned long buffSize = 0;
-+ unsigned long count = inCount;
-+ unsigned long len = inLen;
-+ void *data = inData;
-+ bool firstPass = true;
-+ char *p = nil;
-+ va_list args;
-+
-+ // If the buffer is nil, we have nowhere to put the data
-+ if ( inAuthBuff == nil )
-+ {
-+ return( kErrEmptyDataBuff );
-+ }
-+
-+ // If the buffer is nil, we have nowhere to put the data
-+ if ( inAuthBuff->fBufferData == nil )
-+ {
-+ return( kErrEmptyDataBuff );
-+ }
-+
-+ // Make sure we have data to copy
-+ if ( (inLen != 0) && (inData == nil) )
-+ {
-+ return( kErrEmptyDataParam );
-+ }
-+
-+ // Get buffer info
-+ p = inAuthBuff->fBufferData;
-+ buffSize = inAuthBuff->fBufferSize;
-+
-+ // Set up the arg list
-+ va_start( args, inLen );
-+
-+ while ( count-- > 0 )
-+ {
-+ if ( !firstPass )
-+ {
-+ len = va_arg( args, unsigned long );
-+ data = va_arg( args, void * );
-+ }
-+
-+ if ( (curr + len) > buffSize )
-+ {
-+ // This is bad, lets bail
-+ return( kErrBuffTooSmall );
-+ }
-+
-+ memcpy( &(p[ curr ]), &len, sizeof( long ) );
-+ curr += sizeof( long );
-+
-+ if ( len > 0 )
-+ {
-+ memcpy( &(p[ curr ]), data, len );
-+ curr += len;
-+ }
-+ firstPass = false;
-+ }
-+
-+ inAuthBuff->fBufferLength = curr;
-+
-+ return( error );
-+
-+} // FillAuthBuff
-+
-+
-+long DoClearTextAuth ( tDirReference dsRef, tDirNodeReference inNode, char *inName, char *inPasswd )
-+{
-+ long error= eDSNoErr;
-+ long error2= eDSNoErr;
-+ tDataBuffer *pAuthBuff= nil;
-+ tDataBuffer *pStepBuff= nil;
-+ tDataNode *pAuthType= nil;
-+
-+ error = SetUpAuthBuffs( dsRef, &pAuthBuff, 2048, &pStepBuff, 2048, &pAuthType, kDSStdAuthNodeNativeClearTextOK );
-+ if ( error == eDSNoErr )
-+ {
-+ error = FillAuthBuff ( pAuthBuff, 2,
-+ (long)strlen( inName ), inName,
-+ (long)strlen( inPasswd ), inPasswd );
-+
-+ if ( error == eDSNoErr )
-+ {
-+ error = dsDoDirNodeAuth( inNode, pAuthType, true, pAuthBuff, pStepBuff, nil );
-+ }
-+
-+ error2 = dsDataBufferDeAllocate( dsRef, pAuthBuff );
-+ error2 = dsDataBufferDeAllocate( dsRef, pStepBuff );
-+ error2 = dsDataBufferDeAllocate( dsRef, pAuthType );
-+ }
-+
-+ return( error );
-+
-+} // DoClearTextAuth
-+
-+static long OpenDirNode ( tDirReference dsRef, char *inNodeName, tDirNodeReference *outNodeRef )
-+{
-+ long error = eDSNoErr;
-+ long error2 = eDSNoErr;
-+ tDataList *pDataList = nil;
-+
-+ pDataList = dsBuildFromPath( dsRef, inNodeName, "/" );
-+ if ( pDataList != nil )
-+ {
-+ error = dsOpenDirNode( dsRef, pDataList, outNodeRef );
-+ error2 = dsDataListDeallocate( dsRef, pDataList );
-+ }
-+ else
-+ {
-+ error = kErrBuildFromPath;
-+ }
-+
-+ return( error );
-+
-+} // OpenDirNode
-+
-+static long FindDirectoryNodes ( tDirReference dsRef,
-+ char *inNodeName,
-+ tDirPatternMatch inMatch,
-+ char **outNodeName)
-+{
-+ long error = eDSNoErr;
-+ long error2 = eDSNoErr;
-+ bool done = false;
-+ unsigned long uiCount = 0;
-+ unsigned long uiIndex = 0;
-+ tDataList *pNodeNameList = nil;
-+ tDataList *pDataList = nil;
-+ char *pNodeName = nil;
-+ tDataBuffer *buf;
-+
-+ if ( inNodeName != nil )
-+ {
-+ pNodeNameList = dsBuildFromPath( dsRef, inNodeName, "/" );
-+ if ( pNodeNameList == nil )
-+ {
-+ return( kErrDataNodeAllocateString );
-+ }
-+ }
-+
-+ buf = dsDataBufferAllocate( dsRef, 1024);
-+ do {
-+ error = dsFindDirNodes( dsRef, buf, pNodeNameList, inMatch, &uiCount, nil );
-+ if ( error == eDSBufferTooSmall )
-+ {
-+ unsigned long buffSize = buf->fBufferSize;
-+ dsDataBufferDeAllocate( dsRef, buf );
-+ buf = nil;
-+ buf = dsDataBufferAllocate( dsRef, buffSize * 2 );
-+ }
-+ } while ( error == eDSBufferTooSmall );
-+ if ( error == eDSNoErr )
-+ {
-+
-+ if ( uiCount != 0 )
-+ {
-+ pDataList = dsDataListAllocate( dsRef );
-+ if ( pDataList != nil )
-+ {
-+ for ( uiIndex = 1; (uiIndex <= uiCount) && (error == eDSNoErr); uiIndex++ )
-+ {
-+ error = dsGetDirNodeName( dsRef, buf, uiIndex, &pDataList );
-+ if ( error == eDSNoErr )
-+ {
-+ pNodeName = dsGetPathFromList( dsRef, pDataList, "/" );
-+ if ( pNodeName != nil )
-+ {
-+
-+ if ( (outNodeName != nil) && !done )
-+ {
-+ *outNodeName = pNodeName;
-+ done = true;
-+ }
-+ else
-+ {
-+ free( pNodeName );
-+ pNodeName = nil;
-+ }
-+
-+ error2 = dsDataListDeallocate( dsRef, pDataList );
-+ }
-+ else
-+ {
-+ error = kErrGetPathFromList;
-+ }
-+ }
-+ }
-+ }
-+ else
-+ {
-+ error = kErrDataListAllocate;
-+ }
-+ }
-+ }
-+
-+ if ( pNodeNameList != nil )
-+ {
-+ error2 = dsDataListDeallocate( dsRef, pNodeNameList );
-+ }
-+
-+ dsDataBufferDeAllocate( dsRef, buf );
-+ return( error );
-+
-+} // FindDirectoryNodes
-+
-+static long MyOpenDirNode ( tDirReference dirRef,
-+ tDirNodeReference *outNodeRef )
-+{
-+ long siStatus = noErr;
-+ char *pNodeName = nil;
-+
-+ // siStatus = OpenDirectoryServices();
-+ if ( siStatus != noErr )
-+ {
-+ return( siStatus );
-+ }
-+
-+ // Find and open local node
-+ siStatus = FindDirectoryNodes( dirRef, nil, eDSLocalNodeNames, &pNodeName );
-+ if ( siStatus == noErr )
-+ {
-+ siStatus = OpenDirNode( dirRef, pNodeName, outNodeRef );
-+
-+ free( pNodeName );
-+ pNodeName = nil;
-+ }
-+
-+ return siStatus;
-+}
-+
-+/* Check password
-+ * Accepts: login passwd struct
-+ * password string
-+ * argument count
-+ * argument vector
-+ * Returns: passwd struct if password validated, NIL otherwise
-+ */
-+
-+struct passwd *checkpw (struct passwd *pw,char *pass,int argc,char *argv[])
-+{
-+ if (pw->pw_passwd && pw->pw_passwd[0] && pw->pw_passwd[1])
-+ {
-+ long dirStatus = eDSNoErr;
-+ tDirNodeReference nodeRef = NULL;
-+ tDirReference dirRef = NULL;
-+
-+ dirStatus = dsOpenDirService( &dirRef );
-+ if ( dirStatus == eDSNoErr )
-+ {
-+ dirStatus = MyOpenDirNode( dirRef, &nodeRef );
-+ }
-+
-+ if (dirStatus == eDSNoErr)
-+ {
-+ dirStatus = DoClearTextAuth(dirRef, nodeRef, pw->pw_name, pass);
-+ }
-+
-+ // Any error causes us to fail (including failure of authentication, above)
-+ if (dirStatus != eDSNoErr)
-+ {
-+ pw = NULL;
-+ }
-+
-+ if (nodeRef)
-+ {
-+ dsCloseDirNode( nodeRef );
-+ }
-+
-+ if ( dirRef != NULL )
-+ {
-+ dirStatus = dsCloseDirService( dirRef );
-+ }
-+
-+ return pw;
-+ }
-+ else
-+ {
-+ return NULL;
-+ }
-+}
Modified: trunk/dports/math/gsl/Portfile
===================================================================
--- trunk/dports/math/gsl/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/math/gsl/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -24,11 +24,6 @@
rmd160 f71507181ace425df0977a13946f12cae4b65783
platforms darwin
-# Lower optimization level (-O1) is required to avoid code generation
-# bugs in Apple's gcc 3.3 and earlier.
-platform darwin 7 {
- configure.cflags-append "-O1"
-}
depends_build port:texinfo
use_parallel_build yes
Modified: trunk/dports/math/gsl-devel/Portfile
===================================================================
--- trunk/dports/math/gsl-devel/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/math/gsl-devel/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -24,10 +24,6 @@
rmd160 aa974bc4b1aebbacf5c41ad70115bd94bc9dc6b8
platforms darwin
-# Lower optimization level (-O1) is required to avoid code generation bugs in Apple's gcc 3.3 and earlier.
-platform darwin 7 {
- configure.cflags-append "-O1"
-}
configure.args --mandir=${prefix}/share/man --infodir=${prefix}/share/info
depends_build port:texinfo
Modified: trunk/dports/net/dsocks/Portfile
===================================================================
--- trunk/dports/net/dsocks/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/net/dsocks/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -22,12 +22,6 @@
patchfiles patch-dsocks.sh.diff patch-dsocks-torify.sh.diff
-# Darwin 7 and earlier (Mac OS X 10.3 and earlier) need dsocks.h to explicitly
-# include stdint.h. patch-dsocks.h does this.
-platform darwin 7 {
- patchfiles-append patch-dsocks.h.diff
-}
-
post-patch {
reinplace "s|/usr/local|${prefix}|g" \
${worksrcpath}/dsocks.sh \
Deleted: trunk/dports/net/dsocks/files/patch-dsocks.h.diff
===================================================================
--- trunk/dports/net/dsocks/files/patch-dsocks.h.diff 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/net/dsocks/files/patch-dsocks.h.diff 2009-11-14 23:10:00 UTC (rev 60534)
@@ -1,11 +0,0 @@
---- dsocks.h 2007-08-17 04:50:03.000000000 +0000
-+++ dsocks.h.darwin-7 2007-08-23 06:01:10.000000000 +0000
-@@ -9,6 +9,8 @@
- #ifndef DSOCKS_H
- #define DSOCKS_H
-
-+#include <stdint.h>
-+
- struct dsocks4_hdr {
- uint8_t vn; /* version number */
- uint8_t cd; /* command code */
Modified: trunk/dports/net/rsync/Portfile
===================================================================
--- trunk/dports/net/rsync/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/net/rsync/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -50,11 +50,6 @@
${destroot}${prefix}/share/doc/${name}
}
-platform darwin 7 {
- configure.args-delete --enable-xattr-support
- configure.args-append --disable-acl-support --disable-xattr-support
-}
-
livecheck.type regex
livecheck.regex "Rsync version (\\d+(?:\\.\\d+)*) released"
Modified: trunk/dports/print/ghostscript-fonts-hiragino/Portfile
===================================================================
--- trunk/dports/print/ghostscript-fonts-hiragino/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/print/ghostscript-fonts-hiragino/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -22,7 +22,7 @@
build {}
destroot {
- if {[variant_isset darwin_8] || [variant_isset darwin_7]} {
+ if {[variant_isset darwin_8]} {
set FontList {"/System/Library/Fonts/ヒラギノ角ゴ Pro W3.otf" HiraKakuPro-W3 Adobe-Japan1 {GothicBBB-Medium}
"/System/Library/Fonts/ヒラギノ角ゴ Pro W6.otf" HiraKakuPro-W6 Adobe-Japan1 {FutoGoB101-Bold}
"/System/Library/Fonts/ヒラギノ角ゴ Std W8.otf" HiraKakuStd-W8 Adobe-Japan1 {}
@@ -275,7 +275,6 @@
}
}
-platform darwin 7 {}
platform darwin 8 {}
platform darwin 10 {}
Modified: trunk/dports/science/xloops/Portfile
===================================================================
--- trunk/dports/science/xloops/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/science/xloops/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -38,11 +38,6 @@
system "cd ${worksrcpath} && LIBTOOLIZE=glibtoolize autoreconf -i"
}
-platform darwin 7 {
- depends_build port:gcc40
- configure.compiler macports-gcc-4.0
-}
-
build.target { }
#user_notes Not all of the two loops tests pass yet. The ones that \
Modified: trunk/dports/security/dirmngr/Portfile
===================================================================
--- trunk/dports/security/dirmngr/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/security/dirmngr/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -46,10 +46,6 @@
configure.env-append LDAPLIBS="-lldap -llber"
}
-platform darwin 7 {
- configure.ldflags-append -framework IOKit
-}
-
livecheck.type regex
livecheck.url http://mirrors.rootmode.com/ftp.gnupg.org/gnupg/?O=D
livecheck.regex gnupg-(\\d+\\.\\d+\\.\\d+)
Modified: trunk/dports/security/gpg-agent/Portfile
===================================================================
--- trunk/dports/security/gpg-agent/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/security/gpg-agent/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -41,10 +41,6 @@
delete ${destroot}${prefix}/share/doc/gnupg/README
}
-platform darwin 7 {
- configure.ldflags-append "-framework IOKit"
-}
-
variant no_pinentry description {Do not use pinentry to handle user input} {
depends_lib-delete port:pinentry
configure.args-delete --with-pinentry-pgm=${prefix}/bin/pinentry
Modified: trunk/dports/security/ike-scan/Portfile
===================================================================
--- trunk/dports/security/ike-scan/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/security/ike-scan/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -17,10 +17,6 @@
configure.args --mandir=${prefix}/share/man --with-openssl=${prefix}
configure.ldflags-append "-lgettextlib"
-platform darwin 7 {
- depends_lib-append port:libgnugetopt
-}
-
livecheck.type regex
livecheck.url http://www.nta-monitor.com/tools/${name}/download
livecheck.regex ${name}-(\\d+\\.\\d+)
Modified: trunk/dports/textproc/html2text/Portfile
===================================================================
--- trunk/dports/textproc/html2text/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/textproc/html2text/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -25,11 +25,6 @@
patchfiles patch-configure.diff
-platform darwin 7 {
- patchfiles-delete patch-configure.diff
- patchfiles-append patch-configure-panther.diff
-}
-
destroot {
xinstall -m 755 ${worksrcpath}/html2text ${destroot}${prefix}/bin
xinstall -m 644 ${worksrcpath}/html2text.1.gz \
Deleted: trunk/dports/textproc/html2text/files/patch-configure-panther.diff
===================================================================
--- trunk/dports/textproc/html2text/files/patch-configure-panther.diff 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/textproc/html2text/files/patch-configure-panther.diff 2009-11-14 23:10:00 UTC (rev 60534)
@@ -1,20 +0,0 @@
---- configure.org 2004-01-12 07:47:18.000000000 -0800
-+++ configure 2006-09-21 23:33:37.000000000 -0700
-@@ -39,7 +39,7 @@
- }
- EOF
- CXX=unknown;
--for i in "CC" "g++" "cc" "$CC"; do
-+for i in "g++" "c++" "$CXX"; do
- if $i -c $tmp_file.C 2>/dev/null; then
- CXX="$i";
- break;
-@@ -245,7 +245,7 @@
- EOF
- if eval "$CXX -c $LIBSTDCXX_INCLUDES $EXPLICIT $BOOL_DEFINITION $tmp_file.C" 2>/dev/null; then
- $echo 'defined in <memory>, good';
--else
-+
- $echo 'not defined or not working, use "./libstd/include/auto_ptr.h"';
- AUTO_PTR_BROKEN="-DAUTO_PTR_BROKEN";
- fi;
Modified: trunk/dports/x11/gtk2/Portfile
===================================================================
--- trunk/dports/x11/gtk2/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/x11/gtk2/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -173,10 +173,6 @@
system "${prefix}/bin/gdk-pixbuf-query-loaders >${prefix}/etc/gtk-2.0/gdk-pixbuf.loaders"
}
-platform darwin 7 {
- configure.args-append --disable-cups
-}
-
platform darwin 8 {
if {[variant_isset quartz] || [variant_isset no_x11]} {
configure.ldflags-append -framework Cocoa -framework Carbon
Modified: trunk/dports/x11/itk/Portfile
===================================================================
--- trunk/dports/x11/itk/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/x11/itk/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -38,12 +38,6 @@
--with-itcl=${prefix}/lib/itcl3.3 \
--with-tk=${prefix}/lib
-platform darwin 7 {
- global tclconfig
-
- set tclconfig /System/Library/Frameworks/Tcl.framework
-}
-
post-patch {
reinplace "s|@itk_LIB_SPEC@|-L${prefix}/lib -litk|g" \
${worksrcpath}/itkConfig.sh.in
Modified: trunk/dports/x11/mowitz/Portfile
===================================================================
--- trunk/dports/x11/mowitz/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/x11/mowitz/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -17,9 +17,3 @@
depends_lib lib:libneXtaw:neXtaw
configure.cppflags-append "-no-cpp-precomp -I${prefix}/include"
configure.cflags-append "-no-cpp-precomp"
-
-platform darwin 7 {
- depends_lib-append port:Xaw3d
- configure.args-append --with-xaw3d=Xaw3d
- configure.ldflags-append "-L/usr/X11R6/lib -lX11 -lXt -lXpm -lXext -lXmu -lXaw3d"
-}
Modified: trunk/dports/x11/openmotif/Portfile
===================================================================
--- trunk/dports/x11/openmotif/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/x11/openmotif/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -66,8 +66,4 @@
README RELNOTES TODO ${destroot}${docdir}
}
-platform darwin 7 {
- patchfiles-append patch-freetype.diff
-}
-
livecheck.type none
Deleted: trunk/dports/x11/openmotif/files/patch-freetype.diff
===================================================================
--- trunk/dports/x11/openmotif/files/patch-freetype.diff 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/x11/openmotif/files/patch-freetype.diff 2009-11-14 23:10:00 UTC (rev 60534)
@@ -1,77 +0,0 @@
---- lib/Xm/DataF.c.orig Tue Nov 14 17:30:37 2006
-+++ lib/Xm/DataF.c Tue Nov 14 17:31:40 2006
-@@ -58,6 +58,8 @@
- #include "ImageCachI.h"
-
- #ifdef USE_XFT
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #include <X11/Xft/Xft.h>
- #include "XmRenderTI.h"
- #endif
---- lib/Xm/TabBox.c.orig Tue Nov 14 17:31:55 2006
-+++ lib/Xm/TabBox.c Tue Nov 14 17:32:25 2006
-@@ -26,6 +26,8 @@
- #include <Xm/DrawUtils.h>
-
- #ifdef USE_XFT
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #include <X11/Xft/Xft.h>
- #endif
-
---- lib/Xm/TextF.c.orig Tue Nov 14 17:32:38 2006
-+++ lib/Xm/TextF.c Tue Nov 14 17:32:59 2006
-@@ -89,6 +89,8 @@
- #include "XmStringI.h"
- #include <Xm/PrintSP.h> /* for XmIsPrintShell */
- #ifdef USE_XFT
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #include <X11/Xft/Xft.h>
- #include "XmRenderTI.h"
- #endif
---- lib/Xm/TextFP.h.orig Tue Nov 14 17:33:34 2006
-+++ lib/Xm/TextFP.h Tue Nov 14 17:33:52 2006
-@@ -44,6 +44,8 @@
- #include <Xm/PrimitiveP.h>
- #include <Xm/TextF.h>
- #ifdef USE_XFT
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #include <X11/Xft/Xft.h>
- #endif
-
---- lib/Xm/TextIn.c.orig Tue Nov 14 17:13:39 2006
-+++ lib/Xm/TextIn.c Tue Nov 14 17:22:32 2006
-@@ -88,6 +88,8 @@
- #include "TravActI.h"
- #include "TraversalI.h"
- #ifdef USE_XFT
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #include <X11/Xft/Xft.h>
- #endif
-
---- lib/Xm/XmRenderT.c.orig Tue Nov 14 17:34:21 2006
-+++ lib/Xm/XmRenderT.c Tue Nov 14 17:43:35 2006
-@@ -75,6 +75,8 @@
- #include "XmStringI.h"
- #include "XmTabListI.h"
- #ifdef USE_XFT
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #include <X11/Xft/Xft.h>
- #endif
-
---- lib/Xm/XmRenderTI.h.orig Tue Nov 14 17:29:53 2006
-+++ lib/Xm/XmRenderTI.h Tue Nov 14 16:49:05 2006
-@@ -43,6 +43,8 @@
-
- #include <Xm/XmP.h>
- #ifdef USE_XFT
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #include <X11/Xft/Xft.h>
- #endif
-
Modified: trunk/dports/x11/qt3/Portfile
===================================================================
--- trunk/dports/x11/qt3/Portfile 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/x11/qt3/Portfile 2009-11-14 23:10:00 UTC (rev 60534)
@@ -195,15 +195,6 @@
}
}
-platform darwin 9 {}
-
-platform darwin 8 {}
-
-platform darwin 7 {
- patchfiles-delete qt3-tiger.patch
- patchfiles-append qt3-panther.patch
-}
-
livecheck.type regex
livecheck.url http://ftp.silug.org/mirrors/ftp.trolltech.com/qt/source/
livecheck.regex {qt-x11-free-(\d+(?:\.\d+)*)}
Deleted: trunk/dports/x11/qt3/files/qt3-panther.patch
===================================================================
--- trunk/dports/x11/qt3/files/qt3-panther.patch 2009-11-14 21:54:23 UTC (rev 60533)
+++ trunk/dports/x11/qt3/files/qt3-panther.patch 2009-11-14 23:10:00 UTC (rev 60534)
@@ -1,773 +0,0 @@
-
---- qt-x11-free-3.3.8/Makefile 2005-01-03 11:08:00.000000000 -0500
-+++ qt-x11-free-3.3.8-new/Makefile 2007-10-04 16:09:34.000000000 -0400
-@@ -11,7 +11,7 @@
- install: FORCE
- @$(MAKE) qt.install
-
--all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples
-+all: symlinks src-qmake src-moc sub-src sub-tools
- @echo
- @echo "The Qt library is now built in ./lib"
- @echo "The Qt examples are built in the directories in ./examples"
---- qt-x11-free-3.3.8/config.tests/x11/xfreetype.test 2004-08-09 16:16:57.000000000 -0400
-+++ qt-x11-free-3.3.8-new/config.tests/x11/xfreetype.test 2007-10-04 16:09:34.000000000 -0400
-@@ -41,7 +41,7 @@
- LIBS="Xft2 Xft"
- for LIB in $LIBS; do
- for LIBDIR in $LIBDIRS; do
-- EXTENSIONS="a so sl"
-+ EXTENSIONS="a so sl dylib"
- for E in $EXTENSIONS; do
- if [ -f "$LIBDIR/lib$LIB.$E" ]; then
- F="$LIB"
---- qt-x11-free-3.3.8/configure 2007-01-15 07:41:50.000000000 -0500
-+++ qt-x11-free-3.3.8-new/configure 2007-10-04 16:09:34.000000000 -0400
-@@ -36,7 +36,7 @@
-
- # need that throughout the script
- UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
--UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-+UNAME_RELEASE=`(uname -r | cut -d. -f1) 2>/dev/null` || UNAME_RELEASE=unknown
- UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
- UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-@@ -554,9 +554,9 @@
- QMAKE_PROJECTS="$QMAKE_PROJECTS $relpath/$VAL"
- else
- if [ -d $relpath/$VAL ]; then
-- QMAKE_PROJECTS="$QMAKE_PROJECTS `find $relpath/$VAL -name '*.pro' -print`"
-+ QMAKE_PROJECTS="$QMAKE_PROJECTS `find $relpath/$VAL -name '*.pro' -print | grep -v /examples/ | grep -v /tutorial/`"
- else
-- QMAKE_PROJECTS="$QMAKE_PROJECTS `find $relpath/. -name '*.pro' -print`"
-+ QMAKE_PROJECTS="$QMAKE_PROJECTS `find $relpath/. -name '*.pro' -print | grep -v /examples/ | grep -v /tutorial/`"
- fi
- fi
- ;;
-@@ -1051,8 +1051,8 @@
- [ -z "$QT_INSTALL_DATA" ] && QT_INSTALL_DATA=$QT_INSTALL_PREFIX
- # default PREFIX/translations
- [ -z "$QT_INSTALL_TRANSLATIONS" ] && QT_INSTALL_TRANSLATIONS=$QT_INSTALL_PREFIX/translations
--# default PREFIX/etc/settings
--[ -z "$QT_INSTALL_SYSCONF" ] && QT_INSTALL_SYSCONF=$QT_INSTALL_PREFIX/etc/settings
-+# default PREFIX/etc/qt
-+[ -z "$QT_INSTALL_SYSCONF" ] && QT_INSTALL_SYSCONF=$QT_INSTALL_PREFIX/etc/qt
-
- # generate qconfig.cpp
- [ -d $outpath/src/tools ] || mkdir -p $outpath/src/tools
-@@ -3087,7 +3087,7 @@
- COMPILER_VERSION="3.*"
- ;;
- *4.*)
-- COMPILER_VERSION="4"
-+ COMPILER_VERSION="4.*"
- ;;
- *)
- ;;
-@@ -3525,7 +3525,7 @@
-
- echo "Finding project files. Please wait..."
- if [ -z "$QMAKE_PROJECTS" ]; then
-- QMAKE_PROJECTS=`find $relpath/. -name '*.pro' -print | sed 's-/\./-/-'`
-+ QMAKE_PROJECTS=`find $relpath/. -name '*.pro' -print | grep -v /examples/ | grep -v /tutorial/ | sed 's-/\./-/-'`
- else
- QT_PROJECTS=
- for a in `echo $QMAKE_PROJECTS`; do
---- qt-x11-free-3.3.8/include/qglobal.h 2007-02-02 09:01:04.000000000 -0500
-+++ qt-x11-free-3.3.8-new/include/qglobal.h 2007-10-04 16:09:34.000000000 -0400
-@@ -44,6 +44,10 @@
- */
- #define QT_VERSION 0x030308
-
-+#ifndef __DARWIN_X11__
-+#define __DARWIN_X11__
-+#endif
-+
- /*
- The operating system, must be one of: (Q_OS_x)
-
-@@ -562,6 +566,8 @@
-
- #if defined(Q_OS_MAC9)
- # define Q_WS_MAC9
-+#elif defined(__DARWIN_X11__)
-+# define Q_WS_X11
- #elif defined(Q_OS_MSDOS)
- # define Q_WS_WIN16
- # error "Qt requires Win32 and does not work with Windows 3.x"
-@@ -882,6 +888,10 @@
- # define Q_TEMPLATE_EXTERN
- # undef Q_DISABLE_COPY /* avoid unresolved externals */
- # endif
-+#elif defined(Q_CC_GNU) && __GNUC__ - 0 >= 4
-+# define Q_EXPORT __attribute__((visibility("default")))
-+# undef QT_MAKEDLL /* ignore these for other platforms */
-+# undef QT_DLL
- #else
- # undef QT_MAKEDLL /* ignore these for other platforms */
- # undef QT_DLL
---- qt-x11-free-3.3.8/mkspecs/darwin-g++/qmake.conf 2007-02-02 09:01:44.000000000 -0500
-+++ qt-x11-free-3.3.8-new/mkspecs/darwin-g++/qmake.conf 2007-10-04 16:09:55.000000000 -0400
-@@ -9,10 +9,10 @@
- MAKEFILE_GENERATOR = UNIX
- TEMPLATE = app
- CONFIG += qt warn_on release native_precompiled_headers
--CONFIG += qt warn_on release link_prl
-+CONFIG += qt warn_on release link_prl lib_version_first
- DEFINES += __DARWIN_X11__
-
--QMAKE_CC = cc
-+QMAKE_CC = gcc-3.3
- QMAKE_LEX = flex
- QMAKE_LEXFLAGS =
- QMAKE_YACC = yacc
-@@ -21,7 +21,7 @@
- QMAKE_CFLAGS_DEPS = -M
- QMAKE_CFLAGS_WARN_ON = -Wall -W
- QMAKE_CFLAGS_WARN_OFF = -w
--QMAKE_CFLAGS_RELEASE = -O2
-+QMAKE_CFLAGS_RELEASE = -Os
- QMAKE_CFLAGS_DEBUG = -g
- QMAKE_CFLAGS_SHLIB = -fPIC
- QMAKE_EXTENSION_SHLIB = dylib
-@@ -29,7 +29,7 @@
- QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
- QMAKE_CFLAGS_THREAD =
-
--QMAKE_CXX = c++
-+QMAKE_CXX = g++-3.3
- QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
-@@ -40,8 +40,8 @@
- QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
- QMAKE_CXXFLAGS_THREAD =
-
--QMAKE_INCDIR = /usr/local/include
--QMAKE_LIBDIR =
-+QMAKE_INCDIR = @PREFIX@/lib/qt3/include
-+QMAKE_LIBDIR = @PREFIX@/lib
- QMAKE_INCDIR_X11 = /usr/X11R6/include
- QMAKE_LIBDIR_X11 = /usr/X11R6/lib
- QMAKE_INCDIR_QT = $(QTDIR)/include
-@@ -49,13 +49,13 @@
- QMAKE_INCDIR_OPENGL = /usr/X11R6/include
- QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
-
--QMAKE_LINK = c++
--QMAKE_LINK_SHLIB = c++
--QMAKE_LFLAGS =
-+QMAKE_LINK = g++-3.3
-+QMAKE_LINK_SHLIB = g++-3.3
-+QMAKE_LFLAGS = -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
- QMAKE_LFLAGS_RELEASE =
- QMAKE_LFLAGS_DEBUG =
- QMAKE_LFLAGS_APP = -prebind
--QMAKE_LFLAGS_SHLIB = -prebind -dynamiclib -single_module -headerpad_max_install_names
-+QMAKE_LFLAGS_SHLIB = -prebind -dynamiclib -single_module -headerpad_max_install_names -install_name @PREFIX@/lib/$(TARGET1)
- QMAKE_LFLAGS_PLUGIN = -bundle
- QMAKE_LFLAGS_THREAD =
-
-@@ -64,7 +64,7 @@
-
- QMAKE_RPATH =
-
--QMAKE_LIBS_DYNLOAD =
-+QMAKE_LIBS_DYNLOAD = -ldl
- QMAKE_LIBS_X11 = -lXext -lX11 -lm
- QMAKE_LIBS_X11SM = -lSM -lICE
- QMAKE_LIBS_QT = -lqt
-@@ -76,17 +76,17 @@
- QMAKE_MOC = $(QTDIR)/bin/moc
- QMAKE_UIC = $(QTDIR)/bin/uic
-
--QMAKE_AR = ar cq
--QMAKE_RANLIB = ranlib -s
-+QMAKE_AR = /usr/bin/ar cq
-+QMAKE_RANLIB = /usr/bin/ranlib -s
-
- QMAKE_TAR = tar -cf
- QMAKE_GZIP = gzip -9f
-
--QMAKE_COPY = cp -f
-+QMAKE_COPY = /bin/cp -f
- QMAKE_COPY_FILE = $$QMAKE_COPY
- QMAKE_COPY_DIR = $$QMAKE_COPY -r
--QMAKE_MOVE = mv -f
--QMAKE_DEL_FILE = rm -f
--QMAKE_DEL_DIR = rmdir
--QMAKE_CHK_DIR_EXISTS = test -d
--QMAKE_MKDIR = mkdir -p
-+QMAKE_MOVE = /bin/mv -f
-+QMAKE_DEL_FILE = /bin/rm -f
-+QMAKE_DEL_DIR = /bin/rmdir
-+QMAKE_CHK_DIR_EXISTS = /bin/test -d
-+QMAKE_MKDIR = /bin/mkdir -p
---- qt-x11-free-3.3.8/mkspecs/darwin-g++/qplatformdefs.h 2003-05-27 11:19:20.000000000 -0400
-+++ qt-x11-free-3.3.8-new/mkspecs/darwin-g++/qplatformdefs.h 2007-10-04 16:09:34.000000000 -0400
-@@ -74,12 +74,13 @@
- #define QT_SIGNAL_ARGS int
- #define QT_SIGNAL_IGNORE SIG_IGN
-
--#define QT_SOCKLEN_T int
-+#define QT_SOCKLEN_T socklen_t
-
- #define QT_SNPRINTF ::snprintf
- #define QT_VSNPRINTF ::vsnprintf
-
- #define QT_AOUT_UNDERSCORE
-
-+#define QT_MITSHM
-
- #endif // QPLATFORMDEFS_H
---- qt-x11-free-3.3.8/qmake/Makefile.unix 2006-02-28 05:32:54.000000000 -0500
-+++ qt-x11-free-3.3.8-new/qmake/Makefile.unix 2007-10-04 16:09:34.000000000 -0400
-@@ -36,8 +36,8 @@
- -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
- -I at BUILD_PATH@/include/qmake -I at BUILD_PATH@/include -I at SOURCE_PATH@/include \
- -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \
-- -DQT_NO_COMPRESS -I at QMAKESPEC@ -DHAVE_QCONFIG_CPP
--LFLAGS=@QMAKE_LFLAGS@
-+ -DQT_NO_COMPRESS -I at QMAKESPEC@ -DHAVE_QCONFIG_CPP -mdynamic-no-pic
-+LFLAGS=@QMAKE_LFLAGS@ -mdynamic-no-pic
-
- qmake: $(OBJS) $(QOBJS)
- $(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS)
---- qt-x11-free-3.3.8/qmake/main.cpp 2007-02-02 09:01:27.000000000 -0500
-+++ qt-x11-free-3.3.8-new/qmake/main.cpp 2007-10-04 16:09:34.000000000 -0400
-@@ -49,7 +49,7 @@
-
- // for Borland, main is defined to qMain which breaks qmake
- #undef main
--#ifdef Q_OS_MAC
-+#if defined(Q_OS_MAC) || defined(Q_OS_DARWIN)
- // for qurl
- bool qt_resolve_symlinks = FALSE;
- #endif
---- qt-x11-free-3.3.8/src/kernel/qprocess_unix.cpp 2007-02-02 09:01:11.000000000 -0500
-+++ qt-x11-free-3.3.8-new/src/kernel/qprocess_unix.cpp 2007-10-04 16:09:34.000000000 -0400
-@@ -761,7 +761,7 @@
- #endif
- i++;
- }
--#ifdef Q_OS_MACX
-+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN)
- if(i) {
- QCString arg_bundle = arglistQ[0];
- QFileInfo fi(arg_bundle);
-@@ -826,7 +826,7 @@
- } else { // start process with environment settins as specified in env
- // construct the environment for exec
- int numEntries = env->count();
--#if defined(Q_OS_MACX)
-+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN)
- QString ld_library_path("DYLD_LIBRARY_PATH");
- #else
- QString ld_library_path("LD_LIBRARY_PATH");
-@@ -858,7 +858,7 @@
- QStringList pathList = QStringList::split( ':', getenv( "PATH" ) );
- for (QStringList::Iterator it = pathList.begin(); it != pathList.end(); ++it ) {
- QString dir = *it;
--#if defined(Q_OS_MACX) //look in a bundle
-+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) //look in a bundle
- if(!QFile::exists(dir + "/" + command) && QFile::exists(dir + "/" + command + ".app"))
- dir += "/" + command + ".app/Contents/MacOS";
- #endif
-@@ -868,7 +868,7 @@
- QFileInfo fileInfo( dir + "/" + command );
- #endif
- if ( fileInfo.isExecutable() ) {
--#if defined(Q_OS_MACX)
-+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN)
- arglistQ[0] = fileInfo.absFilePath().local8Bit();
- #else
- arglistQ[0] = fileInfo.filePath().local8Bit();
---- qt-x11-free-3.3.8/src/moc/moc.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.8-new/src/moc/moc.pro 2007-10-04 16:09:34.000000000 -0400
-@@ -48,6 +48,8 @@
- unix:SOURCES += ../tools/qfile_unix.cpp ../tools/qdir_unix.cpp ../tools/qfileinfo_unix.cpp
- win32:SOURCES += ../tools/qfile_win.cpp ../tools/qdir_win.cpp ../tools/qfileinfo_win.cpp
- macx:LIBS += -framework Carbon
-+CFLAGS += -mdynamic-no-pic
-+CXXFLAGS += -mdynamic-no-pic
-
- target.path=$$bins.path
- INSTALLS += target
---- qt-x11-free-3.3.8/src/network/qdns.cpp 2007-02-02 09:01:09.000000000 -0500
-+++ qt-x11-free-3.3.8-new/src/network/qdns.cpp 2007-10-04 16:09:34.000000000 -0400
-@@ -76,7 +76,7 @@
- #include "qcleanuphandler.h"
- #include <limits.h>
- #ifdef Q_OS_MAC
--#include "../3rdparty/dlcompat/dlfcn.h"
-+#include <dlfcn.h>
- #endif
-
- //#define QDNS_DEBUG
---- qt-x11-free-3.3.8/src/qt_professional.pri 2004-02-06 07:08:19.000000000 -0500
-+++ qt-x11-free-3.3.8-new/src/qt_professional.pri 2007-10-04 16:09:34.000000000 -0400
-@@ -25,7 +25,6 @@
- unix {
- NETWORK_H = $$NETWORK_CPP
- }
-- mac:INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/dlcompat
- INCLUDEPATH += $$QT_SOURCE_TREE/src/network
- include( $$QT_SOURCE_TREE/src/network/qt_network.pri )
- DEFINES *= QT_MODULE_NETWORK
---- qt-x11-free-3.3.8/src/qtmain.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.8-new/src/qtmain.pro 2007-10-04 16:09:34.000000000 -0400
-@@ -2,6 +2,7 @@
- TEMPLATE = lib
- TARGET = qtmain
- VERSION = 3.1.0
-+COMPATIBILITY_VERSION = 3.0.0
- DESTDIR = $$QMAKE_LIBDIR_QT
-
- CONFIG += qt staticlib warn_on release
---- qt-x11-free-3.3.8/src/sql/qdatatable.cpp 2007-01-11 08:46:33.000000000 -0500
-+++ qt-x11-free-3.3.8-new/src/sql/qdatatable.cpp 2007-10-04 16:09:34.000000000 -0400
-@@ -1043,8 +1043,8 @@
- return FALSE;
- if ( !sqlCursor()->canInsert() ) {
- #ifdef QT_CHECK_RANGE
-- qWarning("QDataTable::insertCurrent: insert not allowed for " +
-- sqlCursor()->name() );
-+ qWarning("QDataTable::insertCurrent: insert not allowed for %s",
-+ sqlCursor()->name().latin1() );
- #endif
- endInsert();
- return FALSE;
-@@ -1117,16 +1117,16 @@
- return FALSE;
- if ( sqlCursor()->primaryIndex().count() == 0 ) {
- #ifdef QT_CHECK_RANGE
-- qWarning("QDataTable::updateCurrent: no primary index for " +
-- sqlCursor()->name() );
-+ qWarning("QDataTable::updateCurrent: no primary index for %s",
-+ sqlCursor()->name().latin1() );
- #endif
- endUpdate();
- return FALSE;
- }
- if ( !sqlCursor()->canUpdate() ) {
- #ifdef QT_CHECK_RANGE
-- qWarning("QDataTable::updateCurrent: updates not allowed for " +
-- sqlCursor()->name() );
-+ qWarning("QDataTable::updateCurrent: updates not allowed for %s",
-+ sqlCursor()->name().latin1() );
- #endif
- endUpdate();
- return FALSE;
-@@ -1191,8 +1191,8 @@
- return FALSE;
- if ( sqlCursor()->primaryIndex().count() == 0 ) {
- #ifdef QT_CHECK_RANGE
-- qWarning("QDataTable::deleteCurrent: no primary index " +
-- sqlCursor()->name() );
-+ qWarning("QDataTable::deleteCurrent: no primary index %s",
-+ sqlCursor()->name().latin1() );
- #endif
- return FALSE;
- }
---- qt-x11-free-3.3.8/src/sql/qsqldatabase.cpp 2007-01-11 10:03:02.000000000 -0500
-+++ qt-x11-free-3.3.8-new/src/sql/qsqldatabase.cpp 2007-10-04 16:09:34.000000000 -0400
-@@ -234,7 +234,8 @@
- db->open();
- #ifdef QT_CHECK_RANGE
- if ( !db->isOpen() )
-- qWarning("QSqlDatabaseManager::database: unable to open database: " + db->lastError().databaseText() + ": " + db->lastError().driverText() );
-+ qWarning("QSqlDatabaseManager::database: unable to open database: %s: %s",
-+ db->lastError().databaseText().latin1(), db->lastError().driverText().latin1() );
- #endif
- }
- return db;
-@@ -686,7 +687,7 @@
- if ( !d->driver ) {
- #ifdef QT_CHECK_RANGE
- qWarning( "QSqlDatabase: %s driver not loaded", type.latin1() );
-- qWarning( "QSqlDatabase: available drivers: " + drivers().join(" ") );
-+ qWarning( "QSqlDatabase: available drivers: %s", drivers().join(" ").latin1() );
- #endif
- d->driver = new QNullDriver();
- d->driver->setLastError( QSqlError( "Driver not loaded", "Driver not loaded" ) );
---- qt-x11-free-3.3.8/src/sql/qsqlindex.cpp 2007-01-11 08:46:35.000000000 -0500
-+++ qt-x11-free-3.3.8-new/src/sql/qsqlindex.cpp 2007-10-04 16:09:34.000000000 -0400
-@@ -273,7 +273,7 @@
- if ( field )
- newSort.append( *field, desc );
- else
-- qWarning( "QSqlIndex::fromStringList: unknown field: '" + f + "'" );
-+ qWarning( "QSqlIndex::fromStringList: unknown field: '%s'", f.latin1());
- }
- return newSort;
- }
---- qt-x11-free-3.3.8/src/sql/qsqlrecord.cpp 2007-01-11 08:46:35.000000000 -0500
-+++ qt-x11-free-3.3.8-new/src/sql/qsqlrecord.cpp 2007-10-04 16:09:34.000000000 -0400
-@@ -298,7 +298,7 @@
- return i;
- }
- #ifdef QT_CHECK_RANGE
-- qWarning( "QSqlRecord::position: unable to find field " + name );
-+ qWarning( "QSqlRecord::position: unable to find field %s", name.latin1() );
- #endif
- return -1;
- }
-@@ -313,7 +313,7 @@
- checkDetach();
- if ( !sh->d->contains( i ) ) {
- #ifdef QT_CHECK_RANGE
-- qWarning( "QSqlRecord::field: index out of range: " + QString::number( i ) );
-+ qWarning( "QSqlRecord::field: index out of range: %d", i );
- #endif
- return 0;
- }
-@@ -344,7 +344,7 @@
- {
- if ( !sh->d->contains( i ) ) {
- #ifdef QT_CHECK_RANGE
-- qWarning( "QSqlRecord::field: index out of range: " + QString::number( i ) );
-+ qWarning( "QSqlRecord::field: index out of range: %d", i );
- #endif // QT_CHECK_RANGE
- return 0;
- }
---- qt-x11-free-3.3.8/src/tools/qdir_unix.cpp 2007-02-02 09:01:05.000000000 -0500
-+++ qt-x11-free-3.3.8-new/src/tools/qdir_unix.cpp 2007-10-04 16:09:34.000000000 -0400
-@@ -88,7 +88,7 @@
-
- bool QDir::mkdir( const QString &dirName, bool acceptAbsPath ) const
- {
--#if defined(Q_OS_MACX) // Mac X doesn't support trailing /'s
-+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) // Mac X doesn't support trailing /'s
- QString name = dirName;
- if (dirName[dirName.length() - 1] == "/")
- name = dirName.left( dirName.length() - 1 );
---- qt-x11-free-3.3.8/src/tools/qglobal.cpp 2007-02-02 09:01:06.000000000 -0500
-+++ qt-x11-free-3.3.8-new/src/tools/qglobal.cpp 2007-10-04 16:09:34.000000000 -0400
-@@ -161,7 +161,7 @@
- return TRUE;
- }
-
--#if !defined(QWS) && defined(Q_OS_MAC)
-+#if !defined(QWS) && !defined(Q_WS_X11) && defined(Q_OS_MACX)
-
- #include "qt_mac.h"
-
-@@ -680,7 +680,7 @@
- if ( code != -1 )
- qWarning( "%s\n\tError code %d - %s", msg, code, strerror( code ) );
- else
-- qWarning( msg );
-+ qWarning( "%s", msg );
- #endif
- #else
- Q_UNUSED( msg );
---- qt-x11-free-3.3.8/src/tools/qglobal.h 2007-02-02 09:01:04.000000000 -0500
-+++ qt-x11-free-3.3.8-new/src/tools/qglobal.h 2007-10-04 16:09:34.000000000 -0400
-@@ -44,6 +44,10 @@
- */
- #define QT_VERSION 0x030308
-
-+#ifndef __DARWIN_X11__
-+#define __DARWIN_X11__
-+#endif
-+
- /*
- The operating system, must be one of: (Q_OS_x)
-
-@@ -562,6 +566,8 @@
-
- #if defined(Q_OS_MAC9)
- # define Q_WS_MAC9
-+#elif defined(__DARWIN_X11__)
-+# define Q_WS_X11
- #elif defined(Q_OS_MSDOS)
- # define Q_WS_WIN16
- # error "Qt requires Win32 and does not work with Windows 3.x"
-@@ -882,6 +888,10 @@
- # define Q_TEMPLATE_EXTERN
- # undef Q_DISABLE_COPY /* avoid unresolved externals */
- # endif
-+#elif defined(Q_CC_GNU) && __GNUC__ - 0 >= 4
-+# define Q_EXPORT __attribute__((visibility("default")))
-+# undef QT_MAKEDLL /* ignore these for other platforms */
-+# undef QT_DLL
- #else
- # undef QT_MAKEDLL /* ignore these for other platforms */
- # undef QT_DLL
---- qt-x11-free-3.3.8/src/tools/qgpluginmanager.cpp 2007-02-02 09:01:04.000000000 -0500
-+++ qt-x11-free-3.3.8-new/src/tools/qgpluginmanager.cpp 2007-10-04 16:09:34.000000000 -0400
-@@ -316,7 +316,7 @@
-
- #if defined(Q_OS_WIN32)
- QString filter = "*.dll";
--#elif defined(Q_OS_MACX)
-+#elif defined(Q_OS_MACX) || defined(Q_OS_DARWIN)
- QString filter = "*.dylib; *.so; *.bundle";
- #elif defined(Q_OS_HPUX)
- QString filter = "*.sl";
---- qt-x11-free-3.3.8/src/tools/qlibrary.cpp 2007-02-02 09:01:04.000000000 -0500
-+++ qt-x11-free-3.3.8-new/src/tools/qlibrary.cpp 2007-10-04 16:09:34.000000000 -0400
-@@ -400,7 +400,7 @@
- filename += ".dll";
- #else
- QStringList filters = "";
--#ifdef Q_OS_MACX
-+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN)
- filters << ".so";
- filters << ".bundle";
- filters << ".dylib"; //the last one is also the default one..
---- qt-x11-free-3.3.8/src/tools/qlibrary_unix.cpp 2007-02-02 09:01:06.000000000 -0500
-+++ qt-x11-free-3.3.8-new/src/tools/qlibrary_unix.cpp 2007-10-04 16:09:34.000000000 -0400
-@@ -114,7 +114,7 @@
-
- QString filename = library->library();
-
-- pHnd = DL_PREFIX(dlopen)( filename.latin1(), RTLD_LAZY );
-+ pHnd = DL_PREFIX(dlopen)( filename.latin1(), RTLD_LAZY | RTLD_LOCAL );
- #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT)
- if ( !pHnd )
- qWarning( "%s", DL_PREFIX(dlerror)() );
---- qt-x11-free-3.3.8/src/tools/qmutex_unix.cpp 2007-02-02 09:01:04.000000000 -0500
-+++ qt-x11-free-3.3.8-new/src/tools/qmutex_unix.cpp 2007-10-04 16:09:34.000000000 -0400
-@@ -44,7 +44,7 @@
- // POSIX threads mutex types
- #if ((defined(PTHREAD_MUTEX_RECURSIVE) && defined(PTHREAD_MUTEX_DEFAULT)) || \
- defined(Q_OS_FREEBSD)) && !defined(Q_OS_UNIXWARE) && !defined(Q_OS_SOLARIS) && \
-- !defined(Q_OS_MAC)
-+ !defined(Q_OS_MAC) && !defined(Q_OS_DARWIN)
- // POSIX 1003.1c-1995 - We love this OS
- # define Q_MUTEX_SET_TYPE(a, b) pthread_mutexattr_settype((a), (b))
- # if defined(QT_CHECK_RANGE)
---- qt-x11-free-3.3.8/src/tools/qsettings.cpp 2007-02-02 09:01:03.000000000 -0500
-+++ qt-x11-free-3.3.8-new/src/tools/qsettings.cpp 2007-10-04 16:09:34.000000000 -0400
-@@ -981,7 +981,7 @@
-
- if ( filename.isEmpty() ) {
-
--#ifdef QT_CHECK_STATE
-+#if 0 // this error is damn annoying
- qWarning("QSettings::sync: filename is null/empty");
- #endif // QT_CHECK_STATE
-
---- qt-x11-free-3.3.8/src/tools/qstring.cpp 2007-02-02 09:01:05.000000000 -0500
-+++ qt-x11-free-3.3.8-new/src/tools/qstring.cpp 2007-10-04 16:09:34.000000000 -0400
-@@ -1362,7 +1362,7 @@
- QStringData* QString::makeSharedNull()
- {
- QString::shared_null = new QStringData;
--#if defined( Q_OS_MAC ) || defined(Q_OS_SOLARIS) || defined(Q_OS_HPUX) || defined(Q_OS_AIX)
-+#if defined( Q_OS_MAC ) || defined(Q_OS_DARWIN) || defined(Q_OS_SOLARIS) || defined(Q_OS_HPUX) || defined(Q_OS_AIX)
- QString *that = const_cast<QString *>(&QString::null);
- that->d = QString::shared_null;
- #endif
-@@ -2923,7 +2923,7 @@
- if (!l)
- return -1;
-
--#if defined(Q_OS_MACX) && defined(QT_MACOSX_VERSION) && QT_MACOSX_VERSION >= 0x1020
-+#if defined(Q_OS_MACX) && ((defined(QT_MACOSX_VERSION) && QT_MACOSX_VERSION >= 0x1020) | defined(Q_OS_DARWIN))
- if ( sl == 1 )
- return find( *str.unicode(), index, cs );
- #endif
-@@ -3022,7 +3022,7 @@
-
- int QString::findRev( QChar c, int index, bool cs ) const
- {
--#if defined(Q_OS_MACX) && defined(QT_MACOSX_VERSION) && QT_MACOSX_VERSION < 0x1020
-+#if defined(Q_OS_MACX) && ((defined(QT_MACOSX_VERSION) && QT_MACOSX_VERSION >= 0x1020) | defined(Q_OS_DARWIN))
- return findRev( QString( c ), index, cs );
- #else
- const uint l = length();
-@@ -3078,7 +3078,7 @@
- if ( index > delta )
- index = delta;
-
--#if defined(Q_OS_MACX) && defined(QT_MACOSX_VERSION) && QT_MACOSX_VERSION >= 0x1020
-+#if defined(Q_OS_MACX) && ((defined(QT_MACOSX_VERSION) && QT_MACOSX_VERSION >= 0x1020) | defined(Q_OS_DARWIN))
- if ( sl == 1 )
- return findRev( *str.unicode(), index, cs );
- #endif
---- qt-x11-free-3.3.8/src/tools/qt_tools.pri 2004-04-01 05:20:06.000000000 -0500
-+++ qt-x11-free-3.3.8-new/src/tools/qt_tools.pri 2007-10-04 16:09:34.000000000 -0400
-@@ -101,10 +101,6 @@
- $$TOOLS_CPP/qwaitcondition_unix.cpp
-
- mac:!x11:!embedded:SOURCES += $$TOOLS_CPP/qsettings_mac.cpp
-- mac {
-- SOURCES+=3rdparty/dlcompat/dlfcn.c
-- INCLUDEPATH+=3rdparty/dlcompat
-- }
- unix:SOURCES += $$TOOLS_CPP/qlibrary_unix.cpp
-
- SOURCES += $$TOOLS_CPP/qbitarray.cpp \
---- qt-x11-free-3.3.8/src/widgets/qtextedit.cpp 2007-02-02 09:01:23.000000000 -0500
-+++ qt-x11-free-3.3.8-new/src/widgets/qtextedit.cpp 2007-10-04 16:09:34.000000000 -0400
-@@ -6349,7 +6349,7 @@
- cur = tag->prev;
- if ( !cur ) {
- #ifdef QT_CHECK_RANGE
-- qWarning( "QTextEdit::optimParseTags: no left-tag for '<" + tag->tag + ">' in line %d.", tag->line + 1 );
-+ qWarning( "QTextEdit::optimParseTags: no left-tag for '<%s>' in line %d.", tag->tag.ascii(), tag->line + 1 );
- #endif
- return; // something is wrong - give up
- }
-@@ -6372,7 +6372,7 @@
- break;
- } else if ( !cur->leftTag ) {
- #ifdef QT_CHECK_RANGE
-- qWarning( "QTextEdit::optimParseTags: mismatching %s-tag for '<" + cur->tag + ">' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->line + 1 );
-+ qWarning( "QTextEdit::optimParseTags: mismatching %s-tag for '<%s>' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->tag.ascii(), cur->line + 1 );
- #endif
- return; // something is amiss - give up
- }
---- qt-x11-free-3.3.8/src/xml/qsvgdevice.cpp 2007-02-02 09:01:03.000000000 -0500
-+++ qt-x11-free-3.3.8-new/src/xml/qsvgdevice.cpp 2007-10-04 16:09:34.000000000 -0400
-@@ -978,7 +978,7 @@
- // ### catch references to embedded .svg files
- QPixmap pix;
- if ( !pix.load( href ) ) {
-- qWarning( "QSvgDevice::play: Couldn't load image "+href );
-+ qWarning( "QSvgDevice::play: Couldn't load image %s", href.latin1() );
- break;
- }
- pt->drawPixmap( QRect( x1, y1, w, h ), pix );
-@@ -1024,8 +1024,8 @@
- break;
- }
- case InvalidElement:
-- qWarning( "QSvgDevice::play: unknown element type " +
-- node.nodeName() );
-+ qWarning( "QSvgDevice::play: unknown element type %s",
-+ node.nodeName().latin1() );
- break;
- };
-
-@@ -1111,7 +1111,7 @@
- {
- QRegExp reg( QString::fromLatin1("([+-]?\\d*\\.*\\d*[Ee]?[+-]?\\d*)(em|ex|px|%|pt|pc|cm|mm|in|)$") );
- if ( reg.search( str ) == -1 ) {
-- qWarning( "QSvgDevice::parseLen: couldn't parse " + str );
-+ qWarning( "QSvgDevice::parseLen: couldn't parse %s ", str.latin1() );
- if ( ok )
- *ok = FALSE;
- return 0.0;
-@@ -1140,7 +1140,7 @@
- else if ( u == "pc" )
- dbl *= m.logicalDpiX() / 6.0;
- else
-- qWarning( "QSvgDevice::parseLen: Unknown unit " + u );
-+ qWarning( "QSvgDevice::parseLen: Unknown unit %s", u.latin1() );
- }
- if ( ok )
- *ok = TRUE;
---- qt-x11-free-3.3.8/tools/assistant/assistant.pro 2003-11-17 07:40:25.000000000 -0500
-+++ qt-x11-free-3.3.8-new/tools/assistant/assistant.pro 2007-10-04 16:09:34.000000000 -0400
-@@ -32,6 +32,8 @@
-
- win32:RC_FILE = assistant.rc
- mac:RC_FILE = assistant.icns
-+CFLAGS += -mdynamic-no-pic
-+CXXFLAGS += -mdynamic-no-pic
-
- target.path = $$bins.path
- INSTALLS += target
---- qt-x11-free-3.3.8/tools/designer/app/app.pro 2004-01-16 19:51:08.000000000 -0500
-+++ qt-x11-free-3.3.8-new/tools/designer/app/app.pro 2007-10-04 16:09:34.000000000 -0400
-@@ -20,7 +20,8 @@
- QMAKE_INFO_PLIST = Info_mac.plist
- staticlib:CONFIG -= global_init_link_order #yuck
- }
--
-+CFLAGS += -mdynamic-no-pic
-+CXXFLAGS += -mdynamic-no-pic
-
- target.path=$$bins.path
- INSTALLS += target
---- qt-x11-free-3.3.8/tools/designer/designer/designer.pro 2006-02-15 10:48:20.000000000 -0500
-+++ qt-x11-free-3.3.8-new/tools/designer/designer/designer.pro 2007-10-04 16:09:34.000000000 -0400
-@@ -1,6 +1,6 @@
- TEMPLATE = lib
-
--CONFIG += qt warn_on staticlib qmake_cache
-+CONFIG += qt warn_on qmake_cache
- CONFIG -= dll
- !force_static:!win32:contains(QT_PRODUCT,qt-internal) {
- CONFIG -= staticlib
---- qt-x11-free-3.3.8/tools/designer/editor/editor.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.8-new/tools/designer/editor/editor.pro 2007-10-04 16:09:34.000000000 -0400
-@@ -1,5 +1,5 @@
- TEMPLATE = lib
--CONFIG += qt warn_on staticlib
-+CONFIG += qt warn_on
- CONFIG -= dll
- HEADERS = editor.h \
- parenmatcher.h \
---- qt-x11-free-3.3.8/tools/designer/uic/uic.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.8-new/tools/designer/uic/uic.pro 2007-10-04 16:09:34.000000000 -0400
-@@ -40,3 +40,6 @@
- LIBS += $$MWERKSDIR/Libraries/PluginLib4.shlb
- SOURCES += mwerks_mac.cpp
- }
-+CFLAGS += -mdynamic-no-pic
-+CXXFLAGS += -mdynamic-no-pic
-+
---- qt-x11-free-3.3.8/tools/linguist/linguist/linguist.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.8-new/tools/linguist/linguist/linguist.pro 2007-10-04 16:09:34.000000000 -0400
-@@ -43,6 +43,8 @@
- staticlib:CONFIG -= global_init_link_order #yuck
- RC_FILE = linguist.icns
- }
-+CFLAGS += -mdynamic-no-pic
-+CXXFLAGS += -mdynamic-no-pic
-
- PROJECTNAME = Qt Linguist
-
---- qt-x11-free-3.3.8/tools/linguist/linguist.pro 2004-06-08 04:06:56.000000000 -0400
-+++ qt-x11-free-3.3.8-new/tools/linguist/linguist.pro 2007-10-04 16:09:34.000000000 -0400
-@@ -1,8 +1,5 @@
- TEMPLATE = subdirs
- SUBDIRS = linguist \
-- tutorial/tt1 \
-- tutorial/tt2 \
-- tutorial/tt3 \
- lrelease \
- lupdate \
- qm2ts
---- qt-x11-free-3.3.8/tools/linguist/lrelease/lrelease.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.8-new/tools/linguist/lrelease/lrelease.pro 2007-10-04 16:09:34.000000000 -0400
-@@ -15,3 +15,6 @@
-
- target.path=$$bins.path
- INSTALLS += target
-+
-+QMAKE_CFLAGS += -mdynamic-no-pic
-+QMAKE_CXXFLAGS += -mdynamic-no-pic
---- qt-x11-free-3.3.8/tools/linguist/lupdate/lupdate.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.8-new/tools/linguist/lupdate/lupdate.pro 2007-10-04 16:09:34.000000000 -0400
-@@ -19,3 +19,7 @@
-
- target.path=$$bins.path
- INSTALLS += target
-+
-+macx:CFLAGS += -mdynamic-no-pic
-+macx:CXXFLAGS += -mdynamic-no-pic
-+
---- qt-x11-free-3.3.8/tools/linguist/qm2ts/qm2ts.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.8-new/tools/linguist/qm2ts/qm2ts.pro 2007-10-04 16:09:34.000000000 -0400
-@@ -13,3 +13,6 @@
-
- target.path=$$bins.path
- INSTALLS += target
-+
-+CFLAGS += -mdynamic-no-pic
-+CXXFLAGS += -mdynamic-no-pic
---- qt-x11-free-3.3.8/tools/qtconfig/qtconfig.pro 2005-07-19 20:59:24.000000000 -0400
-+++ qt-x11-free-3.3.8-new/tools/qtconfig/qtconfig.pro 2007-10-04 16:09:34.000000000 -0400
-@@ -15,4 +15,7 @@
- INSTALLS += target
- INCLUDEPATH += .
- DBFILE = qtconfig.db
-+
-+CFLAGS += -mdynamic-no-pic
-+CXXFLAGS += -mdynamic-no-pic
- REQUIRES=full-config nocrosscompiler !win32*
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091114/34b91315/attachment-0001.html>
More information about the macports-changes
mailing list