From 59b04dbc3c93e3805855a66a9f2cbeb37915cd4d Mon Sep 17 00:00:00 2001 From: Emanuel Haupt Date: Tue, 8 Apr 2014 07:15:52 +0000 Subject: [PATCH] - Support staging - Define DOCS option --- net/httpry/Makefile | 25 ++++++++++--------------- net/httpry/pkg-plist | 1 + 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/net/httpry/Makefile b/net/httpry/Makefile index 5a565cea0d0e..d345caf0d73b 100644 --- a/net/httpry/Makefile +++ b/net/httpry/Makefile @@ -8,15 +8,12 @@ MASTER_SITES= http://dumpsterventures.com/jason/httpry/ 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 +.include .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 +.include diff --git a/net/httpry/pkg-plist b/net/httpry/pkg-plist index 944bcf8d4899..a26cd7fb9d9e 100644 --- a/net/httpry/pkg-plist +++ b/net/httpry/pkg-plist @@ -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