From owner-svn-ports-all@FreeBSD.ORG  Tue Nov 27 12:05:04 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E452BDCB;
 Tue, 27 Nov 2012 12:05:04 +0000 (UTC) (envelope-from ak@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 B0B338FC0C;
 Tue, 27 Nov 2012 12:05:04 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qARC54OH060172;
 Tue, 27 Nov 2012 12:05:04 GMT (envelope-from ak@svn.freebsd.org)
Received: (from ak@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qARC54XQ060171;
 Tue, 27 Nov 2012 12:05:04 GMT (envelope-from ak@svn.freebsd.org)
Message-Id: <201211271205.qARC54XQ060171@svn.freebsd.org>
From: Alex Kozlov <ak@FreeBSD.org>
Date: Tue, 27 Nov 2012 12:05:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307837 - head/comms/morse
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: Tue, 27 Nov 2012 12:05:05 -0000

Author: ak
Date: Tue Nov 27 12:05:04 2012
New Revision: 307837
URL: http://svnweb.freebsd.org/changeset/ports/307837

Log:
  - Convert Makefile headers to new style
  - Convert to new options framework
  
  PR:	ports/173608 (based on)
  Submitted by:	Charlie & <edward@rdtan.net>
  Approved by:	Stephen Hurd <shurd@sasktel.net> (maintainer)
  Feature safe:	yes

Modified:
  head/comms/morse/Makefile   (contents, props changed)

Modified: head/comms/morse/Makefile
==============================================================================
--- head/comms/morse/Makefile	Tue Nov 27 11:32:06 2012	(r307836)
+++ head/comms/morse/Makefile	Tue Nov 27 12:05:04 2012	(r307837)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	morse
-# Date created:		2012-04-11
-# Whom:			Stephen Hurd <shurd@sasktel.net>
-#
+# Created by:	Stephen Hurd <shurd@sasktel.net>
 # $FreeBSD$
-#
 
 PORTNAME=	morse
 PORTVERSION=	2.4
@@ -17,37 +13,29 @@ MAN1=		morsec.1 QSO.1
 PLIST_FILES=	bin/morsec \
 		bin/QSO
 
-OPTIONS=	OSS "Beep using OSS (/dev/dsp)"	on \
-		X11 "Beep using X server"	off \
-		PA  "Beep using Pulse Audio"	off
+OPTIONS_SINGLE=	SOUND
+OPTIONS_SINGLE_SOUND=	OSS X11 PA
+OPTIONS_DEFAULT=	OSS
+
+OSS_DESC=	Beep using OSS (/dev/dsp)
+X11_DESC=	Beep using X server
+PA_DESC=	Beep using Pulse Audio
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_OSS)
+.if ${PORT_OPTIONS:MOSS}
 MAKE_FLAGS+=	DEVICE=OSS
 
-.if defined(WITH_X11) || defined(WITH_PA)
-BROKEN=	Only one sound output method must be chosen.
-.endif
-
-.elif defined(WITH_X11)
+.elif ${PORT_OPTIONS:MX11}
 MAKE_FLAGS+=	DEVICE=X11
 USE_XORG=	x11
 CFLAGS+=	-I${PREFIX}/include
 LDFLAGS+=	-L${PREFIX}/lib
 
-.if defined(WITH_OSS) || defined(WITH_PA)
-BROKEN=	Only one sound output method must be chosen.
-.endif
-
-.elif defined(WITH_PA)
+.elif ${PORT_OPTIONS:MPA}
 MAKE_FLAGS+=	DEVICE=PA
 LIB_DEPENDS+=	pulse-simple:${PORTSDIR}/audio/pulseaudio
 USE_GNOME=	pkgconfig
-
-.if defined(WITH_OSS) || defined(WITH_X11)
-BROKEN=	Only one sound output method must be chosen.
-.endif
 .endif
 
 do-install: