[95510] trunk/dports/databases

pixilla at macports.org pixilla at macports.org
Sat Jul 14 10:51:33 PDT 2012


Revision: 95510
          https://trac.macports.org/changeset/95510
Author:   pixilla at macports.org
Date:     2012-07-14 10:51:29 -0700 (Sat, 14 Jul 2012)
Log Message:
-----------
databases/mysql55:
- Fix doc dir. Closes #35190
databases/percona:
- Fix doc dir. Closes #35190
- Add Percona Operations Manual.

Modified Paths:
--------------
    trunk/dports/databases/mysql55/files/patch-cmake-install_layout.cmake.diff
    trunk/dports/databases/percona/Portfile
    trunk/dports/databases/percona/files/patch-cmake-install_layout.cmake.diff

Modified: trunk/dports/databases/mysql55/files/patch-cmake-install_layout.cmake.diff
===================================================================
--- trunk/dports/databases/mysql55/files/patch-cmake-install_layout.cmake.diff	2012-07-14 17:13:33 UTC (rev 95509)
+++ trunk/dports/databases/mysql55/files/patch-cmake-install_layout.cmake.diff	2012-07-14 17:51:29 UTC (rev 95510)
@@ -34,10 +34,10 @@
 +#
 +SET(INSTALL_INCLUDEDIR_MACPORTS         "include/@NAME@/mysql")
 +#
-+SET(INSTALL_DOCDIR_MACPORTS             "share/docs/@NAME@")
-+SET(INSTALL_DOCREADMEDIR_MACPORTS       "share/docs/@NAME@")
++SET(INSTALL_DOCDIR_MACPORTS             "share/doc/@NAME@")
++SET(INSTALL_DOCREADMEDIR_MACPORTS       "share/doc/@NAME@")
 +SET(INSTALL_MANDIR_MACPORTS             "share/man/@NAME@")
-+SET(INSTALL_INFODIR_MACPORTS            "share/docs/@NAME@")
++SET(INSTALL_INFODIR_MACPORTS            "share/doc/@NAME@")
 +#
 +SET(INSTALL_SHAREDIR_MACPORTS           "share/@NAME@")
 +SET(INSTALL_MYSQLSHAREDIR_MACPORTS      "share/@NAME@")

Modified: trunk/dports/databases/percona/Portfile
===================================================================
--- trunk/dports/databases/percona/Portfile	2012-07-14 17:13:33 UTC (rev 95509)
+++ trunk/dports/databases/percona/Portfile	2012-07-14 17:51:29 UTC (rev 95510)
@@ -8,7 +8,7 @@
 set version_mysql   5.5.24
 set release         26.0
 # Please set revision_client and revision_server to 0 if you bump version_mysql or release.
-set revision_client 1
+set revision_client 2
 set revision_server 0
 version             ${version_mysql}-${release}
 categories          databases
@@ -22,7 +22,8 @@
     PortGroup           cmake 1.0
     PortGroup           select 1.0
 
-    set branch          [join [lrange [split ${version} .] 0 1] .]
+    set version_branch  [join [lrange [split ${version} .] 0 1] .]
+    set version_manual  [join [lrange [split ${version} .] 0 1] {}]
 
     revision            ${revision_client}
     license             GPL-2
@@ -32,7 +33,8 @@
 
     homepage            http://www.percona.com/
     master_sites \
-    http://www.percona.com/redir/downloads/Percona-Server-${branch}/Percona-Server-${version_mysql}-${release}/source/
+    http://www.percona.com/redir/downloads/Percona-Server-${version_branch}/Percona-Server-${version_mysql}-${release}/source/ \
+    http://form.percona.com/rs/percona/images/
 
     distname            Percona-Server-${version_mysql}-rel${release}
     use_parallel_build  yes
@@ -45,9 +47,17 @@
     patchfiles-append   patch-plugin-percona-pam-for-mysql-CMakeLists.txt.diff \
                         patch-plugin-percona-pam-for-mysql-src-auth_pam_common.h.diff
 
-    checksums           rmd160  16d4c9958b002f45673e64c1bc5d798ccc21b319 \
+    checksums           ${distname}${extract.suffix} \
+                        rmd160  16d4c9958b002f45673e64c1bc5d798ccc21b319 \
                         sha256  5b54738099156b44d387142a875ff529895406a75652ebb4654cabd3597f1f56
 
+    set manual_distfile Percona_Server_${version_manual}_Operations_Manual.pdf
+    extract.only        ${distfiles}
+    distfiles-append    ${manual_distfile}
+    checksums-append    ${manual_distfile} \
+                        rmd160  80261ad2723cad4a02439175bd3120f9657ebecf \
+                        sha256  031176de33d1def1a55eae90ef34e867164386929eaaa3e565e8d677025f7329
+
     depends_lib-append  port:zlib \
                         port:cmake
     depends_run-append  port:mysql_select
@@ -62,6 +72,8 @@
         copy ${filespath}/macports-default.cnf \
             ${filespath}/my.cnf \
             ${worksrcpath}/build_macports/macports/
+        copy ${distpath}/${manual_distfile} \
+            ${worksrcpath}/build_macports/macports/
     }
 
     post-patch {
@@ -129,8 +141,8 @@
             ${destroot}${prefix}/etc/${name_mysql}/
         xinstall -m 755 -o root -d \
             ${destroot}${prefix}/share/${name_mysql}/support-files/macports
-        copy ${worksrcpath}/build_macports/macports/my.cnf \
-            ${destroot}${prefix}/share/${name_mysql}/support-files/macports/
+        copy ${worksrcpath}/build_macports/macports/${manual_distfile} \
+            ${destroot}${prefix}/share/doc/${name_mysql}/
     }
 
     post-install {
@@ -180,9 +192,9 @@
     }
 
     livecheck.type          regex
-    livecheck.url           http://www.percona.com/downloads/Percona-Server-${branch}/
+    livecheck.url           http://www.percona.com/downloads/Percona-Server-${version_branch}/
     livecheck.version       ${version_mysql}-${release}
-    livecheck.regex         "/downloads/Percona-Server-${branch}/Percona-Server-(\[^/\]+)/"
+    livecheck.regex         "/downloads/Percona-Server-${version_branch}/Percona-Server-(\[^/\]+)/"
 }
 
 subport ${name_mysql}-server {

Modified: trunk/dports/databases/percona/files/patch-cmake-install_layout.cmake.diff
===================================================================
--- trunk/dports/databases/percona/files/patch-cmake-install_layout.cmake.diff	2012-07-14 17:13:33 UTC (rev 95509)
+++ trunk/dports/databases/percona/files/patch-cmake-install_layout.cmake.diff	2012-07-14 17:51:29 UTC (rev 95510)
@@ -34,10 +34,10 @@
 +#
 +SET(INSTALL_INCLUDEDIR_MACPORTS         "include/@NAME@/mysql")
 +#
-+SET(INSTALL_DOCDIR_MACPORTS             "share/docs/@NAME@")
-+SET(INSTALL_DOCREADMEDIR_MACPORTS       "share/docs/@NAME@")
++SET(INSTALL_DOCDIR_MACPORTS             "share/doc/@NAME@")
++SET(INSTALL_DOCREADMEDIR_MACPORTS       "share/doc/@NAME@")
 +SET(INSTALL_MANDIR_MACPORTS             "share/man/@NAME@")
-+SET(INSTALL_INFODIR_MACPORTS            "share/docs/@NAME@")
++SET(INSTALL_INFODIR_MACPORTS            "share/doc/@NAME@")
 +#
 +SET(INSTALL_SHAREDIR_MACPORTS           "share/@NAME@")
 +SET(INSTALL_MYSQLSHAREDIR_MACPORTS      "share/@NAME@")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120714/7d50a55e/attachment.html>


More information about the macports-changes mailing list