Skip to content

Commit

Permalink
Merge branch 'macports:master' into feature/upgrade-lttoolbox-apertium
Browse files Browse the repository at this point in the history
  • Loading branch information
erikbs authored Jan 19, 2025
2 parents 17875ab + 9d46c20 commit 9ce9a02
Show file tree
Hide file tree
Showing 305 changed files with 1,503 additions and 2,924 deletions.
3 changes: 3 additions & 0 deletions aqua/CocoaDialog/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ categories aqua sysutils
# https://github.com/cocoadialog/cocoadialog/commit/8617c8d1024017b8e703df3833378935f143905c
license GPL-2
maintainers {ryandesign @ryandesign} openmaintainer
# The bundled Growl framework is compiled for these architectures.
# TODO: Try to patch out the use of Growl on other archs.
supported_archs i386 x86_64

description common GUI controls for command-line application
long_description CocoaDialog is a macOS application that allows the use \
Expand Down
6 changes: 4 additions & 2 deletions audio/audacious-plugins/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,8 @@ variant qt6 conflicts qt5 description {Add Qt6 support} {
}

variant gtk2 conflicts gtk3 description {Add GTK2 support} {
depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc:gtk2
depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
port:json-glib

configure.args-replace -Dgtk=false \
-Dgtk=true \
Expand All @@ -402,7 +403,8 @@ variant gtk2 conflicts gtk3 description {Add GTK2 support} {
}

variant gtk3 conflicts gtk2 description {Add GTK3 support} {
depends_lib-append path:lib/pkgconfig/gtk+-3.0.pc:gtk3
depends_lib-append path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
port:json-glib

configure.args-replace -Dgtk=false \
-Dgtk=true \
Expand Down
267 changes: 8 additions & 259 deletions databases/mariadb-10.0/Portfile
Original file line number Diff line number Diff line change
@@ -1,270 +1,19 @@
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4

PortSystem 1.0
PortGroup deprecated 1.0

# Support ended 2019-03-31, see https://mariadb.org/about/maintenance-policy/
deprecated.eol_version yes
PortGroup obsolete 1.0

name mariadb-10.0
set name_mysql ${name}
replaced_by mariadb-10.5
version 10.0.38
set version_branch [join [lrange [split ${version} .] 0 1] .]
# Please set revision_client and revision_server to 0 if you bump
# version; these can be changed independently for the 2 subports, but
# can be changed at the same time if that's what's required.
set revision_client 2
set revision_server 1
revision 3
categories databases
homepage https://mariadb.org/
maintainers {michaelld @michaelld} openmaintainer

if {$subport eq $name} {

PortGroup cmake 1.1
PortGroup select 1.0
PortGroup github 1.0

compiler.cxx_standard 2011

github.setup MariaDB server ${version}
# Change github.tarball_from to 'releases' or 'archive' next update
github.tarball_from tarball
git.branch ${version_branch}

license GPL-2
description Multithreaded SQL database server
long_description Mariadb is a fork of the MySQL server, a multi-threaded SQL database.

patch.pre_args-replace -p0 -p1
patchfiles patch-cmake-install_layout.cmake.diff \
patch-CMakeLists.txt.diff

checksums rmd160 dc325783cae3bfcda44754ae8776066478549874 \
sha256 9d51dae4822f6ec392b8768f38ccc095d5ac2e5f2a9482e29676afe88cc6a186 \
size 62845969
revision ${revision_client}

# stealth update equivalent from moving to Github
dist_subdir ${name}/${version}_1

depends_lib-append port:zlib port:tcp_wrappers port:ncurses port:judy \
port:pcre
depends_run-append port:mysql_select

select.group mysql
select.file ${filespath}/${name_mysql}

# override the cmake PG's build type setting, as Mariadb doesn't
# build using 'MacPorts' for this setting
if {[variant_isset debug]} {
cmake.build_type Debug
} else {
cmake.build_type Release
}

post-extract {
file mkdir ${cmake.build_dir}/macports
copy ${filespath}/macports-default.cnf \
${filespath}/my.cnf \
${cmake.build_dir}/macports/
foreach f {
storage/tokudb/PerconaFT/third_party/snappy-1.1.2/install-sh
storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/build-aux/install-sh
} {
file attributes ${worksrcpath}/${f} -permissions a+x
}
}

post-patch {
reinplace "s|@NAME@|${name_mysql}|g" \
${worksrcpath}/cmake/install_layout.cmake
reinplace "s|@NAME@|${name_mysql}|g" \
${cmake.build_dir}/macports/macports-default.cnf \
${cmake.build_dir}/macports/my.cnf
reinplace "s|@PREFIX@|${prefix}|g" \
${cmake.build_dir}/macports/macports-default.cnf \
${cmake.build_dir}/macports/my.cnf
}

configure.args-delete \
-DCMAKE_INSTALL_NAME_DIR=${prefix}/lib
configure.args-append \
-DCMAKE_INSTALL_NAME_DIR:STRING=${prefix}/lib/${name_mysql}/mysql \
-DINSTALL_LAYOUT:STRING=MACPORTS \
-DSYSCONFDIR:PATH=${prefix}/etc/${name_mysql} \
-DMYSQL_UNIX_ADDR:PATH=${prefix}/var/run/${name_mysql}/mysqld.sock \
-DMYSQL_DATADIR:PATH=${prefix}/var/db/${name_mysql} \
-DDEFAULT_CHARSET:STRING=utf8 \
-DDEFAULT_COLLATION:STRING=utf8_general_ci \
-DWITH_EMBEDDED_SERVER:BOOL=ON \
-DWITH_ZLIB:STRING=system \
-DWITH_UNIT_TESTS:BOOL=ON \
-DWITHOUT_TOKUDB_STORAGE_ENGINE:BOOL=ON \
-DWITHOUT_MROONGA_STORAGE_ENGINE:BOOL=ON \
-DWITHOUT_CASSANDRA_STORAGE_ENGINE:BOOL=ON \
-DENABLE_GCOV:BOOL=OFF \
-DENABLE_DTRACE:BOOL=OFF \
-DWITH_READLINE:BOOL=ON \
-DWITH_LIBWRAP:BOOL=ON \
-DWITH_SSL:STRING=no \
-DMYSQL_MAINTAINER_MODE:STRING=AUTO \
-DCONNECT_WITH_JDBC=OFF \
-DCONNECT_WITH_LIBXML2=OFF \
-DCONNECT_WITH_MONGO=OFF \
-DCONNECT_WITH_ODBC=OFF \
-DCONNECT_WITH_REST=OFF \
-DWITH_PCRE=system

post-build {
set dirs ${cmake.build_dir}
foreach dir ${dirs} {
reinplace -E {s|-arch [a-z0-9_]+||g} \
${dir}/scripts/mysql_config \
${dir}/scripts/mysqlbug
}
}

post-destroot {
# 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_mysql}/man\[1-9\]/*] {
# Fix paths in manpages
reinplace -q "s|/etc/|${prefix}/etc/${name_mysql}/|g" ${manpage}
# Compress all manpages with gzip
system "$gzip -9vf ${manpage}"
}
foreach samp_conffile [glob -type f ${destroot}${prefix}/share/${name_mysql}/support-files/my-*.cnf] {
# Fix paths in sample configuration files
reinplace -q "s|/etc/my.cnf|${prefix}/etc/${name_mysql}/my.cnf|g" ${samp_conffile}
}
xinstall -m 755 -o root -d \
${destroot}${prefix}/etc/${name_mysql}
copy ${cmake.build_dir}/macports/macports-default.cnf \
${destroot}${prefix}/etc/${name_mysql}/
xinstall -m 755 -o root -d \
${destroot}${prefix}/share/${name_mysql}/support-files/macports
copy ${cmake.build_dir}/macports/my.cnf \
${destroot}${prefix}/share/${name_mysql}/support-files/macports/
}

post-install {
if {![file exists ${prefix}/etc/LaunchDaemons/org.macports.${name_mysql}/org.macports.${name_mysql}-server.plist]} {
ui_msg "The ${name_mysql} client has been installed."
ui_msg "To install the ${name_mysql} server, install the ${name_mysql}-server port."
}
}
license GPL-2

post-activate {
if {![file exists ${prefix}/etc/${name_mysql}/my.cnf]} {
copy ${prefix}/share/${name_mysql}/support-files/macports/my.cnf \
${prefix}/etc/${name_mysql}/
}
}

variant system_readline description {Use system readline instead of bundled readline} {

# Add readline support.
# "-DWITH_READLINE:BOOL=OFF" has the peculiar meaning "do not use the bundled copy
# of readline but use the system's (i.e. MacPorts') copy of readline"
depends_lib-append port:readline
configure.args-delete -DWITH_READLINE:BOOL=ON
configure.args-append -DWITH_READLINE:BOOL=OFF
}

notes "
On activation if no ${prefix}/etc/${name_mysql}/my.cnf file exists one
will be created which loads
${prefix}/etc/${name_mysql}/macports-default.cnf.
If a ${prefix}/etc/${name_mysql}/my.cnf file exists MacPorts does not
touch it and any changes you make to ${prefix}/etc/${name_mysql}/my.cnf
will be preserved (e.g., during port upgrades, deactivations or
activations). ${prefix}/etc/${name_mysql}/my.cnf is a good place to
customize your ${name_mysql} installation.
Any changes made to ${prefix}/etc/${name_mysql}/macports-default.cnf
will be lost during port upgrades, deactivations or activations so you
are advised to not make changes here. Currently
${prefix}/etc/${name_mysql}/macports-default.cnf contains only one
directive; to disable networking. With disabled networking it is
possible to install and have running all the MacPorts mysql ports
simultaneously.
"

}

subport ${name_mysql}-server {

revision ${revision_server}
subport mariadb-10.0-server {
replaced_by mariadb-10.5-server
revision 2
license BSD
description Run ${name_mysql} as server
long_description {*}${description}

supported_archs noarch
distfiles

depends_run port:${name_mysql}

if {"darwin" eq ${os.platform} && ${os.major} > 8} {
set mysqluser _mysql
} else {
set mysqluser mysql
}
add_users ${mysqluser} group=${mysqluser} realname=MySQL\ Server

pre-extract {
copy ${filespath}/org.macports.mysql-server.plist ${workpath}/org.macports.${subport}.plist
}

post-patch {
reinplace "s|@NAME@|${subport}|g" \
${workpath}/org.macports.${subport}.plist
reinplace "s|@NAMEMYSQL@|${name_mysql}|g" \
${workpath}/org.macports.${subport}.plist
reinplace "s|@PREFIX@|${prefix}|g" \
${workpath}/org.macports.${subport}.plist
reinplace "s|@SUBPORT@|${subport}|g" \
${workpath}/org.macports.${subport}.plist
reinplace "s|@USER@|${mysqluser}|g" \
${workpath}/org.macports.${subport}.plist
reinplace "s|@GROUP@|${mysqluser}|g" \
${workpath}/org.macports.${subport}.plist
}

use_configure no

build {}

destroot {
xinstall -d -m 755 ${destroot}${prefix}/etc/LaunchDaemons/org.macports.${subport}
xinstall -m 0644 -o root -W ${workpath} \
org.macports.${subport}.plist \
${destroot}${prefix}/etc/LaunchDaemons/org.macports.${subport}
xinstall -d -m 755 ${destroot}/Library/LaunchDaemons
ln -s ${prefix}/etc/LaunchDaemons/org.macports.${subport}/org.macports.${subport}.plist \
${destroot}/Library/LaunchDaemons/org.macports.${subport}.plist
xinstall -m 755 -o root -d \
${destroot}${prefix}/var/run
xinstall -m 755 -o ${mysqluser} -g ${mysqluser} -d \
${destroot}${prefix}/etc/${name_mysql} \
${destroot}${prefix}/var/db/${name_mysql} \
${destroot}${prefix}/var/log/${name_mysql} \
${destroot}${prefix}/var/run/${name_mysql}
destroot.keepdirs-append \
${destroot}${prefix}/var/db/${name_mysql} \
${destroot}${prefix}/var/log/${name_mysql} \
${destroot}${prefix}/var/run/${name_mysql}
}

notes "
If this is a new install you might want to run:
\$ sudo -u ${mysqluser} ${prefix}/lib/${name_mysql}/bin/mysql_install_db
"

}

livecheck.type none
# Remove after 2026-01-17
9 changes: 0 additions & 9 deletions databases/mariadb-10.0/files/macports-default.cnf

This file was deleted.

Loading

0 comments on commit 9ce9a02

Please sign in to comment.