Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1562820674196790"
MIME-Version: 1.0
Date: Thu, 11 Jul 2019 04:51:14 +0000
From: "Amitai Schleier" <schmonz@netbsd.org>
Subject: CVS commit: pkgsrc/audio/solfege
To: pkgsrc-changes@NetBSD.org
Reply-To: schmonz@netbsd.org
Message-Id: <20190711045114.8AE46FBF4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1562820674196790
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	schmonz
Date:		Thu Jul 11 04:51:14 UTC 2019

Modified Files:
	pkgsrc/audio/solfege: distinfo
Added Files:
	pkgsrc/audio/solfege/patches: patch-Makefile.in patch-default.config
	    patch-po_Makefile
Removed Files:
	pkgsrc/audio/solfege/patches: patch-aa patch-ab patch-ac

Log Message:
Modernize patch filenames.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/audio/solfege/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/solfege/patches/patch-Makefile.in \
    pkgsrc/audio/solfege/patches/patch-default.config \
    pkgsrc/audio/solfege/patches/patch-po_Makefile
cvs rdiff -u -r1.4 -r0 pkgsrc/audio/solfege/patches/patch-aa
cvs rdiff -u -r1.5 -r0 pkgsrc/audio/solfege/patches/patch-ab
cvs rdiff -u -r1.3 -r0 pkgsrc/audio/solfege/patches/patch-ac

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


--_----------=_1562820674196790
Content-Disposition: inline
Content-Length: 3880
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/audio/solfege/distinfo
diff -u pkgsrc/audio/solfege/distinfo:1.10 pkgsrc/audio/solfege/distinfo:1.11
--- pkgsrc/audio/solfege/distinfo:1.10	Thu Jul 11 04:45:53 2019
+++ pkgsrc/audio/solfege/distinfo	Thu Jul 11 04:51:14 2019
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2019/07/11 04:45:53 schmonz Exp $
+$NetBSD: distinfo,v 1.11 2019/07/11 04:51:14 schmonz Exp $
 
 SHA1 (solfege-3.22.2.tar.xz) = d46e67d2f64c943fbdfa3858f077b49186a60a66
 RMD160 (solfege-3.22.2.tar.xz) = 0832a8b75c913af0f7d7124b339e70a6cc82fb23
 SHA512 (solfege-3.22.2.tar.xz) = 475d2eea54d0c6b2cb11a5271a02ca64e79c45fb6155d87a01b16e826669a07cca0b4c2543cbbb1ce8d36412ccfd64e8052de1efad3db19f34d7e0a984d7459a
 Size (solfege-3.22.2.tar.xz) = 4107232 bytes
-SHA1 (patch-aa) = b8cb381b348b4e2c2201e7ab9666006b40cbd4ce
-SHA1 (patch-ab) = 24cf0755877f53bef9687019e6b493d115709347
-SHA1 (patch-ac) = 6c12696ff9e49773622263382f405a9caa8a44c9
+SHA1 (patch-Makefile.in) = 24cf0755877f53bef9687019e6b493d115709347
+SHA1 (patch-default.config) = b8cb381b348b4e2c2201e7ab9666006b40cbd4ce
+SHA1 (patch-po_Makefile) = 5c7ceec962593afc80f23aa8059c32642a456be3

Added files:

Index: pkgsrc/audio/solfege/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/audio/solfege/patches/patch-Makefile.in:1.1
--- /dev/null	Thu Jul 11 04:51:14 2019
+++ pkgsrc/audio/solfege/patches/patch-Makefile.in	Thu Jul 11 04:51:14 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-Makefile.in,v 1.1 2019/07/11 04:51:14 schmonz Exp $
+
+Avoid GNUism (from MacPorts).
+
+--- Makefile.in.orig	2013-10-05 20:57:48.000000000 +0000
++++ Makefile.in
+@@ -144,7 +144,9 @@ install-program-files: mkinstalldirs
+ 	$(INSTALL_DATA) system.rc $(DESTDIR)/$(sysconfdir)/$(PACKAGE)
+ 	$(INSTALL_DATA) solfege.desktop $(DESTDIR)/$(datadir)/applications/
+ 	for ifile in $(installfiles); do \
+-	    cp --parents $$ifile $(DESTDIR)/$(datadir)/$(PACKAGE)/; \
++	    dname=$$(dirname "$$ifile"); \
++	    $(INSTALL) -d -m 755 "$(DESTDIR)/$(datadir)/$(PACKAGE)/$$dname"; \
++	    $(INSTALL_DATA) "$$ifile" "$(DESTDIR)/$(datadir)/$(PACKAGE)/$$dname"; \
+ 	done
+ 
+ compileall:
Index: pkgsrc/audio/solfege/patches/patch-default.config
diff -u /dev/null pkgsrc/audio/solfege/patches/patch-default.config:1.1
--- /dev/null	Thu Jul 11 04:51:14 2019
+++ pkgsrc/audio/solfege/patches/patch-default.config	Thu Jul 11 04:51:14 2019
@@ -0,0 +1,24 @@
+$NetBSD: patch-default.config,v 1.1 2019/07/11 04:51:14 schmonz Exp $
+
+Configure audio players.
+
+--- default.config.orig	2013-10-05 20:57:48.000000000 +0000
++++ default.config
+@@ -79,13 +79,13 @@ text-editor=gedit
+ type=external-midiplayer
+ device_file=/dev/sequencer2
+ synth_number=2
+-wav_player=/usr/bin/aplay
++wav_player=@WAVPLAYER@
+ wav_player_options=
+-midi_player=/usr/bin/timidity
++midi_player=@MIDIPLAYER@
+ midi_player_options=-idqq %s
+-mp3_player=/usr/bin/mpg123
++mp3_player=@MP3PLAYER@
+ mp3_player_options=
+-ogg_player=/usr/bin/ogg123
++ogg_player=@OGGPLAYER@
+ ogg_player_options=
+ 
+ [config]
Index: pkgsrc/audio/solfege/patches/patch-po_Makefile
diff -u /dev/null pkgsrc/audio/solfege/patches/patch-po_Makefile:1.1
--- /dev/null	Thu Jul 11 04:51:14 2019
+++ pkgsrc/audio/solfege/patches/patch-po_Makefile	Thu Jul 11 04:51:14 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-po_Makefile,v 1.1 2019/07/11 04:51:14 schmonz Exp $
+
+Respect PKGLOCALEDIR.
+
+--- po/Makefile.orig	2013-10-05 20:57:48.000000000 +0000
++++ po/Makefile
+@@ -42,8 +42,8 @@ run-from-srcdir: $(MOFILES)
+ install-po:
+ 	echo $(POLANGUAGES)
+ 	for lang in $(POLANGUAGES); do \
+-	  mkdir -p $(DESTDIR)/$(datadir)/locale/$$lang/LC_MESSAGES; \
+-	  $(INSTALL_DATA) po/$$lang.mo $(DESTDIR)/$(datadir)/locale/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
++	  mkdir -p $(DESTDIR)${localedir}/$$lang/LC_MESSAGES; \
++	  $(INSTALL_DATA) po/$$lang.mo $(DESTDIR)${localedir}/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
+ 	done
+ 
+ uninstall-po:


--_----------=_1562820674196790--