From owner-svn-ports-head@FreeBSD.ORG  Fri Jun 14 13:51:19 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 63BB8E40;
 Fri, 14 Jun 2013 13:51:19 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3DFE7106A;
 Fri, 14 Jun 2013 13:51:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5EDpJpr036711;
 Fri, 14 Jun 2013 13:51:19 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5EDpJqa036710;
 Fri, 14 Jun 2013 13:51:19 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201306141351.r5EDpJqa036710@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 14 Jun 2013 13:51:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r320919 - head/audio/gogglesmm
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Jun 2013 13:51:19 -0000

Author: bapt
Date: Fri Jun 14 13:51:18 2013
New Revision: 320919
URL: http://svnweb.freebsd.org/changeset/ports/320919

Log:
  Simplify by adopting the new options helpers

Modified:
  head/audio/gogglesmm/Makefile

Modified: head/audio/gogglesmm/Makefile
==============================================================================
--- head/audio/gogglesmm/Makefile	Fri Jun 14 13:51:04 2013	(r320918)
+++ head/audio/gogglesmm/Makefile	Fri Jun 14 13:51:18 2013	(r320919)
@@ -38,49 +38,25 @@ MAN1=		gogglesmm.1
 
 PORTDOCS=	README AUTHORS
 
-.include <bsd.port.options.mk>
+FOX16_LIB_DEPENDS=	FOX-1.6:${PORTSDIR}/x11-toolkits/fox16
+FOX17_LIB_DEPENDS=	FOX-1.7:${PORTSDIR}/x11-toolkits/fox17
 
-.if ${PORT_OPTIONS:MFOX16}
-LIB_DEPENDS+=	FOX-1.6:${PORTSDIR}/x11-toolkits/fox16
-.endif
+GCRYPT_LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt
+GCRYPT_CONFIGURE_ON=	--with-md5=gcrypt
+GCRYPT_CONFIGURE_OFF=	--with-md5=internal
 
-.if ${PORT_OPTIONS:MFOX17}
-LIB_DEPENDS+=	FOX-1.7:${PORTSDIR}/x11-toolkits/fox17
-.endif
+DBUS_LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus
+DBUS_CONFIGURE_OFF=	--with-dbus
 
-.if ${PORT_OPTIONS:MGCRYPT}
-LIB_DEPENDS+=	gcrypt:${PORTSDIR}/security/libgcrypt
-CONFIGURE_ARGS+=	--with-md5=gcrypt
-.else
-CONFIGURE_ARGS+=	--with-md5=internal
-.endif
+CURL_LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
+CURL_CONFIGURE_OFF=	--without-curl
 
-.if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=	dbus-1:${PORTSDIR}/devel/dbus
-.else
-CONFIGURE_ARGS+=	--without-dbus
-.endif
+NLS_USES=		gettext
+NLS_CONFIGURE_OFF=	--disable-nls
 
-.if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
-.else
-CONFIGURE_ARGS+=	--without-curl
-.endif
+NEWREMOTE_CONFIGURE_OFF=	--without-new-remote
 
-.if ${PORT_OPTIONS:MNLS}
-PLIST_SUB=	NLS=""
-USES+=		gettext
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB=	NLS="@comment "
-.endif
-
-.if empty(PORT_OPTIONS:MNEWREMOTE)
-CONFIGURE_ARGS+=--without-new-remote
-.endif
-
-post-patch:
-	@${ECHO_CMD} ${SUBPORT}
+.include <bsd.port.options.mk>
 
 pre-install:
 	@${MKDIR} ${PREFIX}/share/applications