- Update to 2.5

PR:		189474
Submitted by:	myself
Approved by:	maintainer timeout

4 files changed, 55 insertions, 8 deletions

diff --git a/audio/asunder/Makefile b/audio/asunder/Makefile
index 2d80040a0bfd..09442995237c 100644
--- a/audio/asunder/Makefile
+++ b/audio/asunder/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	asunder
-PORTVERSION=	2.3
-PORTREVISION=	1
+PORTVERSION=	2.5
 CATEGORIES=	audio
 MASTER_SITES=	http://littlesvr.ca/asunder/releases/
 
@@ -11,7 +10,6 @@ MAINTAINER=	frase@frase.id.au
 COMMENT=	Lightweight GTK+ CD ripper
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcddb.so:${PORTSDIR}/audio/libcddb
 RUN_DEPENDS=	${LOCALBASE}/bin/cdparanoia:${PORTSDIR}/audio/cdparanoia
@@ -25,7 +23,7 @@ WINDOWS_CHARS_DESC=	Allow Windows special chars in filenames
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake desktop-file-utils pkgconfig tar:bzip2
-USE_GNOME=	gtk20
+USE_GNOME=	gtk20 glib20 intltool intlhack
 
 PORTDOCS=	AUTHORS ChangeLog INSTALL NEWS README TODO
 
diff --git a/audio/asunder/distinfo b/audio/asunder/distinfo
index 6daba3708086..a452d6761bf7 100644
--- a/audio/asunder/distinfo
+++ b/audio/asunder/distinfo
@@ -1,2 +1,2 @@
-SHA256 (asunder-2.3.tar.bz2) = ded2eff22c7e65f46eecd8ad89c6c37c5a032af280e293a59c3e5bb34c0bb05f
-SIZE (asunder-2.3.tar.bz2) = 230060
+SHA256 (asunder-2.5.tar.bz2) = 0e548050143f964a0f869d44680554c7f7204b53262340ef0bd0f32e37507f20
+SIZE (asunder-2.5.tar.bz2) = 226657
diff --git a/audio/asunder/files/patch-Makefile.in b/audio/asunder/files/patch-Makefile.in
new file mode 100644
index 000000000000..f96813455e94
--- /dev/null
+++ b/audio/asunder/files/patch-Makefile.in
@@ -0,0 +1,38 @@
+--- ./Makefile.in.orig	2014-03-13 03:33:04.000000000 +0000
++++ ./Makefile.in	2014-05-08 10:39:15.000000000 +0000
+@@ -345,7 +345,7 @@
+ SUBDIRS = src po
+ pixdir = $(datadir)/pixmaps
+ pix_DATA = pixmaps/asunder.png
+-EXTRA_DIST = asunder.desktop pixmaps/asunder.png syslogng
++EXTRA_DIST = asunder.desktop pixmaps/asunder.png
+ ACLOCAL_AMFLAGS = -I m4
+ desktopdir = $(datadir)/applications
+ desktop_DATA = asunder.desktop
+@@ -793,7 +793,6 @@
+ 
+ install-data-am: install-desktopDATA install-pixDATA
+ 	@$(NORMAL_INSTALL)
+-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ install-dvi: install-dvi-recursive
+ 
+ install-dvi-am:
+@@ -851,7 +850,7 @@
+ 	distcheck distclean distclean-generic distclean-hdr \
+ 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ 	dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-data-hook \
++	install-data install-data-am \
+ 	install-desktopDATA install-dvi install-dvi-am install-exec \
+ 	install-exec-am install-html install-html-am install-info \
+ 	install-info-am install-man install-pdf install-pdf-am \
+@@ -863,9 +862,6 @@
+ 	uninstall-pixDATA
+ 
+ 
+-install-data-hook:
+-	cd syslogng && $(MAKE) install
+-
+ uninstall-hook: 
+ 	cd syslogng && $(MAKE) uninstall
+ 
diff --git a/audio/asunder/pkg-plist b/audio/asunder/pkg-plist
index 5091a1ccf154..965b4ab1d3b0 100644
--- a/audio/asunder/pkg-plist
+++ b/audio/asunder/pkg-plist
@@ -1,8 +1,15 @@
 bin/asunder
 share/applications/asunder.desktop
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
 %%NLS%%share/locale/ar/LC_MESSAGES/asunder.mo
 %%NLS%%share/locale/be@latin/LC_MESSAGES/asunder.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/bn_IN/LC_MESSAGES/asunder.mo
 %%NLS%%share/locale/bs_BA/LC_MESSAGES/asunder.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/asunder.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/asunder.mo
@@ -36,13 +43,17 @@ share/applications/asunder.desktop
 %%NLS%%share/locale/sv/LC_MESSAGES/asunder.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/asunder.mo
 %%NLS%%share/locale/ur_PK/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/asunder.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/asunder.mo
 share/pixmaps/asunder.png
-%%NLS%%@dirrmtry share/locale/bs_BA/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/bs_BA
 %%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ur_PK
 %%NLS%%@dirrmtry share/locale/sr@latin/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/sr@latin
+%%NLS%%@dirrmtry share/locale/bs_BA/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/bs_BA
+%%NLS%%@dirrmtry share/locale/bn_IN/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/bn_IN
 %%NLS%%@dirrmtry share/locale/be@latin/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/be@latin
+%%PORTDOCS%%@dirrm %%DOCSDIR%%