From owner-svn-ports-head@FreeBSD.ORG Sun Oct 20 16:24:05 2013 Return-Path: Delivered-To: svn-ports-head@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 ESMTP id 70227C23; Sun, 20 Oct 2013 16:24:05 +0000 (UTC) (envelope-from danfe@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 5E1402151; Sun, 20 Oct 2013 16:24:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9KGO5Yb021208; Sun, 20 Oct 2013 16:24:05 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9KGO5an021207; Sun, 20 Oct 2013 16:24:05 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201310201624.r9KGO5an021207@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 20 Oct 2013 16:24:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331034 - head/games/qstat X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Oct 2013 16:24:05 -0000 Author: danfe Date: Sun Oct 20 16:24:04 2013 New Revision: 331034 URL: http://svnweb.freebsd.org/changeset/ports/331034 Log: Stagify; simplify one regex; do not hardcode operating system name. PR: ports/182535 Submitted by: amdmi3 Modified: head/games/qstat/Makefile Modified: head/games/qstat/Makefile ============================================================================== --- head/games/qstat/Makefile Sun Oct 20 16:07:22 2013 (r331033) +++ head/games/qstat/Makefile Sun Oct 20 16:24:04 2013 (r331034) @@ -15,26 +15,18 @@ CONFLICTS_INSTALL= torque-[0-9]* OPTIONS_DEFINE= DOCS -NO_STAGE= yes -.include - post-extract: @${MV} ${WRKSRC}/qstat.cfg ${WRKSRC}/qstat.cfg.default post-patch: - @${REINPLACE_CMD} -e 's|\(qstat\.cfg\)|\1\.default|' \ - ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|OpenBSD|FreeBSD|' ${WRKSRC}/qstat.c + @${REINPLACE_CMD} -e 's|qstat\.cfg|&.default|' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|OpenBSD|${OPSYS}|' ${WRKSRC}/qstat.c post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR}/info ${DOCSDIR}/template - ${INSTALL_DATA} ${WRKSRC}/qstatdoc.html ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR}/info ${STAGEDIR}${DOCSDIR}/template + ${INSTALL_DATA} ${WRKSRC}/qstatdoc.html ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/template/*.html ${WRKSRC}/template/*.txt \ - ${DOCSDIR}/template - ${INSTALL_DATA} ${WRKSRC}/info/*.txt ${DOCSDIR}/info -.endif - @[ -f ${PREFIX}/etc/qstat.cfg ] || \ - ${CP} ${PREFIX}/etc/qstat.cfg.default ${PREFIX}/etc/qstat.cfg + ${STAGEDIR}${DOCSDIR}/template + ${INSTALL_DATA} ${WRKSRC}/info/*.txt ${STAGEDIR}${DOCSDIR}/info .include