From owner-svn-ports-all@FreeBSD.ORG  Tue Apr  8 07:15:54 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 17031FC1;
 Tue,  8 Apr 2014 07:15:53 +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 032EF1CD9;
 Tue,  8 Apr 2014 07:15:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s387Fqtw072381;
 Tue, 8 Apr 2014 07:15:52 GMT (envelope-from ehaupt@svn.freebsd.org)
Received: (from ehaupt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s387FqXQ072376;
 Tue, 8 Apr 2014 07:15:52 GMT (envelope-from ehaupt@svn.freebsd.org)
Message-Id: <201404080715.s387FqXQ072376@svn.freebsd.org>
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Tue, 8 Apr 2014 07:15:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r350577 - head/net/httpry
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.17
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: Tue, 08 Apr 2014 07:15:54 -0000

Author: ehaupt
Date: Tue Apr  8 07:15:52 2014
New Revision: 350577
URL: http://svnweb.freebsd.org/changeset/ports/350577
QAT: https://qat.redports.org/buildarchive/r350577/

Log:
  - Support staging
  - Define DOCS option

Modified:
  head/net/httpry/Makefile
  head/net/httpry/pkg-plist

Modified: head/net/httpry/Makefile
==============================================================================
--- head/net/httpry/Makefile	Tue Apr  8 07:15:50 2014	(r350576)
+++ head/net/httpry/Makefile	Tue Apr  8 07:15:52 2014	(r350577)
@@ -8,15 +8,12 @@ MASTER_SITES=	http://dumpsterventures.co
 MAINTAINER=	wxs@FreeBSD.org
 COMMENT=	Packet sniffer designed for displaying and logging HTTP traffic
 
-MAN1=		httpry.1
-
 USE_RC_SUBR=	httpry
 
-OPTIONS_DEFINE=	EXTRASCRIPTS
+OPTIONS_DEFINE=	EXTRASCRIPTS DOCS
 EXTRASCRIPTS_DESC=	Install additional scripts
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MEXTRASCRIPTS}
 PLIST_SUB=	EXTRASCRIPTS=""
@@ -28,17 +25,15 @@ PLIST_SUB=	EXTRASCRIPTS="@comment "
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 .if ${PORT_OPTIONS:MEXTRASCRIPTS}
-	${MKDIR} ${PREFIX}/bin/httpry-scripts
+	@${MKDIR} ${STAGEDIR}${PREFIX}/bin/httpry-scripts
 	(cd ${WRKSRC}/scripts/ && \
-		${COPYTREE_BIN} \* ${PREFIX}/bin/httpry-scripts "! -name *.bak")
-.endif
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/doc/perl-tools ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/doc/format-string ${DOCSDIR}
+		${COPYTREE_BIN} \* ${STAGEDIR}${PREFIX}/bin/httpry-scripts "! -name *.bak")
 .endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/doc/perl-tools ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/doc/format-string ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/net/httpry/pkg-plist
==============================================================================
--- head/net/httpry/pkg-plist	Tue Apr  8 07:15:50 2014	(r350576)
+++ head/net/httpry/pkg-plist	Tue Apr  8 07:15:52 2014	(r350577)
@@ -1,4 +1,5 @@
 bin/httpry
+man/man1/httpry.1.gz
 %%EXTRASCRIPTS%%bin/httpry-scripts/parse_log.pl
 %%EXTRASCRIPTS%%bin/httpry-scripts/rotate_log.pl
 %%EXTRASCRIPTS%%bin/httpry-scripts/process_logs