svn commit: r307958 - in head/games: vegastrike vegastrike-data vegastrike/files

[Dmitry Marakasov]

Author: amdmi3
Date: Thu Nov 29 09:41:47 2012
New Revision: 307958
URL: http://svnweb.freebsd.org/changeset/ports/307958

Log:
  - Update to 0.5.1.r1
  - OptionsNG
  - Trim headers
  - Pass maintainership to submitter
  
  PR:		168957
  Submitted by:	Rusty Nejdl <rnejdl at ringofsaturn.com>
  Feature safe:	yes

Deleted:
  head/games/vegastrike/files/
Modified:
  head/games/vegastrike-data/Makefile
  head/games/vegastrike-data/distinfo
  head/games/vegastrike/Makefile
  head/games/vegastrike/distinfo

Modified: head/games/vegastrike-data/Makefile
==============================================================================
--- head/games/vegastrike-data/Makefile	Thu Nov 29 09:22:55 2012	(r307957)
+++ head/games/vegastrike-data/Makefile	Thu Nov 29 09:41:47 2012	(r307958)
@@ -1,30 +1,25 @@
-# New ports collection makefile for:	vegastrike-data
-# Date created:		05 May 2008
-# Whom:			Dmitry Marakasov <amdmi3 at amdmi3.ru>
-#
+# Created by: Dmitry Marakasov <amdmi3 at amdmi3.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	vegastrike
-PORTVERSION=	0.5.0
+PORTVERSION=	0.5.1.r1
 CATEGORIES=	games
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/0.5.1/
 PKGNAMESUFFIX=	-data
-DISTNAME=	vegastrike-linux-${PORTVERSION}
+DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
-MAINTAINER=	amdmi3 at FreeBSD.org
+MAINTAINER=	rnejdl at ringofsaturn.com
 COMMENT=	Vega Strike data files
 
 USE_BZIP2=	yes
 NO_BUILD=	yes
 
 PLIST=		${WRKDIR}/pkg-plist
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
 MANUAL_PACKAGE_BUILD=huge
 
 post-patch:
-	@${RM} -rf ${WRKSRC}/bin ${WRKSRC}/I* ${WRKSRC}/.vsinstall.sh.swp
 	@${FIND} ${WRKSRC} -name "Makefile.am" -delete
 
 pre-install:

Modified: head/games/vegastrike-data/distinfo
==============================================================================
--- head/games/vegastrike-data/distinfo	Thu Nov 29 09:22:55 2012	(r307957)
+++ head/games/vegastrike-data/distinfo	Thu Nov 29 09:41:47 2012	(r307958)
@@ -1,2 +1,2 @@
-SHA256 (vegastrike-linux-0.5.0.tar.bz2) = e273191dcdb3bed3edeff2618b0dfac56cc0ae2d2fe2855b4376c80ccadee02d
-SIZE (vegastrike-linux-0.5.0.tar.bz2) = 520498096
+SHA256 (vegastrike-data-0.5.1.r1.tar.bz2) = b9c457f303fda7970d89338a7ff6c17c945420c9952cc7c1c2f3ab39a3dd381d
+SIZE (vegastrike-data-0.5.1.r1.tar.bz2) = 447919499

Modified: head/games/vegastrike/Makefile
==============================================================================
--- head/games/vegastrike/Makefile	Thu Nov 29 09:22:55 2012	(r307957)
+++ head/games/vegastrike/Makefile	Thu Nov 29 09:41:47 2012	(r307958)
@@ -1,18 +1,13 @@
-# New ports collection makefile for:	vegastrike
-# Date created:		05 May 2008
-# Whom:			Dmitry Marakasov <amdmi3 at amdmi3.ru>
-#
+# Created by: Dmitry Marakasov <amdmi3 at amdmi3.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	vegastrike
-PORTVERSION=	0.5.0
-PORTREVISION=	19
+PORTVERSION=	0.5.1.r1
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/OldFiles
-DISTNAME=	vegastrike-source-${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/0.5.1/
+DISTNAME=	vegastrike-src-${PORTVERSION}
 
-MAINTAINER=	amdmi3 at FreeBSD.org
+MAINTAINER=	rnejdl at ringofsaturn.com
 COMMENT=	Opensource 3D space simulator
 
 RUN_DEPENDS=	${DATADIR}/vegastrike.ico:${PORTSDIR}/games/vegastrike-data
@@ -27,12 +22,11 @@ USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_SDL=	sdl
 USE_XORG=	sm ice xi x11 xext xrender xinerama xi xrandr xcursor \
-		xcomposite xdamage xfixes 
+		xcomposite xdamage xfixes
 USE_GL=		gl glu glut
 USE_GNOME=	gtk20
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 MAKE_JOBS_SAFE=	yes
 
 # cegui and ffmpeg are not used yet
@@ -42,25 +36,23 @@ CONFIGURE_ARGS=	--disable-cegui --disabl
 
 PLIST_FILES=	bin/vegastrike bin/vssetup bin/vegaserver
 
-.if !defined(NOPORTDOCS)
 PORTDOCS=	README
-.endif
 
-OPTIONS=	MESHER "Enable mesher modelling tool" off
+OPTIONS_DEFINE=	MESHER
+MESHER_DESC=	Enable mesher modelling tool
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_MESHER)
-CONFIGURE_ARGS+=	--disable-ogre
-.else
+.if ${OSVERSION} < 800000
+BROKEN=		fails to build on 7.x
+.endif
+
+.if ${PORT_OPTIONS:MMESHER}
 PLIST_FILES+=	bin/mesher
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libOgreMain.so:${PORTSDIR}/graphics/ogre3d
 RUN_DEPENDS+=		${LOCALBASE}/lib/libOgreMain.so:${PORTSDIR}/graphics/ogre3d
-.endif
-
-.if (${OSVERSION} >= 800501 && ${OSVERSION} < 900000) || ${OSVERSION} >= 900006
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src-cmd-basecomputer.cpp \
-		${FILESDIR}/extra-patch-src-vsfilesystem.cpp
+.else
+CONFIGURE_ARGS+=	--disable-ogre
 .endif
 
 post-patch:
@@ -71,15 +63,12 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vegaserver ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/vegastrike ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/vssetup ${PREFIX}/bin
-.if !defined(WITHOUT_MESHER)
+.if ${PORT_OPTIONS:MMESHER}
 	${INSTALL_PROGRAM} ${WRKSRC}/mesher ${PREFIX}/bin
 .endif
-
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
 post-install:

Modified: head/games/vegastrike/distinfo
==============================================================================
--- head/games/vegastrike/distinfo	Thu Nov 29 09:22:55 2012	(r307957)
+++ head/games/vegastrike/distinfo	Thu Nov 29 09:41:47 2012	(r307958)
@@ -1,2 +1,2 @@
-SHA256 (vegastrike-source-0.5.0.tar.bz2) = e4fe2aeeece103d87ae11ca8b27e48b72cc7ed8a0c1bed44e7131afd644fde72
-SIZE (vegastrike-source-0.5.0.tar.bz2) = 9093178
+SHA256 (vegastrike-src-0.5.1.r1.tar.bz2) = 5ef8bc4906746183f3b13fe7054fa37dee7672cf5749d1044ea511a85d2af125
+SIZE (vegastrike-src-0.5.1.r1.tar.bz2) = 10875771