ports/173368: [PATCH] games/glmaze: OptionsNG, changed Makefile, added Desktop entries, take maintainership

Mon Nov 5 01:50:01 UTC 2012

>Number:         173368
>Category:       ports
>Synopsis:       [PATCH] games/glmaze: OptionsNG, changed Makefile, added Desktop entries, 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:   Mon Nov 05 01:50:00 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:

- Take maintainership

Makefile changed:
+		SF/nemysisfreebsdp/:icons
+DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}.png:icons
+DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
+LICENSE=	GPLv2
+PORTDOCS=	TODO readme.txt
+DESKTOP_ENTRIES=
+.include <bsd.port.options.mk>

Changed and refined:
 post-patch:
+post-install:
files/patch-*
pkg-descr
pkg-plist

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

portlint -A
looks fine.

port test: clean

Build log

https://redports.org/buildarchive/20121105005232-53542/

>Fix:

--- glmaze-1.1a_9.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/games/glmaze/Makefile ./Makefile
--- /usr/ports/games/glmaze/Makefile	2012-02-18 11:17:52.000000000 +0100
+++ ./Makefile	2012-11-05 01:47:31.000000000 +0100
@@ -6,20 +6,45 @@
 
 PORTNAME=	glmaze
 PORTVERSION=	1.1a
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/ \
+		SF/nemysisfreebsdp/:icons
+DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}.png:icons
+DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	nemysis at gmx.ch
 COMMENT=	Multiplayer OpenGL Maze Game
 
-USE_GL=		gl
-USE_SDL=	mixer sdl
+LICENSE=	GPLv2
+
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-MAN1=		glmaze.1
+USE_GL=		glu
+USE_SDL=	mixer sdl
+MAKE_JOBS_SAFE=	yes
+
+MAN6=	${PORTNAME}.6
+
+PORTDOCS=	TODO readme.txt
+
+DESKTOP_ENTRIES="glMaze" "${COMMENT}" "${PORTNAME}" \
+		"${PORTNAME}" "Game;ArcadeGame;" ${FALSE}
+
+.include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/shot.c
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/shot.c
+	@(cd ${WRKSRC} && ${MV} glmaze.1 glmaze.6)
+
+post-install:
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}.png ${PREFIX}/share/pixmaps
+
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/games/glmaze/distinfo ./distinfo
--- /usr/ports/games/glmaze/distinfo	2011-07-03 16:23:59.000000000 +0200
+++ ./distinfo	2012-11-05 01:38:38.000000000 +0100
@@ -1,2 +1,4 @@
-SHA256 (glmaze-1.1a.tar.gz) = 39cdb8a3231f03d56f3583f6ad306f9c180112de8ce9fb26db5ebbb1d6ac5037
-SIZE (glmaze-1.1a.tar.gz) = 588179
+SHA256 (glmaze/glmaze-1.1a.tar.gz) = 39cdb8a3231f03d56f3583f6ad306f9c180112de8ce9fb26db5ebbb1d6ac5037
+SIZE (glmaze/glmaze-1.1a.tar.gz) = 588179
+SHA256 (glmaze/glmaze.png) = 34facdd5f8c919ceab8fbdbfcac7becd60681e2c468a0ca4b31c6783d5119bca
+SIZE (glmaze/glmaze.png) = 3632
diff -ruN --exclude=CVS /usr/ports/games/glmaze/files/patch-Makefile ./files/patch-Makefile
--- /usr/ports/games/glmaze/files/patch-Makefile	2008-04-19 19:49:05.000000000 +0200
+++ ./files/patch-Makefile	2012-11-05 01:25:46.000000000 +0100
@@ -1,8 +1,8 @@
---- Makefile.orig	Wed Jan 23 06:44:46 2002
-+++ Makefile	Tue Jun 17 23:14:54 2003
+--- Makefile.orig	2002-01-23 15:44:46.000000000 +0100
++++ Makefile	2012-11-05 01:25:37.000000000 +0100
 @@ -1,17 +1,17 @@
 -CC = gcc -O2 -ffast-math -Wall
-+#CC = gcc -O2 -ffast-math -Wall
++CC ?= gcc -O2 -ffast-math -Wall
  
  VERSION = "1.1a"
  
@@ -10,16 +10,17 @@
 +DESTPATH = ${PREFIX}
  BINPATH = $(DESTPATH)/bin
 -GAMEPATH = $(DESTPATH)/games/glMaze
+-MANPATH = $(DESTPATH)/man/man1
 +GAMEPATH = $(DESTPATH)/share/glmaze
- MANPATH = $(DESTPATH)/man/man1
++MANPATH = $(DESTPATH)/man/man6
  
  OBJECTS = load_maze.o main.o controls.o shot.o player.o net.o \
  	  username.o radar.o prefs.o sound.o
  
 -SDL_FLAGS=`sdl-config --cflags`
 -SDL_LIBS=`sdl-config --libs`
-+SDL_FLAGS=`sdl-config --cflags`
-+SDL_LIBS=`sdl-config --libs`
++SDL_FLAGS=`$(SDL_CONFIG) --cflags`
++SDL_LIBS=`$(SDL_CONFIG) --libs`
  
  # comment the follwing if you don't want sound
  CC += -DSOUND
@@ -28,11 +29,20 @@
  
  .c.o:
 -	$(CC) -DVERSION=\"$(VERSION)\" $(SDL_FLAGS) -c -o $@ $<
-+	$(CC) $(CFLAGS) -I${LOCALBASE}/include -DVERSION=\"$(VERSION)\" $(SDL_FLAGS) -c -o $@ $<
++	$(CC) $(CFLAGS) -I${LOCALBASE}/include -DVERSION=\"$(VERSION)\" $(SDL_FLAGS) -c -o $@ $< 
  
  glmaze: $(OBJECTS)
 -	$(CC) $(OBJECTS) -o $@ $(SDL_LIBS) -lGL -lGLU -lm 
-+	$(CC) $(LDFLAGS) $(OBJECTS) -o $@ -L${LOCALBASE}/lib $(SDL_LIBS) -lGL -lGLU -lm 
++	$(CC) $(LDFLAGS) $(OBJECTS) -o $@ -L${LOCALBASE}/lib $(SDL_LIBS) -lGL -lGLU -lm
  
  clean:
  	@echo Cleaning up...
+@@ -48,7 +48,7 @@
+ 
+ install: glmaze
+ 	install -s glmaze $(BINPATH)
+-	install glmaze.1 $(MANPATH)
++	install glmaze.6 $(MANPATH)
+ 	install -d $(GAMEPATH)/data
+ 	install data/*.* $(GAMEPATH)/data
+ 	install -d $(GAMEPATH)/levels
diff -ruN --exclude=CVS /usr/ports/games/glmaze/files/patch-shot.c ./files/patch-shot.c
--- /usr/ports/games/glmaze/files/patch-shot.c	2003-06-06 05:18:22.000000000 +0200
+++ ./files/patch-shot.c	2012-11-05 01:45:41.000000000 +0100
@@ -1,5 +1,5 @@
---- shot.c.orig	Thu Jun  5 19:55:39 2003
-+++ shot.c	Thu Jun  5 19:56:34 2003
+--- shot.c.orig	2001-11-16 13:12:27.000000000 +0100
++++ shot.c	2012-11-05 01:45:31.000000000 +0100
 @@ -47,6 +47,7 @@
    "/usr/games/glmaze/",
    "/usr/local/games/glMaze/",
diff -ruN --exclude=CVS /usr/ports/games/glmaze/files/patch-sound.c ./files/patch-sound.c
--- /usr/ports/games/glmaze/files/patch-sound.c	2003-06-06 05:18:22.000000000 +0200
+++ ./files/patch-sound.c	2012-11-05 01:15:06.000000000 +0100
@@ -1,5 +1,5 @@
---- sound.c.orig	Thu Jun  5 19:49:36 2003
-+++ sound.c	Thu Jun  5 19:50:22 2003
+--- sound.c.orig	2001-11-16 13:22:36.000000000 +0100
++++ sound.c	2012-11-05 01:11:35.000000000 +0100
 @@ -18,7 +18,7 @@
  #include "maze.h"
  
diff -ruN --exclude=CVS /usr/ports/games/glmaze/pkg-descr ./pkg-descr
--- /usr/ports/games/glmaze/pkg-descr	2009-12-21 03:16:42.000000000 +0100
+++ ./pkg-descr	2012-11-05 01:35:34.000000000 +0100
@@ -1,4 +1,9 @@
-glMaze is a multiplayer OpenGL maze game.  Up to six players hunt
-each other online in a real 3-D maze.
+glMaze is a multiplayer maze game based on the opengl 3d graphics engine.
+If a command line argument is present, glmaze tries to interpret this as
+the server name to connect to. If no argument was given, glmaze becomes
+the master client and starts a local server. Up to six players can join
+a session. Only the master client can start the session. Other players
+can join a running game. The game stops when the first player reaches
+ten kills. The player with the top score at this moment is the winner.
 
-WWW: http://glmaze.sourceforge.net
+WWW: http://glmaze.sourceforge.net/
diff -ruN --exclude=CVS /usr/ports/games/glmaze/pkg-plist ./pkg-plist
--- /usr/ports/games/glmaze/pkg-plist	2003-06-06 05:18:22.000000000 +0200
+++ ./pkg-plist	2012-11-05 01:39:30.000000000 +0100
@@ -1,51 +1,52 @@
 bin/glmaze
-share/glmaze/data/Font.bmp
-share/glmaze/data/Star.bmp
-share/glmaze/data/bar.bmp
-share/glmaze/data/crosshair.bmp
-share/glmaze/data/hit1.bmp
-share/glmaze/data/hit2.bmp
-share/glmaze/data/hit3.bmp
-share/glmaze/data/hit4.bmp
-share/glmaze/data/hit5.bmp
-share/glmaze/data/master.bmp
-share/glmaze/data/paused.bmp
-share/glmaze/data/radar.bmp
-share/glmaze/data/shield.bmp
-share/glmaze/data/slave.bmp
-share/glmaze/data/smiley_b.bmp
-share/glmaze/data/smiley_b_icon.bmp
-share/glmaze/data/smiley_c.bmp
-share/glmaze/data/smiley_c_icon.bmp
-share/glmaze/data/smiley_g.bmp
-share/glmaze/data/smiley_g_icon.bmp
-share/glmaze/data/smiley_m.bmp
-share/glmaze/data/smiley_m_icon.bmp
-share/glmaze/data/smiley_r.bmp
-share/glmaze/data/smiley_r_icon.bmp
-share/glmaze/data/smiley_y.bmp
-share/glmaze/data/smiley_y_icon.bmp
-share/glmaze/levels/369.maz
-share/glmaze/levels/brick_b.bmp
-share/glmaze/levels/brick_c.bmp
-share/glmaze/levels/brick_d.bmp
-share/glmaze/levels/brick_g.bmp
-share/glmaze/levels/brick_m.bmp
-share/glmaze/levels/brick_r.bmp
-share/glmaze/levels/brick_y.bmp
-share/glmaze/levels/bricks.bmp
-share/glmaze/levels/complex.maz
-share/glmaze/levels/crate.bmp
-share/glmaze/levels/empty.maz
-share/glmaze/levels/floor1.bmp
-share/glmaze/levels/maze.maz
-share/glmaze/sounds/button.wav
-share/glmaze/sounds/hit.wav
-share/glmaze/sounds/kill.wav
-share/glmaze/sounds/music.mod
-share/glmaze/sounds/shot.wav
-share/glmaze/sounds/wall.wav
- at dirrm share/glmaze/sounds
- at dirrm share/glmaze/levels
- at dirrm share/glmaze/data
- at dirrm share/glmaze
+%%DATADIR%%/data/Font.bmp
+%%DATADIR%%/data/Star.bmp
+%%DATADIR%%/data/bar.bmp
+%%DATADIR%%/data/crosshair.bmp
+%%DATADIR%%/data/hit1.bmp
+%%DATADIR%%/data/hit2.bmp
+%%DATADIR%%/data/hit3.bmp
+%%DATADIR%%/data/hit4.bmp
+%%DATADIR%%/data/hit5.bmp
+%%DATADIR%%/data/master.bmp
+%%DATADIR%%/data/paused.bmp
+%%DATADIR%%/data/radar.bmp
+%%DATADIR%%/data/shield.bmp
+%%DATADIR%%/data/slave.bmp
+%%DATADIR%%/data/smiley_b.bmp
+%%DATADIR%%/data/smiley_b_icon.bmp
+%%DATADIR%%/data/smiley_c.bmp
+%%DATADIR%%/data/smiley_c_icon.bmp
+%%DATADIR%%/data/smiley_g.bmp
+%%DATADIR%%/data/smiley_g_icon.bmp
+%%DATADIR%%/data/smiley_m.bmp
+%%DATADIR%%/data/smiley_m_icon.bmp
+%%DATADIR%%/data/smiley_r.bmp
+%%DATADIR%%/data/smiley_r_icon.bmp
+%%DATADIR%%/data/smiley_y.bmp
+%%DATADIR%%/data/smiley_y_icon.bmp
+%%DATADIR%%/levels/369.maz
+%%DATADIR%%/levels/brick_b.bmp
+%%DATADIR%%/levels/brick_c.bmp
+%%DATADIR%%/levels/brick_d.bmp
+%%DATADIR%%/levels/brick_g.bmp
+%%DATADIR%%/levels/brick_m.bmp
+%%DATADIR%%/levels/brick_r.bmp
+%%DATADIR%%/levels/brick_y.bmp
+%%DATADIR%%/levels/bricks.bmp
+%%DATADIR%%/levels/complex.maz
+%%DATADIR%%/levels/crate.bmp
+%%DATADIR%%/levels/empty.maz
+%%DATADIR%%/levels/floor1.bmp
+%%DATADIR%%/levels/maze.maz
+%%DATADIR%%/sounds/button.wav
+%%DATADIR%%/sounds/hit.wav
+%%DATADIR%%/sounds/kill.wav
+%%DATADIR%%/sounds/music.mod
+%%DATADIR%%/sounds/shot.wav
+%%DATADIR%%/sounds/wall.wav
+share/pixmaps/glmaze.png
+ at dirrm %%DATADIR%%/sounds
+ at dirrm %%DATADIR%%/levels
+ at dirrm %%DATADIR%%/data
+ at dirrm %%DATADIR%%
--- glmaze-1.1a_9.patch ends here ---

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