[pkgsrc/trunk]: pkgsrc/doc Update phpMyAdmin package to 2.6.0-pl2. Changes si...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/doc Update phpMyAdmin package to 2.6.0-pl2. Changes si...
From: jdolecek <jdolecek%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 00:47:41 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/d02be31c2d54
branches:  trunk
changeset: 483029:d02be31c2d54
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Sat Nov 06 13:28:32 2004 +0000

description:
Update phpMyAdmin package to 2.6.0-pl2. Changes since 2.5.7 seem to be
only UI changes according to release announcements.

While here, introduce some package changes:
* handle config.inc.php via CONF_FILES mechanism instead of PLIST magick,
  the symlink config.inc.php -> ${PKG_SYSCONFDIR}/config.inc.php is now
  included in PLIST
* use NO_BUILD, NO_CONFIGURE
* Apache config fragment file is now installed as ${EXDIR}/apache.conf, not
  copied to ${PKG_SYSCONFDIR} and MESSAGE points to the ${EXDIR} location
* do not install any *.sh files - they are developer stuff only
* use INSTALL_DATA for all files except scripts/convertcfg.pl

diffstat:

 databases/phpmyadmin/DESCR    |   18 +-
 databases/phpmyadmin/MESSAGE  |    4 +-
 databases/phpmyadmin/Makefile |   65 +++----
 databases/phpmyadmin/PLIST    |  341 +++++++++++++++++++++++++++++++++++------
 databases/phpmyadmin/distinfo |    6 +-
 doc/CHANGES                   |    3 +-
 6 files changed, 334 insertions(+), 103 deletions(-)

diffs (truncated from 639 to 300 lines):

diff -r 8ebb886a8cde -r d02be31c2d54 databases/phpmyadmin/DESCR
--- a/databases/phpmyadmin/DESCR        Sat Nov 06 11:53:02 2004 +0000
+++ b/databases/phpmyadmin/DESCR        Sat Nov 06 13:28:32 2004 +0000
@@ -1,11 +1,13 @@
 phpMyAdmin is a tool written in PHP intended to handle the administration of 
 MySQL over the Web. Currently it can:
 
-- create and drop databases, 
-- create/drop/alter tables, 
-- delete/edit/add fields, 
-- execute any SQL statement, 
-- manage keys on fields, 
-- manage privileges,
-- export data into various formats and 
-- is available in 47 languages.
+- create and drop databases
+- create, copy, drop and alter tables
+- delete, edit and add fields
+- execute any SQL-statement, even batch-queries
+- manage keys on fields
+- load text files into tables
+- create and read dumps of tables
+- export and import CSV data
+- administer one single database as well as a whole database server
+- communicate in 47 different languages
diff -r 8ebb886a8cde -r d02be31c2d54 databases/phpmyadmin/MESSAGE
--- a/databases/phpmyadmin/MESSAGE      Sat Nov 06 11:53:02 2004 +0000
+++ b/databases/phpmyadmin/MESSAGE      Sat Nov 06 13:28:32 2004 +0000
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.6 2004/08/07 11:31:14 adrianp Exp $
+$NetBSD: MESSAGE,v 1.7 2004/11/06 13:28:32 jdolecek Exp $
 
 Do *not* edit "${PMDIR}/config.inc.php" to customize
 this package because it is a link which will removed during upgrades.
@@ -9,7 +9,7 @@
 If you are running Apache and ap-php, then you can add the following line
 to httpd.conf:
        
-       Include ${PKG_SYSCONFDIR}/phpmyadmin.conf
+       Include ${EXDIR}/apache.conf
 
 to make phpMyAdmin accessible through:
                                
diff -r 8ebb886a8cde -r d02be31c2d54 databases/phpmyadmin/Makefile
--- a/databases/phpmyadmin/Makefile     Sat Nov 06 11:53:02 2004 +0000
+++ b/databases/phpmyadmin/Makefile     Sat Nov 06 13:28:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/10/31 23:47:32 jdolecek Exp $
+# $NetBSD: Makefile,v 1.19 2004/11/06 13:28:32 jdolecek Exp $
 
 DISTNAME=      phpMyAdmin-${DIST_VERSION}
 PKGNAME=       phpmyadmin-${DIST_VERSION}
@@ -18,7 +18,7 @@
                PMDIR=${PMDIR} EXDIR=${EXDIR}
 
 CONF_INC_PHP=  ${PREFIX}/share/phpmyadmin/config.inc.php
-DIST_VERSION=  2.5.7-pl1
+DIST_VERSION=  2.6.0-pl2
 DOC_FILES=     CREDITS ChangeLog \
                Documentation.txt INSTALL LICENSE README \
                RELEASE-DATE-${DIST_VERSION} TODO
@@ -27,62 +27,59 @@
 PMCONFFILE=    ${PKG_SYSCONFDIR}/config.inc.php
 PMDIR=         ${PREFIX}/share/phpmyadmin
 NO_BUILDLINK=  YES
-CONF_FILES=    ${EXDIR}/phpmyadmin.conf ${PKG_SYSCONFDIR}/phpmyadmin.conf
+CONF_FILES=    ${EXDIR}/config.inc.php ${PKG_SYSCONFDIR}/config.inc.php
 
 USE_PKGINSTALL=                YES
 PKG_SYSCONFSUBDIR?=    phpmyadmin
 
 SUBST_CLASSES=         paths
-SUBST_STAGE.paths=     post-build
+SUBST_STAGE.paths=     post-extract
 SUBST_FILES.paths=     ${WRKDIR}/phpmyadmin.conf       
 SUBST_SED.paths=       -e "s|@PMDIR@|${PMDIR}|g"
 SUBST_MESSAGE.paths=   "Fixing paths."
 
-do-build:
+NO_BUILD=              # defined
+NO_CONFIGURE=          # defined
+
+INSTALL_DIRS=  css lang libraries libraries/auth libraries/dbg \
+               libraries/dbi libraries/export libraries/fpdf   \
+               libraries/fpdf/font libraries/transformations   \
+               themes themes/darkblue_orange \
+               themes/darkblue_orange/css themes/darkblue_orange/img \
+               themes/original themes/original/css themes/original/img
+
+pre-extract:
        @${CP} ${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} ${PMDIR}
-       ${INSTALL_DATA_DIR} ${PMDIR}/css
-       ${INSTALL_DATA_DIR} ${PMDIR}/images
-       ${INSTALL_DATA_DIR} ${PMDIR}/lang
-       ${INSTALL_DATA_DIR} ${PMDIR}/libraries
-       ${INSTALL_DATA_DIR} ${PMDIR}/libraries/auth
-       ${INSTALL_DATA_DIR} ${PMDIR}/libraries/dbg
-       ${INSTALL_DATA_DIR} ${PMDIR}/libraries/export
-       ${INSTALL_DATA_DIR} ${PMDIR}/libraries/fpdf
-       ${INSTALL_DATA_DIR} ${PMDIR}/libraries/fpdf/font
-       ${INSTALL_DATA_DIR} ${PMDIR}/libraries/transformations
+       for dir in ${INSTALL_DIRS}; do \
+               ${INSTALL_DATA_DIR} ${PMDIR}/$$dir; \
+       done
        ${INSTALL_DATA_DIR} ${PMDIR}/scripts
 
-       ${RM} -f ${CONF_INC_PHP}
-       ${INSTALL_SCRIPT} ${WRKSRC}/*.php ${PMDIR}
-       ${TEST} -f ${PMCONFFILE} || ${CP} -p ${CONF_INC_PHP} ${PMCONFFILE}
+       ${INSTALL_DATA} ${WRKSRC}/*.php ${PMDIR}
+       ${INSTALL_DATA} ${WRKSRC}/*.css ${PMDIR}
        ${MV} ${CONF_INC_PHP} ${EXDIR}
        ${LN} -s ${PMCONFFILE} ${CONF_INC_PHP}
 
        ${INSTALL_DATA} ${WRKSRC}/Documentation.html ${PMDIR}
-       ${INSTALL_DATA} ${WRKSRC}/images/*.* ${PMDIR}/images
-       ${INSTALL_SCRIPT} ${WRKSRC}/lang/*.php ${PMDIR}/lang
-       ${INSTALL_SCRIPT} ${WRKSRC}/css/*.php ${PMDIR}/css
+       ${INSTALL_DATA} ${WRKSRC}/translators.html ${PMDIR}
 
-       ${INSTALL_SCRIPT} ${WRKSRC}/libraries/*.* ${PMDIR}/libraries
-       ${INSTALL_SCRIPT} ${WRKSRC}/libraries/auth/*.php ${PMDIR}/libraries/auth
-       ${INSTALL_SCRIPT} ${WRKSRC}/libraries/dbg/*.php ${PMDIR}/libraries/dbg
-       ${INSTALL_SCRIPT} ${WRKSRC}/libraries/export/*.php \
-               ${PMDIR}/libraries/export
-       ${INSTALL_SCRIPT} ${WRKSRC}/libraries/fpdf/*.php ${PMDIR}/libraries/fpdf
-       ${INSTALL_SCRIPT} ${WRKSRC}/libraries/fpdf/font/*.php \
-               ${PMDIR}/libraries/fpdf/font
-       ${INSTALL_SCRIPT} ${WRKSRC}/libraries/transformations/*.php \
-               ${PMDIR}/libraries/transformations
-       ${INSTALL_SCRIPT} ${WRKSRC}/scripts/*.* ${PMDIR}/scripts
+       for dir in ${INSTALL_DIRS}; do                                  \
+               for file in "${WRKSRC}/$$dir"/*; do                     \
+                       ${TEST} -f "$$file" -a `${BASENAME} "$$file" .sh` = `${BASENAME} "$$file"` &&                           \
+                       ${INSTALL_DATA} $$file ${PMDIR}/$$dir;          \
+               done                                                    \
+       done
+
+       ${INSTALL_DATA} ${WRKSRC}/scripts/*.sql ${PMDIR}/scripts
+       ${INSTALL_SCRIPT} ${WRKSRC}/scripts/convertcfg.pl ${PMDIR}/scripts
 
        cd ${WRKSRC} && \
        ${INSTALL_DATA} ${DOC_FILES} ${PREFIX}/share/doc/phpmyadmin
-       ${INSTALL_DATA} ${WRKDIR}/phpmyadmin.conf ${EXDIR}
+       ${INSTALL_DATA} ${WRKDIR}/phpmyadmin.conf ${EXDIR}/apache.conf
 
 .include "../../mk/bsd.pkg.mk"
diff -r 8ebb886a8cde -r d02be31c2d54 databases/phpmyadmin/PLIST
--- a/databases/phpmyadmin/PLIST        Sat Nov 06 11:53:02 2004 +0000
+++ b/databases/phpmyadmin/PLIST        Sat Nov 06 13:28:32 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/08/07 11:31:14 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/11/06 13:28:32 jdolecek Exp $
 share/doc/phpmyadmin/CREDITS
 share/doc/phpmyadmin/ChangeLog
 share/doc/phpmyadmin/Documentation.txt
@@ -8,13 +8,18 @@
 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/examples/phpmyadmin/apache.conf
 share/phpmyadmin/Documentation.html
 share/phpmyadmin/browse_foreigners.php
+share/phpmyadmin/calendar.php
+share/phpmyadmin/changelog.php
 share/phpmyadmin/chk_rel.php
+share/phpmyadmin/config.default.php
+share/phpmyadmin/config.footer.inc.php
+share/phpmyadmin/config.header.inc.php
+share/phpmyadmin/config.inc.php
 share/phpmyadmin/css/phpmyadmin.css.php
+share/phpmyadmin/docs.css
 share/phpmyadmin/db_create.php
 share/phpmyadmin/db_datadict.php
 share/phpmyadmin/db_details.php
@@ -31,41 +36,6 @@
 share/phpmyadmin/footer.inc.php
 share/phpmyadmin/header.inc.php
 share/phpmyadmin/header_printview.inc.php
-share/phpmyadmin/images/arrow_ltr.gif
-share/phpmyadmin/images/arrow_rtl.gif
-share/phpmyadmin/images/asc_order.png
-share/phpmyadmin/images/browse.png
-share/phpmyadmin/images/button_bookmark.png
-share/phpmyadmin/images/button_browse.png
-share/phpmyadmin/images/button_drop.png
-share/phpmyadmin/images/button_edit.png
-share/phpmyadmin/images/button_empty.png
-share/phpmyadmin/images/button_fulltext.png
-share/phpmyadmin/images/button_index.png
-share/phpmyadmin/images/button_insert.png
-share/phpmyadmin/images/button_nobrowse.png
-share/phpmyadmin/images/button_nodrop.png
-share/phpmyadmin/images/button_noempty.png
-share/phpmyadmin/images/button_nofulltext.png
-share/phpmyadmin/images/button_noindex.png
-share/phpmyadmin/images/button_noprimary.png
-share/phpmyadmin/images/button_noselect.png
-share/phpmyadmin/images/button_nounique.png
-share/phpmyadmin/images/button_primary.png
-share/phpmyadmin/images/button_properties.png
-share/phpmyadmin/images/button_select.png
-share/phpmyadmin/images/button_smallbrowse.png
-share/phpmyadmin/images/button_unique.png
-share/phpmyadmin/images/desc_order.png
-share/phpmyadmin/images/fulltext.png
-share/phpmyadmin/images/item_ltr.png
-share/phpmyadmin/images/item_rtl.png
-share/phpmyadmin/images/minus.png
-share/phpmyadmin/images/partialtext.png
-share/phpmyadmin/images/plus.png
-share/phpmyadmin/images/pma_logo.png
-share/phpmyadmin/images/spacer.gif
-share/phpmyadmin/images/vertical_line.png
 share/phpmyadmin/index.php
 share/phpmyadmin/lang/afrikaans-iso-8859-1.inc.php
 share/phpmyadmin/lang/afrikaans-utf-8.inc.php
@@ -86,10 +56,10 @@
 share/phpmyadmin/lang/bulgarian-windows-1251.inc.php
 share/phpmyadmin/lang/catalan-iso-8859-1.inc.php
 share/phpmyadmin/lang/catalan-utf-8.inc.php
-share/phpmyadmin/lang/chinese_big5-utf-8.inc.php
-share/phpmyadmin/lang/chinese_big5.inc.php
-share/phpmyadmin/lang/chinese_gb-utf-8.inc.php
-share/phpmyadmin/lang/chinese_gb.inc.php
+share/phpmyadmin/lang/chinese_simplified-gb2312.inc.php
+share/phpmyadmin/lang/chinese_simplified-utf-8.inc.php
+share/phpmyadmin/lang/chinese_traditional-big5.inc.php
+share/phpmyadmin/lang/chinese_traditional-utf-8.inc.php
 share/phpmyadmin/lang/croatian-iso-8859-2.inc.php
 share/phpmyadmin/lang/croatian-utf-8.inc.php
 share/phpmyadmin/lang/croatian-windows-1250.inc.php
@@ -116,6 +86,7 @@
 share/phpmyadmin/lang/greek-iso-8859-7.inc.php
 share/phpmyadmin/lang/greek-utf-8.inc.php
 share/phpmyadmin/lang/hebrew-iso-8859-8-i.inc.php
+share/phpmyadmin/lang/hebrew-utf-8.inc.php
 share/phpmyadmin/lang/hindi-utf-8.inc.php
 share/phpmyadmin/lang/hungarian-iso-8859-2.inc.php
 share/phpmyadmin/lang/hungarian-utf-8.inc.php
@@ -126,7 +97,8 @@
 share/phpmyadmin/lang/japanese-euc.inc.php
 share/phpmyadmin/lang/japanese-sjis.inc.php
 share/phpmyadmin/lang/japanese-utf-8.inc.php
-share/phpmyadmin/lang/korean-ks_c_5601-1987.inc.php
+share/phpmyadmin/lang/korean-euc-kr.inc.php
+share/phpmyadmin/lang/korean-utf-8.inc.php
 share/phpmyadmin/lang/latvian-utf-8.inc.php
 share/phpmyadmin/lang/latvian-windows-1257.inc.php
 share/phpmyadmin/lang/lithuanian-utf-8.inc.php
@@ -143,7 +115,7 @@
 share/phpmyadmin/lang/portuguese-utf-8.inc.php
 share/phpmyadmin/lang/romanian-iso-8859-1.inc.php
 share/phpmyadmin/lang/romanian-utf-8.inc.php
-share/phpmyadmin/lang/russian-dos-866.inc.php
+share/phpmyadmin/lang/russian-cp-866.inc.php
 share/phpmyadmin/lang/russian-koi8-r.inc.php
 share/phpmyadmin/lang/russian-utf-8.inc.php
 share/phpmyadmin/lang/russian-windows-1251.inc.php
@@ -178,12 +150,14 @@
 share/phpmyadmin/libraries/charset_conversion.lib.php
 share/phpmyadmin/libraries/common.lib.php
 share/phpmyadmin/libraries/config_import.lib.php
+share/phpmyadmin/libraries/database_interface.lib.php
 share/phpmyadmin/libraries/db_config.lib.php
 share/phpmyadmin/libraries/db_table_exists.lib.php
 share/phpmyadmin/libraries/dbg/profiling.php
 share/phpmyadmin/libraries/dbg/setup.php
+share/phpmyadmin/libraries/dbi/mysql.dbi.lib.php
+share/phpmyadmin/libraries/dbi/mysqli.dbi.lib.php
 share/phpmyadmin/libraries/defines.lib.php
-share/phpmyadmin/libraries/defines_mysql.lib.php
 share/phpmyadmin/libraries/display_export.lib.php
 share/phpmyadmin/libraries/display_tbl.lib.php
 share/phpmyadmin/libraries/display_tbl_links.lib.php
@@ -191,7 +165,9 @@
 share/phpmyadmin/libraries/export/csv.php
 share/phpmyadmin/libraries/export/latex.php
 share/phpmyadmin/libraries/export/sql.php
+share/phpmyadmin/libraries/export/xls.php
 share/phpmyadmin/libraries/export/xml.php
+share/phpmyadmin/libraries/fpdf/README
 share/phpmyadmin/libraries/fpdf/font/courier.php
 share/phpmyadmin/libraries/fpdf/font/helvetica.php
 share/phpmyadmin/libraries/fpdf/font/helveticab.php
@@ -216,12 +192,13 @@
 share/phpmyadmin/libraries/kanji-encoding.lib.php
 share/phpmyadmin/libraries/left.js
 share/phpmyadmin/libraries/mysql_charsets.lib.php
-share/phpmyadmin/libraries/mysql_wrappers.lib.php
Prev by Date: [pkgsrc/trunk]: pkgsrc/x11/controlcenter Add patch from jmmv that fixes scrol...
Next by Date: [pkgsrc/trunk]: pkgsrc Move ttf2pk patches to the original sources, i.e. free...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/x11/controlcenter Add patch from jmmv that fixes scrol...
Next by Thread: [pkgsrc/trunk]: pkgsrc Move ttf2pk patches to the original sources, i.e. free...
Indexes:
Home | Main Index | Thread Index | Old Index