diff options
Diffstat (limited to 'multimedia/vic')
-rw-r--r-- | multimedia/vic/Makefile | 43 | ||||
-rw-r--r-- | multimedia/vic/distinfo | 1 | ||||
-rw-r--r-- | multimedia/vic/files/patch-Makefile.in | 20 | ||||
-rw-r--r-- | multimedia/vic/files/patch-Tcl.cpp | 10 | ||||
-rw-r--r-- | multimedia/vic/files/patch-configure.in | 20 | ||||
-rw-r--r-- | multimedia/vic/files/patch-configure.in.tail | 15 | ||||
-rw-r--r-- | multimedia/vic/files/patch-configure.in.tk | 56 | ||||
-rw-r--r-- | multimedia/vic/files/patch-encoder-jpeg.cpp | 16 | ||||
-rw-r--r-- | multimedia/vic/files/patch-histtolut.cpp | 73 | ||||
-rw-r--r-- | multimedia/vic/files/patch-inet6.c | 14 | ||||
-rw-r--r-- | multimedia/vic/files/patch-inet6.h | 34 | ||||
-rw-r--r-- | multimedia/vic/files/patch-net-ipv6.cpp | 29 | ||||
-rw-r--r-- | multimedia/vic/files/patch-ui-ctrlmenu.tcl | 25 | ||||
-rw-r--r-- | multimedia/vic/files/patch-ui-resource.tcl | 11 | ||||
-rw-r--r-- | multimedia/vic/pkg-descr | 4 | ||||
-rw-r--r-- | multimedia/vic/pkg-plist | 2 |
16 files changed, 0 insertions, 373 deletions
diff --git a/multimedia/vic/Makefile b/multimedia/vic/Makefile deleted file mode 100644 index d4b597362111..000000000000 --- a/multimedia/vic/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# New ports collection makefile for: vic -# Date created: 14 December 1994 -# Whom: wollman -# -# $FreeBSD$ -# - -PORTNAME= vic -PORTVERSION= 2.8.1.1.3 -PORTREVISION= 1 -CATEGORIES= mbone tk83 ipv6 -MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/vic/2.8ucl-1.1.3/ -DISTNAME= ${PORTNAME}-2.8ucl-1.1.3 - -MAINTAINER= fenner@FreeBSD.org -COMMENT= MBONE video tool - -LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83 -BUILD_DEPENDS= ${LOCALBASE}/lib/libuclmmbase.a:${PORTSDIR}/devel/uclmmbase - -WRKSRC= ${WRKDIR}/vic-2.8ucl-1.1.3/vic - -USE_AUTOCONF= yes -USE_PERL5_BUILD=yes -USE_X_PREFIX= yes -CONFIGURE_ARGS= -x-libraries=${PREFIX}/lib \ - -x-includes=${PREFIX}/include \ - -without-ucltcl \ - -with-tcl=${LOCALBASE} \ - -without-ucltk \ - -with-tk=${LOCALBASE} \ - -enable-ipv6 -MAN1= vic.1 - -pre-patch: - @${FIND} ${WRKSRC} -name "*.[c,h]" | ${XARGS} ${PERL} -pi -e \ - 's|malloc.h|stdlib.h|' - -post-install: - ${STRIP_CMD} ${PREFIX}/bin/vic - ${STRIP_CMD} ${PREFIX}/bin/histtolut - -.include <bsd.port.mk> diff --git a/multimedia/vic/distinfo b/multimedia/vic/distinfo deleted file mode 100644 index b9faf5a35270..000000000000 --- a/multimedia/vic/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (vic-2.8ucl-1.1.3.tar.gz) = 55e792aa8f370fc15a197bb1b910a704 diff --git a/multimedia/vic/files/patch-Makefile.in b/multimedia/vic/files/patch-Makefile.in deleted file mode 100644 index 24d9a710cec8..000000000000 --- a/multimedia/vic/files/patch-Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.in.orig Thu Feb 17 21:59:08 2000 -+++ Makefile.in Tue May 8 09:06:28 2001 -@@ -85,7 +85,7 @@ - OBJ_XIL = @V_OBJ_XIL@ - OBJ_CRYPT = @V_OBJ_CRYPT@ - LIB = $(LIB_GRABBER) @V_LIB_TK@ @V_LIB_TCL@ @V_LIB_X11@ @V_LIB@ \ -- codec/tmndec/libh263.a codec/tmn-x/libh263coder.a ../common/libuclmmbase.a -lm -+ codec/tmndec/libh263.a codec/tmn-x/libh263coder.a /usr/local/lib/libuclmmbase.a -lm - INCLUDE = $(INCLUDE_MISC) $(INCLUDE_GRABBER) $(INCLUDE_TK) $(INCLUDE_TCL) \ - $(INCLUDE_X11) $(MD_INC) -Icodec/jpeg -Icodec/p64 -I. - DEFINE = @V_DEFINE@ -DED_YBITS=$(ED_YBITS) -DSIGRET=@V_SIGRET@ -DNLAYER=8 -@@ -329,7 +329,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 diff --git a/multimedia/vic/files/patch-Tcl.cpp b/multimedia/vic/files/patch-Tcl.cpp deleted file mode 100644 index 881919b5448f..000000000000 --- a/multimedia/vic/files/patch-Tcl.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- Tcl.cpp.org Mon May 7 15:55:17 2001 -+++ Tcl.cpp Mon May 7 15:55:34 2001 -@@ -66,6 +66,7 @@ - { - instance_.tcl_ = tcl; - instance_.application_ = application; -+ Tcl_Init(tcl); - } - - void Tcl::evalc(const char* s) diff --git a/multimedia/vic/files/patch-configure.in b/multimedia/vic/files/patch-configure.in deleted file mode 100644 index a603fa09b660..000000000000 --- a/multimedia/vic/files/patch-configure.in +++ /dev/null @@ -1,20 +0,0 @@ ---- configure.in.org Mon May 7 15:30:01 2001 -+++ configure.in Mon May 7 15:31:32 2001 -@@ -72,8 +72,7 @@ - if test -r /usr/include/linux/videodev.h ; then - V_OBJ_GRABBER="video/grabber-video4linux.o $V_OBJ_GRABBER" - fi --#if test -r /usr/local/lib/libspigot.a -a ${PORTOBJFORMAT} != elf; then --if test -r /usr/local/lib/libspigot.a ; then -+if test -r /usr/local/lib/libspigot.a -a ${PORTOBJFORMAT} != elf; then - V_OBJ_GRABBER="video/grabber-spigot.o $V_OBJ_GRABBER" - V_LIB_GRABBER="$V_LIB_GRABBER -lspigot" - V_INCLUDE_GRABBER="$V_INCLUDE_GRABBER -I/usr/local/include" -@@ -249,6 +248,7 @@ - else - V_DEFINE="$V_DEFINE -DFreeBSD" - fi -+ V_DEFINE="$V_DEFINE -DSIGARGS=int" - OPSYS=freebsd - ;; - *-*-hpux*) diff --git a/multimedia/vic/files/patch-configure.in.tail b/multimedia/vic/files/patch-configure.in.tail deleted file mode 100644 index 44ab63487ae9..000000000000 --- a/multimedia/vic/files/patch-configure.in.tail +++ /dev/null @@ -1,15 +0,0 @@ ---- configure.in.tail.orig Fri Jan 31 09:09:33 2003 -+++ configure.in.tail Fri Jan 31 09:09:47 2003 -@@ -35,9 +35,9 @@ - - AC_SUBST(V_STATIC) - --if test "$host_cpu" = alpha ; then -- V_DEFINE="$V_DEFINE -DINT_64=u_long" --fi -+#if test "$host_cpu" = alpha ; then -+# V_DEFINE="$V_DEFINE -DINT_64=u_long" -+#fi - - # various include hacks - dirs="/usr/src/local/include-fixes \ diff --git a/multimedia/vic/files/patch-configure.in.tk b/multimedia/vic/files/patch-configure.in.tk deleted file mode 100644 index aee5d9ad4021..000000000000 --- a/multimedia/vic/files/patch-configure.in.tk +++ /dev/null @@ -1,56 +0,0 @@ ---- configure.in.tk.org Tue May 8 08:42:54 2001 -+++ configure.in.tk Tue May 8 08:56:43 2001 -@@ -32,13 +32,13 @@ - echo "'$d' is not a directory" - exit 1 - fi -- V_INCLUDE_TCL=-I$d/include -- if test ! -r $d/include/tcl.h ; then -+ V_INCLUDE_TCL=-I$d/include/tcl8.3/ -+ if test ! -r $d/include/tcl8.3/tcl.h ; then - echo "can't find tcl.h in $d/include" - exit 1 - fi -- places="$d/lib/libtcl8.0.so \ -- $d/lib/libtcl8.0.a \ -+ places="$d/lib/libtcl83.so \ -+ $d/lib/libtcl83.a \ - $d/lib/libtcl.so \ - $d/lib/libtcl.a" - V_LIB_TCL=FAIL -@@ -52,7 +52,7 @@ - echo "can't find libtcl.a in $d/lib" - exit 1 - fi -- places="$d/lib/tcl-8.0 \ -+ places="$d/lib/tcl8.3 \ - $d/lib/tcl8.0 \ - $d/lib/tcl" - V_LIBRARY_TCL=FAIL -@@ -190,13 +190,13 @@ - echo "'$d' is not a directory" - exit 1 - fi -- V_INCLUDE_TK=-I$d/include -- if test ! -r $d/include/tk.h ; then -+ V_INCLUDE_TK=-I$d/include/tk8.3 -+ if test ! -r $d/include/tk8.3/tk.h ; then - echo "can't find tk.h in $d/include" - exit 1 - fi -- places="$d/lib/libtk8.0.so \ -- $d/lib/libtk8.0.a \ -+ places="$d/lib/libtk83.so \ -+ $d/lib/libtk83.a \ - $d/lib/libtk.so \ - $d/lib/libtk.a" - V_LIB_TK=FAIL -@@ -210,7 +210,7 @@ - echo "can't find libtk.a in $d/lib" - exit 1 - fi -- places="$d/lib/tk8.0 \ -+ places="$d/lib/tk8.3 \ - $d/lib/tk" - V_LIBRARY_TK=FAIL - for dir in $places; do diff --git a/multimedia/vic/files/patch-encoder-jpeg.cpp b/multimedia/vic/files/patch-encoder-jpeg.cpp deleted file mode 100644 index 7a8fed0d8b42..000000000000 --- a/multimedia/vic/files/patch-encoder-jpeg.cpp +++ /dev/null @@ -1,16 +0,0 @@ ---- codec/encoder-jpeg.cpp.orig Thu Jan 23 18:22:29 2003 -+++ codec/encoder-jpeg.cpp Thu Jan 23 18:22:37 2003 -@@ -127,12 +127,12 @@ - void size(int w, int h); - int consume(const VideoFrame*); - -- protected: - struct huffentry { - u_short val; - u_short nb; - }; - -+ protected: - int command(int argc, const char*const* argv); - - int flush(pktbuf* pb, int nbit, pktbuf* npb); diff --git a/multimedia/vic/files/patch-histtolut.cpp b/multimedia/vic/files/patch-histtolut.cpp deleted file mode 100644 index c47168d31e64..000000000000 --- a/multimedia/vic/files/patch-histtolut.cpp +++ /dev/null @@ -1,73 +0,0 @@ ---- render/histtolut/histtolut.cpp.orig Thu Jan 23 18:13:08 2003 -+++ render/histtolut/histtolut.cpp Thu Jan 23 18:15:11 2003 -@@ -62,6 +62,7 @@ - #endif - #include <sys/stat.h> - #include <fcntl.h> -+#include <cstring> - - #ifdef WIN32 - extern "C" { -@@ -142,7 +143,7 @@ - * For further details see "Introduction to Algorithms" by Carmen, - * Lieserson and Rivest. - */ --//extern void *memset(void *, int, size_t); -+//extern void *std::memset(void *, int, size_t); - - /* XXX should pass backup array in as argument, that way can create it - only once. */ -@@ -154,7 +155,7 @@ - \ - register histItem** hist = &h[idx]; \ - int j; \ -- memset((void *)aux, 0, 256 * sizeof(int)); \ -+ std::memset((void *)aux, 0, 256 * sizeof(int)); \ - for (j = 0; j < n; j++) \ - aux[hist[j]->c.fld]++; \ - \ -@@ -199,7 +200,7 @@ - box* bv = new box[sizeof(box) * newcolors]; - - register u_char* colormap = cmap; -- memset(colormap, 0, 3 * newcolors); -+ std::memset(colormap, 0, 3 * newcolors); - - /* Set up the initial box. */ - bv[0].ind = 0; -@@ -450,7 +451,7 @@ - box* bv = new box[sizeof(box) * newcolors]; - - register u_char* colormap = cmap; -- memset(colormap, 0, 3 * newcolors); -+ std::memset(colormap, 0, 3 * newcolors); - - /* Set up the initial box. */ - bv[0].ind = 0; -@@ -639,7 +640,7 @@ - abort(); - - int ncol[MAX_YLEVELS]; -- memset(ncol, 0, sizeof(ncol)); -+ std::memset(ncol, 0, sizeof(ncol)); - /* - * We do this in two passes so that the size of the table can be - * calculated. Otherwise it would be have to be too big: -@@ -657,7 +658,7 @@ - table[i] = new histItem[ncol[i]]; - - i = 0; -- memset(ncol, 0, sizeof(ncol)); -+ std::memset(ncol, 0, sizeof(ncol)); - for (v = 0; v < 1 << 5; ++v) { - for (int u = 0; u < 1 << 5; ++u) { - for (int y = 0; y < 1 << 4; ++y) { -@@ -688,7 +689,7 @@ - } - - histItem** histogram[MAX_YLEVELS]; -- memset(histogram, 0, sizeof(histogram)); -+ std::memset(histogram, 0, sizeof(histogram)); - int totcol = 0; - for (i = 0; i < ny; ++i) { - if (ncol[i] != 0) { diff --git a/multimedia/vic/files/patch-inet6.c b/multimedia/vic/files/patch-inet6.c deleted file mode 100644 index 3d1ba594a6f2..000000000000 --- a/multimedia/vic/files/patch-inet6.c +++ /dev/null @@ -1,14 +0,0 @@ ---- net/inet6.c.org Mon Feb 4 17:51:32 2002 -+++ net/inet6.c Mon Feb 4 17:52:02 2002 -@@ -64,11 +64,7 @@ - memcpy(addr->s6_addr, &(((struct sockaddr_in6 *)(ai->ai_addr))->sin6_addr), sizeof(struct in6_addr)); - return (0); - #else --#ifdef MUSICA_IPV6 - hp = gethostbyname2(hostname, AF_INET6); --#else -- hp = getnodebyname(hostname, AF_INET6,AI_DEFAULT); --#endif /*MUSICA_IPV6*/ - #endif /*LINUX_IPV6*/ - #endif /*SOLARIS7_IPV6*/ - if (hp == 0) return (-1); diff --git a/multimedia/vic/files/patch-inet6.h b/multimedia/vic/files/patch-inet6.h deleted file mode 100644 index ed330bfa8b04..000000000000 --- a/multimedia/vic/files/patch-inet6.h +++ /dev/null @@ -1,34 +0,0 @@ ---- net/inet6.h.org Mon Feb 4 17:51:39 2002 -+++ net/inet6.h Mon Feb 4 17:52:02 2002 -@@ -44,7 +44,6 @@ - #define vic_inet6_h - - #ifdef HAVE_IPV6 -- - #include <sys/types.h> - #ifdef WIN32 - //#include <winsock.h> -@@ -62,10 +61,23 @@ - } - #else - #include <netinet/in.h> -+#include <netinet6/in6.h> - #endif - #endif - #ifndef WIN32 - #include <arpa/inet.h> -+#ifdef _NETINET6_IN6_H_ -+#ifndef IPV6_ADD_MEMBERSHIP -+#ifdef IPV6_JOIN_GROUP -+#define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP -+#endif /* IPV6_JOIN_GROUP */ -+#endif /* IPV6_ADD_MEMBERSHIP */ -+#ifndef IPV6_DROP_MEMBERSHIP -+#ifdef IPV6_LEAVE_GROUP -+#define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP -+#endif /* IPV6_LEAVE_GROUP */ -+#endif /* IPV6_DROP_MEMBERSHIP */ -+#endif /* _NETINET6_IN6_H_ */ - #endif - - #include "config.h" diff --git a/multimedia/vic/files/patch-net-ipv6.cpp b/multimedia/vic/files/patch-net-ipv6.cpp deleted file mode 100644 index 26397cdde8ff..000000000000 --- a/multimedia/vic/files/patch-net-ipv6.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- net/net-ipv6.cpp.org Mon Feb 4 17:51:46 2002 -+++ net/net-ipv6.cpp Mon Feb 4 17:52:08 2002 -@@ -277,7 +277,7 @@ - p->sin6_family = AF_INET6; - int len = sizeof(*p), result = 0; - -- if ((result = getsockname(ssock_, (struct sockaddr *)p, &len)) < 0) { -+ if ((result = getsockname(ssock_, (struct sockaddr *)p, (socklen_t *)&len)) < 0) { - perror("getsockname"); - p->sin6_addr = in6addr_any; - p->sin6_port = 0; -@@ -364,7 +364,7 @@ - * with bated breath. - */ - #if defined(__FreeBSD__) -- struct oipv6_mreq mr; -+ struct ipv6_mreq mr; - #else - struct ipv6_mreq mr; - #endif -@@ -522,7 +522,7 @@ - sockaddr_in6 sfrom; - int fromlen = sizeof(sfrom); - int cc = ::recvfrom(fd, (char*)buf, len, 0, -- (sockaddr*)&sfrom, &fromlen); -+ (sockaddr*)&sfrom, (socklen_t *)&fromlen); - if (cc < 0) { - if (errno != EWOULDBLOCK) - perror("recvfrom"); diff --git a/multimedia/vic/files/patch-ui-ctrlmenu.tcl b/multimedia/vic/files/patch-ui-ctrlmenu.tcl deleted file mode 100644 index d8a3514fe595..000000000000 --- a/multimedia/vic/files/patch-ui-ctrlmenu.tcl +++ /dev/null @@ -1,25 +0,0 @@ ---- tcl/ui-ctrlmenu.tcl.org Thu May 10 08:44:51 2001 -+++ tcl/ui-ctrlmenu.tcl Thu May 10 08:48:19 2001 -@@ -408,16 +408,16 @@ - -relief raised -command transmit \ - -anchor w -variable transmitButtonState -font $f \ - -state disabled -highlightthickness 0 --# checkbutton $w.freeze -text "Freeze" \ --# -relief raised -command "grabber freeze \$freeze" \ --# -anchor w -variable freeze -font $f \ --# -highlightthickness 0 -+ checkbutton $w.freeze -text "Freeze" \ -+ -relief raised -command "grabber freeze \$freeze" \ -+ -anchor w -variable freeze -font $f \ -+ -highlightthickness 0 - button $w.release -text "Release" \ - -relief raised -command release_device \ - -font $f -highlightthickness 0 - --# pack $w.send $w.release $w.freeze -fill both -- pack $w.send $w.release -fill both -+ pack $w.send $w.release $w.freeze -fill both -+# pack $w.send $w.release -fill both - } - - proc doNothing { args } { diff --git a/multimedia/vic/files/patch-ui-resource.tcl b/multimedia/vic/files/patch-ui-resource.tcl deleted file mode 100644 index b1134d6f5e76..000000000000 --- a/multimedia/vic/files/patch-ui-resource.tcl +++ /dev/null @@ -1,11 +0,0 @@ ---- tcl/ui-resource.tcl.org Mon May 7 16:17:03 2001 -+++ tcl/ui-resource.tcl Mon May 7 16:17:29 2001 -@@ -153,7 +153,7 @@ - option add Vic.infoHighlightColor LightYellow2 startupFile - option add Vic.useJPEGforH261 false startupFile - option add Vic.useHardwareComp false startupFile -- option add Vic.stillGrabber false startupFile -+ option add Vic.stillGrabber true startupFile ; # XXX was false - option add Vic.siteDropTime "300" startupFile - option add Vic.quality "0" startupFile - diff --git a/multimedia/vic/pkg-descr b/multimedia/vic/pkg-descr deleted file mode 100644 index 457adff21faf..000000000000 --- a/multimedia/vic/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -This package contains the binary release of LBL's `vic' network video -conferencing tool. - -NOTE: This kit requires XFree86 3.1, Tk, and Tcl shared libraries. diff --git a/multimedia/vic/pkg-plist b/multimedia/vic/pkg-plist deleted file mode 100644 index 3ae0decf49cb..000000000000 --- a/multimedia/vic/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/vic -bin/histtolut |