Ticket #6743: Portfile.2.diff

Portfile

@@ -21 +21 @@
 dist_subdir             ${name}/${version}
 checksums               md5 ee0aa211febd992c8540e6c9df749b51
 use_bzip2               yes
+worksrcdir              ${name}-${version}
 
 depends_lib             port:jpeg \
                                 port:tiff \
@@ -31 +32 @@
                                 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"
@@ -55 +54 @@
                                 --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
 }
 
+variant cocoa {
+        configure.args-delete   --with-mac
+        configure.args-append   --with-cocoa \
+                                                        --without-mac
+}
+
+#variant gtk {}
+#variant x11 {}
+#variant motif {}
+
+
 set contrib             "animate gizmos stc"
 
 build.target
@@ -73 +94 @@
                 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 \