svn commit: r303818 - in head/audio: gbsplay xmms-gbsplay

[Emanuel Haupt]

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 at 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 at critical.ch>
-#
 # $FreeBSD$
-#
 
 PKGNAMEPREFIX=	xmms-