Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 15 Dec 2012 03:55:27 GMT
From:      "4721@hushmail.com" <4721@hushmail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/174448: [patch] fix audio/baudline on amd64
Message-ID:  <201212150355.qBF3tREM012259@red.freebsd.org>
Resent-Message-ID: <201212150400.qBF400Ft047581@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         174448
>Category:       ports
>Synopsis:       [patch] fix audio/baudline on amd64
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 15 04:00:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     4721@hushmail.com
>Release:        
>Organization:
>Environment:
>Description:
the audio/baudline port tries to install the 64-bit version on amd64, which installs an unusable program because freebsd can not run 64-bit linux programs.

* fix on amd64 by forcing to always use the i686 version
* remove unncessary EXTRACT_SUFX
* optionalize MPG123 dependency
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: audio/baudline/Makefile
===================================================================
--- audio/baudline/Makefile	(revision 308925)
+++ audio/baudline/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	baudline
-# Date created:				19 Jan 2002
-# Whom:					David Yeske <dyeske@gmail.com>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	baudline
 PORTVERSION=	1.08
@@ -12,16 +7,12 @@
 # package cluster to automatically fetch baudline
 MASTER_SITES=	http://www.baudline.com/
 PKGNAMEPREFIX=	linux-
-DISTNAME=	baudline_${PORTVERSION:S/.p/pre/}_linux_${ARCH_SUFX}
-EXTRACT_SUFX=	.tar.gz
+DISTNAME=	baudline_${PORTVERSION:S/.p/pre/}_linux_i686
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Real-time signal analysis and time-frequency browser
 
-RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
-
 WRKSRC=		${WRKDIR}/${DISTNAME:S/i686/x86/}
-ARCH_SUFX=	${ARCH:S/i386/i686/:S/amd64/x86_64/}
 USE_LINUX=	yes
 USE_LINUX_APPS=	xorglibs
 ONLY_FOR_ARCHS=	i386 amd64
@@ -31,6 +22,15 @@
 PORTDOCS=	README_unix.txt
 PLIST_FILES=	bin/baudline
 
+OPTIONS_DEFINE=	MPG123
+OPTIONS_DEFAULT=MPG123
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MMPG123}
+RUN_DEPENDS+=	mpg123:${PORTSDIR}/audio/mpg123
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
Index: audio/baudline/distinfo
===================================================================
--- audio/baudline/distinfo	(revision 308925)
+++ audio/baudline/distinfo	(working copy)
@@ -1,4 +1,2 @@
 SHA256 (baudline_1.08_linux_i686.tar.gz) = 4b42e8d03c9fe9738ec66ee51a8d594a60a5770e8e22bb1d73ae38566fb951f1
 SIZE (baudline_1.08_linux_i686.tar.gz) = 1945014
-SHA256 (baudline_1.08_linux_x86_64.tar.gz) = 79ff55c3817cd4a97d565733ea6e0532be57b05a7ffe7865b03199680800d625
-SIZE (baudline_1.08_linux_x86_64.tar.gz) = 2270546


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212150355.qBF3tREM012259>