Set NO_WRKSUBDIR and BUILD_WRKSRC instead of abusing WRKSRC. Fix: Please apply this patch.
This patch works for me. -- Regards, Gary J. Hayers gary@hayers.org PGP Signature http://www.hayers.org/pgp
Can you please send an updated version that applies to the current ports tree? Thanks.
Responsible Changed From-To: freebsd-ports-bugs->danilo I'll take it.
Author: danilo Date: Wed Oct 30 18:27:20 2013 New Revision: 332162 URL: http://svnweb.freebsd.org/changeset/ports/332162 Log: - Set NO_WRKSUBDIR and BUILD_WRKSRC - Add stage support PR: ports/176195 Submitted by: Christoph Mallon <christoph.mallon@gmx.de> Modified: head/games/cre/Makefile Modified: head/games/cre/Makefile ============================================================================== --- head/games/cre/Makefile Wed Oct 30 18:15:23 2013 (r332161) +++ head/games/cre/Makefile Wed Oct 30 18:27:20 2013 (r332162) @@ -13,34 +13,29 @@ COMMENT= Corewars Redcode Evolver LICENSE= GPLv2 -USE_DOS2UNIX= ../*.txt -WRKSRC= ${WRKDIR}/src +USE_DOS2UNIX= *.txt +NO_WRKSUBDIR= yes +BUILD_WRKSRC= ${WRKSRC}/src PLIST_FILES= bin/${PORTNAME} PORTDOCS= *.txt -NO_STAGE= yes -.include <bsd.port.options.mk> - post-extract: - @${CP} ${FILESDIR}/${MAKEFILE} ${WRKSRC} - @cd ${WRKDIR} && ${MV} "CRE Manual.txt" CRE_Manual.txt && \ + @${CP} ${FILESDIR}/${MAKEFILE} ${BUILD_WRKSRC} + @cd ${WRKSRC} && ${MV} "CRE Manual.txt" CRE_Manual.txt && \ ${MV} "Exhaust README.txt" Exhaust_README.txt post-patch: - @cd ${WRKSRC} && ${REINPLACE_CMD} -e '/memwatch\.h/d' \ + @cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} -e '/memwatch\.h/d' \ asm.c pspace.c sim.c - @cd ${WRKSRC} && ${REINPLACE_CMD} \ + @cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} \ -e 's|random[[:blank:]]*(|myrandom(|' \ battler.c generator.c globals.h Main.c do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/ - -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKDIR}/|} ${DOCSDIR} -.endif + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed, with minor changes. Thanks!