3 files changed, 67 insertions, 23 deletions

diff --git a/audio/asunder/Makefile b/audio/asunder/Makefile
index 56fab4492c4f..a86fd5e12af0 100644
--- a/audio/asunder/Makefile
+++ b/audio/asunder/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	asunder
-# Date created:				14 September 2007
-# Whom:					frase@frase.id.au
-#
+# Created by: Fraser Tweedale <frase@frase.id.au>
 # $FreeBSD$
 
 PORTNAME=	asunder
-PORTVERSION=	2.0
-PORTREVISION?=	2
+PORTVERSION=	2.2
 CATEGORIES=	audio
 MASTER_SITES=	http://littlesvr.ca/asunder/releases/
 
@@ -16,50 +12,59 @@ COMMENT=	A lightweight GTK+ CD ripper
 LIB_DEPENDS=	cddb.4:${PORTSDIR}/audio/libcddb
 RUN_DEPENDS=	${LOCALBASE}/bin/cdparanoia:${PORTSDIR}/audio/cdparanoia
 
-OPTIONS=	LAME "lame support" on \
-		OGG "ogg-vorbis support" on \
-		FLAC "FLAC support" on \
-		WAVPACK "WavPack support" off \
-		MONKEYAUDIO "Monkey's Audio support" off \
-		WINDOWS_CHARS "Allow Windows special chars in filenames" off
+OPTIONS_DEFINE=	LAME OGG FLAC WAVPACK MONKEYAUDIO WINDOWS_CHARS NLS DOCS
+OPTIONS_DEFAULT=	LAME OGG FLAC
+
+MONKEYAUDIO_DESC=	Monkey's Audio support
+WINDOWS_CHARS_DESC=	Allow Windows special chars in filenames
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
 USE_GNOME=	gtk20
 
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_LAME)
+.if ${PORT_OPTIONS:MLAME}
 RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
 .endif
 
-.if defined(WITH_OGG)
+.if ${PORT_OPTIONS:MOGG}
 RUN_DEPENDS+=	oggenc:${PORTSDIR}/audio/vorbis-tools
 .endif
 
-.if defined(WITH_FLAC)
+.if ${PORT_OPTIONS:MFLAC}
 RUN_DEPENDS+=	flac:${PORTSDIR}/audio/flac
 .endif
 
-.if defined(WITH_WAVPACK)
+.if ${PORT_OPTIONS:MWAVPACK}
 RUN_DEPENDS+=	wavpack:${PORTSDIR}/audio/wavpack
 .endif
 
-.if defined(WITH_MONKEYAUDIO)
+.if ${PORT_OPTIONS:MMONKEYAUDIO}
 RUN_DEPENDS+=	mac:${PORTSDIR}/audio/mac
 .endif
 
+.if ${PORT_OPTIONS:MNLS}
+PLIST_SUB+=	NLS=''
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS='@comment '
+.endif
+
 post-patch:
-.if defined(WITH_WINDOWS_CHARS)
+	@${REINPLACE_CMD} -e 's/^itlocaledir = .*/itlocaledir = @datarootdir@\/locale/' ${WRKSRC}/po/Makefile.in.in
+.if ${PORT_OPTIONS:MWINDOWS_CHARS}
 	@${REINPLACE_CMD} -e 's^#define[[:blank:]]*BADCHARS.*^#define BADCHARS "/"^' ${WRKSRC}/src/util.h
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/asunder/distinfo b/audio/asunder/distinfo
index fbd5b8fdcd1d..95b50bfc4be3 100644
--- a/audio/asunder/distinfo
+++ b/audio/asunder/distinfo
@@ -1,2 +1,2 @@
-SHA256 (asunder-2.0.tar.bz2) = f86539f3cbccf0727f654cbfad4f6b7dde4e5668973b5c74b3cf5041b70b9f4d
-SIZE (asunder-2.0.tar.bz2) = 220593
+SHA256 (asunder-2.2.tar.bz2) = bb608c1cdefcce2f533fb5d5cc23838846b2810ec89d0ebb083507cf27e7822f
+SIZE (asunder-2.2.tar.bz2) = 208936
diff --git a/audio/asunder/pkg-plist b/audio/asunder/pkg-plist
index 0615ebe61e93..e976eb04192f 100644
--- a/audio/asunder/pkg-plist
+++ b/audio/asunder/pkg-plist
@@ -1,4 +1,43 @@
 bin/asunder
 share/applications/asunder.desktop
+%%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/bs_BA/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/da/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/de/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/el/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/es/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/it/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/asunder.mo
+%%NLS%%share/locale/sr@latin/LC_MESSAGES/asunder.mo
+%%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_TW/LC_MESSAGES/asunder.mo
 share/pixmaps/asunder.png
 @dirrmtry share/applications
+%%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