From owner-svn-ports-head@FreeBSD.ORG Thu Dec 5 07:59:10 2013 Return-Path: Delivered-To: svn-ports-head@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 CBF6DDE0; Thu, 5 Dec 2013 07:59:10 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 85DB615AA; Thu, 5 Dec 2013 07:59:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB57xAEI015395; Thu, 5 Dec 2013 07:59:10 GMT (envelope-from martymac@svn.freebsd.org) Received: (from martymac@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB57x9IK015389; Thu, 5 Dec 2013 07:59:09 GMT (envelope-from martymac@svn.freebsd.org) Message-Id: <201312050759.rB57x9IK015389@svn.freebsd.org> From: Ganael LAPLANCHE Date: Thu, 5 Dec 2013 07:59:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335655 - in head/multimedia/sms1xxx-kmod: . 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-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Dec 2013 07:59:10 -0000 Author: martymac Date: Thu Dec 5 07:59:09 2013 New Revision: 335655 URL: http://svnweb.freebsd.org/changeset/ports/335655 Log: - Enable staging - Use new options framework - Remove pre-8.x IGNORE statement - Always stage documentation Added: head/multimedia/sms1xxx-kmod/files/patch-Makefile (contents, props changed) Modified: head/multimedia/sms1xxx-kmod/Makefile (contents, props changed) head/multimedia/sms1xxx-kmod/pkg-plist (contents, props changed) Modified: head/multimedia/sms1xxx-kmod/Makefile ============================================================================== --- head/multimedia/sms1xxx-kmod/Makefile Thu Dec 5 07:59:03 2013 (r335654) +++ head/multimedia/sms1xxx-kmod/Makefile Thu Dec 5 07:59:09 2013 (r335655) @@ -25,7 +25,9 @@ OPTIONS_DEFINE= RC5WATCH DEBUG OPTIONS_MULTI= FIRMWARE OPTIONS_MULTI_FIRMWARE= STELLAR NOVA OPTIONS_DEFAULT= RC5WATCH NOVA +OPTIONS_SUB= yes RC5WATCH_DESC= Build rc5watch IR utility +DEBUG_ALL_TARGET= debug STELLAR_DESC= Build Terratec Cinergy Piranha FW NOVA_DESC= Build Hauppauge WinTV MiniStick FW @@ -35,36 +37,17 @@ SUB_FILES= pkg-message PORTDOCS= CHANGELOG README COPYING -MAN4= sms1xxx.4 -MANCOMPRESSED= yes - # Supported firmwares / firmwares to build STELLAR_FW= stellar_dvbt NOVA_FW= novab0_dvbbda BUILD_FWS= -NO_STAGE= yes - USES= kmod -.include - -.if ${OSVERSION} <= 800063 -IGNORE= requires FreeBSD 8.0 or superior -.endif - -.if ${PORT_OPTIONS:MDEBUG} -ALL_TARGET= debug -.endif -.if ${PORT_OPTIONS:MRC5WATCH} -PLIST_SUB+= PL_RC5WATCH="" -.else -PLIST_SUB+= PL_RC5WATCH="@comment " -.endif +.include .if ${PORT_OPTIONS:MSTELLAR} BUILD_FWS+= ${STELLAR_FW} -PLIST_SUB+= PL_STELLAR="" .if !exists(${DISTDIR}/${DIST_SUBDIR}/${STELLAR_FW}.fw) .if !defined(DISTFILE_INSTRUCTIONS) DISTFILE_INSTRUCTIONS=\n\ @@ -79,13 +62,10 @@ DISTFILE_INSTRUCTIONS+= \ \t'Cinergy Piranha/BDA Driver 3.09.02.00/Windos XP (32Bit)/SMS100x_Dvbt.inp'\n\ mv 'SMS100x_Dvbt.inp' '${DISTDIR}/${DIST_SUBDIR}/${STELLAR_FW}.fw'\n .endif -.else -PLIST_SUB+= PL_STELLAR="@comment " .endif .if ${PORT_OPTIONS:MNOVA} BUILD_FWS+= ${NOVA_FW} -PLIST_SUB+= PL_NOVA="" .if !exists(${DISTDIR}/${DIST_SUBDIR}/${NOVA_FW}.fw) .if !defined(DISTFILE_INSTRUCTIONS) DISTFILE_INSTRUCTIONS=\n\ @@ -100,8 +80,6 @@ DISTFILE_INSTRUCTIONS+= \ \t'driver17/hcw17dvb.1b0'\n\ mv 'hcw17dvb.1b0' '${DISTDIR}/${DIST_SUBDIR}/${NOVA_FW}.fw'\n .endif -.else -PLIST_SUB+= PL_NOVA="@comment " .endif .if defined(DISTFILE_INSTRUCTIONS) @@ -134,14 +112,9 @@ post-build: post-install: .if ${PORT_OPTIONS:MRC5WATCH} - ${INSTALL_PROGRAM} ${WRKSRC}/apps/rc5watch/rc5watch ${PREFIX}/bin/rc5watch -.endif -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} -.for doc in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR} -.endfor + ${INSTALL_PROGRAM} ${WRKSRC}/apps/rc5watch/rc5watch ${STAGEDIR}${PREFIX}/bin/rc5watch .endif - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -.include +.include Added: head/multimedia/sms1xxx-kmod/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/sms1xxx-kmod/files/patch-Makefile Thu Dec 5 07:59:09 2013 (r335655) @@ -0,0 +1,13 @@ +--- Makefile.orig 2013-12-03 06:24:57.000000000 +0100 ++++ Makefile 2013-12-03 06:25:48.000000000 +0100 +@@ -26,8 +26,8 @@ + ${MAKE} -f Makefile.kld install + + installman: +- ${INSTALL_MAN} man/man4/sms1xxx.4 ${MANPREFIX}/man/man4 +- ${GZIP_CMD} ${MANPREFIX}/man/man4/sms1xxx.4 ++ ${INSTALL_MAN} man/man4/sms1xxx.4 ${DESTDIR}${MANPREFIX}/man/man4 ++ ${GZIP_CMD} ${DESTDIR}${MANPREFIX}/man/man4/sms1xxx.4 + + install: installkld installman + Modified: head/multimedia/sms1xxx-kmod/pkg-plist ============================================================================== --- head/multimedia/sms1xxx-kmod/pkg-plist Thu Dec 5 07:59:03 2013 (r335654) +++ head/multimedia/sms1xxx-kmod/pkg-plist Thu Dec 5 07:59:09 2013 (r335655) @@ -1,5 +1,5 @@ -%%PL_RC5WATCH%%bin/rc5watch -@cwd %%KMODDIR%% -%%PL_NOVA%%novab0_dvbbda.ko -%%PL_STELLAR%%stellar_dvbt.ko -sms1xxx.ko +%%RC5WATCH%%bin/rc5watch +man/man4/sms1xxx.4.gz +/%%KMODDIR%%/sms1xxx.ko +%%NOVA%%/%%KMODDIR%%/novab0_dvbbda.ko +%%STELLAR%%/%%KMODDIR%%/stellar_dvbt.ko