Attachment 187461 Details for Bug 223139 – simplify

[patch] simplify

simplify.diff (text/plain), 5.77 KB, created by Jan Beich on 2017-10-25 12:58:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2017-10-25 12:58:32 UTC

Size: 5.77 KB

patch

obsolete

>From df0c6794693e15323adaf34430ed500520fbcea4 Mon Sep 17 00:00:00 2001
>From: nobody <>
>Date: Wed, 25 Oct 2017 11:49:57 +0000
>Subject: [PATCH] games/openclaw: simplify
>
>- Rename from OpenClaw to openclaw to match binary name
>- Convert to INSTALL_(PROGRAM|SCRIPT)
>- Convert to COPYTREE_SHARE
>- Drop unnecessary :outsource
>- Switch to c++11-lib
>
>PR:		223139
>Submitted by:	jbeich
>---
> games/Makefile                                    |  2 +-
> games/OpenClaw/pkg-plist                          |  8 ----
> games/{OpenClaw => openclaw}/Makefile             | 56 +++++++++++------------
> games/{OpenClaw => openclaw}/distinfo             |  0
> games/{OpenClaw => openclaw}/files/pkg-message.in |  2 +-
> games/{OpenClaw => openclaw}/pkg-descr            |  0
> 6 files changed, 29 insertions(+), 39 deletions(-)
> delete mode 100644 games/OpenClaw/pkg-plist
> rename games/{OpenClaw => openclaw}/Makefile (21%)
> rename games/{OpenClaw => openclaw}/distinfo (100%)
> rename games/{OpenClaw => openclaw}/files/pkg-message.in (79%)
> rename games/{OpenClaw => openclaw}/pkg-descr (100%)
>
>diff --git a/games/Makefile b/games/Makefile
>index 79c2594c46ed..d0dc1681da10 100644
>--- a/games/Makefile
>+++ b/games/Makefile
>@@ -17,7 +17,6 @@
>     SUBDIR += CaribbeanStud
>     SUBDIR += HeroesOfMightAndMagic
>     SUBDIR += KnightCap
>-    SUBDIR += OpenClaw
>     SUBDIR += OpenTomb
>     SUBDIR += abbayedesmorts
>     SUBDIR += abe
>@@ -695,6 +694,7 @@
>     SUBDIR += openbor4432
>     SUBDIR += openbubbles
>     SUBDIR += opencity
>+    SUBDIR += openclaw
>     SUBDIR += openclonk
>     SUBDIR += opengfx
>     SUBDIR += openglad
>diff --git a/games/OpenClaw/pkg-plist b/games/OpenClaw/pkg-plist
>deleted file mode 100644
>index 907c1d6ce8b8..000000000000
>--- a/games/OpenClaw/pkg-plist
>+++ /dev/null
>@@ -1,8 +0,0 @@
>-bin/ClawLauncher.exe
>-bin/clawlauncher
>-bin/openclaw
>-share/openclaw/ASSETS.ZIP
>-share/openclaw/SAVES.XML
>-share/openclaw/clacon.ttf
>-share/openclaw/config.xml
>-share/openclaw/console02.tga
>diff --git a/games/OpenClaw/Makefile b/games/openclaw/Makefile
>similarity index 21%
>rename from games/OpenClaw/Makefile
>rename to games/openclaw/Makefile
>index 0d7176acc622..3917cb85b0db 100644
>--- a/games/OpenClaw/Makefile
>+++ b/games/openclaw/Makefile
>@@ -1,9 +1,9 @@
> # $FreeBSD$
> 
>-PORTNAME=		OpenClaw
>-DISTVERSION=		1.0-29
>+PORTNAME=	openclaw
>+DISTVERSION=	1.0-29
> DISTVERSIONSUFFIX=	-g49c28d9
>-CATEGORIES=		games
>+CATEGORIES=	games
> 
> MAINTAINER=	greg@unrelenting.technology
> COMMENT=	Reimplementation of Captain Claw (1997) platformer
>@@ -12,39 +12,37 @@ LICENSE=	GPLv3
> 
> LIB_DEPENDS=	libtinyxml.so:textproc/tinyxml
> 
>-USES=		cmake:outsource compiler:c++11-lang pkgconfig localbase:ldflags
>-
> USE_GITHUB=	yes
> GH_ACCOUNT=	pjasicek
>+GH_PROJECT=	OpenClaw
> 
>+USES=		cmake compiler:c++11-lib pkgconfig localbase:ldflags
> USE_SDL=	image2 mixer2 ttf2 gfx2
> 
>+PLIST_FILES=	bin/ClawLauncher.exe \
>+		bin/clawlauncher \
>+		bin/openclaw
>+PORTDATA=	ASSETS.ZIP SAVES.XML clacon.ttf config.xml console02.tga
> SUB_FILES=	pkg-message
>-DATADIR=	${LOCALBASE}/share/openclaw
>+
>+post-patch:
>+	@${REINPLACE_CMD} '/CMAKE_RUNTIME_OUTPUT_DIRECTORY/d' \
>+		${WRKSRC}/CMakeLists.txt
>+	@${REINPLACE_CMD} -e 's|/usr/share/openclaw|${DATADIR}|g' \
>+		${WRKSRC}/Build_Release/clawlauncher \
>+		${WRKSRC}/Build_Release/config_linux_release.xml
>+
>+pre-build:
>+	cd ${WRKSRC}/Build_Release; ${CP} config_linux_release.xml config.xml
> 
> do-install:
>-	${INSTALL} -s ${WRKSRC}/../Build_Release/openclaw \
>-			${STAGEDIR}${PREFIX}/bin/openclaw
>-	${INSTALL} ${WRKSRC}/Build_Release/ClawLauncher.exe \
>-			${STAGEDIR}${PREFIX}/bin/ClawLauncher.exe
>-	${SED} -e 's|/usr/share/openclaw|${DATADIR}|g' \
>-		${WRKSRC}/Build_Release/clawlauncher > \
>-		${WRKSRC}/Build_Release/clawlauncher_freebsd
>-	${INSTALL} ${WRKSRC}/Build_Release/clawlauncher_freebsd \
>-			${STAGEDIR}${PREFIX}/bin/clawlauncher
>-	${MKDIR} ${STAGEDIR}${DATADIR}
>-	${INSTALL_DATA} ${WRKSRC}/Build_Release/ASSETS.ZIP \
>-			${STAGEDIR}${DATADIR}/ASSETS.ZIP
>-	${INSTALL_DATA} ${WRKSRC}/Build_Release/clacon.ttf \
>-			${STAGEDIR}${DATADIR}/clacon.ttf
>-	${INSTALL_DATA} ${WRKSRC}/Build_Release/console02.tga \
>-			${STAGEDIR}${DATADIR}/console02.tga
>-	${INSTALL_DATA} ${WRKSRC}/Build_Release/SAVES.XML \
>-			${STAGEDIR}${DATADIR}/SAVES.XML
>-	${SED} -e 's|/usr/share/openclaw|${DATADIR}|g' \
>-			${WRKSRC}/Build_Release/config_linux_release.xml > \
>-			${WRKSRC}/Build_Release/config_freebsd_release.xml
>-	${INSTALL_DATA} ${WRKSRC}/Build_Release/config_freebsd_release.xml \
>-			${STAGEDIR}${DATADIR}/config.xml
>+	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} \
>+		${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_SCRIPT} ${WRKSRC}/Build_Release/clawlauncher \
>+		${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_SCRIPT} ${WRKSRC}/Build_Release/ClawLauncher.exe \
>+		${STAGEDIR}${PREFIX}/bin
>+	(cd ${WRKSRC}/Build_Release && ${COPYTREE_SHARE} \
>+		"${PORTDATA}" ${STAGEDIR}${DATADIR})
> 
> .include <bsd.port.mk>
>diff --git a/games/OpenClaw/distinfo b/games/openclaw/distinfo
>similarity index 100%
>rename from games/OpenClaw/distinfo
>rename to games/openclaw/distinfo
>diff --git a/games/OpenClaw/files/pkg-message.in b/games/openclaw/files/pkg-message.in
>similarity index 79%
>rename from games/OpenClaw/files/pkg-message.in
>rename to games/openclaw/files/pkg-message.in
>index fd73f10a70c0..fc170402a6bd 100644
>--- a/games/OpenClaw/files/pkg-message.in
>+++ b/games/openclaw/files/pkg-message.in
>@@ -4,7 +4,7 @@ To complete the installation of this port you need to copy the file
> "CLAW.REZ" from the original Captain Claw distribution to
> %%DATADIR%%.
> 
>-To use clawlauncher (optional), install lang/mono.
>+To use clawlauncher (optional), install lang/mono and x11-toolkits/libgdiplus.
> 
> ==============================================================================
> 
>diff --git a/games/OpenClaw/pkg-descr b/games/openclaw/pkg-descr
>similarity index 100%
>rename from games/OpenClaw/pkg-descr
>rename to games/openclaw/pkg-descr

Flags:

jbeich: maintainer-approval? (val)

Actions: View | Diff

Attachments on bug 223139: 187338 | 187461 | 187470 | 187471