From owner-svn-ports-all@FreeBSD.ORG Sun Jun 1 14:47:27 2014 Return-Path: Delivered-To: svn-ports-all@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 BFC70228; Sun, 1 Jun 2014 14:47:27 +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 9336C2250; Sun, 1 Jun 2014 14:47:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s51ElRdD004085; Sun, 1 Jun 2014 14:47:27 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s51ElRn3004083; Sun, 1 Jun 2014 14:47:27 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201406011447.s51ElRn3004083@svn.freebsd.org> From: Pawel Pekala Date: Sun, 1 Jun 2014 14:47:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356130 - head/mail/ask 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: Sun, 01 Jun 2014 14:47:27 -0000 Author: pawel Date: Sun Jun 1 14:47:26 2014 New Revision: 356130 URL: http://svnweb.freebsd.org/changeset/ports/356130 QAT: https://qat.redports.org/buildarchive/r356130/ Log: - Add staging support - Convert to new options framework Modified: head/mail/ask/Makefile head/mail/ask/pkg-plist Modified: head/mail/ask/Makefile ============================================================================== --- head/mail/ask/Makefile Sun Jun 1 14:46:12 2014 (r356129) +++ head/mail/ask/Makefile Sun Jun 1 14:47:26 2014 (r356130) @@ -14,11 +14,11 @@ NO_BUILD= yes ASKLIBDIR= ${PREFIX}/lib/${PORTNAME} BINS= askfilter asksetup utils/asksenders -MAN1= askfilter.1 asksenders.1 asksetup.1 SUB_FILES= pkg-message PORTDOCS= * -NO_STAGE= yes +OPTIONS_DEFINE= DOCS + post-extract: @${REINPLACE_CMD} -E \ -e "s,/usr/share/ask/templates,${EXAMPLESDIR},g" \ @@ -27,21 +27,14 @@ post-extract: ${BINS:S,^,${WRKSRC}/,} ${WRKSRC}/*.py do-install: - ${MKDIR} ${ASKLIBDIR} - ${INSTALL_DATA} ${WRKSRC}/*.py ${ASKLIBDIR} - ${INSTALL_SCRIPT} ${BINS:S,^,${WRKSRC}/,} ${PREFIX}/bin - - ${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/templates/* ${EXAMPLESDIR} - - ${INSTALL_MAN} ${MAN1:S,^,${WRKSRC}/docs/,} ${PREFIX}/man/man1 - -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/*.[!1]* ${DOCSDIR} -.endif - -post-install: - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${ASKLIBDIR} + ${INSTALL_DATA} ${WRKSRC}/*.py ${STAGEDIR}${ASKLIBDIR} + ${INSTALL_SCRIPT} ${BINS:S,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/templates/* ${STAGEDIR}${EXAMPLESDIR} + (cd ${WRKSRC}/docs && ${INSTALL_MAN} askfilter.1 asksetup.1 \ + asksenders.1 ${STAGEDIR}${PREFIX}/man/man1) + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/*.[!1]* ${STAGEDIR}${DOCSDIR} .include Modified: head/mail/ask/pkg-plist ============================================================================== --- head/mail/ask/pkg-plist Sun Jun 1 14:46:12 2014 (r356129) +++ head/mail/ask/pkg-plist Sun Jun 1 14:47:26 2014 (r356130) @@ -10,6 +10,9 @@ lib/ask/askmessage.py lib/ask/askremote.py lib/ask/askversion.py lib/ask/test.py +man/man1/askfilter.1.gz +man/man1/asksenders.1.gz +man/man1/asksetup.1.gz %%EXAMPLESDIR%%/ask.rc %%EXAMPLESDIR%%/confirm_da.txt %%EXAMPLESDIR%%/confirm_de.txt