PLIST-related fixes:

* Avoid building OSS support (this could be an option if anyone really cares)
* compile all .py into .pyc at install time (from joerg)

This doesn't address the PR about PKGLOCALEDIR on e.g. Solaris, but
in the meantime it should fix other bulk builds. Bump PKGREVISION.

5 files changed, 127 insertions, 3 deletions

diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index c48c26db2de..6e66ea4e6d1 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2007/05/13 13:02:42 schmonz Exp $
+# $NetBSD: Makefile,v 1.13 2007/06/20 18:45:38 schmonz Exp $
 #
 
 DISTNAME=		solfege-3.8.0
+PKGREVISION=		1
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=solfege/}
 
@@ -16,6 +17,7 @@ USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--disable-oss-sound
 CONFIGURE_ARGS+=	--disable-pygtk-test
 CONFIGURE_ARGS+=	--enable-docbook-stylesheet=${LOCALBASE}/share/xsl/docbook/html/chunk.xsl
 
@@ -23,6 +25,7 @@ USE_TOOLS+=		gmake gm4 makeinfo pkg-config msgfmt
 
 PYTHON_VERSIONS_ACCEPTED=	24 23
 PYTHON_PATCH_SCRIPTS=	*.py *.py.in */*.py */*.py.in
+PYCOMPILEALL=		${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
 
 SUBST_CLASSES+=		sound
 SUBST_STAGE.sound=	do-configure
@@ -48,6 +51,11 @@ MIDIPLAYER=	${LOCALBASE}/bin/qtplay
 DEPENDS+=	qtplay-[0-9]*:../../audio/qtplay
 .endif
 
+post-install:
+	${PYTHONBIN} ${PYCOMPILEALL} ${PREFIX}/share/solfege/mpd \
+		${PREFIX}/share/solfege/soundcard \
+		${PREFIX}/share/solfege/src
+
 .include "../../lang/python/application.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
diff --git a/audio/solfege/PLIST b/audio/solfege/PLIST
index 13bb4d26b0e..f9333161bd3 100644
--- a/audio/solfege/PLIST
+++ b/audio/solfege/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2007/05/13 13:02:42 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/06/20 18:45:39 schmonz Exp $
 bin/lessonfile_editor
 bin/solfege
 man/man1/lessonfile_editor.1
@@ -811,93 +811,180 @@ share/solfege/lesson-files/two-prog-root
 share/solfege/lesson-files/volkslieder1
 share/solfege/lesson-files/volkslieder2
 share/solfege/mpd/__init__.py
+share/solfege/mpd/__init__.pyc
 share/solfege/mpd/_exceptions.py
+share/solfege/mpd/_exceptions.pyc
 share/solfege/mpd/const.py
+share/solfege/mpd/const.pyc
 share/solfege/mpd/duration.py
+share/solfege/mpd/duration.pyc
 share/solfege/mpd/engravers.py
+share/solfege/mpd/engravers.pyc
 share/solfege/mpd/interval.py
+share/solfege/mpd/interval.pyc
 share/solfege/mpd/mfutils.py
+share/solfege/mpd/mfutils.pyc
 share/solfege/mpd/mpdutils.py
+share/solfege/mpd/mpdutils.pyc
 share/solfege/mpd/musicalpitch.py
+share/solfege/mpd/musicalpitch.pyc
 share/solfege/mpd/musicdisplayer.py
+share/solfege/mpd/musicdisplayer.pyc
 share/solfege/mpd/parser.py
+share/solfege/mpd/parser.pyc
 share/solfege/mpd/rat.py
+share/solfege/mpd/rat.pyc
 share/solfege/mpd/requests.py
+share/solfege/mpd/requests.pyc
 share/solfege/mpd/track.py
+share/solfege/mpd/track.pyc
 share/solfege/solfege.gtkrc
 share/solfege/soundcard/__init__.py
+share/solfege/soundcard/__init__.pyc
 share/solfege/soundcard/fakesynth.py
+share/solfege/soundcard/fakesynth.pyc
 share/solfege/soundcard/midifilesynth.py
+share/solfege/soundcard/midifilesynth.pyc
 share/solfege/soundcard/oss_common.py
+share/solfege/soundcard/oss_common.pyc
 share/solfege/soundcard/oss_sequencer.py
+share/solfege/soundcard/oss_sequencer.pyc
 share/solfege/soundcard/oss_sequencer2.py
+share/solfege/soundcard/oss_sequencer2.pyc
 share/solfege/soundcard/solfege_c_midi.py
+share/solfege/soundcard/solfege_c_midi.pyc
 share/solfege/soundcard/soundcardexceptions.py
+share/solfege/soundcard/soundcardexceptions.pyc
 share/solfege/soundcard/synth_common.py
+share/solfege/soundcard/synth_common.pyc
 share/solfege/soundcard/winsynth.py
+share/solfege/soundcard/winsynth.pyc
 share/solfege/src/__init__.py
+share/solfege/src/__init__.pyc
 share/solfege/src/abstract.py
+share/solfege/src/abstract.pyc
 share/solfege/src/app.py
+share/solfege/src/app.pyc
 share/solfege/src/cfg.py
+share/solfege/src/cfg.pyc
 share/solfege/src/chord.py
+share/solfege/src/chord.pyc
 share/solfege/src/chordvoicing.py
+share/solfege/src/chordvoicing.pyc
 share/solfege/src/compareintervals.py
+share/solfege/src/compareintervals.pyc
 share/solfege/src/configureoutput.py
+share/solfege/src/configureoutput.pyc
 share/solfege/src/configwindow.py
+share/solfege/src/configwindow.pyc
 share/solfege/src/const.py
+share/solfege/src/const.pyc
 share/solfege/src/dataparser.py
+share/solfege/src/dataparser.pyc
 share/solfege/src/dictation.py
+share/solfege/src/dictation.pyc
 share/solfege/src/docviewer.py
+share/solfege/src/docviewer.pyc
 share/solfege/src/elembuilder.py
+share/solfege/src/elembuilder.pyc
 share/solfege/src/example.py
+share/solfege/src/example.pyc
 share/solfege/src/exceptiondialog.py
+share/solfege/src/exceptiondialog.pyc
 share/solfege/src/gethomedir.py
+share/solfege/src/gethomedir.pyc
 share/solfege/src/gpath.py
+share/solfege/src/gpath.pyc
 share/solfege/src/gu.py
+share/solfege/src/gu.pyc
 share/solfege/src/harmonicinterval.py
+share/solfege/src/harmonicinterval.pyc
 share/solfege/src/harmonicprogressiondictation.py
+share/solfege/src/harmonicprogressiondictation.pyc
 share/solfege/src/helpbrowser.py
+share/solfege/src/helpbrowser.pyc
 share/solfege/src/history.py
+share/solfege/src/history.pyc
 share/solfege/src/htmlwidget.py
+share/solfege/src/htmlwidget.pyc
 share/solfege/src/i18n.py
+share/solfege/src/i18n.pyc
 share/solfege/src/idbyname.py
+share/solfege/src/idbyname.pyc
 share/solfege/src/identifybpm.py
+share/solfege/src/identifybpm.pyc
 share/solfege/src/idtone.py
+share/solfege/src/idtone.pyc
 share/solfege/src/inputwidgets.py
+share/solfege/src/inputwidgets.pyc
 share/solfege/src/instrumentselector.py
+share/solfege/src/instrumentselector.pyc
 share/solfege/src/languages.py
+share/solfege/src/languages.pyc
 share/solfege/src/learning_tree_editor.py
+share/solfege/src/learning_tree_editor.pyc
 share/solfege/src/lessonfile.py
+share/solfege/src/lessonfile.pyc
 share/solfege/src/lessonfile_editor_main.py
+share/solfege/src/lessonfile_editor_main.pyc
 share/solfege/src/lessonfilegui.py
+share/solfege/src/lessonfilegui.pyc
 share/solfege/src/mainwin.py
+share/solfege/src/mainwin.pyc
 share/solfege/src/melodicinterval.py
+share/solfege/src/melodicinterval.pyc
 share/solfege/src/multipleintervalconfigwidget.py
+share/solfege/src/multipleintervalconfigwidget.pyc
 share/solfege/src/nameinterval.py
+share/solfege/src/nameinterval.pyc
 share/solfege/src/notenamespinbutton.py
+share/solfege/src/notenamespinbutton.pyc
 share/solfege/src/osutils.py
+share/solfege/src/osutils.pyc
 share/solfege/src/pmwiki.py
+share/solfege/src/pmwiki.pyc
 share/solfege/src/reportbug.py
+share/solfege/src/reportbug.pyc
 share/solfege/src/reportlib.py
+share/solfege/src/reportlib.pyc
 share/solfege/src/rhythm.py
+share/solfege/src/rhythm.pyc
 share/solfege/src/rhythmtapping.py
+share/solfege/src/rhythmtapping.pyc
 share/solfege/src/rhythmtapping2.py
+share/solfege/src/rhythmtapping2.pyc
 share/solfege/src/runtime.py
+share/solfege/src/runtime.pyc
 share/solfege/src/singanswer.py
+share/solfege/src/singanswer.pyc
 share/solfege/src/singchord.py
+share/solfege/src/singchord.pyc
 share/solfege/src/singinterval.py
+share/solfege/src/singinterval.pyc
 share/solfege/src/specialwidgets.py
+share/solfege/src/specialwidgets.pyc
 share/solfege/src/statistics.py
+share/solfege/src/statistics.pyc
 share/solfege/src/statisticsviewer.py
+share/solfege/src/statisticsviewer.pyc
 share/solfege/src/stock.py
+share/solfege/src/stock.pyc
 share/solfege/src/tracebackwindow.py
+share/solfege/src/tracebackwindow.pyc
 share/solfege/src/trainingsetdlg.py
+share/solfege/src/trainingsetdlg.pyc
 share/solfege/src/tree.py
+share/solfege/src/tree.pyc
 share/solfege/src/tuner.py
+share/solfege/src/tuner.pyc
 share/solfege/src/twelvetone.py
+share/solfege/src/twelvetone.pyc
 share/solfege/src/utils.py
+share/solfege/src/utils.pyc
 share/solfege/src/uuid.py
+share/solfege/src/uuid.pyc
 share/solfege/src/xrandom.py
+share/solfege/src/xrandom.pyc
 share/solfege/themes/svg/chord-voicing.svg
 share/solfege/themes/svg/chord.svg
 share/solfege/themes/svg/happyface.svg
diff --git a/audio/solfege/distinfo b/audio/solfege/distinfo
index 2526b4613b6..f2f5263bf2b 100644
--- a/audio/solfege/distinfo
+++ b/audio/solfege/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.6 2007/05/13 13:02:42 schmonz Exp $
+$NetBSD: distinfo,v 1.7 2007/06/20 18:45:39 schmonz Exp $
 
 SHA1 (solfege-3.8.0.tar.gz) = 3ad5e03db5cae744fa8826c12efc22679be4d5c4
 RMD160 (solfege-3.8.0.tar.gz) = 435358a763f8c45f66ce841d62ace349270d0287
 Size (solfege-3.8.0.tar.gz) = 2543125 bytes
 SHA1 (patch-aa) = 86e7d473659f347bb63bc0b9b20809d93002748d
+SHA1 (patch-ab) = 0a70ece552c5810df9c469c15310b542938a3d98
+SHA1 (patch-ac) = b6cc2f5b5c460768f360724a1feb7144de329c22
diff --git a/audio/solfege/patches/patch-ab b/audio/solfege/patches/patch-ab
new file mode 100644
index 00000000000..d82c9e379c3
--- /dev/null
+++ b/audio/solfege/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.3 2007/06/20 18:45:39 schmonz Exp $
+
+--- Makefile.in.orig	2007-05-10 05:21:46.000000000 -0400
++++ Makefile.in
+@@ -25,6 +25,7 @@ export datadir:=@datadir@
+ export sysconfdir:=@sysconfdir@
+ export libdir:=@libdir@
+ export mandir:=@mandir@
++export localedir:=@localedir@
+ export CC:=@CC@
+ export CFLAGS:=@CFLAGS@
+ export RSVG:=@RSVG@
diff --git a/audio/solfege/patches/patch-ac b/audio/solfege/patches/patch-ac
new file mode 100644
index 00000000000..cc72ca6d8ed
--- /dev/null
+++ b/audio/solfege/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2007/06/20 18:45:39 schmonz Exp $
+
+--- po/Makefile.orig	2007-05-10 05:21:47.000000000 -0400
++++ po/Makefile
+@@ -49,8 +49,8 @@ dist-po:
+ 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: