- Update to 3.13.0.6 . [1]

- Stagify.
- Use new LIB_DEPENDS syntax.
- Switch to USES= tar:bzip2.

Submitted by:	hselasky (maintainer) [1]
Approved by:	hselasky (maintainer)

5 files changed, 81 insertions, 29 deletions

diff --git a/multimedia/webcamd/Makefile b/multimedia/webcamd/Makefile
index 92bc10b4bf77..7bca0d0b7731 100644
--- a/multimedia/webcamd/Makefile
+++ b/multimedia/webcamd/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	webcamd
-PORTVERSION=	3.11.0.2
+PORTVERSION=	3.13.0.6
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.selasky.org/hans_petter/distfiles/ \
 		http://home.selasky.org:8192/distfiles/
@@ -11,29 +11,15 @@ MAINTAINER=	hselasky@FreeBSD.org
 COMMENT=	A port of Linux USB webcam and DVB drivers into userspace
 
 BUILD_DEPENDS=	v4l_compat>=1.0.20100321:${PORTSDIR}/multimedia/v4l_compat \
-		cuse4bsd-kmod>=0.1.24:${PORTSDIR}/multimedia/cuse4bsd-kmod
-LIB_DEPENDS=	v4l1.0:${PORTSDIR}/multimedia/libv4l \
-		cuse4bsd.1:${PORTSDIR}/multimedia/cuse4bsd-kmod
+		cuse4bsd-kmod>=0.1.31:${PORTSDIR}/multimedia/cuse4bsd-kmod
+LIB_DEPENDS=	libv4l1.so:${PORTSDIR}/multimedia/libv4l \
+		libcuse4bsd.so:${PORTSDIR}/multimedia/cuse4bsd-kmod
 
 LICENSE=	GPLv2
 
-USES=		pkgconfig
+USES=		pkgconfig tar:bzip2 uidfix
 USE_RC_SUBR=	webcamd
-USE_BZIP2=	yes
 USE_LDCONFIG=	yes
-MANCOMPRESSED=	yes
-MAN4=		a800.4 ce6230.4 dtv5100.4 gl861.4 mr800.4 pwcusb.4 sq905c.4 \
-		usbvision.4 af9005.4 cinergy.4 dw2102.4 gp8psk.4 \
-		mr97310a.4 s2255.4 stk014.4 uvc.4 af9015.4 conex.4 \
-		ec168.4 hdpvr.4 nova-t.4 se401.4 stv06xx.4 vc032x.4 \
-		anysee.4 cpiax.4 em28xx.4 ibmcam.4 opera.4 siano.4 \
-		sunplus.4 vp702x.4 au0828.4 cxusb.4 et61x251.4 \
-		jeilinj.4 ov519.4 sn9c102.4 t613.4 vp7045.4 au6610.4 \
-		dib0700.4 finepix.4 m5602.4 ov534.4 sn9c20x.4 ttusb2.4 \
-		zc3xx.4 b2c2.4 digitv.4 friio.4 m920x.4 pacxxx.4 \
-		sonixj.4 tv8532.4 zr364xx.4 benq.4 dtt200u.4 gl860.4 \
-		mars.4 pvrusb2.4 spca5xx.4 umt.4
-MAN8=		webcamd.8
 
 LIBDIR=		${PREFIX}/lib
 
@@ -52,7 +38,6 @@ WEBCAM_DESC=	Build with USB webcam support (UVC, gspca, ...)
 USERS=		webcamd
 GROUPS=		webcamd
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 LIBCUSE=${LIBDIR}/libcuse4bsd.so
@@ -79,8 +64,8 @@ MAKE_ARGS+=" HAVE_WEBCAM_DRV=YES"
 .if ${PORT_OPTIONS:MHAL}
 MAKE_ARGS+=" HAVE_HAL=YES"
 LIBHAL=${LIBDIR}/libhal.so:${LIBDIR}/libdbus-1.so:
-LIB_DEPENDS+=hal.1:${PORTSDIR}/sysutils/hal
-LIB_DEPENDS+=dbus-1:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+=libhal.so:${PORTSDIR}/sysutils/hal
+LIB_DEPENDS+=libdbus-1.so:${PORTSDIR}/devel/dbus
 .else
 LIBHAL=
 .endif
@@ -112,12 +97,11 @@ post-patch:
 	@cd ${WRKSRC}/patches; ${SH} ./do_patch.sh
 
 post-install:
-	@${MKDIR} ${PREFIX}/etc/devd
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/devd
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|g" \
 		-e "s|%%LIBHAL%%|${LIBHAL}|g" \
 		-e "s|%%LIBCUSE%%|${LIBCUSE}|g" \
 		< ${FILESDIR}/webcamd.conf.in > ${WRKDIR}/webcamd.conf
-	${INSTALL_DATA} "${WRKDIR}/webcamd.conf" ${PREFIX}/etc/devd
-	@${CAT} ${PKGMESSAGE}
+	${INSTALL_DATA} "${WRKDIR}/webcamd.conf" ${STAGEDIR}${PREFIX}/etc/devd
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/webcamd/distinfo b/multimedia/webcamd/distinfo
index a23b95ee050a..61d54de639ad 100644
--- a/multimedia/webcamd/distinfo
+++ b/multimedia/webcamd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (webcamd-3.11.0.2.tar.bz2) = f8a6bb8b031b62e3a0506c119ea70bd4674cddec11dae742eecad5024b3ba138
-SIZE (webcamd-3.11.0.2.tar.bz2) = 9317774
+SHA256 (webcamd-3.13.0.6.tar.bz2) = bebcfce207df913469434b51e521b21559a76afafa69b583a0c8c04fe9ec340e
+SIZE (webcamd-3.13.0.6.tar.bz2) = 9516599
diff --git a/multimedia/webcamd/files/webcamd.in b/multimedia/webcamd/files/webcamd.in
index c2fd83b4d1ae..406fb25d3f74 100644
--- a/multimedia/webcamd/files/webcamd.in
+++ b/multimedia/webcamd/files/webcamd.in
@@ -9,8 +9,8 @@
 # webcamd_enable="YES"
 #
 # Optional:
-# webcamd_flags="-m v4l2.vflip=1"
-# webcamd_flags="-m v4l2.hflip=1"
+# webcamd_flags="-m v4l2-dev.vflip=1"
+# webcamd_flags="-m v4l2-dev.hflip=1"
 #
 
 webcamd_enable=${webcamd_enable-"NO"}
diff --git a/multimedia/webcamd/pkg-message b/multimedia/webcamd/pkg-message
index af2a7894bc99..f5643f70d36a 100644
--- a/multimedia/webcamd/pkg-message
+++ b/multimedia/webcamd/pkg-message
@@ -18,4 +18,8 @@ to your /etc/rc.conf
 
 	# service devd restart
 
+4) Optionally add a user to the "webcamd" group
+
+	# pw groupmod webcamd -m <username>
+
 *********************************************************************
diff --git a/multimedia/webcamd/pkg-plist b/multimedia/webcamd/pkg-plist
index 339a810cf267..4e1b3d72dd77 100644
--- a/multimedia/webcamd/pkg-plist
+++ b/multimedia/webcamd/pkg-plist
@@ -1,2 +1,66 @@
 etc/devd/webcamd.conf
 sbin/webcamd
+man/man4/a800.4.gz
+man/man4/af9005.4.gz
+man/man4/af9015.4.gz
+man/man4/anysee.4.gz
+man/man4/au0828.4.gz
+man/man4/au6610.4.gz
+man/man4/b2c2.4.gz
+man/man4/benq.4.gz
+man/man4/ce6230.4.gz
+man/man4/cinergy.4.gz
+man/man4/conex.4.gz
+man/man4/cpiax.4.gz
+man/man4/cxusb.4.gz
+man/man4/dib0700.4.gz
+man/man4/digitv.4.gz
+man/man4/dtt200u.4.gz
+man/man4/dtv5100.4.gz
+man/man4/dw2102.4.gz
+man/man4/ec168.4.gz
+man/man4/em28xx.4.gz
+man/man4/et61x251.4.gz
+man/man4/finepix.4.gz
+man/man4/friio.4.gz
+man/man4/gl860.4.gz
+man/man4/gl861.4.gz
+man/man4/gp8psk.4.gz
+man/man4/hdpvr.4.gz
+man/man4/ibmcam.4.gz
+man/man4/jeilinj.4.gz
+man/man4/m5602.4.gz
+man/man4/m920x.4.gz
+man/man4/mars.4.gz
+man/man4/mr800.4.gz
+man/man4/mr97310a.4.gz
+man/man4/nova-t.4.gz
+man/man4/opera.4.gz
+man/man4/ov519.4.gz
+man/man4/ov534.4.gz
+man/man4/pacxxx.4.gz
+man/man4/pvrusb2.4.gz
+man/man4/pwcusb.4.gz
+man/man4/s2255.4.gz
+man/man4/se401.4.gz
+man/man4/siano.4.gz
+man/man4/sn9c102.4.gz
+man/man4/sn9c20x.4.gz
+man/man4/sonixj.4.gz
+man/man4/spca5xx.4.gz
+man/man4/sq905c.4.gz
+man/man4/stk014.4.gz
+man/man4/stv06xx.4.gz
+man/man4/sunplus.4.gz
+man/man4/t613.4.gz
+man/man4/ttusb2.4.gz
+man/man4/tv8532.4.gz
+man/man4/umt.4.gz
+man/man4/usbvision.4.gz
+man/man4/uvc.4.gz
+man/man4/vc032x.4.gz
+man/man4/vp702x.4.gz
+man/man4/vp7045.4.gz
+man/man4/zc3xx.4.gz
+man/man4/zr364xx.4.gz
+man/man8/webcamd.8.gz