From owner-svn-ports-all@FreeBSD.ORG Fri Jun 20 09:11:40 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D89E175F; Fri, 20 Jun 2014 09:11:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C54ED27A3; Fri, 20 Jun 2014 09:11:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5K9Be9T092958; Fri, 20 Jun 2014 09:11:40 GMT (envelope-from lme@svn.freebsd.org) Received: (from lme@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5K9Bect092955; Fri, 20 Jun 2014 09:11:40 GMT (envelope-from lme@svn.freebsd.org) Message-Id: <201406200911.s5K9Bect092955@svn.freebsd.org> From: Lars Engels Date: Fri, 20 Jun 2014 09:11:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358535 - in head/multimedia/pwcbsd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jun 2014 09:11:41 -0000 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@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 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 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 -@cwd /boot/modules -pwc.ko +%%PROGRAMS%%man/man1/pwcview.1.gz +man/man4/pwc.4.gz +@cwd / +%%KMODDIR%%/pwc.ko @exec kldxref %D @unexec kldxref %D