- Update to 2.4.0

- Drop GTK2, GTK3 options as only GTK3 is now supported
- Sort USES and un-mute INSTALL_DATA command to pet portlint

4 files changed, 23 insertions, 27 deletions

diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index f2ed494e2ae1..ef34afbe1fdd 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	easytag
-PORTVERSION=	2.2.6
+PORTVERSION=	2.4.0
 CATEGORIES=	audio
 MASTER_SITES=	GNOME
 
@@ -21,8 +21,9 @@ LIB_DEPENDS=	libid3.so:${PORTSDIR}/audio/id3lib \
 		libFLAC.so:${PORTSDIR}/audio/flac \
 		libtag.so:${PORTSDIR}/audio/taglib
 
-USES=		desktop-file-utils gmake pkgconfig tar:xz gettext-tools
-USE_GNOME=	glib20 intltool intlhack libxslt
+USES=		desktop-file-utils gettext-tools gmake pkgconfig tar:xz
+USE_GNOME=	gtk30 glib20 intltool intlhack libxslt
+GLIB_SCHEMAS=	org.gnome.EasyTAG.gschema.xml org.gnome.EasyTAG.enums.xml
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_GTK
@@ -35,9 +36,7 @@ CONFIGURE_ARGS=	--disable-appdata-validate \
 PORTDOCS=	HACKING THANKS TODO
 
 OPTIONS_DEFINE=	WAVPACK NLS OPUS SPEEX DOCS
-OPTIONS_SINGLE=	GTK
-OPTIONS_SINGLE_GTK=	GTK2 GTK3
-OPTIONS_DEFAULT=	GTK2 NLS
+OPTIONS_DEFAULT=	NLS
 OPTIONS_SUB=	yes
 
 WAVPACK_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
@@ -50,16 +49,10 @@ SPEEX_CONFIGURE_ENABLE=	speex
 
 NLS_USES=		gettext-runtime
 
-GTK2_USE=	GNOME=gtk20
-GTK2_CONFIGURE_ON=--with-gtk2
-
-GTK3_USE=	GNOME=gtk30
-GTK3_CONFIGURE_ON=--without-gtk2
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 pre-configure:
diff --git a/audio/easytag/distinfo b/audio/easytag/distinfo
index 9e07ac06c2f3..96fbcfca2e15 100644
--- a/audio/easytag/distinfo
+++ b/audio/easytag/distinfo
@@ -1,2 +1,2 @@
-SHA256 (easytag-2.2.6.tar.xz) = 26437f0d698c3b16794336c335b40f53fa26aefeb77322e45e4e2501c4cff14a
-SIZE (easytag-2.2.6.tar.xz) = 1016508
+SHA256 (easytag-2.4.0.tar.xz) = b8d882bc168abca96b1b369b10e5b97fa29a7a43f7b33f34489768d111610c3d
+SIZE (easytag-2.4.0.tar.xz) = 1342852
diff --git a/audio/easytag/files/patch-Makefile.in b/audio/easytag/files/patch-Makefile.in
index 3b961b51c70e..80779397f583 100644
--- a/audio/easytag/files/patch-Makefile.in
+++ b/audio/easytag/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- ./Makefile.in.orig	2014-04-11 23:01:28.000000000 +0000
-+++ ./Makefile.in	2014-04-12 13:01:19.000000000 +0000
-@@ -612,7 +612,6 @@
+--- Makefile.in.orig	2015-08-29 14:34:05 UTC
++++ Makefile.in
+@@ -806,7 +806,6 @@ am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
  am__tar = @am__tar@
  am__untar = @am__untar@
@@ -8,7 +8,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -657,7 +656,7 @@
+@@ -852,7 +851,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  ACLOCAL_AMFLAGS = -I m4
  DISTCHECK_CONFIGURE_FLAGS = \
@@ -17,24 +17,24 @@
  	--enable-flac \
  	--enable-id3v23 \
  	--enable-ogg \
-@@ -783,8 +782,6 @@
- @WINDOWS_HOST_TRUE@easytag_LDFLAGS = \
- @WINDOWS_HOST_TRUE@	-Wl,--subsystem,windows
+@@ -1056,8 +1055,6 @@ easytag_enum_headers = \
+ @ENABLE_NAUTILUS_ACTIONS_TRUE@libnautilus_easytag_la_LIBADD = \
+ @ENABLE_NAUTILUS_ACTIONS_TRUE@	$(NAUTILUS_LIBS)
  
--appdata_in_files = data/easytag.appdata.xml.in
--appdata_XML = $(appdata_in_files:.appdata.xml.in=.appdata.xml)
+-appdata_in_files = data/easytag.appdata.xml.in data/easytag-nautilus.metainfo.xml.in
+-appdata_XML = $(appdata_in_files:.xml.in=.xml)
  desktopdir = $(datadir)/applications
  desktop_in_files = data/easytag.desktop.in
  desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-@@ -844,7 +841,6 @@
+@@ -1124,7 +1121,6 @@ dist_appiconsymbolic_DATA = \
  
  UPDATE_ICON_CACHE = gtk-update-icon-cache --ignore-theme-index --force
  dist_noinst_DATA = \
 -	$(appdata_in_files) \
  	$(desktop_in_files) \
+ 	$(gsettings_SCHEMAS) \
  	$(easytag_headers) \
- 	src/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff \
-@@ -895,7 +891,6 @@
+@@ -1271,7 +1267,6 @@ dist_noinst_SCRIPTS = \
  @EASYTAG_ENABLE_TESTS_TRUE@	$(check_SCRIPTS)
  
  CLEANFILES = \
diff --git a/audio/easytag/pkg-plist b/audio/easytag/pkg-plist
index 9966909898ee..a9b678e94fb2 100644
--- a/audio/easytag/pkg-plist
+++ b/audio/easytag/pkg-plist
@@ -10,7 +10,9 @@ share/icons/hicolor/32x32/apps/easytag.png
 share/icons/hicolor/48x48/apps/easytag.png
 share/icons/hicolor/64x64/apps/easytag.png
 share/icons/hicolor/scalable/apps/easytag.svg
+share/icons/hicolor/symbolic/apps/easytag-symbolic.svg
 %%NLS%%share/locale/bg/LC_MESSAGES/easytag.mo
+%%NLS%%share/locale/bs/LC_MESSAGES/easytag.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/easytag.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/easytag.mo
 %%NLS%%share/locale/da/LC_MESSAGES/easytag.mo
@@ -29,6 +31,7 @@ share/icons/hicolor/scalable/apps/easytag.svg
 %%NLS%%share/locale/nb/LC_MESSAGES/easytag.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/easytag.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/easytag.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/easytag.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/easytag.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/easytag.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/easytag.mo