svn commit: r328323 - in head/games/evilfinder: . files

[Alex Kozlov]

Author: ak
Date: Wed Sep 25 22:55:45 2013
New Revision: 328323
URL: http://svnweb.freebsd.org/changeset/ports/328323

Log:
  - Support STAGEDIR
  - Convert to options helpers

Modified:
  head/games/evilfinder/Makefile
  head/games/evilfinder/files/evilfinder   (contents, props changed)

Modified: head/games/evilfinder/Makefile
==============================================================================
--- head/games/evilfinder/Makefile	Wed Sep 25 21:54:48 2013	(r328322)
+++ head/games/evilfinder/Makefile	Wed Sep 25 22:55:45 2013	(r328323)
@@ -9,7 +9,6 @@ MASTER_SITES=	http://lcamtuf.coredump.cx
 	http://lcamtuf.coredump.cx/evilfinder/:numbers
 DISTFILES=	ef.tgz:src \
 	evilnumbers.dat:numbers
-
 EXTRACT_ONLY=	ef.tgz
 
 MAINTAINER=	ak at FreeBSD.org
@@ -17,10 +16,11 @@ COMMENT=	Numerologically determine the e
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+OPTIONS_SUB=	yes
 
 PLIST_FILES=	bin/ef \
-	%%WRAPPER%%bin/evilfinder \
-	libexec/ef-shuffle
+		%%WRAPPER%%bin/evilfinder \
+		libexec/ef-shuffle
 
 PORTDATA=	evilnumbers.dat
 PORTDOCS=	README
@@ -29,15 +29,7 @@ OPTIONS_DEFINE=	WRAPPER
 WRAPPER_DESC=	Evilfinder local wrapper
 OPTIONS_DEFAULT=	WRAPPER
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MWRAPPER}
-RUN_DEPENDS+=	lynx:${PORTSDIR}/www/lynx
-PLIST_SUB+=	WRAPPER=""
-.else
-PLIST_SUB+=	WRAPPER="@comment "
-.endif
+WRAPPER_RUN_DEPENDS+=	lynx:${PORTSDIR}/www/lynx
 
 post-extract:
 	@${CP} ${DISTDIR}/evilnumbers.dat ${WRKSRC}
@@ -49,24 +41,18 @@ post-patch:
 		-e 's|./shuffle|${PREFIX}/libexec/ef-shuffle|' \
 		-e 's|inline||' \
 		${WRKSRC}/ef.c
-.if ${PORT_OPTIONS:MWRAPPER}
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|' \
 		-e 's|/dev/stdin|-stdin|' \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${FILESDIR}/evilfinder > ${WRKSRC}/evilfinder
-.endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ef ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/shuffle ${PREFIX}/libexec/ef-shuffle
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/evilnumbers.dat ${DATADIR}
-.if ${PORT_OPTIONS:MWRAPPER}
-	${INSTALL_SCRIPT} ${WRKSRC}/evilfinder ${PREFIX}/bin
-.endif
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/ef ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/shuffle ${STAGEDIR}${PREFIX}/libexec/ef-shuffle
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/evilnumbers.dat ${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/evilfinder ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/games/evilfinder/files/evilfinder
==============================================================================
--- head/games/evilfinder/files/evilfinder	Wed Sep 25 21:54:48 2013	(r328322)
+++ head/games/evilfinder/files/evilfinder	Wed Sep 25 22:55:45 2013	(r328323)
@@ -2,7 +2,7 @@
 
 if [ "x$#" = "x0" ]; then
 	echo "Usage: $0 POTENTIALLY_EVIL_WORD"; exit
-else 
-QUERY_STRING_UNESCAPED="_=$*" %%PREFIX%%/bin/ef| \
+else
+	QUERY_STRING_UNESCAPED="_=$*" %%PREFIX%%/bin/ef | \
 	%%LOCALBASE%%/bin/lynx -dump -force_html /dev/stdin
 fi