[90903] trunk/dports/databases

pixilla at macports.org pixilla at macports.org
Sat Mar 17 14:35:32 PDT 2012 

Revision: 90903
          https://trac.macports.org/changeset/90903
Author:   pixilla at macports.org
Date:     2012-03-17 14:35:27 -0700 (Sat, 17 Mar 2012)
Log Message:
-----------
databases/mysql_select:
- Add man pages to mysql_select.
databases/mysql55:
- Add man pages to mysql_select.
- Conflict with mysql5 until mysql5 is subdir'ed.

Modified Paths:
--------------
    trunk/dports/databases/mysql55/Portfile
    trunk/dports/databases/mysql55/files/mysql55
    trunk/dports/databases/mysql_select/Portfile
    trunk/dports/databases/mysql_select/files/base
    trunk/dports/databases/mysql_select/files/none

Modified: trunk/dports/databases/mysql55/Portfile
===================================================================
--- trunk/dports/databases/mysql55/Portfile	2012-03-17 19:13:05 UTC (rev 90902)
+++ trunk/dports/databases/mysql55/Portfile	2012-03-17 21:35:27 UTC (rev 90903)
@@ -4,7 +4,11 @@
 PortSystem          1.0
 
 name                mysql55
+# Fixme: Subdir mysql5.
+# Conflict due to mysqld_safe finding mysql5 ports ${prefix}/libexec/mysqld.
+conflicts           mysql5
 version             5.5.21
+revision            1
 categories          databases
 platforms           darwin
 maintainers         pixilla openmaintainer
@@ -54,13 +58,6 @@
                         lib/libssl.dylib \
                         lib/libreadline.dylib
     
-    set mysql           ${name}
-    set libdir          ${prefix}/lib/${mysql}
-    set bindir          ${prefix}/bin
-    set dbdir           ${prefix}/var/db/${mysql}
-    set sysconfdir      ${prefix}/etc/${mysql}
-    set sockfile        ${prefix}/var/run/${mysql}/mysqld.sock
-    
     post-patch {
         reinplace "s|@NAME@|${name}|g" ${worksrcpath}/cmake/install_layout.cmake
         reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/cmake/install_layout.cmake
@@ -97,22 +94,30 @@
     }
     
     pre-destroot {
-        xinstall -m 755 -d ${destroot}${sysconfdir}
-        destroot.keepdirs-append ${destroot}${sysconfdir}
+        xinstall -m 755 -d ${destroot}${prefix}/etc/${name}
+        destroot.keepdirs-append ${destroot}${prefix}/etc/${name}
     }
     
     post-destroot {
-        # Fix paths in manpages and sample configuration files
-        foreach manpage [glob -type f ${destroot}${prefix}/share/man/${mysql}/man\[1-9\]/*] {
-            reinplace "s|/etc/|${sysconfdir}/|g" ${manpage}
+        # proc portdestroot::destroot_finish fails to find and compress our man pages
+        # so borrow the compress command and run on our files now.
+        set manpath "${destroot}${prefix}/share/man"
+        set gzip [findBinary gzip ${portutil::autoconf::gzip_path}]
+        foreach manpage [glob -type f ${destroot}${prefix}/share/man/${name}/man\[1-9\]/*] {
+            # Fix paths in manpages
+            reinplace "s|/etc/|${prefix}/etc/${name}/|g" ${manpage}
+            # Compress all manpages with gzip
+            system "$gzip -9vf ${manpage}"
         }
-        foreach samp_conffile [glob -type f ${destroot}${prefix}/share/${mysql}/support-files/my-*.cnf] {
-            reinplace "s|/etc/my.cnf|${sysconfdir}/my.cnf|g" ${samp_conffile}
+        foreach samp_conffile [glob -type f ${destroot}${prefix}/share/${name}/support-files/my-*.cnf] {
+            # Fix paths in sample configuration files
+            reinplace "s|/etc/my.cnf|${prefix}/etc/${name}/my.cnf|g" ${samp_conffile}
         }
+        
     }
     
     post-install {
-        if {![file exists ${prefix}/etc/LaunchDaemons/org.macports.${mysql}/org.macports.${mysql}.plist]} {
+        if {![file exists ${prefix}/etc/LaunchDaemons/org.macports.${name}/org.macports.${name}.plist]} {
             ui_msg "The MySQL client has been installed."
             ui_msg "If you also want a MySQL server, install the mysql5-server port."
         }

Modified: trunk/dports/databases/mysql55/files/mysql55
===================================================================
--- trunk/dports/databases/mysql55/files/mysql55	2012-03-17 19:13:05 UTC (rev 90902)
+++ trunk/dports/databases/mysql55/files/mysql55	2012-03-17 21:35:27 UTC (rev 90903)
@@ -46,3 +46,50 @@
 lib/mysql55/bin/resolve_stack_dump
 lib/mysql55/bin/resolveip
 -
+share/man/mysql55/man1/comp_err.1.gz
+share/man/mysql55/man1/innochecksum.1.gz
+share/man/mysql55/man1/msql2mysql.1.gz
+share/man/mysql55/man1/my_print_defaults.1.gz
+share/man/mysql55/man1/myisam_ftdump.1.gz
+share/man/mysql55/man1/myisamchk.1.gz
+share/man/mysql55/man1/myisamlog.1.gz
+share/man/mysql55/man1/myisampack.1.gz
+share/man/mysql55/man1/mysql-stress-test.pl.1.gz
+share/man/mysql55/man1/mysql-test-run.pl.1.gz
+share/man/mysql55/man1/mysql.1.gz
+share/man/mysql55/man1/mysql.server.1.gz
+share/man/mysql55/man1/mysql_client_test.1.gz
+share/man/mysql55/man1/mysql_client_test_embedded.1.gz
+share/man/mysql55/man1/mysql_config.1.gz
+share/man/mysql55/man1/mysql_convert_table_format.1.gz
+share/man/mysql55/man1/mysql_find_rows.1.gz
+share/man/mysql55/man1/mysql_fix_extensions.1.gz
+share/man/mysql55/man1/mysql_install_db.1.gz
+share/man/mysql55/man1/mysql_plugin.1.gz
+share/man/mysql55/man1/mysql_secure_installation.1.gz
+share/man/mysql55/man1/mysql_setpermission.1.gz
+share/man/mysql55/man1/mysql_tzinfo_to_sql.1.gz
+share/man/mysql55/man1/mysql_upgrade.1.gz
+share/man/mysql55/man1/mysql_waitpid.1.gz
+share/man/mysql55/man1/mysql_zap.1.gz
+share/man/mysql55/man1/mysqlaccess.1.gz
+share/man/mysql55/man1/mysqladmin.1.gz
+share/man/mysql55/man1/mysqlbinlog.1.gz
+share/man/mysql55/man1/mysqlbug.1.gz
+share/man/mysql55/man1/mysqlcheck.1.gz
+share/man/mysql55/man1/mysqld_multi.1.gz
+share/man/mysql55/man1/mysqld_safe.1.gz
+share/man/mysql55/man1/mysqldump.1.gz
+share/man/mysql55/man1/mysqldumpslow.1.gz
+share/man/mysql55/man1/mysqlhotcopy.1.gz
+share/man/mysql55/man1/mysqlimport.1.gz
+share/man/mysql55/man1/mysqlman.1.gz
+share/man/mysql55/man1/mysqlshow.1.gz
+share/man/mysql55/man1/mysqlslap.1.gz
+share/man/mysql55/man1/mysqltest.1.gz
+share/man/mysql55/man1/mysqltest_embedded.1.gz
+share/man/mysql55/man1/perror.1.gz
+share/man/mysql55/man1/replace.1.gz
+share/man/mysql55/man1/resolve_stack_dump.1.gz
+share/man/mysql55/man1/resolveip.1.gz
+share/man/mysql55/man8/mysqld.8.gz

Modified: trunk/dports/databases/mysql_select/Portfile
===================================================================
--- trunk/dports/databases/mysql_select/Portfile	2012-03-17 19:13:05 UTC (rev 90902)
+++ trunk/dports/databases/mysql_select/Portfile	2012-03-17 21:35:27 UTC (rev 90903)
@@ -5,7 +5,7 @@
 PortGroup           select 1.0
 
 name                mysql_select
-version             0.1
+version             0.1.1
 categories          databases
 license             BSD
 maintainers         nomaintainer

Modified: trunk/dports/databases/mysql_select/files/base
===================================================================
--- trunk/dports/databases/mysql_select/files/base	2012-03-17 19:13:05 UTC (rev 90902)
+++ trunk/dports/databases/mysql_select/files/base	2012-03-17 21:35:27 UTC (rev 90903)
@@ -46,3 +46,50 @@
 bin/resolve_stack_dump
 bin/resolveip
 bin/xtstat
+share/man/man1/comp_err.1.gz
+share/man/man1/innochecksum.1.gz
+share/man/man1/msql2mysql.1.gz
+share/man/man1/my_print_defaults.1.gz
+share/man/man1/myisam_ftdump.1.gz
+share/man/man1/myisamchk.1.gz
+share/man/man1/myisamlog.1.gz
+share/man/man1/myisampack.1.gz
+share/man/man1/mysql-stress-test.pl.1.gz
+share/man/man1/mysql-test-run.pl.1.gz
+share/man/man1/mysql.1.gz
+share/man/man1/mysql.server.1.gz
+share/man/man1/mysql_client_test.1.gz
+share/man/man1/mysql_client_test_embedded.1.gz
+share/man/man1/mysql_config.1.gz
+share/man/man1/mysql_convert_table_format.1.gz
+share/man/man1/mysql_find_rows.1.gz
+share/man/man1/mysql_fix_extensions.1.gz
+share/man/man1/mysql_install_db.1.gz
+share/man/man1/mysql_plugin.1.gz
+share/man/man1/mysql_secure_installation.1.gz
+share/man/man1/mysql_setpermission.1.gz
+share/man/man1/mysql_tzinfo_to_sql.1.gz
+share/man/man1/mysql_upgrade.1.gz
+share/man/man1/mysql_waitpid.1.gz
+share/man/man1/mysql_zap.1.gz
+share/man/man1/mysqlaccess.1.gz
+share/man/man1/mysqladmin.1.gz
+share/man/man1/mysqlbinlog.1.gz
+share/man/man1/mysqlbug.1.gz
+share/man/man1/mysqlcheck.1.gz
+share/man/man1/mysqld_multi.1.gz
+share/man/man1/mysqld_safe.1.gz
+share/man/man1/mysqldump.1.gz
+share/man/man1/mysqldumpslow.1.gz
+share/man/man1/mysqlhotcopy.1.gz
+share/man/man1/mysqlimport.1.gz
+share/man/man1/mysqlman.1.gz
+share/man/man1/mysqlshow.1.gz
+share/man/man1/mysqlslap.1.gz
+share/man/man1/mysqltest.1.gz
+share/man/man1/mysqltest_embedded.1.gz
+share/man/man1/perror.1.gz
+share/man/man1/replace.1.gz
+share/man/man1/resolve_stack_dump.1.gz
+share/man/man1/resolveip.1.gz
+share/man/man8/mysqld.8.gz

Modified: trunk/dports/databases/mysql_select/files/none
===================================================================
--- trunk/dports/databases/mysql_select/files/none	2012-03-17 19:13:05 UTC (rev 90902)
+++ trunk/dports/databases/mysql_select/files/none	2012-03-17 21:35:27 UTC (rev 90903)
@@ -46,3 +46,50 @@
 -
 -
 -
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120317/6c021a1f/attachment-0001.html>

More information about the macports-changes mailing list