From cd4e498f06d8f4c1e23086d679830952cb689c10 Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 12 Jan 2003 14:04:57 +0000 Subject: - Fix installation of online documentation. - Supply example configuration for Apache web server. - Search for configuration file in "${PKG_SYSCONFDIR}/phpmyadmin". - Rearrange directory structure so that the PHP files can be mapped into a web server's document space instead of copying them. - Bump package revision after above changes. These improvements are based on the patches supplied by Adrian Portelli in PR pkg/19708. --- databases/phpmyadmin/MESSAGE | 26 ++++++++++++++++++---- databases/phpmyadmin/Makefile | 35 +++++++++++++++++++++++------- databases/phpmyadmin/PLIST | 27 +++++++++++++---------- databases/phpmyadmin/files/phpmyadmin.conf | 14 ++++++++++++ 4 files changed, 79 insertions(+), 23 deletions(-) create mode 100644 databases/phpmyadmin/files/phpmyadmin.conf (limited to 'databases') diff --git a/databases/phpmyadmin/MESSAGE b/databases/phpmyadmin/MESSAGE index e5fc5616335..b07a8952f7d 100644 --- a/databases/phpmyadmin/MESSAGE +++ b/databases/phpmyadmin/MESSAGE @@ -1,8 +1,26 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.3 2002/01/30 17:15:37 tron Exp $ +$NetBSD: MESSAGE,v 1.4 2003/01/12 14:04:57 tron Exp $ Do *not* edit "${PREFIX}/share/phpmyadmin/config.inc.php" to customize -this package because it is a prototype file. Instead link or copy -the required files to your web space and create a local copy of -"config.inc.php" there. +this package because it is a link which will removed during upgrades. +The actual configuration file is "${PMCONFFILE}". + +You will need to make phpMyAdmin accessible through your HTTP server. +If you are running Apache and ap-php, then you may either symlink + + ${PMDIR} + +into DocumentRoot, or copy + + ${EXDIR}/phpmyadmin.conf + +to ${PKG_SYSCONFDIR}/httpd and add the following line to httpd.conf: + + Include ${PKG_SYSCONFDIR}/httpd/phpmyadmin.conf + +to make mySQL accessible through: + + http://www.domain.com/phpmyadmin/ + + =========================================================================== diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile index cfb98e16848..97770113eec 100644 --- a/databases/phpmyadmin/Makefile +++ b/databases/phpmyadmin/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2003/01/05 14:25:18 tron Exp $ +# $NetBSD: Makefile,v 1.9 2003/01/12 14:04:57 tron Exp $ DISTNAME= phpMyAdmin-${DIST_VERSION}-php PKGNAME= phpmyadmin-2.3.3.1 +PKGREVISION= 1 CATEGORIES= databases www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=phpmyadmin/} EXTRACT_SUFX= .tar.bz2 @@ -13,16 +14,30 @@ COMMENT= Set of PHP-scripts to adminstrate MySQL over the WWW DEPENDS+= php-mysql>=4.0.5:../../databases/php4-mysql DEPENDS+= php-pcre>=4.0.5:../../devel/php4-pcre -PLIST_SUBST+= DIST_VERSION=${DIST_VERSION} -NO_BUILD= YES +PLIST_SUBST+= CP="${CP}" DIST_VERSION=${DIST_VERSION} \ + PMCONFFILE=${PMCONFFILE} TEST="${TEST}" +MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} PMCONFFILE=${PMCONFFILE} \ + PMDIR=${PMDIR} EXDIR=${EXDIR} WRKSRC= ${WRKDIR}/${DISTNAME:S/-php//} +CONF_INC_PHP= ${PREFIX}/share/phpmyadmin/config.inc.php DIST_VERSION= 2.3.3pl1 -DOC_FILES= ANNOUNCE.txt CREDITS ChangeLog Documentation.html \ +DOC_FILES= ANNOUNCE.txt CREDITS ChangeLog \ Documentation.txt INSTALL LICENSE README \ RELEASE-DATE-${DIST_VERSION} TODO +EXDIR= ${PREFIX}/share/examples/phpmyadmin +PMCONFDIR= ${PKG_SYSCONFDIR}/phpmyadmin +PMCONFFILE= ${PMCONFDIR}/config.inc.php +PMDIR= ${PREFIX}/share/phpmyadmin + +do-build: + @${SED} -e 's#@PMDIR@#${PMDIR}#g' ${FILESDIR}/phpmyadmin.conf \ + >${WRKDIR}/phpmyadmin.conf do-install: + ${INSTALL_DATA_DIR} ${PMCONFDIR} + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/phpmyadmin + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/phpmyadmin ${INSTALL_DATA_DIR} ${PREFIX}/share/phpmyadmin ${INSTALL_DATA_DIR} ${PREFIX}/share/phpmyadmin/images ${INSTALL_DATA_DIR} ${PREFIX}/share/phpmyadmin/lang @@ -32,7 +47,12 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/phpmyadmin/libraries/fpdf/font ${INSTALL_DATA_DIR} ${PREFIX}/share/phpmyadmin/libraries/xpath ${INSTALL_DATA_DIR} ${PREFIX}/share/phpmyadmin/scripts + ${RM} -f ${CONF_INC_PHP} ${INSTALL_SCRIPT} ${WRKSRC}/*.php ${PREFIX}/share/phpmyadmin + ${TEST} -f ${PMCONFFILE} || ${CP} -p ${CONF_INC_PHP} ${PMCONFFILE} + ${MV} ${CONF_INC_PHP} ${EXDIR} + ${LN} -s ${PMCONFFILE} ${CONF_INC_PHP} + ${INSTALL_DATA} ${WRKSRC}/Documentation.html ${PREFIX}/share/phpmyadmin ${INSTALL_DATA} ${WRKSRC}/badwords.txt ${PREFIX}/share/phpmyadmin ${INSTALL_DATA} ${WRKSRC}/images/*.* ${PREFIX}/share/phpmyadmin/images ${INSTALL_SCRIPT} ${WRKSRC}/lang/*.php ${PREFIX}/share/phpmyadmin/lang @@ -42,9 +62,8 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/libraries/fpdf/font/*.php ${PREFIX}/share/phpmyadmin/libraries/fpdf/font ${INSTALL_SCRIPT} ${WRKSRC}/libraries/xpath/*.php ${PREFIX}/share/phpmyadmin/libraries/xpath ${INSTALL_SCRIPT} ${WRKSRC}/scripts/*.* ${PREFIX}/share/phpmyadmin/scripts - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/phpmyadmin - for FILE in ${DOC_FILES}; do \ - ${INSTALL_DATA} ${WRKSRC}/$$FILE ${PREFIX}/share/doc/phpmyadmin; \ - done + cd ${WRKSRC}; \ + ${INSTALL_DATA} ${DOC_FILES} ${PREFIX}/share/doc/phpmyadmin + ${INSTALL_DATA} ${WRKDIR}/phpmyadmin.conf ${EXDIR} .include "../../mk/bsd.pkg.mk" diff --git a/databases/phpmyadmin/PLIST b/databases/phpmyadmin/PLIST index c901a31ce99..cf6ab359b5f 100644 --- a/databases/phpmyadmin/PLIST +++ b/databases/phpmyadmin/PLIST @@ -1,4 +1,17 @@ -@comment $NetBSD: PLIST,v 1.3 2003/01/05 14:25:18 tron Exp $ +@comment $NetBSD: PLIST,v 1.4 2003/01/12 14:04:57 tron Exp $ +share/doc/phpmyadmin/ANNOUNCE.txt +share/doc/phpmyadmin/CREDITS +share/doc/phpmyadmin/ChangeLog +share/doc/phpmyadmin/Documentation.txt +share/doc/phpmyadmin/INSTALL +share/doc/phpmyadmin/LICENSE +share/doc/phpmyadmin/README +share/doc/phpmyadmin/TODO +share/doc/phpmyadmin/RELEASE-DATE-${DIST_VERSION} +share/examples/phpmyadmin/config.inc.php +@exec ${MKDIR} ${PMCONFDIR} +@exec ${TEST} -f ${PMCONFFILE} || ${CP} -p %D/%F ${PMCONFFILE} +share/examples/phpmyadmin/phpmyadmin.conf share/phpmyadmin/lang/afrikaans-utf-8.inc.php share/phpmyadmin/lang/albanian-iso-8859-1.inc.php share/phpmyadmin/lang/albanian-utf-8.inc.php @@ -89,16 +102,7 @@ share/phpmyadmin/lang/ukrainian-utf-8.inc.php share/phpmyadmin/lang/ukrainian-windows-1251.inc.php share/phpmyadmin/lang/afrikaans-iso-8859-1.inc.php share/phpmyadmin/lang/brazilian_portuguese-iso-8859-1.inc.php -share/doc/phpmyadmin/ANNOUNCE.txt -share/doc/phpmyadmin/CREDITS -share/doc/phpmyadmin/ChangeLog -share/doc/phpmyadmin/Documentation.html -share/doc/phpmyadmin/Documentation.txt -share/doc/phpmyadmin/INSTALL -share/doc/phpmyadmin/LICENSE -share/doc/phpmyadmin/README -share/doc/phpmyadmin/TODO -share/doc/phpmyadmin/RELEASE-DATE-${DIST_VERSION} +share/phpmyadmin/Documentation.html share/phpmyadmin/badwords.txt share/phpmyadmin/db_create.php share/phpmyadmin/db_datadict.php @@ -228,4 +232,5 @@ share/phpmyadmin/scripts/remove_control_m.sh @dirrm share/phpmyadmin/libraries @dirrm share/phpmyadmin/scripts @dirrm share/phpmyadmin +@dirrm share/examples/phpmyadmin @dirrm share/doc/phpmyadmin diff --git a/databases/phpmyadmin/files/phpmyadmin.conf b/databases/phpmyadmin/files/phpmyadmin.conf new file mode 100644 index 00000000000..ad158051369 --- /dev/null +++ b/databases/phpmyadmin/files/phpmyadmin.conf @@ -0,0 +1,14 @@ +# $Header: /cvsroot/pkgsrc/databases/phpmyadmin/files/phpmyadmin.conf,v 1.1 2003/01/12 14:04:58 tron Exp $ +# +# phpmyadmin configuration file fragment for Apache + + + Alias /phpmyadmin/ "@PMDIR@/" + + + + Options Indexes + AllowOverride None + Order allow,deny + Allow from all + -- cgit v1.2.3