From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Nov 16 04:14:11 2004 Return-Path: Delivered-To: freebsd-ports-bugs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 256C716A4CE; Tue, 16 Nov 2004 04:14:11 +0000 (GMT) Received: from matrix.bilogic.org (ca-redbch-cuda1-c3a-216.stmnca.adelphia.net [68.68.193.216]) by mx1.FreeBSD.org (Postfix) with ESMTP id 717D843D55; Tue, 16 Nov 2004 04:14:10 +0000 (GMT) (envelope-from freebsd@bilogic.org) Received: from localhost (localhost [127.0.0.1]) by matrix.bilogic.org (8.12.10/8.12.10) with ESMTP id iAG4E9Gn051607; Mon, 15 Nov 2004 20:14:09 -0800 (PST) (envelope-from freebsd@bilogic.org) Date: Mon, 15 Nov 2004 20:14:09 -0800 (PST) From: freebsd@bilogic.org X-X-Sender: pete@matrix.bilogic.org To: Volker Stolz In-Reply-To: <20041115105213.J39475@matrix.bilogic.org> Message-ID: <20041115200950.J42236@matrix.bilogic.org> References: <200411150911.iAF9B7Av059759@freefall.freebsd.org> <20041115105213.J39475@matrix.bilogic.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: freebsd-ports-bugs@FreeBSD.org cc: freebsd-gnats-submit@FreeBSD.org Subject: Re: ports/73917: [PATCH] Update audio/cheesetracker to 0.9.9 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Nov 2004 04:14:11 -0000 I think the following change to Makefile should fix the issue (instead of the one included in the original patch). This sets QTDIR for the build. -Peter Index: Makefile =================================================================== RCS file: /home/ncvs/ports/audio/cheesetracker/Makefile,v retrieving revision 1.20 diff -u -r1.20 Makefile --- Makefile 26 Feb 2004 21:08:47 -0000 1.20 +++ Makefile 16 Nov 2004 04:12:49 -0000 @@ -7,8 +7,7 @@ # PORTNAME= cheesetracker -PORTVERSION= 0.9.1 -PORTREVISION= 1 +PORTVERSION= 0.9.9 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= cheesetronic @@ -17,25 +16,20 @@ COMMENT= An Impulse Tracker clone BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa \ - qmake:${PORTSDIR}/devel/qmake + scons:${PORTSDIR}/devel/scons LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 USE_QT_VER= 3 -MAKE_ENV= QTDIR="${QT_PREFIX}" -post-patch: - @${CP} ${FILESDIR}/cheesetracker.pro ${WRKSRC} - -do-configure: - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake \ - -spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ cheesetracker.pro +do-build: + @cd ${WRKSRC} && ${SETENV} QTDIR="${QT_PREFIX}" scons do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/cheesetracker ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/cheesetracker/program__QT/cheesetracker_qt ${PREFIX}/bin .if !defined(NOPORTDOCS) @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/examples/*.it ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/examples/*.xm ${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/cheesetracker/examples/*.it ${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/cheesetracker/examples/*.xm ${EXAMPLESDIR} .endif .include On Mon, 15 Nov 2004 freebsd@bilogic.org wrote: > I only tested on 5.3; I removed a dependency on qmake, but I think I > missed adding a qt33 dependency back in and neglected to test the port in > an empty mtree. Here's the list of updated/removed/added files (as > reported by CVS update): > > cvs update: Updating . > M Makefile > M distinfo > M pkg-plist > cvs update: Updating files > R files/cheesetracker.pro > A files/patch-SConstruct > A files/patch-cheesetracker::program__QT::SCsub > A files/patch-common::components::audio::sample_conversion.cpp > R files/patch-common::components::audio::sample_data.cpp > R files/patch-common::components::file::file_access.cpp > R files/patch-common::drivers::posix::mutex_lock_pthread.h > R files/patch-common::drivers::posix::sound_driver_oss.cpp > A files/patch-common::drivers::posix::tcp_client_posix.cpp > A files/patch-common::drivers::posix::tcp_server_posix.cpp > R files/patch-common::drivers::posix::timer_sigalarm.cpp > R files/patch-common::drivers::rtaudio::rt_audio.cpp > R files/patch-common::interface__QT::audio::sample_editor_format.cpp > R files/patch-common::plugins::edit_effects::simple_edit_effects.cpp > M files/patch-common::plugins::effects::custom::chorus_effect.cpp > A files/patch-common::plugins::effects::custom::effect_distortion.cpp > A files/patch-common::plugins::effects::custom::effect_pshift.cpp > R files/patch-common::plugins::effects::custom::freeverb_effect.cpp > A files/patch-common::plugins::effects::ladspa::SCsub > R files/patch-common::plugins::effects::ladspa::ladspa_effect.cpp > R files/patch-common::plugins::effects::ladspa::ladspa_effect_source.cpp > R files/patch-common::plugins::resamplers::helpers.h > A files/patch-detect.py > R files/patch-interface_binds::editor.cpp > R files/patch-trackercore::tracker_voice.cpp > > If you can't figure out how to make it work, I'll take a look at it later > today; I've got a 4.x system here too. > > Peter > > On Mon, 15 Nov 2004, Volker Stolz wrote: > > > Synopsis: [PATCH] Update audio/cheesetracker to 0.9.9 > > > > State-Changed-From-To: open->feedback > > State-Changed-By: vs > > State-Changed-When: Mon Nov 15 09:09:51 GMT 2004 > > State-Changed-Why: > > Hm, something doesn't work as expected on 4.10. Did you nuke any patches which > > were addressing this or is this new behaviour? Also, please explicitly list > > added/removed files in your PR. > > > > ===> cheesetracker-0.9.9 depends on file: /usr/X11R6/bin/moc - found > > ===> cheesetracker-0.9.9 depends on shared library: sigc-1.2.5 - found > > ===> Configuring for cheesetracker-0.9.9 > > ===> Building for cheesetracker-0.9.9 > > scons: Reading SConscript files ... > > Detecting if PKG-CONFIG is installed... > > 0.15.0 > > pkg-config found! > > Checking for libsigc++-1.2... > > 1.2.5 > > libsigc++-1.2 found! > > QT Check: > > $QTDIR not found, you could define this pointing to a proper QT location if not found > > I will try to check if you have Qt in a bunch of paths.. > > Looking for QT 3.x Includes: > > /usr/X11R6/include > > Checking QT version.. > > > > #define QT_VERSION_STR "3.3.2" > > > > Looking for QT 3.x Libraries: > > Looking for QT 3.x 'moc' Binary: > > I Couldnt find QT in your system :( > > > > > > http://www.freebsd.org/cgi/query-pr.cgi?pr=73917 > > >