From owner-svn-ports-head@FreeBSD.ORG  Fri Sep  7 18:20:54 2012
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B5FB9106564A;
	Fri,  7 Sep 2012 18:20:54 +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 A141B8FC14;
	Fri,  7 Sep 2012 18:20:54 +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 q87IKsnx043125;
	Fri, 7 Sep 2012 18:20:54 GMT (envelope-from ehaupt@svn.freebsd.org)
Received: (from ehaupt@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q87IKsrR043122;
	Fri, 7 Sep 2012 18:20:54 GMT (envelope-from ehaupt@svn.freebsd.org)
Message-Id: <201209071820.q87IKsrR043122@svn.freebsd.org>
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Fri, 7 Sep 2012 18:20:54 +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: r303816 - head/audio/adplay
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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, 07 Sep 2012 18:20:54 -0000

Author: ehaupt
Date: Fri Sep  7 18:20:54 2012
New Revision: 303816
URL: http://svn.freebsd.org/changeset/ports/303816

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

Modified:
  head/audio/adplay/Makefile

Modified: head/audio/adplay/Makefile
==============================================================================
--- head/audio/adplay/Makefile	Fri Sep  7 18:16:57 2012	(r303815)
+++ head/audio/adplay/Makefile	Fri Sep  7 18:20:54 2012	(r303816)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	adplay
-# Date created:				10 August 2004
-# Whom:					Emanuel Haupt <ehaupt@critical.ch>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	adplay
 PORTVERSION=	1.7
@@ -19,7 +14,7 @@ COMMENT=	AdLib player using adplug libra
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	adplug-2.2:${PORTSDIR}/audio/libadplug
+LIB_DEPENDS=	adplug:${PORTSDIR}/audio/libadplug
 
 GNU_CONFIGURE=	yes
 WANT_SDL=	yes
@@ -37,11 +32,11 @@ MAN1=		adplay.1
 PLIST_FILES=	bin/adplay %%DATADIR%%/adplug.db
 PLIST_DIRS=	%%DATADIR%%
 
-OPTIONS=	SDL	"Build with SDL output support"	off
+OPTIONS_DEFINE=	SDL
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_SDL)
+.if ${PORT_OPTIONS:MSDL}
 USE_SDL=	sdl mixer
 .else
 CONFIGURE_ARGS+=	--disable-output-sdl
@@ -58,4 +53,4 @@ do-install:
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/${DBVERSION}/${DBFILE} ${DATADIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>