UPDATE: gogglesmm-1.2.5

This diff is from my series to update taglib to version 2. Patches
stoles form FreeBSD. Simple update gogglesmm-1.2.5. Tested on amd64. OK?

Cheers Rafael

diff --git a/audio/gogglesmm/Makefile b/audio/gogglesmm/Makefile
index 20b6bf9395d..6ae89dc1bad 100644
--- a/audio/gogglesmm/Makefile
+++ b/audio/gogglesmm/Makefile
@@ -1,7 +1,9 @@
COMMENT = music collection manager and player
-DISTNAME = gogglesmm-0.12.7
-EXTRACT_SUFX = .tar.xz
-REVISION = 15
+
+GH_ACCOUNT = gogglesmm
+GH_PROJECT = gogglesmm
+GH_TAGNAME = 1.2.5
+
CATEGORIES = audio x11

HOMEPAGE = https://gogglesmm.github.io/
@@ -9,27 +11,37 @@ HOMEPAGE = https://gogglesmm.github.io/
# GPLv3+
PERMIT_PACKAGE = Yes

-WANTLIB += FOX-1.6 GL GLU X11 c dbus-1 expat intl m sqlite3 ${COMPILER_LIBCXX}
-WANTLIB += tag xine z
-
-SITES = http://www.linklevel.net/distfiles/
+WANTLIB += ${COMPILER_LIBCXX} FLAC GL GLU ICE SM X11 Xcursor Xext
+WANTLIB += Xfixes Xft Xrandr Xrender bz2 c crypto dbus-1 epoxy
+WANTLIB += expat fontconfig freetype intl jpeg m ogg opus png
+WANTLIB += pulse sndio sqlite3 ssl tag tiff vorbis webp z

COMPILER = base-clang ports-gcc base-gcc

-LIB_DEPENDS = audio/taglib \
+MODULES = devel/cmake
+
+LIB_DEPENDS = archivers/bzip2 \
+ audio/flac \
+ audio/libogg \
+ audio/libvorbis \
+ audio/opus \
+ audio/pulseaudio \
+ audio/taglib>=2.0.2 \
databases/sqlite3 \
- devel/fox \
- multimedia/xine-lib \
+ devel/gettext,-runtime \
+ graphics/jpeg \
+ graphics/libwebp \
+ graphics/png \
+ graphics/tiff \
x11/dbus

RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+4,-guic

-CONFIGURE_ARGS = --prefix=${PREFIX} \
- --with-md5=internal
-CONFIGURE_ENV = LINK="${CXX}" LIBS=-lintl
-CONFIGURE_STYLE = simple
-USE_GMAKE = Yes
+CONFIGURE_ARGS= -DCMAKE_INSTALL_PREFIX="${PREFIX}"
+
+CXXFLAGS += -I${LOCALBASE}/include -I${X11BASE}/include
+MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib -L${X11BASE}/lib

NO_TEST = Yes

diff --git a/audio/gogglesmm/distinfo b/audio/gogglesmm/distinfo
index cdc7ee53fb8..cce12e3c873 100644
--- a/audio/gogglesmm/distinfo
+++ b/audio/gogglesmm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gogglesmm-0.12.7.tar.xz) = zq7JprP0kpAa3FxKkzGo8uBcOOKS3RuPnjEhmyFcu/Q=
-SIZE (gogglesmm-0.12.7.tar.xz) = 344652
+SHA256 (gogglesmm-1.2.5.tar.gz) = +2ozRXqBWtZQqB97rVIz+YNkeXfkAcV8bTlvDeRBQoM=
+SIZE (gogglesmm-1.2.5.tar.gz) = 3174015
diff --git a/audio/gogglesmm/patches/patch-CMakeLists_txt b/audio/gogglesmm/patches/patch-CMakeLists_txt
new file mode 100644
index 00000000000..4409dfe2625
--- /dev/null
+++ b/audio/gogglesmm/patches/patch-CMakeLists_txt
@@ -0,0 +1,24 @@
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -69,6 +69,11 @@ if(HAS_CXX_OPTIMIZE_DEBUG AND CMAKE_BUILD_TYPE MATCHES
+ add_compile_options(-Og)
+ endif()
+
++CHECK_CXX_COMPILER_FLAG(-Wno-inconsistent-missing-override HAS_CXX_NOOVERRIDE)
++if(HAS_CXX_NOOVERRIDE AND NOT CMAKE_BUILD_TYPE MATCHES Debug)
++ add_compile_options(-Wno-inconsistent-missing-override)
++endif()
++
+ # FIXME Doesn't work on all platforms.
+ #CHECK_CXX_COMPILER_FLAG(-flto HAS_CXX_OPTIMIZE_LINKTIME)
+ if(HAS_CXX_OPTIMIZE_LINKTIME AND NOT CMAKE_BUILD_TYPE MATCHES Debug)
+@@ -110,7 +115,7 @@ install(FILES extra/gogglesmm_64.png DESTINATION share
+ install(FILES extra/gogglesmm.svg DESTINATION share/icons/hicolor/scalable/apps RENAME gogglesmm.svg)
+ install(FILES extra/gogglesmm.appdata.xml DESTINATION share/metainfo)
+ install(FILES extra/gogglesmm.desktop DESTINATION share/applications)
+-install(FILES extra/gogglesmm.1 DESTINATION share/man/man1)
++install(FILES extra/gogglesmm.1 DESTINATION man/man1)
+
+ # Install translations when native language support has been enabled
+ if(WITH_NLS)
diff --git a/audio/gogglesmm/patches/patch-Makefile b/audio/gogglesmm/patches/patch-Makefile
deleted file mode 100644
index 8c7276c0321..00000000000
--- a/audio/gogglesmm/patches/patch-Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
---- Makefile.orig Thu Feb 9 03:50:01 2012
-+++ Makefile Wed May 15 09:21:54 2013
-@@ -16,6 +16,7 @@ include build/version
- .PHONY : all clean realclean cleanicons install install-desktop
-
- INSTALL=install
-+MANDIR=$(PREFIX)/man
-
-
- # Convert to Platform specific names
-@@ -153,24 +154,33 @@ LINGUAS?=$(TRANSLATIONS)
- #----------------------------------------------------------
- install: $(BINNAME)
- @echo " Installing $(INSTALL_DIR)/bin/gogglesmm ..."
-- @$(INSTALL) -m 755 -D src/gogglesmm $(INSTALL_DIR)/bin/gogglesmm
-+ @$(BSD_INSTALL_PROGRAM) src/gogglesmm $(INSTALL_DIR)/bin/gogglesmm
- @echo " Installing $(INSTALL_DIR)/share/applications/gogglesmm.desktop"
-- @$(INSTALL) -m 644 -D extra/gogglesmm.desktop $(INSTALL_DIR)/share/applications/gogglesmm.desktop
-+ @$(BSD_INSTALL_DATA_DIR) $(INSTALL_DIR)/share/applications
-+ @$(BSD_INSTALL_DATA) extra/gogglesmm.desktop $(INSTALL_DIR)/share/applications/gogglesmm.desktop
- @echo " Installing Icons"
-- $(INSTALL) -m 644 -D icons/gogglesmm_16.png $(INSTALL_DIR)/share/icons/hicolor/16x16/apps/gogglesmm.png
-- $(INSTALL) -m 644 -D extra/gogglesmm_22.png $(INSTALL_DIR)/share/icons/hicolor/22x22/apps/gogglesmm.png
-- $(INSTALL) -m 644 -D extra/gogglesmm_24.png $(INSTALL_DIR)/share/icons/hicolor/24x24/apps/gogglesmm.png
-- $(INSTALL) -m 644 -D icons/gogglesmm_32.png $(INSTALL_DIR)/share/icons/hicolor/32x32/apps/gogglesmm.png
-- $(INSTALL) -m 644 -D extra/gogglesmm_48.png $(INSTALL_DIR)/share/icons/hicolor/48x48/apps/gogglesmm.png
-- $(INSTALL) -m 644 -D extra/gogglesmm.svg $(INSTALL_DIR)/share/icons/hicolor/scalable/apps/gogglesmm.svg
-+ @$(BSD_INSTALL_DATA_DIR) $(INSTALL_DIR)/share/icons/hicolor/16x16/apps/
-+ @$(BSD_INSTALL_DATA) icons/gogglesmm_16.png $(INSTALL_DIR)/share/icons/hicolor/16x16/apps/gogglesmm.png
-+ @$(BSD_INSTALL_DATA_DIR) $(INSTALL_DIR)/share/icons/hicolor/22x22/apps/
-+ @$(BSD_INSTALL_DATA) extra/gogglesmm_22.png $(INSTALL_DIR)/share/icons/hicolor/22x22/apps/gogglesmm.png
-+ @$(BSD_INSTALL_DATA_DIR) $(INSTALL_DIR)/share/icons/hicolor/24x24/apps/
-+ @$(BSD_INSTALL_DATA) extra/gogglesmm_24.png $(INSTALL_DIR)/share/icons/hicolor/24x24/apps/gogglesmm.png
-+ @$(BSD_INSTALL_DATA_DIR) $(INSTALL_DIR)/share/icons/hicolor/32x32/apps/
-+ @$(BSD_INSTALL_DATA) icons/gogglesmm_32.png $(INSTALL_DIR)/share/icons/hicolor/32x32/apps/gogglesmm.png
-+ @$(BSD_INSTALL_DATA_DIR) $(INSTALL_DIR)/share/icons/hicolor/48x48/apps/
-+ @$(BSD_INSTALL_DATA) extra/gogglesmm_48.png $(INSTALL_DIR)/share/icons/hicolor/48x48/apps/gogglesmm.png
-+ @$(BSD_INSTALL_DATA_DIR) $(INSTALL_DIR)/share/icons/hicolor/scalable/apps/
-+ @$(BSD_INSTALL_DATA) extra/gogglesmm.svg $(INSTALL_DIR)/share/icons/hicolor/scalable/apps/gogglesmm.svg
- @echo " Installing $(INSTALL_MANDIR)/man1/gogglesmm.1"
-- @$(INSTALL) -m 644 -D extra/gogglesmm.1 $(INSTALL_MANDIR)/man1/gogglesmm.1
-+ @$(BSD_INSTALL_MAN_DIR) $(INSTALL_MANDIR)/man1/
-+ @$(BSD_INSTALL_MAN) extra/gogglesmm.1 $(INSTALL_MANDIR)/man1/gogglesmm.1
- ifneq (,$(findstring nls,$(OPTIONS)))
- @echo " Installing Translations"
- @linguas='$(filter $(TRANSLATIONS),$(LINGUAS))'; \
- for tr in $$linguas ; do \
- echo " Installing $(INSTALL_LOCALEDIR)/$$tr/LC_MESSAGES/gogglesmm.mo" ;\
-- $(INSTALL) -m 644 -D po/$$tr.mo -T $(INSTALL_LOCALEDIR)/$$tr/LC_MESSAGES/gogglesmm.mo ; \
-+ $(BSD_INSTALL_DATA_DIR) $(INSTALL_LOCALEDIR)/$$tr/LC_MESSAGES/ ; \
-+ $(BSD_INSTALL_DATA) po/$$tr.mo $(INSTALL_LOCALEDIR)/$$tr/LC_MESSAGES/gogglesmm.mo ; \
- done;
- endif
-
diff --git a/audio/gogglesmm/patches/patch-cfox_include_FXObject_h b/audio/gogglesmm/patches/patch-cfox_include_FXObject_h
new file mode 100644
index 00000000000..b3f1d1e0bec
--- /dev/null
+++ b/audio/gogglesmm/patches/patch-cfox_include_FXObject_h
@@ -0,0 +1,14 @@
+Index: cfox/include/FXObject.h
+--- cfox/include/FXObject.h.orig
++++ cfox/include/FXObject.h
+@@ -25,6 +25,10 @@
+ #include "FXMetaClass.h"
+