Attachment #127063 for bug #170837

Lines 7-33 Link Here

(-)./Makefile (-15 / +34 lines)
7		7
8	PORTNAME= vectoroids	8	PORTNAME= vectoroids
9	PORTVERSION= 1.1.0	9	PORTVERSION= 1.1.0
10	PORTREVISION= 13	10	PORTREVISION= 14
11	CATEGORIES= games	11	CATEGORIES= games
12	MASTER_SITES= ftp://ftp.billsgames.com/unix/x/vectoroids/src/	12	MASTER_SITES= ftp://ftp.tuxpaint.org/unix/x/vectoroids/src/ \
		13	ftp://ftp.billsgames.com/unix/x/vectoroids/src/
13		14
14	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= nemysis@gmx.ch
15	COMMENT= A vector-based, pretty, Asteroids clone	16	COMMENT= Vector-based rock-shooting game similar to Asteroids
		17
		18	LICENSE= GPLv2
16		19
17	USE_SDL= image mixer sdl
18	USE_GMAKE= yes	20	USE_GMAKE= yes
		21	USE_SDL= image mixer sdl
		22
		23	PLIST_FILES= bin/${PORTNAME} \
		24	share/pixmaps/${PORTNAME}.png
		25
		26	MAN6= ${PORTNAME}.6
		27
		28	PORTDATA= *
		29	PORTDOCS= CHANGES.txt README.txt
		30
		31	.include <bsd.port.options.mk>
19		32
20	do-install:	33	do-install:
21	${INSTALL_PROGRAM} ${WRKSRC}/vectoroids ${PREFIX}/bin	34	# Executable
22	@${MKDIR} ${DATADIR}/images	35	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
23	${INSTALL_DATA} ${WRKSRC}/data/images/* ${DATADIR}/images	36
24	@${MKDIR} ${DATADIR}/music	37	# Data
25	${INSTALL_DATA} ${WRKSRC}/data/music/* ${DATADIR}/music	38	(cd ${WRKSRC}/data && ${COPYTREE_SHARE} "images music sounds" ${DATADIR})
26	@${MKDIR} ${DATADIR}/sounds	39
27	${INSTALL_DATA} ${WRKSRC}/data/sounds/* ${DATADIR}/sounds	40	# Pixmaps
28	.if !defined(NOPORTDOCS)	41	${INSTALL_DATA} ${WRKSRC}/data/images/icon.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
29	@${MKDIR} ${DOCSDIR}	42
30	${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR}/README	43	# Documentation
		44	.if ${PORT_OPTIONS:MDOCS}
		45	${MKDIR} ${DOCSDIR}
		46	. for f in ${PORTDOCS}
		47	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
		48	. endfor
31	.endif	49	.endif
		50	${INSTALL_MAN} ${WRKSRC}/${MAN6} ${MAN6PREFIX}/man/man6
32		51
33	.include <bsd.port.mk>	52	.include <bsd.port.mk>




--- Makefile.orig	Sun Apr 14 09:51:14 2002
+++ Makefile	Wed Aug 27 22:16:03 2003
@@ -9,19 +9,18 @@
 # November 30, 2001 - April 13, 2002
 
 
-PREFIX=/usr/local
 MAN_PREFIX=$(PREFIX)
 BIN_PREFIX=$(PREFIX)/bin
 DATA_PREFIX=$(PREFIX)/share/vectoroids/
 JOY=YES
 TARGET_DEF=LINUX
-SDL_LIB=$(shell sdl-config --libs) $(MIXER) -lSDL_image
+SDL_LIB=$(shell $(SDL_CONFIG) --libs) $(MIXER) -lSDL_image
 
 NOSOUNDFLAG=__SOUND
 MIXER=-lSDL_mixer
 
-CFLAGS=-Wall -Wno-long-long -pedantic -ansi -O2 \
-	$(shell sdl-config --cflags) -D$(NOSOUNDFLAG) \
+CFLAGS+= \
+	$(shell $(SDL_CONFIG) --cflags) -D$(NOSOUNDFLAG) \
 	-DDATA_PREFIX=\"$(DATA_PREFIX)\" -DJOY_$(JOY) -D$(TARGET_DEF)
 
 

Lines 1-4 Link Here

(-)./pkg-descr (-2 / +4 lines)
1	Vectoroids is an SDL Asteroids clone, with quick game-play and pretty	1	Vectoroids is a vector-based rock-shooting game similar to the
2	good graphics.	2	arcade classic "Asteroids". It is an SDL game based on the source for
		3	"Agendaroids", an X-Window game written for the Agenda VR3 Linux-based PDA
		4	written by the same author.
3		5
4	WWW: http://www.newbreedsoftware.com/vectoroids/	6	WWW: http://www.newbreedsoftware.com/vectoroids/




bin/vectoroids
%%PORTDOCS%%%%DOCSDIR%%/README
%%DATADIR%%/images/icon.png
%%DATADIR%%/images/redspot-e.bmp
%%DATADIR%%/images/redspot.jpg
%%DATADIR%%/music/decision.s3m
%%DATADIR%%/music/decision.txt
%%DATADIR%%/sounds/ast1.wav
%%DATADIR%%/sounds/ast2.wav
%%DATADIR%%/sounds/ast3.wav
%%DATADIR%%/sounds/ast4.wav
%%DATADIR%%/sounds/bullet.wav
%%DATADIR%%/sounds/explode.wav
%%DATADIR%%/sounds/extralife.wav
%%DATADIR%%/sounds/gameover.wav
%%DATADIR%%/sounds/thrust.wav
@dirrm %%DATADIR%%/sounds
@dirrm %%DATADIR%%/music
@dirrm %%DATADIR%%/images
@dirrm %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 170837

Lines 1-25 Link Here

(-)./files/patch-Makefile (-25 lines)
1	--- Makefile.orig Sun Apr 14 09:51:14 2002
2	+++ Makefile Wed Aug 27 22:16:03 2003
3	@@ -9,19 +9,18 @@
4	# November 30, 2001 - April 13, 2002
5
6
7	-PREFIX=/usr/local
8	MAN_PREFIX=$(PREFIX)
9	BIN_PREFIX=$(PREFIX)/bin
10	DATA_PREFIX=$(PREFIX)/share/vectoroids/
11	JOY=YES
12	TARGET_DEF=LINUX
13	-SDL_LIB=$(shell sdl-config --libs) $(MIXER) -lSDL_image
14	+SDL_LIB=$(shell $(SDL_CONFIG) --libs) $(MIXER) -lSDL_image
15
16	NOSOUNDFLAG=__SOUND
17	MIXER=-lSDL_mixer
18
19	-CFLAGS=-Wall -Wno-long-long -pedantic -ansi -O2 \
20	- $(shell sdl-config --cflags) -D$(NOSOUNDFLAG) \
21	+CFLAGS+= \
22	+ $(shell $(SDL_CONFIG) --cflags) -D$(NOSOUNDFLAG) \
23	-DDATA_PREFIX=\"$(DATA_PREFIX)\" -DJOY_$(JOY) -D$(TARGET_DEF)
24
25

Lines 1-21 Link Here

(-)./pkg-plist (-21 lines)
1	bin/vectoroids
2	%%PORTDOCS%%%%DOCSDIR%%/README
3	%%DATADIR%%/images/icon.png
4	%%DATADIR%%/images/redspot-e.bmp
5	%%DATADIR%%/images/redspot.jpg
6	%%DATADIR%%/music/decision.s3m
7	%%DATADIR%%/music/decision.txt
8	%%DATADIR%%/sounds/ast1.wav
9	%%DATADIR%%/sounds/ast2.wav
10	%%DATADIR%%/sounds/ast3.wav
11	%%DATADIR%%/sounds/ast4.wav
12	%%DATADIR%%/sounds/bullet.wav
13	%%DATADIR%%/sounds/explode.wav
14	%%DATADIR%%/sounds/extralife.wav
15	%%DATADIR%%/sounds/gameover.wav
16	%%DATADIR%%/sounds/thrust.wav
17	@dirrm %%DATADIR%%/sounds
18	@dirrm %%DATADIR%%/music
19	@dirrm %%DATADIR%%/images
20	@dirrm %%DATADIR%%
21	%%PORTDOCS%%@dirrm %%DOCSDIR%%