pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2016Q2]: pkgsrc/databases/phpmyadmin Pullup ticket #5077 - req...
details: https://anonhg.NetBSD.org/pkgsrc/rev/070d85249aec
branches: pkgsrc-2016Q2
changeset: 408867:070d85249aec
user: bsiegert <bsiegert%pkgsrc.org@localhost>
date: Tue Aug 09 18:39:13 2016 +0000
description:
Pullup ticket #5077 - requested by nils
databases/phpmyadmin: bugfix
Revisions pulled up:
- databases/phpmyadmin/Makefile 1.149
- databases/phpmyadmin/PLIST 1.43
---
Module Name: pkgsrc
Committed By: nils
Date: Mon Aug 8 09:04:26 UTC 2016
Modified Files:
pkgsrc/databases/phpmyadmin: Makefile PLIST
Log Message:
Fix PR pkg/51364.
This is not the suggested fix, but Makefile should be easier to read
this way.
diffstat:
databases/phpmyadmin/Makefile | 287 +-----------------------------
databases/phpmyadmin/PLIST | 382 +++++++++++++++++++++++++++++++++++++++++-
2 files changed, 397 insertions(+), 272 deletions(-)
diffs (truncated from 910 to 300 lines):
diff -r f6200303cb58 -r 070d85249aec databases/phpmyadmin/Makefile
--- a/databases/phpmyadmin/Makefile Fri Jul 29 16:35:38 2016 +0000
+++ b/databases/phpmyadmin/Makefile Tue Aug 09 18:39:13 2016 +0000
@@ -1,4 +1,7 @@
-# $NetBSD: Makefile,v 1.148 2016/06/28 13:32:35 taca Exp $
+# $NetBSD: Makefile,v 1.148.2.1 2016/08/09 18:39:13 bsiegert Exp $
+
+# When updating this package, please check there is no
+# new INSTALL_DIRS to add. Remember pkg/51364 ;)
DISTNAME= phpMyAdmin-${DIST_VERSION}-all-languages
PKGNAME= phpmyadmin-${DIST_VERSION:S/-//}
@@ -10,7 +13,9 @@
HOMEPAGE= http://www.phpmyadmin.net/
COMMENT= Set of PHP-scripts to adminstrate MySQL over the WWW
LICENSE= gnu-gpl-v2
+PKGREVISION= 1
+USE_TOOLS+= pax bash
DEPENDS+= ${PHP_PKG_PREFIX}-bz2>=5.3.0:../../archivers/php-bz2
DEPENDS+= ${PHP_PKG_PREFIX}-zip>=5.3.0:../../archivers/php-zip
DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=5.3.0:../../archivers/php-zlib
@@ -29,7 +34,8 @@
CONF_INC_PHP= ${PREFIX}/share/phpmyadmin/config.inc.php
DIST_VERSION= 4.6.3
-DOC_FILES= ChangeLog LICENSE README RELEASE-DATE-${DIST_VERSION}
+DOC_FILES= ChangeLog LICENSE README RELEASE-DATE-${DIST_VERSION} \
+ CONTRIBUTING.md DCO
APACHE_USER?= www
APACHE_GROUP?= www
@@ -57,270 +63,22 @@
${PMDIR} ${PMDIR}/scripts
INSTALL_DIRS= doc/html
-INSTALL_DIRS+= doc/html/_static
INSTALL_DIRS+= js
-INSTALL_DIRS+= js/canvg
-INSTALL_DIRS+= js/codemirror
-INSTALL_DIRS+= js/codemirror/addon
-INSTALL_DIRS+= js/codemirror/addon/hint
-INSTALL_DIRS+= js/codemirror/addon/runmode
-INSTALL_DIRS+= js/codemirror/lib
-INSTALL_DIRS+= js/codemirror/mode
-INSTALL_DIRS+= js/codemirror/mode/sql
-INSTALL_DIRS+= js/jqplot
-INSTALL_DIRS+= js/jqplot/plugins
-INSTALL_DIRS+= js/jquery
-INSTALL_DIRS+= js/jquery/src
-INSTALL_DIRS+= js/jquery/src/jquery
-INSTALL_DIRS+= js/jquery/src/jquery-ui
-INSTALL_DIRS+= js/jquery/src/jquery/ajax
-INSTALL_DIRS+= js/openlayers
-INSTALL_DIRS+= js/openlayers/img
-INSTALL_DIRS+= js/openlayers/src
-INSTALL_DIRS+= js/openlayers/src/openlayers
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/Firebug
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/Gears
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Control
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Feature
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Filter
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Format
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Format/ArcXML
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetDomain
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetRecords
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Format/Filter
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Format/GML
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSContext
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Format/SLD
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Format/SOSCapabilities
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Format/WFST
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Format/WMC
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSDescribeLayer
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Format/WMTSCapabilities
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Geometry
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Handler
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Lang
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Layer
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Layer/Google
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Layer/MapServer
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Layer/Vector
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Layer/WMS
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Marker
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Popup
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Protocol
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Protocol/SOS
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Protocol/SQL
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Renderer
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Request
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Strategy
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Tile
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/OpenLayers/Tile/Image
-INSTALL_DIRS+= js/openlayers/src/openlayers/lib/Rico
-INSTALL_DIRS+= js/openlayers/theme
-INSTALL_DIRS+= js/openlayers/theme/default
-INSTALL_DIRS+= js/openlayers/theme/default/img
-INSTALL_DIRS+= js/pmd
-INSTALL_DIRS+= js/tracekit
-INSTALL_DIRS+= js/transformations
INSTALL_DIRS+= libraries
-INSTALL_DIRS+= libraries/PHPExcel
-INSTALL_DIRS+= libraries/PHPExcel/PHPExcel
-INSTALL_DIRS+= libraries/PHPExcel/PHPExcel/CachedObjectStorage
-INSTALL_DIRS+= libraries/PHPExcel/PHPExcel/Calculation
-INSTALL_DIRS+= libraries/PHPExcel/PHPExcel/Cell
-INSTALL_DIRS+= libraries/PHPExcel/PHPExcel/Reader
-INSTALL_DIRS+= libraries/PHPExcel/PHPExcel/Reader/Excel2007
-INSTALL_DIRS+= libraries/PHPExcel/PHPExcel/Reader/Excel5
-INSTALL_DIRS+= libraries/PHPExcel/PHPExcel/RichText
-INSTALL_DIRS+= libraries/PHPExcel/PHPExcel/Shared
-INSTALL_DIRS+= libraries/PHPExcel/PHPExcel/Shared/Escher
-INSTALL_DIRS+= libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer
-INSTALL_DIRS+= libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer
-INSTALL_DIRS+= libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer
-INSTALL_DIRS+= libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer
-INSTALL_DIRS+= libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE
-INSTALL_DIRS+= libraries/PHPExcel/PHPExcel/Shared/JAMA
-INSTALL_DIRS+= libraries/PHPExcel/PHPExcel/Shared/JAMA/utils
-INSTALL_DIRS+= libraries/PHPExcel/PHPExcel/Shared/OLE
-INSTALL_DIRS+= libraries/PHPExcel/PHPExcel/Shared/OLE/PPS
-INSTALL_DIRS+= libraries/PHPExcel/PHPExcel/Shared/PCLZip
-INSTALL_DIRS+= libraries/PHPExcel/PHPExcel/Shared/trend
-INSTALL_DIRS+= libraries/PHPExcel/PHPExcel/Style
-INSTALL_DIRS+= libraries/PHPExcel/PHPExcel/Worksheet
-INSTALL_DIRS+= libraries/PHPExcel/PHPExcel/Worksheet/Drawing
-INSTALL_DIRS+= libraries/PHPExcel/PHPExcel/Writer
-INSTALL_DIRS+= libraries/PHPExcel/PHPExcel/Writer/Excel2007
-INSTALL_DIRS+= libraries/auth
-INSTALL_DIRS+= libraries/auth/swekey
-INSTALL_DIRS+= libraries/bfShapeFiles
-INSTALL_DIRS+= libraries/chart
-INSTALL_DIRS+= libraries/chart/pChart
-INSTALL_DIRS+= libraries/chart/pChart/fonts
-INSTALL_DIRS+= libraries/config
-INSTALL_DIRS+= libraries/dbi
-INSTALL_DIRS+= libraries/engines
-INSTALL_DIRS+= libraries/export
-INSTALL_DIRS+= libraries/gis
-INSTALL_DIRS+= libraries/import
-INSTALL_DIRS+= libraries/import/upload
-INSTALL_DIRS+= libraries/navigation
-INSTALL_DIRS+= libraries/navigation/Nodes
-INSTALL_DIRS+= libraries/php-gettext
-INSTALL_DIRS+= libraries/phpseclib/Crypt
-INSTALL_DIRS+= libraries/plugins
-INSTALL_DIRS+= libraries/plugins/auth
-INSTALL_DIRS+= libraries/plugins/auth/swekey
-INSTALL_DIRS+= libraries/plugins/export
-INSTALL_DIRS+= libraries/plugins/import
-INSTALL_DIRS+= libraries/plugins/import/upload
-INSTALL_DIRS+= libraries/plugins/schema
-INSTALL_DIRS+= libraries/plugins/schema/dia
-INSTALL_DIRS+= libraries/plugins/schema/eps
-INSTALL_DIRS+= libraries/plugins/schema/pdf
-INSTALL_DIRS+= libraries/plugins/schema/svg
-INSTALL_DIRS+= libraries/plugins/transformations
-INSTALL_DIRS+= libraries/plugins/transformations/abstract
-INSTALL_DIRS+= libraries/plugins/transformations/input
-INSTALL_DIRS+= libraries/plugins/transformations/output
-INSTALL_DIRS+= libraries/properties
-INSTALL_DIRS+= libraries/properties/options
-INSTALL_DIRS+= libraries/properties/options/groups
-INSTALL_DIRS+= libraries/properties/options/items
-INSTALL_DIRS+= libraries/properties/plugins
-INSTALL_DIRS+= libraries/rte
-INSTALL_DIRS+= libraries/schema
-INSTALL_DIRS+= libraries/tcpdf
-INSTALL_DIRS+= libraries/tcpdf/cache
-INSTALL_DIRS+= libraries/tcpdf/config
-INSTALL_DIRS+= libraries/tcpdf/config/lang
-INSTALL_DIRS+= libraries/tcpdf/fonts
-INSTALL_DIRS+= libraries/tcpdf/fonts/dejavu-fonts-ttf-2.32
-INSTALL_DIRS+= libraries/tcpdf/fonts/dejavu-fonts-ttf-2.33
-INSTALL_DIRS+= libraries/tcpdf/include
-INSTALL_DIRS+= libraries/transformations
INSTALL_DIRS+= locale
-INSTALL_DIRS+= locale/ar
-INSTALL_DIRS+= locale/ar/LC_MESSAGES
-INSTALL_DIRS+= locale/az
-INSTALL_DIRS+= locale/az/LC_MESSAGES
-INSTALL_DIRS+= locale/be
-INSTALL_DIRS+= locale/be/LC_MESSAGES
-INSTALL_DIRS+= locale/be@latin
-INSTALL_DIRS+= locale/be@latin/LC_MESSAGES
-INSTALL_DIRS+= locale/bg
-INSTALL_DIRS+= locale/bg/LC_MESSAGES
-INSTALL_DIRS+= locale/bn
-INSTALL_DIRS+= locale/bn/LC_MESSAGES
-INSTALL_DIRS+= locale/ca
-INSTALL_DIRS+= locale/ca/LC_MESSAGES
-INSTALL_DIRS+= locale/cs
-INSTALL_DIRS+= locale/cs/LC_MESSAGES
-INSTALL_DIRS+= locale/da
-INSTALL_DIRS+= locale/da/LC_MESSAGES
-INSTALL_DIRS+= locale/de
-INSTALL_DIRS+= locale/de/LC_MESSAGES
-INSTALL_DIRS+= locale/el
-INSTALL_DIRS+= locale/el/LC_MESSAGES
-INSTALL_DIRS+= locale/en_GB
-INSTALL_DIRS+= locale/en_GB/LC_MESSAGES
-INSTALL_DIRS+= locale/es
-INSTALL_DIRS+= locale/es/LC_MESSAGES
-INSTALL_DIRS+= locale/et
-INSTALL_DIRS+= locale/et/LC_MESSAGES
-INSTALL_DIRS+= locale/fi
-INSTALL_DIRS+= locale/fi/LC_MESSAGES
-INSTALL_DIRS+= locale/fr
-INSTALL_DIRS+= locale/fr/LC_MESSAGES
-INSTALL_DIRS+= locale/gl
-INSTALL_DIRS+= locale/gl/LC_MESSAGES
-INSTALL_DIRS+= locale/hi
-INSTALL_DIRS+= locale/hi/LC_MESSAGES
-INSTALL_DIRS+= locale/hr
-INSTALL_DIRS+= locale/hr/LC_MESSAGES
-INSTALL_DIRS+= locale/hu
-INSTALL_DIRS+= locale/hu/LC_MESSAGES
-INSTALL_DIRS+= locale/ia
-INSTALL_DIRS+= locale/ia/LC_MESSAGES
-INSTALL_DIRS+= locale/id
-INSTALL_DIRS+= locale/id/LC_MESSAGES
-INSTALL_DIRS+= locale/it
-INSTALL_DIRS+= locale/it/LC_MESSAGES
-INSTALL_DIRS+= locale/ja
-INSTALL_DIRS+= locale/ja/LC_MESSAGES
-INSTALL_DIRS+= locale/ka
-INSTALL_DIRS+= locale/ka/LC_MESSAGES
-INSTALL_DIRS+= locale/ko
-INSTALL_DIRS+= locale/ko/LC_MESSAGES
-INSTALL_DIRS+= locale/lt
-INSTALL_DIRS+= locale/lt/LC_MESSAGES
-INSTALL_DIRS+= locale/mn
-INSTALL_DIRS+= locale/mn/LC_MESSAGES
-INSTALL_DIRS+= locale/nb
-INSTALL_DIRS+= locale/nb/LC_MESSAGES
-INSTALL_DIRS+= locale/nl
-INSTALL_DIRS+= locale/nl/LC_MESSAGES
-INSTALL_DIRS+= locale/pl
-INSTALL_DIRS+= locale/pl/LC_MESSAGES
-INSTALL_DIRS+= locale/pt/LC_MESSAGES
-INSTALL_DIRS+= locale/pt_BR
-INSTALL_DIRS+= locale/pt_BR/LC_MESSAGES
-INSTALL_DIRS+= locale/ro
-INSTALL_DIRS+= locale/ro/LC_MESSAGES
-INSTALL_DIRS+= locale/ru
-INSTALL_DIRS+= locale/ru/LC_MESSAGES
-INSTALL_DIRS+= locale/si
-INSTALL_DIRS+= locale/si/LC_MESSAGES
-INSTALL_DIRS+= locale/sk
-INSTALL_DIRS+= locale/sk/LC_MESSAGES
-INSTALL_DIRS+= locale/sl
-INSTALL_DIRS+= locale/sl/LC_MESSAGES
-INSTALL_DIRS+= locale/sr
-INSTALL_DIRS+= locale/sr/LC_MESSAGES
-INSTALL_DIRS+= locale/sr@latin
-INSTALL_DIRS+= locale/sr@latin/LC_MESSAGES
-INSTALL_DIRS+= locale/sv
-INSTALL_DIRS+= locale/sv/LC_MESSAGES
-INSTALL_DIRS+= locale/tr
-INSTALL_DIRS+= locale/tr/LC_MESSAGES
-INSTALL_DIRS+= locale/uk
-INSTALL_DIRS+= locale/uk/LC_MESSAGES
-INSTALL_DIRS+= locale/uz
-INSTALL_DIRS+= locale/uz/LC_MESSAGES
-INSTALL_DIRS+= locale/uz@latin
-INSTALL_DIRS+= locale/uz@latin/LC_MESSAGES
-INSTALL_DIRS+= locale/zh_CN
-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+= templates
INSTALL_DIRS+= themes
-INSTALL_DIRS+= themes/original
-INSTALL_DIRS+= themes/original/css
-INSTALL_DIRS+= themes/original/img
-INSTALL_DIRS+= themes/original/img/pmd
-INSTALL_DIRS+= themes/original/jquery
-INSTALL_DIRS+= themes/original/jquery/images
-INSTALL_DIRS+= themes/pmahomme
-INSTALL_DIRS+= themes/pmahomme/css
-INSTALL_DIRS+= themes/pmahomme/img
-INSTALL_DIRS+= themes/pmahomme/img/pmd
-INSTALL_DIRS+= themes/pmahomme/jquery
-INSTALL_DIRS+= themes/pmahomme/jquery/images
.for dir in $(INSTALL_DIRS)
INSTALLATION_DIRS+= ${PMDIR}/${dir}
.endfor
Home |
Main Index |
Thread Index |
Old Index