Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 02 Sep 2012 22:38:41 +0200
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        jgh@FreeBSD.org
Subject:   ports/171261: [PATCH] games/3dpong: Makefile changed, OptionsNG, take maintainership
Message-ID:  <20120902203845.55B0A1065689@hub.freebsd.org>
Resent-Message-ID: <201209022040.q82KeAvE015790@freefall.freebsd.org>

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

>Number:         171261
>Category:       ports
>Synopsis:       [PATCH] games/3dpong: 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 20:40:09 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:

Added

- MASTER_SITES=<>ftp://ftp.tuxpaint.org/unix/x/3dpong/src
- Pixmaps http://www.newbreedsoftware.com/images/prodicons/:icons
- MAN6=		${PORTNAME}.6
- PLIST_FILES=
- PLIST_DIRS=
- PORTDATA=	*
- PORTDOCS=
- Examples
- OptionsNG

- Take maintainership

Removed file(s):
- pkg-plist

Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- 3dpong-0.5_3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/games/3dpong/Makefile ./Makefile
--- /usr/ports/games/3dpong/Makefile	2011-12-14 22:29:12.000000000 +0100
+++ ./Makefile	2012-09-02 22:02:03.000000000 +0200
@@ -1,18 +1,18 @@
-# New ports collection makefile for:	3dpong
-# Date created:				10 March 1998
-# Whom:					Andrey Zakhvatov
-#
 # $FreeBSD: ports/games/3dpong/Makefile,v 1.21 2011/12/14 21:29:12 crees Exp $
-#
 
 PORTNAME=	3dpong
 PORTVERSION=	0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.billsgames.com/unix/x/3dpong/src/
+MASTER_SITES=	ftp://ftp.tuxpaint.org/unix/x/3dpong/src/ \
+		ftp://ftp.billsgames.com/unix/x/3dpong/src/ \
+		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=	X Window 3D Pong game for 1 or 2 players with a ball and paddles
+MAINTAINER=	nemysis@gmx.ch
+COMMENT=	X Window 3D Pong game for 1 or 2 players
 
 LICENSE=	GPLv2
 
@@ -21,19 +21,43 @@
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		XLIB="-L${LOCALBASE}/lib -lX11"
 
+MAN6=		${PORTNAME}.6
+
+PLIST_FILES=	bin/${PORTNAME} \
+		share/pixmaps/${PORTNAME}.gif \
+		share/examples/${PORTNAME}/${PORTNAME}-handball.sh \
+		share/examples/${PORTNAME}/${PORTNAME}-vs-computer.sh
+PLIST_DIRS=	share/examples/${PORTNAME}
+
+PORTDATA=	*
+PORTDOCS=	AUTHORS.txt CHANGES.txt README.txt TODO.txt
+
+.include <bsd.port.options.mk>
+
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|cat sounds/|cat ${DATADIR}/|g' ${WRKSRC}/src/3dpong.c
+	@${REINPLACE_CMD} -e 's|cat sounds/|cat ${DATADIR}/|g' ${WRKSRC}/src/3dpong.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/3dpong ${PREFIX}/bin
-	@${MKDIR} ${DATADIR}
+# Executable
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+
+# Data
+	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/sounds/*.au ${DATADIR}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in AUTHORS.txt CHANGES.txt INSTALL.txt README.txt TODO.txt
-	${INSTALL_DATA} ${WRKSRC}/docs/${file} ${DOCSDIR}
-.endfor
+	${INSTALL_MAN} ${WRKSRC}/src/${MAN6} ${MAN1PREFIX}/man/man6
+
+# Pixmaps
+	${INSTALL_DATA} ${DISTDIR}/${PORTNAME}.gif ${PREFIX}/share/pixmaps/
+
+# Documentation
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+.  for f in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCSDIR}
+.  endfor
 .endif
 
+# Examples
+	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
+
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/games/3dpong/distinfo ./distinfo
--- /usr/ports/games/3dpong/distinfo	2011-07-03 16:23:22.000000000 +0200
+++ ./distinfo	2012-09-02 21:33:50.000000000 +0200
@@ -1,2 +1,4 @@
 SHA256 (3dpong-0.5.tar.gz) = b1557818319f482c1e0795192f013ecf998c9f1013033b542676d1bf743a6bc5
 SIZE (3dpong-0.5.tar.gz) = 37004
+SHA256 (3dpong.gif) = 52524304fd79bb31740ac59a6ce249cc8461112adca0e4f3ab57ff4ab5623a1f
+SIZE (3dpong.gif) = 321
diff -ruN --exclude=CVS /usr/ports/games/3dpong/pkg-plist ./pkg-plist
--- /usr/ports/games/3dpong/pkg-plist	2004-07-14 14:21:19.000000000 +0200
+++ ./pkg-plist	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-bin/3dpong
-%%DATADIR%%/hit.au
-%%DATADIR%%/score.au
-%%DATADIR%%/wall.au
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.txt
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL.txt
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
-%%PORTDOCS%%%%DOCSDIR%%/TODO.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%
--- 3dpong-0.5_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?20120902203845.55B0A1065689>