From 2c67d66fa5332ec13a6393cf218c8479d40d37d9 Mon Sep 17 00:00:00 2001 From: Diane Bruce Date: Tue, 25 Dec 2012 18:11:04 +0000 Subject: [PATCH] * 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 --- audio/baudline/Makefile | 19 ++++++++++--------- audio/baudline/distinfo | 2 -- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/audio/baudline/Makefile b/audio/baudline/Makefile index 1e007297f49d..ef6532788f88 100644 --- a/audio/baudline/Makefile +++ b/audio/baudline/Makefile @@ -1,7 +1,4 @@ -# New ports collection makefile for: baudline -# Date created: 19 Jan 2002 -# Whom: David Yeske -# +# Created by: David Yeske # $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 distribution except from their site PORTDOCS= README_unix.txt PLIST_FILES= bin/baudline +OPTIONS_DEFINE= MPG123 +OPTIONS_DEFAULT= MPG123 + +.include .include +.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\ diff --git a/audio/baudline/distinfo b/audio/baudline/distinfo index 51496b381657..c22b1185339c 100644 --- a/audio/baudline/distinfo +++ b/audio/baudline/distinfo @@ -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