Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 20 Oct 2013 16:24:05 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r331034 - head/games/qstat
Message-ID:  <201310201624.r9KGO5an021207@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>
-
 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 <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310201624.r9KGO5an021207>