- Update to 3.4.2

PR:		ports/103141
Submitted by:	KATO Tsuguru <tkato432(at)yahoo.com>

3 files changed, 16 insertions, 19 deletions

diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index 51fbc565a41..f340337d5ae 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	solfege
-PORTVERSION=	3.4.0
+PORTVERSION=	3.4.2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,10 +19,6 @@ COMMENT=	Free eartraining software
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		swig:${PORTSDIR}/devel/swig13 \
 		${STYLESHEET}:${PORTSDIR}/textproc/docbook-xsl
-.if defined(PACKAGE_BUILDING)
-BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT} \
-		${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
-.endif
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix pygnomeextras
@@ -40,6 +36,15 @@ MAN1=		lessonfile_editor.1 solfege.1
 
 STYLESHEET=	${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl
 
+.if defined(PACKAGE_BUILDING)
+BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT} \
+		${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
+.else
+.if !defined(DISPLAY) || ${DISPLAY} == ""
+IGNORE=		Requires an active X session (and DISPLAY variable).  Please compile this while running X.
+.endif
+.endif
+
 post-patch:
 	@${GREP} -lR "/usr/bin/python" ${WRKSRC} | ${XARGS} \
 		${REINPLACE_CMD} -e 's|/usr/bin/python|${SETENV} python|g'
diff --git a/audio/solfege/distinfo b/audio/solfege/distinfo
index dc18bcfa655..d3b2c388d16 100644
--- a/audio/solfege/distinfo
+++ b/audio/solfege/distinfo
@@ -1,3 +1,3 @@
-MD5 (solfege-3.4.0.tar.gz) = 3ad55716c6914c0d702feef3ab830a85
-SHA256 (solfege-3.4.0.tar.gz) = d7a1e6f41be18da10289d725832f8270c36a6218977e7840b87cbdc5699aa159
-SIZE (solfege-3.4.0.tar.gz) = 1546772
+MD5 (solfege-3.4.2.tar.gz) = 1c09eadb4686bd0f19b102dce05f8a75
+SHA256 (solfege-3.4.2.tar.gz) = a6a8f086f011c1b1075c6da07ee5125adbb63ec0476f1e5ca26debf4f227a920
+SIZE (solfege-3.4.2.tar.gz) = 1515532
diff --git a/audio/solfege/pkg-plist b/audio/solfege/pkg-plist
index 04cd48831ae..49f0d144058 100644
--- a/audio/solfege/pkg-plist
+++ b/audio/solfege/pkg-plist
@@ -137,9 +137,6 @@ share/gnome/solfege/graphics/test-sound.png
 share/gnome/solfege/graphics/twelve-tone.png
 share/gnome/solfege/help/C/apb.html
 share/gnome/solfege/help/C/bug-reporting.html
-share/gnome/solfege/help/C/ch03s02.html
-share/gnome/solfege/help/C/ch03s03.html
-share/gnome/solfege/help/C/ch03s04.html
 share/gnome/solfege/help/C/chord-module.html
 share/gnome/solfege/help/C/chord.html
 share/gnome/solfege/help/C/compareintervals-module.html
@@ -191,11 +188,6 @@ share/gnome/solfege/help/C/ly/scale-mixolydian-bebop.png
 share/gnome/solfege/help/C/ly/scale-mixolydian.png
 share/gnome/solfege/help/C/ly/scale-phrygian.png
 share/gnome/solfege/help/C/ly/theory-intervals-1.png
-share/gnome/solfege/help/C/ly/theory-intervals-2.png
-share/gnome/solfege/help/C/ly/theory-intervals-3.png
-share/gnome/solfege/help/C/ly/theory-intervals-4.png
-share/gnome/solfege/help/C/ly/theory-intervals-5.png
-share/gnome/solfege/help/C/ly/theory-intervals-6.png
 share/gnome/solfege/help/C/ly/theory-intervals-fifths-1.png
 share/gnome/solfege/help/C/ly/theory-intervals-fifths-2.png
 share/gnome/solfege/help/C/ly/theory-intervals-fifths.png
@@ -206,8 +198,6 @@ share/gnome/solfege/help/C/ly/theory-intervals-seconds-3.png
 share/gnome/solfege/help/C/ly/theory-intervals-seconds.png
 share/gnome/solfege/help/C/ly/theory-intervals-sevenths.png
 share/gnome/solfege/help/C/ly/theory-intervals-sixths.png
-share/gnome/solfege/help/C/ly/theory-intervals-thirds-1.png
-share/gnome/solfege/help/C/ly/theory-intervals-thirds-2.png
 share/gnome/solfege/help/C/ly/theory-intervals-thirds.png
 share/gnome/solfege/help/C/melodicinterval.html
 share/gnome/solfege/help/C/melodicintervals-module.html
@@ -227,7 +217,6 @@ share/gnome/solfege/help/C/singinterval-module.html
 share/gnome/solfege/help/C/singinterval.html
 share/gnome/solfege/help/C/solfege-exercise-helps.html
 share/gnome/solfege/help/C/solfege-intro.html
-share/gnome/solfege/help/C/theory-intervals.html
 share/gnome/solfege/help/C/twelvetone.html
 share/gnome/solfege/help/C/welcome.html
 share/gnome/solfege/help/fr/apb.html
@@ -460,6 +449,7 @@ share/gnome/solfege/lesson-files/harmonic-intervals
 share/gnome/solfege/lesson-files/harmonic-intervals-10
 share/gnome/solfege/lesson-files/harmonic-intervals-2
 share/gnome/solfege/lesson-files/harmonic-intervals-2-3
+share/gnome/solfege/lesson-files/harmonic-intervals-2-to-8
 share/gnome/solfege/lesson-files/harmonic-intervals-3
 share/gnome/solfege/lesson-files/harmonic-intervals-4-5
 share/gnome/solfege/lesson-files/harmonic-intervals-4-5-8
@@ -486,6 +476,7 @@ share/gnome/solfege/lesson-files/melodic-intervals
 share/gnome/solfege/lesson-files/melodic-intervals-10
 share/gnome/solfege/lesson-files/melodic-intervals-2
 share/gnome/solfege/lesson-files/melodic-intervals-2-3
+share/gnome/solfege/lesson-files/melodic-intervals-2-to-8
 share/gnome/solfege/lesson-files/melodic-intervals-2int-2-3
 share/gnome/solfege/lesson-files/melodic-intervals-3
 share/gnome/solfege/lesson-files/melodic-intervals-4-5
@@ -499,6 +490,7 @@ share/gnome/solfege/lesson-files/melodic-intervals-down
 share/gnome/solfege/lesson-files/melodic-intervals-down-10
 share/gnome/solfege/lesson-files/melodic-intervals-down-2
 share/gnome/solfege/lesson-files/melodic-intervals-down-2-3
+share/gnome/solfege/lesson-files/melodic-intervals-down-2-to-8
 share/gnome/solfege/lesson-files/melodic-intervals-down-3
 share/gnome/solfege/lesson-files/melodic-intervals-down-4-5
 share/gnome/solfege/lesson-files/melodic-intervals-down-4-5-8