[138168] trunk/dports/audio/solfege

[cal at macports.org]

Revision: 138168
          https://trac.macports.org/changeset/138168
Author:   cal at macports.org
Date:     2015-06-30 15:28:50 -0700 (Tue, 30 Jun 2015)
Log Message:
-----------
solfege: update to 3.22.2, closes #42998

Depend on librsvg, because gdk-pixbuf2 needs that to load solfege's SVG icon
but adding it as a dependency in gdk-pixbuf2 would cause a cyclic dependency.

Additionally, patch solfege's build system to avoid using the GNU cp feature
--parents.

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

Added Paths:
-----------
    trunk/dports/audio/solfege/files/patch-Makefile.in-avoid-cp-parents.diff

Removed Paths:
-------------
    trunk/dports/audio/solfege/files/patch-topdocs__FAQ.texi-texinfo-ftbfs.diff

Modified: trunk/dports/audio/solfege/Portfile
===================================================================
--- trunk/dports/audio/solfege/Portfile	2015-06-30 21:15:36 UTC (rev 138167)
+++ trunk/dports/audio/solfege/Portfile	2015-06-30 22:28:50 UTC (rev 138168)
@@ -4,11 +4,14 @@
 PortSystem          1.0
 
 name                solfege
-version             3.19.2
-revision            1
+version             3.22.2
+checksums           rmd160  35f3a7adbf30c95552e9f62ca8bc06d8f3f71065 \
+                    sha256  e46a0960c83e4998d9dcf7bb07b8269e03fc81fab6c4485f8112c5a3e6488fe4
+
 categories          audio education python
 maintainers         gmail.com:allencmcbride
 description         Ear training software
+license             GPL-3
 homepage            http://www.solfege.org/
 long_description    Solfege is a free eartraining program. The program is part \
                     of the GNU Project. One of the ideas of this program is \
@@ -21,20 +24,21 @@
 platforms           darwin
 supported_archs     noarch
 
-depends_lib         port:py27-pygtk
+# Solfege fails to load its icon without librsvg; it should be a dependency of
+# gdk-pixbuf2, but can't be because it would create a cycle. Add it here
+# instead.
+depends_lib         port:py27-pygtk \
+                    port:librsvg
+
 depends_build       port:texinfo \
                     port:pkgconfig
 depends_run         port:qtplay
 
-master_sites        sourceforge \
+master_sites        sourceforge:project/solfege/solfege-stable/${version} \
                     gnu
 
-checksums           md5     0254493d165041e843b3eba6290605fc \
-                    sha1    c78a407aa6dc5c3daafbcc3904fa77158f7b85fb \
-                    rmd160  ef06a2691d1dac04e3c4c344806dd7ca0cb78335
-
 patchfiles          patch-default-config.diff \
-                    patch-topdocs__FAQ.texi-texinfo-ftbfs.diff
+                    patch-Makefile.in-avoid-cp-parents.diff
 
 post-patch {
     reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/default.config
@@ -42,3 +46,7 @@
 
 configure.python    ${prefix}/bin/python2.7
 configure.pkg_config_path   ${frameworks_dir}/Python.framework/Versions/2.7/lib/pkgconfig/
+
+livecheck.type      regex
+livecheck.url       http://sourceforge.net/projects/${name}/files/
+livecheck.regex     /${name}-(\[0-9.\]+)${extract.suffix}

Added: trunk/dports/audio/solfege/files/patch-Makefile.in-avoid-cp-parents.diff
===================================================================
--- trunk/dports/audio/solfege/files/patch-Makefile.in-avoid-cp-parents.diff	                        (rev 0)
+++ trunk/dports/audio/solfege/files/patch-Makefile.in-avoid-cp-parents.diff	2015-06-30 22:28:50 UTC (rev 138168)
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	2015-06-30 23:44:15.000000000 +0200
++++ Makefile.in	2015-06-30 23:46:15.000000000 +0200
+@@ -144,7 +144,9 @@
+ 	$(INSTALL_DATA) system.rc $(DESTDIR)/$(sysconfdir)/$(PACKAGE)
+ 	$(INSTALL_DATA) solfege.desktop $(DESTDIR)/$(datadir)/applications/
+ 	for ifile in $(installfiles); do \
+-	    cp --parents $$ifile $(DESTDIR)/$(datadir)/$(PACKAGE)/; \
++	    dname=$$(dirname "$$ifile"); \
++	    $(INSTALL) -d -m 755 "$(DESTDIR)/$(datadir)/$(PACKAGE)/$$dname"; \
++	    $(INSTALL_DATA) "$$ifile" "$(DESTDIR)/$(datadir)/$(PACKAGE)/$$dname"; \
+ 	done
+ 
+ compileall:

Modified: trunk/dports/audio/solfege/files/patch-default-config.diff
===================================================================
--- trunk/dports/audio/solfege/files/patch-default-config.diff	2015-06-30 21:15:36 UTC (rev 138167)
+++ trunk/dports/audio/solfege/files/patch-default-config.diff	2015-06-30 22:28:50 UTC (rev 138168)
@@ -1,11 +1,7 @@
---- 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
-+type=external-midiplayer
+--- default.config	2014-10-17 20:39:30.000000000 -0400
++++ default.config	2014-10-17 20:39:35.000000000 -0400
+@@ -79,13 +79,13 @@
+ type=external-midiplayer
  device_file=/dev/sequencer2
  synth_number=2
 -wav_player=/usr/bin/aplay

Deleted: trunk/dports/audio/solfege/files/patch-topdocs__FAQ.texi-texinfo-ftbfs.diff
===================================================================
--- trunk/dports/audio/solfege/files/patch-topdocs__FAQ.texi-texinfo-ftbfs.diff	2015-06-30 21:15:36 UTC (rev 138167)
+++ trunk/dports/audio/solfege/files/patch-topdocs__FAQ.texi-texinfo-ftbfs.diff	2015-06-30 22:28:50 UTC (rev 138168)
@@ -1,16 +0,0 @@
-Patch originates at https://bugzilla.redhat.com/attachment.cgi?id=702157
-Upstream-Status: Backport [https://code.google.com/p/solfege/issues/detail?id=268]
-
-Index: solfege-3.20.7/topdocs/FAQ.texi
-===================================================================
---- ./topdocs/FAQ.texi
-+++ ./topdocs/FAQ.texi
-@@ -4,6 +4,8 @@
- @node Top, , , (dir)
- @top
- 
-+ at chapter FAQ
-+
- See also @url{http://www.solfege.org/Solfege/FrequentlyAskedQuestions}
- 
- @section The window title does not display non-ascii characters
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150630/9ff0a507/attachment.html>