Attachment #54100 for bug #81860

View | Details | Raw Unified | Return to bug 81860
Collapse All | Expand All




#

PORTNAME=	trackballs
PORTVERSION=	1.1.0
CATEGORIES=	games
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}


USE_X_PREFIX=	yes
USE_SDL=	image mixer sdl ttf
USE_GETTEXT=	yes
USE_GETOPT_LONG=	yes
USE_REINPLACE=	yes
USE_GMAKE=	yes
GNU_CONFIGURE=	yes
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAKE_ARGS=	mkinstalldirs="${MKDIR}"

MAN6=		${PORTNAME}.6

CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include
LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib -lintl

post-patch:
	@${FIND} ${WRKSRC} -name '*.h' -o -name '*.cc' | ${XARGS} \
		${REINPLACE_CMD} -e '/^#include/s|SDL/SDL|SDL|; \
			/stdint.h/d'
	@${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' \
		${WRKSRC}/share/icons/installIcons
	@${REINPLACE_CMD} -e 's|install -D|$$(INSTALL)|' \
		${WRKSRC}/share/Makefile.in

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)games/trackballs/distinfo (-2 / +2 lines)
1	MD5 (trackballs-1.0.0.tar.gz) = 0d3ce4903aa60fba18c0e8c02b3cd563	1	MD5 (trackballs-1.1.0.tar.gz) = 4d1c4be3274ac88038bc03e2d470546c
2	SIZE (trackballs-1.0.0.tar.gz) = 4826294	2	SIZE (trackballs-1.1.0.tar.gz) = 5674366




--- po/Makefile.in.in.orig	Wed Feb 16 02:16:34 2005
+++ po/Makefile.in.in	Fri Jun  3 03:18:21 2005
@@ -21,13 +21,13 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 datadir = @datadir@
-localedir = $(datadir)/${PACKAGE}/locale
+localedir = $(datadir)/locale
 gettextsrcdir = $(datadir)/gettext/po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
+mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
 
 GMSGFMT = @GMSGFMT@
 MSGFMT = @MSGFMT@

Line 0 Link Here

(-)games/trackballs/files/patch-src-Makefile.in (+11 lines)
	1	--- src/Makefile.in.orig Sat Mar 5 03:26:01 2005
	2	+++ src/Makefile.in Fri Jun 3 03:10:32 2005
	3	@@ -301,7 +301,7 @@
	4	EXTRA_trackballs_SOURCES = trackballsIcon.rc
	5	trackballs_LDADD = @WINRESOURCES@
	6	trackballs_DEPENDENCIES = @WINRESOURCES@
	7	-snarfcppopts = $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
	8	+snarfcppopts = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
	9	localedir = $(datadir)/locale
	10	all: all-am
	11




--- src/pipe.cc.orig	Wed Feb 23 00:10:31 2005
+++ src/pipe.cc	Fri Jun  3 02:54:26 2005
@@ -96,8 +96,8 @@
 }
 void Pipe::computeBoundingBox() {
   for(int i=0;i<3;i++) {
-	boundingBox[0][i]=fmin(from[i]-radius,to[i]-radius)-position[i];
-	boundingBox[1][i]=fmax(from[i]+radius,to[i]+radius)-position[i];
+	boundingBox[0][i]=((from[i]-radius)>(to[i]-radius)?(to[i]-radius):(from[i]-radius))-position[i];
+	boundingBox[1][i]=((from[i]+radius)>(to[i]+radius)?(from[i]+radius):(to[i]+radius))-position[i];
   }
 }
 void Pipe::onRemove() {Animated::onRemove(); pipes->erase(this);}

Lines 1-4 Link Here

(-)games/trackballs/pkg-plist (-22 / +28 lines)
1	bin/trackballs	1	bin/trackballs
		2	share/locale/de/LC_MESSAGES/trackballs.mo
		3	share/locale/it/LC_MESSAGES/trackballs.mo
		4	share/locale/sv/LC_MESSAGES/trackballs.mo
2	%%DATADIR%%/fonts/menuFont.ttf	5	%%DATADIR%%/fonts/menuFont.ttf
3	%%DATADIR%%/highScores	6	%%DATADIR%%/highScores
4	%%DATADIR%%/images/acid.png	7	%%DATADIR%%/images/acid.png
Lines 9-17 Link Here
9	%%DATADIR%%/images/difficulty2.png	12	%%DATADIR%%/images/difficulty2.png
10	%%DATADIR%%/images/difficulty2High.png	13	%%DATADIR%%/images/difficulty2High.png
11	%%DATADIR%%/images/displayHighscoreBackground.jpg	14	%%DATADIR%%/images/displayHighscoreBackground.jpg
		15	%%DATADIR%%/images/dizzy.png
12	%%DATADIR%%/images/enterHighscoreBackground.jpg	16	%%DATADIR%%/images/enterHighscoreBackground.jpg
		17	%%DATADIR%%/images/font.png
13	%%DATADIR%%/images/font.rgb	18	%%DATADIR%%/images/font.rgb
14	%%DATADIR%%/images/gamesettings.png	19	%%DATADIR%%/images/font2.png
		20	%%DATADIR%%/images/font3.png
15	%%DATADIR%%/images/glitter.png	21	%%DATADIR%%/images/glitter.png
16	%%DATADIR%%/images/header.png	22	%%DATADIR%%/images/header.png
17	%%DATADIR%%/images/help0_1024.png	23	%%DATADIR%%/images/help0_1024.png
Lines 23-55 Link Here
23	%%DATADIR%%/images/left_panel.png	29	%%DATADIR%%/images/left_panel.png
24	%%DATADIR%%/images/levelsetup.png	30	%%DATADIR%%/images/levelsetup.png
25	%%DATADIR%%/images/life.png	31	%%DATADIR%%/images/life.png
26	%%DATADIR%%/images/menu0.png
27	%%DATADIR%%/images/menu1.png
28	%%DATADIR%%/images/menu2.png
29	%%DATADIR%%/images/menu3.png
30	%%DATADIR%%/images/menu4.png
31	%%DATADIR%%/images/menuHigh0.png
32	%%DATADIR%%/images/menuHigh1.png
33	%%DATADIR%%/images/menuHigh2.png
34	%%DATADIR%%/images/menuHigh3.png
35	%%DATADIR%%/images/menuHigh4.png
36	%%DATADIR%%/images/moreHelp.png
37	%%DATADIR%%/images/moreHelpHigh.png
38	%%DATADIR%%/images/mousePointer.png	32	%%DATADIR%%/images/mousePointer.png
39	%%DATADIR%%/images/nolife.png	33	%%DATADIR%%/images/nolife.png
40	%%DATADIR%%/images/playersetup.png	34	%%DATADIR%%/images/playersetup.png
41	%%DATADIR%%/images/return2menu.png
42	%%DATADIR%%/images/return2menuHigh.png
43	%%DATADIR%%/images/sand.png	35	%%DATADIR%%/images/sand.png
44	%%DATADIR%%/images/setup1.png
45	%%DATADIR%%/images/setup2.png
46	%%DATADIR%%/images/setup3.png
47	%%DATADIR%%/images/setup4.png
48	%%DATADIR%%/images/setupBackground.jpg	36	%%DATADIR%%/images/setupBackground.jpg
49	%%DATADIR%%/images/setupTitle.png
50	%%DATADIR%%/images/splashScreen.jpg	37	%%DATADIR%%/images/splashScreen.jpg
51	%%DATADIR%%/images/start.png
52	%%DATADIR%%/images/startHigh.png
53	%%DATADIR%%/images/texture.png	38	%%DATADIR%%/images/texture.png
54	%%DATADIR%%/images/texture2.png	39	%%DATADIR%%/images/texture2.png
55	%%DATADIR%%/images/texture3.png	40	%%DATADIR%%/images/texture3.png
Lines 61-66 Link Here
61	%%DATADIR%%/levels/bonus.map	46	%%DATADIR%%/levels/bonus.map
62	%%DATADIR%%/levels/bonus.scm	47	%%DATADIR%%/levels/bonus.scm
63	%%DATADIR%%/levels/boot.scm	48	%%DATADIR%%/levels/boot.scm
		49	%%DATADIR%%/levels/boxofun.map
		50	%%DATADIR%%/levels/boxofun.scm
		51	%%DATADIR%%/levels/bx.set
		52	%%DATADIR%%/levels/bx1.map
		53	%%DATADIR%%/levels/bx1.scm
		54	%%DATADIR%%/levels/bx2.map
		55	%%DATADIR%%/levels/bx2.scm
		56	%%DATADIR%%/levels/bx3.map
		57	%%DATADIR%%/levels/bx3.scm
64	%%DATADIR%%/levels/con1.map	58	%%DATADIR%%/levels/con1.map
65	%%DATADIR%%/levels/con1.scm	59	%%DATADIR%%/levels/con1.scm
66	%%DATADIR%%/levels/con2.map	60	%%DATADIR%%/levels/con2.map
Lines 119-124 Link Here
119	%%DATADIR%%/levels/ki3.scm	113	%%DATADIR%%/levels/ki3.scm
120	%%DATADIR%%/levels/ki4.map	114	%%DATADIR%%/levels/ki4.map
121	%%DATADIR%%/levels/ki4.scm	115	%%DATADIR%%/levels/ki4.scm
		116	%%DATADIR%%/levels/ki5.map
		117	%%DATADIR%%/levels/ki5.scm
122	%%DATADIR%%/levels/lv.set	118	%%DATADIR%%/levels/lv.set
123	%%DATADIR%%/levels/lv1.map	119	%%DATADIR%%/levels/lv1.map
124	%%DATADIR%%/levels/lv1.scm	120	%%DATADIR%%/levels/lv1.scm
Lines 138-148 Link Here
138	%%DATADIR%%/levels/lv8.scm	134	%%DATADIR%%/levels/lv8.scm
139	%%DATADIR%%/levels/lv9.map	135	%%DATADIR%%/levels/lv9.map
140	%%DATADIR%%/levels/lv9.scm	136	%%DATADIR%%/levels/lv9.scm
		137	%%DATADIR%%/levels/mhm.set
		138	%%DATADIR%%/levels/mhm1.map
		139	%%DATADIR%%/levels/mhm1.scm
		140	%%DATADIR%%/levels/mhm2.map
		141	%%DATADIR%%/levels/mhm2.scm
		142	%%DATADIR%%/levels/mhm3.map
		143	%%DATADIR%%/levels/mhm3.scm
141	%%DATADIR%%/levels/tmp.map	144	%%DATADIR%%/levels/tmp.map
142	%%DATADIR%%/levels/tmp.scm	145	%%DATADIR%%/levels/tmp.scm
143	%%DATADIR%%/sfx/badpill.wav	146	%%DATADIR%%/sfx/badpill.wav
144	%%DATADIR%%/sfx/blackDie.wav	147	%%DATADIR%%/sfx/blackDie.wav
		148	%%DATADIR%%/sfx/capuchmonk.wav
		149	%%DATADIR%%/sfx/crazylaugh.wav
145	%%DATADIR%%/sfx/die.wav	150	%%DATADIR%%/sfx/die.wav
		151	%%DATADIR%%/sfx/evillaugh.wav
146	%%DATADIR%%/sfx/ff_death.wav	152	%%DATADIR%%/sfx/ff_death.wav
147	%%DATADIR%%/sfx/flag.wav	153	%%DATADIR%%/sfx/flag.wav
148	%%DATADIR%%/sfx/goodpill.wav	154	%%DATADIR%%/sfx/goodpill.wav

Return to bug 81860

Lines 6-12 Link Here

(-)games/trackballs/Makefile (-6 / +8 lines)
6	#	6	#
7		7
8	PORTNAME= trackballs	8	PORTNAME= trackballs
9	PORTVERSION= 1.0.0	9	PORTVERSION= 1.1.0
10	CATEGORIES= games	10	CATEGORIES= games
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 19-43 Link Here
19		19
20	USE_X_PREFIX= yes	20	USE_X_PREFIX= yes
21	USE_SDL= image mixer sdl ttf	21	USE_SDL= image mixer sdl ttf
		22	USE_GETTEXT= yes
22	USE_GETOPT_LONG= yes	23	USE_GETOPT_LONG= yes
23	USE_REINPLACE= yes	24	USE_REINPLACE= yes
24	USE_GMAKE= yes	25	USE_GMAKE= yes
25	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
26	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	27	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
27	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"	28	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
		29	MAKE_ARGS= mkinstalldirs="${MKDIR}"
28		30
29	MAN6= ${PORTNAME}.6	31	MAN6= ${PORTNAME}.6
30		32
31	CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include	33	CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include
32	LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib	34	LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib -lintl
33		35
34	post-patch:	36	post-patch:
35	@${FIND} ${WRKSRC} -name '.h' -o -name '.cc' \| ${XARGS} \	37	@${FIND} ${WRKSRC} -name '.h' -o -name '.cc' \| ${XARGS} \
36	${REINPLACE_CMD} -e "/^#include/s\|SDL/SDL\|SDL\|; \	38	${REINPLACE_CMD} -e '/^#include/s\|SDL/SDL\|SDL\|; \
37	/stdint.h/d"	39	/stdint.h/d'
38	@${REINPLACE_CMD} -e "s\|/bin/bash\|${LOCALBASE}/bin/bash\|" \	40	@${REINPLACE_CMD} -e 's\|/bin/bash\|${LOCALBASE}/bin/bash\|' \
39	${WRKSRC}/share/icons/installIcons	41	${WRKSRC}/share/icons/installIcons
40	@${REINPLACE_CMD} -e "s\|install -D\|install\|" \	42	@${REINPLACE_CMD} -e 's\|install -D\|$$(INSTALL)\|' \
41	${WRKSRC}/share/Makefile.in	43	${WRKSRC}/share/Makefile.in
42		44
43	.include <bsd.port.mk>	45	.include <bsd.port.mk>

Line 0 Link Here

(-)games/trackballs/files/patch-po-Makefile.in (+18 lines)
	1	--- po/Makefile.in.in.orig Wed Feb 16 02:16:34 2005
	2	+++ po/Makefile.in.in Fri Jun 3 03:18:21 2005
	3	@@ -21,13 +21,13 @@
	4	prefix = @prefix@
	5	exec_prefix = @exec_prefix@
	6	datadir = @datadir@
	7	-localedir = $(datadir)/${PACKAGE}/locale
	8	+localedir = $(datadir)/locale
	9	gettextsrcdir = $(datadir)/gettext/po
	10
	11	INSTALL = @INSTALL@
	12	INSTALL_DATA = @INSTALL_DATA@
	13	MKINSTALLDIRS = @MKINSTALLDIRS@
	14	-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /) echo "$(MKINSTALLDIRS)" ;; ) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
	15	+mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
	16
	17	GMSGFMT = @GMSGFMT@
	18	MSGFMT = @MSGFMT@

Line 0 Link Here

(-)games/trackballs/files/patch-src-pipe.cc (+13 lines)
	1	--- src/pipe.cc.orig Wed Feb 23 00:10:31 2005
	2	+++ src/pipe.cc Fri Jun 3 02:54:26 2005
	3	@@ -96,8 +96,8 @@
	4	}
	5	void Pipe::computeBoundingBox() {
	6	for(int i=0;i<3;i++) {
	7	- boundingBox[0][i]=fmin(from[i]-radius,to[i]-radius)-position[i];
	8	- boundingBox[1][i]=fmax(from[i]+radius,to[i]+radius)-position[i];
	9	+ boundingBox[0][i]=((from[i]-radius)>(to[i]-radius)?(to[i]-radius):(from[i]-radius))-position[i];
	10	+ boundingBox[1][i]=((from[i]+radius)>(to[i]+radius)?(from[i]+radius):(to[i]+radius))-position[i];
	11	}
	12	}
	13	void Pipe::onRemove() {Animated::onRemove(); pipes->erase(this);}