Received: by mail.netbsd.org (Postfix, from userid 605) id C11D584F29; Sun, 10 Jul 2022 18:43:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 070E284F27 for ; Sun, 10 Jul 2022 18:43:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id uTYwS1cYWLzd for ; Sun, 10 Jul 2022 18:43:20 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 2217384D01 for ; Sun, 10 Jul 2022 18:43:20 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1B526FB1A; Sun, 10 Jul 2022 18:43:20 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1657478600176260" MIME-Version: 1.0 Date: Sun, 10 Jul 2022 18:43:20 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/databases/pgadmin3 To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20220710184320.1B526FB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1657478600176260 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Sun Jul 10 18:43:20 UTC 2022 Modified Files: pkgsrc/databases/pgadmin3: Makefile PLIST options.mk Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 pkgsrc/databases/pgadmin3/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/databases/pgadmin3/PLIST cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/pgadmin3/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1657478600176260 Content-Disposition: inline Content-Length: 5210 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/databases/pgadmin3/Makefile diff -u pkgsrc/databases/pgadmin3/Makefile:1.77 pkgsrc/databases/pgadmin3/Makefile:1.78 --- pkgsrc/databases/pgadmin3/Makefile:1.77 Mon Apr 18 19:10:38 2022 +++ pkgsrc/databases/pgadmin3/Makefile Sun Jul 10 18:43:19 2022 @@ -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_LANGUAGES= c99 c++11 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 Index: pkgsrc/databases/pgadmin3/PLIST diff -u pkgsrc/databases/pgadmin3/PLIST:1.14 pkgsrc/databases/pgadmin3/PLIST:1.15 --- pkgsrc/databases/pgadmin3/PLIST:1.14 Thu May 10 07:12:53 2018 +++ pkgsrc/databases/pgadmin3/PLIST Sun Jul 10 18:43:19 2022 @@ -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/_i ${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/_s ${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/_s ${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/_s ${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 Index: pkgsrc/databases/pgadmin3/options.mk diff -u pkgsrc/databases/pgadmin3/options.mk:1.4 pkgsrc/databases/pgadmin3/options.mk:1.5 --- pkgsrc/databases/pgadmin3/options.mk:1.4 Mon Oct 21 21:19:35 2019 +++ pkgsrc/databases/pgadmin3/options.mk Sun Jul 10 18:43:19 2022 @@ -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 @@ PLIST_VARS= doc .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= --_----------=_1657478600176260--