Tue Aug 21 21:47:28 2012 UTC ()
mbone/vat: Patch in tcl/tk 8.5 support

vat's patches specify tcl/tk 8.4, so update the patches to specify 8.5
to fix build.


(marino)
diff -r1.59 -r1.60 pkgsrc/mbone/vat/Makefile
diff -r1.12 -r1.13 pkgsrc/mbone/vat/distinfo
diff -r1.3 -r1.4 pkgsrc/mbone/vat/patches/patch-ao
diff -r1.2 -r1.3 pkgsrc/mbone/vat/patches/patch-ap
cvs diff -r1.59 -r1.60 pkgsrc/mbone/vat/Makefile (expand / switch to unified diff)

--- pkgsrc/mbone/vat/Makefile 2010/11/13 21:08:59 1.59
+++ pkgsrc/mbone/vat/Makefile 2012/08/21 21:47:28 1.60
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.59 2010/11/13 21:08:59 shattered Exp $ 1# $NetBSD: Makefile,v 1.60 2012/08/21 21:47:28 marino Exp $
2# 2#
3 3
4DISTNAME= vatsrc-4.0b2 4DISTNAME= vatsrc-4.0b2
5PKGNAME= ${DISTNAME:S/src//} 5PKGNAME= ${DISTNAME:S/src//}
6PKGREVISION= 3 6PKGREVISION= 4
7CATEGORIES= mbone 7CATEGORIES= mbone
8MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/ 8MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://ee.lbl.gov/vat/ 11HOMEPAGE= http://ee.lbl.gov/vat/
12COMMENT= The Visual Audio Tool - multicast audioconferencing 12COMMENT= The Visual Audio Tool - multicast audioconferencing
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16MAKE_JOBS_SAFE= no 16MAKE_JOBS_SAFE= no
17 17
18WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 18WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
cvs diff -r1.12 -r1.13 pkgsrc/mbone/vat/distinfo (expand / switch to unified diff)

--- pkgsrc/mbone/vat/distinfo 2011/12/14 03:21:51 1.12
+++ pkgsrc/mbone/vat/distinfo 2012/08/21 21:47:28 1.13
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: distinfo,v 1.12 2011/12/14 03:21:51 sbd Exp $ 1$NetBSD: distinfo,v 1.13 2012/08/21 21:47:28 marino Exp $
2 2
3SHA1 (vatsrc-4.0b2.tar.gz) = 92390be72438647bef422c7a493ee520e82e33b3 3SHA1 (vatsrc-4.0b2.tar.gz) = 92390be72438647bef422c7a493ee520e82e33b3
4RMD160 (vatsrc-4.0b2.tar.gz) = 3540a371f2d4bbd388561157009dc744bec24a0a 4RMD160 (vatsrc-4.0b2.tar.gz) = 3540a371f2d4bbd388561157009dc744bec24a0a
5Size (vatsrc-4.0b2.tar.gz) = 263799 bytes 5Size (vatsrc-4.0b2.tar.gz) = 263799 bytes
6SHA1 (patch-aa) = 58021f5a9accc06efb168374036f9c737fb9cbe6 6SHA1 (patch-aa) = 58021f5a9accc06efb168374036f9c737fb9cbe6
7SHA1 (patch-ab) = f1ba1d4877de8ab3650ba5e19f1197ac756560af 7SHA1 (patch-ab) = f1ba1d4877de8ab3650ba5e19f1197ac756560af
8SHA1 (patch-ac) = 989059394e3c322300a16f8aa7ed2508661f1863 8SHA1 (patch-ac) = 989059394e3c322300a16f8aa7ed2508661f1863
9SHA1 (patch-ad) = 29288eba884ba9ef59c0eac2d92d50ca9336a101 9SHA1 (patch-ad) = 29288eba884ba9ef59c0eac2d92d50ca9336a101
10SHA1 (patch-af) = 1cfe73e1a1e7f179d6293c451cd55f0fd558e8d3 10SHA1 (patch-af) = 1cfe73e1a1e7f179d6293c451cd55f0fd558e8d3
11SHA1 (patch-ag) = cee2e711190a0d33ed7ff95e87f00e811c7d8286 11SHA1 (patch-ag) = cee2e711190a0d33ed7ff95e87f00e811c7d8286
12SHA1 (patch-ai) = 72b94bfaa14daabb07c65194c9068c23157307f8 12SHA1 (patch-ai) = 72b94bfaa14daabb07c65194c9068c23157307f8
13SHA1 (patch-aj) = 15a00276ea8758f6f3ca96324a5596eb60399c92 13SHA1 (patch-aj) = 15a00276ea8758f6f3ca96324a5596eb60399c92
14SHA1 (patch-ak) = e79273c0b7d101bf9cbdc7ad8e6348bda8fa2e45 14SHA1 (patch-ak) = e79273c0b7d101bf9cbdc7ad8e6348bda8fa2e45
15SHA1 (patch-al) = 1e135bf818a4b35901ecabe8442aa57414fa46d1 15SHA1 (patch-al) = 1e135bf818a4b35901ecabe8442aa57414fa46d1
16SHA1 (patch-am) = 3513e9495e460b9d2923f6dfdfa048c0e5872b3f 16SHA1 (patch-am) = 3513e9495e460b9d2923f6dfdfa048c0e5872b3f
17SHA1 (patch-an) = 2793bea8c9a9a4c73c82c20da65d549252144eb3 17SHA1 (patch-an) = 2793bea8c9a9a4c73c82c20da65d549252144eb3
18SHA1 (patch-ao) = bc65da31051d5989ebcb8a6a4a34d3091c25ee0a 18SHA1 (patch-ao) = c2b4cc90f591f8a37a5255f83e93b819221146d2
19SHA1 (patch-ap) = 439cc24d945d72c447bd4285fafea50cccd558d2 19SHA1 (patch-ap) = dc396b9d19a526c01970b7a7882435729916f632
20SHA1 (patch-aq) = 7fe27d23fb5164ae98f4ef0a4e377b50d9f2d3b3 20SHA1 (patch-aq) = 7fe27d23fb5164ae98f4ef0a4e377b50d9f2d3b3
21SHA1 (patch-ar) = cc92e2e1fd7d4c084f899977a2453d4622d0d461 21SHA1 (patch-ar) = cc92e2e1fd7d4c084f899977a2453d4622d0d461
cvs diff -r1.3 -r1.4 pkgsrc/mbone/vat/patches/patch-ao (expand / switch to unified diff)

--- pkgsrc/mbone/vat/patches/patch-ao 2011/12/14 03:21:52 1.3
+++ pkgsrc/mbone/vat/patches/patch-ao 2012/08/21 21:47:28 1.4
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: patch-ao,v 1.3 2011/12/14 03:21:52 sbd Exp $ 1$NetBSD: patch-ao,v 1.4 2012/08/21 21:47:28 marino Exp $
2 2
3--- configure.orig 1996-05-16 08:03:58.000000000 +0000 3--- configure.orig 1996-05-16 08:03:58.000000000 +0000
4+++ configure 4+++ configure
5@@ -1468,6 +1468,8 @@ else 5@@ -1468,6 +1468,8 @@ else
6 d="" 6 d=""
7 fi 7 fi
8  8
9+tcldir=tcl8.4 9+tcldir=tcl8.5
10+tcllib=tcl84 10+tcllib=tcl85
11 if test "$d" != "" ; then  11 if test "$d" != "" ; then
12 if test ! -d $d ; then  12 if test ! -d $d ; then
13 echo "'$d' is not a directory" 13 echo "'$d' is not a directory"
14@@ -1478,8 +1480,8 @@ if test "$d" != "" ; then 14@@ -1478,8 +1480,8 @@ if test "$d" != "" ; then
15 echo "can't find tcl.h in $d/include" 15 echo "can't find tcl.h in $d/include"
16 exit 1 16 exit 1
17 fi 17 fi
18- places="$d/lib/libtcl7.5.so \ 18- places="$d/lib/libtcl7.5.so \
19- $d/lib/libtcl7.5.a \ 19- $d/lib/libtcl7.5.a \
20+ places="$d/lib/lib${tcllib}.so \ 20+ places="$d/lib/lib${tcllib}.so \
21+ $d/lib/lib${tcllib}.a \ 21+ $d/lib/lib${tcllib}.a \
22 $d/lib/libtcl.so \ 22 $d/lib/libtcl.so \
23 $d/lib/libtcl.a" 23 $d/lib/libtcl.a"
@@ -163,28 +163,28 @@ $NetBSD: patch-ao,v 1.3 2011/12/14 03:21 @@ -163,28 +163,28 @@ $NetBSD: patch-ao,v 1.3 2011/12/14 03:21
163+ /usr/contrib/lib/${tcldir} \ 163+ /usr/contrib/lib/${tcldir} \
164+ /usr/lib/${tcldir} \ 164+ /usr/lib/${tcldir} \
165+ /usr/lib/tk/${tcldir} \ 165+ /usr/lib/tk/${tcldir} \
166+ /import/tcl/lib/${tcldir} \ 166+ /import/tcl/lib/${tcldir} \
167+ $prefix/lib/${tcldir} \ 167+ $prefix/lib/${tcldir} \
168+ $x_libraries/${tcldir} \ 168+ $x_libraries/${tcldir} \
169 /usr/local/lib/tcl \ 169 /usr/local/lib/tcl \
170 /usr/lib/tcl \ 170 /usr/lib/tcl \
171 /usr/lib/tk/tcl \ 171 /usr/lib/tk/tcl \
172@@ -1651,6 +1618,8 @@ else 172@@ -1651,6 +1618,8 @@ else
173 d="" 173 d=""
174 fi 174 fi
175  175
176+tkdir=tk8.4 176+tkdir=tk8.5
177+tklib=tk84 177+tklib=tk85
178 if test "$d" != "" ; then  178 if test "$d" != "" ; then
179 if test ! -d $d ; then  179 if test ! -d $d ; then
180 echo "'$d' is not a directory" 180 echo "'$d' is not a directory"
181@@ -1661,8 +1630,8 @@ if test "$d" != "" ; then 181@@ -1661,8 +1630,8 @@ if test "$d" != "" ; then
182 echo "can't find tk.h in $d/include" 182 echo "can't find tk.h in $d/include"
183 exit 1 183 exit 1
184 fi 184 fi
185- places="$d/lib/libtk4.1.so \ 185- places="$d/lib/libtk4.1.so \
186- $d/lib/libtk4.1.a \ 186- $d/lib/libtk4.1.a \
187+ places="$d/lib/lib${tklib}.so \ 187+ places="$d/lib/lib${tklib}.so \
188+ $d/lib/lib${tklib}.a \ 188+ $d/lib/lib${tklib}.a \
189 $d/lib/libtk.so \ 189 $d/lib/libtk.so \
190 $d/lib/libtk.a" 190 $d/lib/libtk.a"
cvs diff -r1.2 -r1.3 pkgsrc/mbone/vat/patches/patch-ap (expand / switch to unified diff)

--- pkgsrc/mbone/vat/patches/patch-ap 2010/01/25 21:07:48 1.2
+++ pkgsrc/mbone/vat/patches/patch-ap 2012/08/21 21:47:28 1.3
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-ap,v 1.2 2010/01/25 21:07:48 is Exp $ 1$NetBSD: patch-ap,v 1.3 2012/08/21 21:47:28 marino Exp $
2 2
3--- configure.in.tk.orig Thu May 16 04:06:05 1996 3--- configure.in.tk.orig Thu May 16 04:06:05 1996
4+++ configure.in.tk Wed Jan 26 16:03:04 2000 4+++ configure.in.tk Wed Jan 26 16:03:04 2000
5@@ -3,5 +3,7 @@ 5@@ -3,5 +3,7 @@
6  6
7 AC_ARG_WITH(tcl, --with-tcl=path specify a pathname for tcl, d=$withval, d="") 7 AC_ARG_WITH(tcl, --with-tcl=path specify a pathname for tcl, d=$withval, d="")
8+tcldir=tcl8.4 8+tcldir=tcl8.5
9+tcllib=tcl84 9+tcllib=tcl85
10 if test "$d" != "" ; then  10 if test "$d" != "" ; then
11 if test ! -d $d ; then  11 if test ! -d $d ; then
12 echo "'$d' is not a directory" 12 echo "'$d' is not a directory"
13@@ -12,8 +14,8 @@ 13@@ -12,8 +14,8 @@
14 echo "can't find tcl.h in $d/include" 14 echo "can't find tcl.h in $d/include"
15 exit 1 15 exit 1
16 fi 16 fi
17- places="$d/lib/libtcl7.5.so \ 17- places="$d/lib/libtcl7.5.so \
18- $d/lib/libtcl7.5.a \ 18- $d/lib/libtcl7.5.a \
19+ places="$d/lib/lib${tcllib}.so \ 19+ places="$d/lib/lib${tcllib}.so \
20+ $d/lib/lib${tcllib}.a \ 20+ $d/lib/lib${tcllib}.a \
21 $d/lib/libtcl.so \ 21 $d/lib/libtcl.so \
22 $d/lib/libtcl.a" 22 $d/lib/libtcl.a"
@@ -120,28 +120,28 @@ $NetBSD: patch-ap,v 1.2 2010/01/25 21:07 @@ -120,28 +120,28 @@ $NetBSD: patch-ap,v 1.2 2010/01/25 21:07
120+ /usr/contrib/lib/${tcldir} \ 120+ /usr/contrib/lib/${tcldir} \
121+ /usr/lib/${tcldir} \ 121+ /usr/lib/${tcldir} \
122+ /usr/lib/tk/${tcldir} \ 122+ /usr/lib/tk/${tcldir} \
123+ /import/tcl/lib/${tcldir} \ 123+ /import/tcl/lib/${tcldir} \
124+ $prefix/lib/${tcldir} \ 124+ $prefix/lib/${tcldir} \
125+ $x_libraries/${tcldir} \ 125+ $x_libraries/${tcldir} \
126 /usr/local/lib/tcl \ 126 /usr/local/lib/tcl \
127 /usr/lib/tcl \ 127 /usr/lib/tcl \
128 /usr/lib/tk/tcl \ 128 /usr/lib/tk/tcl \
129@@ -128,6 +127,8 @@ 129@@ -128,6 +127,8 @@
130 AC_SUBST(V_LIBRARY_TCL) 130 AC_SUBST(V_LIBRARY_TCL)
131  131
132 AC_ARG_WITH(tk, --with-tk=path specify a pathname for tk, d=$withval, d="") 132 AC_ARG_WITH(tk, --with-tk=path specify a pathname for tk, d=$withval, d="")
133+tkdir=tk8.4 133+tkdir=tk8.5
134+tklib=tk84 134+tklib=tk85
135 if test "$d" != "" ; then  135 if test "$d" != "" ; then
136 if test ! -d $d ; then  136 if test ! -d $d ; then
137 echo "'$d' is not a directory" 137 echo "'$d' is not a directory"
138@@ -138,8 +139,8 @@ 138@@ -138,8 +139,8 @@
139 echo "can't find tk.h in $d/include" 139 echo "can't find tk.h in $d/include"
140 exit 1 140 exit 1
141 fi 141 fi
142- places="$d/lib/libtk4.1.so \ 142- places="$d/lib/libtk4.1.so \
143- $d/lib/libtk4.1.a \ 143- $d/lib/libtk4.1.a \
144+ places="$d/lib/lib${tklib}.so \ 144+ places="$d/lib/lib${tklib}.so \
145+ $d/lib/lib${tklib}.a \ 145+ $d/lib/lib${tklib}.a \
146 $d/lib/libtk.so \ 146 $d/lib/libtk.so \
147 $d/lib/libtk.a" 147 $d/lib/libtk.a"