diff -ruN --exclude=CVS /usr/ports/audio/gimmix/Makefile /tmp/gimmix/Makefile
--- /usr/ports/audio/gimmix/Makefile	2010-11-04 21:29:38.000000000 +0100
+++ /tmp/gimmix/Makefile	2010-11-10 03:26:24.000000000 +0100
@@ -2,11 +2,12 @@
 # Date created:                                11 April 2007
 # Whom:                                        Matthieu Guegan <matt.guegan@free.fr>
 #
-# $FreeBSD: ports/audio/gimmix/Makefile,v 1.17 2010/11/01 08:35:55 wen Exp $
+# $FreeBSD: ports/audio/gimmix/Makefile,v 1.16 2010/05/16 17:27:04 nork Exp $
 #
 
 PORTNAME=	gimmix
 PORTVERSION=	0.5.7.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	gimmix
@@ -20,9 +21,13 @@
 
 LICENSE=	GPLv2
 
+OPTIONS=	NLS	"Native Language Support" on
+
+.include <bsd.port.options.mk>
+
 USE_GNOME=	gtk20 intltool libglade2
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
@@ -31,9 +36,18 @@
 
 CONFIGURE_ENV=	DATADIRNAME=share
 
+.if !defined(WITHOUT_NLS)
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CONFIGURE_ARGS+=	--enable-nls
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 post-patch:
-	${LN} -sf ${LOCALBASE}/share/intltool/Makefile.in.in ${WRKSRC}/po/Makefile.in.in
-	@${REINPLACE_CMD} -e 's,libmpd-1.0\/libmpd,libmpd,' \
-		${WRKSRC}/src/gimmix.h
+	@${LN} -sf ${LOCALBASE}/share/intltool/Makefile.in.in ${WRKSRC}/po/Makefile.in.in
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/audio/gimmix/distinfo /tmp/gimmix/distinfo
--- /usr/ports/audio/gimmix/distinfo	2010-11-04 21:29:38.000000000 +0100
+++ /tmp/gimmix/distinfo	2010-11-10 03:21:16.000000000 +0100
@@ -1,3 +1,2 @@
-MD5 (gimmix-0.5.7.1.tar.bz2) = d89f3d6a80a85e9e6f34f9abd2614c15
 SHA256 (gimmix-0.5.7.1.tar.bz2) = f504e19615fe2032b958d14a88504fbf9c2684ccad3cbe0b177068173e538cba
 SIZE (gimmix-0.5.7.1.tar.bz2) = 330368
diff -ruN --exclude=CVS /usr/ports/audio/gimmix/pkg-plist /tmp/gimmix/pkg-plist
--- /usr/ports/audio/gimmix/pkg-plist	2010-11-04 21:29:38.000000000 +0100
+++ /tmp/gimmix/pkg-plist	2010-11-10 03:04:39.000000000 +0100
@@ -1,9 +1,10 @@
+@comment $FreeBSD$
 bin/gimmix
-share/locale/de/LC_MESSAGES/gimmix.mo
-share/locale/fr/LC_MESSAGES/gimmix.mo
-share/locale/sv/LC_MESSAGES/gimmix.mo
-share/locale/tr/LC_MESSAGES/gimmix.mo
-share/locale/zh_TW/LC_MESSAGES/gimmix.mo
+%%NLS%%share/locale/de/LC_MESSAGES/gimmix.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gimmix.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/gimmix.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/gimmix.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/gimmix.mo
 share/applications/gimmix.desktop
 %%DATADIR%%/gimmix.glade
 %%DATADIR%%/gimmix_firstrun.png