From bd8b9678196b6c36605b4d7df0f06fd986383a06 Mon Sep 17 00:00:00 2001 From: Stuart Herbert Date: Fri, 23 Apr 2004 15:17:05 +0000 Subject: Config file fix --- dev-db/mysqltool/ChangeLog | 8 ++- dev-db/mysqltool/Manifest | 8 ++- dev-db/mysqltool/files/90_mysqltool.conf.m4 | 3 +- dev-db/mysqltool/files/digest-mysqltool-0.95-r3 | 1 + dev-db/mysqltool/mysqltool-0.95-r3.ebuild | 91 +++++++++++++++++++++++++ 5 files changed, 106 insertions(+), 5 deletions(-) create mode 100644 dev-db/mysqltool/files/digest-mysqltool-0.95-r3 create mode 100644 dev-db/mysqltool/mysqltool-0.95-r3.ebuild (limited to 'dev-db') diff --git a/dev-db/mysqltool/ChangeLog b/dev-db/mysqltool/ChangeLog index ff4591822274..68a9f4ea91a0 100644 --- a/dev-db/mysqltool/ChangeLog +++ b/dev-db/mysqltool/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-db/mysqltool # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysqltool/ChangeLog,v 1.15 2004/03/03 03:38:38 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysqltool/ChangeLog,v 1.16 2004/04/23 15:17:05 stuart Exp $ + +*mysqltool-0.95-r3 (23 Apr 2004) + + 23 Apr 2004; Stuart Herbert mysqltool-0.95-r3.ebuild, + files/90_mysqltool.conf.m4: + Config file fix; see bug #44748 02 Mar 2004; Jason Wever mysqltool-0.95-r2.ebuild: Marked stable on sparc. diff --git a/dev-db/mysqltool/Manifest b/dev-db/mysqltool/Manifest index 7fe760e8d4d1..dae3c525ad65 100644 --- a/dev-db/mysqltool/Manifest +++ b/dev-db/mysqltool/Manifest @@ -1,6 +1,8 @@ -MD5 deca9d04a207dfb3156e382d9320af35 ChangeLog 1982 -MD5 6cdcadc7771b584195d16317d6bfcabd mysqltool-0.95-r1.ebuild 2288 MD5 42d0b7d4af7b31150f27d06e1f8f3efc mysqltool-0.95-r2.ebuild 3254 -MD5 67953566eb2f18bca9f98439733fb938 files/90_mysqltool.conf.m4 332 +MD5 6cdcadc7771b584195d16317d6bfcabd mysqltool-0.95-r1.ebuild 2288 +MD5 cb47beb2812c0292435c2b3684c9652f ChangeLog 2158 +MD5 a932ed50d84d370731e08b1c1d3e92aa mysqltool-0.95-r3.ebuild 3257 +MD5 8f29dbd83bfe415fe9b3dff311ce9c20 files/90_mysqltool.conf.m4 363 MD5 f19ea0fa37a19ab341ca96aacd0418c9 files/digest-mysqltool-0.95-r1 65 MD5 f19ea0fa37a19ab341ca96aacd0418c9 files/digest-mysqltool-0.95-r2 65 +MD5 f19ea0fa37a19ab341ca96aacd0418c9 files/digest-mysqltool-0.95-r3 65 diff --git a/dev-db/mysqltool/files/90_mysqltool.conf.m4 b/dev-db/mysqltool/files/90_mysqltool.conf.m4 index 0eff8951d9d2..ef7c44c7f8bc 100644 --- a/dev-db/mysqltool/files/90_mysqltool.conf.m4 +++ b/dev-db/mysqltool/files/90_mysqltool.conf.m4 @@ -5,7 +5,8 @@ Options ExecCGI - SetHandler perl-script +### SetHandler perl-script + SetHandler cgi-script PerlHandler MysqlTool diff --git a/dev-db/mysqltool/files/digest-mysqltool-0.95-r3 b/dev-db/mysqltool/files/digest-mysqltool-0.95-r3 new file mode 100644 index 000000000000..e506852425e2 --- /dev/null +++ b/dev-db/mysqltool/files/digest-mysqltool-0.95-r3 @@ -0,0 +1 @@ +MD5 9650d62eec7dab21d39c83d30f79a08b MysqlTool-0.95.tar.gz 44898 diff --git a/dev-db/mysqltool/mysqltool-0.95-r3.ebuild b/dev-db/mysqltool/mysqltool-0.95-r3.ebuild new file mode 100644 index 000000000000..d483f2885517 --- /dev/null +++ b/dev-db/mysqltool/mysqltool-0.95-r3.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysqltool/mysqltool-0.95-r3.ebuild,v 1.1 2004/04/23 15:17:05 stuart Exp $ + +inherit perl-module + +S=${WORKDIR}/MysqlTool-${PV} +DESCRIPTION="Web interface for managing one or more mysql server installations" +SRC_URI="http://www.dajoba.com/projects/mysqltool/MysqlTool-${PV}.tar.gz" +HOMEPAGE="http://www.dajoba.com/projects/mysqltool/" +IUSE="apache2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~sparc ~ppc ~alpha" + +DEPEND="virtual/glibc + dev-lang/perl + >=dev-db/mysql-3.23.38 + dev-perl/CGI + dev-perl/Apache-DBI + dev-perl/DBI + dev-perl/DBD-mysql + dev-perl/Crypt-Blowfish" +RDEPEND="${DEPEND} + || ( >=net-www/apache-1.3.24-r1 + apache2? ( >=net-www/apache-2.0.45 ) + )" + +src_install() { + eval `perl '-V:installarchlib'` + dodir /$installarchlib + + cp ${S}/Makefile ${S}/Makefile.orig + cat ${S}/Makefile | sed -e "s!INSTALLMAN1DIR = /usr/share/man/man1!INSTALLMAN1DIR = ${D}/usr/share/man/man1!" -e "s!INSTALLMAN3DIR = /usr/share/man/man3!INSTALLMAN3DIR = ${D}/usr/share/man/man3!" > ${S}/Makefile.gentoo + mv ${S}/Makefile.gentoo ${S}/Makefile + + make install || die + + dodoc COPYING Changes MANIFEST README Upgrade + + local __apache_server_root__ + if [ "`use apache2`" ]; then + __apache_server_root__="/etc/apache2" + else + __apache_server_root__="/etc/apache" + fi; + __apache_conf_dir__=${__apache_server_root__}/conf + local __apache_document_root__ + __apache_document_root__=`grep "^DocumentRoot" ${__apache_conf_dir__}/*.conf -h | cut -d' ' -f2` + local __apache_modules_conf_dir__ + if [ "`use apache2`" ]; then + __apache_modules_conf_dir__="${__apache_conf_dir__}/modules.d" + else + __apache_modules_conf_dir__="${__apache_conf_dir__}/addon-modules" + fi; + + # the cgi and images.. + dodir ${__apache_document_root__}/mysqltool + cp -a htdocs/* ${D}/${__apache_document_root__}/mysqltool + rm ${D}/${__apache_document_root__}/mysqltool/mysqltool.conf + + # the config file.. + local apacheconfbase + apacheconfbase=${FILESDIR}/90_mysqltool.conf.m4 + insinto ${__apache_modules_conf_dir__} + cp ${S}/htdocs/mysqltool.conf ${S}/htdocs/mysqltool.pl + doins htdocs/mysqltool.pl + fowners apache:apache ${__apache_modules_conf_dir__}/mysqltool.pl + fperms 0600 ${__apache_modules_conf_dir__}/mysqltool.pl + m4 -D__APACHE_SERVER_ROOT__=${__apache_server_root__} -D__APACHE_DOCUMENT_ROOT__=${__apache_document_root__} -D__APACHE_MODULES_CONF_DIR__=${__apache_modules_conf_dir__} ${apacheconfbase} >${D}/${__apache_modules_conf_dir__}/`basename ${apacheconfbase} .m4` + + # now fix its location in the main cgi.. + cp ${D}/${__apache_document_root__}/mysqltool/index.cgi \ + ${D}/${__apache_document_root__}/mysqltool/index.cgi.orig + sed -e "s:^\(require\).*:\1 '${__apache_modules_conf_dir__}/mysqltool.pl';:" \ + ${D}/${__apache_document_root__}/mysqltool/index.cgi.orig > \ + ${D}/${__apache_document_root__}/mysqltool/index.cgi + rm ${D}/${__apache_document_root__}/mysqltool/index.cgi.orig +} + +pkg_postinst() { + einfo "To have Apache support MySQLTool, please do the following:" + local f + if [ "`use apache2`" ] ; then + f='2' + else + f='' + fi + einfo "Edit /etc/conf.d/apache${f} and add \"-D MYSQLTOOL\" to APACHE${f}_OPTS" +} -- cgit v1.2.3-65-gdbad