- Convert LIB_DEPENDS to new syntax

- Use options helpers
- Add stage support

1 files changed, 21 insertions, 29 deletions

diff --git a/games/stepmania-devel/Makefile b/games/stepmania-devel/Makefile
index 1cd2713223af..003b34993008 100644
--- a/games/stepmania-devel/Makefile
+++ b/games/stepmania-devel/Makefile
@@ -16,8 +16,8 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/Docs/Licenses.txt
 
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=	mad:${PORTSDIR}/audio/libmad \
-		GLEW:${PORTSDIR}/graphics/glew
+LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad \
+		libGLEW.so:${PORTSDIR}/graphics/glew
 
 OPTIONS_DEFINE=	PULSEAUDIO VORBIS DOCS
 OPTIONS_DEFAULT=VORBIS
@@ -40,24 +40,21 @@ SHEBANG_FILES=	Utils/*.pl \
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lX11 -lpthread
 
-NO_STAGE=	yes
+VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_CONFIGURE_WITH=	vorbis
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 .else
 CONFIGURE_ENV+=	ac_cv_lib_pulse_pa_stream_new=no
 .endif
 
-.if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
-.else
-CONFIGURE_ARGS+=--without-vorbis
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e \
-		'/^LIBS/s|-lpthread|${ICONV_LIB}|' ${WRKSRC}/src/Makefile.in
+		'/^LIBS/s|-lpthread|${ICONV_LIB}|' -e 's/-finline-limit=300//g' \
+			 ${WRKSRC}/src/Makefile.in
 
 pre-build:
 	@${ECHO_CMD} -n > ${WRKDIR}/stepmania.sh
@@ -69,28 +66,23 @@ post-build:
 		${MAKEFILE} ${MAKE_ARGS} SMData)
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/stepmania.sh ${PREFIX}/bin/stepmania
-	${INSTALL_DATA} ${WRKSRC}/stepmania.desktop ${PREFIX}/share/applications
-	@${MKDIR} ${PREFIX}/share/icons/hicolor/scalable/apps
+	${INSTALL_SCRIPT} ${WRKDIR}/stepmania.sh ${STAGEDIR}${PREFIX}/bin/stepmania
+	${INSTALL_DATA} ${WRKSRC}/stepmania.desktop ${STAGEDIR}${PREFIX}/share/applications
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	cd ${WRKSRC}/icons/hicolor/scalable/apps && ${INSTALL_DATA} \
-		stepmania-ssc.svg ${PREFIX}/share/icons/hicolor/scalable/apps
+		stepmania-ssc.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 .for i in 16 22 24 32 36 48 64 72 96 128 192 256
-	@${MKDIR} ${PREFIX}/share/icons/hicolor/${i}x${i}/apps
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps
 	cd ${WRKSRC}/icons/hicolor/${i}x${i}/apps && ${INSTALL_DATA} \
-		stepmania-ssc.png ${PREFIX}/share/icons/hicolor/${i}x${i}/apps
+		stepmania-ssc.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps
 .endfor
-	@${MKDIR} ${PREFIX}/lib/stepmania
-	${INSTALL_PROGRAM} ${WRKSRC}/src/stepmania ${PREFIX}/lib/stepmania
-	${INSTALL_DATA} ${WRKSRC}/src/GtkModule.so ${PREFIX}/lib/stepmania
-	@${MKDIR} ${PREFIX}/lib/stepmania/Packages
-	${INSTALL_DATA} ${WRKSRC}/GameData.smzip ${PREFIX}/lib/stepmania/Packages
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/stepmania
+	${INSTALL_PROGRAM} ${WRKSRC}/src/stepmania ${STAGEDIR}${PREFIX}/lib/stepmania
+	${INSTALL_DATA} ${WRKSRC}/src/GtkModule.so ${STAGEDIR}${PREFIX}/lib/stepmania
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/stepmania/Packages
+	${INSTALL_DATA} ${WRKSRC}/GameData.smzip ${STAGEDIR}${PREFIX}/lib/stepmania/Packages
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(${TAR} -C ${WRKSRC}/Docs --exclude "Licenses.txt" -cf - . | \
-		${TAR} -C ${DOCSDIR} --unlink -xf -)
-	@${FIND} ${DOCSDIR} -print0 | ${XARGS} -0 ${CHOWN} ${SHAREOWN}:${SHAREGRP}
-	@${FIND} ${DOCSDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} ${SHAREMODE}
-	@${FIND} ${DOCSDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} a+rx
-.endif
+		${TAR} -C ${STAGEDIR}${DOCSDIR} --unlink -xf -)
 
 .include <bsd.port.mk>