6 files changed, 210 insertions, 0 deletions

diff --git a/net/Makefile b/net/Makefile
index 3b2dd1c609b0..2032510ed241 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -685,6 +685,7 @@
     SUBDIR += v6eval
     SUBDIR += vchat
     SUBDIR += vicq
+    SUBDIR += vls
     SUBDIR += vnc
     SUBDIR += vomit
     SUBDIR += vtun
diff --git a/net/vls/Makefile b/net/vls/Makefile
new file mode 100644
index 000000000000..9a290e7cb660
--- /dev/null
+++ b/net/vls/Makefile
@@ -0,0 +1,28 @@
+# New ports collection makefile for:	vls
+# Date created:		3rd August 2001
+# Whom:			Gleb Smirnoff <glebius@cell.sick.ru>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	vls
+PORTVERSION=	0.5.0
+CATEGORIES=	net
+MASTER_SITES=	http://www.videolan.org/pub/videolan/vls/${PORTVERSION}/
+
+MAINTAINER=	glebius@cell.sick.ru
+COMMENT=	An X11 video streaming client/server solution
+
+LIB_DEPENDS=	dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \
+		dvbpsi.1:${PORTSDIR}/multimedia/libdvbpsi \
+		dvdread.3:${PORTSDIR}/multimedia/libdvdread
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--with-dvdcss=${LOCALBASE} \
+		--with-dvbpsi=${LOCALBASE} \
+		--with-dvdread=${LOCALBASE}
+
+INSTALLS_SHLIB=	yes
+USE_GMAKE=	yes
+
+.include <bsd.port.mk>
diff --git a/net/vls/distinfo b/net/vls/distinfo
new file mode 100644
index 000000000000..d77f928d3b57
--- /dev/null
+++ b/net/vls/distinfo
@@ -0,0 +1 @@
+MD5 (vls-0.5.0.tar.gz) = e9f8fa8abff5b9b3a11af389bc5a5128
diff --git a/net/vls/files/patch-configure b/net/vls/files/patch-configure
new file mode 100644
index 000000000000..93597c85d146
--- /dev/null
+++ b/net/vls/files/patch-configure
@@ -0,0 +1,159 @@
+--- configure.in	Tue Mar 11 23:24:08 2003
++++ /tmp/vls/configure.in	Thu May  8 20:24:08 2003
+@@ -309,8 +309,17 @@
+ dnl
+ AC_ARG_ENABLE(dvd,
+ AC_HELP_STRING(--disable-dvd, DVD support (default enabled)))
++AC_ARG_WITH(dvdread,
++AC_HELP_STRING(--with-dvdread=[PATH], path to libdvdread))
+ if test x$enable_dvd != xno
+ then
++  if test "x$with_dvdread" != x
++  then
++    test_CFLAGS="-I${with_dvdread}/include"
++  fi
++  save_CPPFLAGS=$CPPFLAGS
++  save_CFLAGS=$CFLAGS
++  CPPFLAGS="$save_CPPFLAGS $test_CFLAGS $DVBINPUT_CCFLAGS"
+   AC_CHECK_HEADER(dvdread/dvd_reader.h,
+                   HAVE_LIBDVDREAD=1, HAVE_LIBDVDREAD=0)
+   if test ${HAVE_LIBDVDREAD} = 1
+@@ -318,16 +327,17 @@
+     if test ${SYS} != mingw32
+     then
+       PLUGINS="${PLUGINS} dvdreader"
+-      DVDREADER_LIB="${DVDREADER_LIB} -ldvdread"
++      DVDREADER_LIB="${DVDREADER_LIB} -ldvdread -L${with_dvdread}/lib"
+     else
+       BUILTINS="${BUILTINS} dvdreader"
+-      DVDREADER_LIB="${DVDREADER_LIB} -ldvdread -ldvdcss"
++      DVDREADER_LIB="${DVDREADER_LIB} -ldvdread -ldvdcss -L${with_dvdread}/lib"
+     fi
+   else
+     AC_MSG_ERROR([The development package for libdvdread is not installed.
+ Please install it and try again. Alternatively you can also configure with
+ --disable-dvd.])
+   fi
++  CPPFLAGS="$save_CPPFLAGS"
+ fi
+ 
+ dnl 
+@@ -343,7 +353,7 @@
+   AC_MSG_CHECKING(for libdvb headers in ${with_libdvb})
+     if test "x$with_libdvb" != x
+     then
+-      test_CFLAGS="-I${with_libdvb}"
++      test_CFLAGS="-I${with_libdvb}/include"
+     fi
+     save_CPPFLAGS=$CPPFLAGS
+     CPPFLAGS="$save_CPPFLAGS $test_CFLAGS $DVBINPUT_CCFLAGS"
+@@ -355,11 +365,11 @@
+     CPPFLAGS="$save_CPPFLAGS"
+ 
+     dnl Test for the lib existence
+-    if test -f "${with_libdvb}/libdvb.a"
++    if test -f "${with_libdvb}/lib/libdvb.a"
+     then
+       DVBINPUT_LIB="${DVBINPUT_LIB} -ldvb"
+-      DVBINPUT_DCFLAGS="${DVBINPUT_DCFLAGS} -I${with_libdvb}"
+-      DVBINPUT_LCFLAGS="${DVBINPUT_LCFLAGS} -L${with_libdvb}"
++      DVBINPUT_DCFLAGS="${DVBINPUT_DCFLAGS} -I${with_libdvb}/include"
++      DVBINPUT_LCFLAGS="${DVBINPUT_LCFLAGS} -L${with_libdvb}/lib"
+       PLUGINS="${PLUGINS} dvbinput dvbreader"
+     else
+       AC_MSG_ERROR([cannot find ${with_libdvb}/libdvb.a, make sure you compiled libdvb in ${with_libdvb}])
+@@ -422,7 +432,7 @@
+     save_CPPFLAGS=$CPPFLAGS
+     CPPFLAGS="$save_CPPFLAGS $test_CFLAGS"
+     AC_CHECK_HEADERS([dvbpsi/dvbpsi.h],[
+-      VLS_LIB="${VLS_LIB} -ldvbpsi"
++      VLS_LIB="${VLS_LIB} -ldvbpsi -L${with_dvbpsi}/lib"
+       CCFLAGS="${CCFLAGS} ${test_CFLAGS}"
+       DCFLAGS="${DCFLAGS} ${test_CFLAGS}"
+       ],[
+--- configure	Tue Mar 11 23:24:08 2003
++++ /tmp/vls/configure	Thu May  8 20:24:12 2003
+@@ -862,6 +862,7 @@
+ Optional Packages:
+   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
++  --with-dvdread=PATH     path to libdvdread
+   --with-libdvb=PATH      path to libdvb
+   --with-dvbpsi=PATH      libdvbpsi headers and libraries
+   --with-dvbpsi-tree=PATH libdvbpsi tree for static linking
+@@ -7096,8 +7097,21 @@
+   enableval="$enable_dvd"
+ 
+ fi;
++
++# Check whether --with-dvdread or --without-dvdread was given.
++if test "${with_dvdread+set}" = set; then
++  withval="$with_dvdread"
++
++fi;
+ if test x$enable_dvd != xno
+ then
++  if test "x$with_dvdread" != x
++  then
++    test_CFLAGS="-I${with_dvdread}/include"
++  fi
++  save_CPPFLAGS=$CPPFLAGS
++  save_CFLAGS=$CFLAGS
++  CPPFLAGS="$save_CPPFLAGS $test_CFLAGS $DVBINPUT_CCFLAGS"
+   if test "${ac_cv_header_dvdread_dvd_reader_h+set}" = set; then
+   echo "$as_me:$LINENO: checking for dvdread/dvd_reader.h" >&5
+ echo $ECHO_N "checking for dvdread/dvd_reader.h... $ECHO_C" >&6
+@@ -7239,10 +7253,10 @@
+     if test ${SYS} != mingw32
+     then
+       PLUGINS="${PLUGINS} dvdreader"
+-      DVDREADER_LIB="${DVDREADER_LIB} -ldvdread"
++      DVDREADER_LIB="${DVDREADER_LIB} -ldvdread -L${with_dvdread}/lib"
+     else
+       BUILTINS="${BUILTINS} dvdreader"
+-      DVDREADER_LIB="${DVDREADER_LIB} -ldvdread -ldvdcss"
++      DVDREADER_LIB="${DVDREADER_LIB} -ldvdread -ldvdcss -L${with_dvdread}/lib"
+     fi
+   else
+     { { echo "$as_me:$LINENO: error: The development package for libdvdread is not installed.
+@@ -7253,6 +7267,7 @@
+ --disable-dvd." >&2;}
+    { (exit 1); exit 1; }; }
+   fi
++  CPPFLAGS="$save_CPPFLAGS"
+ fi
+ 
+ # Check whether --enable-dvb or --disable-dvb was given.
+@@ -7272,7 +7287,7 @@
+ echo $ECHO_N "checking for libdvb headers in ${with_libdvb}... $ECHO_C" >&6
+     if test "x$with_libdvb" != x
+     then
+-      test_CFLAGS="-I${with_libdvb}"
++      test_CFLAGS="-I${with_libdvb}/include"
+     fi
+     save_CPPFLAGS=$CPPFLAGS
+     CPPFLAGS="$save_CPPFLAGS $test_CFLAGS $DVBINPUT_CCFLAGS"
+@@ -7428,11 +7443,11 @@
+ 
+     CPPFLAGS="$save_CPPFLAGS"
+ 
+-        if test -f "${with_libdvb}/libdvb.a"
++        if test -f "${with_libdvb}/lib/libdvb.a"
+     then
+       DVBINPUT_LIB="${DVBINPUT_LIB} -ldvb"
+-      DVBINPUT_DCFLAGS="${DVBINPUT_DCFLAGS} -I${with_libdvb}"
+-      DVBINPUT_LCFLAGS="${DVBINPUT_LCFLAGS} -L${with_libdvb}"
++      DVBINPUT_DCFLAGS="${DVBINPUT_DCFLAGS} -I${with_libdvb}/include"
++      DVBINPUT_LCFLAGS="${DVBINPUT_LCFLAGS} -L${with_libdvb}/lib"
+       PLUGINS="${PLUGINS} dvbinput dvbreader"
+     else
+       { { echo "$as_me:$LINENO: error: cannot find ${with_libdvb}/libdvb.a, make sure you compiled libdvb in ${with_libdvb}" >&5
+@@ -7785,7 +7800,7 @@
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+-      VLS_LIB="${VLS_LIB} -ldvbpsi"
++      VLS_LIB="${VLS_LIB} -ldvbpsi -L${with_dvbpsi}/lib"
+       CCFLAGS="${CCFLAGS} ${test_CFLAGS}"
+       DCFLAGS="${DCFLAGS} ${test_CFLAGS}"
+ 
diff --git a/net/vls/pkg-descr b/net/vls/pkg-descr
new file mode 100644
index 000000000000..493f48de6da1
--- /dev/null
+++ b/net/vls/pkg-descr
@@ -0,0 +1,13 @@
+vls -- the VideoLAN Server
+
+The vls is distributed with a GPL license.  See the file COPYING in the
+base directory.
+
+The vls is part of the VideoLAN project, a full client/server
+solution for video streaming using multicast or unicast.
+
+The VideoLAN web site at http://www.videolan.org/ is a good start for
+information about MPEG and DVD playing. Have a look at the documentation
+section (http://www.videolan.org/doc/), as well as the bookmarks.
+
+WWW: http://www.videolan.org/
diff --git a/net/vls/pkg-plist b/net/vls/pkg-plist
new file mode 100644
index 000000000000..da96a214d39c
--- /dev/null
+++ b/net/vls/pkg-plist
@@ -0,0 +1,8 @@
+bin/vls
+bin/vlsd
+etc/videolan/vls/vls.cfg
+lib/videolan/vls/dvdreader.so
+@dirrm lib/videolan/vls
+@dirrm lib/videolan
+@dirrm etc/videolan/vls
+@dirrm etc/videolan