From owner-freebsd-ports Mon Sep 17 23:30:14 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5BE9837B401 for ; Mon, 17 Sep 2001 23:30:02 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.4/8.11.4) id f8I6U2L62768; Mon, 17 Sep 2001 23:30:02 -0700 (PDT) (envelope-from gnats) Date: Mon, 17 Sep 2001 23:30:02 -0700 (PDT) Message-Id: <200109180630.f8I6U2L62768@freefall.freebsd.org> To: freebsd-ports@FreeBSD.org Cc: From: The Anarcat Subject: Re: ports/28363: New port: audacity-0.95 - a graphical waveform editor Reply-To: The Anarcat Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org The following reply was made to PR ports/28363; it has been noted by GNATS. From: The Anarcat To: freebsd-gnats-submit@FreeBSD.org Cc: Subject: Re: ports/28363: New port: audacity-0.95 - a graphical waveform editor Date: Tue, 18 Sep 2001 02:28:12 -0400 --ytoMbUMiTKPMT3hY Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi. "This pr can be closed". :) I don't know why this PR is still opened, but I worked on a port for audacity on my own side only to be told by the Audacity people that there was already a port made. :) So I bring here my contribution. I made a merge of this port (0.95) with the port I was doing (0.96) and I think the result is quite good. What I changed: 1- version 0.95->0.96 2- libid3 dependency (included some CONFIG_ENV hacks) 3- removal of USE_GTK dependency (included by wxgtk dep) 4- removal of the --without-xaudio flag (detected automagically) 5- finer control over the location of the help file (PREFIX-independant) 6- added libvorbis support toggle About 4-. --without-xaudio is not necessary. The configure script detects the OS and tells it cannot compile on FBSD. I add a ifdef for WITH_MP3, to toggle the compilation of the port with libmpeg3, the alternate mp3 lib. For now, this is broken. Anyways, by 1.0, Audacity will be using libmad. About 6-... As noted in comments, I would like to put a message before configure is called to tell the admin he can use WITHOUT_VORBIS to avoid building in vorbis support... How do I do that? This is the generic problem of "how do I talk to the user in a makefile". :) I don't have any handy example. Anyways, here are the diffs to the original port, followed by a complete shar of the new port itself. Note that the patch in the original files dir must be removed and replace by the 2 new patches. --- distinfo.orig Mon Sep 17 20:44:25 2001 +++ distinfo Mon Sep 17 20:45:37 2001 @@ -1 +1 @@ -MD5 (audacity-src-0.95.tgz) =3D b5ebe5657d2c0cd14d465c8f5974f114 +MD5 (audacity-src-0.96.tgz) =3D dc4bfaa6bf00108963485e1052a8452c --- Makefile.orig Mon Sep 17 20:44:35 2001 +++ Makefile Tue Sep 18 02:23:28 2001 @@ -6,30 +6,43 @@ # =20 PORTNAME=3D audacity -PORTVERSION=3D 0.95 +PORTVERSION=3D 0.96 CATEGORIES=3D audio MASTER_SITES=3D ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR=3D audacity -DISTNAME=3D ${PORTNAME}-src-${PORTVERSION} +MASTER_SITE_SUBDIR=3D ${PORTNAME} +DISTNAME=3D ${PORTNAME}-src-${PORTVERSION} EXTRACT_SUFX=3D .tgz =20 MAINTAINER=3D 3d@freebsd.org =20 -LIB_DEPENDS=3D wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk +LIB_DEPENDS=3D wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk \ + id3-3.7.13:${PORTSDIR}/audio/id3lib =20 -GNU_CONFIGURE=3D yes - -# Xaudio MP3 support for FreeBSD is not present in source tarball -# However there is a FreeBSD version available from -# http://www.xaudio.com -# I need to sort things out (addition? separate download?) -CONFIGURE_ARGS=3D --without-xaudio +.if defined(WITH_MP3) +BROKEN=3D libmpeg3 doesn't compile, waiting 1.0 for libmad support +CONFIGURE_ARGS+=3D --with-libmpeg3 +.else +# message to say MP3 support is not compiled in because xaudio does not +# compile on FreeBSD either +.endif =20 +GNU_CONFIGURE=3D yes USE_GMAKE=3D yes USE_NEWGCC=3D yes -USE_GTK=3D yes =20 USE_X_PREFIX=3D yes + +AUDACITY_HELP_DIR=3D ${PREFIX}/share/doc/audacity + +CONFIGURE_ENV+=3D LDFLAGS=3D"-L${LOCALBASE}/lib" \ + CPPFLAGS=3D"-I${LOCALBASE}/include" \ + CFLAGS=3D"-DAUDACITY_HELP_DIR=3D${AUDACITY_HELP_DIR}" + +.if !defined(WITHOUT_VORBIS) +CONFIGURE_ARGS+=3D --with-vorbis +LIB_DEPENDS+=3D vorbis.0:${PORTSDIR}/audio/libvorbis +# this should also tell the user how to avoid compiling with vorbis +.endif =20 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/audacity ${PREFIX}/bin/audacity # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # audacity # audacity/files # audacity/files/patch::Help.h # audacity/files/patch::Help.cpp # audacity/distinfo # audacity/pkg-comment # audacity/Makefile # audacity/pkg-plist # audacity/pkg-descr # echo c - audacity mkdir -p audacity > /dev/null 2>&1 echo c - audacity/files mkdir -p audacity/files > /dev/null 2>&1 echo x - audacity/files/patch::Help.h sed 's/^X//' >audacity/files/patch::Help.h << 'END-of-audacity/files/patch:= :Help.h' X--- Help.h.orig Mon Sep 17 16:52:09 2001 X+++ Help.h Mon Sep 17 16:52:53 2001 X@@ -11,6 +11,10 @@ X #ifndef __AUDACITY_HELP__ X #define __AUDACITY_HELP__ X=20 X+#ifndef AUDACITY_HELP_DIR X+#define AUDACITY_HELP_DIR /usr/X11R6/share/audacity X+#endif X+ X void InitHelp(wxWindow * parent); X void ShowHelp(wxWindow * parent); X void ShowHelp(wxWindow * parent, wxString topic); END-of-audacity/files/patch::Help.h echo x - audacity/files/patch::Help.cpp sed 's/^X//' >audacity/files/patch::Help.cpp << 'END-of-audacity/files/patc= h::Help.cpp' X--- Help.cpp.orig Mon Sep 17 16:50:58 2001 X+++ Help.cpp Mon Sep 17 16:53:11 2001 X@@ -61,7 +61,7 @@ X void InitHelp(wxWindow * parent) X { X if (!gHelp) { X- wxString defaultLoc =3D wxGetCwd() + wxFILE_SEP_PATH + "audacity-he= lp.htb"; X+ wxString defaultLoc =3D AUDACITY_HELP_DIR + wxFILE_SEP_PATH + "auda= city-help.htb"; X=20 X wxString helpFilePath =3D X gPrefs->Read("/Help/HelpFilePath", defaultLoc); END-of-audacity/files/patch::Help.cpp echo x - audacity/distinfo sed 's/^X//' >audacity/distinfo << 'END-of-audacity/distinfo' XMD5 (audacity-src-0.96.tgz) =3D dc4bfaa6bf00108963485e1052a8452c END-of-audacity/distinfo echo x - audacity/pkg-comment sed 's/^X//' >audacity/pkg-comment << 'END-of-audacity/pkg-comment' XAudacity is a GUI editor for digital audio waveforms END-of-audacity/pkg-comment echo x - audacity/Makefile sed 's/^X//' >audacity/Makefile << 'END-of-audacity/Makefile' X# New ports collection makefile for: audacity X# Date created: 21 Jul 2001 X# Whom: Marc van Woerkom <3d@freebsd.org> X# X# $FreeBSD: $ X# X XPORTNAME=3D audacity XPORTVERSION=3D 0.96 XCATEGORIES=3D audio XMASTER_SITES=3D ${MASTER_SITE_SOURCEFORGE} XMASTER_SITE_SUBDIR=3D ${PORTNAME} XDISTNAME=3D ${PORTNAME}-src-${PORTVERSION} XEXTRACT_SUFX=3D .tgz X XMAINTAINER=3D 3d@freebsd.org X XLIB_DEPENDS=3D wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk \ X id3-3.7.13:${PORTSDIR}/audio/id3lib X X.if defined(WITH_MP3) XBROKEN=3D libmpeg3 doesn't compile, waiting 1.0 for libmad support XCONFIGURE_ARGS+=3D --with-libmpeg3 X.else X# message to say MP3 support is not compiled in because xaudio does not X# compile on FreeBSD either X.endif X XGNU_CONFIGURE=3D yes XUSE_GMAKE=3D yes XUSE_NEWGCC=3D yes X XUSE_X_PREFIX=3D yes X XAUDACITY_HELP_DIR=3D ${PREFIX}/share/doc/audacity X XCONFIGURE_ENV+=3D LDFLAGS=3D"-L${LOCALBASE}/lib" \ X CPPFLAGS=3D"-I${LOCALBASE}/include" \ X CFLAGS=3D"-DAUDACITY_HELP_DIR=3D${AUDACITY_HELP_DIR}" X X.if !defined(WITHOUT_VORBIS) XCONFIGURE_ARGS+=3D --with-vorbis XLIB_DEPENDS+=3D vorbis.0:${PORTSDIR}/audio/libvorbis X# this should also tell the user how to avoid compiling with vorbis X.endif X Xdo-install: X ${INSTALL_PROGRAM} ${WRKSRC}/audacity ${PREFIX}/bin/audacity X.if !defined(NOPORTDOCS) X ${MKDIR} ${PREFIX}/share/doc/audacity X ${INSTALL_DATA} ${WRKSRC}/audacity-help.htb ${PREFIX}/share/doc/audacity/= audacity-help.htb X.endif X X.include END-of-audacity/Makefile echo x - audacity/pkg-plist sed 's/^X//' >audacity/pkg-plist << 'END-of-audacity/pkg-plist' Xbin/audacity Xshare/doc/audacity/audacity-help.htb X@dirrm share/doc/audacity END-of-audacity/pkg-plist echo x - audacity/pkg-descr sed 's/^X//' >audacity/pkg-descr << 'END-of-audacity/pkg-descr' XAudacity is a program that lets you manipulate digital audio Xwaveforms. In addition to letting you record sounds directly from Xwithin the program, it imports many sound file formats, including XWAV, AIFF, AU, IRCAM, MP3, and Ogg Vorbis. It supports all Xcommon editing operations such as Cut, Copy, and Paste, plus it will Xmix tracks and let you apply plug-in effects to any part of a sound. It Xalso has a built-in amplitude envelope editor, a customizable Xspectrogram mode and a frequency analysis window for audio Xanalysis applications.=20 X XWWW: http://www.cs.cmu.edu/~music/audacity END-of-audacity/pkg-descr exit --ytoMbUMiTKPMT3hY Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.6 (FreeBSD) Comment: For info see http://www.gnupg.org iEYEARECAAYFAjum6XsACgkQttcWHAnWiGe5nQCfU8JoWw7tHgJG9P9wv2FFitdu La4AoKKEzZO2RAnyaKqM0B+TcQnSydHM =WGbr -----END PGP SIGNATURE----- --ytoMbUMiTKPMT3hY-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message