diff options
author | tron <tron@pkgsrc.org> | 2012-08-27 17:11:34 +0000 |
---|---|---|
committer | tron <tron@pkgsrc.org> | 2012-08-27 17:11:34 +0000 |
commit | 1575def13d7cae8d31c69c37bdb47cfcab04f6cd (patch) | |
tree | 2710d2f43b3f6230799ac05e5de5a0a156a5d7eb /databases | |
parent | 482b5c0d457a3906e8c8e84c7d53f036054867e1 (diff) | |
download | pkgsrc-1575def13d7cae8d31c69c37bdb47cfcab04f6cd.tar.gz |
Improve setup and configuration file handling:
1.) Install PHP script in the "setup" directory.
2.) Use Vendor override to set the location of the configuration file.
It is now possible to use phpMyAdmin's setup for configuration.
Based on a suggestion by Peter Avalos in private e-mail.
Diffstat (limited to 'databases')
-rw-r--r-- | databases/phpmyadmin/DEINSTALL | 10 | ||||
-rw-r--r-- | databases/phpmyadmin/INSTALL | 11 | ||||
-rw-r--r-- | databases/phpmyadmin/Makefile | 17 | ||||
-rw-r--r-- | databases/phpmyadmin/PLIST | 7 | ||||
-rw-r--r-- | databases/phpmyadmin/distinfo | 3 | ||||
-rw-r--r-- | databases/phpmyadmin/patches/patch-libraries_vendor_config.php | 23 |
6 files changed, 42 insertions, 29 deletions
diff --git a/databases/phpmyadmin/DEINSTALL b/databases/phpmyadmin/DEINSTALL deleted file mode 100644 index 4fc91a7bbda..00000000000 --- a/databases/phpmyadmin/DEINSTALL +++ /dev/null @@ -1,10 +0,0 @@ -# $NetBSD: DEINSTALL,v 1.1 2007/11/27 23:02:43 tron Exp $ - -CONF_INC_PHP=@CONF_INC_PHP@ -PMCONFFILE=@PMCONFFILE@ - -case ${STAGE} in -DEINSTALL) - ${RM} -f ${CONF_INC_PHP} - ;; -esac diff --git a/databases/phpmyadmin/INSTALL b/databases/phpmyadmin/INSTALL deleted file mode 100644 index 93d95c792ce..00000000000 --- a/databases/phpmyadmin/INSTALL +++ /dev/null @@ -1,11 +0,0 @@ -# $NetBSD: INSTALL,v 1.1 2007/11/27 15:20:47 tron Exp $ - -CONF_INC_PHP=@CONF_INC_PHP@ -PMCONFFILE=@PMCONFFILE@ - -case ${STAGE} in -POST-INSTALL) - ${RM} -f ${CONF_INC_PHP} - ${LN} -s ${PMCONFFILE} ${CONF_INC_PHP} - ;; -esac diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile index e3b4ba8a5bf..ac10f5cdd25 100644 --- a/databases/phpmyadmin/Makefile +++ b/databases/phpmyadmin/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.104 2012/08/17 23:08:21 tron Exp $ +# $NetBSD: Makefile,v 1.105 2012/08/27 17:11:34 tron Exp $ DISTNAME= phpMyAdmin-${DIST_VERSION}-all-languages PKGNAME= phpmyadmin-${DIST_VERSION:S/-//} +PKGREVISION= 1 CATEGORIES= databases www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=phpmyadmin/} EXTRACT_SUFX= .tar.xz @@ -12,6 +13,7 @@ COMMENT= Set of PHP-scripts to adminstrate MySQL over the WWW LICENSE= gnu-gpl-v2 DEPENDS+= ${PHP_PKG_PREFIX}-bz2>=5.2.0:../../archivers/php-bz2 +DEPENDS+= ${PHP_PKG_PREFIX}-zip>=5.2.0:../../archivers/php-zip DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=5.2.0:../../archivers/php-zlib DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.2.0:../../converters/php-mbstring DEPENDS+= ${PHP_PKG_PREFIX}-gettext>=5.2.0:../../devel/php-gettext @@ -22,12 +24,11 @@ DEPENDS+= ${PHP_PKG_PREFIX}-json>=5.2.0:../../textproc/php-json PKG_DESTDIR_SUPPORT= user-destdir -FILES_SUBST+= CONF_INC_PHP=${CONF_INC_PHP:Q} PMCONFFILE=${PMCONFFILE:Q} PLIST_SUBST+= DIST_VERSION=${DIST_VERSION:Q} MESSAGE_SUBST+= CONF_INC_PHP=${CONF_INC_PHP} PMCONFFILE=${PMCONFFILE:Q} \ EXDIR=${EXDIR:Q} -CONF_INC_PHP= ${PREFIX}/share/phpmyadmin/config.inc.php +CONF_INC_PHP= ${PREFIX}/share/phpmyadmin/config/config.inc.php DIST_VERSION= 3.5.2.2 DOC_FILES= ChangeLog Documentation.txt LICENSE README \ RELEASE-DATE-${DIST_VERSION} @@ -208,6 +209,7 @@ INSTALL_DIRS+= locale/zh_CN/LC_MESSAGES INSTALL_DIRS+= locale/zh_TW INSTALL_DIRS+= locale/zh_TW/LC_MESSAGES INSTALL_DIRS+= scripts +INSTALL_DIRS+= setup INSTALL_DIRS+= setup/frames INSTALL_DIRS+= setup/lib INSTALL_DIRS+= themes @@ -230,7 +232,10 @@ INSTALLATION_DIRS+= ${PMDIR}/${dir} do-configure: ${SED} -e "s|@PMDIR@|${PMDIR}|g" ${FILESDIR}/phpmyadmin.conf \ - >${WRKDIR}/phpmyadmin.conf + >${WRKDIR}/phpmyadmin.conf + cd ${WRKSRC}/libraries; \ + ${SED} -e "s#@@PMCONFFILE@@#${PMCONFFILE}#" vendor_config.php \ + >vendor_config.php.pkgsrc do-install: ${INSTALL_DATA} ${WRKSRC}/*.css ${DESTDIR}${PMDIR} @@ -261,8 +266,8 @@ do-install: cd ${WRKSRC} && \ ${INSTALL_DATA} ${DOC_FILES} ${DESTDIR}${PREFIX}/share/doc/phpmyadmin ${INSTALL_DATA} ${WRKDIR}/phpmyadmin.conf ${DESTDIR}${EXDIR}/apache.conf - - ${RM} -f ${DESTDIR}${PREFIX}/share/phpmyadmin/libraries/footer.inc.php.orig + cd ${DESTDIR}${PREFIX}/share/phpmyadmin/libraries; \ + ${MV} -f vendor_config.php.pkgsrc vendor_config.php .include "../../lang/php/phpversion.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/phpmyadmin/PLIST b/databases/phpmyadmin/PLIST index 680964f6164..71b35556a4a 100644 --- a/databases/phpmyadmin/PLIST +++ b/databases/phpmyadmin/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.28 2012/07/15 13:02:32 tron Exp $ +@comment $NetBSD: PLIST,v 1.29 2012/08/27 17:11:34 tron Exp $ share/doc/phpmyadmin/ChangeLog share/doc/phpmyadmin/Documentation.txt share/doc/phpmyadmin/LICENSE @@ -451,15 +451,20 @@ share/phpmyadmin/server_sql.php share/phpmyadmin/server_status.php share/phpmyadmin/server_synchronize.php share/phpmyadmin/server_variables.php +share/phpmyadmin/setup/config.php share/phpmyadmin/setup/frames/config.inc.php share/phpmyadmin/setup/frames/form.inc.php share/phpmyadmin/setup/frames/index.inc.php share/phpmyadmin/setup/frames/menu.inc.php share/phpmyadmin/setup/frames/servers.inc.php +share/phpmyadmin/setup/index.php share/phpmyadmin/setup/lib/ConfigGenerator.class.php share/phpmyadmin/setup/lib/common.inc.php share/phpmyadmin/setup/lib/form_processing.lib.php share/phpmyadmin/setup/lib/index.lib.php +share/phpmyadmin/setup/scripts.js +share/phpmyadmin/setup/styles.css +share/phpmyadmin/setup/validate.php share/phpmyadmin/show_config_errors.php share/phpmyadmin/sql.php share/phpmyadmin/tbl_addfield.php diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo index 1ae2fdee75b..b6700522386 100644 --- a/databases/phpmyadmin/distinfo +++ b/databases/phpmyadmin/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.64 2012/08/17 23:08:21 tron Exp $ +$NetBSD: distinfo,v 1.65 2012/08/27 17:11:34 tron Exp $ SHA1 (phpMyAdmin-3.5.2.2-all-languages.tar.xz) = 0772385c8133e7b0becaa6c81df7f76bdb9d3bf2 RMD160 (phpMyAdmin-3.5.2.2-all-languages.tar.xz) = 26e247336fa2876c939afa0fa842cc67ee7c38f3 Size (phpMyAdmin-3.5.2.2-all-languages.tar.xz) = 3654332 bytes +SHA1 (patch-libraries_vendor_config.php) = 4840b0ba666b4dd9869045859d380cd9e9e50571 diff --git a/databases/phpmyadmin/patches/patch-libraries_vendor_config.php b/databases/phpmyadmin/patches/patch-libraries_vendor_config.php new file mode 100644 index 00000000000..014309f22b3 --- /dev/null +++ b/databases/phpmyadmin/patches/patch-libraries_vendor_config.php @@ -0,0 +1,23 @@ +$NetBSD: patch-libraries_vendor_config.php,v 1.1 2012/08/27 17:11:34 tron Exp $ + +Configure location of the configuration file in the vendor specific section +as suggested by the phpMyAdmin documentation. + +--- libraries/vendor_config.php.orig 2012-08-12 14:45:56.000000000 +0100 ++++ libraries/vendor_config.php 2012-08-27 17:59:25.000000000 +0100 +@@ -25,13 +25,13 @@ + /** + * Path to config file generated using setup script. + */ +-define('SETUP_CONFIG_FILE', './config/config.inc.php'); ++define('SETUP_CONFIG_FILE', '@@PMCONFFILE@@'); + + /** + * Whether setup requires writable directory where config + * file will be generated. + */ +-define('SETUP_DIR_WRITABLE', true); ++define('SETUP_DIR_WRITABLE', false); + + /** + * Directory where configuration files are stored. |