4 files changed, 74 insertions, 48 deletions

diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index abc6fc42b77e..ab1d9ab0029e 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -3,48 +3,58 @@
 
 PORTNAME=	camserv
 PORTVERSION=	0.5.1
-PORTREVISION=	16
+PORTREVISION=	17
 PORTEPOCH=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/cserv/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Camserv is a free program to do streaming video via the web
+COMMENT=	Free program to do streaming video via the web
 
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
-		freetype.9:${PORTSDIR}/print/freetype2
+LICENSE=	GPLv2 # (or later)
 
-ONLY_FOR_ARCHS=	i386 alpha
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
+
+OPTIONS_DEFINE=	IMLIB2 PIXBUF V4L
+OPTIONS_DEFAULT=IMLIB2
+OPTIONS_SUB=	yes
 
 USE_AUTOTOOLS=	autoconf libtool libltdl
-USE_EFL=	imlib2
 
-CPPFLAGS+=	-I${LOCALBASE}/include \
-		-I${LOCALBASE}/include/gtk12 \
-		-I${LOCALBASE}/include/gdk-pixbuf-1.0 \
-		-I${LOCALBASE}/include/glib12
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.if exists(/usr/include/dev/bktr/ioctl_bt848.h)
-NO_STAGE=	yes
-post-patch:
-	@${REINPLACE_CMD} -e 's#machine/\(ioctl_bt848.h\)#dev/bktr/\1#' \
-		${WRKSRC}/camserv/video_fbsd_bttv.c \
-		${WRKSRC}/configure.in
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MIMLIB2}
+USE_EFL+=	imlib2
+.else
+CONFIGURE_ENV+=	ac_cv_path_IMLIB2_CONFIG=no
 .endif
 
-.if exists(/usr/include/machine/ioctl_bt848.h) || \
-	exists(/usr/include/dev/bktr/ioctl_bt848.h)
-PLIST_SUB+=	BKTR=""
+.if ${PORT_OPTIONS:MPIXBUF}
+USE_GNOME+=	gdkpixbuf
 .else
-PLIST_SUB+=	BKTR="@comment "
+CONFIGURE_ENV+=	ac_cv_path_GDKPIXBUF_CONFIG=no
 .endif
 
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/javascript.txt ${DOCSDIR}
+.if ${PORT_OPTIONS:MV4L}
+BUILD_DEPENDS+=	v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat
+.else
+CONFIGURE_ENV=	ac_cv_header_linux_videodev_h=no
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e \
+		'/^camserv_DEP/s|=.*|=|' ${WRKSRC}/camserv/Makefile.in
+.for i in common/Makefile.in relay/Makefile.in
+	@${REINPLACE_CMD} -e \
+		'/^CFLAGS/s|-g||' ${WRKSRC}/${i}
+.endfor
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} README javascript.txt \
+		${STAGEDIR}${DOCSDIR})
+
 .include <bsd.port.mk>
diff --git a/multimedia/camserv/files/patch-ab b/multimedia/camserv/files/patch-ab
index 55890dc80281..e2b8cf1d2ebb 100644
--- a/multimedia/camserv/files/patch-ab
+++ b/multimedia/camserv/files/patch-ab
@@ -1,15 +1,18 @@
---- camserv/video_fbsd_bttv.c.orig	Mon May 12 23:13:31 2003
-+++ camserv/video_fbsd_bttv.c	Mon May 12 23:13:00 2003
-@@ -27,6 +27,7 @@
+--- camserv/video_fbsd_bttv.c.orig	2002-09-16 07:01:56.000000000 +0900
++++ camserv/video_fbsd_bttv.c	2014-01-04 04:56:21.000000000 +0900
+@@ -27,8 +27,9 @@
  #include <fcntl.h>
  #include <errno.h>
  #include <sys/mman.h>
+-#include <machine/ioctl_bt848.h>
+-#include <machine/ioctl_meteor.h>
 +#include <sys/types.h>
- #include <machine/ioctl_bt848.h>
- #include <machine/ioctl_meteor.h>
++#include <dev/bktr/ioctl_bt848.h>
++#include <dev/bktr/ioctl_meteor.h>
  #include <signal.h>
-@@ -644,7 +644,7 @@
-   if( !fbttv_dev->autobright || --fbttv_dev->autoleft > 0 )
+ #include <sys/ioctl.h>
+ #include <unistd.h>
+@@ -642,7 +643,7 @@
      return 0;
  
    totmean = camserv_get_pic_mean( width, height, picbuf, 1, 0, 0, 
diff --git a/multimedia/camserv/files/patch-configure.in b/multimedia/camserv/files/patch-configure.in
index 295cd02c2560..d643cbf3ab2a 100644
--- a/multimedia/camserv/files/patch-configure.in
+++ b/multimedia/camserv/files/patch-configure.in
@@ -1,5 +1,5 @@
---- configure.in.orig	Sun May 12 20:06:12 2002
-+++ configure.in	Fri Mar 19 19:26:43 2004
+--- configure.in.orig	2002-05-13 03:06:12.000000000 +0900
++++ configure.in	2014-01-04 04:57:50.000000000 +0900
 @@ -12,12 +12,12 @@
  AM_ACLOCAL_INCLUDE(macros)
  
@@ -25,3 +25,12 @@
  		 GDKPIXBUF_CFLAGS=`$GDKPIXBUF_CONFIG --cflags`
  		 GDKPIXBUF_LIBS=`$GDKPIXBUF_CONFIG --libs`
  		 CFLAGS="$CFLAGS $GDKPIXBUF_CFLAGS"
+@@ -93,7 +93,7 @@
+ [video_v4l=yes],[video_v4l=no])
+ AM_CONDITIONAL(VIDEO_V4L, test $video_v4l = yes)
+ 
+-AC_CHECK_HEADERS(machine/ioctl_bt848.h,
++AC_CHECK_HEADERS(dev/bktr/ioctl_bt848.h,
+ [video_fbsd_bttv=yes],[video_fbsd_bttv=no])
+ AM_CONDITIONAL(VIDEO_FBSD_BTTV, test $video_fbsd_bttv = yes)
+ 
diff --git a/multimedia/camserv/pkg-plist b/multimedia/camserv/pkg-plist
index 89c20b4aad50..c5231d90e04b 100644
--- a/multimedia/camserv/pkg-plist
+++ b/multimedia/camserv/pkg-plist
@@ -1,13 +1,13 @@
 bin/camserv
 bin/relay
-lib/camserv/libgdk_pixbuf_filter.a
-lib/camserv/libgdk_pixbuf_filter.la
-lib/camserv/libgdk_pixbuf_filter.so
-lib/camserv/libgdk_pixbuf_filter.so.0
-lib/camserv/libimlib2_filter.a
-lib/camserv/libimlib2_filter.la
-lib/camserv/libimlib2_filter.so
-lib/camserv/libimlib2_filter.so.0
+%%PIXBUF%%lib/camserv/libgdk_pixbuf_filter.a
+%%PIXBUF%%lib/camserv/libgdk_pixbuf_filter.la
+%%PIXBUF%%lib/camserv/libgdk_pixbuf_filter.so
+%%PIXBUF%%lib/camserv/libgdk_pixbuf_filter.so.0
+%%IMLIB2%%lib/camserv/libimlib2_filter.a
+%%IMLIB2%%lib/camserv/libimlib2_filter.la
+%%IMLIB2%%lib/camserv/libimlib2_filter.so
+%%IMLIB2%%lib/camserv/libimlib2_filter.so.0
 lib/camserv/libjpg_filter.a
 lib/camserv/libjpg_filter.la
 lib/camserv/libjpg_filter.so
@@ -24,14 +24,18 @@ lib/camserv/libvideo_basic.a
 lib/camserv/libvideo_basic.la
 lib/camserv/libvideo_basic.so
 lib/camserv/libvideo_basic.so.0
-%%BKTR%%lib/camserv/libvideo_fbsd_bttv.a
-%%BKTR%%lib/camserv/libvideo_fbsd_bttv.la
-%%BKTR%%lib/camserv/libvideo_fbsd_bttv.so
-%%BKTR%%lib/camserv/libvideo_fbsd_bttv.so.0
+lib/camserv/libvideo_fbsd_bttv.a
+lib/camserv/libvideo_fbsd_bttv.la
+lib/camserv/libvideo_fbsd_bttv.so
+lib/camserv/libvideo_fbsd_bttv.so.0
+%%V4L%%lib/camserv/libvideo_v4l.a
+%%V4L%%lib/camserv/libvideo_v4l.la
+%%V4L%%lib/camserv/libvideo_v4l.so
+%%V4L%%lib/camserv/libvideo_v4l.so.0
 %%DATADIR%%/camserv.cfg.dist
 %%DATADIR%%/defpage.html
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/javascript.txt
-@dirrm lib/camserv
-@dirrm share/camserv
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%
+@dirrm lib/camserv