diff options
| author | Jeremy Messenger <mezz@FreeBSD.org> | 2009-08-02 19:36:34 +0000 |
|---|---|---|
| committer | Jeremy Messenger <mezz@FreeBSD.org> | 2009-08-02 19:36:34 +0000 |
| commit | 789d75c728ef23566a07bf5b9bc2190bf34ff4f1 (patch) | |
| tree | dc7540d42fa2d5d7c1c74515e3bdbf6ab842cd17 /audio/sphinxbase | |
| parent | d1a9e827c98542eb35619dffa314cba50fb08b58 (diff) | |
| download | ports-789d75c728ef23566a07bf5b9bc2190bf34ff4f1.tar.gz ports-789d75c728ef23566a07bf5b9bc2190bf34ff4f1.zip | |
-Repocopy devel/libtool15 -> libtool22 and libltdl15 -> libltdl22.
-Update libtool and libltdl to 2.2.6a.
-Remove devel/libtool15 and devel/libltdl15.
-Fix ports build with libtool22/libltdl22.
-Bump ports that depend on libltdl22 due to shared library version change.
-Explain what to do update in the UPDATING.
It has been tested with GNOME2, XFCE4, KDE3, KDE4 and other many wm/desktop
and applications in the runtime.
With help: marcus and kwm
Pointyhat-exp: a few times by pav
Tested by: pgollucci, "Romain Tartière" <romain@blogreen.org>, and
a few MarcusCom CVS users. Also, I might have missed a few.
Repocopy by: marcus
Approved by: portmgr
Notes
Notes:
svn path=/head/; revision=238781
Diffstat (limited to 'audio/sphinxbase')
| -rw-r--r-- | audio/sphinxbase/Makefile | 7 | ||||
| -rw-r--r-- | audio/sphinxbase/files/patch-configure (renamed from audio/sphinxbase/files/patch-configure.in) | 17 |
2 files changed, 15 insertions, 9 deletions
diff --git a/audio/sphinxbase/Makefile b/audio/sphinxbase/Makefile index 0cb09061b8ef..c27e8bfb1735 100644 --- a/audio/sphinxbase/Makefile +++ b/audio/sphinxbase/Makefile @@ -7,6 +7,7 @@ PORTNAME= sphinxbase PORTVERSION= 0.3 +PORTREVISION= 1 CATEGORIES= audio accessibility MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= cmusphinx @@ -17,7 +18,8 @@ COMMENT= CMU SPhinx Speech recognition system base USE_LDCONFIG= yes PKGMESSAGE= ${WRKDIR}/pkg-message USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 automake:19 +USE_GNOME= gnomehack +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -25,7 +27,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAKE_ENV= MKDIR="${MKDIR}" \ OSVERSION=${OSVERSION} -post-patch: - @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' ${WRKSRC}/Makefile.am - .include <bsd.port.mk> diff --git a/audio/sphinxbase/files/patch-configure.in b/audio/sphinxbase/files/patch-configure index bba277a6037e..f536d39e1773 100644 --- a/audio/sphinxbase/files/patch-configure.in +++ b/audio/sphinxbase/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.in (revision 7550) -+++ configure.in (working copy) -@@ -105,18 +105,12 @@ +--- 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 @@ -9,14 +9,21 @@ + *-*-freebsd*|*-*-netbsd*|*-*-openbsd*) ad_files="ad_oss.lo" ad_backend="AD_BACKEND_OSS" - AC_DEFINE(AD_BACKEND_OSS, [], [Use OSS interface for sound I/O]) + +@@ -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" -- AC_DEFINE(AD_BACKEND_OSS_BSD, [], [Use OSS interface for sound I/O]) +- +-cat >>confdefs.h <<\_ACEOF +-#define AD_BACKEND_OSS_BSD +-_ACEOF +- - ;; *-*-osf*) ad_files="ad_osf.lo mulaw_base.lo" |