audio/guidolib: Update 168 -> 168-207

Also update WWW.

6 files changed, 33 insertions, 212 deletions

diff --git a/audio/guidolib/Makefile b/audio/guidolib/Makefile
index 6776f1b46c4c..d1d9c1e6a9b1 100644
--- a/audio/guidolib/Makefile
+++ b/audio/guidolib/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	guidolib
 DISTVERSIONPREFIX=	v
-DISTVERSION=	168
-PORTREVISION=	2
+DISTVERSION=	168-207
+DISTVERSIONSUFFIX=	-gd1c151b5
 CATEGORIES=	audio graphics print
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -10,25 +10,23 @@ COMMENT=	Library for graphic rendering of music scores
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	cmake:devel/cmake
 LIB_DEPENDS=	libmidisharelight.so:audio/midisharelight
 
-USES=		compiler:c++11-lang gl gmake gnome localbase:ldflags pkgconfig qt:5 xorg
-USE_GITHUB=	yes
-GH_ACCOUNT=	grame-cncm
+USES=		compiler:c++11-lang gl cmake gnome localbase:ldflags pkgconfig qt:5 xorg
 USE_QT=		core gui widgets printsupport xml buildtools_build qmake_build
 USE_GL=		gl
 USE_GNOME=	cairo
 USE_LDCONFIG=	yes
 
-BUILD_WRKSRC=	${WRKSRC}/build
-INSTALL_WRKSRC=	${WRKSRC}/build
+USE_GITHUB=	yes
+GH_ACCOUNT=	grame-cncm
 
-MAKE_ARGS=	LINUXMIDI=no
+CMAKE_SOURCE_PATH=	${WRKSRC}/build
 
 LDFLAGS+=	-lmidisharelight
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
+
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
@@ -37,34 +35,6 @@ BINARY_ALIAS=	qmake=${QMAKE}
 post-extract:
 	@${RM} -r ${WRKSRC}/src/midisharelight
 
-post-patch:
-	@${REINPLACE_CMD} -i '' -E ' \
-		s|Linux|FreeBSD|; \
-		s|-DMIDIEXPORT=yes|-DMIDIEXPORT=off|' \
-		$$(${FIND} ${WRKSRC} -name Makefile) \
-		$$(${FIND} ${WRKSRC}/environments/Qt -name Make.shared)
-	@${REINPLACE_CMD} -i '' -e ' \
-		s|PUBLIC_HEADER DESTINATION /usr/include/guido|PUBLIC_HEADER DESTINATION ${PREFIX}/include/guido|; \
-		s|LIBDEST /usr/lib|LIBDEST ${PREFIX}/lib|; \
-		s|LIBPATH "/usr/lib"|LIBPATH "${LOCALBASE}/lib"|; \
-		s|-L/usr/local|-L${LOCALBASE}|' \
-		${WRKSRC}/build/CMakeLists.txt
-	@${REINPLACE_CMD} -i '' -e ' \
-		s|-lGUIDOEngine|-L${WRKSRC}/build -lGUIDOEngine|' \
-		${WRKSRC}/environments/Qt/apps/GUIDOEngine.shared \
-		${WRKSRC}/environments/Qt/GuidoServer/GUIDOEngineLink.pri \
-		${WRKSRC}/environments/Qt/libs/GuidoQt/GuidoQt.pro \
-		${WRKSRC}/environments/Qt/apps/guido2image/Makefile \
-		${WRKSRC}/src/tools/Makefile \
-		${WRKSRC}/validate/Makefile
-	@${REINPLACE_CMD} -i '' -e ' \
-		s|!android:CONFIG += staticlib|#!android:CONFIG += staticlib|' \
-		${WRKSRC}/environments/Qt/libs/GuidoQt/GuidoQt.pro
-	@${REINPLACE_CMD} -i '' -e ' \
-		s|/usr|$$(DESTDIR)$$(PREFIX)|; \
-		s|libGuidoQt.a|libGuidoQt.*|' \
-		${WRKSRC}/environments/Qt/libs/Makefile
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/libGUIDOEngine.so.*
 	${RM} -r ${STAGEDIR}${DATADIR}/python
@@ -74,8 +44,7 @@ do-install-DOCS-on:
 	${INSTALL_DATA} ${WRKSRC}/package/doc/*.pdf ${STAGEDIR}${DOCSDIR}
 	${CP} -r ${WRKSRC}/package/doc/html ${STAGEDIR}${DOCSDIR}
 
-do-install-EXAMPLES-on:
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${CP} -r ${WRKSRC}/gmn-examples/* ${STAGEDIR}${EXAMPLESDIR}
+do-install-EXAMPLES-on: # workaround for https://github.com/grame-cncm/guidolib/issues/130
+	@${RMDIR} ${STAGEDIR}${EXAMPLESDIR}/new-tags-v1.51/symbols
 
 .include <bsd.port.mk>
diff --git a/audio/guidolib/distinfo b/audio/guidolib/distinfo
index 40792ec4c80a..39b3510c091c 100644
--- a/audio/guidolib/distinfo
+++ b/audio/guidolib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614055636
-SHA256 (grame-cncm-guidolib-v168_GH0.tar.gz) = ff4abd38b419e54a53f90522349e440c60c49cd1f8d17e73e9b4e0c78aa66070
-SIZE (grame-cncm-guidolib-v168_GH0.tar.gz) = 42637630
+TIMESTAMP = 1635090081
+SHA256 (grame-cncm-guidolib-v168-207-gd1c151b5_GH0.tar.gz) = 17006f4dcfb605df636b58cf0df356ee3c23a23fb6c283be62a8e3b033330e99
+SIZE (grame-cncm-guidolib-v168-207-gd1c151b5_GH0.tar.gz) = 42460208
diff --git a/audio/guidolib/files/patch-build_CMakeLists.txt b/audio/guidolib/files/patch-build_CMakeLists.txt
new file mode 100644
index 000000000000..31b8c82f0056
--- /dev/null
+++ b/audio/guidolib/files/patch-build_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- build/CMakeLists.txt.orig	2021-10-24 16:01:23 UTC
++++ build/CMakeLists.txt
+@@ -256,7 +256,7 @@ else()
+ 	set (INSTALL_BIN 		${CMAKE_INSTALL_PREFIX}/bin)
+ 	set (INSTALL_LIB 		${CMAKE_INSTALL_PREFIX}/lib)
+ 	set (INSTALL_INC 		${CMAKE_INSTALL_PREFIX}/include/guido)
+-	set (INSTALL_SAMPLES 	${CMAKE_INSTALL_PREFIX}/share/guidolib/examples)
++	set (INSTALL_SAMPLES 	share/examples/guidolib)
+ 	set (INSTALL_APPS 		${CMAKE_INSTALL_PREFIX}/bin)
+ 	set (INSTALL_DOC 		${CMAKE_INSTALL_PREFIX}/share/guidolib/doc)
+ 	set (INSTALL_INTERFACES ${CMAKE_INSTALL_PREFIX}/share/guidolib)
diff --git a/audio/guidolib/files/patch-build_Makefile b/audio/guidolib/files/patch-build_Makefile
deleted file mode 100644
index 21911bd13d04..000000000000
--- a/audio/guidolib/files/patch-build_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/Makefile.orig	2021-02-23 05:12:20 UTC
-+++ build/Makefile
-@@ -39,7 +39,7 @@ basic : $(PROJ)
- all : $(PROJ)
- 	$(MAKE) basic
- 	$(MAKE) Qt
--	$(MAKE) wasm
-+	#$(MAKE) wasm
- 	
- $(PROJ) : $(BUILDDIR)
- 	cd $(BUILDDIR) && cmake $(CMAKEOPT) .. -G $(GENERATOR)
diff --git a/audio/guidolib/pkg-descr b/audio/guidolib/pkg-descr
index 5cefc1a7babc..cafd3015b415 100644
--- a/audio/guidolib/pkg-descr
+++ b/audio/guidolib/pkg-descr
@@ -17,4 +17,4 @@ notation software, compositional and analytical systems and tools, performance
 systems, and large musical databases.  It is powerful, flexible, easily
 portable, and human readable.
 
-WWW: http://guidolib.sourceforge.net/
+WWW: https://guido.grame.fr/
diff --git a/audio/guidolib/pkg-plist b/audio/guidolib/pkg-plist
index d52f15124c00..d2d174e91a81 100644
--- a/audio/guidolib/pkg-plist
+++ b/audio/guidolib/pkg-plist
@@ -1,12 +1,11 @@
-bin/GuidoEditor
-bin/GuidoSceneComposer
 bin/guido2abstract
-bin/guido2image
 bin/guido2midi
 bin/guido2proll
 bin/guido2rproportional
 bin/guido2svg
 bin/guido2svgmap
+bin/guidoar2gr
+bin/guidodraw
 bin/guidogetmeters
 bin/guidogetpagecount
 bin/guidogetpagemap
@@ -17,6 +16,7 @@ bin/guidogettimemap
 bin/guidogetversion
 bin/guidogetvoicecount
 bin/guidogetvoicemap
+bin/guidoparse
 bin/midi2proll
 include/guido/CairoDevice.h
 include/guido/CairoFont.h
@@ -43,16 +43,17 @@ include/guido/VGPen.h
 include/guido/VGSystem.h
 lib/libGUIDOEngine.so
 lib/libGUIDOEngine.so.1
-lib/libGUIDOEngine.so.1.6.8
-share/fonts/guido/guido2.ttf/guido2.svg
-share/fonts/guido/guido2.ttf/guido2.ttf
-%%DATADIR%%/doc/GUIDO-Format_de_Notation_Musicale.pdf
+lib/libGUIDOEngine.so.1.7.1
+share/fonts/guidolib/guido2.svg
+share/fonts/guidolib/guido2.ttf
+%%DATADIR%%/doc/GMNRefCard.pdf
 %%DATADIR%%/doc/GUIDO-Music-Notation-Format.pdf
 %%DATADIR%%/doc/GUIDO_Additional_Specifications_1.3.8.pdf
 %%DATADIR%%/doc/GUIDO_Additional_Specifications_1.5.1.pdf
 %%DATADIR%%/doc/GUIDO_Additional_Specifications_1.5.2.pdf
 %%DATADIR%%/doc/GUIDO_Additional_Specifications_1.5.4.pdf
-%%DATADIR%%/doc/classes.pdf
+%%DATADIR%%/doc/RefCardsParams.pdf
+%%DATADIR%%/doc/RefCardsTags.pdf
 %%DATADIR%%/doc/html/GUIDO-Music-Notation-Format.html
 %%DATADIR%%/doc/html/GUIDO_Additional_Specifications_1.3.8.html
 %%DATADIR%%/doc/html/GUIDO_Additional_Specifications_1.5.1.html
@@ -97,152 +98,3 @@ share/fonts/guido/guido2.ttf/guido2.ttf
 %%DATADIR%%/doc/html/imgs/tuplet2.png
 %%DATADIR%%/doc/html/imgs/turn.jpg
 %%DATADIR%%/doc/readme.md
-%%DATADIR%%/gmn-examples/chord/chords.gmn
-%%DATADIR%%/gmn-examples/chord/chords1.gmn
-%%DATADIR%%/gmn-examples/chord/chords2.gmn
-%%DATADIR%%/gmn-examples/complex_files/846_2f.gmn
-%%DATADIR%%/gmn-examples/complex_files/Bach-BWV772.gmn
-%%DATADIR%%/gmn-examples/complex_files/Faure.gmn
-%%DATADIR%%/gmn-examples/complex_files/bach.gmn
-%%DATADIR%%/gmn-examples/complex_files/bach_2.gmn
-%%DATADIR%%/gmn-examples/complex_files/complexScore.gmn
-%%DATADIR%%/gmn-examples/complex_files/moz581.gmn
-%%DATADIR%%/gmn-examples/examples/4voices.gmn
-%%DATADIR%%/gmn-examples/examples/accidentals.gmn
-%%DATADIR%%/gmn-examples/examples/allthethings.gmn
-%%DATADIR%%/gmn-examples/examples/articulations.gmn
-%%DATADIR%%/gmn-examples/examples/bach.gmn
-%%DATADIR%%/gmn-examples/examples/barlines.gmn
-%%DATADIR%%/gmn-examples/examples/bartok.gmn
-%%DATADIR%%/gmn-examples/examples/beaming.gmn
-%%DATADIR%%/gmn-examples/examples/beethoven.gmn
-%%DATADIR%%/gmn-examples/examples/brown.gmn
-%%DATADIR%%/gmn-examples/examples/clefkeymeter.gmn
-%%DATADIR%%/gmn-examples/examples/cpebach.gmn
-%%DATADIR%%/gmn-examples/examples/dynamics.gmn
-%%DATADIR%%/gmn-examples/examples/faure.gmn
-%%DATADIR%%/gmn-examples/examples/layout.gmn
-%%DATADIR%%/gmn-examples/examples/lutkin.gmn
-%%DATADIR%%/gmn-examples/examples/mozart581.gmn
-%%DATADIR%%/gmn-examples/examples/notes.gmn
-%%DATADIR%%/gmn-examples/examples/ornaments.gmn
-%%DATADIR%%/gmn-examples/examples/repeats.gmn
-%%DATADIR%%/gmn-examples/examples/slurs.gmn
-%%DATADIR%%/gmn-examples/examples/space.gmn
-%%DATADIR%%/gmn-examples/examples/tempo.gmn
-%%DATADIR%%/gmn-examples/lyrics/bach_lyrics.gmn
-%%DATADIR%%/gmn-examples/lyrics/bach_lyrics_withlinebreaks.gmn
-%%DATADIR%%/gmn-examples/lyrics/lyrics.gmn
-%%DATADIR%%/gmn-examples/lyrics/lyrics_with_3_verse.gmn
-%%DATADIR%%/gmn-examples/misc/4voices.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.38/fermatas.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.38/harmonic.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.38/pizz.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.38/staccato.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.43/cautionary.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.43/quarters.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.47/freekey.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.51/cluster.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.51/combinedBeams.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.51/featheredBeam.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.51/featheredBeamComplex.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.51/featheredBeamNewSystem.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.51/glissando.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.51/noteFormat2.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.51/noteFormat3.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.51/staffOffOn.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.51/staffOffOn_complex.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.51/symbol.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.52/accolade.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.52/complexMeter.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.52/newBarsBehaviour.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.52/newCrescDecrescAttributes.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.52/newMarcatoAttribute.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.52/newStaffFormatAttribute.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.52/newTupletAttributes.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.53/autoMeasuresOn.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.54/measuresNumbering.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.54/newStaffFormatAttribute.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.54/staffdistance.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.54/tremolo.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.57/newTupletParam.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.63/accidental.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.63/barformat.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.63/lyrics-ypos.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.63/mark.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.63/measuresNumberingPage.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.63/ties.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.63/tuplets.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.64/accelerandoRitardando.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.64/complexMeter.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.64/dynamics.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.64/fixed-staff-distance.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.64/grace-beaming.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.64/harmony.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.64/instr.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.64/lyrics-ypos.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.64/measureNumberingSkipped.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.64/measureNumberingSystem.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.64/measureNumberingSystem2.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.64/slursdy.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.65/mordent.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.65/trill-tie-repeat.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.65/trill.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.65/trillAndTies.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.65/trillLine.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.65/turn.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.66/arpeggio.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.66/fingering-misc.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.66/fingering.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.66/intens.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.66/pedal.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.67/intens.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.68/bowing.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.68/chords-fingering.gmn
-%%DATADIR%%/gmn-examples/note/headsReverse.gmn
-%%DATADIR%%/gmn-examples/note/noteFormat.gmn
-%%DATADIR%%/gmn-examples/note/sample.gmn
-%%DATADIR%%/gmn-examples/tags/acc.gmn
-%%DATADIR%%/gmn-examples/tags/autoBreak.gmn
-%%DATADIR%%/gmn-examples/tags/barFormat.gmn
-%%DATADIR%%/gmn-examples/tags/barformat2.gmn
-%%DATADIR%%/gmn-examples/tags/beam.gmn
-%%DATADIR%%/gmn-examples/tags/beams.gmn
-%%DATADIR%%/gmn-examples/tags/beamsfull.gmn
-%%DATADIR%%/gmn-examples/tags/begend.gmn
-%%DATADIR%%/gmn-examples/tags/centerrests.gmn
-%%DATADIR%%/gmn-examples/tags/clef.gmn
-%%DATADIR%%/gmn-examples/tags/cue.gmn
-%%DATADIR%%/gmn-examples/tags/dim.gmn
-%%DATADIR%%/gmn-examples/tags/dotFormat.gmn
-%%DATADIR%%/gmn-examples/tags/dots.gmn
-%%DATADIR%%/gmn-examples/tags/empty.gmn
-%%DATADIR%%/gmn-examples/tags/fermata.gmn
-%%DATADIR%%/gmn-examples/tags/fingering.gmn
-%%DATADIR%%/gmn-examples/tags/grace.gmn
-%%DATADIR%%/gmn-examples/tags/instr.gmn
-%%DATADIR%%/gmn-examples/tags/intens.gmn
-%%DATADIR%%/gmn-examples/tags/key.gmn
-%%DATADIR%%/gmn-examples/tags/marcato.gmn
-%%DATADIR%%/gmn-examples/tags/meter.gmn
-%%DATADIR%%/gmn-examples/tags/newSystem.gmn
-%%DATADIR%%/gmn-examples/tags/pageFormat.gmn
-%%DATADIR%%/gmn-examples/tags/restFormat.gmn
-%%DATADIR%%/gmn-examples/tags/slur.gmn
-%%DATADIR%%/gmn-examples/tags/space.gmn
-%%DATADIR%%/gmn-examples/tags/special-articulations.gmn
-%%DATADIR%%/gmn-examples/tags/staff.gmn
-%%DATADIR%%/gmn-examples/tags/staff2.gmn
-%%DATADIR%%/gmn-examples/tags/staffFormat.gmn
-%%DATADIR%%/gmn-examples/tags/stems.gmn
-%%DATADIR%%/gmn-examples/tags/stemsAuto.gmn
-%%DATADIR%%/gmn-examples/tags/systemFormat.gmn
-%%DATADIR%%/gmn-examples/tags/tempo.gmn
-%%DATADIR%%/gmn-examples/tags/testsysstretch.gmn
-%%DATADIR%%/gmn-examples/tags/text.gmn
-%%DATADIR%%/gmn-examples/tags/tie.gmn
-%%DATADIR%%/gmn-examples/tags/ties-up-down.gmn
-%%DATADIR%%/gmn-examples/tags/title.gmn
-%%DATADIR%%/gmn-examples/tags/tuplet.gmn
-%%DATADIR%%/gmn-examples/tags/volta.gmn
-@dir %%DATADIR%%/gmn-examples/new-tags-v1.51/symbols