- update to 0.5.4

- install documentation
- preserve configuration
- honor CFLAGS
- add multimedia in CATEGORIES
- new option WITHOUT_DVD
- Fix build for 64bit
- Fix linker warnings in STABLE

6 files changed, 145 insertions, 45 deletions

diff --git a/net/vls/Makefile b/net/vls/Makefile
index f8f8381c3b3a..d72d9dbba7af 100644
--- a/net/vls/Makefile
+++ b/net/vls/Makefile
@@ -6,23 +6,46 @@
 #
 
 PORTNAME=	vls
-PORTVERSION=	0.5.0
-CATEGORIES=	net
+PORTVERSION=	0.5.4
+CATEGORIES=	net multimedia
 MASTER_SITES=	http://www.videolan.org/pub/videolan/vls/${PORTVERSION}/
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	An X11 video streaming client/server solution
 
-LIB_DEPENDS=	dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \
-		dvbpsi.1:${PORTSDIR}/multimedia/libdvbpsi \
+LIB_DEPENDS=	dvbpsi.1:${PORTSDIR}/multimedia/libdvbpsi
+.if !defined(WITHOUT_DVD)
+LIB_DEPENDS+=	dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \
 		dvdread.3:${PORTSDIR}/multimedia/libdvdread
+.endif
 
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-dvdcss=${LOCALBASE} \
-		--with-dvbpsi=${LOCALBASE} \
-		--with-dvdread=${LOCALBASE}
-
 INSTALLS_SHLIB=	yes
-USE_GMAKE=	yes
+CFLAGS+=	-I${LOCALBASE}/inlcude
+
+CONFIGURE_ARGS+=	--with-dvbpsi=${LOCALBASE}
+.if !defined(WITHOUT_DVD)
+CONFIGURE_ARGS+=	--with-dvdcss=${LOCALBASE} \
+			--with-dvdread=${LOCALBASE}
+PLIST_SUB+=		WITHDVD=""
+.else
+CONFIGURE_ARGS+=	--disable-dvd
+PLIST_SUB+=		WITHDVD="@comment "
+.endif
+
+pre-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/vls-guide.sgml ${DOCSDIR}/
+	${CP} -pR ${WRKSRC}/doc/developer ${DOCSDIR}/
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+CONFIGURE_ENV+=		VLS_LIB="-L/usr/lib -lcipher"
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/vls/distinfo b/net/vls/distinfo
index d77f928d3b57..91b96b8b4ac3 100644
--- a/net/vls/distinfo
+++ b/net/vls/distinfo
@@ -1 +1 @@
-MD5 (vls-0.5.0.tar.gz) = e9f8fa8abff5b9b3a11af389bc5a5128
+MD5 (vls-0.5.4.tar.gz) = 04ca71ab3261404c3dc2db7a8b32f763
diff --git a/net/vls/files/patch-Makefile b/net/vls/files/patch-Makefile
new file mode 100644
index 000000000000..2767d4125ff0
--- /dev/null
+++ b/net/vls/files/patch-Makefile
@@ -0,0 +1,20 @@
+--- Makefile.orig	Fri Nov 28 22:54:25 2003
++++ Makefile	Sat Dec 27 18:11:03 2003
+@@ -10,6 +10,8 @@
+     include Makefile.opts
+ endif
+ 
++CCFLAGS += ${CFLAGS}
++
+ 
+ ################################################################################
+ # Common options
+@@ -176,7 +178,7 @@
+ 	$(INSTALL) -m 644 $(PLUGINS:%=bin/%.so) $(DESTDIR)$(libdir)/videolan/vls
+ endif
+ 	mkdir -p $(DESTDIR)$(sysconfdir)/videolan/vls
+-	test -r $(DESTDIR)$(sysconfdir)/videolan/vls/vls.cfg || $(INSTALL) -m 644 vls.cfg $(DESTDIR)$(sysconfdir)/videolan/vls
++	test -r $(DESTDIR)$(sysconfdir)/videolan/vls/vls.cfg-dist || $(INSTALL) -m 644 vls.cfg $(DESTDIR)$(sysconfdir)/videolan/vls/vls.cfg-dist
+ 	@echo "Installation succeeded."
+ 
+ uninstall:
diff --git a/net/vls/files/patch-configure b/net/vls/files/patch-configure
index 93597c85d146..ca3e09c5d08a 100644
--- a/net/vls/files/patch-configure
+++ b/net/vls/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.in	Tue Mar 11 23:24:08 2003
-+++ /tmp/vls/configure.in	Thu May  8 20:24:08 2003
+--- configure.in.orig	Fri Nov 28 22:54:25 2003
++++ configure.in	Sat Dec 27 17:35:05 2003
 @@ -309,8 +309,17 @@
  dnl
  AC_ARG_ENABLE(dvd,
@@ -37,17 +37,8 @@
 +  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 @@
+ dnl
+@@ -373,11 +383,11 @@
      CPPFLAGS="$save_CPPFLAGS"
  
      dnl Test for the lib existence
@@ -62,7 +53,7 @@
        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 @@
+@@ -440,7 +450,7 @@
      save_CPPFLAGS=$CPPFLAGS
      CPPFLAGS="$save_CPPFLAGS $test_CFLAGS"
      AC_CHECK_HEADERS([dvbpsi/dvbpsi.h],[
@@ -71,17 +62,17 @@
        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:
+--- configure.orig	Fri Nov 28 22:54:25 2003
++++ configure	Sat Dec 27 17:36:08 2003
+@@ -846,6 +846,7 @@
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
    --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+   --with-dvb=PATH         path to DVB driver header files
 +  --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 @@
+@@ -6522,8 +6523,21 @@
    enableval="$enable_dvd"
  
  fi;
@@ -103,7 +94,7 @@
    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 @@
+@@ -6637,10 +6651,10 @@
      if test ${SYS} != mingw32
      then
        PLUGINS="${PLUGINS} dvdreader"
@@ -116,7 +107,7 @@
      fi
    else
      { { echo "$as_me:$LINENO: error: The development package for libdvdread is not installed.
-@@ -7253,6 +7267,7 @@
+@@ -6651,6 +6665,7 @@
  --disable-dvd." >&2;}
     { (exit 1); exit 1; }; }
    fi
@@ -124,16 +115,7 @@
  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 @@
+@@ -6935,11 +6950,11 @@
  
      CPPFLAGS="$save_CPPFLAGS"
  
@@ -148,7 +130,7 @@
        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 @@
+@@ -7236,7 +7251,7 @@
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
diff --git a/net/vls/files/patch-src-core-common.h b/net/vls/files/patch-src-core-common.h
new file mode 100644
index 000000000000..8a8e3401520f
--- /dev/null
+++ b/net/vls/files/patch-src-core-common.h
@@ -0,0 +1,26 @@
+--- src/core/common.h.orig	Fri Nov 28 22:54:22 2003
++++ src/core/common.h	Sat Dec 27 18:47:34 2003
+@@ -75,19 +75,23 @@
+ typedef signed char         s8;
+ typedef signed short        s16;
+ typedef signed int          s32;
++#ifndef __FreeBSD__
+ #ifdef _WIN32
+ typedef __int64             s64;
+ #else
+ typedef signed long long    s64;
+ #endif
++#endif
+ 
+ typedef unsigned char       u8;
+ typedef unsigned short      u16;
+ typedef unsigned int        u32;
++#ifndef __FreeBSD__
+ #ifdef _WIN32
+ typedef unsigned __int64    u64;
+ #else
+ typedef unsigned long long  u64;
++#endif
+ #endif
+ 
+ // Byte type
diff --git a/net/vls/pkg-plist b/net/vls/pkg-plist
index da96a214d39c..c0c3d255b538 100644
--- a/net/vls/pkg-plist
+++ b/net/vls/pkg-plist
@@ -1,8 +1,57 @@
 bin/vls
 bin/vlsd
-etc/videolan/vls/vls.cfg
-lib/videolan/vls/dvdreader.so
+etc/videolan/vls/vls.cfg-dist
+%%WITHDVD%%lib/videolan/vls/dvdreader.so
 @dirrm lib/videolan/vls
 @dirrm lib/videolan
 @dirrm etc/videolan/vls
 @dirrm etc/videolan
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/vls-guide.sgml
+%%PORTDOCS%%%%DOCSDIR%%/developer/3parts.sgml
+%%PORTDOCS%%%%DOCSDIR%%/developer/architecture.dia
+%%PORTDOCS%%%%DOCSDIR%%/developer/architecture.eps
+%%PORTDOCS%%%%DOCSDIR%%/developer/architecture.jpg
+%%PORTDOCS%%%%DOCSDIR%%/developer/converter-reader.sgml
+%%PORTDOCS%%%%DOCSDIR%%/developer/convfifo.dia
+%%PORTDOCS%%%%DOCSDIR%%/developer/convfifo.eps
+%%PORTDOCS%%%%DOCSDIR%%/developer/convfifo.jpg
+%%PORTDOCS%%%%DOCSDIR%%/developer/extrapolation.dia
+%%PORTDOCS%%%%DOCSDIR%%/developer/extrapolation.eps
+%%PORTDOCS%%%%DOCSDIR%%/developer/extrapolation.jpg
+%%PORTDOCS%%%%DOCSDIR%%/developer/framework.sgml
+%%PORTDOCS%%%%DOCSDIR%%/developer/output.sgml
+%%PORTDOCS%%%%DOCSDIR%%/developer/outputfifo.dia
+%%PORTDOCS%%%%DOCSDIR%%/developer/outputfifo.eps
+%%PORTDOCS%%%%DOCSDIR%%/developer/outputfifo.jpg
+%%PORTDOCS%%%%DOCSDIR%%/developer/overview.eps
+%%PORTDOCS%%%%DOCSDIR%%/developer/overview.jpg
+%%PORTDOCS%%%%DOCSDIR%%/developer/overview.sda
+%%PORTDOCS%%%%DOCSDIR%%/developer/overview.sgml
+%%PORTDOCS%%%%DOCSDIR%%/developer/pcr.dia
+%%PORTDOCS%%%%DOCSDIR%%/developer/pcr.eps
+%%PORTDOCS%%%%DOCSDIR%%/developer/pcr.jpg
+%%PORTDOCS%%%%DOCSDIR%%/developer/provider.dia
+%%PORTDOCS%%%%DOCSDIR%%/developer/provider.eps
+%%PORTDOCS%%%%DOCSDIR%%/developer/provider.jpg
+%%PORTDOCS%%%%DOCSDIR%%/developer/readerconv.dia
+%%PORTDOCS%%%%DOCSDIR%%/developer/readerconv.eps
+%%PORTDOCS%%%%DOCSDIR%%/developer/readerconv.jpg
+%%PORTDOCS%%%%DOCSDIR%%/developer/stream_send.eps
+%%PORTDOCS%%%%DOCSDIR%%/developer/stream_send.jpg
+%%PORTDOCS%%%%DOCSDIR%%/developer/stream_send.sda
+%%PORTDOCS%%%%DOCSDIR%%/developer/stream_start.eps
+%%PORTDOCS%%%%DOCSDIR%%/developer/stream_start.jpg
+%%PORTDOCS%%%%DOCSDIR%%/developer/stream_start.sda
+%%PORTDOCS%%%%DOCSDIR%%/developer/streamer.sgml
+%%PORTDOCS%%%%DOCSDIR%%/developer/streaming.sgml
+%%PORTDOCS%%%%DOCSDIR%%/developer/structure.eps
+%%PORTDOCS%%%%DOCSDIR%%/developer/structure.jpg
+%%PORTDOCS%%%%DOCSDIR%%/developer/structure.sda
+%%PORTDOCS%%%%DOCSDIR%%/developer/stylesheet.dsl
+%%PORTDOCS%%%%DOCSDIR%%/developer/tsstreamer.dia
+%%PORTDOCS%%%%DOCSDIR%%/developer/tsstreamer.eps
+%%PORTDOCS%%%%DOCSDIR%%/developer/tsstreamer.jpg
+%%PORTDOCS%%%%DOCSDIR%%/developer/vls-devel.sgml
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/developer
+%%PORTDOCS%%@dirrm %%DOCSDIR%%