Ticket #6743: Portfile.diff

Portfile

@@ -9 +9 @@
 maintainers             mww@opendarwin.org blb@opendarwin.org
 description             mature cross-platform C++ GUI framework
 long_description        wxWidgets is a mature open-source cross-platform C++ \
-                                GUI framework for MacOS, Unix, Linux, Windows. It can \
-                                make use of a variety of native widget sets as well as \
-                                its own widget set: MacOS, GTK+, Motif, WIN32. \
-                                wxWidgets will even run on embedded systems using \
-                                Linux and X11.
+                        GUI framework for MacOS, Unix, Linux, Windows. It can \
+                        make use of a variety of native widget sets as well as \
+                        its own widget set: MacOS, GTK+, Motif, WIN32. \
+                        wxWidgets will even run on embedded systems using \
+                        Linux and X11.
 
 homepage                http://www.wxwidgets.org/
-master_sites    ftp://biolpc22.york.ac.uk/pub/${version}/ \
+master_sites            ftp://biolpc22.york.ac.uk/pub/${version}/ \
                                 sourceforge:wxwindows
 dist_subdir             ${name}/${version}
 checksums               md5 ee0aa211febd992c8540e6c9df749b51
 use_bzip2               yes
+worksrcdir              ${name}-${version}
 
 depends_lib             port:jpeg \
-                                port:tiff \
-                                port:libpng \
-                                port:zlib \
-                                port:libiconv \
-                                port:expat \
-                                port:libsdl \
-                                port:libsdl_mixer
+                        port:tiff \
+                        port:libpng \
+                        port:zlib \
+                        port:libiconv \
+                        port:expat \
+                        port:libsdl \
+                        port:libsdl_mixer
 
-set worksrcdir  build
 
 post-extract {
-        file mkdir ${worksrcpath}
+                file mkdir ${workpath}/build
 }
 
-configure.cmd   ../${name}-${version}/configure
+configure.cmd   ../${worksrcdir}/configure
+
 configure.env   CPPFLAGS="-I${prefix}/include" \
-                                CFLAGS="-I${prefix}/include" \
-                                LDFLAGS="-L${prefix}/lib"
+                CFLAGS="-I${prefix}/include" \
+                LDFLAGS="-L${prefix}/lib"
+
 configure.args  --mandir=${prefix}/share/man \
-                                --with-libiconv-prefix=${prefix} \
-                                --with-libjpeg \
-                                --with-libtiff \
-                                --with-libpng \
-                                --with-zlib \
-                                --with-sdl \
-                                --with-opengl \
-                                --with-mac \
-                                --disable-sdltest \
-                                --enable-unicode \
-                                --enable-display \
-                                --enable-monolithic
+                --with-libiconv-prefix=${prefix} \
+                --with-libjpeg \
+                --with-libtiff \
+                --with-libpng \
+                --with-zlib \
+                --with-sdl \
+                --with-opengl \
+                --disable-sdltest \
+                --enable-unicode \
+                --enable-display \
+                --enable-monolithic
+
+platform darwin 7 {
+# OS 10.3.9, Xcode 1.5, and November2004gccupdater
+# gcc version 3.3 20030304 (Apple Computer, Inc. build 1671)
+# variant 'mac' (carbon):  QuickTime 7.0.1 and 7.0.3 tested
+# variant 'cocoa':         QuickTime 7.0.1 and 7.0.4 tested
+
+        configure.env-append    CFLAGS="-I/usr/include" \
+                                CXXFLAGS="-I/usr/include" \
+                                LDFLAGS="-L${workpath}/build/lib"
+}
 
 platform darwin 8 {
         configure.env-append    CC=/usr/bin/gcc-4.0 CPP=/usr/bin/cpp-4.0 CXX=/usr/bin/g++-4.0
 }
 
+default_variants        +mac
+
+variant mac {
+        configure.args-append   --with-mac \
+                                --without-cocoa
+}
+
+variant cocoa {
+        configure.args-append   --with-cocoa \
+                                --without-mac
+        default_variants-delete +mac
+}
+
+#variant gtk {}
+#variant x11 {}
+#variant motif {}
+
+
 set contrib             "animate gizmos stc"
 
 build.target
@@ -73 +103 @@
                 system "cd ${destroot.dir} && make -C contrib/src/${target} install ${destroot.destdir}"
         }
         xinstall -d -m 755 ${destroot}${prefix}/share/doc/${name}
-        xinstall -m 644 -W ${workpath}/${name}-${version} BuildCVS.txt CHANGES.txt \
+        xinstall -m 644 -W ${workpath}/${worksrcdir} BuildCVS.txt CHANGES.txt \
                 COPYING.LIB INSTALL-MAC.txt INSTALL-MGL.txt INSTALL-MOTIF.txt \
                 INSTALL-OS2.txt INSTALL-X11.txt LICENCE.txt README-MAC.txt \
                 README-MGL.txt README-MOTIF.txt README-X11.txt README.txt \
@@ -81 +111 @@
         system "cd ${destroot}${prefix}/bin && \
                 ln -sf ${prefix}/lib/wx/config/mac-unicode-release-2.6 wx-config"
 }
+