From owner-svn-ports-all@FreeBSD.ORG  Fri Sep  7 18:37:53 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 22B631065673;
	Fri,  7 Sep 2012 18:37:53 +0000 (UTC)
	(envelope-from ehaupt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0D86B8FC17;
	Fri,  7 Sep 2012 18:37:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q87Ibq0A045127;
	Fri, 7 Sep 2012 18:37:52 GMT (envelope-from ehaupt@svn.freebsd.org)
Received: (from ehaupt@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q87IbqjQ045124;
	Fri, 7 Sep 2012 18:37:52 GMT (envelope-from ehaupt@svn.freebsd.org)
Message-Id: <201209071837.q87IbqjQ045124@svn.freebsd.org>
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Fri, 7 Sep 2012 18:37:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r303818 - in head/audio: gbsplay xmms-gbsplay
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Fri, 07 Sep 2012 18:37:53 -0000

Author: ehaupt
Date: Fri Sep  7 18:37:52 2012
New Revision: 303818
URL: http://svn.freebsd.org/changeset/ports/303818

Log:
  - Convert to OPTIONSng
  - Remove deprecated header information
  - Pacify portlint

Modified:
  head/audio/gbsplay/Makefile
  head/audio/xmms-gbsplay/Makefile

Modified: head/audio/gbsplay/Makefile
==============================================================================
--- head/audio/gbsplay/Makefile	Fri Sep  7 18:22:12 2012	(r303817)
+++ head/audio/gbsplay/Makefile	Fri Sep  7 18:37:52 2012	(r303818)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	gbsplay
-# Date created:				25 Jun 2005
-# Whom:					Emanuel Haupt <ehaupt@critical.ch>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	gbsplay
 PORTVERSION=	0.0.8
@@ -31,16 +26,16 @@ MAN1=		gbsplay.1 gbsinfo.1
 MAN5=		gbsplayrc.5
 PORTDOCS=	COPYRIGHT HISTORY README
 
-OPTIONS=	NAS "NAS sound output" on
+OPTIONS_DEFINE=	NAS
 
 .endif
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PKGNAMEPREFIX} == ""
 
-.if defined(WITH_NAS)
-LIB_DEPENDS+=	audio.2:${PORTSDIR}/audio/nas
+.if ${PORT_OPTIONS:MNAS}
+LIB_DEPENDS+=	audio:${PORTSDIR}/audio/nas
 .else
 CONFIGURE_ARGS+=	--disable-nas
 .endif
@@ -98,4 +93,4 @@ do-install:
 
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/audio/xmms-gbsplay/Makefile
==============================================================================
--- head/audio/xmms-gbsplay/Makefile	Fri Sep  7 18:22:12 2012	(r303817)
+++ head/audio/xmms-gbsplay/Makefile	Fri Sep  7 18:37:52 2012	(r303818)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xmms-gbsplay
-# Date created:				25 Jun 2005
-# Whom:					Emanuel Haupt <ehaupt@critical.ch>
-#
 # $FreeBSD$
-#
 
 PKGNAMEPREFIX=	xmms-