From owner-svn-ports-all@FreeBSD.ORG  Thu Jul 19 21:35:28 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id AD640106566B;
	Thu, 19 Jul 2012 21:35:28 +0000 (UTC) (envelope-from ak@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8BF628FC1B;
	Thu, 19 Jul 2012 21:35:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6JLZSsf024833;
	Thu, 19 Jul 2012 21:35:28 GMT (envelope-from ak@svn.freebsd.org)
Received: (from ak@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6JLZS30024830;
	Thu, 19 Jul 2012 21:35:28 GMT (envelope-from ak@svn.freebsd.org)
Message-Id: <201207192135.q6JLZS30024830@svn.freebsd.org>
From: Alex Kozlov <ak@FreeBSD.org>
Date: Thu, 19 Jul 2012 21:35:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r301191 - head/games/evilfinder
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Jul 2012 21:35:28 -0000

Author: ak
Date: Thu Jul 19 21:35:27 2012
New Revision: 301191
URL: http://svn.freebsd.org/changeset/ports/301191

Log:
  - Use new evilnumbers database
  - Remove old options remnants
  - Remove pkg-plist
  - Fix build with clang
  - Mark MAKE_JOBS_SAFE

Deleted:
  head/games/evilfinder/pkg-plist
Modified:
  head/games/evilfinder/Makefile   (contents, props changed)
  head/games/evilfinder/distinfo   (contents, props changed)

Modified: head/games/evilfinder/Makefile
==============================================================================
--- head/games/evilfinder/Makefile	Thu Jul 19 20:56:44 2012	(r301190)
+++ head/games/evilfinder/Makefile	Thu Jul 19 21:35:27 2012	(r301191)
@@ -7,21 +7,31 @@
 
 PORTNAME=	evilfinder
 PORTVERSION=	1.00
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
-MASTER_SITES=	http://lcamtuf.coredump.cx/
-DISTNAME=	ef
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	http://lcamtuf.coredump.cx/:src \
+	http://lcamtuf.coredump.cx/evilfinder/:numbers
+DISTFILES=	ef.tgz:src \
+	evilnumbers.dat:numbers
+
+EXTRACT_ONLY=	ef.tgz
 
 MAINTAINER=	ak@FreeBSD.org
 COMMENT=	Numerologically determine the evilness of things
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-OPTIONS_DEFINE=	WRAPPER
+MAKE_JOBS_SAFE=	yes
 
-WRAPPER_DESC=	Evilfinder local wrapper
+PLIST_FILES=	bin/ef \
+	%%WRAPPER%%bin/evilfinder \
+	libexec/ef-shuffle
 
+PORTDATA=	evilnumbers.dat
+PORTDOCS=	README
+
+OPTIONS_DEFINE=	WRAPPER
+WRAPPER_DESC=	Evilfinder local wrapper
 OPTIONS_DEFAULT=	WRAPPER
 
 .include <bsd.port.options.mk>
@@ -33,16 +43,20 @@ PLIST_SUB+=	WRAPPER=""
 PLIST_SUB+=	WRAPPER="@comment "
 .endif
 
+post-extract:
+	@${CP} ${DISTDIR}/evilnumbers.dat ${WRKSRC}
+
 post-patch:
 	@${REINPLACE_CMD} -e '/^CFLAGS/d' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e "s|evilnumbers.dat|${DATADIR}/evilnumbers.dat|; \
-		s|.tmp-%d-%u|/tmp/.tmp-%d-%u|; \
-		s|./shuffle|${PREFIX}/libexec/ef-shuffle|" \
+	@${REINPLACE_CMD} -e 's|evilnumbers.dat|${DATADIR}/evilnumbers.dat|' \
+		-e 's|.tmp-%d-%u|/tmp/.tmp-%d-%u|' \
+		-e 's|./shuffle|${PREFIX}/libexec/ef-shuffle|' \
+		-e 's|inline||' \
 		${WRKSRC}/ef.c
-.if !defined(WITHOUT_WRAPPER)
-	@${SED} -e "s|%%PREFIX%%|${PREFIX}|; \
-		s|/dev/stdin|-stdin|; \
-		s|%%LOCALBASE%%|${LOCALBASE}|" \
+.if ${PORT_OPTIONS:MWRAPPER}
+	@${SED} -e 's|%%PREFIX%%|${PREFIX}|' \
+		-e 's|/dev/stdin|-stdin|' \
+		-e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${FILESDIR}/evilfinder > ${WRKSRC}/evilfinder
 .endif
 
@@ -51,10 +65,10 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/shuffle ${PREFIX}/libexec/ef-shuffle
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/evilnumbers.dat ${DATADIR}
-.if !defined(WITHOUT_WRAPPER)
+.if ${PORT_OPTIONS:MWRAPPER}
 	${INSTALL_SCRIPT} ${WRKSRC}/evilfinder ${PREFIX}/bin
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif

Modified: head/games/evilfinder/distinfo
==============================================================================
--- head/games/evilfinder/distinfo	Thu Jul 19 20:56:44 2012	(r301190)
+++ head/games/evilfinder/distinfo	Thu Jul 19 21:35:27 2012	(r301191)
@@ -1,2 +1,4 @@
 SHA256 (ef.tgz) = 0e61b46c0891f7631a24a06c40988013c5581a9631eb7ed1221ff797299f0588
 SIZE (ef.tgz) = 150494
+SHA256 (evilnumbers.dat) = 6162beec29da300c610d8a8e8d879178af6814b6e80ec3ddc12cfdfc4bc330ac
+SIZE (evilnumbers.dat) = 5087