CVS commit: pkgsrc/print/pmw

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Sat Aug 16 09:15:35 UTC 2025

Modified Files:
        pkgsrc/print/pmw: Makefile PLIST distinfo
        pkgsrc/print/pmw/patches: patch-Makefile.in
Removed Files:
        pkgsrc/print/pmw: MESSAGE

Log Message:
Update pmw to 5.32

Code overhaul and four years of fixes and improvements.

Breaking change:
- The features for inserting literal PostScript have been removed

Highlights:
- generate PDF by default
- OpenType version of the PMW-Music font included
- -includefont removed as no longer necessary

Full changelog at:
https://github.com/PhilipHazel/pmw/blob/pmw-5.32/doc/ChangeLog


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 pkgsrc/print/pmw/MESSAGE
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/pmw/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/pmw/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/print/pmw/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/pmw/patches/patch-Makefile.in

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

Modified files:

Index: pkgsrc/print/pmw/Makefile
diff -u pkgsrc/print/pmw/Makefile:1.5 pkgsrc/print/pmw/Makefile:1.6
--- pkgsrc/print/pmw/Makefile:1.5       Sat Aug  7 13:39:05 2021
+++ pkgsrc/print/pmw/Makefile   Sat Aug 16 09:15:35 2025
@@ -1,26 +1,29 @@
-# $NetBSD: Makefile,v 1.5 2021/08/07 13:39:05 prlw1 Exp $
+# $NetBSD: Makefile,v 1.6 2025/08/16 09:15:35 prlw1 Exp $
 
-DISTNAME=      pmw-4.51
+DISTNAME=      pmw-5.32
 CATEGORIES=    print
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=PhilipHazel/}
+GITHUB_RELEASE=        ${DISTNAME}
 
 MAINTAINER=    prlw1%cam.ac.uk@localhost
-HOMEPAGE=      http://people.ds.cam.ac.uk/ph10/pmw.html
+HOMEPAGE=      https://philiphazel.github.io/pmw/
 COMMENT=       High quality music typesetting program
 LICENSE=       gnu-gpl-v2
 
 GNU_CONFIGURE= yes
+USE_TOOLS+=    autoconf gmake
 
 BUILD_TARGET=  build
 
-SPECPDF=       ${PREFIX}/share/doc/pmw/spec.pdf
-MESSAGE_SUBST+=        SPECPDF=${SPECPDF}
-MESSAGE_SUBST+=        GS=${PREFIX}/bin/gs
-MESSAGE_SUBST+=        BINDIR=${PREFIX}/bin
-MESSAGE_SUBST+=        DATADIR=${PREFIX}/share/pmw
-MESSAGE_SUBST+=        MANDIR=${PREFIX}/${PKGMANDIR}
-
 INSTALLATION_DIRS+=    share/doc/${PKGBASE}
+
+CONFIGURE_ARGS+=       --enable-musicxml
+CONFIGURE_ARGS+=       --enable-pdf-default
+
+pre-configure:
+       cd ${WRKSRC} && autoconf
+
 post-install:
-       ${INSTALL_DATA} ${WRKSRC}/doc/spec.pdf ${DESTDIR}${SPECPDF}
+       ${INSTALL_DATA} ${WRKSRC}/doc/spec.pdf ${DESTDIR}${PREFIX}/share/doc/pmw/spec.pdf
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/pmw/PLIST
diff -u pkgsrc/print/pmw/PLIST:1.2 pkgsrc/print/pmw/PLIST:1.3
--- pkgsrc/print/pmw/PLIST:1.2  Sat Aug  7 13:39:05 2021
+++ pkgsrc/print/pmw/PLIST      Sat Aug 16 09:15:35 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2021/08/07 13:39:05 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.3 2025/08/16 09:15:35 prlw1 Exp $
 bin/pmw
 man/man1/pmw.1
 share/doc/pmw/spec.pdf
@@ -46,5 +46,10 @@ share/pmw/fontmetrics/Utopia-Italic.afm
 share/pmw/fontmetrics/Utopia-Regular.afm
 share/pmw/fontmetrics/ZapfChancery-MediumItalic.afm
 share/pmw/fontmetrics/ZapfDingbats.afm
-share/pmw/psfonts/PMW-Alpha
+share/pmw/macros/FigBass
+share/pmw/macros/Fingering
+share/pmw/macros/StdMacs
+share/pmw/psfonts/PMW-Alpha.otf
+share/pmw/psfonts/PMW-Alpha.pfa
+share/pmw/psfonts/PMW-Music.otf
 share/pmw/psfonts/PMW-Music.pfa

Index: pkgsrc/print/pmw/distinfo
diff -u pkgsrc/print/pmw/distinfo:1.8 pkgsrc/print/pmw/distinfo:1.9
--- pkgsrc/print/pmw/distinfo:1.8       Tue Oct 26 11:12:13 2021
+++ pkgsrc/print/pmw/distinfo   Sat Aug 16 09:15:35 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 11:12:13 nia Exp $
+$NetBSD: distinfo,v 1.9 2025/08/16 09:15:35 prlw1 Exp $
 
-BLAKE2s (pmw-4.51.tar.gz) = 8e6b42f18f2426a852c37ec045c74a49146ea9ab271842f80214dd61b4abf282
-SHA512 (pmw-4.51.tar.gz) = 70b85e57464cec234f937e7ff3524ae1c4d4a63ee2f32b55816c5764ce8f29bd910725e7f851fb5de7a41eda3d88b8ad383a2906a7e29dd0f4f5d580d76d1c5f
-Size (pmw-4.51.tar.gz) = 2241739 bytes
-SHA1 (patch-Makefile.in) = 287f7ed907797b42b65d95af7a2798970aec8698
+BLAKE2s (pmw-5.32.tar.gz) = af0863cceab2eae5f5ec8f857715abc4aa4186879e4dd51cc63faa4ac75f8853
+SHA512 (pmw-5.32.tar.gz) = f334017d6d95fce67dc26b5a0278d9bd4670a617e156936f2d6ad3e3810fa9b00f2abdf1851687c60c6d90587b489dedb1ddef768e91bfafb8d84530a4863822
+Size (pmw-5.32.tar.gz) = 2196382 bytes
+SHA1 (patch-Makefile.in) = fb06bd88f4be3d416d4afc530b06a1a9d8a10723

Index: pkgsrc/print/pmw/patches/patch-Makefile.in
diff -u pkgsrc/print/pmw/patches/patch-Makefile.in:1.2 pkgsrc/print/pmw/patches/patch-Makefile.in:1.3
--- pkgsrc/print/pmw/patches/patch-Makefile.in:1.2      Fri Apr  1 12:36:41 2016
+++ pkgsrc/print/pmw/patches/patch-Makefile.in  Sat Aug 16 09:15:35 2025
@@ -1,20 +1,20 @@
-$NetBSD: patch-Makefile.in,v 1.2 2016/04/01 12:36:41 jperkin Exp $
+$NetBSD: patch-Makefile.in,v 1.3 2025/08/16 09:15:35 prlw1 Exp $
 
 Move message to MESSAGE.
 
---- Makefile.in.orig   2014-02-08 14:24:01.000000000 +0000
+--- Makefile.in.orig   2025-06-25 14:14:35.000000000 +0000
 +++ Makefile.in
-@@ -14,7 +14,7 @@ INSTALL_DATA = @INSTALL_DATA@
- 
- BINDIR=$(DESTDIR)@prefix@/bin
- DATADIR=$(DESTDIR)@prefix@/share/pmw
--MANDIR=$(DESTDIR)@prefix@/man
-+MANDIR=$(DESTDIR)@prefix@/${PKGMANDIR}
+@@ -19,7 +19,7 @@ INSTALL_DATA = @INSTALL_DATA@
+ # deb, ...). Do not remove!
+ BINDIR=$(DESTDIR)/@prefix@/bin
+ DATADIR=$(DESTDIR)/@prefix@/share/pmw
+-MANDIR=$(DESTDIR)/@prefix@/man
++MANDIR=$(DESTDIR)/@prefix@/$(PKGMANDIR)
  
  # BINDIR is the directory in which the pmw command is installed.
  # DATADIR is the directory in which the fontmetrics, the PostScript fonts,
-@@ -65,7 +65,6 @@ install:        build
-               $(INSTALL_DATA) psfonts/PMW-Alpha $(DATADIR)/psfonts
+@@ -81,7 +81,6 @@ install:        build
+               $(INSTALL_DATA) psfonts/PMW-Alpha.otf $(DATADIR)/psfonts
                $(INSTALL_DATA) fontmetrics/* $(DATADIR)/fontmetrics
                $(INSTALL_DATA) doc/pmw.1 $(MANDIR)/man1
 -              ./post-install "$(BINDIR)" "$(DATADIR)" "$(MANDIR)"