Ticket #2576: Portfile.diff

Portfile

@@ -2 +2 @@
 
 PortSystem 1.0
 name                    MyODBC
-version                 3.51.06
+version                 3.51.10
 categories              databases
 platforms               darwin
 maintainers             simon@cotsworth.com
 description             MySQL Connector/ODBC
+
 long_description        MySQL Connector/ODBC (also known as MyODBC) allows you \
-                to connect to a MySQL database server using the ODBC database \
-                API on all Microsoft Windows and most Unix platforms, \
-                including through such applications and programming \
-                environments such as Microsoft Access, Microsoft Excel, and \
-                Borland Delphi.
-
-homepage        http://www.mysql.com/
-master_sites    http://mysql.mirror.anlx.net/Downloads/MyODBC3/ \
-                http://gd.tuwien.ac.at/db/mysql/Downloads/MyODBC3/
-
-checksums       md5 5a59b4f01592fc9ec96e985bc7d6aada
-
-depends_lib     lib:libdl:dlcompat \
-                lib:libiconv.2:libiconv \
-                lib:readline:readline \
-                lib:mysql:mysql \
-                lib:libodbc.1:unixODBC
-
-configure.env   CFLAGS=-no-cpp-precomp \
-                LDFLAGS=-L${prefix}/lib \
-                CPPFLAGS=-I${prefix}/include
+                                to connect to a MySQL database server using the ODBC database \
+                                API on all Microsoft Windows and most Unix platforms, \
+                                including through such applications and programming \
+                                environments such as Microsoft Access, Microsoft Excel, and \
+                                Borland Delphi.
+
+homepage                http://www.mysql.com/
+
+set sitedir             Downloads/${name}3/
+master_sites    ftp://planetmirror.com/pub/mysql/${sitedir} \
+                http://www.softagency.co.jp/MySQL/${sitedir} \
+                ftp://sunsite.dk/mirrors/mysql/${sitedir} \
+                http://mysql.mirror.anlx.net/${sitedir} \
+                http://gd.tuwien.ac.at/db/mysql/${sitedir} \
+                http://mysql.mediatraffic.fi/${sitedir} \
+                ftp://filepile.tiscali.de/mirror/mysql/${sitedir} \
+                http://mirrors.tilian.co.uk/mysql.com/${sitedir} \
+                ftp://ftp.rtfm.no/pub/mysql/${sitedir} \
+                http://www.mysql.cz/${sitedir} \
+                ftp://ftp.u-paris10.fr/mysql.com/${sitedir} \
+                http://mysql.oms-net.nl/${sitedir} \
+                ftp://ftp.free.fr/pub/MySQL/${sitedir}
+
+checksums               md5 95e123c9edfdc7afe27cd7d03fd853c7 \
+                                sha1 54d189618dd88d82571f4211445c67681a8b59a4
+
+depends_lib             lib:libmysqlclient:mysql4 \
+                                lib:libodbc.1:unixODBC \
+                                lib:libz.1:zlib
+
+post-patch      {
+        reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/imyodbc/Makefile.osx
+}
+
+configure.env   LDFLAGS=-L${prefix}/lib CPPFLAGS=-I${prefix}/include
 
 configure.args  --with-unixODBC=${prefix} \
-                --with-unixODBC-libs=${prefix}/lib \
-                --with-unixODBC-includes=${prefix}/include \
-                --with-odbc-ini=${prefix}/etc/odbc.ini \
-                --with-mysql-libs=${prefix}/lib/mysql \
-                --with-mysql-includes=${prefix}/include/mysql \
-                --with-docs \
-                --enable-shared
-
-set odbc        "unixODBC"
-set doc_dest    "${destroot}${prefix}/share/doc/${name}"
-set share_dest  "${destroot}${prefix}/share/${name}"
-set odbc_share  "${prefix}/share/${odbc}"
+                                --with-unixODBC-includes=${prefix}/include \
+                                --with-unixODBC-libs=${prefix}/lib \
+                                --with-odbc-ini=${prefix}/etc/odbc.ini \
+                                --with-mysql-path=${prefix} \
+                                --enable-thread-safe \
+                                --enable-shared \
+                                --enable-static \
+                                --without-debug \
+                                --without-samples \
+                                --disable-gui
 
-post-destroot   {
-        system "cd ${worksrcpath}/driver && \
-        /usr/bin/gcc -bundle -flat_namespace -undefined error -o \
-                .libs/libmyodbc3-${version}.so *.o -L${prefix}/lib/mysql \
-                -L${prefix}/lib -lodbcinst -lmysqlclient -lz -lc"
-
-        # Install libmyodbc3.so and create symbolic links
-        system "install -m 755 \
-                ${worksrcpath}/driver/.libs/libmyodbc3-${version}.so \
-                ${destroot}${prefix}/lib/libmyodbc3-${version}.so"
-        system "cd ${destroot}${prefix}/lib && \
-                ln -fs libmyodbc3-${version}.so libmyodbc3.so"
-
-        # Install documentation
-        file mkdir ${doc_dest}
-        system "cd ${worksrcpath} && \
-                tar -cf - COPYING INSTALL INSTALL-BINARY README | \
-                tar -xf - -C ${doc_dest}"
-        system "install -m 644 ${worksrcpath}/RELEASE-NOTES \
-                ${doc_dest}/RELEASE-NOTES-${version}"
-        system "chown -R `id -u`:`id -g` ${doc_dest}"
-
-        # Install samples and myodbc example .ini
-        file mkdir ${share_dest} ${share_dest}/samples
-        system "install -m 755 ${worksrcpath}/samples/.libs/my_* \
-                ${share_dest}/samples"
-        system "install -m 644 ${worksrcpath}/odbc.ini \
-                ${share_dest}/odbc.ini.default"
-        reinplace "s|/usr/local|${prefix}|g" \
-                "${share_dest}/odbc.ini.default"
+platform darwin 6       {
+        depends_lib-append      lib:libdl:dlcompat
+}
 
-        # Install odbc mysql templates
-        file mkdir ${destroot}${odbc_share}
-        system "install -m 755 ${portpath}/${filesdir}/*.template \
-                ${destroot}${odbc_share}"
-        reinplace "s|DarwinPortsDirectory|${prefix}|g" \
-                "${destroot}${odbc_share}/mysql.driver.template"
+variant darwin  {
+        configure.args-append   --enable-bundles \
+                                                        --enable-dmlink \
+                                                        --enable-imyodbc
 }
 
-post-install    {
-        system "${prefix}/bin/odbcinst -i -d -f \
-                ${odbc_share}/mysql.driver.template"
-        system "${prefix}/bin/odbcinst -i -s -f \
-                ${odbc_share}/mysql.data.template"
+variant samples {
+        configure.args-delete   --without-samples
+        configure.args-append   --with-samples  
+}
+
+variant debug {
+        configure.args-delete   --without-debug
+        configure.args-append   --with-debug    
+}
+
+post-destroot   {
+        # install directories
+        foreach dir [list ${name} doc/${name} unixODBC] {
+                xinstall -d -m 0755 ${destroot}${prefix}/share/$dir
+        }
+
+        # install readme files
+        foreach readme [glob ${worksrcpath}/\[A-Z\]*\[A-Z\] ${worksrcpath}/\[A-Z\]*.\[a-z\]] {
+                xinstall -m 0644 $readme ${destroot}${prefix}/share/doc/${name}
+        }
+
+        # install samples
+        if { [variant_isset samples] } {
+                xinstall -d -m 0755 ${destroot}${prefix}/share/${name}/samples
+                foreach sample [glob ${worksrcpath}/samples/.libs/my_*] {
+                        xinstall -m 0755 $sample \
+                          ${destroot}${prefix}/share/${name}/samples
+                }
+        }
+
+        # install example odbc.ini
+        xinstall -m 0644 ${portpath}/${filesdir}/odbc.ini \
+          ${destroot}${prefix}/share/${name}/odbc.ini.dist
+        reinplace "s|/usr/local|${prefix}|g" \
+          ${destroot}${prefix}/share/${name}/odbc.ini.dist
+
+        # install MyODBC templates
+        foreach template [glob ${portpath}/${filesdir}/*.template] {
+                xinstall -m 0644 $template ${destroot}${prefix}/share/unixODBC
+        }
+        reinplace "s|_DP_PREFIX|${prefix}|g" \
+          ${destroot}${prefix}/share/unixODBC/mysql.driver.template
 }