Date: Tue, 13 Nov 2012 23:38:08 +0800 From: "Charlie &" <edward@rdtan.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: edward@rdtan.net, shurd@sasktel.net Subject: ports/173608: [PATCH] comms/morse: OPTIONSNG & trim Makefile header Message-ID: <50a26964.e84f420a.0532.ffffdce3@mx.google.com> Resent-Message-ID: <201211131540.qADFe0V8018063@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 173608
>Category: ports
>Synopsis: [PATCH] comms/morse: OPTIONSNG & trim Makefile header
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Nov 13 15:40:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Edward
>Release: FreeBSD 8.3-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD optionsng 8.3-RELEASE FreeBSD 8.3-RELEASE #0: Mon Apr 9 21:23:18 UTC
>Description:
- Update to use OPTIONSNG
- Trim Makefile header
Port maintainer (shurd@sasktel.net) is cc'd.
Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:
begin 644 morse-2.4.patch
--- Makefile.original 2012-11-13 22:59:10.000000000 +0800
+++ Makefile 2012-11-13 23:33:15.000000000 +0800
@@ -1,9 +1,5 @@
-# New ports collection makefile for: morse
-# Date created: 2012-04-11
-# Whom: Stephen Hurd <shurd@sasktel.net>
-#
-# $FreeBSD: ports/comms/morse/Makefile,v 1.1 2012/04/18 05:04:42 ak Exp $
-#
+# Created by: Stephen Hurd <shurd@sasktel.net>
+# $FreeBSD$
PORTNAME= morse
PORTVERSION= 2.4
@@ -17,35 +13,38 @@
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_DEFINE= PA X11 OSS
+OPTIONS_DEFAULT= OSS
+
+PA_DESC= Beep using Pulse Audio
+X11_DESC= Beep using X server
+OSS_DESC= Beep using OSS (/dev/dsp)
.include <bsd.port.options.mk>
-.if defined(WITH_OSS)
+.if ${PORT_OPTIONS:MOSS}
MAKE_FLAGS+= DEVICE=OSS
-.if defined(WITH_X11) || defined(WITH_PA)
+.if ${PORT_OPTIONS:MX11} || ${PORT_OPTIONS:MPA}
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)
+.if ${PORT_OPTIONS:MOSS} || ${PORT_OPTIONS:MPA}
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)
+.if ${PORT_OPTIONS:MOSS} || ${PORT_OPTIONS:MX11}
BROKEN= Only one sound output method must be chosen.
.endif
.endif
end
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?50a26964.e84f420a.0532.ffffdce3>