Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 02 Sep 2012 23:52:49 +0200
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        jgh@FreeBSD.org
Subject:   ports/171264: [PATCH] games/icbm3d: Makefile changed, OptionsNG, take maintainership
Message-ID:  <20120902215252.B175D1065670@hub.freebsd.org>
Resent-Message-ID: <201209022200.q82M0PaF099206@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         171264
>Category:       ports
>Synopsis:       [PATCH] games/icbm3d: Makefile changed, OptionsNG, take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 02 22:00:25 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC
>Description:

Makefile changed:

- MASTER_SITES=	ftp://ftp.tuxpaint.org/unix/x/icbm3d/
- Pixmaps http://www.newbreedsoftware.com/images/prodicons/:icons
- COMMENT=	Inter-Continental Ballistic Missiles, 3D
- PLIST_FILES=
- PORTDOCS=
- OptionsNG

- Take maintainership

Added file(s):
- files/patch-makefile

Removed file(s):
- files/patch-aa
- pkg-plist

Generated and tested manually, tested with port test and with RedPorts (all RELEASES), sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- icbm3d-0.4_3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/games/icbm3d/Makefile ./Makefile
--- /usr/ports/games/icbm3d/Makefile	2008-04-19 19:49:11.000000000 +0200
+++ ./Makefile	2012-09-02 23:10:28.000000000 +0200
@@ -1,30 +1,43 @@
-# New ports collection makefile for:	icbm3d
-# Date created:				20 March 1998
-# Whom:					Andrey Zakhvatov
-#
 # $FreeBSD: ports/games/icbm3d/Makefile,v 1.14 2008/04/19 17:49:11 miwi Exp $
-#
 
 PORTNAME=	icbm3d
 PORTVERSION=	0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.billsgames.com/unix/x/icbm3d/
-DISTNAME=	${PORTNAME}.${PORTVERSION}
+MASTER_SITES=	ftp://ftp.tuxpaint.org/unix/x/icbm3d/  \
+		ftp://ftp.billsgames.com/unix/x/icbm3d/ \
+		http://www.newbreedsoftware.com/images/prodicons/:icons
+DISTFILES=	${PORTNAME}.${DISTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}.gif:icons
+EXTRACT_ONLY=	${PORTNAME}.${DISTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	"Inter-Continental Ballistic Missiles, 3D" - 3D game of defense
+MAINTAINER=	nemysis@gmx.ch
+COMMENT=	Inter-Continental Ballistic Missiles, 3D
 
 WRKSRC=		${WRKDIR}/icbm3d
+
 USE_XORG=	x11
 MAKEFILE=	makefile
-ALL_TARGET=	icbm3d
+ALL_TARGET=	${PORTNAME}
+
+PLIST_FILES=	bin/${PORTNAME} \
+		share/pixmaps/${PORTNAME}.gif
+
+PORTDOCS=	README.txt
+
+.include <bsd.port.options.mk>
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/icbm3d ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/icbm3d
-	${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/icbm3d
+# Executable
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+
+# Pixmaps
+	${INSTALL_DATA} ${DISTDIR}/${PORTNAME}.gif ${PREFIX}/share/pixmaps/
+
+# Documentation
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/games/icbm3d/distinfo ./distinfo
--- /usr/ports/games/icbm3d/distinfo	2011-07-03 16:24:06.000000000 +0200
+++ ./distinfo	2012-09-02 22:40:14.000000000 +0200
@@ -1,2 +1,4 @@
 SHA256 (icbm3d.0.4.tar.gz) = 9ad41c154ef47695771a26875d5415bcedcb139352b1e2175f386d206b0038fd
 SIZE (icbm3d.0.4.tar.gz) = 31187
+SHA256 (icbm3d.gif) = e5d6d45ee11ff669414ac2e22943a0786b62b72035884a06abd5f12dcd0d5f15
+SIZE (icbm3d.gif) = 1024
diff -ruN --exclude=CVS /usr/ports/games/icbm3d/files/patch-aa ./files/patch-aa
--- /usr/ports/games/icbm3d/files/patch-aa	2008-04-19 19:49:11.000000000 +0200
+++ ./files/patch-aa	1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
---- makefile	Fri Jul 31 04:41:20 1998
-+++ /home/andy/tmp/wrk/makefile	Mon Aug 10 18:40:01 1998
-@@ -9,14 +9,16 @@
- 
- # Makefile user-definable variables------------------------------------------
- 
--CC=gcc
-+CC?=gcc
-+PREFIX?=/usr/X11R6
-+LOCALBASE?=/usr/X11R6
- MATHLIB=-lm
- 
- INSTALLROOT=$(PREFIX)
- LANGUAGE=english
- 
--XLIB=-L$(PREFIX)/lib -lX11 #-lcompat
--CFLAGS=-I$(PREFIX)/include -O2
-+XLIB=-L$(LOCALBASE)/lib -lX11 #-lcompat
-+CFLAGS+=-I$(LOCALBASE)/include
- 
- 
- # End of makefile user-definable variables-----------------------------------
diff -ruN --exclude=CVS /usr/ports/games/icbm3d/files/patch-makefile ./files/patch-makefile
--- /usr/ports/games/icbm3d/files/patch-makefile	1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-makefile	2012-09-02 23:21:45.000000000 +0200
@@ -0,0 +1,22 @@
+--- makefile.orig	1998-07-31 06:41:20.000000000 +0200
++++ makefile	2012-09-02 23:21:36.000000000 +0200
+@@ -9,14 +9,16 @@
+ 
+ # Makefile user-definable variables------------------------------------------
+ 
+-CC=gcc
++CC?=g++
++PREFIX?=/usr/local
++LOCALBASE?=/usr/local
+ MATHLIB=-lm
+ 
+ INSTALLROOT=$(PREFIX)
+ LANGUAGE=english
+ 
+-XLIB=-L$(PREFIX)/lib -lX11 #-lcompat
+-CFLAGS=-I$(PREFIX)/include -O2
++XLIB=-L$(LOCALBASE)/lib -lX11 #-lcompat
++CFLAGS+=-I$(LOCALBASE)/include
+ 
+ 
+ # End of makefile user-definable variables-----------------------------------
diff -ruN --exclude=CVS /usr/ports/games/icbm3d/pkg-descr ./pkg-descr
--- /usr/ports/games/icbm3d/pkg-descr	2000-04-02 02:58:40.000000000 +0200
+++ ./pkg-descr	2012-09-02 23:12:57.000000000 +0200
@@ -1,14 +1,16 @@
-   Like the original "Missile Command" and its clones, this game
-places  you  in  control  of  Anti-ICBM weapons which you use to 
-destroy  an  onslaught of missiles (and other nasties) which are 
-dropping onto your nation.
-   The game ends when your cities have all  been  destroyed. You 
-only   gain   replacement   cities  by  acheiving  certain score
-thresholds during each attack (level).
-   The main difference between this game and  Missile Command is
-that ICBM3D, as the name  suggests,  provides  a 3D perspective. 
-You take advantage of X-Window's  3-button mouse to control your
-firing  sight  ("cross-hair")  in  3-dimensions, and change your 
-viewpoint.
+ICBM3D ("Inter-Continental Ballistic Missiles, 3D") is a 3D game of defense.
+
+Like the original "Missile Command" and its clones, this game places you in
+control of Anti-ICBM weapons which you use to destroy an onslaught of
+missiles (and other nasties) which are dropping onto your nation.
+
+The game ends when your cities have all been destroyed. You only gain
+replacement cities by acheiving certain score thresholds during each attack
+(level).
+
+The main difference between this game and Missile Command is that ICBM3D,
+as the name suggests, provides a 3D perspective. You take advantage of
+X-Window's 3-button mouse to control your firing sight ("cross-hair")
+in 3-dimensions, and change your viewpoint.
 
 WWW: http://www.newbreedsoftware.com/icbm3d/
diff -ruN --exclude=CVS /usr/ports/games/icbm3d/pkg-plist ./pkg-plist
--- /usr/ports/games/icbm3d/pkg-plist	2001-12-24 03:14:53.000000000 +0100
+++ ./pkg-plist	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-bin/icbm3d
-%%PORTDOCS%%share/doc/icbm3d/README.txt
-%%PORTDOCS%%@dirrm share/doc/icbm3d
--- icbm3d-0.4_3.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



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