On Fri, Apr 20, 2018 at 10:57:39PM +0100, Nigel Taylor wrote:
>
> Build continues if png package is installed, but note that
> post extract has
>
> @sed -i 's|"png.h"|"localpng.h"|' ${WRKSRC}/src/emu/*.cpp \
> ${WRKSRC}/src/lib/util/*.cpp ${WRKSRC}/src/tools/*.cpp
>
> The source file is not included in the edit.
>
> Either png.h needs changing to localpng.h or png package needs to be
> installed.
> Also when fixing a revision bump is required.
Thanks for pointing this out, I used grep -rl so it won't happen again
in the future when new files requiring "png.h" are added.
Comments? OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/mame/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile 20 Apr 2018 15:06:22 -0000 1.5
+++ Makefile 21 Apr 2018 21:50:19 -0000
@@ -9,6 +9,7 @@ COMMENT = Multiple Arcade Machine Emulat
V = 196
DISTNAME = mame0${V}s
PKGNAME = mame-0.${V}
+REVISION = 0
CATEGORIES = emulators
@@ -74,8 +75,7 @@ post-extract:
${WRKSRC}/3rdparty/genie/build/gmake.bsd
@sed -i 's,"lua","lua${MODLUA_VERSION}",g' ${WRKSRC}/scripts/extlib.lua
@mv ${WRKSRC}/src/lib/util/png.h ${WRKSRC}/src/lib/util/localpng.h
- @sed -i 's|"png.h"|"localpng.h"|' ${WRKSRC}/src/emu/*.cpp \
- ${WRKSRC}/src/lib/util/*.cpp ${WRKSRC}/src/tools/*.cpp
+ @grep -rl "png.h" ${WRKSRC}/src | xargs sed -i 's|"png.h"|"localpng.h"|'
@perl -pi -e 's/\r//g' ${WRKSRC}/makefile ${WRKSRC}/scripts/genie.lua \
${WRKSRC}/3rdparty/genie/build/gmake.bsd/genie.make \
${WRKSRC}/docs/man/* ${WRKSRC}/keymaps/*
