diff -ruN --exclude=CVS /usr/ports/audio/gmm.orig/Makefile /usr/ports/audio/gmm/Makefile
--- /usr/ports/audio/gmm.orig/Makefile	2010-07-13 23:56:24.334179561 +0200
+++ /usr/ports/audio/gmm/Makefile	2010-07-14 00:16:53.008317827 +0200
@@ -6,45 +6,61 @@
 #
 
 PORTNAME=	gmm
-PORTVERSION=	0.10.22
-PORTREVISION=	1
+PORTVERSION=	0.10.25
 CATEGORIES=	audio
 MASTER_SITES=	http://gogglesmm.googlecode.com/files/
-DISTNAME=	musicmanager-${PORTVERSION}
+DISTNAME=	gogglesmm-${PORTVERSION}
 
 MAINTAINER=	sklauder@trimind.de
 COMMENT=	Music collection manager and player
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS=	FOX-1.6:${PORTSDIR}/x11-toolkits/fox16 		\
 		xine.1:${PORTSDIR}/multimedia/libxine		\
 		tag.1:${PORTSDIR}/audio/taglib			\
-		sqlite3.8:${PORTSDIR}/databases/sqlite3		\
-		dbus-1:${PORTSDIR}/devel/dbus			\
-		curl.6:${PORTSDIR}/ftp/curl
+		sqlite3.8:${PORTSDIR}/databases/sqlite3
+
+OPTIONS=	DBUS "Add DBUS support" on \
+		CURL "Add Curl support" on \
+		NLS "Add support for nls" on \
+		NEWREMOTE "Use new remote player" on
 
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 USE_GMAKE=	yes
-USE_BZIP2=	yes
-USE_GETTEXT=	yes
-USE_GNOME=	gtk20
+USE_XZ=		yes
 INSTALLS_ICONS=	yes
 
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 PORTDOCS=	README AUTHORS
 
 CONFIGURE_ENV=	OPT_CFLAGS=" "
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
+.if defined(WITHOUT_DBUS)
+CONFIGURE_ARGS+=	--without-dbus
+.else
+LIB_DEPENDS+=	dbus-1:${PORTSDIR}/devel/dbus
+.endif
+
+.if defined(WITHOUT_CURL)
+CONFIGURE_ARGS+=	--without-curl
+.else
+LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
+.endif
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+.endif
 
 .if defined(WITHOUT_NEWREMOTE)
 CONFIGURE_ARGS+=--without-new-remote
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -i '' -e "s|/bin/bash|${LOCALBASE}/bin/bash|; \
-		s|/usr/local|${LOCALBASE}|" ${WRKSRC}/configure
-
 post-configure:
 	@${REINPLACE_CMD} -i '' -e 's| -[DT] | |g' \
 		${WRKSRC}/Makefile
@@ -57,4 +73,4 @@
 . endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/audio/gmm.orig/distinfo /usr/ports/audio/gmm/distinfo
--- /usr/ports/audio/gmm.orig/distinfo	2010-07-13 23:56:24.331179467 +0200
+++ /usr/ports/audio/gmm/distinfo	2010-07-14 00:06:22.293296602 +0200
@@ -1,3 +1,3 @@
-MD5 (musicmanager-0.10.22.tar.bz2) = 0379054b9cf2a2d4074a0129d03b3763
-SHA256 (musicmanager-0.10.22.tar.bz2) = 8083dab95a483ba975873ce6bed1054752b2fdb207d2424383aa1d77593ee536
-SIZE (musicmanager-0.10.22.tar.bz2) = 422520
+MD5 (gogglesmm-0.10.25.tar.xz) = fe33fd0e5a0b63371563a962951bca45
+SHA256 (gogglesmm-0.10.25.tar.xz) = bd23f93c87c413c47bbbe132ee06313edb0cb39499d67b72521b7dcaf2a11390
+SIZE (gogglesmm-0.10.25.tar.xz) = 358932
diff -ruN --exclude=CVS /usr/ports/audio/gmm.orig/files/patch-build__byteorderdetect /usr/ports/audio/gmm/files/patch-build__byteorderdetect
--- /usr/ports/audio/gmm.orig/files/patch-build__byteorderdetect	1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/audio/gmm/files/patch-build__byteorderdetect	2010-07-14 00:10:46.713462884 +0200
@@ -0,0 +1,19 @@
+--- ./build/byteorderdetect.orig	2010-07-09 16:28:43.000000000 +0200
++++ ./build/byteorderdetect	2010-07-14 00:06:39.941240488 +0200
+@@ -39,13 +39,13 @@
+ $CXX ${OUTPUTBIN} checkbyteorder checkbyteorder.cpp
+ 
+ BYTEORDER=${BYTEORDER:-0}
+-if [[ -x checkbyteorder ]] ; then
++if [ -x checkbyteorder ] ; then
+   ./checkbyteorder
+-	if [[ $? -eq 1 ]] ; then
++	if [ $? -eq 1 ] ; then
+ 		BYTEORDER=1
+ 	fi
+ 	rm -rf checkbyteorder 
+ fi
+ rm -rf checkbyteorder.cpp
+-DEFINES+="-DFOX_BIGENDIAN=${BYTEORDER} "
++DEFINES="$DEFINES -DFOX_BIGENDIAN=${BYTEORDER} "
+ cd ..
diff -ruN --exclude=CVS /usr/ports/audio/gmm.orig/files/patch-configure /usr/ports/audio/gmm/files/patch-configure
--- /usr/ports/audio/gmm.orig/files/patch-configure	1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/audio/gmm/files/patch-configure	2010-07-14 00:10:46.709462665 +0200
@@ -0,0 +1,474 @@
+--- ./configure.orig	2010-07-09 16:28:43.000000000 +0200
++++ ./configure	2010-07-14 00:09:38.495677309 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ #-----------------------------
+ 
+ # Settings
+@@ -131,7 +131,7 @@
+ 
+ # Print Command Line Options
+ #---------------------------
+-if [[ $HELP -eq 1 ]] ; then
++if [ $HELP -eq 1 ] ; then
+   echo "Available options:"
+   echo "   --enable-debug                  Compile with debug information"
+   echo "   --with-taglib-extras            Use taglib-extras library for ASF and MP4 support."
+@@ -159,14 +159,14 @@
+ 
+ # Debug / Release Mode
+ #----------------------
+-if [[ $DEBUG -eq 1 ]] ; then
++if [ $DEBUG -eq 1 ] ; then
+   CFLAGS=${CFLAGS:-$GEN_CFLAGS $DEBUG_CFLAGS}
+   LDFLAGS=${LDFLAGS:-$GEN_LDFLAGS $DEBUG_LDFLAGS}
+-  DEFINES+="-DDEBUG "
++  DEFINES="$DEFINES -DDEBUG "
+ else
+   CFLAGS=${CFLAGS:-$GEN_CFLAGS $OPT_CFLAGS}
+   LDFLAGS=${LDFLAGS:-$GEN_LDFLAGS $OPT_LDFLAGS}
+-  DEFINES+="-DNDEBUG "
++  DEFINES="$DEFINES -DNDEBUG "
+ fi
+ 
+ # Check for generic config in prefix
+@@ -175,7 +175,7 @@
+ {
+   echo "    Search for $1 in $2 ... "
+ 
+-  if [[ ! -x $2/bin/$3 ]] ; then
++  if [ ! -x $2/bin/$3 ] ; then
+     return 0
+   fi
+ 
+@@ -195,12 +195,12 @@
+ 
+   # Make sure it is a compatible version
+   #--------------------------------------------
+-  if [[ $CONFIG_MAJOR -lt $4 ]] ; then
++  if [ $CONFIG_MAJOR -lt $4 ] ; then
+       echo "        Check $1 Version => Unsupported ($CONFIG_MAJOR.$CONFIG_MINOR.$CONFIG_RELEASE)"
+       return 0
+   fi
+ 
+-  if [[ $CONFIG_MINOR -lt $5 ]] ; then
++  if [ $CONFIG_MINOR -lt $5 ] ; then
+       echo "        Check $1 Version => Unsupported ($CONFIG_MAJOR.$CONFIG_MINOR.$CONFIG_RELEASE)"
+       return 0
+   fi
+@@ -222,7 +222,7 @@
+ #  echo "pkg-config --exists \"$1 >= $3\""
+ #  RUN=`pkg-config --exists '$1 >= $3'`
+   pkg-config --exists "$1 >= $3"
+-  if [[ "$?" -ne "0" ]] ; then
++  if [ "$?" -ne "0" ] ; then
+     echo "\"$?\""
+     return 0
+   fi
+@@ -236,24 +236,24 @@
+   PKG_LIBS=`pkg-config --libs-only-l $1`
+   PKG_LIBS_OTHER=`pkg-config --libs-only-other $1`
+ 
+-  if [[ -n $PKG_CFLAGS ]] ; then
+-    CFLAGS+="$PKG_CFLAGS "
++  if [ -n "$PKG_CFLAGS" ] ; then
++    CFLAGS="$CFLAGS $PKG_CFLAGS "
+   fi
+ 
+-  if [[ -n $PKG_INCFLAGS ]] ; then
+-    INCFLAGS+="$PKG_INCFLAGS "
++  if [ -n "$PKG_INCFLAGS" ] ; then
++    INCFLAGS="$INCFLAGS $PKG_INCFLAGS "
+   fi
+ 
+-  if [[ -n $PKG_LDFLAGS ]] ; then
+-    LDFLAGS+="$PKG_LDFLAGS "
++  if [ -n $PKG_LDFLAGS ] ; then
++    LDFLAGS="$LDFLAGS $PKG_LDFLAGS "
+   fi
+ 
+-  if [[ -n $PKG_LIBS ]] ; then
+-    LIBS+=" $PKG_LIBS "
++  if [ -n $PKG_LIBS ] ; then
++    LIBS="$LIBS $PKG_LIBS "
+   fi
+ 
+-  if [[ -n $PKG_LIBS_OTHER ]] ; then
+-    LIBS+=" $PKG_LIBS_OTHER "
++  if [ -n $PKG_LIBS_OTHER ] ; then
++    LIBS="$LIBS $PKG_LIBS_OTHER "
+   fi
+ 
+   echo ""
+@@ -273,25 +273,25 @@
+   MAJOR=1
+   MINOR=6
+ 
+-  if [[ -n "$FOX_PREFIX" ]] ; then
++  if [ -n "$FOX_PREFIX" ] ; then
+     check_in_prefix "FOX" $FOX_PREFIX "fox-config" $MAJOR $MINOR
+-    if [[ $? -eq 0 ]] ; then
++    if [ $? -eq 0 ] ; then
+       echo " Unable to find a compatible FOX library installation. Please make"
+       echo " sure the correct version is installed including the header files."
+       echo " You can use the \"--fox-prefix\" option to search in an"
+       echo " alternative installation directory."
+-      exit -1
++      exit 1
+     fi
+   else
+     check_in_prefix "FOX" "/usr" "fox-config" $MAJOR $MINOR
+-    if [[ $? -eq 0 ]] ; then
++    if [ $? -eq 0 ] ; then
+       check_in_prefix "FOX" "/usr/local" "fox-config" $MAJOR $MINOR
+-      if [[ $? -eq 0 ]] ; then
++      if [ $? -eq 0 ] ; then
+           echo " Unable to find a compatible FOX library installation. Please make"
+           echo " sure the correct version is installed including the header files."
+           echo " You can use the \"--fox-prefix\" option to search in an"
+           echo " alternative installation directory."
+-          exit -1
++          exit 1
+       fi
+     fi
+   fi
+@@ -302,8 +302,8 @@
+   RESVERSION=`echo ${RESCMD} | cut -d" " -f2`
+   RESWRAP_MAJOR=`echo ${RESVERSION} | cut -d. -f1`
+ 
+-  if [[ -d icons ]] ; then
+-    if [[ $RESWRAP_MAJOR = "5" ]] ; then
++  if [ -d icons ] ; then
++    if [ $RESWRAP_MAJOR = "5" ] ; then
+       RESWRAP_H="${CONFIG_PREFIX}/bin/reswrap --keep-ext --header"
+       RESWRAP_CPP="${CONFIG_PREFIX}/bin/reswrap --keep-ext --source --extern"
+       RESWRAP_TEXT="${CONFIG_PREFIX}/bin/reswrap -t --keep-ext"
+@@ -324,10 +324,10 @@
+   MAJOR=1
+   MINOR=0
+ 
+-  if [[ -n "$XINE_PREFIX" ]] ; then
++  if [ -n "$XINE_PREFIX" ] ; then
+     export PKG_CONFIG_PATH="$XINE_PREFIX/lib/pkgconfig:$XINE_PREFIX/lib64/pkgconfig:$XINE_PREFIX/share/pkgconfig"
+     check_in_prefix "XINE" $XINE_PREFIX "xine-config" $MAJOR $MINOR
+-    if [[ $? -eq 0 ]] ; then
++    if [ $? -eq 0 ] ; then
+       echo " Unable to find a compatible XINE library installation. Please make"
+       echo " sure the correct version is installed including the header files."
+       echo " You can use the \"--xine-prefix\" option to search in an"
+@@ -337,10 +337,10 @@
+   else
+     export PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig"
+     check_in_prefix "XINE" "/usr" "xine-config" $MAJOR $MINOR
+-    if [[ $? -eq 0 ]] ; then
++    if [ $? -eq 0 ] ; then
+       export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/local/share/pkgconfig"
+       check_in_prefix "XINE" "/usr/local" "xine-config" $MAJOR $MINOR
+-      if [[ $? -eq 0 ]] ; then
++      if [ $? -eq 0 ] ; then
+           echo " Unable to find a compatible XINE library installation. Please make"
+           echo " sure the correct version is installed including the header files."
+           echo " You can use the \"--xine-prefix\" option to search in an"
+@@ -355,10 +355,10 @@
+ #---------------------------
+ check_dbus()
+ {
+-  if [[ $DBUS -eq 1 ]] ; then
+-    if [[ -n "$DBUS_PREFIX" ]] ; then
++  if [ $DBUS -eq 1 ] ; then
++    if [ -n "$DBUS_PREFIX" ] ; then
+       check_required_pkg dbus-1 $DBUS_PREFIX "1.0"
+-      if [[ $? -eq 0 ]] ; then
++      if [ $? -eq 0 ] ; then
+         echo " Unable to find a compatible DBUS library installation. Please make"
+         echo " sure the correct version is installed including the header files."
+         echo " You can use the \"--dbus-prefix\" option to search in an"
+@@ -368,9 +368,9 @@
+       fi
+     else
+       check_required_pkg dbus-1 "/usr" "1.0"
+-      if [[ $? -eq 0 ]] ; then
++      if [ $? -eq 0 ] ; then
+         check_required_pkg dbus-1 "/usr/local" "1.0"
+-        if [[ $? -eq 0 ]] ; then
++        if [ $? -eq 0 ] ; then
+             echo " Unable to find a compatible DBUS library installation. Please make"
+             echo " sure the correct version is installed including the header files."
+             echo " You can use the \"--dbus-prefix\" option to search in an"
+@@ -380,7 +380,7 @@
+         fi
+       fi
+     fi
+-    DEFINES+="-DHAVE_DBUS "
++    DEFINES="$DEFINES -DHAVE_DBUS "
+   fi
+ }
+ 
+@@ -388,9 +388,9 @@
+ 
+ check_sqlite()
+ {
+-  if [[ -n "$SQLITE_PREFIX" ]] ; then
++  if [ -n "$SQLITE_PREFIX" ] ; then
+     check_required_pkg sqlite3 $SQLITE_PREFIX "3.4"
+-    if [[ $? -eq 0 ]] ; then
++    if [ $? -eq 0 ] ; then
+       echo " Unable to find a compatible SQLITE library installation. Please make"
+       echo " sure the correct version is installed including the header files."
+       echo " You can use the \"--sqlite-prefix\" option to search in an"
+@@ -399,9 +399,9 @@
+     fi
+   else
+     check_required_pkg sqlite3 "/usr" "3.4"
+-    if [[ $? -eq 0 ]] ; then
++    if [ $? -eq 0 ] ; then
+       check_required_pkg sqlite3 "/usr/local" "3.4"
+-      if [[ $? -eq 0 ]] ; then
++      if [ $? -eq 0 ] ; then
+           echo " Unable to find a compatible SQLITE library installation. Please make"
+           echo " sure the correct version is installed including the header files."
+           echo " You can use the \"--sqlite-prefix\" option to search in an"
+@@ -416,17 +416,17 @@
+ 
+ check_taglib_16()
+ {
+-  if [[ -n "$TAGLIB_PREFIX" ]] ; then
++  if [ -n "$TAGLIB_PREFIX" ] ; then
+     check_required_pkg taglib $TAGLIB_PREFIX "1.6"
+-    if [[ $? -eq 0 ]] ; then
++    if [ $? -eq 0 ] ; then
+       TAGLIB_16=0
+       return
+     fi
+   else
+     check_required_pkg taglib "/usr" "1.6"
+-    if [[ $? -eq 0 ]] ; then
++    if [ $? -eq 0 ] ; then
+       check_required_pkg taglib "/usr/local" "1.6"
+-      if [[ $? -eq 0 ]] ; then
++      if [ $? -eq 0 ] ; then
+         TAGLIB_16=0
+         return
+       fi
+@@ -439,9 +439,9 @@
+ check_taglib()
+ {
+   echo " Warning: please consider upgrading to taglib 1.6.3"
+-  if [[ -n "$TAGLIB_PREFIX" ]] ; then
++  if [ -n "$TAGLIB_PREFIX" ] ; then
+     check_required_pkg taglib $TAGLIB_PREFIX "1.4"
+-    if [[ $? -eq 0 ]] ; then
++    if [ $? -eq 0 ] ; then
+       echo " Unable to find a compatible TAGLIB library installation. Please make"
+       echo " sure the correct version is installed including the header files."
+       echo " You can use the \"--taglib-prefix\" option to search in an"
+@@ -450,9 +450,9 @@
+     fi
+   else
+     check_required_pkg taglib "/usr" "1.4"
+-    if [[ $? -eq 0 ]] ; then
++    if [ $? -eq 0 ] ; then
+       check_required_pkg taglib "/usr/local" "1.4"
+-      if [[ $? -eq 0 ]] ; then
++      if [ $? -eq 0 ] ; then
+           echo " Unable to find a compatible TAGLIB library installation. Please make"
+           echo " sure the correct version is installed including the header files."
+           echo " You can use the \"--taglib-prefix\" option to search in an"
+@@ -466,9 +466,9 @@
+ 
+ check_taglib_extras()
+ {
+-  if [[ -n "$TAGLIB_EXTRAS_PREFIX" ]] ; then
++  if [ -n "$TAGLIB_EXTRAS_PREFIX" ] ; then
+     check_required_pkg taglib-extras $TAGLIB_EXTRAS_PREFIX "0.1"
+-    if [[ $? -eq 0 ]] ; then
++    if [ $? -eq 0 ] ; then
+       echo " Unable to find a compatible TAGLIB-EXTRAS library installation. Please make"
+       echo " sure the correct version is installed including the header files."
+       echo " You can use the \"--taglib-extras-prefix\" option to search in an"
+@@ -477,9 +477,9 @@
+     fi
+   else
+     check_required_pkg taglib-extras "/usr" "0.1"
+-    if [[ $? -eq 0 ]] ; then
++    if [ $? -eq 0 ] ; then
+       check_required_pkg taglib-extras "/usr/local" "0.1"
+-      if [[ $? -eq 0 ]] ; then
++      if [ $? -eq 0 ] ; then
+           echo " Unable to find a compatible TAGLIB-EXTRAS library installation. Please make"
+           echo " sure the correct version is installed including the header files."
+           echo " You can use the \"--taglib-extras-prefix\" option to search in an"
+@@ -493,10 +493,10 @@
+ 
+ check_libcurl()
+ {
+-  if [[ $CURL -eq 1 ]] ; then
+-    if [[ -n "$CURL_PREFIX" ]] ; then
++  if [ $CURL -eq 1 ] ; then
++    if [ -n "$CURL_PREFIX" ] ; then
+       check_required_pkg libcurl $CURL_PREFIX "7.19"
+-      if [[ $? -eq 0 ]] ; then
++      if [ $? -eq 0 ] ; then
+         echo " Unable to find a compatible libcurl library installation. Please make"
+         echo " sure the correct version is installed including the header files."
+         echo " You can use the \"--libcurl-prefix\" option to search in an"
+@@ -506,9 +506,9 @@
+       fi
+     else
+       check_required_pkg libcurl "/usr" "7.19"
+-      if [[ $? -eq 0 ]] ; then
++      if [ $? -eq 0 ] ; then
+         check_required_pkg libcurl "/usr/local" "7.19"
+-        if [[ $? -eq 0 ]] ; then
++        if [ $? -eq 0 ] ; then
+             echo " Unable to find a compatible libcurl library installation. Please make"
+             echo " sure the correct version is installed including the header files."
+             echo " You can use the \"--libcurl-prefix\" option to search in an"
+@@ -518,7 +518,7 @@
+         fi
+       fi
+     fi
+-    DEFINES+="-DHAVE_CURL "
++    DEFINES="$DEFINES -DHAVE_CURL "
+   fi
+ }
+ 
+@@ -526,25 +526,25 @@
+ check_expat()
+ {
+   echo "    Adding expat ... "
+-  LIBS+="-lexpat"
++  LIBS="$LIBS -lexpat"
+ }
+ 
+ # Which icons to build in
+ #---------------------------
+ check_icons()
+ {
+-  if [[ $BUILDIN_ICONS -eq 0 ]] && [[ -d "$ICON_DIRECTORY" ]] ; then
+-    DEFINES+="-DHAVE_EXTERNAL_ICONS -DDEFAULT_ICON_PATH=\"${ICON_DIRECTORY}/${ICON_THEME}\" "
++  if [ $BUILDIN_ICONS -eq 0 ] && [ -d "$ICON_DIRECTORY" ] ; then
++    DEFINES="$DEFINES -DHAVE_EXTERNAL_ICONS -DDEFAULT_ICON_PATH=\"${ICON_DIRECTORY}/${ICON_THEME}\" "
+   else
+     BUILDIN_ICONS=1
+-    DEFINES+="-DHAVE_INTERNAL_ICONS "
++    DEFINES="$DEFINES -DHAVE_INTERNAL_ICONS "
+   fi
+ }
+ 
+ check_remote()
+ {
+-  if [[ $OLD_REMOTE -eq 1 ]] ; then
+-    DEFINES+="-DHAVE_COMPACT_REMOTE "
++  if [ $OLD_REMOTE -eq 1 ] ; then
++    DEFINES="$DEFINES -DHAVE_COMPACT_REMOTE "
+   fi
+ }
+ 
+@@ -556,15 +556,15 @@
+ check_xine
+ check_dbus
+ check_taglib_16
+-if [[ $TAGLIB_16 -eq 1 ]] ; then
++if [ $TAGLIB_16 -eq 1 ] ; then
+   ASF=0
+   MP4=0
+-  DEFINES+="-DHAVE_TAGLIB_16 "
++  DEFINES="$DEFINES -DHAVE_TAGLIB_16 "
+ else
+   check_taglib
+-  if [[ $TAGLIB_EXTRAS -eq 1 ]] ; then
++  if [ $TAGLIB_EXTRAS -eq 1 ] ; then
+     check_taglib_extras
+-    DEFINES+="-DHAVE_TAGLIB_EXTRAS "
++    DEFINES="$DEFINES -DHAVE_TAGLIB_EXTRAS "
+     ASF=0
+     MP4=0
+   fi
+@@ -584,50 +584,50 @@
+ 
+ # Features
+ #------------------------
+-if [[ $TAGLIB_EXTRAS -eq 0 ]] && [[ $TAGLIB_16 -eq 0 ]] ; then
+-  if [[ $ASF -eq 0 ]] ; then
+-    DEFINES+="-DDISABLE_ASF_SUPPORT "
++if [ $TAGLIB_EXTRAS -eq 0 ] && [ $TAGLIB_16 -eq 0 ] ; then
++  if [ $ASF -eq 0 ] ; then
++    DEFINES="$DEFINES -DDISABLE_ASF_SUPPORT "
+   fi
+-  if [[ $MP4 -eq 0 ]] ; then
+-    DEFINES+="-DDISABLE_MP4_SUPPORT "
++  if [ $MP4 -eq 0 ] ; then
++    DEFINES="$DEFINES -DDISABLE_MP4_SUPPORT "
+   fi
+ fi
+ 
+-if [[ $NLS -eq 1 ]] ; then
++if [ $NLS -eq 1 ] ; then
+   NLSDIR=${NLSDIR:-$PREFIX/share/locale}
+-  DEFINES+="-DHAVE_NLS -DLOCALEDIR=\"${NLSDIR}\" "
++  DEFINES="$DEFINES -DHAVE_NLS -DLOCALEDIR=\"${NLSDIR}\" "
+ fi
+ 
+ # Summary
+ #-------------------------
+ echo "Features:"
+-if [[ $DBUS -eq 0 ]] ; then
++if [ $DBUS -eq 0 ] ; then
+   echo "    DBUS Support => no"
+ else
+   echo "    DBUS Support => yes"
+ fi
+ 
+-if [[ $CURL -eq 0 ]] ; then
++if [ $CURL -eq 0 ] ; then
+   echo "    libcurl Support => no"
+ else
+   echo "    libcurl Support => yes"
+ fi
+ 
+-if [[ $TAGLIB_16 -eq 1 ]] ; then
++if [ $TAGLIB_16 -eq 1 ] ; then
+   echo "    Taglib 1.6 => yes"
+   echo "    MP4 / ASF supported if buildin into TagLib."
+-elif [[ $TAGLIB_EXTRAS -eq 1 ]] ; then
++elif [ $TAGLIB_EXTRAS -eq 1 ] ; then
+   echo "    Taglib-Extras => yes"
+   echo "    MP4 Support => yes"
+   echo "    ASF Support => yes"
+ else
+   echo "    Taglib-Extras => no"
+-  if [[ $ASF -eq 0 ]] ; then
++  if [ $ASF -eq 0 ] ; then
+     echo "    ASF Support => no"
+   else
+     echo "    ASF Support => yes"
+   fi
+-  if [[ $MP4 -eq 0 ]] ; then
++  if [ $MP4 -eq 0 ] ; then
+     echo "    MP4 Support => no"
+   else
+     echo "    MP4 Support => yes"
+@@ -635,18 +635,18 @@
+ fi
+ 
+ 
+-if [[ $NLS -eq 0 ]] ; then
++if [ $NLS -eq 0 ] ; then
+   echo "    NLS Support => no"
+ else
+   echo "    NLS Support => yes"
+   echo "    Locale Directory => $NLSDIR"
+ fi
+-if [[ $OLD_REMOTE -eq 1 ]] ; then
++if [ $OLD_REMOTE -eq 1 ] ; then
+   echo "    Old Remote => yes"
+ else
+   echo "    New Remote => yes"
+ fi
+-if [[ $BUILDIN_ICONS -eq 0 ]] ; then
++if [ $BUILDIN_ICONS -eq 0 ] ; then
+   echo "    Icons => external"
+   echo "    Icon Path => $ICON_DIRECTORY/$ICON_THEME"
+ else
diff -ruN --exclude=CVS /usr/ports/audio/gmm.orig/pkg-plist /usr/ports/audio/gmm/pkg-plist
--- /usr/ports/audio/gmm.orig/pkg-plist	2010-07-13 23:56:24.329180055 +0200
+++ /usr/ports/audio/gmm/pkg-plist	2010-07-14 00:16:08.731456058 +0200
@@ -1,10 +1,10 @@
-bin/gmm
-share/applications/gmm.desktop
-share/icons/hicolor/48x48/apps/gmm.png
-share/locale/de/LC_MESSAGES/gogglesmm.mo
-share/locale/es/LC_MESSAGES/gogglesmm.mo
-share/locale/fr/LC_MESSAGES/gogglesmm.mo
-share/locale/ru/LC_MESSAGES/gogglesmm.mo
-share/locale/hu/LC_MESSAGES/gogglesmm.mo
-share/locale/cs/LC_MESSAGES/gogglesmm.mo
+bin/gogglesmm
+share/applications/gogglesmm.desktop
+share/icons/hicolor/48x48/apps/gogglesmm.png
+%%NLS%%share/locale/de/LC_MESSAGES/gogglesmm.mo
+%%NLS%%share/locale/es/LC_MESSAGES/gogglesmm.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gogglesmm.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/gogglesmm.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/gogglesmm.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/gogglesmm.mo
 @dirrmtry share/applications