summaryrefslogtreecommitdiff
path: root/mbone
diff options
context:
space:
mode:
authorJustin M. Seger <jseger@FreeBSD.org>1998-10-13 04:33:06 +0000
committerJustin M. Seger <jseger@FreeBSD.org>1998-10-13 04:33:06 +0000
commit1851b3c8688528d1071f0a9936d865ad10c61268 (patch)
treec385fd90159a9f60acba6dea110bab8138d921e4 /mbone
parentMark BORKEN for ELF: (diff)
Unbreak.
Submitted by: steve
Notes
Notes: svn path=/head/; revision=13946
Diffstat (limited to 'mbone')
-rw-r--r--mbone/vic/Makefile4
-rw-r--r--mbone/vic/files/patch-aa21
2 files changed, 16 insertions, 9 deletions
diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile
index 09ff9fb9149a..d66befe6d759 100644
--- a/mbone/vic/Makefile
+++ b/mbone/vic/Makefile
@@ -3,7 +3,7 @@
# Date created: 14 December 1994
# Whom: wollman
#
-# $Id: Makefile,v 1.18 1998/09/25 10:05:11 asami Exp $
+# $Id: Makefile,v 1.19 1998/10/13 03:05:40 jseger Exp $
#
DISTNAME= vic-2.8
@@ -13,8 +13,6 @@ DISTFILES= vicsrc-2.8.tar.gz
MAINTAINER= fenner@FreeBSD.ORG
-BROKEN_ELF= yes
-
LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
USE_AUTOCONF= yes
diff --git a/mbone/vic/files/patch-aa b/mbone/vic/files/patch-aa
index 1ff46b9b4f1a..567da523ab66 100644
--- a/mbone/vic/files/patch-aa
+++ b/mbone/vic/files/patch-aa
@@ -1,5 +1,5 @@
---- configure.in.orig Thu Jun 20 23:36:47 1996
-+++ configure.in Tue Sep 9 11:20:32 1997
+--- 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=""
@@ -9,6 +9,15 @@
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"
@@ -19,16 +28,16 @@
vpix_dir=/usr/src/local/vfc-1.0
vpix_lib=$vpix_dir/vfc_lib
if test -d /import/VideoPix ; then
-@@ -228,6 +228,9 @@
+@@ -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 @@