Bug 174448 - [patch] fix audio/baudline on amd64
Summary: [patch] fix audio/baudline on amd64
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Diane Bruce
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-12-15 04:00 UTC by 4721@hushmail.com
Modified: 2012-12-25 18:20 UTC (History)
0 users

See Also:

Attachments
file.diff (1.81 KB, patch)
2012-12-15 04:00 UTC, 4721@hushmail.com 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description 4721@hushmail.com 2012-12-15 04:00:00 UTC 
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

Fix: Patch attached with submission follows:
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2012-12-15 04:00:09 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->hamradio

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Diane Bruce freebsd_committer freebsd_triage 2012-12-15 23:47:48 UTC 
Responsible Changed
From-To: hamradio->db

I'll take it.
Comment 3 dfilter service freebsd_committer freebsd_triage 2012-12-25 18:11:27 UTC 
Author: db
Date: Tue Dec 25 18:11:04 2012
New Revision: 309491
URL: http://svnweb.freebsd.org/changeset/ports/309491

Log:
  * fix on amd64 by forcing to always use the i686 version
  * remove unncessary EXTRACT_SUFX
  * optionalize MPG123 dependency
  
  PR:		ports/174448
  Submitted by:	4721@hushmail.com

Modified:
  head/audio/baudline/Makefile   (contents, props changed)
  head/audio/baudline/distinfo   (contents, props changed)

Modified: head/audio/baudline/Makefile
==============================================================================
--- head/audio/baudline/Makefile	Tue Dec 25 17:19:12 2012	(r309490)
+++ head/audio/baudline/Makefile	Tue Dec 25 18:11:04 2012	(r309491)
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	baudline
-# Date created:				19 Jan 2002
-# Whom:					David Yeske <dyeske@gmail.com>
-#
+# Created by: David Yeske <dyeske@gmail.com>
 # $FreeBSD$
 #
 
@@ -12,16 +9,12 @@ CATEGORIES=	audio linux
 # 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,8 +24,16 @@ RESTRICTED=	author requests no distribut
 PORTDOCS=	README_unix.txt
 PLIST_FILES=	bin/baudline
 
+OPTIONS_DEFINE=		MPG123
+OPTIONS_DEFAULT=	MPG123
+
+.include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
 
+.if ${PORT_OPTIONS:MMPG123}
+RUN_DEPENDS+=	mpg123:${PORTSDIR}/audio/mpg123
+.endif
+
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
 IGNORE=		may not be automatically fetched due to licensing\
 		restrictions. You must manually fetch ${DISTFILES} from\

Modified: head/audio/baudline/distinfo
==============================================================================
--- head/audio/baudline/distinfo	Tue Dec 25 17:19:12 2012	(r309490)
+++ head/audio/baudline/distinfo	Tue Dec 25 18:11:04 2012	(r309491)
@@ -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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 4 Diane Bruce freebsd_committer freebsd_triage 2012-12-25 18:11:33 UTC 
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!