From owner-svn-ports-all@FreeBSD.ORG  Sun Oct 27 20:39:57 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
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 ESMTP id 7267386A;
 Sun, 27 Oct 2013 20:39:57 +0000 (UTC) (envelope-from wg@FreeBSD.org)
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 45E432B12;
 Sun, 27 Oct 2013 20:39:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9RKdv7t022654;
 Sun, 27 Oct 2013 20:39:57 GMT (envelope-from wg@svn.freebsd.org)
Received: (from wg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9RKdu00022652;
 Sun, 27 Oct 2013 20:39:56 GMT (envelope-from wg@svn.freebsd.org)
Message-Id: <201310272039.r9RKdu00022652@svn.freebsd.org>
From: William Grzybowski <wg@FreeBSD.org>
Date: Sun, 27 Oct 2013 20:39:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r331804 - head/devel/cgit
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Oct 2013 20:39:57 -0000

Author: wg
Date: Sun Oct 27 20:39:56 2013
New Revision: 331804
URL: http://svnweb.freebsd.org/changeset/ports/331804

Log:
  devel/cgit: allow staging
  
  - Allow staging [1] (based on)
  - Add DOCS option
  - Remove useless options.mk
  
  PR:		ports/183369
  Submitted by:	Kevin Zheng <kevinz5000 gmail.com> (maintainer)

Modified:
  head/devel/cgit/Makefile
  head/devel/cgit/pkg-plist

Modified: head/devel/cgit/Makefile
==============================================================================
--- head/devel/cgit/Makefile	Sun Oct 27 20:27:20 2013	(r331803)
+++ head/devel/cgit/Makefile	Sun Oct 27 20:39:56 2013	(r331804)
@@ -29,8 +29,8 @@ SUB_FILES=	pkg-message
 SUB_LIST+=	PORTNAME=${PORTNAME}
 PLIST_SUB+=	PORTNAME=${PORTNAME} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.pre.mk>
 
 post-extract:
@@ -50,12 +50,7 @@ post-patch:
 .endif
 
 post-install:
-	@${MKDIR} /var/cache/${PORTNAME}
-	@${CHOWN} ${WWWOWN}:${WWWGRP} /var/cache/${PORTNAME}
-	@${CAT} ${PKGMESSAGE}
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}rc.5.txt ${DOCSDIR}/
-.endif
+	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}rc.5.txt ${STAGEDIR}/${DOCSDIR}/
 
 .include <bsd.port.post.mk>

Modified: head/devel/cgit/pkg-plist
==============================================================================
--- head/devel/cgit/pkg-plist	Sun Oct 27 20:27:20 2013	(r331803)
+++ head/devel/cgit/pkg-plist	Sun Oct 27 20:39:56 2013	(r331804)
@@ -1,8 +1,6 @@
 %%WWWDIR%%/cgit.cgi
 %%WWWDIR%%/cgit.css
 %%WWWDIR%%/cgit.png
-%%PORTDOCS%%%%DOCSDIR%%/cgitrc.5.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 lib/cgit/filters/about-formatting.sh
 lib/cgit/filters/commit-links.sh
 lib/cgit/filters/html-converters/man2html
@@ -13,6 +11,8 @@ lib/cgit/filters/html-converters/rst2htm
 lib/cgit/filters/html-converters/txt2html
 lib/cgit/filters/syntax-highlighting.py
 lib/cgit/filters/syntax-highlighting.sh
+%%PORTDOCS%%%%DOCSDIR%%/cgitrc.5.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/cgit/filters/html-converters/resources
 @dirrm lib/cgit/filters/html-converters
 @dirrm lib/cgit/filters
@@ -20,4 +20,3 @@ lib/cgit/filters/syntax-highlighting.sh
 @dirrm %%WWWDIR%%
 @exec mkdir -p /var/cache/%%PORTNAME%%
 @exec chown %%WWWOWN%%:%%WWWGRP%% /var/cache/%%PORTNAME%%
-@unexec rmdir /var/cache/%%PORTNAME%% 2>/dev/null || true