Attachment 173905 Details for Bug 209742 – style cleanup

[patch] style cleanup

style-cleanup.diff (text/plain), 3.68 KB, created by Jan Beich on 2016-08-21 09:06:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2016-08-21 09:06:39 UTC

Size: 3.68 KB

patch

obsolete

>diff --git devel/godot-tools/Makefile devel/godot-tools/Makefile
>index 55fac7b..0957da2 100644
>--- devel/godot-tools/Makefile
>+++ devel/godot-tools/Makefile
>@@ -5,8 +5,28 @@ PKGNAMESUFFIX=	-tools
> 
> COMMENT=	Game development environment
> 
>+MASTERDIR=	${.CURDIR}/../godot
>+
>+MAKE_ARGS=	target=release_debug tools=yes
>+
> OPTIONS_DEFINE=	EXAMPLES
> 
>-MASTERDIR=	${.CURDIR}/../godot
>+DESKTOP_ENTRIES="Godot" "${COMMENT}" "${PKGBASE}" \
>+		  "${PKGBASE}" "Development;IDE;" ""
>+PLIST_FILES=	share/pixmaps/${PKGBASE}.png \
>+		share/pixmaps/${PKGBASE}.svg
>+EXAMPLESDIR=	${DATADIR}/demos
>+PORTEXAMPLES=	*
>+
>+do-install:	slave-do-install
>+slave-do-install:
>+	${INSTALL_DATA} ${WRKSRC}/icon.png \
>+		${STAGEDIR}${PREFIX}/share/pixmaps/${PKGBASE}.png
>+	${INSTALL_DATA} ${WRKSRC}/icon.svg \
>+		${STAGEDIR}${PREFIX}/share/pixmaps/${PKGBASE}.svg
>+
>+do-install-EXAMPLES-on:
>+	(cd ${WRKSRC_DEMOS} && ${COPYTREE_SHARE} "${PORTEXAMPLES}" \
>+		${STAGEDIR}${EXAMPLESDIR})
> 
> .include "${MASTERDIR}/Makefile"
>diff --git devel/godot/Makefile devel/godot/Makefile
>index 01e1a3c..e617e65 100644
>--- devel/godot/Makefile
>+++ devel/godot/Makefile
>@@ -23,61 +23,37 @@ RUN_DEPENDS=	xdg-user-dir:devel/xdg-user-dirs \
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	godotengine
>-GH_TAGNAME_DEMOS=	dfa1274
> 
>-USES=		scons ssl pkgconfig compiler
>+USES=		compiler:c++11-lib scons ssl pkgconfig
> USE_XORG=	x11 xcursor xinerama xrandr
> USE_GL=		gl
> 
>+MAKE_ARGS?=	target=release tools=no
> MAKE_ARGS+=	platform=x11
>+MAKE_ARGS+=	${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}
>+MAKE_ARGS_clang=	use_llvm=yes
> CXXFLAGS+=	-DGLEW_NO_GLU -DRTAUDIO_ENABLED
>+CXXFLAGS_i386=	${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}}
>+CXXFLAGS_i386_gcc=	-march=i586
> 
> OPTIONS_DEFINE+=	DEBUG
> OPTIONS_DEFAULT+=	OSS
> OPTIONS_GROUP=		AUDIO
> OPTIONS_GROUP_AUDIO=	ALSA OSS PULSEAUDIO
> 
>-EXAMPLES_GH_TUPLE=	godotengine:godot-demo-projects:${GH_TAGNAME_DEMOS}:DEMOS
>+DEBUG_MAKE_ARGS=	target=debug
> 
>-AUDIO_DESC=		Supported audio
>+EXAMPLES_GH_PROJECT=	godot-demo-projects:DEMOS
>+EXAMPLES_GH_TAGNAME=	dfa1274:DEMOS # 2.1 branch HEAD
>+
>+AUDIO_DESC=		Audio backends
> ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
> ALSA_MAKE_ARGS=		alsa=yes
> OSS_MAKE_ARGS=		oss=yes
> PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio
> PULSEAUDIO_MAKE_ARGS=	pulseaudio=yes
> 
>-GODOTFILE=		${PORTNAME}${PKGNAMESUFFIX}
>-PLIST_FILES=	bin/${GODOTFILE}
>-PORTDATA=		*
>-
>-.include <bsd.port.pre.mk>
>-
>-.ifdef WITH_DEBUG
>-MAKE_ARGS+=	target=debug
>-.elif ${SLAVE_PORT} == yes
>-MAKE_ARGS+=	target=release_debug
>-.else #SLAVE_PORT
>-MAKE_ARGS+=	target=release
>-.endif #SLAVE_PORT
>-
>-.if ${SLAVE_PORT} == yes
>-MAKE_ARGS+=	tools=yes
>-DESKTOP_ENTRIES=	"Godot" "${COMMENT}" "${GODOTFILE}" \
>-			"${GODOTFILE}" "Development;IDE;" ""
>-PLIST_FILES+=	share/pixmaps/${GODOTFILE}.png \
>-		share/pixmaps/${GODOTFILE}.svg
>-.else #SLAVE_PORT
>-MAKE_ARGS+=	tools=no
>-.endif #SLAVE_PORT
>-
>-.if ${CHOSEN_COMPILER_TYPE} == clang
>-MAKE_ARGS+=	use_llvm=yes
>-.else  # clang
>-USE_GCC=	yes
>-.if ${ARCH} == i386
>-CXXFLAGS+=	-march=i586
>-.endif
>-.endif # clang
>+PLIST_FILES+=		bin/${PKGBASE}
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|custom_build|${OPSYS}_Ports_build|' \
>@@ -90,16 +66,6 @@ post-patch:
> # this gives us bin/godot for runtime and bin/godot-tools for the IDE
> do-install:
> 	@cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} godot.x11* \
>-		${STAGEDIR}/${PREFIX}/bin/${GODOTFILE}
>-.if ${SLAVE_PORT} == yes
>-	${INSTALL_DATA} ${WRKSRC}/icon.png \
>-		${STAGEDIR}${PREFIX}/share/pixmaps/${GODOTFILE}.png
>-	${INSTALL_DATA} ${WRKSRC}/icon.svg \
>-		${STAGEDIR}${PREFIX}/share/pixmaps/${GODOTFILE}.svg
>-.endif
>-
>-do-install-EXAMPLES-on:
>-	(cd ${WRKSRC_DEMOS} && ${COPYTREE_SHARE} "${PORTDATA}" \
>-		${STAGEDIR}${DATADIR}/demos)
>+		${STAGEDIR}/${PREFIX}/bin/${PKGBASE}
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>

Actions: View | Diff

Attachments on bug 209742: 170627 | 170628 | 170629 | 170630 | 170631 | 170632 | 170633 | 170655 | 170656 | 170661 | 170662 | 170708 | 170709 | 170710 | 170711 | 170758 | 170759 | 170766 | 170767 | 170772 | 170773 | 170803 | 170804 | 171800 | 171811 | 171968 | 171969 | 172012 | 172034 | 172038 | 172041 | 172374 | 172548 | 172566 | 173522 | 173523 | 173524 | 173710 | 173711 | 173719 | 173905 | 173912 | 173917 | 173935 | 173937 | 173942 | 173959 | 173964 | 173966 | 173976 | 173980 | 173981 | 173982 | 173984 | 173985 | 174021 | 174023