From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jun 2 22:30:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id A081F3E8 for ; Sun, 2 Jun 2013 22:30:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 855281B26 for ; Sun, 2 Jun 2013 22:30:00 +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 r52MU0Pc054137 for ; Sun, 2 Jun 2013 22:30:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r52MU0Vo054136; Sun, 2 Jun 2013 22:30:00 GMT (envelope-from gnats) Resent-Date: Sun, 2 Jun 2013 22:30:00 GMT Resent-Message-Id: <201306022230.r52MU0Vo054136@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, nemysis Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 9B1843D6 for ; Sun, 2 Jun 2013 22:27:16 +0000 (UTC) (envelope-from nemysis@gmx.ch) Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by mx1.freebsd.org (Postfix) with ESMTP id 2F52E1B1C for ; Sun, 2 Jun 2013 22:27:15 +0000 (UTC) Received: from mailout-de.gmx.net ([10.1.76.20]) by mrigmx.server.lan (mrigmx001) with ESMTP (Nemesis) id 0Ld2ys-1U1ATs3IlE-00iAgQ for ; Mon, 03 Jun 2013 00:27:08 +0200 Received: (qmail invoked by alias); 02 Jun 2013 22:27:07 -0000 Received: from 5-80.77-83.cust.bluewin.ch (EHLO something.email.com) [83.77.80.5] by mail.gmx.net (mp020) with SMTP; 03 Jun 2013 00:27:07 +0200 Received: by something.email.com (sSMTP sendmail emulation); Mon, 03 Jun 2013 00:27:08 +0200 Message-Id: <20130602222716.9B1843D6@hub.freebsd.org> Date: Mon, 03 Jun 2013 00:27:08 +0200 From: nemysis To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/179235: [PATCH] audio/sphinx3: Trim pkg-plist, remove simple patch Cc: jpaetzel@freebsd.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Jun 2013 22:30:00 -0000 >Number: 179235 >Category: ports >Synopsis: [PATCH] audio/sphinx3: Trim pkg-plist, remove simple patch >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Jun 02 22:30:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: nemysis >Release: FreeBSD 9.1-RELEASE-p3 amd64 >Organization: >Environment: System: FreeBSD FreeBSD_Ports 9.1-RELEASE-p3 FreeBSD 9.1-RELEASE-p3 #0: Mon Apr 29 18:27:25 UTC 2013 >Description: - Use REINPLACE_CMD instead of simple patches - Trim pkg-plist Removed file(s): - files/patch-src_libs3decoder_libsearch_vithist.c Generated and tested manually, tested with port test and with RedPort, sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports) >How-To-Repeat: Build log https://redports.org/buildarchive/20130602213801-52509/ >Fix: --- sphinx3-0.8_1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/audio/sphinx3/Makefile ./Makefile --- /usr/ports/audio/sphinx3/Makefile 2013-06-02 19:00:28.000000000 +0200 +++ ./Makefile 2013-06-02 23:33:47.000000000 +0200 @@ -12,12 +12,12 @@ LIB_DEPENDS= sphinxbase:${PORTSDIR}/audio/sphinxbase +USES= pathfix USE_LDCONFIG= yes USE_GMAKE= yes USE_AUTOTOOLS=libtool USE_CSTD= gnu99 MAKE_JOBS_UNSAFE= yes -USES= pathfix CFLAGS+= -I${LOCALBASE}/include #-I${LOCALBASE}/include/sphinxbase CXXFLAGS+= -I${LOCALBASE}/include #-I${LOCALBASE}/include/sphinxbase @@ -26,4 +26,8 @@ MAKE_ENV= MKDIR="${MKDIR}" \ OSVERSION=${OSVERSION} +post-patch: + @${REINPLACE_CMD} -e 's|heap_t h|heap_t* h|' \ + ${WRKSRC}/src/libs3decoder/libsearch/vithist.c + .include diff -ruN --exclude=CVS /usr/ports/audio/sphinx3/files/patch-src_libs3decoder_libsearch_vithist.c ./files/patch-src_libs3decoder_libsearch_vithist.c --- /usr/ports/audio/sphinx3/files/patch-src_libs3decoder_libsearch_vithist.c 2013-06-02 19:00:28.000000000 +0200 +++ ./files/patch-src_libs3decoder_libsearch_vithist.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- src/libs3decoder/libsearch/vithist.c.orig 2012-12-14 12:01:13.000000000 -0500 -+++ src/libs3decoder/libsearch/vithist.c 2012-12-14 12:00:44.000000000 -0500 -@@ -647,7 +647,7 @@ vithist_prune(vithist_t * vh, dict_t * d - { - int32 se, fe, filler_done, th; - vithist_entry_t *ve; -- heap_t h; -+ heap_t* h; - s3wid_t *wid; - int32 i; - diff -ruN --exclude=CVS /usr/ports/audio/sphinx3/pkg-plist ./pkg-plist --- /usr/ports/audio/sphinx3/pkg-plist 2013-06-02 19:00:28.000000000 +0200 +++ ./pkg-plist 2013-04-02 03:10:30.000000000 +0200 @@ -128,8 +128,8 @@ %%DATADIR%%/model/ep/variances %%DATADIR%%/model/hmm/RM1_cd_semi/feat.params %%DATADIR%%/model/hmm/RM1_cd_semi/kdtrees -%%DATADIR%%/model/hmm/RM1_cd_semi/means %%DATADIR%%/model/hmm/RM1_cd_semi/mdef +%%DATADIR%%/model/hmm/RM1_cd_semi/means %%DATADIR%%/model/hmm/RM1_cd_semi/mixture_weights %%DATADIR%%/model/hmm/RM1_cd_semi/transition_matrices %%DATADIR%%/model/hmm/RM1_cd_semi/variances --- sphinx3-0.8_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: