From owner-freebsd-ports Sat Aug 3 2:11:11 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9AE5637B864 for ; Sat, 3 Aug 2002 02:10:13 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4920343ED1 for ; Sat, 3 Aug 2002 02:10:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g739A2JU024986 for ; Sat, 3 Aug 2002 02:10:02 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g739A27g024985; Sat, 3 Aug 2002 02:10:02 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B67F737B401; Sat, 3 Aug 2002 02:07:47 -0700 (PDT) Received: from kartoffel.salatschuessel.net (pD9E21522.dip.t-dialin.net [217.226.21.34]) by mx1.FreeBSD.org (Postfix) with ESMTP id A3F6F4405D; Sat, 3 Aug 2002 01:46:06 -0700 (PDT) (envelope-from olivleh1@kartoffel.salatschuessel.net) Received: from kartoffel.salatschuessel.net (localhost [127.0.0.1]) by kartoffel.salatschuessel.net (8.12.4/8.12.3) with ESMTP id g738jat2033625; Sat, 3 Aug 2002 10:45:36 +0200 (CEST) (envelope-from olivleh1@kartoffel.salatschuessel.net) Received: (from root@localhost) by kartoffel.salatschuessel.net (8.12.4/8.12.4/Submit) id g738jaAw033624; Sat, 3 Aug 2002 10:45:36 +0200 (CEST) Message-Id: <200208030845.g738jaAw033624@kartoffel.salatschuessel.net> Date: Sat, 3 Aug 2002 10:45:36 +0200 (CEST) From: Oliver Lehmann Reply-To: Oliver Lehmann To: FreeBSD-gnats-submit@FreeBSD.org Cc: lehmann@ans-netz.de, sobomax@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/41280: update-port: audio/extace (unbroke) 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 >Number: 41280 >Category: ports >Synopsis: update-port: audio/extace (unbroke) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Aug 03 02:10:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Oliver Lehmann >Release: FreeBSD 4.6-STABLE i386 >Organization: >Environment: System: FreeBSD kartoffel.salatschuessel.net 4.6-STABLE FreeBSD 4.6-STABLE #2: Wed Jul 10 21:57:02 CEST 2002 olivleh1@nudel.salatschuessel.net:/usr/obj/i386/usr/src/sys/KARTOFFEL i386 >Description: make extace compile again, and update to the latest version patch file patch-ac got removed >How-To-Repeat: >Fix: --- extace.patch begins here --- diff -ruN extace.old/Makefile /usr/ports/audio/extace/Makefile --- extace.old/Makefile Sat May 18 05:31:05 2002 +++ /usr/ports/audio/extace/Makefile Sat Aug 3 10:40:25 2002 @@ -6,15 +6,13 @@ # PORTNAME= extace -PORTVERSION= 1.4.5 +PORTVERSION= 1.7.3 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= eXtace +MASTER_SITE_SUBDIR= extace MAINTAINER= sobomax@FreeBSD.org -BROKEN= "Configure fails" - LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw USE_X_PREFIX= yes @@ -25,6 +23,7 @@ CONFIGURE_ARGS= --disable-alsa CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_LIBFFTW" \ LIBS="-L${LOCALBASE}/lib" +USE_REINPLACE= YES .include @@ -33,9 +32,9 @@ .endif pre-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + @${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" \ + -e "s|DATADIRNAME=lib|DATADIRNAME=share|g" ${WRKSRC}/configure + @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g' .include diff -ruN extace.old/distinfo /usr/ports/audio/extace/distinfo --- extace.old/distinfo Tue Jan 2 20:32:20 2001 +++ /usr/ports/audio/extace/distinfo Sat Aug 3 10:15:48 2002 @@ -1 +1 @@ -MD5 (extace-1.4.5.tar.gz) = eb3975c05dbf94a3d52b3aea495349a2 +MD5 (extace-1.7.3.tar.gz) = b12ca26f98da7e306df1d3777b1cb77a diff -ruN extace.old/files/patch-aa /usr/ports/audio/extace/files/patch-aa --- extace.old/files/patch-aa Mon Jul 31 11:46:30 2000 +++ /usr/ports/audio/extace/files/patch-aa Sat Aug 3 10:37:17 2002 @@ -1,30 +1,38 @@ ---- configure.orig Sat Jul 22 07:40:27 2000 -+++ configure Mon Jul 31 12:39:34 2000 -@@ -1210,9 +1210,9 @@ +--- configure.orig Sun May 26 19:57:47 2002 ++++ configure Sat Aug 3 10:36:04 2002 +@@ -1595,13 +1595,13 @@ + CFLAGS="$ac_save_CFLAGS" + elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then +- CFLAGS="-g -O2" ++# CFLAGS="-g -O2" + else + CFLAGS="-g" fi else if test "$GCC" = yes; then - CFLAGS="-O2" +# CFLAGS="-O2" else -- CFLAGS= -+# CFLAGS= + CFLAGS= fi - fi - -@@ -1748,9 +1748,9 @@ +@@ -5706,13 +5706,13 @@ + CFLAGS="$ac_save_CFLAGS" + elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then +- CFLAGS="-g -O2" ++# CFLAGS="-g -O2" + else + CFLAGS="-g" fi else if test "$GCC" = yes; then - CFLAGS="-O2" +# CFLAGS="-O2" else -- CFLAGS= -+# CFLAGS= + CFLAGS= fi - fi - -@@ -2764,7 +2764,7 @@ +@@ -6717,7 +6717,7 @@ done @@ -32,13 +40,22 @@ +#CFLAGS="-O2 " - EXTRA_LIBS="" -@@ -3301,7 +3301,7 @@ + EFENCE="" +@@ -7149,7 +7149,8 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lgdk_imlib `gtk-config --libs` $LIBS" -+LIBS="-lgdk_imlib `$GTK_CONFIG --libs` $LIBS" ++IMLIB_LIBS=`imlib-config --libs` ++LIBS="-lgdk_imlib ${GTK_LIBS} ${IMLIB_LIBS} $LIBS" cat > conftest.$ac_ext < - #include - #include -+#ifndef __FreeBSD__ - #include -+#endif - #include "convolve.h" - #ifdef HAVE_LIBRFFTW - #include diff -ruN extace.old/files/patch-ad /usr/ports/audio/extace/files/patch-ad --- extace.old/files/patch-ad Tue Jan 2 20:32:20 2001 +++ /usr/ports/audio/extace/files/patch-ad Sat Aug 3 10:26:21 2002 @@ -1,6 +1,6 @@ ---- extace/sound.c 2001/01/02 09:31:56 1.1 -+++ extace/sound.c 2001/01/02 09:32:16 -@@ -24,7 +24,9 @@ +--- src/sound.c.orig Sat Aug 3 10:25:15 2002 ++++ src/sound.c Sat Aug 3 10:25:49 2002 +@@ -23,7 +23,9 @@ #include #include #include diff -ruN extace.old/files/patch-ae /usr/ports/audio/extace/files/patch-ae --- extace.old/files/patch-ae Thu Jan 1 01:00:00 1970 +++ /usr/ports/audio/extace/files/patch-ae Sat Aug 3 10:26:50 2002 @@ -0,0 +1,12 @@ +--- src/getfft.c.orig Sat Aug 3 10:25:11 2002 ++++ src/getfft.c Sat Aug 3 10:25:40 2002 +@@ -20,7 +20,9 @@ + #include + #include + #include ++#ifndef __FreeBSD__ + #include ++#endif + #include "convolve.h" + #ifdef HAVE_LIBRFFTW + #include --- extace.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message