From 10b91beee0b68e5da308a7924a5949d617dba237 Mon Sep 17 00:00:00 2001 From: Lars Engels Date: Fri, 20 Jun 2014 09:11:39 +0000 Subject: [PATCH] - 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 --- multimedia/pwcbsd/Makefile | 24 +++++++++---------- .../{pkg-message => files/pkg-message.in} | 0 multimedia/pwcbsd/pkg-plist | 6 +++-- 3 files changed, 16 insertions(+), 14 deletions(-) rename multimedia/pwcbsd/{pkg-message => files/pkg-message.in} (100%) diff --git a/multimedia/pwcbsd/Makefile b/multimedia/pwcbsd/Makefile index a9ae0ee7c2a0..ed5cc436d14f 100644 --- a/multimedia/pwcbsd/Makefile +++ b/multimedia/pwcbsd/Makefile @@ -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 diff --git a/multimedia/pwcbsd/pkg-message b/multimedia/pwcbsd/files/pkg-message.in similarity index 100% rename from multimedia/pwcbsd/pkg-message rename to multimedia/pwcbsd/files/pkg-message.in diff --git a/multimedia/pwcbsd/pkg-plist b/multimedia/pwcbsd/pkg-plist index 9209e08004f4..221437273d99 100644 --- a/multimedia/pwcbsd/pkg-plist +++ b/multimedia/pwcbsd/pkg-plist @@ -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