diff options
| author | schmonz <schmonz@pkgsrc.org> | 2006-01-13 23:34:53 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2006-01-13 23:34:53 +0000 |
| commit | 2f32a7112c99c9a16873cc2a37118b6dadb8bd03 (patch) | |
| tree | c555270c84514f148b258198051f5d33bd78d8f5 /audio/solfege | |
| parent | a5023743e8fb7a9dd2226c2c7afdb47531ef96ba (diff) | |
| download | pkgsrc-2f32a7112c99c9a16873cc2a37118b6dadb8bd03.tar.gz | |
As suggested by jlam, use INSTALL_MAKE_FLAGS to override the install-time
value of sysconfdir without patching. Ride the previous PKGREVISION bump.
Diffstat (limited to 'audio/solfege')
| -rw-r--r-- | audio/solfege/Makefile | 9 | ||||
| -rw-r--r-- | audio/solfege/PLIST | 4 | ||||
| -rw-r--r-- | audio/solfege/distinfo | 3 | ||||
| -rw-r--r-- | audio/solfege/patches/patch-ab | 13 |
4 files changed, 8 insertions, 21 deletions
diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile index 94100864929..3d7e0ade80a 100644 --- a/audio/solfege/Makefile +++ b/audio/solfege/Makefile @@ -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 @@ USE_MAKEINFO= yes 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 --git a/audio/solfege/PLIST b/audio/solfege/PLIST index d10820a0873..9693f15b771 100644 --- a/audio/solfege/PLIST +++ b/audio/solfege/PLIST @@ -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 --git a/audio/solfege/distinfo b/audio/solfege/distinfo index 80bd445f59a..a1c70b716b1 100644 --- a/audio/solfege/distinfo +++ b/audio/solfege/distinfo @@ -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 --git a/audio/solfege/patches/patch-ab b/audio/solfege/patches/patch-ab deleted file mode 100644 index 2bee589771f..00000000000 --- a/audio/solfege/patches/patch-ab +++ /dev/null @@ -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)/ - |