CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Thu, 1 Jun 2023 16:28:17 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jun  1 16:28:16 UTC 2023

Modified Files:
        pkgsrc/meta-pkgs/bulk-small: Makefile
        pkgsrc/meta-pkgs/netbsd-www: Makefile
        pkgsrc/meta-pkgs/texlive-collection-fontutils: Makefile
        pkgsrc/print/a2ps: Makefile
        pkgsrc/print/apsfilter: Makefile
        pkgsrc/textproc/groff: Makefile options.mk

Log Message:
*: switch to py-pspdfutils instead of psutils


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/meta-pkgs/bulk-small/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/meta-pkgs/netbsd-www/Makefile
cvs rdiff -u -r1.15 -r1.16 \
    pkgsrc/meta-pkgs/texlive-collection-fontutils/Makefile
cvs rdiff -u -r1.100 -r1.101 pkgsrc/print/a2ps/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/print/apsfilter/Makefile
cvs rdiff -u -r1.97 -r1.98 pkgsrc/textproc/groff/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/groff/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/meta-pkgs/bulk-small/Makefile
diff -u pkgsrc/meta-pkgs/bulk-small/Makefile:1.32 pkgsrc/meta-pkgs/bulk-small/Makefile:1.33
--- pkgsrc/meta-pkgs/bulk-small/Makefile:1.32   Tue Jun 28 11:34:45 2022
+++ pkgsrc/meta-pkgs/bulk-small/Makefile        Thu Jun  1 16:28:16 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2022/06/28 11:34:45 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2023/06/01 16:28:16 wiz Exp $
 
-DISTNAME=      bulk-small-20210613
-PKGREVISION=   1
+DISTNAME=      bulk-small-20230601
 CATEGORIES=    meta-pkgs
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -15,6 +14,8 @@ RESTRICTED=           Just for test build purpose
 NO_BIN_ON_CDROM=       ${RESTRICTED}
 NO_BIN_ON_FTP=         ${RESTRICTED}
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
 #
 # Note: The purpose of this package is to produce a small set of the
 # most generally useful packages in a short time. On a fast build
@@ -74,7 +75,7 @@ BUILD_DEPENDS+=       pkgin-[0-9]*:../../pkgto
 BUILD_DEPENDS+=        enscript-[0-9]*:../../print/enscript
 BUILD_DEPENDS+=        ghostscript-gpl-[0-9]*:../../print/ghostscript-gpl
 BUILD_DEPENDS+=        papersize-[0-9]*:../../print/papersize
-BUILD_DEPENDS+=        psutils-[0-9]*:../../print/psutils
+BUILD_DEPENDS+=        ${PYPKGPREFIX}-pypspdfutils-[0-9]*:../../print/py-pspdfutils
 BUILD_DEPENDS+=        sudo-[0-9]*:../../security/sudo
 BUILD_DEPENDS+=        stunnel-[0-9]*:../../security/stunnel
 BUILD_DEPENDS+=        bash-[0-9]*:../../shells/bash
@@ -168,5 +169,5 @@ BUILD_DEPENDS+=     libgpg-error-[0-9]*:../.
 BUILD_DEPENDS+=        libtasn1-[0-9]*:../../security/libtasn1 # required by gnutls
 BUILD_DEPENDS+=        nettle-[0-9]*:../../security/nettle     # required by gnutls
 
-
+.include "../../lang/python/pyversion.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/meta-pkgs/netbsd-www/Makefile
diff -u pkgsrc/meta-pkgs/netbsd-www/Makefile:1.42 pkgsrc/meta-pkgs/netbsd-www/Makefile:1.43
--- pkgsrc/meta-pkgs/netbsd-www/Makefile:1.42   Tue Jun 28 11:34:46 2022
+++ pkgsrc/meta-pkgs/netbsd-www/Makefile        Thu Jun  1 16:28:16 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2022/06/28 11:34:46 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2023/06/01 16:28:16 wiz Exp $
 
-DISTNAME=      netbsd-www-1.10
-PKGREVISION=   5
+DISTNAME=      netbsd-www-1.11
 CATEGORIES=    meta-pkgs
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -19,7 +18,7 @@ DEPENDS+=     dvipsk-[0-9]*:../../print/dvip
 DEPENDS+=      libxslt>=1.0.20:../../textproc/libxslt
 DEPENDS+=      netbsd-doc-print>=1.4:../../meta-pkgs/netbsd-doc-print
 DEPENDS+=      opensp>=1.1:../../textproc/opensp
-DEPENDS+=      psutils>=1.17:../../print/psutils
+DEPENDS+=      ${PYPKGPREFIX}-pypspdfutils-[0-9]*:../../print/py-pspdfutils
 DEPENDS+=      fig2dev-[0-9]*:../../print/fig2dev
 DEPENDS+=      w3m>=0.4:../../www/w3m
 DEPENDS+=      xplanet>=1.2.0nb3:../../x11/xplanet
@@ -28,4 +27,7 @@ USE_TOOLS+=   perl:run ps2pdf:run
 
 META_PACKAGE=  yes
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
+.include "../../lang/python/pyversion.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/meta-pkgs/texlive-collection-fontutils/Makefile
diff -u pkgsrc/meta-pkgs/texlive-collection-fontutils/Makefile:1.15 pkgsrc/meta-pkgs/texlive-collection-fontutils/Makefile:1.16
--- pkgsrc/meta-pkgs/texlive-collection-fontutils/Makefile:1.15 Tue Apr 11 03:22:23 2023
+++ pkgsrc/meta-pkgs/texlive-collection-fontutils/Makefile      Thu Jun  1 16:28:16 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2023/04/11 03:22:23 markd Exp $
+# $NetBSD: Makefile,v 1.16 2023/06/01 16:28:16 wiz Exp $
 
 DISTNAME=      collection-fontutils
 PKGNAME=       texlive-${DISTNAME}-2023
@@ -27,10 +27,13 @@ DEPENDS+=   tex-luafindfont-[0-9]*:../../f
 DEPENDS+=      tex-mf2pt1-[0-9]*:../../fonts/tex-mf2pt1
 DEPENDS+=      ps2eps-[0-9]*:../../graphics/ps2eps
 DEPENDS+=      ps2pkm-[0-9]*:../../fonts/ps2pkm
-DEPENDS+=      psutils-[0-9]*:../../print/psutils
+DEPENDS+=      ${PYPKGPREFIX}-pypspdfutils-[0-9]*:../../print/py-pspdfutils
 DEPENDS+=      t1utils-[0-9]*:../../fonts/t1utils
 DEPENDS+=      tex-ttfutils-[0-9]*:../../fonts/tex-ttfutils
 
 META_PACKAGE=  yes
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
+.include "../../lang/python/pyversion.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/a2ps/Makefile
diff -u pkgsrc/print/a2ps/Makefile:1.100 pkgsrc/print/a2ps/Makefile:1.101
--- pkgsrc/print/a2ps/Makefile:1.100    Sat Apr 15 05:01:48 2023
+++ pkgsrc/print/a2ps/Makefile  Thu Jun  1 16:28:16 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.100 2023/04/15 05:01:48 wiz Exp $
+# $NetBSD: Makefile,v 1.101 2023/06/01 16:28:16 wiz Exp $
 
 DISTNAME=              a2ps-4.15.4
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            print
 MASTER_SITES=          ${MASTER_SITE_GNU:=a2ps/}
 
@@ -10,7 +10,7 @@ HOMEPAGE=             https://www.gnu.org/software/
 COMMENT=               Formats an ascii file for printing on a postscript printer
 LICENSE=               gnu-gpl-v3
 
-DEPENDS+=              psutils>=1.17:../../print/psutils
+DEPENDS+=              ${PYPKGPREFIX}-pypspdfutils-[0-9]*:../../print/py-pspdfutils
 
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
@@ -24,6 +24,8 @@ CONFIGURE_ENV+=               file_prog=${FILE_CMD:Q}
 
 INFO_FILES=            yes
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
 CFLAGS.Darwin+=                -flat_namespace
 
 EGDIR=                 ${PREFIX}/share/examples/a2ps
@@ -43,6 +45,7 @@ pre-build:
 post-install:
        cd ${DESTDIR}${PKG_SYSCONFDIR} && ${MV} a2ps-site.cfg a2ps.cfg ${DESTDIR}${PREFIX}/share/examples/a2ps
 
+.include "../../lang/python/pyversion.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/boehm-gc/buildlink3.mk"
 .include "../../devel/gperf/buildlink3.mk"

Index: pkgsrc/print/apsfilter/Makefile
diff -u pkgsrc/print/apsfilter/Makefile:1.36 pkgsrc/print/apsfilter/Makefile:1.37
--- pkgsrc/print/apsfilter/Makefile:1.36        Mon Nov  4 19:57:58 2019
+++ pkgsrc/print/apsfilter/Makefile     Thu Jun  1 16:28:16 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2019/11/04 19:57:58 rillig Exp $
+# $NetBSD: Makefile,v 1.37 2023/06/01 16:28:16 wiz Exp $
 
 DISTNAME=      apsfilter-7.2.8
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    print
 #MASTER_SITES= http://www.apsfilter.org/download/
 
@@ -16,7 +16,7 @@ DEPENDS+=     fig2dev-[0-9]*:../../print/fig
 DEPENDS+=      jpeg>=6b:../../graphics/jpeg
 DEPENDS+=      netpbm>=9.7nb1:../../graphics/netpbm
 DEPENDS+=      a2ps-[0-9]*:../../print/a2ps
-DEPENDS+=      psutils-[0-9]*:../../print/psutils
+DEPENDS+=      ${PYPKGPREFIX}-pypspdfutils-[0-9]*:../../print/py-pspdfutils
 
 WRKSRC=                ${WRKDIR}/apsfilter
 HAS_CONFIGURE= YES
@@ -38,4 +38,7 @@ SUBST_FILES.prefix=   bin/apsfilter.in SET
 SUBST_SED.prefix=      -e 's,/usr/local,${LOCALBASE},g'
 SUBST_SED.prefix+=     -e 's,/usr/X11R6,${X11BASE},g'
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
+.include "../../lang/python/pyversion.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/groff/Makefile
diff -u pkgsrc/textproc/groff/Makefile:1.97 pkgsrc/textproc/groff/Makefile:1.98
--- pkgsrc/textproc/groff/Makefile:1.97 Tue Jun 28 11:36:10 2022
+++ pkgsrc/textproc/groff/Makefile      Thu Jun  1 16:28:16 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.97 2022/06/28 11:36:10 wiz Exp $
+# $NetBSD: Makefile,v 1.98 2023/06/01 16:28:16 wiz Exp $
 
 DISTNAME=      groff-1.22.4
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GNU:=groff/}
 

Index: pkgsrc/textproc/groff/options.mk
diff -u pkgsrc/textproc/groff/options.mk:1.9 pkgsrc/textproc/groff/options.mk:1.10
--- pkgsrc/textproc/groff/options.mk:1.9        Mon Apr  1 16:48:37 2019
+++ pkgsrc/textproc/groff/options.mk    Thu Jun  1 16:28:16 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2019/04/01 16:48:37 ryoon Exp $
+# $NetBSD: options.mk,v 1.10 2023/06/01 16:28:16 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.groff
 PKG_SUPPORTED_OPTIONS= groff-docs x11
@@ -8,9 +8,12 @@ PKG_SUGGESTED_OPTIONS= groff-docs x11
 
 .if !empty(PKG_OPTIONS:Mgroff-docs)
 DEPENDS+=              netpbm>=10.0:../../graphics/netpbm
-DEPENDS+=              psutils>=1.17:../../print/psutils
+DEPENDS+=              ${PYPKGPREFIX}-pypspdfutils-[0-9]*:../../print/py-pspdfutils
 USE_TOOLS+=            gs:run
 PLIST_SRC+=            PLIST.docs
+
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+.include "../../lang/python/pyversion.mk"
 .else
 CONFIGURE_ENV+=                with_doc=no
 .endif

Prev by Date: CVS commit: pkgsrc/print/psutils
Next by Date: CVS commit: pkgsrc
Previous by Thread: CVS commit: pkgsrc/print/psutils
Next by Thread: CVS commit: pkgsrc
Indexes:

Home | Main Index | Thread Index | Old Index