diff options
| author | Alex Kozlov <ak@FreeBSD.org> | 2012-06-02 10:01:24 +0000 |
|---|---|---|
| committer | Alex Kozlov <ak@FreeBSD.org> | 2012-06-02 10:01:24 +0000 |
| commit | c2396e09565c691b57b040efa7a967446f8885c5 (patch) | |
| tree | 76f4ffdd4f9187da51b9ab613e5863dc4565d523 /games | |
| parent | 24b247e2c7c02d18ee233d4cfabb838668bbe249 (diff) | |
| download | ports-c2396e09565c691b57b040efa7a967446f8885c5.tar.gz ports-c2396e09565c691b57b040efa7a967446f8885c5.zip | |
- Resolve conflict with misc/shuffle [1]
- Clarify wrapper option
Submitted by: ketas <madis555@hot.ee> [1]
Approved by: eadler, itetcu (mentors, implicit)
Notes
Notes:
svn path=/head/; revision=298003
Diffstat (limited to 'games')
| -rw-r--r-- | games/evilfinder/Makefile | 17 | ||||
| -rw-r--r-- | games/evilfinder/pkg-plist | 2 |
2 files changed, 5 insertions, 14 deletions
diff --git a/games/evilfinder/Makefile b/games/evilfinder/Makefile index 1d462b11b882..e363ef1a7bd7 100644 --- a/games/evilfinder/Makefile +++ b/games/evilfinder/Makefile @@ -7,7 +7,7 @@ PORTNAME= evilfinder PORTVERSION= 1.00 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://lcamtuf.coredump.cx/ DISTNAME= ef @@ -18,7 +18,7 @@ COMMENT= Numerologically determine the evilness of things WRKSRC= ${WRKDIR}/${PORTNAME} -OPTIONS= WRAPPER "Build with evilfinder wrapper" on +OPTIONS= WRAPPER "Evilfinder local wrapper" on .include <bsd.port.pre.mk> @@ -29,19 +29,10 @@ PLIST_SUB+= WRAPPER="" PLIST_SUB+= WRAPPER="@comment " .endif -pre-everything:: -.if !defined(WITHOUT_WRAPPER) - @${ECHO_MSG} "********************************************" - @${ECHO_MSG} "Define WITHOUT_WRAPPER to build without the" - @${ECHO_MSG} "\"evilfinder\" wrapper, which makes the port" - @${ECHO_MSG} "a web-oriented application." - @${ECHO_MSG} "********************************************" -.endif - post-patch: @${REINPLACE_CMD} -e '/^CFLAGS/d' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e "s|evilnumbers.dat|${DATADIR}/evilnumbers.dat|; \ - s|./shuffle|${PREFIX}/bin/shuffle|" \ + s|./shuffle|${PREFIX}/libexec/ef-shuffle|" \ ${WRKSRC}/ef.c .if !defined(WITHOUT_WRAPPER) @${SED} -e "s|%%PREFIX%%|${PREFIX}|; \ @@ -51,7 +42,7 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ef ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/shuffle ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/shuffle ${PREFIX}/libexec/ef-shuffle ${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/evilnumbers.dat ${DATADIR} .if !defined(WITHOUT_WRAPPER) diff --git a/games/evilfinder/pkg-plist b/games/evilfinder/pkg-plist index 45c15e41287f..b3e546845394 100644 --- a/games/evilfinder/pkg-plist +++ b/games/evilfinder/pkg-plist @@ -1,6 +1,6 @@ bin/ef %%WRAPPER%%bin/evilfinder -bin/shuffle +libexec/ef-shuffle %%PORTDOCS%%%%DOCSDIR%%/README %%DATADIR%%/evilnumbers.dat %%PORTDOCS%%@dirrm %%DOCSDIR%% |