From owner-svn-ports-head@FreeBSD.ORG Mon Jan 27 16:50:35 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F0E9E3EA; Mon, 27 Jan 2014 16:50:34 +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 DD9871A82; Mon, 27 Jan 2014 16:50:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0RGoYNn099027; Mon, 27 Jan 2014 16:50:34 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0RGoYpj099024; Mon, 27 Jan 2014 16:50:34 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201401271650.s0RGoYpj099024@svn.freebsd.org> From: Rene Ladan Date: Mon, 27 Jan 2014 16:50:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341429 - head/sysutils/fusefs-kmod 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: Mon, 27 Jan 2014 16:50:35 -0000 Author: rene Date: Mon Jan 27 16:50:34 2014 New Revision: 341429 URL: http://svnweb.freebsd.org/changeset/ports/341429 QAT: https://qat.redports.org/buildarchive/r341429/ Log: - Support stage - Use option helper - Pet portlint Approved by: portmgr (infrastructure blanket) Modified: head/sysutils/fusefs-kmod/Makefile head/sysutils/fusefs-kmod/pkg-plist Modified: head/sysutils/fusefs-kmod/Makefile ============================================================================== --- head/sysutils/fusefs-kmod/Makefile Mon Jan 27 16:41:25 2014 (r341428) +++ head/sysutils/fusefs-kmod/Makefile Mon Jan 27 16:50:34 2014 (r341429) @@ -27,19 +27,15 @@ DISABLE_SIZE= yes OPTIONS_DEFINE= AUTOSETUP DOCS AUTOSETUP_DESC= Automatic global config file setup -NO_STAGE= yes - USES= kmod -.include -.if ${PORT_OPTIONS:MDOCS} -BUILD_DEPENDS+= deplate:${PORTSDIR}/textproc/ruby-deplate -.endif +DOCS_BUILD_DEPENDS= deplate:${PORTSDIR}/textproc/ruby-deplate + +.include SETUP= setup.sh HG_SHORTREV= 498acaef33b0 -MAN8= mount_fusefs.8 TXT_DOCS= doc.text HTML_DOCS= Faq.html \ Implementation.html \ @@ -66,7 +62,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extrapatch-f .endif .if exists(${SRC_BASE}/sys/fs/fuse) -IGNORE= Integrated into base +IGNORE= integrated into base .endif .if !exists(${SRC_BASE}/sbin/mount) IGNORE= requires the userland sources to be installed. Set SRC_BASE if it is not in /usr/src @@ -81,7 +77,6 @@ SUB_FILES+= ${SETUP} .else SUB_FILES+= pkg-message .endif - post-patch: @${REINPLACE_CMD} -e 's/deplate.rb/deplate/g' \ ${WRKSRC}/doc/Makefile @@ -97,21 +92,21 @@ post-build: .endif post-install: - @${LN} -fs ${PREFIX}/sbin/mount_fusefs /usr/sbin + ${MKDIR} ${STAGEDIR}/usr/sbin + (cd ${STAGEDIR} && ${LN} -fs ${PREFIX}/sbin/mount_fusefs \ + usr/sbin/mount_fusefs) .if ${PORT_OPTIONS:MAUTOSETUP} && !defined(PACKAGE_BUILDING) @${ECHO} "Modifying global startup config files and loading module..." @${SH} ${WRKDIR}/${SETUP} -.else - @${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD} .endif .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR}/kmod/html + ${MKDIR} ${STAGEDIR}${DOCSDIR}/kmod/html .for i in ${TXT_DOCS} - @${INSTALL_DATA} ${WRKSRC}/doc/plaintext_out/$i ${DOCSDIR}/kmod + ${INSTALL_DATA} ${WRKSRC}/doc/plaintext_out/$i ${STAGEDIR}${DOCSDIR}/kmod .endfor .for i in ${HTML_DOCS} - @${INSTALL_DATA} ${WRKSRC}/doc/html_chunked_out/$i ${DOCSDIR}/kmod/html + ${INSTALL_DATA} ${WRKSRC}/doc/html_chunked_out/$i ${STAGEDIR}${DOCSDIR}/kmod/html .endfor .endif Modified: head/sysutils/fusefs-kmod/pkg-plist ============================================================================== --- head/sysutils/fusefs-kmod/pkg-plist Mon Jan 27 16:41:25 2014 (r341428) +++ head/sysutils/fusefs-kmod/pkg-plist Mon Jan 27 16:50:34 2014 (r341429) @@ -1,6 +1,5 @@ sbin/mount_fusefs -@exec ln -fs %D/%F /usr/sbin -@unexec rm -f /usr/sbin/mount_fusefs +man/man8/mount_fusefs.8.gz %%PORTDOCS%%%%DOCSDIR%%/kmod/doc.text %%PORTDOCS%%%%DOCSDIR%%/kmod/html/Faq.html %%PORTDOCS%%%%DOCSDIR%%/kmod/html/Implementation.html @@ -19,6 +18,7 @@ sbin/mount_fusefs %%PORTDOCS%%%%DOCSDIR%%/kmod/html/tabbar-right.css %%PORTDOCS%%@dirrm %%DOCSDIR%%/kmod/html %%PORTDOCS%%@dirrm %%DOCSDIR%%/kmod -@dirrmtry %%DOCSDIR%% -@cwd /%%KMODDIR%% -fuse.ko +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% +@cwd / +usr/sbin/mount_fusefs +%%KMODDIR%%/fuse.ko