[67985] trunk/dports/audio/solfege

[ryandesign at macports.org]

Revision: 67985
          http://trac.macports.org/changeset/67985
Author:   ryandesign at macports.org
Date:     2010-05-23 13:04:56 -0700 (Sun, 23 May 2010)
Log Message:
-----------
solfege: maintainer update to 3.16.3 (see #24982); indicate this is noarch

Modified Paths:
--------------
    trunk/dports/audio/solfege/Portfile
    trunk/dports/audio/solfege/files/patch-default-config.diff

Removed Paths:
-------------
    trunk/dports/audio/solfege/files/patch-src-configwindow.py.diff
    trunk/dports/audio/solfege/files/patch-src-mainwin.py.diff

Modified: trunk/dports/audio/solfege/Portfile
===================================================================
--- trunk/dports/audio/solfege/Portfile	2010-05-23 19:47:53 UTC (rev 67984)
+++ trunk/dports/audio/solfege/Portfile	2010-05-23 20:04:56 UTC (rev 67985)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                solfege
-version             3.14.9
+version             3.16.3
 categories          audio education python
 maintainers         gmail.com:allencmcbride
 description         Ear training software
@@ -27,17 +27,22 @@
 
 master_sites        sourceforge \
                     gnu
-checksums           md5     487c9df5caae642f1f0758758717e7a8 \
-                    sha1    ab25914cae6f8091f06369b16e731064f144e020 \
-                    rmd160  ea260dd56dc5aa4dffdb08c81acecc17912eac6a
 
-patchfiles          patch-default-config.diff \
-                    patch-src-mainwin.py.diff \
-                    patch-src-configwindow.py.diff
+checksums           md5     f8faabc581747582e37dea2bf14313f6 \
+                    sha1    3cc6937b5c2a418fcbac5202228b31a7f42710e0 \
+                    rmd160  3de20912e2fb35a7ab0099d8d7e7d57ae6cd8a81
 
+patchfiles          patch-default-config.diff
+
 post-patch {
     reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/default.config
 }
 
+if {[info exists supported_archs]} {
+    supported_archs noarch
+} else {
+    universal_variant no
+}
+
 configure.python    ${prefix}/bin/python2.6
 configure.pkg_config_path   ${frameworks_dir}/Python.framework/Versions/2.6/lib/pkgconfig/

Modified: trunk/dports/audio/solfege/files/patch-default-config.diff
===================================================================
--- trunk/dports/audio/solfege/files/patch-default-config.diff	2010-05-23 19:47:53 UTC (rev 67984)
+++ trunk/dports/audio/solfege/files/patch-default-config.diff	2010-05-23 20:04:56 UTC (rev 67985)
@@ -1,7 +1,7 @@
---- default.config.old	2009-03-28 01:06:19.000000000 +0100
-+++ default.config	2009-03-28 01:07:40.000000000 +0100
-@@ -65,13 +65,13 @@
- mma=mma
+--- default.config.orig	2010-05-21 22:42:10.000000000 -0400
++++ default.config	2010-05-21 22:45:00.000000000 -0400
+@@ -70,16 +70,16 @@
+ text-editor=gedit
  
  [sound]
 -type=sequencer-device
@@ -9,13 +9,17 @@
  device_file=/dev/sequencer2
  synth_number=2
 -wav_player=/usr/bin/aplay
--midi_player=/usr/bin/timidity -idqq %s
++wav_player=@PREFIX@/bin/qtplay
+ wav_player_options=
+-midi_player=/usr/bin/timidity
+-midi_player_options=-idqq %s
 -mp3_player=/usr/bin/mpg123
--ogg_player=/usr/bin/ogg123
-+wav_player=@PREFIX@/bin/qtplay
 +midi_player=@PREFIX@/bin/qtplay
++midi_player_options=
 +mp3_player=@PREFIX@/bin/qtplay
+ mp3_player_options=
+-ogg_player=/usr/bin/ogg123
 +ogg_player=@PREFIX@/bin/ogg123
+ ogg_player_options=
  
  [config]
- preferred_instrument=0

Deleted: trunk/dports/audio/solfege/files/patch-src-configwindow.py.diff
===================================================================
--- trunk/dports/audio/solfege/files/patch-src-configwindow.py.diff	2010-05-23 19:47:53 UTC (rev 67984)
+++ trunk/dports/audio/solfege/files/patch-src-configwindow.py.diff	2010-05-23 20:04:56 UTC (rev 67985)
@@ -1,15 +0,0 @@
---- src/configwindow.py.orig	2009-10-31 18:08:45.000000000 -0400
-+++ src/configwindow.py	2009-10-31 18:36:46.000000000 -0400
-@@ -288,9 +288,9 @@
-         box, category_vbox = gu.hig_category_vbox(_("Interface"))
-         page_vbox.pack_start(box, False)
- 
--        b = gu.nCheckButton('gui', 'web_browser_as_help_browser',
--            _("_Display the user manual in web browser"))
--        category_vbox.pack_start(b, False)
-+        #b = gu.nCheckButton('gui', 'web_browser_as_help_browser',
-+        #    _("_Display the user manual in web browser"))
-+        #category_vbox.pack_start(b, False)
-         self.g_mainwin_user_resizeable = gu.nCheckButton('gui',
-           'mainwin_user_resizeable', _("_Resizeable main window"))
-         category_vbox.pack_start(self.g_mainwin_user_resizeable, False)

Deleted: trunk/dports/audio/solfege/files/patch-src-mainwin.py.diff
===================================================================
--- trunk/dports/audio/solfege/files/patch-src-mainwin.py.diff	2010-05-23 19:47:53 UTC (rev 67984)
+++ trunk/dports/audio/solfege/files/patch-src-mainwin.py.diff	2010-05-23 20:04:56 UTC (rev 67985)
@@ -1,11 +0,0 @@
---- src/mainwin.py.orig	2009-10-31 18:12:58.000000000 -0400
-+++ src/mainwin.py	2009-10-31 17:58:13.000000000 -0400
-@@ -772,7 +772,7 @@
-         """
-         if not self.g_help_browser:
-             self.g_help_browser = HelpBrowser(self.m_app)
--        if self.get_bool('gui/web_browser_as_help_browser'):
-+        if True:#self.get_bool('gui/web_browser_as_help_browser'):
-             for lang in self.g_help_browser.g_docviewer.m_language, "C":
-                 filename = os.path.join(os.getcwdu(), u"help", lang, fn)
-                 if os.path.isfile(filename):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100523/9db54f05/attachment-0001.html>