From owner-svn-ports-all@FreeBSD.ORG  Wed Oct 30 20:22:20 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id B247A932;
 Wed, 30 Oct 2013 20:22:20 +0000 (UTC) (envelope-from wg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9F38C20B8;
 Wed, 30 Oct 2013 20:22:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9UKMKeU032017;
 Wed, 30 Oct 2013 20:22:20 GMT (envelope-from wg@svn.freebsd.org)
Received: (from wg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9UKMKtF032016;
 Wed, 30 Oct 2013 20:22:20 GMT (envelope-from wg@svn.freebsd.org)
Message-Id: <201310302022.r9UKMKtF032016@svn.freebsd.org>
From: William Grzybowski <wg@FreeBSD.org>
Date: Wed, 30 Oct 2013 20:22:20 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r332167 - head/x11/lxpanel
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Oct 2013 20:22:20 -0000

Author: wg
Date: Wed Oct 30 20:22:20 2013
New Revision: 332167
URL: http://svnweb.freebsd.org/changeset/ports/332167

Log:
  x11/lxpanel: pass maintainership
  
  - Pass maintainership
  - Use options helpers

Modified:
  head/x11/lxpanel/Makefile

Modified: head/x11/lxpanel/Makefile
==============================================================================
--- head/x11/lxpanel/Makefile	Wed Oct 30 19:32:47 2013	(r332166)
+++ head/x11/lxpanel/Makefile	Wed Oct 30 20:22:20 2013	(r332167)
@@ -7,7 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	SF/lxde/LXPanel%20%28desktop%20panel%29/LXPanel%20${PORTVERSION}/
 
-MAINTAINER=	wg@FreeBSD.org
+MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Lightweight X11 desktop panel
 
 LICENSE=	GPLv2 MIT
@@ -16,8 +16,14 @@ LICENSE_COMB=	dual
 LIB_DEPENDS=	libmenu-cache.so:${PORTSDIR}/x11/menu-cache
 RUN_DEPENDS=	${LOCALBASE}/share/desktop-directories/lxde-audio-video.directory:${PORTSDIR}/x11/lxmenu-data
 
-OPTIONS_DEFINE=	DOCS ALSA NLS
-OPTIONS_DEFAULT=NLS
+OPTIONS_DEFINE=	ALSA DOCS NLS
+OPTIONS_DEFAULT=
+OPTIONS_SUB=	yes
+
+ALSA_RUN_DEPENDS=	${LINUXBASE}/lib/libasound.so.2:${PORTSDIR}/audio/linux-f10-alsa-li
+ALSA_CONFIGURE_ENABLE=	alsa
+
+NLS_USES=	gettext
 
 USE_XORG=	x11 xmu
 USE_GNOME=	gtk20 libwnck
@@ -35,19 +41,6 @@ PORTDOCS=	AUTHORS README
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MALSA}
-RUN_DEPENDS+=	${LINUXBASE}/lib/libasound.so.2:${PORTSDIR}/audio/linux-f10-alsa-lib
-.else
-CONFIGURE_ARGS+=--disable-alsa
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-PLIST_SUB+=	NLS="@comment "
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,linux,sys,' \
 		${WRKSRC}/src/plugins/volume/volume-impl.c
@@ -60,9 +53,7 @@ post-patch:
 .endif
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>