svn commit: r380091 - in head: . games games/trigger games/trigger-data games/trigger-rally

Max Brazhnikov makc at FreeBSD.org
Fri Feb 27 14:49:26 UTC 2015 

Author: makc
Date: Fri Feb 27 14:49:23 2015
New Revision: 380091
URL: https://svnweb.freebsd.org/changeset/ports/380091
QAT: https://qat.redports.org/buildarchive/r380091/

Log:
  Rename games/trigger to games/trigger-rally (follow upstream naming) and
  create separate port for game data.
  
  games/trigger-rally:
  - Pass required bits via arguments instead of patching configure script
  - Clean up Makefile
  - Stop using plist in favour one line PLIST_FILES
  
  games/trigger-data:
  - Mark port as architecture neutral

Added:
  head/games/trigger-data/
     - copied from r379962, head/games/trigger/
  head/games/trigger-rally/
     - copied from r380082, head/games/trigger/
Deleted:
  head/games/trigger/
  head/games/trigger-rally/pkg-plist
Modified:
  head/MOVED
  head/UPDATING
  head/games/Makefile
  head/games/trigger-data/Makefile
  head/games/trigger-data/distinfo
  head/games/trigger-data/pkg-plist
  head/games/trigger-rally/Makefile
  head/games/trigger-rally/distinfo

Modified: head/MOVED
==============================================================================
--- head/MOVED	Fri Feb 27 14:42:51 2015	(r380090)
+++ head/MOVED	Fri Feb 27 14:49:23 2015	(r380091)
@@ -7426,3 +7426,4 @@ sysutils/rsyslog8-devel|sysutils/rsyslog
 japanese/mozc-additions||2015-02-15|Obsoleted by mozc script in japanese/mozc-server
 math/ruby-numru_units|math/rubygem-numru-units|2015-02-22|Long time broken. Please use math/rubygem-numru-units instead
 lang/ruby19|lang/ruby20|2015-02-24|Upstream support ended February 23, 2015
+games/trigger|games/trigger-rally|2015-02-26|Follow upstream naming

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Fri Feb 27 14:42:51 2015	(r380090)
+++ head/UPDATING	Fri Feb 27 14:49:23 2015	(r380091)
@@ -5,6 +5,14 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20150227:
+  AFFECTS: Users of games/trigger
+  AUTHOR: makc at FreeBSD.org
+
+  games/trigger has been split and renamed to games/trigger-rally
+  and games/trigger-data ports. Deinstall previous version
+  before upgrading.
+
 20150224:
   AFFECTS: Users of devel/qt4-linguist
   AUTHOR: makc at FreeBSD.org

Modified: head/games/Makefile
==============================================================================
--- head/games/Makefile	Fri Feb 27 14:42:51 2015	(r380090)
+++ head/games/Makefile	Fri Feb 27 14:49:23 2015	(r380091)
@@ -966,7 +966,8 @@
     SUBDIR += traindirector
     SUBDIR += traingame
     SUBDIR += tremulous
-    SUBDIR += trigger
+    SUBDIR += trigger-data
+    SUBDIR += trigger-rally
     SUBDIR += trimines
     SUBDIR += triplane
     SUBDIR += trojka

Modified: head/games/trigger-data/Makefile
==============================================================================
--- head/games/trigger/Makefile	Wed Feb 25 20:14:02 2015	(r379962)
+++ head/games/trigger-data/Makefile	Fri Feb 27 14:49:23 2015	(r380091)
@@ -1,66 +1,25 @@
-# Created by: Jean-Yves Lefort <jylefort at brutele.be>
 # $FreeBSD$
 
-PORTNAME=	trigger
+PORTNAME=	trigger-data
 PORTVERSION=	0.6.0
-PORTREVISION=	3
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}-rally/${PORTNAME}-rally/${PORTNAME}-${PORTVERSION}
-DISTFILES=	trigger-rally-${PORTVERSION}-src${EXTRACT_SUFX} \
-		trigger-rally-${DATAVERSION}-data${EXTRACT_SUFX}
+MASTER_SITES=	SF/trigger-rally/trigger-rally/trigger-${PORTVERSION}
+DISTNAME=	trigger-rally-${PORTVERSION}-data
 
 MAINTAINER=	makc at FreeBSD.org
-COMMENT=	Rally car racing game
+COMMENT=	Data files for trigger-rally
 
-BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
-LIB_DEPENDS=	libphysfs.so:${PORTSDIR}/devel/physfs
+USES=		tar:bzip2
 
-USES=		openal:al,alut tar:bzip2
-USE_SDL=	sdl image
-USE_GL=		glu
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+DATADIR=	${PREFIX}/share/trigger-rally
 
-WRKSRC=		${WRKDIR}/trigger-rally-${PORTVERSION}-src
-DATASRC=	${WRKDIR}/trigger-rally-${DATAVERSION}-data
-
-DATAVERSION=	0.6.0
-
-DESKTOP_ENTRIES="Trigger" "${COMMENT}" "" \
-		"trigger" "" false
-
-PORTDOCS=	README-stereo.txt README.txt
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.options.mk>
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|SDL/||' \
-		${WRKSRC}/src/trigger/main.cpp \
-		${WRKSRC}/src/pengine/texture.cpp
-	@${REINPLACE_CMD} -e 's|\$${prefix}/share|${DATADIR}|; \
-		s|-lopenal|& -lalut|g' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|-O3||' ${WRKSRC}/Jamrules
-
-do-build:
-	@cd ${BUILD_WRKSRC} && ${LOCALBASE}/bin/jam
+NO_ARCH=	yes
+NO_BUILD=	yes
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/trigger ${STAGEDIR}${PREFIX}/bin
-
-	${MKDIR} ${STAGEDIR}${DATADIR}
-.for d in events fonts maps plugins sounds textures vehicles
-	cd ${DATASRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}
-.endfor
-	${INSTALL_DATA} ${DATASRC}/trigger.config.defs ${STAGEDIR}${DATADIR}
-
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
+	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
+# Avoid conflict with trigger-rally
+	@${RM} -f ${STAGEDIR}${DATADIR}/COPYING* \
+		${STAGEDIR}${DATADIR}/README*
 
 .include <bsd.port.mk>

Modified: head/games/trigger-data/distinfo
==============================================================================
--- head/games/trigger/distinfo	Wed Feb 25 20:14:02 2015	(r379962)
+++ head/games/trigger-data/distinfo	Fri Feb 27 14:49:23 2015	(r380091)
@@ -1,4 +1,2 @@
-SHA256 (trigger-rally-0.6.0-src.tar.bz2) = dc818f359fff71a8ba5e147886f233cca6478e5b007ef0a38a2974cca855a662
-SIZE (trigger-rally-0.6.0-src.tar.bz2) = 333977
 SHA256 (trigger-rally-0.6.0-data.tar.bz2) = 9ec81472051c890eb2c69e3036299059c7ae82fe445fd4c210c25764f6733598
 SIZE (trigger-rally-0.6.0-data.tar.bz2) = 21204146

Modified: head/games/trigger-data/pkg-plist
==============================================================================
--- head/games/trigger/pkg-plist	Wed Feb 25 20:14:02 2015	(r379962)
+++ head/games/trigger-data/pkg-plist	Fri Feb 27 14:49:23 2015	(r380091)
@@ -1,4 +1,3 @@
-bin/trigger
 %%DATADIR%%/events/triggercup/bigjump/colormap.jpg
 %%DATADIR%%/events/triggercup/bigjump/foliagemap.png
 %%DATADIR%%/events/triggercup/bigjump/heightmap.png

Modified: head/games/trigger-rally/Makefile
==============================================================================
--- head/games/trigger/Makefile	Fri Feb 27 12:49:50 2015	(r380082)
+++ head/games/trigger-rally/Makefile	Fri Feb 27 14:49:23 2015	(r380091)
@@ -1,66 +1,42 @@
 # Created by: Jean-Yves Lefort <jylefort at brutele.be>
 # $FreeBSD$
 
-PORTNAME=	trigger
+PORTNAME=	trigger-rally
 PORTVERSION=	0.6.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}-rally/${PORTNAME}-rally/${PORTNAME}-${PORTVERSION}
-DISTFILES=	trigger-rally-${PORTVERSION}-src${EXTRACT_SUFX} \
-		trigger-rally-${DATAVERSION}-data${EXTRACT_SUFX}
+MASTER_SITES=	SF/trigger-rally/trigger-rally/trigger-${PORTVERSION}
+DISTVERSIONSUFFIX=	-src
 
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Rally car racing game
 
 BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
 LIB_DEPENDS=	libphysfs.so:${PORTSDIR}/devel/physfs
+RUN_DEPENDS=	${DATADIR}/trigger.config.defs:${PORTSDIR}/games/trigger-data
 
 USES=		openal:al,alut tar:bzip2
 USE_SDL=	sdl image
 USE_GL=		glu
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CONFIGURE_ARGS=	--datadir=${DATADIR} \
+		--with-libAlut=${LOCALBASE} \
+		--with-libPhysFS=${LOCALBASE}
 
-WRKSRC=		${WRKDIR}/trigger-rally-${PORTVERSION}-src
-DATASRC=	${WRKDIR}/trigger-rally-${DATAVERSION}-data
-
-DATAVERSION=	0.6.0
-
-DESKTOP_ENTRIES="Trigger" "${COMMENT}" "" \
+DESKTOP_ENTRIES="Trigger" "" "" \
 		"trigger" "" false
 
+PLIST_FILES=	bin/trigger
 PORTDOCS=	README-stereo.txt README.txt
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|SDL/||' \
-		${WRKSRC}/src/trigger/main.cpp \
-		${WRKSRC}/src/pengine/texture.cpp
-	@${REINPLACE_CMD} -e 's|\$${prefix}/share|${DATADIR}|; \
-		s|-lopenal|& -lalut|g' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|-O3||' ${WRKSRC}/Jamrules
-
 do-build:
 	@cd ${BUILD_WRKSRC} && ${LOCALBASE}/bin/jam
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/trigger ${STAGEDIR}${PREFIX}/bin
-
-	${MKDIR} ${STAGEDIR}${DATADIR}
-.for d in events fonts maps plugins sounds textures vehicles
-	cd ${DATASRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}
-.endfor
-	${INSTALL_DATA} ${DATASRC}/trigger.config.defs ${STAGEDIR}${DATADIR}
-
-.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>

Modified: head/games/trigger-rally/distinfo
==============================================================================
--- head/games/trigger/distinfo	Fri Feb 27 12:49:50 2015	(r380082)
+++ head/games/trigger-rally/distinfo	Fri Feb 27 14:49:23 2015	(r380091)
@@ -1,4 +1,2 @@
 SHA256 (trigger-rally-0.6.0-src.tar.bz2) = dc818f359fff71a8ba5e147886f233cca6478e5b007ef0a38a2974cca855a662
 SIZE (trigger-rally-0.6.0-src.tar.bz2) = 333977
-SHA256 (trigger-rally-0.6.0-data.tar.bz2) = 9ec81472051c890eb2c69e3036299059c7ae82fe445fd4c210c25764f6733598
-SIZE (trigger-rally-0.6.0-data.tar.bz2) = 21204146

More information about the svn-ports-all mailing list