From owner-svn-ports-head@freebsd.org  Wed Oct  7 01:38:14 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id AB74E9D07F7;
 Wed,  7 Oct 2015 01:38:14 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 74B15C9B;
 Wed,  7 Oct 2015 01:38:14 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t971cDvf018817;
 Wed, 7 Oct 2015 01:38:13 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t971cDZ8018816;
 Wed, 7 Oct 2015 01:38:13 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201510070138.t971cDZ8018816@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Wed, 7 Oct 2015 01:38:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r398742 - 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-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Oct 2015 01:38:14 -0000

Author: amdmi3
Date: Wed Oct  7 01:38:13 2015
New Revision: 398742
URL: https://svnweb.freebsd.org/changeset/ports/398742

Log:
  - Switch to options helpers
  - Add LICENSE_FILE
  
  Approved by:	portmgr blanket

Modified:
  head/comms/morse/Makefile

Modified: head/comms/morse/Makefile
==============================================================================
--- head/comms/morse/Makefile	Wed Oct  7 01:38:08 2015	(r398741)
+++ head/comms/morse/Makefile	Wed Oct  7 01:38:13 2015	(r398742)
@@ -11,6 +11,7 @@ MAINTAINER=	shurd@FreeBSD.org
 COMMENT=	Morse Code Trainer
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 PLIST_FILES=	bin/morsec bin/QSO man/man1/QSO.1.gz man/man1/morsec.1.gz
 
@@ -22,22 +23,16 @@ OSS_DESC=	Beep using OSS (/dev/dsp)
 X11_DESC=	Beep using X server
 PULSEAUDIO_DESC=	Beep using Pulse Audio
 
-.include <bsd.port.options.mk>
+OSS_MAKE_ARGS=	DEVICE=OSS
 
-.if ${PORT_OPTIONS:MOSS}
-MAKE_FLAGS+=	DEVICE=OSS
-
-.elif ${PORT_OPTIONS:MX11}
-MAKE_FLAGS+=	DEVICE=X11
-USE_XORG=	x11
-CFLAGS+=	-I${PREFIX}/include
-LDFLAGS+=	-L${PREFIX}/lib
-
-.elif ${PORT_OPTIONS:MPULSEAUDIO}
-MAKE_FLAGS+=	DEVICE=PA
-LIB_DEPENDS+=	libpulse-simple.so:${PORTSDIR}/audio/pulseaudio
-USES+=		pkgconfig
-.endif
+X11_MAKE_ARGS=	DEVICE=X11
+X11_USE=	XORG=x11
+X11_CFLAGS=	-I${LOCALBASE}/include
+X11_LDFLAGS=	-L${LOCALBASE}/lib
+
+PULSEAUDIO_MAKE_ARGS=	DEVICE=PA
+PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_USES=	pkgconfig
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/morse ${STAGEDIR}${PREFIX}/bin/morsec