summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/tcl-snack/Makefile8
-rw-r--r--audio/tcl-snack/distinfo12
-rw-r--r--audio/tcl-snack/patches/patch-aa13
-rw-r--r--audio/tcl-snack/patches/patch-ab11
-rw-r--r--audio/tcl-snack/patches/patch-ac38
5 files changed, 38 insertions, 44 deletions
diff --git a/audio/tcl-snack/Makefile b/audio/tcl-snack/Makefile
index 1de060dc102..5ae5e1b1ace 100644
--- a/audio/tcl-snack/Makefile
+++ b/audio/tcl-snack/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2004/10/03 00:13:09 tv Exp $
+# $NetBSD: Makefile,v 1.12 2004/11/27 10:48:51 gson Exp $
-DISTNAME= snack2.2
-PKGNAME= tcl-snack-2.2
-PKGREVISION= 2
+DISTNAME= snack2.2.8
+PKGNAME= tcl-snack-2.2.8
CATEGORIES= audio
MASTER_SITES= http://www.speech.kth.se/~kare/
-EXTRACT_SUFX= .tar.Z
MAINTAINER= gson@NetBSD.org
HOMEPAGE= http://www.speech.kth.se/snack/
diff --git a/audio/tcl-snack/distinfo b/audio/tcl-snack/distinfo
index 7be2be32b13..827966f3197 100644
--- a/audio/tcl-snack/distinfo
+++ b/audio/tcl-snack/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2002/12/01 21:57:06 gson Exp $
+$NetBSD: distinfo,v 1.5 2004/11/27 10:48:51 gson Exp $
-SHA1 (snack2.2.tar.Z) = cc1ae5614148dc1ca11eda7382d7ffedaa22abb0
-Size (snack2.2.tar.Z) = 1794297 bytes
-SHA1 (patch-aa) = 10b99adfd6be5bce665bc684df2ff4e2ba98b8a6
-SHA1 (patch-ab) = 9d23177311cb392ad5e0203c1a4f5e2cf6d2ca55
-SHA1 (patch-ac) = 470511443dab1a8fd0e4a0b94f30f43a733a43e4
+SHA1 (snack2.2.8.tar.gz) = 86394100e155818e9864a0a215c90102f324c825
+Size (snack2.2.8.tar.gz) = 1791575 bytes
+SHA1 (patch-aa) = 297f046897c9cba1d0919a69874dceeeb2d56808
+SHA1 (patch-ab) = 060757edac59c5c27443466f0c3b0bc55d50364e
+SHA1 (patch-ac) = ec3bac6a58a8d62c646201518f719ec065e98d72
SHA1 (patch-ad) = e6868638722219bf18a345563d8ae2e3436bec81
diff --git a/audio/tcl-snack/patches/patch-aa b/audio/tcl-snack/patches/patch-aa
index aac7689f072..7db5c1989a0 100644
--- a/audio/tcl-snack/patches/patch-aa
+++ b/audio/tcl-snack/patches/patch-aa
@@ -1,8 +1,11 @@
-$NetBSD: patch-aa,v 1.2 2002/08/26 02:26:26 gson Exp $
+$NetBSD: patch-aa,v 1.3 2004/11/27 10:48:51 gson Exp $
---- Makefile.in.orig Wed Jul 17 04:03:15 2002
+--- Makefile.in.orig 2004-02-10 03:10:42.000000000 -0800
+++ Makefile.in
-@@ -1,10 +1,10 @@
+@@ -1,10 +1,13 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++
# The path to the tcl.h header file
-TCL_INCPATH = @TCL_SRC_DIR@/generic
@@ -15,11 +18,11 @@ $NetBSD: patch-aa,v 1.2 2002/08/26 02:26:26 gson Exp $
# The path to the X11 include files
-@@ -28,6 +28,7 @@
+@@ -28,6 +31,7 @@
TCL_VERSION = @TCLVER@
CC = @CC@
+TCL_CC = ${CC}
- INCLUDES = ${XINCLUDES} -I${TCL_INCPATH} -I${TK_INCPATH} @AINC@ @NISTINC@
+ INCLUDES = ${XINCLUDES} @TCL_INCLUDE_SPEC@ -I${TCL_INCPATH} -I${TK_INCPATH} @AINC@ @NISTINC@
diff --git a/audio/tcl-snack/patches/patch-ab b/audio/tcl-snack/patches/patch-ab
index dddc94ba74f..334c84ac671 100644
--- a/audio/tcl-snack/patches/patch-ab
+++ b/audio/tcl-snack/patches/patch-ab
@@ -1,16 +1,17 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/08/25 18:34:39 gson Exp $
+$NetBSD: patch-ab,v 1.2 2004/11/27 10:48:51 gson Exp $
---- configure.in.orig Wed Jul 17 04:03:15 2002
+--- configure.in.orig 2004-04-08 21:05:33.000000000 -0700
+++ configure.in
-@@ -234,9 +234,11 @@
- AC_SUBST(SHLIB_LD)
+@@ -224,10 +224,12 @@
AC_SUBST(SHLIB_SUFFIX)
AC_SUBST(XINCLUDES)
+ AC_SUBST(TCL_INCLUDE_SPEC)
+AC_SUBST(TCL_PREFIX)
AC_SUBST(TCL_LIB_SPEC)
AC_SUBST(TK_LIB_SPEC)
AC_SUBST(TCL_SRC_DIR)
-+AC_SUBST(TK_PREFIX)
AC_SUBST(TK_SRC_DIR)
++AC_SUBST(TK_PREFIX)
AC_SUBST(TK_LIBS)
AC_SUBST(SNACK_INSTALL_PATH)
+ AC_SUBST(SNACK_HINSTALL_PATH)
diff --git a/audio/tcl-snack/patches/patch-ac b/audio/tcl-snack/patches/patch-ac
index 9a50ca7cc17..755d3927b6b 100644
--- a/audio/tcl-snack/patches/patch-ac
+++ b/audio/tcl-snack/patches/patch-ac
@@ -1,25 +1,17 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/08/25 18:34:39 gson Exp $
+$NetBSD: patch-ac,v 1.2 2004/11/27 10:48:51 gson Exp $
---- configure.orig Wed Jul 17 04:03:15 2002
+--- configure.orig 2004-04-08 21:07:42.000000000 -0700
+++ configure
-@@ -1015,6 +1015,8 @@
-
-
-
-+
-+
- trap '' 1 2 15
- cat > confcache <<\EOF
- # This file is a shell script that caches the results of configure
-@@ -1164,9 +1166,11 @@
- s%@SHLIB_LD@%$SHLIB_LD%g
- s%@SHLIB_SUFFIX@%$SHLIB_SUFFIX%g
- s%@XINCLUDES@%$XINCLUDES%g
-+s%@TCL_PREFIX@%$TCL_PREFIX%g
- s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
- s%@TK_LIB_SPEC@%$TK_LIB_SPEC%g
- s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g
-+s%@TK_PREFIX@%$TK_PREFIX%g
- s%@TK_SRC_DIR@%$TK_SRC_DIR%g
- s%@TK_LIBS@%$TK_LIBS%g
- s%@SNACK_INSTALL_PATH@%$SNACK_INSTALL_PATH%g
+@@ -2302,10 +2302,12 @@
+ s,@SHLIB_LD@,$SHLIB_LD,;t t
+ s,@SHLIB_SUFFIX@,$SHLIB_SUFFIX,;t t
+ s,@XINCLUDES@,$XINCLUDES,;t t
++s,@TCL_PREFIX@,$TCL_PREFIX,;t t
+ s,@TCL_INCLUDE_SPEC@,$TCL_INCLUDE_SPEC,;t t
+ s,@TCL_LIB_SPEC@,$TCL_LIB_SPEC,;t t
+ s,@TK_LIB_SPEC@,$TK_LIB_SPEC,;t t
+ s,@TCL_SRC_DIR@,$TCL_SRC_DIR,;t t
++s,@TK_PREFIX@,$TK_PREFIX,;t t
+ s,@TK_SRC_DIR@,$TK_SRC_DIR,;t t
+ s,@TK_LIBS@,$TK_LIBS,;t t
+ s,@SNACK_INSTALL_PATH@,$SNACK_INSTALL_PATH,;t t