From owner-svn-ports-all@FreeBSD.ORG Fri Feb 21 10:03:30 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 8B2B9E90; Fri, 21 Feb 2014 10:03:30 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 68F5B1905; Fri, 21 Feb 2014 10:03:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1LA3UpF073713; Fri, 21 Feb 2014 10:03:30 GMT (envelope-from ehaupt@svn.freebsd.org) Received: (from ehaupt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1LA3UvN073711; Fri, 21 Feb 2014 10:03:30 GMT (envelope-from ehaupt@svn.freebsd.org) Message-Id: <201402211003.s1LA3UvN073711@svn.freebsd.org> From: Emanuel Haupt Date: Fri, 21 Feb 2014 10:03:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345351 - head/mail/smtprc 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Feb 2014 10:03:30 -0000 Author: ehaupt Date: Fri Feb 21 10:03:29 2014 New Revision: 345351 URL: http://svnweb.freebsd.org/changeset/ports/345351 QAT: https://qat.redports.org/buildarchive/r345351/ Log: - Support staging - Use optionsng Modified: head/mail/smtprc/Makefile head/mail/smtprc/pkg-plist Modified: head/mail/smtprc/Makefile ============================================================================== --- head/mail/smtprc/Makefile Fri Feb 21 09:54:10 2014 (r345350) +++ head/mail/smtprc/Makefile Fri Feb 21 10:03:29 2014 (r345351) @@ -10,16 +10,19 @@ EXTRACT_SUFX= .tgz MAINTAINER= mich@FreeBSD.org COMMENT= A scanner for open SMTP relays -.if defined(WITH_GUI) +OPTIONS_DEFINE= DOCS GUI + +.include + +.if ${PORT_OPTIONS:MGUI} RUN_DEPENDS= p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk PLIST_SUB+= WITHGUI="" .else PLIST_SUB+= WITHGUI="@comment " .endif -NO_STAGE= yes pre-fetch: -.if defined(WITH_GUI) +.if ${PORT_OPTIONS:MGUI} @${ECHO_MSG} "" @${ECHO_MSG} "Installed with GUI" @${ECHO_MSG} "" @@ -34,26 +37,17 @@ post-patch: s,gcc,${CC},g" ${WRKSRC}/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - ${MKDIR} ${PREFIX}/etc/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/auto.conf ${PREFIX}/etc/${PORTNAME}/auto.conf.sample - ${INSTALL_DATA} ${WRKSRC}/email.tmpl ${PREFIX}/etc/${PORTNAME}/email.tmpl.sample - ${INSTALL_DATA} ${WRKSRC}/rcheck.conf ${PREFIX}/etc/${PORTNAME}/rcheck.conf.sample - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${PREFIX}/man/man1 -.if defined(WITH_GUI) - ${INSTALL_SCRIPT} ${WRKSRC}/gsmtprc ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/gsmtprc.1 ${PREFIX}/man/man1 -.endif - -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README -.endif - -.if defined(WITH_GUI) -MAN1= smtprc.1 gsmtprc.1 -.else -MAN1= smtprc.1 + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/auto.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/auto.conf.sample + ${INSTALL_DATA} ${WRKSRC}/email.tmpl ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/email.tmpl.sample + ${INSTALL_DATA} ${WRKSRC}/rcheck.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/rcheck.conf.sample + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 +.if ${PORT_OPTIONS:MGUI} + ${INSTALL_SCRIPT} ${WRKSRC}/gsmtprc ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/gsmtprc.1 ${STAGEDIR}${PREFIX}/man/man1 .endif + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/README .include Modified: head/mail/smtprc/pkg-plist ============================================================================== --- head/mail/smtprc/pkg-plist Fri Feb 21 09:54:10 2014 (r345350) +++ head/mail/smtprc/pkg-plist Fri Feb 21 10:03:29 2014 (r345351) @@ -2,7 +2,9 @@ bin/smtprc etc/smtprc/auto.conf.sample etc/smtprc/email.tmpl.sample etc/smtprc/rcheck.conf.sample -@dirrm etc/smtprc +man/man1/smtprc.1.gz +%%WITHGUI%%man/man1/gsmtprc.1.gz %%WITHGUI%%bin/gsmtprc %%PORTDOCS%%share/doc/smtprc/README %%PORTDOCS%%@dirrm share/doc/smtprc +@dirrm etc/smtprc