- Fix building after removal of objformat(1).

- Clean up.
- Remove code for handling our previous SDL non-standard location.
- Merge post-install with do-install.
- Remove some useless comments.

1 files changed, 4 insertions, 26 deletions

diff --git a/games/duel/Makefile b/games/duel/Makefile
index 1a00513ad0da..d023a65f9180 100644
--- a/games/duel/Makefile
+++ b/games/duel/Makefile
@@ -19,47 +19,25 @@ COMMENT=	An overhead, OpenGL space shooter
 BUILD_DEPENDS=	${X11BASE}/lib/libftgl.a:${PORTSDIR}/graphics/ftgl
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
 USE_BZIP2=	yes
 USE_GL=		yes
 USE_SDL=	sdl
-REINPLACE_ARGS=	-i ''
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="`${SDL_CONFIG} --cflags` `freetype-config --cflags` -I${X11BASE}/include -I${X11BASE}/include/FTGL" \
 		LDFLAGS="`${SDL_CONFIG} --libs` -L${X11BASE}/lib"
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 SUB_FILES=	${PORTNAME}-sh
 
 post-patch:
-# Fix SDL include statement
-.for f in *.cpp *.h
-	@${FIND} ${WRKSRC}/src -type f -name ${f} -print0 | \
-		${XARGS} -0 \
-		${REINPLACE_CMD} -e 's|\(#include.*\)SDL/\(SDL.*\)|\1\2|'
-.endfor
-
-# Remove -lSDL flag
-	@${REINPLACE_CMD} -e 's|-lSDL ||' ${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
 
 do-install:
-# Script
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}-sh ${PREFIX}/bin/${PORTNAME}
-
-# Program
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/libexec
-
-# Data
 	${MKDIR} ${DATADIR}
 	${CP} -R ${WRKSRC}/runDir/* ${DATADIR}
-
-post-install:
-# Fix permissions
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
-	${FIND} ${DATADIR} -type f -print0 | \
-		${XARGS} -0 ${CHMOD} ${SHAREMODE}
-	${FIND} ${DATADIR} -type d -print0 | \
-		${XARGS} -0 ${CHMOD} ${BINMODE}
+	${FIND} ${DATADIR} -type f -print0 | ${XARGS} -0 ${CHMOD} ${SHAREMODE}
+	${FIND} ${DATADIR} -type d -print0 | ${XARGS} -0 ${CHMOD} ${BINMODE}
 
 .include <bsd.port.mk>