pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases/pgadmin3 pgadmin3: does not build against po...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1be43bf48b77
branches:  trunk
changeset: 381585:1be43bf48b77
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Jul 10 18:43:19 2022 +0000

description:
pgadmin3: does not build against postgres14

Somebody(TM) should really package pgadmin4

Fix doc option, and restrict to python 3.

Bump PKGREVISION for PLIST change for doc option.

diffstat:

 databases/pgadmin3/Makefile   |   6 ++++--
 databases/pgadmin3/PLIST      |  16 ++++------------
 databases/pgadmin3/options.mk |   6 +++---
 3 files changed, 11 insertions(+), 17 deletions(-)

diffs (101 lines):

diff -r 38f26fbc6860 -r 1be43bf48b77 databases/pgadmin3/Makefile
--- a/databases/pgadmin3/Makefile       Sun Jul 10 17:24:18 2022 +0000
+++ b/databases/pgadmin3/Makefile       Sun Jul 10 18:43:19 2022 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.77 2022/04/18 19:10:38 adam Exp $
+# $NetBSD: Makefile,v 1.78 2022/07/10 18:43:19 wiz Exp $
 
 DISTNAME=      pgadmin3-1.22.2
-PKGREVISION=   12
+PKGREVISION=   13
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_PGSQL:=pgadmin/pgadmin3/v${PKGVERSION_NOREV}/src/}
 
@@ -14,6 +14,8 @@
 USE_TOOLS+=            echo gmake sed
 GNU_CONFIGURE=         yes
 
+PGSQL_VERSIONS_ACCEPTED=       13 12 11 10
+
 GNU_CONFIGURE_WX_CONFIG=       no
 
 REPLACE_SH=            pgadmin/ver_svn.sh
diff -r 38f26fbc6860 -r 1be43bf48b77 databases/pgadmin3/PLIST
--- a/databases/pgadmin3/PLIST  Sun Jul 10 17:24:18 2022 +0000
+++ b/databases/pgadmin3/PLIST  Sun Jul 10 18:43:19 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2018/05/10 07:12:53 adam Exp $
+@comment $NetBSD: PLIST,v 1.15 2022/07/10 18:43:19 wiz Exp $
 bin/pgadmin3
 share/pgadmin3/branding/branding.ini
 share/pgadmin3/docs/cs_CZ/hints/autovacuum.html
@@ -104,7 +104,6 @@
 ${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-table.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-upgrade.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_images/status.png
-${PLIST.doc}share/pgadmin3/docs/en_US/_static/ajax-loader.gif
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/backup-2.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/backup-3.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/backup-4.png
@@ -112,16 +111,11 @@
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/backup.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/basic.css
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/classic.css
-${PLIST.doc}share/pgadmin3/docs/en_US/_static/comment-bright.png
-${PLIST.doc}share/pgadmin3/docs/en_US/_static/comment-close.png
-${PLIST.doc}share/pgadmin3/docs/en_US/_static/comment.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/connect.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/debugger.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/default.css
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/doctools.js
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/documentation_options.js
-${PLIST.doc}share/pgadmin3/docs/en_US/_static/down-pressed.png
-${PLIST.doc}share/pgadmin3/docs/en_US/_static/down.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/editgrid.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/export.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/file.png
@@ -130,8 +124,9 @@
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/gridopt-filter.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/gridopt-sort.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/guru-connect.png
-${PLIST.doc}share/pgadmin3/docs/en_US/_static/jquery-3.2.1.js
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/jquery-3.5.1.js
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/jquery.js
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/language_data.js
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/locks.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/logfile.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/main.png
@@ -197,11 +192,8 @@
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-upgrade.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/status.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/transaction.png
-${PLIST.doc}share/pgadmin3/docs/en_US/_static/underscore-1.3.1.js
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/underscore-1.13.1.js
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/underscore.js
-${PLIST.doc}share/pgadmin3/docs/en_US/_static/up-pressed.png
-${PLIST.doc}share/pgadmin3/docs/en_US/_static/up.png
-${PLIST.doc}share/pgadmin3/docs/en_US/_static/websupport.js
 ${PLIST.doc}share/pgadmin3/docs/en_US/appendices.html
 ${PLIST.doc}share/pgadmin3/docs/en_US/backup.html
 ${PLIST.doc}share/pgadmin3/docs/en_US/bugreport.html
diff -r 38f26fbc6860 -r 1be43bf48b77 databases/pgadmin3/options.mk
--- a/databases/pgadmin3/options.mk     Sun Jul 10 17:24:18 2022 +0000
+++ b/databases/pgadmin3/options.mk     Sun Jul 10 18:43:19 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2019/10/21 21:19:35 adam Exp $
+# $NetBSD: options.mk,v 1.5 2022/07/10 18:43:19 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.pgadmin3
 PKG_SUPPORTED_OPTIONS= doc
@@ -10,9 +10,9 @@
 .if !empty(PKG_OPTIONS:Mdoc)
 PLIST.doc=     yes
 PYTHON_FOR_BUILD_ONLY=yes
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+BUILD_DEPENDS+=        ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 .include "../../lang/python/pyversion.mk"
-.include "../../lang/python/versioned_dependencies.mk"
-PYTHON_VERSIONED_DEPENDENCIES= sphinx:build
 CONFIGURE_ARGS+=       --with-sphinx-build=${PREFIX}/bin/sphinx-build-${PYVERSSUFFIX}
 .else
 CONFIGURE_ENV+=                ac_cv_path_SPHINX_BUILD=



Home | Main Index | Thread Index | Old Index