mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-01 22:05:08 +00:00
Code Issues Releases Activity
e261fddbfa
freebsd-ports/multimedia/vic/files/patch-aa
Steve Price 59e4b7969b Update to Tcl/Tk version 8.2 and get this to build with gcc 2.95. 
Submitted by:	Ade Lovett <ade@lovett.com>
1999-11-29 03:41:33 +00:00

237 lines
6.1 KiB
Plaintext
Raw Blame History

--- configure.in.orig Fri Jun 21 01:36:47 1996
+++ configure.in Mon Oct 12 23:20:51 1998
@@ -34,7 +34,7 @@
V_LIB_GRABBER=""
V_INCLUDE_GRABBER=""
-V_OBJ_GRABBER=""
+V_OBJ_GRABBER="grabber-x11.cc"
V_LIB_XIL=""
V_OBJ_XIL=""
@@ -69,7 +69,7 @@
if test -r /usr/include/machine/ioctl_meteor.h ; then
V_OBJ_GRABBER="$V_OBJ_GRABBER grabber-meteor.o"
fi
-if test -r /usr/local/lib/libspigot.a ; then
+if test -r /usr/local/lib/libspigot.a -a ${PORTOBJFORMAT} != elf; then
V_OBJ_GRABBER="$V_OBJ_GRABBER grabber-spigot.o"
V_LIB_GRABBER="$V_LIB_GRABBER -lspigot"
V_INCLUDE_GRABBER="$V_INCLUDE_GRABBER -I/usr/local/include"
@@ -87,9 +87,6 @@
V_OBJ_GRABBER="$V_OBJ_GRABBER grabber-qcam.o"
V_DEFINE="$V_DEFINE -DQCAMDEV"
fi
-if test -r /usr/include/linux/scc.h -o -r /usr/include/machine/scc.h ; then
- V_OBJ_GRABBER="$V_OBJ_GRABBER grabber-scc.o"
-fi
vpix_dir=/usr/src/local/vfc-1.0
vpix_lib=$vpix_dir/vfc_lib
if test -d /import/VideoPix ; then
@@ -227,6 +224,9 @@
*-*-netbsd*)
V_TARCMD="tar -h -c -f"
V_LIB="$V_LIB -L/usr/local/lib"
+ ;;
+*-*-freebsd*)
+ V_STATIC=""
;;
*-*-hpux*)
V_CCOPT="-O"
--- configure.in.tk.orig Thu May 16 01:06:05 1996
+++ configure.in.tk Tue Sep 9 11:01:36 1997
@@ -12,8 +12,8 @@
echo "can't find tcl.h in $d/include"
exit 1
fi
- places="$d/lib/libtcl7.5.so \
- $d/lib/libtcl7.5.a \
+ places="$d/lib/libtcl8.2.so \
+ $d/lib/libtcl8.2.a \
$d/lib/libtcl.so \
$d/lib/libtcl.a"
V_LIB_TCL=FAIL
@@ -27,7 +27,7 @@
echo "can't find libtcl.a in $d/lib"
exit 1
fi
- places="$d/lib/tcl7.5 \
+ places="$d/lib/tcl8.2 \
$d/lib/tcl"
V_LIBRARY_TCL=FAIL
for dir in $places; do
@@ -44,13 +44,14 @@
AC_TEST_CPP([#include <tcl.h>], V_INCLUDE_TCL="", V_INCLUDE_TCL=FAIL)
if test "$V_INCLUDE_TCL" = FAIL; then
echo "checking for tcl.h"
- places="$PWD/../tcl7.5 \
- /usr/src/local/tcl7.5 \
- /import/tcl/include/tcl7.5 \
+ places="$PWD/../tcl8.2 \
+ /usr/src/local/tcl8.2 \
+ /import/tcl/include/tcl8.2 \
$prefix/include \
$x_includes/tk \
$x_includes \
/usr/local/include \
+ /usr/local/include/tcl8.2 \
/usr/contrib/include \
/usr/include"
for dir in $places; do
@@ -64,7 +65,7 @@
exit 1
fi
fi
- AC_CHECK_LIB(tcl7.5, main, V_LIB_TCL="-ltcl7.5", V_LIB_TCL="FAIL")
+ AC_CHECK_LIB(tcl8.2, main, V_LIB_TCL="-ltcl8.2", V_LIB_TCL="FAIL")
if test "$V_LIB_TCL" = FAIL; then
echo "checking for libtcl.a"
places="\
@@ -73,13 +74,13 @@
/usr/contrib/lib \
/usr/local/lib \
/usr/lib \
- $PWD/../tcl7.5 \
- /usr/src/local/tcl7.5 \
- /import/tcl/lib/tcl7.5 \
+ $PWD/../tcl8.2 \
+ /usr/src/local/tcl8.2 \
+ /import/tcl/lib/tcl8.2 \
"
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"
+ if test -r $dir/libtcl82.so -o -r $dir/libtcl82.a; then
+ V_LIB_TCL="-L$dir -ltcl82"
break
fi
if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then
@@ -98,13 +99,13 @@
fi
echo "checking for tcl/init.tcl"
V_LIBRARY_TCL=FAIL
- places="/usr/local/lib/tcl7.5 \
- /usr/contrib/lib/tcl7.5 \
- /usr/lib/tcl7.5 \
- /usr/lib/tk/tcl7.5 \
- /import/tcl/lib/tcl7.5 \
- $prefix/lib/tcl7.5 \
- $x_libraries/tcl7.5 \
+ places="/usr/local/lib/tcl8.2 \
+ /usr/contrib/lib/tcl8.2 \
+ /usr/lib/tcl8.2 \
+ /usr/lib/tk/tcl8.2 \
+ /import/tcl/lib/tcl8.2 \
+ $prefix/lib/tcl8.2 \
+ $x_libraries/tcl8.2 \
/usr/local/lib/tcl \
/usr/lib/tcl \
/usr/lib/tk/tcl \
@@ -138,8 +139,8 @@
echo "can't find tk.h in $d/include"
exit 1
fi
- places="$d/lib/libtk4.1.so \
- $d/lib/libtk4.1.a \
+ places="$d/lib/libtk8.2.so \
+ $d/lib/libtk8.2.a \
$d/lib/libtk.so \
$d/lib/libtk.a"
V_LIB_TK=FAIL
@@ -153,7 +154,7 @@
echo "can't find libtk.a in $d/lib"
exit 1
fi
- places="$d/lib/tk4.1 \
+ places="$d/lib/tk8.2 \
$d/lib/tk"
V_LIBRARY_TK=FAIL
for dir in $places; do
@@ -170,18 +171,19 @@
AC_TEST_CPP([#include <tk.h>], V_INCLUDE_TK="", V_INCLUDE_TK=FAIL)
if test "$V_INCLUDE_TK" = FAIL; then
echo "checking for tk.h"
- V_INCLUDE_TK=""
+ V_INCLUDE_TK="FAIL"
places="\
$prefix/include \
/usr/local/include \
+ /usr/local/include/tk8.2 \
/usr/contrib/include \
/usr/include/tcl \
/usr/include\
$x_includes/tk \
$x_includes \
- $PWD/../tk4.1 \
- /usr/src/local/tk4.1 \
- /import/tcl/include/tk4.1 \
+ $PWD/../tk8.2 \
+ /usr/src/local/tk8.2 \
+ /import/tcl/include/tk8.2 \
"
for dir in $places; do
if test -r $dir/tk.h ; then
@@ -194,7 +196,7 @@
exit 1
fi
fi
- AC_CHECK_LIB(tk4.1, main, V_LIB_TK="-ltk4.1", V_LIB_TK="FAIL")
+ AC_CHECK_LIB(tk8.2, main, V_LIB_TK="-ltk8.2", V_LIB_TK="FAIL")
if test "$V_LIB_TK" = FAIL; then
echo "checking for libtk.a"
places="/usr/local/lib \
@@ -202,13 +204,13 @@
/usr/lib \
/usr/lib/tk \
/import/tcl/lib \
- $PWD/../tk4.1 \
- /usr/src/local/tk4.1 \
+ $PWD/../tk8.2 \
+ /usr/src/local/tk8.2 \
$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"
+ if test -r $dir/libtk82.so -o -r $dir/libtk82.a; then
+ V_LIB_TK="-L$dir -ltk82"
break
fi
if test -r $dir/libtk.so -o -r $dir/libtk.a; then
@@ -227,15 +229,15 @@
fi
echo "checking for tk/tk.tcl"
V_LIBRARY_TK=FAIL
- places="/usr/local/lib/tk4.1 \
- /usr/contrib/lib/tk4.1 \
- /usr/lib/tk4.1 \
- /usr/lib/tk/tk4.1 \
- /import/tcl/lib/tk4.1 \
- $prefix/lib/tk4.1 \
- $x_libraries/tk4.1 \
- $PWD/../tk4.1/library \
- /usr/src/local/tk4.1/library \
+ places="/usr/local/lib/tk8.2 \
+ /usr/contrib/lib/tk8.2 \
+ /usr/lib/tk8.2 \
+ /usr/lib/tk/tk8.2 \
+ /import/tcl/lib/tk8.2 \
+ $prefix/lib/tk8.2 \
+ $x_libraries/tk8.2 \
+ $PWD/../tk8.2/library \
+ /usr/src/local/tk8.2/library \
/usr/local/lib/tk \
/usr/lib/tk \
/usr/lib/tk/tk \
--- Makefile.in.orig Mon Jul 22 09:32:53 1996
+++ Makefile.in Tue Sep 9 11:01:36 1997
@@ -303,7 +303,7 @@
chown bin @prefix@/bin/vic
chgrp bin @prefix@/bin/vic
chmod 555 @prefix@/bin/vic
- cp vic.1 @prefix@/man/vic.1
+ cp vic.1 @prefix@/man/man1/vic.1
cp histtolut @prefix@/bin/histtolut
chown bin @prefix@/bin/histtolut
chgrp bin @prefix@/bin/histtolut
Reference in New Issue View Git Blame Copy Permalink