From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Oct 30 19:10:02 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 58A50F5E for ; Wed, 30 Oct 2013 19:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 35D172BF6 for ; Wed, 30 Oct 2013 19:10:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r9UJA1rx080356 for ; Wed, 30 Oct 2013 19:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r9UJA1P9080355; Wed, 30 Oct 2013 19:10:01 GMT (envelope-from gnats) Date: Wed, 30 Oct 2013 19:10:01 GMT Message-Id: <201310301910.r9UJA1P9080355@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org Cc: From: Jason Bacon Subject: Re: ports/183486: maintainer update: audio/praat X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Jason Bacon List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Oct 2013 19:10:02 -0000 The following reply was made to PR ports/183486; it has been noted by GNATS. From: Jason Bacon To: bug-followup@FreeBSD.org, jwbacon@tds.net Cc: Subject: Re: ports/183486: maintainer update: audio/praat Date: Wed, 30 Oct 2013 14:01:20 -0500 This is a multi-part message in MIME format. --------------020206060706020502090707 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Disregard previous patch. An additional change was necessary for 9.2-RELEASE. New patch attached. --------------020206060706020502090707 Content-Type: text/plain; charset=us-ascii; name="praat-diff.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="praat-diff.txt" diff -ruN --exclude=CVS /usr/ports/audio/praat/Makefile /usr/wip/audio/praat/Makefile --- /usr/ports/audio/praat/Makefile 2013-09-26 14:13:34.000000000 -0500 +++ /usr/wip/audio/praat/Makefile 2013-10-30 11:39:52.000000000 -0500 @@ -1,5 +1,5 @@ # Created by: Jason Bacon -# $FreeBSD: branches/RELENG_9_2_0/audio/praat/Makefile 322579 2013-07-09 21:20:28Z bapt $ +# $FreeBSD: audio/praat/Makefile 327706 2013-09-20 14:36:35Z bapt $ PORTNAME= praat PORTVERSION= 4.6.39 @@ -11,13 +11,17 @@ MAINTAINER= jwbacon@tds.net COMMENT= Phonetics by Computer +LICENSE= GPLv2 + USE_DOS2UNIX= yes +NO_STAGE= yes DOS2UNIX_REGEX= .*Makefile -USES= motif +USES= iconv motif WRKSRC= ${WRKDIR}/sources_4639 MAKEFILE= makefile PLIST_FILES= bin/praat MAKE_JOBS_UNSAFE= yes +CFLAGS+= -ltinfow MAN1= praat.1 @@ -25,6 +29,8 @@ @${REINPLACE_CMD} -e 's/ log2/ NUMlog2/' ${WRKSRC}/dwtools/Sound_extensions.c @${FIND} ${WRKSRC} -name Makefile -exec \ ${REINPLACE_CMD} -e 's|^CFLAGS =|CFLAGS +=|' "{}" \; + @${REINPLACE_CMD} -e 's/%%ICONV_LIB%%/${ICONV_LIB}/' \ + ${WRKSRC}/makefiles/makefile.defs.freebsd.dynamic @${CP} ${WRKSRC}/makefiles/makefile.defs.freebsd.dynamic \ ${WRKSRC}/makefile.defs diff -ruN --exclude=CVS /usr/ports/audio/praat/files/patch-dwsys-Makefile /usr/wip/audio/praat/files/patch-dwsys-Makefile --- /usr/ports/audio/praat/files/patch-dwsys-Makefile 1969-12-31 18:00:00.000000000 -0600 +++ /usr/wip/audio/praat/files/patch-dwsys-Makefile 2013-10-30 11:39:52.000000000 -0500 @@ -0,0 +1,20 @@ +--- dwsys/Makefile.orig 2013-10-30 09:47:03.000000000 -0500 ++++ dwsys/Makefile 2013-10-30 09:47:03.000000000 -0500 +@@ -4,7 +4,7 @@ + + include ../makefile.defs + +-CFLAGS = -I ../sys -I ../fon -I ../dwtools -I ../GSL -I ../dwsys -I ../kar ++CFLAGS += -I ../sys -I ../fon -I ../dwtools -I ../GSL -I ../dwsys -I ../kar + + all: libdwsys.a + +@@ -16,7 +16,7 @@ + NUM2.o NUMlapack.o NUMmachar.o \ + NUMf2c.o NUMcblas.o NUMclapack.o NUMfft_f.o NUMfft_d.o NUMsort2.o \ + Permutation.o Permutation_and_Index.o \ +- regularExp.o regularExpW.o SimpleVector.o Simple_extensions.o \ ++ regularExp.o SimpleVector.o Simple_extensions.o \ + SVD.o + + $(OBJECTS): *.h ../sys/*.h diff -ruN --exclude=CVS /usr/ports/audio/praat/files/patch-makefiles-makefile.defs.freebsd.dynamic /usr/wip/audio/praat/files/patch-makefiles-makefile.defs.freebsd.dynamic --- /usr/ports/audio/praat/files/patch-makefiles-makefile.defs.freebsd.dynamic 1969-12-31 18:00:00.000000000 -0600 +++ /usr/wip/audio/praat/files/patch-makefiles-makefile.defs.freebsd.dynamic 2013-10-30 11:39:52.000000000 -0500 @@ -0,0 +1,14 @@ +--- makefiles/makefile.defs.freebsd.dynamic.orig 2007-01-31 11:12:13.000000000 -0600 ++++ makefiles/makefile.defs.freebsd.dynamic 2013-10-30 10:13:50.000000000 -0500 +@@ -3,9 +3,9 @@ + # System: FreeBSD + # Paul Boersma, January 31, 2007 + +-CC = gcc -std=gnu99 -DUNIX -Dlinux -I /usr/X11R6/include -Wimplicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O ++CC += -std=gnu99 -DUNIX -Dlinux -I${LOCALBASE}/include -Wimplicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized + +-LIBS = /usr/X11R6/lib/libXm.a -L /usr/X11R6/lib -lXmu -lXp -lXt -lSM -lICE -lXext -lX11 -lm ++LIBS = ${LOCALBASE}/lib/libXm.a -L${LOCALBASE}/lib -lXmu -lXp -lXt -lSM -lICE -lXext -lX11 -lm -lpng -ljpeg -lXft -lfontconfig + + RANLIB = ls + ICON = diff -ruN --exclude=CVS /usr/ports/audio/praat/files/patch-makefiles_makefile.defs.freebsd.dynamic /usr/wip/audio/praat/files/patch-makefiles_makefile.defs.freebsd.dynamic --- /usr/ports/audio/praat/files/patch-makefiles_makefile.defs.freebsd.dynamic 2013-09-26 14:13:34.000000000 -0500 +++ /usr/wip/audio/praat/files/patch-makefiles_makefile.defs.freebsd.dynamic 1969-12-31 18:00:00.000000000 -0600 @@ -1,14 +0,0 @@ ---- makefiles/makefile.defs.freebsd.dynamic.orig 2007-12-02 15:47:18.000000000 +0200 -+++ makefiles/makefile.defs.freebsd.dynamic 2007-12-02 15:55:05.000000000 +0200 -@@ -3,9 +3,9 @@ - # System: FreeBSD - # Paul Boersma, January 31, 2007 - --CC = gcc -std=gnu99 -DUNIX -Dlinux -I /usr/X11R6/include -Wimplicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O -+CC += -std=gnu99 -DUNIX -Dlinux -I${LOCALBASE}/include -Wimplicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized - --LIBS = /usr/X11R6/lib/libXm.a -L /usr/X11R6/lib -lXmu -lXp -lXt -lSM -lICE -lXext -lX11 -lm -+LIBS = ${LOCALBASE}/lib/libXm.a -L${LOCALBASE}/lib -lXmu -lXp -lXt -lSM -lICE -lXext -lX11 -lm -lpng -ljpeg -liconv -lXft - - RANLIB = ls - ICON = --------------020206060706020502090707--