Attachment 156532 Details for Bug 197605 – Proposed patch (since 385392 revision): for games/assaultcube

[patch] Proposed patch (since 385392 revision): for games/assaultcube

assaultcube_enet.diff (text/plain), 1.78 KB, created by lightside on 2015-05-09 06:20:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2015-05-09 06:20:26 UTC

Size: 1.78 KB

patch

obsolete

>diff -ruN assaultcube.orig/Makefile assaultcube/Makefile
>--- assaultcube.orig/Makefile	2015-05-04 15:16:47.000000000 +0400
>+++ assaultcube/Makefile	2015-05-09 08:29:49.000000000 +0400
>@@ -24,11 +24,8 @@
> LICENSE_PERMS_OTHER=	dist-mirror pkg-mirror auto-accept
> 
> USES=		gmake tar:bzip2
>-GNU_CONFIGURE=	yes
>-ALL_TARGET=	libenet
>+ALL_TARGET=	# empty
> WRKSRC=		${WRKDIR}/AssaultCube_v${PORTVERSION}
>-CONFIGURE_ARGS=	--enable-shared=no --enable-static=yes
>-CONFIGURE_WRKSRC=	${WRKSRC}/source/enet
> BUILD_WRKSRC=	${WRKSRC}/source/src
> SUB_FILES=	${PLIST_FILES:Mbin/*:T}
> 
>@@ -36,7 +33,7 @@
> PORTDOCS=	*
> PLIST_DIRS=	%%DATADIR%%/packages/maps/servermaps/incoming
> 
>-OPTIONS_DEFINE=	DOCS
>+OPTIONS_DEFINE=	DOCS PORT_ENET
> OPTIONS_MULTI=	BUILD
> OPTIONS_MULTI_BUILD=	CLIENT DEDICATED MASTER
> OPTIONS_DEFAULT=	CLIENT DEDICATED
>@@ -55,6 +52,7 @@
> MASTER_DESC=	Build master server
> MASTER_ALL_TARGET=	master
> MASTER_PLIST_FILES=	bin/${PORTNAME}_master libexec/${PORTNAME}_master
>+PORT_ENET_DESC=	Use libenet from net/enet
> 
> .include <bsd.port.options.mk>
> 
>@@ -64,6 +62,15 @@
> 	"Game;" false
> .endif
> 
>+.if ${PORT_OPTIONS:MPORT_ENET}
>+LIB_DEPENDS+=	libenet.so:${PORTSDIR}/net/enet
>+.else
>+ALL_TARGET+=	libenet
>+GNU_CONFIGURE=		yes
>+CONFIGURE_ARGS+=	--enable-shared=no --enable-static=yes
>+CONFIGURE_WRKSRC=	${WRKSRC}/source/enet
>+.endif
>+
> post-patch: .SILENT
> 	${REINPLACE_CMD} -e '/^CXXFLAGS=/d ; /^CXX=/d ; /^CLIENT_PCH/d ; \
> 		/^INCLUDES=/s|$$| -I$$(LOCALBASE)/include| ; \
>@@ -73,6 +80,12 @@
> 		/^CLIENT_LIBS=/s|$$| -lintl| ; \
> 		/^SERVER_LIBS=/s|$$| -L$$(LOCALBASE)/lib|' \
> 		${BUILD_WRKSRC}/Makefile
>+.if ${PORT_OPTIONS:MPORT_ENET}
>+	${SED} -i '.port_enet.bak' -e 's/libenet // ; \
>+		s|-I\.\./enet/include|| ; \
>+		s|-L\.\./enet/\.libs||' \
>+		${BUILD_WRKSRC}/Makefile
>+.endif
> 
> do-install:
> .for f in ${PLIST_FILES:Mbin/*}

Flags:

lightside: maintainer-approval+

Actions: View | Diff

Attachments on bug 197605: 152957 | 152968 | 152969 | 152970 | 152986 | 152993 | 152999 | 153001 | 153002 | 153016 | 153018 | 153021 | 153045 | 153046 | 153048 | 153056 | 153656 | 153657 | 154399 | 154400 | 154401 | 154402 | 155563 | 156341 | 156342 | 156343 | 156532