[pkgsrc/trunk]: pkgsrc/audio/solfege As suggested by jlam, use INSTALL_MAKE_F...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3270afd01b74
branches:  trunk
changeset: 506306:3270afd01b74
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Fri Jan 13 23:34:53 2006 +0000

description:
As suggested by jlam, use INSTALL_MAKE_FLAGS to override the install-time
value of sysconfdir without patching. Ride the previous PKGREVISION bump.

diffstat:

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

diffs (69 lines):

diff -r 331b2dc386e0 -r 3270afd01b74 audio/solfege/Makefile
--- a/audio/solfege/Makefile    Fri Jan 13 23:09:39 2006 +0000
+++ b/audio/solfege/Makefile    Fri Jan 13 23:34:53 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/01/13 21:23:42 schmonz Exp $
+# $NetBSD: Makefile,v 1.3 2006/01/13 23:34:53 schmonz Exp $
 #
 
 DISTNAME=              solfege-3.0.5
@@ -22,10 +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
+EGDIR=                 ${PREFIX}/share/examples/solfege
+CONF_FILES=            ${EGDIR}/${PKGBASE}/solfege ${PKG_SYSCONFDIR}/solfege
+INSTALL_MAKE_FLAGS=    ${MAKE_FLAGS} sysconfdir=${EGDIR:Q}
 
-INSTALLATION_DIRS=     share/examples/solfege
+INSTALLATION_DIRS=     ${EGDIR}
 
 .include "../../lang/python/application.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
diff -r 331b2dc386e0 -r 3270afd01b74 audio/solfege/PLIST
--- a/audio/solfege/PLIST       Fri Jan 13 23:09:39 2006 +0000
+++ b/audio/solfege/PLIST       Fri Jan 13 23:34:53 2006 +0000
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2006/01/13 21:23:42 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/01/13 23:34:53 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
+share/examples/solfege/solfege
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/solfege.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/solfege.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/solfege.mo
diff -r 331b2dc386e0 -r 3270afd01b74 audio/solfege/distinfo
--- a/audio/solfege/distinfo    Fri Jan 13 23:09:39 2006 +0000
+++ b/audio/solfege/distinfo    Fri Jan 13 23:34:53 2006 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.2 2006/01/13 21:23:42 schmonz Exp $
+$NetBSD: distinfo,v 1.3 2006/01/13 23:34:53 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 331b2dc386e0 -r 3270afd01b74 audio/solfege/patches/patch-ab
--- a/audio/solfege/patches/patch-ab    Fri Jan 13 23:09:39 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$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)/
-