mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-23 04:23:08 +00:00
Upgrade to version 2.8
This commit is contained in:
Bill Fenner
parent
289bc4ac18
commit
fd0a7fe39c
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=4287
@ -3,23 +3,25 @@
|
||||
# Date created: 14 December 1994
|
||||
# Whom: wollman
|
||||
#
|
||||
# $Id: Makefile,v 1.4 1995/04/10 17:49:14 asami Exp $
|
||||
# $Id: Makefile,v 1.5 1995/11/27 04:05:46 asami Exp $
|
||||
#
|
||||
|
||||
DISTNAME= vic-2.6
|
||||
DISTNAME= vic-2.8
|
||||
CATEGORIES+= net
|
||||
MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vic/
|
||||
DISTFILES= vicsrc-2.6.tar.Z
|
||||
DISTFILES= vicsrc-2.8.tar.gz
|
||||
|
||||
MAINTAINER= wollman@FreeBSD.ORG
|
||||
MAINTAINER= fenner@FreeBSD.ORG
|
||||
|
||||
LIB_DEPENDS= BLT\\.1\\.:${PORTSDIR}/x11/blt
|
||||
LIB_DEPENDS= tk41:${PORTSDIR}/x11/tk41
|
||||
|
||||
HAS_CONFIGURE= yes
|
||||
INSTALL_TARGET= MANDIR=${PREFIX}/man/manl install
|
||||
|
||||
pre-install:
|
||||
mkdir -p ${PREFIX}/man/manl
|
||||
GNU_CONFIGURE= yes
|
||||
USE_X11= yes
|
||||
|
||||
install:
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/vic ${PREFIX}/bin
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/histtolut ${PREFIX}/bin
|
||||
${INSTALL_MAN} ${WRKSRC}/vic.1 ${PREFIX}/man/man1
|
||||
${COMPRESS_MAN} ${PREFIX/man/man1/vic.1
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
MD5 (vicsrc-2.6.tar.Z) = c3039479d92d3e46c6e46cc34a7f2ac0
|
||||
MD5 (vicsrc-2.8.tar.gz) = 1f9ae3fbf8e9e47e6539c0621964542d
|
||||
|
||||
@ -1,45 +1,481 @@
|
||||
*** Makefile.in.orig Wed Dec 14 17:08:44 1994
|
||||
--- Makefile.in Wed Dec 14 17:23:38 1994
|
||||
***************
|
||||
*** 52,55 ****
|
||||
--- 52,56 ----
|
||||
#have-cxx#C++ = cxx -g3
|
||||
#have-cxx#STATIC = -non_shared
|
||||
+ #have-c++#C++ = c++ -g
|
||||
#have-gcc#CC = gcc -g
|
||||
#have-gcc#C++ = g++ -g -Wall
|
||||
***************
|
||||
*** 68,71 ****
|
||||
--- 69,73 ----
|
||||
TARCMD = tar cfh
|
||||
CCOPT = -O2
|
||||
+ MANDIR = /usr/man/man1
|
||||
|
||||
#have-vpix#VPIX_DIR = /usr/src/local/vfc-1.0
|
||||
***************
|
||||
*** 132,136 ****
|
||||
#have-i386#MD_DEF = -DNOSHM
|
||||
#have-i386#TAR_PREFIX = i386
|
||||
! #have-i386#LIB_X = -L/usr/X11/lib -lXext -lX11
|
||||
#have-netbsd_sparc#TAR_PREFIX = netbsd_sparc
|
||||
#have-netbsd_sparc#TARCMD = tar -h -c -f
|
||||
--- 132,137 ----
|
||||
#have-i386#MD_DEF = -DNOSHM
|
||||
#have-i386#TAR_PREFIX = i386
|
||||
! #have-i386#MD_INC = -I/usr/X11R6/include
|
||||
! #have-i386#LIB_X = -L/usr/X11R6/lib -lXext -lX11
|
||||
#have-netbsd_sparc#TAR_PREFIX = netbsd_sparc
|
||||
#have-netbsd_sparc#TARCMD = tar -h -c -f
|
||||
***************
|
||||
*** 368,372 ****
|
||||
install -c vic /usr/local/bin/vic
|
||||
install -c histtolut /usr/local/bin/histtolut
|
||||
! install -c vic.1 /usr/man/manl/vic.l
|
||||
|
||||
clean:
|
||||
--- 370,374 ----
|
||||
install -c vic /usr/local/bin/vic
|
||||
install -c histtolut /usr/local/bin/histtolut
|
||||
! install -c vic.1 $(MANDIR)/vic.l
|
||||
|
||||
clean:
|
||||
--- configure.orig Sun Jun 23 17:59:45 1996
|
||||
+++ configure Sat Nov 2 23:26:46 1996
|
||||
@@ -1,7 +1,7 @@
|
||||
#! /bin/sh
|
||||
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
-# Generated automatically using autoconf version 2.10
|
||||
+# Generated automatically using autoconf version 2.9
|
||||
# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
|
||||
#
|
||||
# This configure script is free software; the Free Software Foundation
|
||||
@@ -342,7 +342,7 @@
|
||||
verbose=yes ;;
|
||||
|
||||
-version | --version | --versio | --versi | --vers)
|
||||
- echo "configure generated by autoconf version 2.10"
|
||||
+ echo "configure generated by autoconf version 2.9"
|
||||
exit 0 ;;
|
||||
|
||||
-with-* | --with-*)
|
||||
@@ -1067,7 +1067,7 @@
|
||||
V_SIGRET="void"
|
||||
|
||||
echo $ac_n "checking for -lXbsd""... $ac_c" 1>&6
|
||||
-ac_lib_var=`echo Xbsd'_'main | tr './+\055' '__p_'`
|
||||
+ac_lib_var=`echo Xbsd_main | tr '.-/+' '___p'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@@ -1076,13 +1076,15 @@
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1078 "configure"
|
||||
#include "confdefs.h"
|
||||
+/* Override any gcc2 internal prototype to avoid an error. */
|
||||
+int main();
|
||||
|
||||
int main() { return 0; }
|
||||
int t() {
|
||||
main()
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:1086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
+if { (eval echo configure:1088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@@ -1101,18 +1103,16 @@
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for -lsocket""... $ac_c" 1>&6
|
||||
-ac_lib_var=`echo socket'_'poll | tr './+\055' '__p_'`
|
||||
+ac_lib_var=`echo socket_poll | tr '.-/+' '___p'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lsocket $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 1112 "configure"
|
||||
+#line 1114 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
-/* We use char because int might match the return type of a gcc2
|
||||
- builtin and then its argument prototype would still apply. */
|
||||
char poll();
|
||||
|
||||
int main() { return 0; }
|
||||
@@ -1139,7 +1139,7 @@
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for -lnsl""... $ac_c" 1>&6
|
||||
-ac_lib_var=`echo nsl'_'gethostbyname | tr './+\055' '__p_'`
|
||||
+ac_lib_var=`echo nsl_gethostbyname | tr '.-/+' '___p'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@@ -1149,8 +1149,6 @@
|
||||
#line 1150 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
-/* We use char because int might match the return type of a gcc2
|
||||
- builtin and then its argument prototype would still apply. */
|
||||
char gethostbyname();
|
||||
|
||||
int main() { return 0; }
|
||||
@@ -1158,7 +1156,7 @@
|
||||
gethostbyname()
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:1162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
+if { (eval echo configure:1160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@@ -1177,18 +1175,16 @@
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for -ldnet_stub""... $ac_c" 1>&6
|
||||
-ac_lib_var=`echo dnet_stub'_'getnodebyname | tr './+\055' '__p_'`
|
||||
+ac_lib_var=`echo dnet_stub_getnodebyname | tr '.-/+' '___p'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldnet_stub $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 1188 "configure"
|
||||
+#line 1186 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
-/* We use char because int might match the return type of a gcc2
|
||||
- builtin and then its argument prototype would still apply. */
|
||||
char getnodebyname();
|
||||
|
||||
int main() { return 0; }
|
||||
@@ -1196,7 +1192,7 @@
|
||||
getnodebyname()
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:1200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
+if { (eval echo configure:1196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@@ -1304,12 +1300,12 @@
|
||||
echo "checking for X11 header files"
|
||||
if test "$x_includes" = NONE ; then
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 1308 "configure"
|
||||
+#line 1304 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <X11/Intrinsic.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
-{ (eval echo configure:1313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
+{ (eval echo configure:1309: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
@@ -1341,18 +1337,16 @@
|
||||
echo "checking for X11 library archive"
|
||||
if test "$x_libraries" = NONE ; then
|
||||
echo $ac_n "checking for -lX11""... $ac_c" 1>&6
|
||||
-ac_lib_var=`echo X11'_'XOpenDisplay | tr './+\055' '__p_'`
|
||||
+ac_lib_var=`echo X11_XOpenDisplay | tr '.-/+' '___p'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lX11 $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 1352 "configure"
|
||||
+#line 1348 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
-/* We use char because int might match the return type of a gcc2
|
||||
- builtin and then its argument prototype would still apply. */
|
||||
char XOpenDisplay();
|
||||
|
||||
int main() { return 0; }
|
||||
@@ -1360,7 +1354,7 @@
|
||||
XOpenDisplay()
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:1364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
+if { (eval echo configure:1358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@@ -1398,18 +1392,16 @@
|
||||
if test -n "$V_SHM" ; then
|
||||
if test -z "$x_libraries" ; then
|
||||
echo $ac_n "checking for -lXext""... $ac_c" 1>&6
|
||||
-ac_lib_var=`echo Xext'_'XShmAttach | tr './+\055' '__p_'`
|
||||
+ac_lib_var=`echo Xext_XShmAttach | tr '.-/+' '___p'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lXext -lX11 $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 1409 "configure"
|
||||
+#line 1403 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
-/* We use char because int might match the return type of a gcc2
|
||||
- builtin and then its argument prototype would still apply. */
|
||||
char XShmAttach();
|
||||
|
||||
int main() { return 0; }
|
||||
@@ -1417,7 +1409,7 @@
|
||||
XShmAttach()
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:1421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
+if { (eval echo configure:1413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@@ -1468,6 +1460,7 @@
|
||||
d=""
|
||||
fi
|
||||
|
||||
+tclposs="tcl7.5 tcl75 tcl"
|
||||
if test "$d" != "" ; then
|
||||
if test ! -d $d ; then
|
||||
echo "'$d' is not a directory"
|
||||
@@ -1478,18 +1471,18 @@
|
||||
echo "can't find tcl.h in $d/include"
|
||||
exit 1
|
||||
fi
|
||||
- places="$d/lib/libtcl7.5.so \
|
||||
- $d/lib/libtcl7.5.a \
|
||||
- $d/lib/libtcl.so \
|
||||
- $d/lib/libtcl.a"
|
||||
V_LIB_TCL=FAIL
|
||||
- for dir in $places; do
|
||||
- if test -r $dir ; then
|
||||
- V_LIB_TCL=$dir
|
||||
+ for p in $tclposs; do
|
||||
+ if test "`echo $d/lib/lib$p.so*`" != "$d/lib/lib$p.so*" ; then
|
||||
+ V_LIB_TCL="-L$d/lib -l$p"
|
||||
+ break
|
||||
+ fi
|
||||
+ if test -r $d/lib/lib$p.a ; then
|
||||
+ V_LIB_TCL="-L$d/lib -l$p"
|
||||
break
|
||||
fi
|
||||
done
|
||||
- if test $V_LIB_TCL = FAIL ; then
|
||||
+ if test "$V_LIB_TCL" = FAIL ; then
|
||||
echo "can't find libtcl.a in $d/lib"
|
||||
exit 1
|
||||
fi
|
||||
@@ -1508,12 +1501,12 @@
|
||||
fi
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 1512 "configure"
|
||||
+#line 1505 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <tcl.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
-{ (eval echo configure:1517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
+{ (eval echo configure:1510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
@@ -1547,22 +1540,24 @@
|
||||
fi
|
||||
fi
|
||||
echo $ac_n "checking for -ltcl7.5""... $ac_c" 1>&6
|
||||
-ac_lib_var=`echo tcl7.5'_'main | tr './+\055' '__p_'`
|
||||
+ac_lib_var=`echo tcl7.5_main | tr '.-/+' '___p'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ltcl7.5 $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 1558 "configure"
|
||||
+#line 1551 "configure"
|
||||
#include "confdefs.h"
|
||||
+/* Override any gcc2 internal prototype to avoid an error. */
|
||||
+int main();
|
||||
|
||||
int main() { return 0; }
|
||||
int t() {
|
||||
main()
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:1566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
+if { (eval echo configure:1561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@@ -1594,12 +1589,17 @@
|
||||
/import/tcl/lib/tcl7.5 \
|
||||
"
|
||||
for dir in $places; do
|
||||
- if test -r $dir/libtcl7.5.so -o -r $dir/libtcl7.5.a; then
|
||||
- V_LIB_TCL="-L$dir -ltcl7.5"
|
||||
- break
|
||||
- fi
|
||||
- if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then
|
||||
- V_LIB_TCL="-L$dir -ltcl"
|
||||
+ for p in $tclposs; do
|
||||
+ if test "`echo $dir/lib$p.so*`" != "$dir/lib$p.so*" ; then
|
||||
+ V_LIB_TCL="-L$dir -l$p"
|
||||
+ break
|
||||
+ fi
|
||||
+ if test -r $dir/lib$p.a ; then
|
||||
+ V_LIB_TCL="-L$dir -l$p"
|
||||
+ break
|
||||
+ fi
|
||||
+ done
|
||||
+ if test "$V_LIB_TCL" != FAIL; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
@@ -1651,6 +1651,7 @@
|
||||
d=""
|
||||
fi
|
||||
|
||||
+tkposs="tk4.1 tk41 tk"
|
||||
if test "$d" != "" ; then
|
||||
if test ! -d $d ; then
|
||||
echo "'$d' is not a directory"
|
||||
@@ -1661,18 +1662,18 @@
|
||||
echo "can't find tk.h in $d/include"
|
||||
exit 1
|
||||
fi
|
||||
- places="$d/lib/libtk4.1.so \
|
||||
- $d/lib/libtk4.1.a \
|
||||
- $d/lib/libtk.so \
|
||||
- $d/lib/libtk.a"
|
||||
V_LIB_TK=FAIL
|
||||
- for dir in $places; do
|
||||
- if test -r $dir ; then
|
||||
- V_LIB_TK=$dir
|
||||
+ for p in $tkposs; do
|
||||
+ if test "`echo $d/lib/lib$p.so*`" != "$d/lib/lib$p.so*" ; then
|
||||
+ V_LIB_TK="-L$d/lib -l$p"
|
||||
+ break
|
||||
+ fi
|
||||
+ if test -r $d/lib/lib$p.a ; then
|
||||
+ V_LIB_TK="-L$d/lib -l$p"
|
||||
break
|
||||
fi
|
||||
done
|
||||
- if test $V_LIB_TK = FAIL ; then
|
||||
+ if test "$V_LIB_TK" = FAIL ; then
|
||||
echo "can't find libtk.a in $d/lib"
|
||||
exit 1
|
||||
fi
|
||||
@@ -1691,12 +1692,12 @@
|
||||
fi
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 1695 "configure"
|
||||
+#line 1696 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <tk.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
-{ (eval echo configure:1700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
+{ (eval echo configure:1701: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
@@ -1734,22 +1735,24 @@
|
||||
fi
|
||||
fi
|
||||
echo $ac_n "checking for -ltk4.1""... $ac_c" 1>&6
|
||||
-ac_lib_var=`echo tk4.1'_'main | tr './+\055' '__p_'`
|
||||
+ac_lib_var=`echo tk4.1_main | tr '.-/+' '___p'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ltk4.1 $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 1745 "configure"
|
||||
+#line 1746 "configure"
|
||||
#include "confdefs.h"
|
||||
+/* Override any gcc2 internal prototype to avoid an error. */
|
||||
+int main();
|
||||
|
||||
int main() { return 0; }
|
||||
int t() {
|
||||
main()
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:1753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
+if { (eval echo configure:1756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@@ -1780,12 +1783,17 @@
|
||||
$prefix/lib \
|
||||
$x_libraries"
|
||||
for dir in $places; do
|
||||
- if test -r $dir/libtk4.1.so -o -r $dir/libtk4.1.a; then
|
||||
- V_LIB_TK="-L$dir -ltk4.1"
|
||||
- break
|
||||
- fi
|
||||
- if test -r $dir/libtk.so -o -r $dir/libtk.a; then
|
||||
- V_LIB_TK="-L$dir -ltk"
|
||||
+ for p in $tkposs; do
|
||||
+ if test "`echo $dir/lib$p.so*`" != "$dir/lib$p.so*" ; then
|
||||
+ V_LIB_TK="-L$dir -l$p"
|
||||
+ break
|
||||
+ fi
|
||||
+ if test -r $dir/lib$p.a ; then
|
||||
+ V_LIB_TK="-L$dir -l$p"
|
||||
+ break
|
||||
+ fi
|
||||
+ done
|
||||
+ if test "$V_LIB_TK" != FAIL; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
@@ -2074,6 +2082,10 @@
|
||||
V_TARCMD="tar -h -c -f"
|
||||
V_LIB="$V_LIB -L/usr/local/lib"
|
||||
;;
|
||||
+*-*-freebsd*)
|
||||
+ # The static tk library isn't always installed
|
||||
+ V_STATIC=""
|
||||
+ ;;
|
||||
*-*-hpux*)
|
||||
V_CCOPT="-O"
|
||||
;;
|
||||
@@ -2132,18 +2144,16 @@
|
||||
;;
|
||||
*-*-linux*)
|
||||
echo $ac_n "checking for -ldl""... $ac_c" 1>&6
|
||||
-ac_lib_var=`echo dl'_'dlopen | tr './+\055' '__p_'`
|
||||
+ac_lib_var=`echo dl_dlopen | tr '.-/+' '___p'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 2143 "configure"
|
||||
+#line 2155 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
-/* We use char because int might match the return type of a gcc2
|
||||
- builtin and then its argument prototype would still apply. */
|
||||
char dlopen();
|
||||
|
||||
int main() { return 0; }
|
||||
@@ -2151,7 +2161,7 @@
|
||||
dlopen()
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:2155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
+if { (eval echo configure:2165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@@ -2177,22 +2187,24 @@
|
||||
esac
|
||||
if test ! -z "$V_LIB_DL" ; then
|
||||
echo $ac_n "checking for -l$V_LIB_DL""... $ac_c" 1>&6
|
||||
-ac_lib_var=`echo $V_LIB_DL'_'main | tr './+\055' '__p_'`
|
||||
+ac_lib_var=`echo $V_LIB_DL_main | tr '.-/+' '___p'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-l$V_LIB_DL $V_STATIC $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 2188 "configure"
|
||||
+#line 2198 "configure"
|
||||
#include "confdefs.h"
|
||||
+/* Override any gcc2 internal prototype to avoid an error. */
|
||||
+int main();
|
||||
|
||||
int main() { return 0; }
|
||||
int t() {
|
||||
main()
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:2196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
+if { (eval echo configure:2208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@@ -2350,7 +2362,7 @@
|
||||
echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
|
||||
exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
|
||||
-version | --version | --versio | --versi | --vers | --ver | --ve | --v)
|
||||
- echo "$CONFIG_STATUS generated by autoconf version 2.10"
|
||||
+ echo "$CONFIG_STATUS generated by autoconf version 2.9"
|
||||
exit 0 ;;
|
||||
-help | --help | --hel | --he | --h)
|
||||
echo "\$ac_cs_usage"; exit 0 ;;
|
||||
|
||||
@ -1,38 +1,30 @@
|
||||
*** configure.orig Wed Dec 14 16:28:40 1994
|
||||
--- configure Wed Dec 14 17:08:40 1994
|
||||
*** grabber-spigot.cc.orig Fri Nov 1 16:11:59 1996
|
||||
--- grabber-spigot.cc Fri Nov 1 16:17:36 1996
|
||||
***************
|
||||
*** 101,109 ****
|
||||
if ( -x /usr/local/bin/gcc || -x /usr/local/gcc || -x /usr/sww/bin/gcc ) set gcc='-e s/^#have-gcc#//'
|
||||
if ( -x /bin/cxx ) set cxx='-e s/^#have-cxx#//'
|
||||
! if ( -d ../blt ) set bltdir=../blt
|
||||
! if ( -d /usr/src/local/blt ) set bltdir=/usr/src/local/blt
|
||||
! if ( -d ../blt-1.7 ) set bltdir=../blt-1.7
|
||||
! if ( -d /usr/src/local/blt-1.7 ) set bltdir=/usr/src/local/blt-1.7
|
||||
! if ( -d /usr/local/src/blt-1.7 ) set bltdir=/usr/local/src/blt-1.7
|
||||
if ( ! $?bltdir ) then
|
||||
echo "configure: can't find blt (tcl/tk extension)"
|
||||
--- 101,111 ----
|
||||
if ( -x /usr/local/bin/gcc || -x /usr/local/gcc || -x /usr/sww/bin/gcc ) set gcc='-e s/^#have-gcc#//'
|
||||
if ( -x /bin/cxx ) set cxx='-e s/^#have-cxx#//'
|
||||
! if ( -x /usr/bin/c++ ) set cxx='-e s/^#have-c++#//'
|
||||
! if ( -d ../blt/src ) set bltdir=../blt/src
|
||||
! if ( -d /usr/src/local/blt/src ) set bltdir=/usr/src/local/blt/src
|
||||
! if ( -d ../blt-1.7/src ) set bltdir=../blt-1.7/src
|
||||
! if ( -d /usr/src/local/blt-1.7/src ) set bltdir=/usr/src/local/blt-1.7/src
|
||||
! if ( -d /usr/local/src/blt-1.7/src ) set bltdir=/usr/local/src/blt-1.7/src
|
||||
! if ( -f /usr/local/lib/libBLT.a ) set bltdir=/usr/local/lib
|
||||
if ( ! $?bltdir ) then
|
||||
echo "configure: can't find blt (tcl/tk extension)"
|
||||
***************
|
||||
*** 140,144 ****
|
||||
set tkdir=`echo $tkdir | sed -e 's/\//\\\//'g`
|
||||
set tkinc=`echo $tkinc | sed -e 's/\//\\\//'g`
|
||||
! set bltdir=`echo $bltdir/src | sed -e 's/\//\\\//'g`
|
||||
sed $gcc $xil $rtvc $vpix $vl $svideo $cxx $dnet $irix5 $static $jv $xv \
|
||||
-e "s/@TKDIR@/$tkdir/" -e "s/@TKINC@/$tkinc/" \
|
||||
--- 142,146 ----
|
||||
set tkdir=`echo $tkdir | sed -e 's/\//\\\//'g`
|
||||
set tkinc=`echo $tkinc | sed -e 's/\//\\\//'g`
|
||||
! set bltdir=`echo $bltdir | sed -e 's/\//\\\//'g`
|
||||
sed $gcc $xil $rtvc $vpix $vl $svideo $cxx $dnet $irix5 $static $jv $xv \
|
||||
-e "s/@TKDIR@/$tkdir/" -e "s/@TKINC@/$tkinc/" \
|
||||
*** 202,212 ****
|
||||
hstart_ = 1;
|
||||
hstop_ = blkw_ - 1;
|
||||
|
||||
int voff = (outh_ - inh_) / 2;
|
||||
- hwrap_ = outw_ - inw_ ;
|
||||
int hoff = hwrap_ / 2;
|
||||
loff_ = outw_ * voff + hoff;
|
||||
coff_ = (outw_ >> 1) * (voff >> 1) + (hoff >> 1);
|
||||
hskip_ = 0;
|
||||
break;
|
||||
case f_411:
|
||||
--- 202,215 ----
|
||||
hstart_ = 1;
|
||||
hstop_ = blkw_ - 1;
|
||||
|
||||
+ {
|
||||
int voff = (outh_ - inh_) / 2;
|
||||
int hoff = hwrap_ / 2;
|
||||
+
|
||||
+ hwrap_ = outw_ - inw_ ;
|
||||
loff_ = outw_ * voff + hoff;
|
||||
coff_ = (outw_ >> 1) * (voff >> 1) + (hoff >> 1);
|
||||
+ }
|
||||
hskip_ = 0;
|
||||
break;
|
||||
case f_411:
|
||||
|
||||
@ -1,24 +1,14 @@
|
||||
*** main.cc.orig Wed Dec 14 17:11:18 1994
|
||||
--- main.cc Wed Dec 14 17:12:59 1994
|
||||
***************
|
||||
*** 464,472 ****
|
||||
signal(SIGTERM, (void (*)(int ...))adios);
|
||||
#endif
|
||||
! #elif defined(__osf__) || defined(__hpux__) || defined(__NetBSD__)
|
||||
signal(SIGINT, (void (*)(int))adios);
|
||||
signal(SIGHUP, (void (*)(int))adios);
|
||||
signal(SIGTERM, (void (*)(int))adios);
|
||||
! #ifdef __NetBSD__
|
||||
signal(SIGSYS, (void (*)(int))noXShm);
|
||||
#endif
|
||||
--- 464,473 ----
|
||||
signal(SIGTERM, (void (*)(int ...))adios);
|
||||
#endif
|
||||
! #elif defined(__osf__) || defined(__hpux__) || defined(__NetBSD__) || defined(__FreeBSD__)
|
||||
signal(SIGINT, (void (*)(int))adios);
|
||||
signal(SIGHUP, (void (*)(int))adios);
|
||||
signal(SIGTERM, (void (*)(int))adios);
|
||||
! #if defined(__NetBSD__) /*|| defined(__FreeBSD__)*/
|
||||
! /* XXX: -DNOSHM should not be conditionalized on just machine(i386) */
|
||||
signal(SIGSYS, (void (*)(int))noXShm);
|
||||
#endif
|
||||
--- grabber-qcam.cc.orig Sat Nov 2 23:22:46 1996
|
||||
+++ grabber-qcam.cc Sat Nov 2 23:23:34 1996
|
||||
@@ -84,6 +84,11 @@
|
||||
#define CIF_HEIGHT 288
|
||||
|
||||
/*XXX*/
|
||||
+#ifndef QC_MAX_CONTRAST
|
||||
+#define QC_MAX_CONTRAST 255
|
||||
+#endif
|
||||
+
|
||||
+/*XXX*/
|
||||
#define VOLATILE volatile
|
||||
|
||||
class QcamGrabber : public Grabber {
|
||||
|
||||
12
mbone/vic/files/patch-ad
Normal file
12
mbone/vic/files/patch-ad
Normal file
@ -0,0 +1,12 @@
|
||||
--- main.cc.orig Sun Nov 3 16:17:04 1996
|
||||
+++ main.cc Sun Nov 3 16:17:05 1996
|
||||
@@ -425,6 +425,9 @@
|
||||
#endif
|
||||
signal(SIGINT, ciao);
|
||||
signal(SIGTERM, ciao);
|
||||
+#ifdef __FreeBSD__
|
||||
+ signal(SIGSYS, (sig_t)noXShm);
|
||||
+#endif
|
||||
|
||||
#ifdef WIN32
|
||||
TkSetPlatformInit(TkPlatformInit);
|
||||
@ -1,5 +1,4 @@
|
||||
This package contains the binary release of LBL's `vic' network video
|
||||
conferencing tool. This version of `vic' was compiled with MIT-SHM
|
||||
disabled, so performance will be inferior.
|
||||
conferencing tool.
|
||||
|
||||
NOTE: This kit requires XFree86 3.1, Tk, Tcl, and BLT shared libraries.
|
||||
NOTE: This kit requires XFree86 3.1, Tk, and Tcl shared libraries.
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
@cwd /usr/local
|
||||
bin/vic
|
||||
bin/histtolut
|
||||
man/manl/vic.l
|
||||
man/man1/vic.1.gz
|
||||
|
||||
@ -3,23 +3,25 @@
|
||||
# Date created: 14 December 1994
|
||||
# Whom: wollman
|
||||
#
|
||||
# $Id: Makefile,v 1.4 1995/04/10 17:49:14 asami Exp $
|
||||
# $Id: Makefile,v 1.5 1995/11/27 04:05:46 asami Exp $
|
||||
#
|
||||
|
||||
DISTNAME= vic-2.6
|
||||
DISTNAME= vic-2.8
|
||||
CATEGORIES+= net
|
||||
MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vic/
|
||||
DISTFILES= vicsrc-2.6.tar.Z
|
||||
DISTFILES= vicsrc-2.8.tar.gz
|
||||
|
||||
MAINTAINER= wollman@FreeBSD.ORG
|
||||
MAINTAINER= fenner@FreeBSD.ORG
|
||||
|
||||
LIB_DEPENDS= BLT\\.1\\.:${PORTSDIR}/x11/blt
|
||||
LIB_DEPENDS= tk41:${PORTSDIR}/x11/tk41
|
||||
|
||||
HAS_CONFIGURE= yes
|
||||
INSTALL_TARGET= MANDIR=${PREFIX}/man/manl install
|
||||
|
||||
pre-install:
|
||||
mkdir -p ${PREFIX}/man/manl
|
||||
GNU_CONFIGURE= yes
|
||||
USE_X11= yes
|
||||
|
||||
install:
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/vic ${PREFIX}/bin
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/histtolut ${PREFIX}/bin
|
||||
${INSTALL_MAN} ${WRKSRC}/vic.1 ${PREFIX}/man/man1
|
||||
${COMPRESS_MAN} ${PREFIX/man/man1/vic.1
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
MD5 (vicsrc-2.6.tar.Z) = c3039479d92d3e46c6e46cc34a7f2ac0
|
||||
MD5 (vicsrc-2.8.tar.gz) = 1f9ae3fbf8e9e47e6539c0621964542d
|
||||
|
||||
@ -1,45 +1,481 @@
|
||||
*** Makefile.in.orig Wed Dec 14 17:08:44 1994
|
||||
--- Makefile.in Wed Dec 14 17:23:38 1994
|
||||
***************
|
||||
*** 52,55 ****
|
||||
--- 52,56 ----
|
||||
#have-cxx#C++ = cxx -g3
|
||||
#have-cxx#STATIC = -non_shared
|
||||
+ #have-c++#C++ = c++ -g
|
||||
#have-gcc#CC = gcc -g
|
||||
#have-gcc#C++ = g++ -g -Wall
|
||||
***************
|
||||
*** 68,71 ****
|
||||
--- 69,73 ----
|
||||
TARCMD = tar cfh
|
||||
CCOPT = -O2
|
||||
+ MANDIR = /usr/man/man1
|
||||
|
||||
#have-vpix#VPIX_DIR = /usr/src/local/vfc-1.0
|
||||
***************
|
||||
*** 132,136 ****
|
||||
#have-i386#MD_DEF = -DNOSHM
|
||||
#have-i386#TAR_PREFIX = i386
|
||||
! #have-i386#LIB_X = -L/usr/X11/lib -lXext -lX11
|
||||
#have-netbsd_sparc#TAR_PREFIX = netbsd_sparc
|
||||
#have-netbsd_sparc#TARCMD = tar -h -c -f
|
||||
--- 132,137 ----
|
||||
#have-i386#MD_DEF = -DNOSHM
|
||||
#have-i386#TAR_PREFIX = i386
|
||||
! #have-i386#MD_INC = -I/usr/X11R6/include
|
||||
! #have-i386#LIB_X = -L/usr/X11R6/lib -lXext -lX11
|
||||
#have-netbsd_sparc#TAR_PREFIX = netbsd_sparc
|
||||
#have-netbsd_sparc#TARCMD = tar -h -c -f
|
||||
***************
|
||||
*** 368,372 ****
|
||||
install -c vic /usr/local/bin/vic
|
||||
install -c histtolut /usr/local/bin/histtolut
|
||||
! install -c vic.1 /usr/man/manl/vic.l
|
||||
|
||||
clean:
|
||||
--- 370,374 ----
|
||||
install -c vic /usr/local/bin/vic
|
||||
install -c histtolut /usr/local/bin/histtolut
|
||||
! install -c vic.1 $(MANDIR)/vic.l
|
||||
|
||||
clean:
|
||||
--- configure.orig Sun Jun 23 17:59:45 1996
|
||||
+++ configure Sat Nov 2 23:26:46 1996
|
||||
@@ -1,7 +1,7 @@
|
||||
#! /bin/sh
|
||||
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
-# Generated automatically using autoconf version 2.10
|
||||
+# Generated automatically using autoconf version 2.9
|
||||
# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
|
||||
#
|
||||
# This configure script is free software; the Free Software Foundation
|
||||
@@ -342,7 +342,7 @@
|
||||
verbose=yes ;;
|
||||
|
||||
-version | --version | --versio | --versi | --vers)
|
||||
- echo "configure generated by autoconf version 2.10"
|
||||
+ echo "configure generated by autoconf version 2.9"
|
||||
exit 0 ;;
|
||||
|
||||
-with-* | --with-*)
|
||||
@@ -1067,7 +1067,7 @@
|
||||
V_SIGRET="void"
|
||||
|
||||
echo $ac_n "checking for -lXbsd""... $ac_c" 1>&6
|
||||
-ac_lib_var=`echo Xbsd'_'main | tr './+\055' '__p_'`
|
||||
+ac_lib_var=`echo Xbsd_main | tr '.-/+' '___p'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@@ -1076,13 +1076,15 @@
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1078 "configure"
|
||||
#include "confdefs.h"
|
||||
+/* Override any gcc2 internal prototype to avoid an error. */
|
||||
+int main();
|
||||
|
||||
int main() { return 0; }
|
||||
int t() {
|
||||
main()
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:1086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
+if { (eval echo configure:1088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@@ -1101,18 +1103,16 @@
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for -lsocket""... $ac_c" 1>&6
|
||||
-ac_lib_var=`echo socket'_'poll | tr './+\055' '__p_'`
|
||||
+ac_lib_var=`echo socket_poll | tr '.-/+' '___p'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lsocket $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 1112 "configure"
|
||||
+#line 1114 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
-/* We use char because int might match the return type of a gcc2
|
||||
- builtin and then its argument prototype would still apply. */
|
||||
char poll();
|
||||
|
||||
int main() { return 0; }
|
||||
@@ -1139,7 +1139,7 @@
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for -lnsl""... $ac_c" 1>&6
|
||||
-ac_lib_var=`echo nsl'_'gethostbyname | tr './+\055' '__p_'`
|
||||
+ac_lib_var=`echo nsl_gethostbyname | tr '.-/+' '___p'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@@ -1149,8 +1149,6 @@
|
||||
#line 1150 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
-/* We use char because int might match the return type of a gcc2
|
||||
- builtin and then its argument prototype would still apply. */
|
||||
char gethostbyname();
|
||||
|
||||
int main() { return 0; }
|
||||
@@ -1158,7 +1156,7 @@
|
||||
gethostbyname()
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:1162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
+if { (eval echo configure:1160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@@ -1177,18 +1175,16 @@
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for -ldnet_stub""... $ac_c" 1>&6
|
||||
-ac_lib_var=`echo dnet_stub'_'getnodebyname | tr './+\055' '__p_'`
|
||||
+ac_lib_var=`echo dnet_stub_getnodebyname | tr '.-/+' '___p'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldnet_stub $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 1188 "configure"
|
||||
+#line 1186 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
-/* We use char because int might match the return type of a gcc2
|
||||
- builtin and then its argument prototype would still apply. */
|
||||
char getnodebyname();
|
||||
|
||||
int main() { return 0; }
|
||||
@@ -1196,7 +1192,7 @@
|
||||
getnodebyname()
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:1200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
+if { (eval echo configure:1196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@@ -1304,12 +1300,12 @@
|
||||
echo "checking for X11 header files"
|
||||
if test "$x_includes" = NONE ; then
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 1308 "configure"
|
||||
+#line 1304 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <X11/Intrinsic.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
-{ (eval echo configure:1313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
+{ (eval echo configure:1309: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
@@ -1341,18 +1337,16 @@
|
||||
echo "checking for X11 library archive"
|
||||
if test "$x_libraries" = NONE ; then
|
||||
echo $ac_n "checking for -lX11""... $ac_c" 1>&6
|
||||
-ac_lib_var=`echo X11'_'XOpenDisplay | tr './+\055' '__p_'`
|
||||
+ac_lib_var=`echo X11_XOpenDisplay | tr '.-/+' '___p'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lX11 $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 1352 "configure"
|
||||
+#line 1348 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
-/* We use char because int might match the return type of a gcc2
|
||||
- builtin and then its argument prototype would still apply. */
|
||||
char XOpenDisplay();
|
||||
|
||||
int main() { return 0; }
|
||||
@@ -1360,7 +1354,7 @@
|
||||
XOpenDisplay()
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:1364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
+if { (eval echo configure:1358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@@ -1398,18 +1392,16 @@
|
||||
if test -n "$V_SHM" ; then
|
||||
if test -z "$x_libraries" ; then
|
||||
echo $ac_n "checking for -lXext""... $ac_c" 1>&6
|
||||
-ac_lib_var=`echo Xext'_'XShmAttach | tr './+\055' '__p_'`
|
||||
+ac_lib_var=`echo Xext_XShmAttach | tr '.-/+' '___p'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lXext -lX11 $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 1409 "configure"
|
||||
+#line 1403 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
-/* We use char because int might match the return type of a gcc2
|
||||
- builtin and then its argument prototype would still apply. */
|
||||
char XShmAttach();
|
||||
|
||||
int main() { return 0; }
|
||||
@@ -1417,7 +1409,7 @@
|
||||
XShmAttach()
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:1421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
+if { (eval echo configure:1413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@@ -1468,6 +1460,7 @@
|
||||
d=""
|
||||
fi
|
||||
|
||||
+tclposs="tcl7.5 tcl75 tcl"
|
||||
if test "$d" != "" ; then
|
||||
if test ! -d $d ; then
|
||||
echo "'$d' is not a directory"
|
||||
@@ -1478,18 +1471,18 @@
|
||||
echo "can't find tcl.h in $d/include"
|
||||
exit 1
|
||||
fi
|
||||
- places="$d/lib/libtcl7.5.so \
|
||||
- $d/lib/libtcl7.5.a \
|
||||
- $d/lib/libtcl.so \
|
||||
- $d/lib/libtcl.a"
|
||||
V_LIB_TCL=FAIL
|
||||
- for dir in $places; do
|
||||
- if test -r $dir ; then
|
||||
- V_LIB_TCL=$dir
|
||||
+ for p in $tclposs; do
|
||||
+ if test "`echo $d/lib/lib$p.so*`" != "$d/lib/lib$p.so*" ; then
|
||||
+ V_LIB_TCL="-L$d/lib -l$p"
|
||||
+ break
|
||||
+ fi
|
||||
+ if test -r $d/lib/lib$p.a ; then
|
||||
+ V_LIB_TCL="-L$d/lib -l$p"
|
||||
break
|
||||
fi
|
||||
done
|
||||
- if test $V_LIB_TCL = FAIL ; then
|
||||
+ if test "$V_LIB_TCL" = FAIL ; then
|
||||
echo "can't find libtcl.a in $d/lib"
|
||||
exit 1
|
||||
fi
|
||||
@@ -1508,12 +1501,12 @@
|
||||
fi
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 1512 "configure"
|
||||
+#line 1505 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <tcl.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
-{ (eval echo configure:1517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
+{ (eval echo configure:1510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
@@ -1547,22 +1540,24 @@
|
||||
fi
|
||||
fi
|
||||
echo $ac_n "checking for -ltcl7.5""... $ac_c" 1>&6
|
||||
-ac_lib_var=`echo tcl7.5'_'main | tr './+\055' '__p_'`
|
||||
+ac_lib_var=`echo tcl7.5_main | tr '.-/+' '___p'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ltcl7.5 $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 1558 "configure"
|
||||
+#line 1551 "configure"
|
||||
#include "confdefs.h"
|
||||
+/* Override any gcc2 internal prototype to avoid an error. */
|
||||
+int main();
|
||||
|
||||
int main() { return 0; }
|
||||
int t() {
|
||||
main()
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:1566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
+if { (eval echo configure:1561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@@ -1594,12 +1589,17 @@
|
||||
/import/tcl/lib/tcl7.5 \
|
||||
"
|
||||
for dir in $places; do
|
||||
- if test -r $dir/libtcl7.5.so -o -r $dir/libtcl7.5.a; then
|
||||
- V_LIB_TCL="-L$dir -ltcl7.5"
|
||||
- break
|
||||
- fi
|
||||
- if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then
|
||||
- V_LIB_TCL="-L$dir -ltcl"
|
||||
+ for p in $tclposs; do
|
||||
+ if test "`echo $dir/lib$p.so*`" != "$dir/lib$p.so*" ; then
|
||||
+ V_LIB_TCL="-L$dir -l$p"
|
||||
+ break
|
||||
+ fi
|
||||
+ if test -r $dir/lib$p.a ; then
|
||||
+ V_LIB_TCL="-L$dir -l$p"
|
||||
+ break
|
||||
+ fi
|
||||
+ done
|
||||
+ if test "$V_LIB_TCL" != FAIL; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
@@ -1651,6 +1651,7 @@
|
||||
d=""
|
||||
fi
|
||||
|
||||
+tkposs="tk4.1 tk41 tk"
|
||||
if test "$d" != "" ; then
|
||||
if test ! -d $d ; then
|
||||
echo "'$d' is not a directory"
|
||||
@@ -1661,18 +1662,18 @@
|
||||
echo "can't find tk.h in $d/include"
|
||||
exit 1
|
||||
fi
|
||||
- places="$d/lib/libtk4.1.so \
|
||||
- $d/lib/libtk4.1.a \
|
||||
- $d/lib/libtk.so \
|
||||
- $d/lib/libtk.a"
|
||||
V_LIB_TK=FAIL
|
||||
- for dir in $places; do
|
||||
- if test -r $dir ; then
|
||||
- V_LIB_TK=$dir
|
||||
+ for p in $tkposs; do
|
||||
+ if test "`echo $d/lib/lib$p.so*`" != "$d/lib/lib$p.so*" ; then
|
||||
+ V_LIB_TK="-L$d/lib -l$p"
|
||||
+ break
|
||||
+ fi
|
||||
+ if test -r $d/lib/lib$p.a ; then
|
||||
+ V_LIB_TK="-L$d/lib -l$p"
|
||||
break
|
||||
fi
|
||||
done
|
||||
- if test $V_LIB_TK = FAIL ; then
|
||||
+ if test "$V_LIB_TK" = FAIL ; then
|
||||
echo "can't find libtk.a in $d/lib"
|
||||
exit 1
|
||||
fi
|
||||
@@ -1691,12 +1692,12 @@
|
||||
fi
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 1695 "configure"
|
||||
+#line 1696 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <tk.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
-{ (eval echo configure:1700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
+{ (eval echo configure:1701: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
@@ -1734,22 +1735,24 @@
|
||||
fi
|
||||
fi
|
||||
echo $ac_n "checking for -ltk4.1""... $ac_c" 1>&6
|
||||
-ac_lib_var=`echo tk4.1'_'main | tr './+\055' '__p_'`
|
||||
+ac_lib_var=`echo tk4.1_main | tr '.-/+' '___p'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ltk4.1 $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 1745 "configure"
|
||||
+#line 1746 "configure"
|
||||
#include "confdefs.h"
|
||||
+/* Override any gcc2 internal prototype to avoid an error. */
|
||||
+int main();
|
||||
|
||||
int main() { return 0; }
|
||||
int t() {
|
||||
main()
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:1753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
+if { (eval echo configure:1756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@@ -1780,12 +1783,17 @@
|
||||
$prefix/lib \
|
||||
$x_libraries"
|
||||
for dir in $places; do
|
||||
- if test -r $dir/libtk4.1.so -o -r $dir/libtk4.1.a; then
|
||||
- V_LIB_TK="-L$dir -ltk4.1"
|
||||
- break
|
||||
- fi
|
||||
- if test -r $dir/libtk.so -o -r $dir/libtk.a; then
|
||||
- V_LIB_TK="-L$dir -ltk"
|
||||
+ for p in $tkposs; do
|
||||
+ if test "`echo $dir/lib$p.so*`" != "$dir/lib$p.so*" ; then
|
||||
+ V_LIB_TK="-L$dir -l$p"
|
||||
+ break
|
||||
+ fi
|
||||
+ if test -r $dir/lib$p.a ; then
|
||||
+ V_LIB_TK="-L$dir -l$p"
|
||||
+ break
|
||||
+ fi
|
||||
+ done
|
||||
+ if test "$V_LIB_TK" != FAIL; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
@@ -2074,6 +2082,10 @@
|
||||
V_TARCMD="tar -h -c -f"
|
||||
V_LIB="$V_LIB -L/usr/local/lib"
|
||||
;;
|
||||
+*-*-freebsd*)
|
||||
+ # The static tk library isn't always installed
|
||||
+ V_STATIC=""
|
||||
+ ;;
|
||||
*-*-hpux*)
|
||||
V_CCOPT="-O"
|
||||
;;
|
||||
@@ -2132,18 +2144,16 @@
|
||||
;;
|
||||
*-*-linux*)
|
||||
echo $ac_n "checking for -ldl""... $ac_c" 1>&6
|
||||
-ac_lib_var=`echo dl'_'dlopen | tr './+\055' '__p_'`
|
||||
+ac_lib_var=`echo dl_dlopen | tr '.-/+' '___p'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 2143 "configure"
|
||||
+#line 2155 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
-/* We use char because int might match the return type of a gcc2
|
||||
- builtin and then its argument prototype would still apply. */
|
||||
char dlopen();
|
||||
|
||||
int main() { return 0; }
|
||||
@@ -2151,7 +2161,7 @@
|
||||
dlopen()
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:2155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
+if { (eval echo configure:2165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@@ -2177,22 +2187,24 @@
|
||||
esac
|
||||
if test ! -z "$V_LIB_DL" ; then
|
||||
echo $ac_n "checking for -l$V_LIB_DL""... $ac_c" 1>&6
|
||||
-ac_lib_var=`echo $V_LIB_DL'_'main | tr './+\055' '__p_'`
|
||||
+ac_lib_var=`echo $V_LIB_DL_main | tr '.-/+' '___p'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-l$V_LIB_DL $V_STATIC $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 2188 "configure"
|
||||
+#line 2198 "configure"
|
||||
#include "confdefs.h"
|
||||
+/* Override any gcc2 internal prototype to avoid an error. */
|
||||
+int main();
|
||||
|
||||
int main() { return 0; }
|
||||
int t() {
|
||||
main()
|
||||
; return 0; }
|
||||
EOF
|
||||
-if { (eval echo configure:2196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
+if { (eval echo configure:2208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@@ -2350,7 +2362,7 @@
|
||||
echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
|
||||
exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
|
||||
-version | --version | --versio | --versi | --vers | --ver | --ve | --v)
|
||||
- echo "$CONFIG_STATUS generated by autoconf version 2.10"
|
||||
+ echo "$CONFIG_STATUS generated by autoconf version 2.9"
|
||||
exit 0 ;;
|
||||
-help | --help | --hel | --he | --h)
|
||||
echo "\$ac_cs_usage"; exit 0 ;;
|
||||
|
||||
@ -1,38 +1,30 @@
|
||||
*** configure.orig Wed Dec 14 16:28:40 1994
|
||||
--- configure Wed Dec 14 17:08:40 1994
|
||||
*** grabber-spigot.cc.orig Fri Nov 1 16:11:59 1996
|
||||
--- grabber-spigot.cc Fri Nov 1 16:17:36 1996
|
||||
***************
|
||||
*** 101,109 ****
|
||||
if ( -x /usr/local/bin/gcc || -x /usr/local/gcc || -x /usr/sww/bin/gcc ) set gcc='-e s/^#have-gcc#//'
|
||||
if ( -x /bin/cxx ) set cxx='-e s/^#have-cxx#//'
|
||||
! if ( -d ../blt ) set bltdir=../blt
|
||||
! if ( -d /usr/src/local/blt ) set bltdir=/usr/src/local/blt
|
||||
! if ( -d ../blt-1.7 ) set bltdir=../blt-1.7
|
||||
! if ( -d /usr/src/local/blt-1.7 ) set bltdir=/usr/src/local/blt-1.7
|
||||
! if ( -d /usr/local/src/blt-1.7 ) set bltdir=/usr/local/src/blt-1.7
|
||||
if ( ! $?bltdir ) then
|
||||
echo "configure: can't find blt (tcl/tk extension)"
|
||||
--- 101,111 ----
|
||||
if ( -x /usr/local/bin/gcc || -x /usr/local/gcc || -x /usr/sww/bin/gcc ) set gcc='-e s/^#have-gcc#//'
|
||||
if ( -x /bin/cxx ) set cxx='-e s/^#have-cxx#//'
|
||||
! if ( -x /usr/bin/c++ ) set cxx='-e s/^#have-c++#//'
|
||||
! if ( -d ../blt/src ) set bltdir=../blt/src
|
||||
! if ( -d /usr/src/local/blt/src ) set bltdir=/usr/src/local/blt/src
|
||||
! if ( -d ../blt-1.7/src ) set bltdir=../blt-1.7/src
|
||||
! if ( -d /usr/src/local/blt-1.7/src ) set bltdir=/usr/src/local/blt-1.7/src
|
||||
! if ( -d /usr/local/src/blt-1.7/src ) set bltdir=/usr/local/src/blt-1.7/src
|
||||
! if ( -f /usr/local/lib/libBLT.a ) set bltdir=/usr/local/lib
|
||||
if ( ! $?bltdir ) then
|
||||
echo "configure: can't find blt (tcl/tk extension)"
|
||||
***************
|
||||
*** 140,144 ****
|
||||
set tkdir=`echo $tkdir | sed -e 's/\//\\\//'g`
|
||||
set tkinc=`echo $tkinc | sed -e 's/\//\\\//'g`
|
||||
! set bltdir=`echo $bltdir/src | sed -e 's/\//\\\//'g`
|
||||
sed $gcc $xil $rtvc $vpix $vl $svideo $cxx $dnet $irix5 $static $jv $xv \
|
||||
-e "s/@TKDIR@/$tkdir/" -e "s/@TKINC@/$tkinc/" \
|
||||
--- 142,146 ----
|
||||
set tkdir=`echo $tkdir | sed -e 's/\//\\\//'g`
|
||||
set tkinc=`echo $tkinc | sed -e 's/\//\\\//'g`
|
||||
! set bltdir=`echo $bltdir | sed -e 's/\//\\\//'g`
|
||||
sed $gcc $xil $rtvc $vpix $vl $svideo $cxx $dnet $irix5 $static $jv $xv \
|
||||
-e "s/@TKDIR@/$tkdir/" -e "s/@TKINC@/$tkinc/" \
|
||||
*** 202,212 ****
|
||||
hstart_ = 1;
|
||||
hstop_ = blkw_ - 1;
|
||||
|
||||
int voff = (outh_ - inh_) / 2;
|
||||
- hwrap_ = outw_ - inw_ ;
|
||||
int hoff = hwrap_ / 2;
|
||||
loff_ = outw_ * voff + hoff;
|
||||
coff_ = (outw_ >> 1) * (voff >> 1) + (hoff >> 1);
|
||||
hskip_ = 0;
|
||||
break;
|
||||
case f_411:
|
||||
--- 202,215 ----
|
||||
hstart_ = 1;
|
||||
hstop_ = blkw_ - 1;
|
||||
|
||||
+ {
|
||||
int voff = (outh_ - inh_) / 2;
|
||||
int hoff = hwrap_ / 2;
|
||||
+
|
||||
+ hwrap_ = outw_ - inw_ ;
|
||||
loff_ = outw_ * voff + hoff;
|
||||
coff_ = (outw_ >> 1) * (voff >> 1) + (hoff >> 1);
|
||||
+ }
|
||||
hskip_ = 0;
|
||||
break;
|
||||
case f_411:
|
||||
|
||||
@ -1,24 +1,14 @@
|
||||
*** main.cc.orig Wed Dec 14 17:11:18 1994
|
||||
--- main.cc Wed Dec 14 17:12:59 1994
|
||||
***************
|
||||
*** 464,472 ****
|
||||
signal(SIGTERM, (void (*)(int ...))adios);
|
||||
#endif
|
||||
! #elif defined(__osf__) || defined(__hpux__) || defined(__NetBSD__)
|
||||
signal(SIGINT, (void (*)(int))adios);
|
||||
signal(SIGHUP, (void (*)(int))adios);
|
||||
signal(SIGTERM, (void (*)(int))adios);
|
||||
! #ifdef __NetBSD__
|
||||
signal(SIGSYS, (void (*)(int))noXShm);
|
||||
#endif
|
||||
--- 464,473 ----
|
||||
signal(SIGTERM, (void (*)(int ...))adios);
|
||||
#endif
|
||||
! #elif defined(__osf__) || defined(__hpux__) || defined(__NetBSD__) || defined(__FreeBSD__)
|
||||
signal(SIGINT, (void (*)(int))adios);
|
||||
signal(SIGHUP, (void (*)(int))adios);
|
||||
signal(SIGTERM, (void (*)(int))adios);
|
||||
! #if defined(__NetBSD__) /*|| defined(__FreeBSD__)*/
|
||||
! /* XXX: -DNOSHM should not be conditionalized on just machine(i386) */
|
||||
signal(SIGSYS, (void (*)(int))noXShm);
|
||||
#endif
|
||||
--- grabber-qcam.cc.orig Sat Nov 2 23:22:46 1996
|
||||
+++ grabber-qcam.cc Sat Nov 2 23:23:34 1996
|
||||
@@ -84,6 +84,11 @@
|
||||
#define CIF_HEIGHT 288
|
||||
|
||||
/*XXX*/
|
||||
+#ifndef QC_MAX_CONTRAST
|
||||
+#define QC_MAX_CONTRAST 255
|
||||
+#endif
|
||||
+
|
||||
+/*XXX*/
|
||||
#define VOLATILE volatile
|
||||
|
||||
class QcamGrabber : public Grabber {
|
||||
|
||||
12
multimedia/vic/files/patch-ad
Normal file
12
multimedia/vic/files/patch-ad
Normal file
@ -0,0 +1,12 @@
|
||||
--- main.cc.orig Sun Nov 3 16:17:04 1996
|
||||
+++ main.cc Sun Nov 3 16:17:05 1996
|
||||
@@ -425,6 +425,9 @@
|
||||
#endif
|
||||
signal(SIGINT, ciao);
|
||||
signal(SIGTERM, ciao);
|
||||
+#ifdef __FreeBSD__
|
||||
+ signal(SIGSYS, (sig_t)noXShm);
|
||||
+#endif
|
||||
|
||||
#ifdef WIN32
|
||||
TkSetPlatformInit(TkPlatformInit);
|
||||
@ -1,5 +1,4 @@
|
||||
This package contains the binary release of LBL's `vic' network video
|
||||
conferencing tool. This version of `vic' was compiled with MIT-SHM
|
||||
disabled, so performance will be inferior.
|
||||
conferencing tool.
|
||||
|
||||
NOTE: This kit requires XFree86 3.1, Tk, Tcl, and BLT shared libraries.
|
||||
NOTE: This kit requires XFree86 3.1, Tk, and Tcl shared libraries.
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
@cwd /usr/local
|
||||
bin/vic
|
||||
bin/histtolut
|
||||
man/manl/vic.l
|
||||
man/man1/vic.1.gz
|
||||
|
||||
Loading…
Reference in New Issue
Block a user