- Update to 0.74.b1

PR:		154416
Submitted by:	Jason E. Hale <bsdkaffee@gmail.com>
Feature safe:	yes

6 files changed, 57 insertions, 33 deletions

diff --git a/audio/audex/Makefile b/audio/audex/Makefile
index bbe83c3b1c9b..ac9324fd4de4 100644
--- a/audio/audex/Makefile
+++ b/audio/audex/Makefile
@@ -6,12 +6,9 @@
 #
 
 PORTNAME=	audex
-DISTVERSION=	0.72b1
-PORTREVISION=	5
+DISTVERSION=	0.74b1
 CATEGORIES=	audio kde
-MASTER_SITES=	${MASTER_SITE_GENTOO} \
-		http://kde.maniatek.de/${PORTNAME}/files/
-MASTER_SITE_SUBDIR=	distfiles
+MASTER_SITES=	http://kde.maniatek.com/${PORTNAME}/files/
 
 MAINTAINER=	bsdkaffee@gmail.com
 COMMENT=	Audio CD ripping utility for KDE4
@@ -19,23 +16,33 @@ COMMENT=	Audio CD ripping utility for KDE4
 LIB_DEPENDS=	cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia \
 		kcddb.5:${PORTSDIR}/multimedia/kdemultimedia4
 
-USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USE_XZ=		yes
 USE_CMAKE=	yes
 USE_KDE4=	automoc4 kdeprefix kdelibs
 USE_QT_VER=	4
-QT_COMPONENTS=	gui dbus network qt3support sql svg xml \
+QT_COMPONENTS=	gui dbus network svg xml \
 		qmake_build moc_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/LICENCE
 
-OPTIONS=	FAAC "Depend on audio/faac for m4a encoding" off \
+OPTIONS=	NLS "Native language support" on \
+		FAAC "Depend on audio/faac for m4a encoding" off \
 		FLAC "Depend on audio/flac for flac encoding" on \
 		LAME "Depend on audio/lame for mp3 encoding" off \
+		EYED3 "Depend on audio/py-eyed3 for Unicode mp3 tags" off \
 		OGG "Depend on audio/vorbis-tools for ogg encoding" on
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
+
+.if defined(WITHOUT_NLS)
+CMAKE_ARGS+=	-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
 
 .if defined(WITH_FAAC)
 RUN_DEPENDS+=	faac:${PORTSDIR}/audio/faac
@@ -49,8 +56,12 @@ RUN_DEPENDS+=	flac:${PORTSDIR}/audio/flac
 RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
 .endif
 
+.if defined(WITH_EYED3)
+RUN_DEPENDS+=	eyeD3:${PORTSDIR}/audio/py-eyed3
+.endif
+
 .if defined(WITH_OGG)
 RUN_DEPENDS+=	oggenc:${PORTSDIR}/audio/vorbis-tools
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/audex/distinfo b/audio/audex/distinfo
index fb8fd0baac8e..38551b05dfbc 100644
--- a/audio/audex/distinfo
+++ b/audio/audex/distinfo
@@ -1,3 +1,2 @@
-MD5 (audex-0.72b1.tar.bz2) = 1953587ebc8e08f5de1eb782ecf92788
-SHA256 (audex-0.72b1.tar.bz2) = 87a31cc95b7b1b587c6f091d8248b76128d249de7d758ae621c8376597ccd757
-SIZE (audex-0.72b1.tar.bz2) = 207987
+SHA256 (audex-0.74b1.tar.xz) = 47e39dbf0fcd600314aa975c5a57f3a2970c4eb9214a8ddccef828598d9c5da5
+SIZE (audex-0.74b1.tar.xz) = 269112
diff --git a/audio/audex/files/patch-CMakeLists.txt b/audio/audex/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..f438bbf260c9
--- /dev/null
+++ b/audio/audex/files/patch-CMakeLists.txt
@@ -0,0 +1,10 @@
+--- ./CMakeLists.txt.orig	2011-01-31 06:29:55.000000000 -0500
++++ ./CMakeLists.txt	2011-01-31 06:30:15.000000000 -0500
+@@ -122,6 +122,6 @@
+ 
+ add_subdirectory(icons)
+ add_subdirectory(images)
+-add_subdirectory(po)
++macro_optional_add_subdirectory(po)
+ 
+ macro_display_feature_log()
diff --git a/audio/audex/files/patch-utils__upload.h b/audio/audex/files/patch-utils__upload.h
deleted file mode 100644
index fc4f46fc742b..000000000000
--- a/audio/audex/files/patch-utils__upload.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./utils/upload.h.orig	2010-06-10 17:32:46.000000000 -0400
-+++ ./utils/upload.h	2010-06-10 17:33:01.000000000 -0400
-@@ -28,7 +28,6 @@
- #include <KLocale>
- #include <KUrl>
- #include <KIO/Job>
--#include <KIO/MkdirJob>
- #include <KIO/SimpleJob>
- #include <KIO/CopyJob>
- 
diff --git a/audio/audex/pkg-descr b/audio/audex/pkg-descr
index a90e37a6ce64..dcd3ec02e119 100644
--- a/audio/audex/pkg-descr
+++ b/audio/audex/pkg-descr
@@ -11,5 +11,5 @@ Features include:
 - Creates extraction and encoding protocols.
 - Transfer files with KDE KIO-Slaves.
 
-WWW: http://kde.maniatek.de/audex/
+WWW: http://kde.maniatek.com/audex/
 WWW: http://www.kde-apps.org/content/show.php?content=77125
diff --git a/audio/audex/pkg-plist b/audio/audex/pkg-plist
index e83f2e34ef9d..5b5234de4d24 100644
--- a/audio/audex/pkg-plist
+++ b/audio/audex/pkg-plist
@@ -1,7 +1,6 @@
 bin/audex
 share/applications/kde4/audex.desktop
 share/apps/audex/audexui.rc
-share/apps/audex/images/amazon.png
 share/apps/audex/images/canada.png
 share/apps/audex/images/france.png
 share/apps/audex/images/germany.png
@@ -21,11 +20,26 @@ share/icons/hicolor/16x16/apps/audex.png
 share/icons/hicolor/32x32/apps/audex.png
 share/icons/hicolor/48x48/apps/audex.png
 share/icons/hicolor/64x64/apps/audex.png
-share/locale/cs/LC_MESSAGES/audex.mo
-share/locale/de/LC_MESSAGES/audex.mo
-share/locale/it/LC_MESSAGES/audex.mo
-share/locale/nl/LC_MESSAGES/audex.mo
-share/locale/pt_BR/LC_MESSAGES/audex.mo
-share/locale/ru/LC_MESSAGES/audex.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/audex.mo
+%%NLS%%share/locale/da/LC_MESSAGES/audex.mo
+%%NLS%%share/locale/de/LC_MESSAGES/audex.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/audex.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/audex.mo
+%%NLS%%share/locale/es/LC_MESSAGES/audex.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/audex.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/audex.mo
+%%NLS%%share/locale/it/LC_MESSAGES/audex.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/audex.mo
+%%NLS%%share/locale/km/LC_MESSAGES/audex.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/audex.mo
+%%NLS%%share/locale/mai/LC_MESSAGES/audex.mo
+%%NLS%%share/locale/nds/LC_MESSAGES/audex.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/audex.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/audex.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/audex.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/audex.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/audex.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/audex.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/audex.mo
 @dirrm share/apps/audex/images
 @dirrm share/apps/audex