From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Sep 11 16:20:07 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5CF7E1065695 for ; Fri, 11 Sep 2009 16:20:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 4BE978FC16 for ; Fri, 11 Sep 2009 16:20:07 +0000 (UTC) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n8BGK7x9089120 for ; Fri, 11 Sep 2009 16:20:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n8BGK7UN089117; Fri, 11 Sep 2009 16:20:07 GMT (envelope-from gnats) Date: Fri, 11 Sep 2009 16:20:07 GMT Message-Id: <200909111620.n8BGK7UN089117@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Richard E Neese Cc: Subject: Re: ports/138602: audio/sphinxbase port update X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Richard E Neese List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Sep 2009 16:20:07 -0000 The following reply was made to PR ports/138602; it has been noted by GNATS. From: Richard E Neese To: Tilman Linneweh , bug-followup@FreeBSD.org Cc: Subject: Re: ports/138602: audio/sphinxbase port update Date: Fri, 11 Sep 2009 12:11:28 -0400 This is a multi-part message in MIME format. --------------030901030404050202050805 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit here is the new diff On 9/11/2009 10:10 AM, Tilman Linneweh wrote: > > As discussed on IRC, here is what i fixed so far, regarding the python > dependency > --------------030901030404050202050805 Content-Type: text/plain; name="sphinxbase-update.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="sphinxbase-update.diff" diff -ruN /usr/ports/audio/sphinxbase/Makefile sphinxbase/Makefile --- /usr/ports/audio/sphinxbase/Makefile 2009-08-21 18:13:21.000000000 -0600 +++ sphinxbase/Makefile 2009-09-06 16:20:41.000000000 -0600 @@ -2,23 +2,24 @@ # Date created: 8 Jan 2008 # Whom: r.neese # -# $FreeBSD: ports/audio/sphinxbase/Makefile,v 1.4 2009/08/22 00:13:21 amdmi3 Exp $ +# $FreeBSD: ports/audio/sphinxbase/Makefile,v 1.2 2008/07/25 09:08:40 pav Exp $ # PORTNAME= sphinxbase -PORTVERSION= 0.3 -PORTREVISION= 1 +PORTVERSION= 0.4.1 CATEGORIES= audio accessibility -MASTER_SITES= SF/cmusphinx/${PORTNAME}/${PORTVERSION} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= cmusphinx/sphinxbase/0.4.1/ +#DISTNAME= ${PORTNAME}-${PORTVERSION}-latest MAINTAINER= r.neese@gmail.com COMMENT= CMU SPhinx Speech recognition system base USE_LDCONFIG= yes PKGMESSAGE= ${WRKDIR}/pkg-message +GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= gnomehack -USE_AUTOTOOLS= libtool:22 +USE_AUTOTOOLS= libtool:22 automake:110 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -26,4 +27,7 @@ MAKE_ENV= MKDIR="${MKDIR}" \ OSVERSION=${OSVERSION} +post-patch: + @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' ${WRKSRC}/Makefile.am + .include diff -ruN /usr/ports/audio/sphinxbase/distinfo sphinxbase/distinfo --- /usr/ports/audio/sphinxbase/distinfo 2008-03-22 14:36:38.000000000 -0600 +++ sphinxbase/distinfo 2009-09-06 16:26:13.000000000 -0600 @@ -1,3 +1,3 @@ -MD5 (sphinxbase-0.3.tar.gz) = 4a00720a5fa42947e1f477e8a7325454 -SHA256 (sphinxbase-0.3.tar.gz) = 0497a39d926fb0faa5fab28391821743225cd332e7b582419c60b0db7e6fbaa2 -SIZE (sphinxbase-0.3.tar.gz) = 1841919 +MD5 (sphinxbase-0.4.1.tar.gz) = b3b34a4de1040e0c54c2698c8ed4aa44 +SHA256 (sphinxbase-0.4.1.tar.gz) = 366805a9134298687af65eee503dddf85c8b5fe83ef38d23ec052e0ea598cb91 +SIZE (sphinxbase-0.4.1.tar.gz) = 2126416 diff -ruN /usr/ports/audio/sphinxbase/files/patch-configure sphinxbase/files/patch-configure --- /usr/ports/audio/sphinxbase/files/patch-configure 2009-08-02 13:32:26.000000000 -0600 +++ sphinxbase/files/patch-configure 1969-12-31 17:00:00.000000000 -0700 @@ -1,30 +0,0 @@ ---- configure.orig 2009-07-13 10:53:01.000000000 -0500 -+++ configure 2009-07-13 10:54:06.000000000 -0500 -@@ -7166,7 +7166,8 @@ - - if test "x$ad_files" = "x"; then - case $host in -- *-*-linux*|*-*-uclinux*) -+ *-*-linux*|*-*-uclinux*| \ -+ *-*-freebsd*|*-*-netbsd*|*-*-openbsd*) - ad_files="ad_oss.lo" - ad_backend="AD_BACKEND_OSS" - -@@ -7175,17 +7176,6 @@ - _ACEOF - - ;; -- # FIXME: isn't this the same OSS as on Linux? -- *-*-freebsd*|*-*-netbsd*|*-*-openbsd*) -- ad_files="ad_oss_bsd.lo mulaw_base.lo" -- ad_libs="-lossaudio" -- ad_backend="AD_BACKEND_OSS_BSD" -- --cat >>confdefs.h <<\_ACEOF --#define AD_BACKEND_OSS_BSD --_ACEOF -- -- ;; - *-*-osf*) - ad_files="ad_osf.lo mulaw_base.lo" - ad_backend="AD_BACKEND_OSF" diff -ruN /usr/ports/audio/sphinxbase/files/patch-src-libsphinxad_ad_oss_bsd.c sphinxbase/files/patch-src-libsphinxad_ad_oss_bsd.c --- /usr/ports/audio/sphinxbase/files/patch-src-libsphinxad_ad_oss_bsd.c 2008-03-22 14:36:38.000000000 -0600 +++ sphinxbase/files/patch-src-libsphinxad_ad_oss_bsd.c 1969-12-31 17:00:00.000000000 -0700 @@ -1,14 +0,0 @@ ---- src/libsphinxad/ad_oss_bsd.c (revision 7548) -+++ src/libsphinxad/ad_oss_bsd.c (working copy) -@@ -65,11 +65,7 @@ - #include - #include - #include --#if defined(SYS_SOUNDCARD_H) - #include --#else --#include --#endif - #include - #include - diff -ruN /usr/ports/audio/sphinxbase/files/patch-test-unit-test_case_ucase3.test sphinxbase/files/patch-test-unit-test_case_ucase3.test --- /usr/ports/audio/sphinxbase/files/patch-test-unit-test_case_ucase3.test 2008-03-22 14:36:38.000000000 -0600 +++ sphinxbase/files/patch-test-unit-test_case_ucase3.test 1969-12-31 17:00:00.000000000 -0700 @@ -1,9 +0,0 @@ ---- test/unit/test_case/_ucase3.test (revision 7548) -+++ test/unit/test_case/_ucase3.test (working copy) -@@ -1,2 +1,2 @@ --#!/bin/bash --./chgCase ucase -\ No newline at end of file -+#!/bin/sh -+./chgCase ucase - diff -ruN /usr/ports/audio/sphinxbase/pkg-plist sphinxbase/pkg-plist --- /usr/ports/audio/sphinxbase/pkg-plist 2008-03-22 14:36:38.000000000 -0600 +++ sphinxbase/pkg-plist 2009-09-06 16:30:10.000000000 -0600 @@ -1,5 +1,11 @@ bin/sphinx_cepview +bin/sphinx_cont_adseg +bin/sphinx_cont_fileseg bin/sphinx_fe +bin/sphinx_jsgf2fsg +bin/sphinx_lm_eval +bin/sphinx_lm_sort +bin/sphinx_pitch include/sphinxbase/ad.h include/sphinxbase/agc.h include/sphinxbase/bio.h @@ -17,38 +23,41 @@ include/sphinxbase/feat.h include/sphinxbase/filename.h include/sphinxbase/fixpoint.h +include/sphinxbase/fsg_model.h include/sphinxbase/genrand.h include/sphinxbase/glist.h include/sphinxbase/hash_table.h include/sphinxbase/heap.h include/sphinxbase/info.h +include/sphinxbase/jsgf.h include/sphinxbase/libutil.h -include/sphinxbase/linklist.h +include/sphinxbase/listelem_alloc.h +include/sphinxbase/logmath.h include/sphinxbase/matrix.h +include/sphinxbase/mmio.h include/sphinxbase/mulaw.h +include/sphinxbase/ngram_model.h include/sphinxbase/pio.h include/sphinxbase/prim_type.h include/sphinxbase/profile.h -include/sphinxbase/s3_arraylist.h +include/sphinxbase/sbthread.h include/sphinxbase/sphinx_config.h -include/sphinxbase/sphinx_types.h +include/sphinxbase/sphinxbase.pxd +include/sphinxbase/sphinxbase_export.h include/sphinxbase/strfuncs.h include/sphinxbase/unlimit.h +include/sphinxbase/yin.h lib/libsphinxad.a lib/libsphinxad.la lib/libsphinxad.so lib/libsphinxad.so.0 -lib/libsphinxfe.a -lib/libsphinxfe.la -lib/libsphinxfe.so -lib/libsphinxfe.so.0 -lib/libsphinxfeat.a -lib/libsphinxfeat.la -lib/libsphinxfeat.so -lib/libsphinxfeat.so.0 -lib/libsphinxutil.a -lib/libsphinxutil.la -lib/libsphinxutil.so -lib/libsphinxutil.so.0 +lib/libsphinxbase.a +lib/libsphinxbase.la +lib/libsphinxbase.so +lib/libsphinxbase.so.1 +lib/python2.6/site-packages/SphinxBase-0.4.1-py2.6.egg-info +lib/python2.6/site-packages/sphinxbase.so libdata/pkgconfig/sphinxbase.pc +@dirrm lib/python2.6/site-packages +@dirrm lib/python2.6 @dirrm include/sphinxbase --------------030901030404050202050805--