Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 25 Sep 2009 11:50:52 GMT
From:      Ganael Laplanche <ganael.laplanche@martymac.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/139131: Port fix: games/afternoonstalker - update + fix build with new flatzebra
Message-ID:  <200909251150.n8PBoqKx055279@www.freebsd.org>
Resent-Message-ID: <200909251200.n8PC08Hr033480@freefall.freebsd.org>

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

>Number:         139131
>Category:       ports
>Synopsis:       Port fix: games/afternoonstalker - update + fix build with new flatzebra
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 25 12:00:08 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Ganael Laplanche
>Release:        9.0-CURRENT
>Organization:
http://contribs.martymac.org
>Environment:
FreeBSD laptop.martymac.com 9.0-CURRENT FreeBSD 9.0-CURRENT #3: Wed Sep  9 12:33:31 UTC 2009     martymac@laptop.martymac.com:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
This patch fixes build against the new version of flatzebra and brings the following changes :

- remove unused dependency to gengameng
- port is now DATADIR safe
- better handling of PORTDOCS
- take maintainership of the port
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -aurN afternoonstalker.orig/Makefile afternoonstalker/Makefile
--- afternoonstalker.orig/Makefile	2009-09-24 08:38:38.924463793 +0000
+++ afternoonstalker/Makefile	2009-09-24 18:38:57.528952701 +0000
@@ -6,30 +6,32 @@
 #
 
 PORTNAME=	afternoonstalker
-PORTVERSION=	1.1.1
-PORTREVISION=	5
+PORTVERSION=	1.1.2
 CATEGORIES=	games
-MASTER_SITES=	http://www3.sympatico.ca/sarrazip/dev/
+MASTER_SITES=	http://perso.b2b2c.ca/sarrazip/dev/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ganael.laplanche@martymac.com
 COMMENT=	A clone of the 1981 Night Stalker video game
 
-LIB_DEPENDS=	gengameng.4:${PORTSDIR}/devel/gengameng \
-		flatzebra-0.1.2:${PORTSDIR}/devel/flatzebra
+LIB_DEPENDS=	flatzebra-0.1.2:${PORTSDIR}/devel/flatzebra
 
 USE_SDL=	mixer sdl
 GNU_CONFIGURE=	yes
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN6=		afternoonstalker.6
-
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
-
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+PORTDOCS=	AUTHORS COPYING INSTALL NEWS README THANKS TODO
 
 post-patch:
-	${REINPLACE_CMD} "s@sounds/..PACKAGE.@afternoonstalker/sounds@g" \
+	@${REINPLACE_CMD} -e 's|^pkgsounddir =.*|pkgsounddir = ${DATADIR}/sounds|' \
 		${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|docdir = .*|docdir = ${DOCSDIR}|' \
+		${WRKSRC}/Makefile.in
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e '/^install-data-am/s|install-docDATA||' \
+		${WRKSRC}/Makefile.in
+.endif
 
 .include <bsd.port.mk>
diff -aurN afternoonstalker.orig/distinfo afternoonstalker/distinfo
--- afternoonstalker.orig/distinfo	2009-09-24 08:38:38.922464307 +0000
+++ afternoonstalker/distinfo	2009-09-24 08:39:49.013244909 +0000
@@ -1,3 +1,3 @@
-MD5 (afternoonstalker-1.1.1.tar.gz) = 09a6c7204a38c621dacc6a858f5abb19
-SHA256 (afternoonstalker-1.1.1.tar.gz) = 7c0c2829968ec1673d798ec412cd65620a2856aefe92c1f7c2f8cac3fb0010ca
-SIZE (afternoonstalker-1.1.1.tar.gz) = 193895
+MD5 (afternoonstalker-1.1.2.tar.gz) = 5ddaac5e13c2ab2888826911aa81e203
+SHA256 (afternoonstalker-1.1.2.tar.gz) = 9531164e0f4d9876498c75b6b174e8a50e5e1861517002f431e14972df423f70
+SIZE (afternoonstalker-1.1.2.tar.gz) = 193791
diff -aurN afternoonstalker.orig/files/patch-src__sdlmain.cpp afternoonstalker/files/patch-src__sdlmain.cpp
--- afternoonstalker.orig/files/patch-src__sdlmain.cpp	2009-09-24 08:38:38.901464920 +0000
+++ afternoonstalker/files/patch-src__sdlmain.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
---- src/sdlmain.cpp.orig	Tue Oct 18 13:24:24 2005
-+++ src/sdlmain.cpp	Tue Oct 18 13:25:35 2005
-@@ -27,6 +27,7 @@
- #include <time.h>
- #include <stdio.h>
- 
-+#undef HAVE_GETOPT_LONG
- #ifdef HAVE_GETOPT_LONG
-     #include <getopt.h>
- #endif
diff -aurN afternoonstalker.orig/pkg-plist afternoonstalker/pkg-plist
--- afternoonstalker.orig/pkg-plist	2009-09-24 08:38:38.921464739 +0000
+++ afternoonstalker/pkg-plist	2009-09-25 07:21:35.473217964 +0000
@@ -1,26 +1,17 @@
 bin/afternoonstalker
-share/afternoonstalker/level1.set
-share/afternoonstalker/level2.set
-share/afternoonstalker/sounds/bat-killed.wav
-share/afternoonstalker/sounds/bomb-explodes.wav
-share/afternoonstalker/sounds/gun-pickup.wav
-share/afternoonstalker/sounds/new-life.wav
-share/afternoonstalker/sounds/player-bullet.wav
-share/afternoonstalker/sounds/player-hit.wav
-share/afternoonstalker/sounds/robot-bullet.wav
-share/afternoonstalker/sounds/robot-hit.wav
-share/afternoonstalker/sounds/shooting-blanks.wav
-share/afternoonstalker/sounds/spider-killed.wav
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/README
-%%DOCSDIR%%/THANKS
-%%DOCSDIR%%/TODO
-share/pixmaps/afternoonstalker.png
 share/applications/afternoonstalker.desktop
-@dirrm %%DOCSDIR%%
-@dirrm share/afternoonstalker/sounds
-@dirrm share/afternoonstalker
+share/pixmaps/afternoonstalker.png
+%%DATADIR%%/level1.set
+%%DATADIR%%/level2.set
+%%DATADIR%%/sounds/bat-killed.wav
+%%DATADIR%%/sounds/gun-pickup.wav
+%%DATADIR%%/sounds/new-life.wav
+%%DATADIR%%/sounds/player-bullet.wav
+%%DATADIR%%/sounds/player-hit.wav
+%%DATADIR%%/sounds/robot-bullet.wav
+%%DATADIR%%/sounds/robot-hit.wav
+%%DATADIR%%/sounds/shooting-blanks.wav
+%%DATADIR%%/sounds/spider-killed.wav
+@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%
 @dirrmtry share/applications


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



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