svn commit: r386748 - in head/benchmarks/fhourstones: . files

[John Marino]

Author: marino
Date: Tue May 19 08:37:43 2015
New Revision: 386748
URL: https://svnweb.freebsd.org/changeset/ports/386748

Log:
  benchmarks/fhourstones: New MASTER_SITES to unbreak, move executable
  
  This port was broken due to being unfetchable.  While finding a new
  source location, switch the executable from lib/fhourstones to
  libexec/fhourstones.  Also, use "sed" and "echo" to eliminate the
  need for patches.
  
  Some changes were made to the submitted patch by me, but they were minor.
  
  PR:		200293
  Submitted by:	Ports Fury

Deleted:
  head/benchmarks/fhourstones/files/
Modified:
  head/benchmarks/fhourstones/Makefile
  head/benchmarks/fhourstones/pkg-descr

Modified: head/benchmarks/fhourstones/Makefile
==============================================================================
--- head/benchmarks/fhourstones/Makefile	Tue May 19 08:11:43 2015	(r386747)
+++ head/benchmarks/fhourstones/Makefile	Tue May 19 08:37:43 2015	(r386748)
@@ -3,26 +3,36 @@
 
 PORTNAME=	fhourstones
 PORTVERSION=	3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	benchmarks
-MASTER_SITES=	http://homepages.cwi.nl/~tromp/c4/
+MASTER_SITES=	http://tromp.github.io/c4/
 DISTNAME=	Fhourstones
 
 MAINTAINER=	ports at FreeBSD.org
-COMMENT=	The Fhourstones Benchmark
+COMMENT=	Integrated benchmark program
 
-BROKEN=		Unfetchable
 NO_WRKSUBDIR=	yes
-PLIST_FILES=	bin/fhourstones lib/fhourstones/SearchGame lib/fhourstones/inputs
+PLIST_FILES=	bin/fhourstones \
+		libexec/fhourstones/SearchGame \
+		share/fhourstones/inputs
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/fhourstones
+	@${REINPLACE_CMD} -e \
+		's| = -O3| +=|' ${WRKSRC}/Makefile
+
+post-build:
+	${ECHO_CMD} '#!${SH}' > ${WRKSRC}/fhourstones
+	${ECHO_CMD} 'libexecdir=${PREFIX}/libexec/fhourstones' \
+		>> ${WRKSRC}/fhourstones
+	${ECHO_CMD} 'datadir=${DATADIR}' >> ${WRKSRC}/fhourstones
+	${ECHO_CMD} 'exec $${libexecdir}/SearchGame < $${datadir}/inputs' \
+		>> ${WRKSRC}/fhourstones
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/fhourstones
-	${INSTALL_SCRIPT} ${WRKDIR}/fhourstones ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKDIR}/SearchGame ${STAGEDIR}${PREFIX}/lib/fhourstones
-	${INSTALL_DATA} ${WRKDIR}/inputs ${STAGEDIR}${PREFIX}/lib/fhourstones
+	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/fhourstones ${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT}  ${WRKSRC}/fhourstones ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA}    ${WRKSRC}/inputs ${STAGEDIR}${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/SearchGame \
+		${STAGEDIR}${PREFIX}/libexec/fhourstones
 
 .include <bsd.port.mk>

Modified: head/benchmarks/fhourstones/pkg-descr
==============================================================================
--- head/benchmarks/fhourstones/pkg-descr	Tue May 19 08:11:43 2015	(r386747)
+++ head/benchmarks/fhourstones/pkg-descr	Tue May 19 08:37:43 2015	(r386748)
@@ -2,4 +2,4 @@ This integer benchmark solves positions 
 as played on a vertical 7x6 board.  This takes about 10 minutes
 on contemporary PCs.
 
-WWW: http://homepages.cwi.nl/~tromp/c4/fhour.html
+WWW: http://tromp.github.io/c4/fhour.html