svn commit: r358535 - in head/multimedia/pwcbsd: . files

[Lars Engels]

Author: lme
Date: Fri Jun 20 09:11:39 2014
New Revision: 358535
URL: http://svnweb.freebsd.org/changeset/ports/358535
QAT: https://qat.redports.org/buildarchive/r358535/

Log:
  - Stagify
  - Add LICENSE
  - Remove NO_PACKAGE restriction, the package should include a working kmod
  - Use new LIB_DEPENDS
  - Move pkg-message to files/
  - Use %%KMODDIR%% instead of hardcoding it

Added:
  head/multimedia/pwcbsd/files/pkg-message.in
     - copied unchanged from r358528, head/multimedia/pwcbsd/pkg-message
Deleted:
  head/multimedia/pwcbsd/pkg-message
Modified:
  head/multimedia/pwcbsd/Makefile
  head/multimedia/pwcbsd/pkg-plist

Modified: head/multimedia/pwcbsd/Makefile
==============================================================================
--- head/multimedia/pwcbsd/Makefile	Fri Jun 20 08:59:10 2014	(r358534)
+++ head/multimedia/pwcbsd/Makefile	Fri Jun 20 09:11:39 2014	(r358535)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pwcbsd
 PORTVERSION=	1.4.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	multimedia sysutils kld
 MASTER_SITES=	http://raaf.atspace.org/ \
 		http://www.bsd-geek.de/FreeBSD/distfiles/ \
@@ -13,21 +13,21 @@ MASTER_SITE_SUBDIR=	miwi
 MAINTAINER=	lme at FreeBSD.org
 COMMENT=	The Linux pwc webcam driver ported to FreeBSD
 
+LICENSE=	GPLv2
+
 CONFLICTS=	pwcview-[0-9]*
 
 SSP_UNSAFE=	kernel module does not support ssp
 
-MAN4=		pwc.4
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
-NO_PACKAGE=	should be recompiled for a particular FreeBSD kernel
+
+PLIST_SUB=	KMODDIR=${KMODDIR}
 
 OPTIONS_DEFINE=	PROGRAMS MMAP
 OPTIONS_DEFAULT=	PROGRAMS
 PROGRAMS_DESC=	Build the programs
 MMAP_DESC=	Enable mmap support (MAY CRASH YOUR SYSTEM)
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-Makefile.kld \
@@ -48,8 +48,7 @@ ALL_TARGET=	all
 .if ${PORT_OPTIONS:MPROGRAMS}
 ALL_TARGET+=	pwcview
 PROGRAMS=	pwcview
-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
-MAN1=		pwcview.1
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
 USE_SDL=	sdl
 PLIST_SUB+=	PROGRAMS=""
 .else
@@ -61,12 +60,13 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|g' ${WRKSRC}/Makefile
 .endif
 
-post-install:
-	${INSTALL_MAN} ${MAN4:S|^|${WRKSRC}/|} ${PREFIX}/man/man4
+do-install:
+	${MKDIR} ${STAGEDIR}${KMODDIR}
+	${INSTALL_KLD} ${WRKSRC}/pwc.ko ${STAGEDIR}${KMODDIR}
+	${INSTALL_MAN} ${WRKSRC}/pwc.4 ${STAGEDIR}${PREFIX}/man/man4
 .if ${PORT_OPTIONS:MPROGRAMS}
-	${INSTALL_PROGRAM} ${PROGRAMS:S|^|${WRKSRC}/|} ${PREFIX}/bin
-	${INSTALL_MAN} ${MAN1:S|^|${WRKSRC}/|} ${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${PROGRAMS:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${PROGRAMS:S|^|${WRKSRC}/|}.1 ${STAGEDIR}${PREFIX}/man/man1
 .endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

Copied: head/multimedia/pwcbsd/files/pkg-message.in (from r358528, head/multimedia/pwcbsd/pkg-message)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/pwcbsd/files/pkg-message.in	Fri Jun 20 09:11:39 2014	(r358535, copy of r358528, head/multimedia/pwcbsd/pkg-message)
@@ -0,0 +1,20 @@
+===============================================================================
+
+This port has installed the pwc kernel module.
+
+To load the kernel module immediately, type the following command:
+
+	kldload pwc
+
+If your webcam was already plugged in before the kernel module
+was loaded you may have to unplug it first.
+
+To load the kernel module at boot, add the following line to
+/boot/loader.conf:
+
+	pwc_load="YES"
+
+CAUTION: If you enabled mmap support in the driver, beware that
+unplugging your webcam while it is in use may crash your system.
+
+===============================================================================

Modified: head/multimedia/pwcbsd/pkg-plist
==============================================================================
--- head/multimedia/pwcbsd/pkg-plist	Fri Jun 20 08:59:10 2014	(r358534)
+++ head/multimedia/pwcbsd/pkg-plist	Fri Jun 20 09:11:39 2014	(r358535)
@@ -1,5 +1,7 @@
 %%PROGRAMS%%bin/pwcview
- at cwd /boot/modules
-pwc.ko
+%%PROGRAMS%%man/man1/pwcview.1.gz
+man/man4/pwc.4.gz
+ at cwd /
+%%KMODDIR%%/pwc.ko
 @exec kldxref %D
 @unexec kldxref %D