From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Nov 13 15:40:00 2012 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B336EF45 for ; Tue, 13 Nov 2012 15:40:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 842498FC0C for ; Tue, 13 Nov 2012 15:40:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qADFe0qS018064 for ; Tue, 13 Nov 2012 15:40:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qADFe0V8018063; Tue, 13 Nov 2012 15:40:00 GMT (envelope-from gnats) Resent-Date: Tue, 13 Nov 2012 15:40:00 GMT Resent-Message-Id: <201211131540.qADFe0V8018063@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Charlie &" Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 410B2F21 for ; Tue, 13 Nov 2012 15:38:14 +0000 (UTC) (envelope-from edward@rdtan.net) Received: from mail-pb0-f54.google.com (mail-pb0-f54.google.com [209.85.160.54]) by mx1.freebsd.org (Postfix) with ESMTP id 0D0F78FC08 for ; Tue, 13 Nov 2012 15:38:13 +0000 (UTC) Received: by mail-pb0-f54.google.com with SMTP id wz12so438987pbc.13 for ; Tue, 13 Nov 2012 07:38:13 -0800 (PST) Received: by 10.68.254.8 with SMTP id ae8mr53609986pbd.46.1352821093257; Tue, 13 Nov 2012 07:38:13 -0800 (PST) Received: from rdtan.net ([175.136.52.242]) by mx.google.com with ESMTPS id m8sm6260065pax.38.2012.11.13.07.38.10 (version=SSLv3 cipher=OTHER); Tue, 13 Nov 2012 07:38:12 -0800 (PST) Received: by rdtan.net (sSMTP sendmail emulation); Tue, 13 Nov 2012 23:38:08 +0800 Message-Id: <50a26964.e84f420a.0532.ffffdce3@mx.google.com> Date: Tue, 13 Nov 2012 23:38:08 +0800 From: "Charlie &" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/173608: [PATCH] comms/morse: OPTIONSNG & trim Makefile header Cc: edward@rdtan.net, shurd@sasktel.net X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Nov 2012 15:40:00 -0000 >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 -# -# $FreeBSD: ports/comms/morse/Makefile,v 1.1 2012/04/18 05:04:42 ak Exp $ -# +# Created by: Stephen Hurd +# $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 -.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: