From owner-svn-ports-all@FreeBSD.ORG Wed Oct 23 23:53:55 2013 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 ESMTP id 4B9211C4; Wed, 23 Oct 2013 23:53:55 +0000 (UTC) (envelope-from garga@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 38A5729BF; Wed, 23 Oct 2013 23:53:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NNrtBC005157; Wed, 23 Oct 2013 23:53:55 GMT (envelope-from garga@svn.freebsd.org) Received: (from garga@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NNrsOT005155; Wed, 23 Oct 2013 23:53:54 GMT (envelope-from garga@svn.freebsd.org) Message-Id: <201310232353.r9NNrsOT005155@svn.freebsd.org> From: Renato Botelho Date: Wed, 23 Oct 2013 23:53:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331449 - head/sysutils/ucspi-tcp 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 23:53:55 -0000 Author: garga Date: Wed Oct 23 23:53:54 2013 New Revision: 331449 URL: http://svnweb.freebsd.org/changeset/ports/331449 Log: . Support staging . Remove MANPAGES option and respect NO_INSTALL_MANPAGES instead Modified: head/sysutils/ucspi-tcp/Makefile head/sysutils/ucspi-tcp/pkg-plist Modified: head/sysutils/ucspi-tcp/Makefile ============================================================================== --- head/sysutils/ucspi-tcp/Makefile Wed Oct 23 23:38:12 2013 (r331448) +++ head/sysutils/ucspi-tcp/Makefile Wed Oct 23 23:53:54 2013 (r331449) @@ -14,14 +14,12 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= garga@FreeBSD.org COMMENT= Command-line tools for building TCP client-server applications -OPTIONS_DEFINE= MANPAGES RSS_DIFF RBL2SMTPD IPV6 SSL LIMITS -OPTIONS_DEFAULT=MANPAGES +OPTIONS_DEFINE= RSS_DIFF RBL2SMTPD IPV6 SSL LIMITS RSS_DIFF_DESC= Patch rblsmtpd for qmail users RBL2SMTPD_DESC= Don't drop connection, pass envvar to smtpd LIMITS_DESC= Implement per-connection and other limits - ALL_TARGET= prog install instcheck SCRIPTS_ENV= BINOWN="${BINOWN}" \ @@ -49,7 +47,6 @@ SCRIPTS= date@ \ who@ \ tcpcat -NO_STAGE= yes .include # SSL and LIMITS can't coexist @@ -62,15 +59,18 @@ BROKEN= SSL and LIMITS options cannot co CFLAGS+= -O .endif -.if ${PORT_OPTIONS:MMANPAGES} +.if !defined(NO_INSTALL_MANPAGES) MASTER_SITES+= http://smarden.org/pape/djb/manpages/:man \ ${MASTER_SITE_LOCAL:S/$/:man/} MASTER_SITE_SUBDIR+= garga/ucspi-tcp/:man DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} \ ${DISTNAME}-man.tar.gz:man -MAN1= addcr.1 argv0.1 date@.1 delcr.1 finger@.1 fixcrio.1 \ +MAN_FILES= addcr.1 argv0.1 date@.1 delcr.1 finger@.1 fixcrio.1 \ http@.1 mconnect.1 rblsmtpd.1 recordio.1 tcpcat.1 \ tcpclient.1 tcprules.1 tcprulescheck.1 tcpserver.1 who@.1 +PLIST_SUB= MANPAGES="" +.else +PLIST_SUB= MANPAGES="@comment " .endif .if ${PORT_OPTIONS:MRSS_DIFF} @@ -126,14 +126,14 @@ post-configure: do-install: .for file_name in ${PROGRAMS} - @${INSTALL_PROGRAM} ${WRKSRC}/${file_name} ${PREFIX}/bin + @${INSTALL_PROGRAM} ${WRKSRC}/${file_name} ${STAGEDIR}${PREFIX}/bin .endfor .for file_name in ${SCRIPTS} - @${INSTALL_SCRIPT} ${WRKSRC}/${file_name} ${PREFIX}/bin + @${INSTALL_SCRIPT} ${WRKSRC}/${file_name} ${STAGEDIR}${PREFIX}/bin .endfor -.if ${PORT_OPTIONS:MMANPAGES} -. for file_name in ${MAN1} - ${INSTALL_MAN} ${WRKSRC}-man/${file_name} ${MAN1PREFIX}/man/man1/ +.if !defined(NO_INSTALL_MANPAGES) +. for file_name in ${MAN_FILES} + ${INSTALL_MAN} ${WRKSRC}-man/${file_name} ${STAGEDIR}${MAN1PREFIX}/man/man1/ . endfor .endif Modified: head/sysutils/ucspi-tcp/pkg-plist ============================================================================== --- head/sysutils/ucspi-tcp/pkg-plist Wed Oct 23 23:38:12 2013 (r331448) +++ head/sysutils/ucspi-tcp/pkg-plist Wed Oct 23 23:53:54 2013 (r331449) @@ -15,3 +15,19 @@ bin/tcprules bin/tcprulescheck bin/tcpserver bin/who@ +%%MANPAGES%%man/man1/addcr.1.gz +%%MANPAGES%%man/man1/argv0.1.gz +%%MANPAGES%%man/man1/date@.1.gz +%%MANPAGES%%man/man1/delcr.1.gz +%%MANPAGES%%man/man1/finger@.1.gz +%%MANPAGES%%man/man1/fixcrio.1.gz +%%MANPAGES%%man/man1/http@.1.gz +%%MANPAGES%%man/man1/mconnect.1.gz +%%MANPAGES%%man/man1/rblsmtpd.1.gz +%%MANPAGES%%man/man1/recordio.1.gz +%%MANPAGES%%man/man1/tcpcat.1.gz +%%MANPAGES%%man/man1/tcpclient.1.gz +%%MANPAGES%%man/man1/tcprules.1.gz +%%MANPAGES%%man/man1/tcprulescheck.1.gz +%%MANPAGES%%man/man1/tcpserver.1.gz +%%MANPAGES%%man/man1/who@.1.gz