Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 9 May 2015 12:43:56 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r385887 - head/games/assaultcube
Message-ID:  <201505091243.t49Chudn071777@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Sat May  9 12:43:56 2015
New Revision: 385887
URL: https://svnweb.freebsd.org/changeset/ports/385887

Log:
  - Add optional support for using newer libenet from ports
  
  PR:		197605
  Submitted by:	lightside@gmx.com (maintainer)

Modified:
  head/games/assaultcube/Makefile

Modified: head/games/assaultcube/Makefile
==============================================================================
--- head/games/assaultcube/Makefile	Sat May  9 12:26:38 2015	(r385886)
+++ head/games/assaultcube/Makefile	Sat May  9 12:43:56 2015	(r385887)
@@ -3,7 +3,7 @@
 
 PORTNAME=	assaultcube
 PORTVERSION=	1.2.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	SF/actiongame/AssaultCube%20Version%20${PORTVERSION}
 DISTNAME=	AssaultCube_v${PORTVERSION}
@@ -24,11 +24,8 @@ LICENSE_PERMS_CUBE=	dist-mirror dist-sel
 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 @@ PORTDATA=	config packages scripts
 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 @@ DEDICATED_PLIST_FILES=	bin/${PORTNAME}_s
 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 @@ DESKTOP_ENTRIES="AssaultCube" "${COMMENT
 	"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 @@ post-patch: .SILENT
 		/^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/*}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505091243.t49Chudn071777>