Base should be enhanced to allow dots “.” in variant names. We could then write variant names like "mariadb10.0” and “mariadb10.1" instead of the ambiguous “mariadb100” and “mariadb101”.
Regards, Bradley Giesbrecht (pixilla) > On Jun 10, 2016, at 11:56 PM, Jeremy Huddleston Sequoia <jerem...@apple.com> > wrote: > > Failed to parse file lang/qore-mysql-module/Portfile: Variant name > mariadb-10.0 contains invalid characters > >> On Jun 10, 2016, at 23:15, davidnich...@macports.org wrote: >> >> Revision >> 149320 >> Author >> davidnich...@macports.org >> Date >> 2016-06-10 23:15:48 -0700 (Fri, 10 Jun 2016) >> Log Message >> >> qore-mysql-module: updated to v2.0.2 and added support for newer mysql and >> mariadb ports >> Modified Paths >> >> • trunk/dports/lang/qore-mysql-module/Portfile >> Removed Paths >> >> • trunk/dports/lang/qore-mysql-module/files/ >> Diff >> >> Modified: trunk/dports/lang/qore-mysql-module/Portfile (149319 => 149320) >> >> --- trunk/dports/lang/qore-mysql-module/Portfile 2016-06-11 06:01:57 UTC >> (rev 149319) >> +++ trunk/dports/lang/qore-mysql-module/Portfile 2016-06-11 06:15:48 UTC >> (rev 149320) >> >> @@ -4,8 +4,7 @@ >> >> PortSystem 1.0 >> >> >> >> name qore-mysql-module >> >> -version 2.0.1 >> -revision 1 >> >> +version 2.0.2 >> >> categories lang >> >> license LGPL-2.1 >> >> maintainers davidnichols >> >> @@ -14,32 +13,39 @@ >> >> use_bzip2 yes >> >> homepage http://qore.org >> platforms darwin >> >> -master_sites sourceforge:qore >> >> +master_sites >> https://github.com/qorelanguage/module-mysql/releases/download/v${version} >> >> >> -checksums md5 28e9a89f7e543f46ddb6bb3dcc838c2c \ >> - sha1 4c219ce39d2fc0c025e1dc46fe7a6a8bff5f0020 \ >> - rmd160 172c9f9ebee4b638e470e096e1537d6decff3af3 >> >> +checksums md5 29800c39a41c90824ef530c551ae4a7e \ >> + sha1 5abf5c0ddea7719bee45dae0cbea76d8afe13dbe \ >> + rmd160 c3459e518186bfc4176cbb8b06adf5d68bcd4943 >> >> >> >> -patchfiles patch-configure >> >> +variant mariadb conflicts mariadb-10.0 mariadb-10.1 mysql51 mysql55 mysql56 >> mysql57 percona description {use mariadb} {} >> +variant mariadb-10.0 conflicts mariadb mariadb-10.1 mysql51 mysql55 mysql56 >> mysql57 percona description {use mariadb-10.0} {} >> +variant mariadb-10.1 conflicts mariadb mariadb-10.0 mysql51 mysql55 mysql56 >> mysql57 percona description {use mariadb-10.1} {} >> +variant mysql51 conflicts mariadb mariadb-10.0 mariadb-10.1 mysql55 mysql56 >> mysql57 percona description {use mysql 5.1} {} >> +variant mysql55 conflicts mariadb mariadb-10.0 mariadb-10.1 mysql51 mysql56 >> mysql57 percona description {use mysql 5.5} {} >> +variant mysql56 conflicts mariadb mariadb-10.0 mariadb-10.1 mysql51 mysql55 >> mysql57 percona description {use mysql 5.6} {} >> +variant mysql57 conflicts mariadb mariadb-10.0 mariadb-10.1 mysql51 mysql55 >> mysql56 percona description {use mysql 5.7} {} >> +variant percona conflicts mariadb mariadb-10.0 mariadb-10.1 mysql51 mysql55 >> mysql56 mysql57 description {use percona} {} >> >> >> >> -variant mariadb conflicts mysql51 mysql55 mysql56 percona description {use >> mariadb} {} >> -variant mysql51 conflicts mariadb mysql55 mysql56 percona description {use >> mysql 5.1} {} >> -variant mysql55 conflicts mariadb mysql51 mysql56 percona description {use >> mysql 5.5} {} >> -variant mysql56 conflicts mariadb mysql51 mysql55 percona description {use >> mysql 5.6} {} >> -variant percona conflicts mariadb mysql51 mysql55 mysql56 description {use >> percona} {} >> - >> -if {![variant_isset mariadb] && ![variant_isset mysql51] && ![variant_isset >> mysql55] && ![variant_isset mysql56] && ![variant_isset percona]} { >> >> +if {![variant_isset mariadb] && ![variant_isset mariadb-10.0] && >> ![variant_isset mariadb-10.1] && ![variant_isset mysql51] && ![variant_isset >> mysql55] && ![variant_isset mysql56] && ![variant_isset mysql57] && >> ![variant_isset percona]} { >> >> default_variants +mariadb >> >> } >> >> >> >> if {[variant_isset mariadb]} { >> >> set mysql_port "mariadb" >> >> +} elseif {[variant_isset mariadb-10.0]} { >> + set mysql_port "mariadb-10.0" >> +} elseif {[variant_isset mariadb-10.1]} { >> + set mysql_port "mariadb-10.1" >> >> } elseif {[variant_isset mysql51]} { >> >> set mysql_port "mysql51" >> >> } elseif {[variant_isset mysql55]} { >> >> set mysql_port "mysql55" >> >> } elseif {[variant_isset mysql56]} { >> >> set mysql_port "mysql56" >> >> +} elseif {[variant_isset mysql57]} { >> + set mysql_port "mysql57" >> >> } elseif {[variant_isset percona]} { >> >> set mysql_port "percona" >> >> } >> >> _______________________________________________ >> macports-changes mailing list >> macports-chan...@lists.macosforge.org >> https://lists.macosforge.org/mailman/listinfo/macports-changes > > _______________________________________________ > macports-dev mailing list > macports-dev@lists.macosforge.org > https://lists.macosforge.org/mailman/listinfo/macports-dev
signature.asc
Description: Message signed with OpenPGP using GPGMail
_______________________________________________ macports-dev mailing list macports-dev@lists.macosforge.org https://lists.macosforge.org/mailman/listinfo/macports-dev
