[pkgsrc/trunk]: pkgsrc/audio/solfege Install the config file under share/exam...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f7a042600733
branches:  trunk
changeset: 506296:f7a042600733
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Fri Jan 13 21:23:42 2006 +0000

description:
Install the config file under share/examples/solfege and use
CONF_FILES to copy it into ${PKG_SYSCONFDIR}, instead of letting
the package install it directly there. Bump PKGREVISION. This
should fix the CHECK_FILES error found in Krister's bulk build.

diffstat:

 audio/solfege/Makefile         |   8 +++++++-
 audio/solfege/PLIST            |   4 +++-
 audio/solfege/distinfo         |   3 ++-
 audio/solfege/patches/patch-ab |  13 +++++++++++++
 4 files changed, 25 insertions(+), 3 deletions(-)

diffs (74 lines):

diff -r 90facaa657ee -r f7a042600733 audio/solfege/Makefile
--- a/audio/solfege/Makefile    Fri Jan 13 21:23:00 2006 +0000
+++ b/audio/solfege/Makefile    Fri Jan 13 21:23:42 2006 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/12/28 02:08:19 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2006/01/13 21:23:42 schmonz Exp $
 #
 
 DISTNAME=              solfege-3.0.5
+PKGREVISION=           1
 CATEGORIES=            audio
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=solfege/}
 
@@ -21,6 +22,11 @@
 PYTHON_VERSIONS_ACCEPTED=      24 23
 PYTHON_PATCH_SCRIPTS=  *.py *.py.in */*.py */*.py.in
 
+CONF_FILES=            ${PREFIX}/share/examples/solfege/system.rc
+CONF_FILES+=           ${PKG_SYSCONFDIR}/solfege
+
+INSTALLATION_DIRS=     share/examples/solfege
+
 .include "../../lang/python/application.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 90facaa657ee -r f7a042600733 audio/solfege/PLIST
--- a/audio/solfege/PLIST       Fri Jan 13 21:23:00 2006 +0000
+++ b/audio/solfege/PLIST       Fri Jan 13 21:23:42 2006 +0000
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/12/28 02:08:19 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/01/13 21:23:42 schmonz Exp $
 bin/lessonfile_editor
 bin/solfege
 man/man1/lessonfile_editor.1
 man/man1/solfege.1
 share/applications/solfege.desktop
+share/examples/solfege/system.rc
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/solfege.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/solfege.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/solfege.mo
@@ -508,3 +509,4 @@
 @dirrm share/solfege/feta
 @dirrm share/solfege/example-lesson-files
 @dirrm share/solfege
+@dirrm share/examples/solfege
diff -r 90facaa657ee -r f7a042600733 audio/solfege/distinfo
--- a/audio/solfege/distinfo    Fri Jan 13 21:23:00 2006 +0000
+++ b/audio/solfege/distinfo    Fri Jan 13 21:23:42 2006 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/12/28 02:08:19 schmonz Exp $
+$NetBSD: distinfo,v 1.2 2006/01/13 21:23:42 schmonz Exp $
 
 SHA1 (solfege-3.0.5.tar.gz) = 9d9449239749cfc25d0cef95f75a9935597e5c79
 RMD160 (solfege-3.0.5.tar.gz) = ef4ac68c0aa7783f5253817b0537208aa2698e9f
 Size (solfege-3.0.5.tar.gz) = 831996 bytes
 SHA1 (patch-aa) = aed03ee233649212f28bd928742fedd8bdb41ded
+SHA1 (patch-ab) = d1562e510bda90255c712bdd19c194fd703e7ae5
diff -r 90facaa657ee -r f7a042600733 audio/solfege/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/solfege/patches/patch-ab    Fri Jan 13 21:23:42 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2006/01/13 21:23:42 schmonz Exp $
+
+--- Makefile.in.orig   2005-12-07 15:25:15.000000000 -0500
++++ Makefile.in
+@@ -112,7 +112,7 @@ install: all mkinstalldirs install-po in
+       $(INSTALL_DATA) solfege.1 $(DESTDIR)/$(mandir)/man1
+       $(INSTALL_DATA) lessonfile_editor.1 $(DESTDIR)/$(mandir)/man1
+       
+-      $(INSTALL_DATA) system.rc $(DESTDIR)/$(sysconfdir)/$(PACKAGE)
++      $(INSTALL_DATA) system.rc $(DESTDIR)/$(datadir)/examples/$(PACKAGE)
+       $(INSTALL_DATA) solfege.desktop $(DESTDIR)/$(datadir)/applications/
+       $(PYTHON) tools/pcopy.py $(installfiles) $(DESTDIR)/$(datadir)/$(PACKAGE)/
+