Attachment #73452 for bug #106482

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

Lines 6-12 Link Here

(-)blobandconquer/Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= blobandconquer	8	PORTNAME= blobandconquer
9	DISTVERSION= 0.6-1	9	DISTVERSION= 0.7-2
10	CATEGORIES= games	10	CATEGORIES= games
11	MASTER_SITES= http://www.parallelrealities.co.uk/download.php?type=zip&file=	11	MASTER_SITES= http://www.parallelrealities.co.uk/download.php?type=zip&file=
12	DISTNAME= blobAndConquer-${DISTVERSION}	12	DISTNAME= blobAndConquer-${DISTVERSION}
Lines 16-22 Link Here
16		16
17	FETCH_BEFORE_ARGS+= -o ${DISTNAME}${EXTRACT_SUFX}	17	FETCH_BEFORE_ARGS+= -o ${DISTNAME}${EXTRACT_SUFX}
18		18
19	USE_X_PREFIX= yes
20	USE_SDL= sdl mixer image ttf	19	USE_SDL= sdl mixer image ttf
21	USE_GL= yes	20	USE_GL= yes
22	USE_GMAKE= yes	21	USE_GMAKE= yes

Lines 1-3 Link Here

(-)blobandconquer/distinfo (-3 / +3 lines)
1	MD5 (blobAndConquer-0.6-1.tar.gz) = 60dd58d3784a2f5fc92c10950b50d074	1	MD5 (blobAndConquer-0.7-2.tar.gz) = c189414401cd9b2ff4b372be9ac433c0
2	SHA256 (blobAndConquer-0.6-1.tar.gz) = 514c231d151de9ece589292a908bd98a50371872285eab035d3053eb8a7c0102	2	SHA256 (blobAndConquer-0.7-2.tar.gz) = 594671e1f23073ce49b7386a5bd2ce86dbbe7d9dd228cb15e330afa9d167807f
3	SIZE (blobAndConquer-0.6-1.tar.gz) = 29550965	3	SIZE (blobAndConquer-0.7-2.tar.gz) = 32432321

Lines 1-5 Link Here

(-)blobandconquer/pkg-plist (-4 / +95 lines)
1	bin/blobAndConquer	1	bin/blobAndConquer
2	share/applications/blobAndConquer.desktop
3	%%DATADIR%%/data/bsp/ancientTomb1.bsp	2	%%DATADIR%%/data/bsp/ancientTomb1.bsp
4	%%DATADIR%%/data/bsp/ancientTomb1.map	3	%%DATADIR%%/data/bsp/ancientTomb1.map
5	%%DATADIR%%/data/bsp/ancientTomb2.bsp	4	%%DATADIR%%/data/bsp/ancientTomb2.bsp
Lines 16-23 Link Here
16	%%DATADIR%%/data/bsp/bossBattle1.map	15	%%DATADIR%%/data/bsp/bossBattle1.map
17	%%DATADIR%%/data/bsp/bossBattle2.bsp	16	%%DATADIR%%/data/bsp/bossBattle2.bsp
18	%%DATADIR%%/data/bsp/bossBattle2.map	17	%%DATADIR%%/data/bsp/bossBattle2.map
		18	%%DATADIR%%/data/bsp/bossBattle3.bsp
		19	%%DATADIR%%/data/bsp/bossBattle3.map
19	%%DATADIR%%/data/bsp/bossBattle4.bsp	20	%%DATADIR%%/data/bsp/bossBattle4.bsp
20	%%DATADIR%%/data/bsp/bossBattle4.map	21	%%DATADIR%%/data/bsp/bossBattle4.map
		22	%%DATADIR%%/data/bsp/bossTest.bsp
		23	%%DATADIR%%/data/bsp/bossTest.map
21	%%DATADIR%%/data/bsp/caves1.bsp	24	%%DATADIR%%/data/bsp/caves1.bsp
22	%%DATADIR%%/data/bsp/caves1.map	25	%%DATADIR%%/data/bsp/caves1.map
23	%%DATADIR%%/data/bsp/caves2.bsp	26	%%DATADIR%%/data/bsp/caves2.bsp
Lines 63-68 Link Here
63	%%DATADIR%%/data/combatResources/models	66	%%DATADIR%%/data/combatResources/models
64	%%DATADIR%%/data/combatResources/sounds	67	%%DATADIR%%/data/combatResources/sounds
65	%%DATADIR%%/data/combatResources/textures	68	%%DATADIR%%/data/combatResources/textures
		69	%%DATADIR%%/data/cutscenes/ancientTomb3End
		70	%%DATADIR%%/data/cutscenes/hub
66	%%DATADIR%%/data/fonts/909.ttf	71	%%DATADIR%%/data/fonts/909.ttf
67	%%DATADIR%%/data/fonts/tele.ttf	72	%%DATADIR%%/data/fonts/tele.ttf
68	%%DATADIR%%/data/fonts/tycho.ttf	73	%%DATADIR%%/data/fonts/tycho.ttf
Lines 79-85 Link Here
79	%%DATADIR%%/data/gameDefs/frost	84	%%DATADIR%%/data/gameDefs/frost
80	%%DATADIR%%/data/gameDefs/ionCannon	85	%%DATADIR%%/data/gameDefs/ionCannon
81	%%DATADIR%%/data/gameDefs/items	86	%%DATADIR%%/data/gameDefs/items
		87	%%DATADIR%%/data/gameDefs/spiderBlobCommander
82	%%DATADIR%%/data/gameDefs/weapons	88	%%DATADIR%%/data/gameDefs/weapons
		89	%%DATADIR%%/data/locale/de/additional
		90	%%DATADIR%%/data/locale/de/battle
		91	%%DATADIR%%/data/locale/de/cheats
		92	%%DATADIR%%/data/locale/de/controls
		93	%%DATADIR%%/data/locale/de/enemies
		94	%%DATADIR%%/data/locale/de/hubLocale
		95	%%DATADIR%%/data/locale/de/items
		96	%%DATADIR%%/data/locale/de/laserGrid
		97	%%DATADIR%%/data/locale/de/loadSave
		98	%%DATADIR%%/data/locale/de/mastermind
		99	%%DATADIR%%/data/locale/de/mission01Locale
		100	%%DATADIR%%/data/locale/de/mission02Locale
		101	%%DATADIR%%/data/locale/de/mission03Locale
		102	%%DATADIR%%/data/locale/de/mission04Locale
		103	%%DATADIR%%/data/locale/de/mission05Locale
		104	%%DATADIR%%/data/locale/de/mission06Locale
		105	%%DATADIR%%/data/locale/de/mission07Locale
		106	%%DATADIR%%/data/locale/de/mission08Locale
		107	%%DATADIR%%/data/locale/de/mission09Locale
		108	%%DATADIR%%/data/locale/de/mission10Locale
		109	%%DATADIR%%/data/locale/de/mission11Locale
		110	%%DATADIR%%/data/locale/de/mission12Locale
		111	%%DATADIR%%/data/locale/de/mission13Locale
		112	%%DATADIR%%/data/locale/de/mission14Locale
		113	%%DATADIR%%/data/locale/de/mission15Locale
		114	%%DATADIR%%/data/locale/de/mission17Locale
		115	%%DATADIR%%/data/locale/de/mission18Locale
		116	%%DATADIR%%/data/locale/de/mission19Locale
		117	%%DATADIR%%/data/locale/de/mission21Locale
		118	%%DATADIR%%/data/locale/de/mission22Locale
		119	%%DATADIR%%/data/locale/de/mission23Locale
		120	%%DATADIR%%/data/locale/de/mission24Locale
		121	%%DATADIR%%/data/locale/de/mission25Locale
		122	%%DATADIR%%/data/locale/de/mission26Locale
		123	%%DATADIR%%/data/locale/de/mission29Locale
		124	%%DATADIR%%/data/locale/de/mission30Locale
		125	%%DATADIR%%/data/locale/de/mission31Locale
		126	%%DATADIR%%/data/locale/de/options
		127	%%DATADIR%%/data/locale/de/status
		128	%%DATADIR%%/data/locale/de/system
		129	%%DATADIR%%/data/locale/de/trainingLocale
		130	%%DATADIR%%/data/locale/de/weapons
83	%%DATADIR%%/data/locale/en/additional	131	%%DATADIR%%/data/locale/en/additional
84	%%DATADIR%%/data/locale/en/battle	132	%%DATADIR%%/data/locale/en/battle
85	%%DATADIR%%/data/locale/en/cheats	133	%%DATADIR%%/data/locale/en/cheats
Lines 105-110 Link Here
105	%%DATADIR%%/data/locale/en/mission13Locale	153	%%DATADIR%%/data/locale/en/mission13Locale
106	%%DATADIR%%/data/locale/en/mission14Locale	154	%%DATADIR%%/data/locale/en/mission14Locale
107	%%DATADIR%%/data/locale/en/mission15Locale	155	%%DATADIR%%/data/locale/en/mission15Locale
		156	%%DATADIR%%/data/locale/en/mission16Locale
108	%%DATADIR%%/data/locale/en/mission17Locale	157	%%DATADIR%%/data/locale/en/mission17Locale
109	%%DATADIR%%/data/locale/en/mission18Locale	158	%%DATADIR%%/data/locale/en/mission18Locale
110	%%DATADIR%%/data/locale/en/mission19Locale	159	%%DATADIR%%/data/locale/en/mission19Locale
Lines 122-130 Link Here
122	%%DATADIR%%/data/locale/en/system	171	%%DATADIR%%/data/locale/en/system
123	%%DATADIR%%/data/locale/en/trainingLocale	172	%%DATADIR%%/data/locale/en/trainingLocale
124	%%DATADIR%%/data/locale/en/weapons	173	%%DATADIR%%/data/locale/en/weapons
125	%%DATADIR%%/data/locale/fr/options
126	%%DATADIR%%/data/locale/index	174	%%DATADIR%%/data/locale/index
127	%%DATADIR%%/data/misc/letterFrequencyTable	175	%%DATADIR%%/data/misc/letterFrequencyTable
		176	%%DATADIR%%/data/missions/bossTest
128	%%DATADIR%%/data/missions/hub	177	%%DATADIR%%/data/missions/hub
129	%%DATADIR%%/data/missions/mission01	178	%%DATADIR%%/data/missions/mission01
130	%%DATADIR%%/data/missions/mission02	179	%%DATADIR%%/data/missions/mission02
Lines 171-176 Link Here
171	%%DATADIR%%/data/widgets/masterMind	220	%%DATADIR%%/data/widgets/masterMind
172	%%DATADIR%%/data/widgets/status	221	%%DATADIR%%/data/widgets/status
173	%%DATADIR%%/data/widgets/title	222	%%DATADIR%%/data/widgets/title
		223	%%DATADIR%%/gfx/blender/cannonbase.blend
		224	%%DATADIR%%/gfx/blender/cannontop.blend
174	%%DATADIR%%/gfx/blender/cherry.blend	225	%%DATADIR%%/gfx/blender/cherry.blend
175	%%DATADIR%%/gfx/blender/cypher1.blend	226	%%DATADIR%%/gfx/blender/cypher1.blend
176	%%DATADIR%%/gfx/blender/cypher2.blend	227	%%DATADIR%%/gfx/blender/cypher2.blend
Lines 180-199 Link Here
180	%%DATADIR%%/gfx/blender/debris4.blend	231	%%DATADIR%%/gfx/blender/debris4.blend
181	%%DATADIR%%/gfx/blender/debris5.blend	232	%%DATADIR%%/gfx/blender/debris5.blend
182	%%DATADIR%%/gfx/blender/diamond.blend	233	%%DATADIR%%/gfx/blender/diamond.blend
		234	%%DATADIR%%/gfx/blender/eyedroidcommander.blend
183	%%DATADIR%%/gfx/blender/flamethrower.blend	235	%%DATADIR%%/gfx/blender/flamethrower.blend
184	%%DATADIR%%/gfx/blender/grenade.blend	236	%%DATADIR%%/gfx/blender/grenade.blend
185	%%DATADIR%%/gfx/blender/gun.blend	237	%%DATADIR%%/gfx/blender/gun.blend
186	%%DATADIR%%/gfx/blender/hackerswitch.blend	238	%%DATADIR%%/gfx/blender/hackerswitch.blend
187	%%DATADIR%%/gfx/blender/hook.blend	239	%%DATADIR%%/gfx/blender/hook.blend
		240	%%DATADIR%%/gfx/blender/hookfired.blend
188	%%DATADIR%%/gfx/blender/icegun.blend	241	%%DATADIR%%/gfx/blender/icegun.blend
189	%%DATADIR%%/gfx/blender/plasmapistol.blend	242	%%DATADIR%%/gfx/blender/plasmapistol.blend
190	%%DATADIR%%/gfx/blender/plasmarifle.blend	243	%%DATADIR%%/gfx/blender/plasmarifle.blend
191	%%DATADIR%%/gfx/blender/rifle.blend	244	%%DATADIR%%/gfx/blender/rifle.blend
		245	%%DATADIR%%/gfx/blender/rocket.blend
192	%%DATADIR%%/gfx/blender/rocketlauncher.blend	246	%%DATADIR%%/gfx/blender/rocketlauncher.blend
193	%%DATADIR%%/gfx/blender/shieldbelt.blend	247	%%DATADIR%%/gfx/blender/shieldbelt.blend
		248	%%DATADIR%%/gfx/blender/spiderblob.blend
194	%%DATADIR%%/gfx/blender/switch.blend	249	%%DATADIR%%/gfx/blender/switch.blend
195	%%DATADIR%%/gfx/blender/teletag.blend	250	%%DATADIR%%/gfx/blender/teletag.blend
		251	%%DATADIR%%/gfx/blender/throwngrenade.blend
196	%%DATADIR%%/gfx/blender/uzi.blend	252	%%DATADIR%%/gfx/blender/uzi.blend
		253	%%DATADIR%%/gfx/blender/webbing.blend
197	%%DATADIR%%/gfx/game/0.png	254	%%DATADIR%%/gfx/game/0.png
198	%%DATADIR%%/gfx/game/1.png	255	%%DATADIR%%/gfx/game/1.png
199	%%DATADIR%%/gfx/game/2.png	256	%%DATADIR%%/gfx/game/2.png
Lines 204-209 Link Here
204	%%DATADIR%%/gfx/game/7.png	261	%%DATADIR%%/gfx/game/7.png
205	%%DATADIR%%/gfx/game/8.png	262	%%DATADIR%%/gfx/game/8.png
206	%%DATADIR%%/gfx/game/9.png	263	%%DATADIR%%/gfx/game/9.png
		264	%%DATADIR%%/gfx/game/cannonbase.png
		265	%%DATADIR%%/gfx/game/cannontop.png
207	%%DATADIR%%/gfx/game/colon.png	266	%%DATADIR%%/gfx/game/colon.png
208	%%DATADIR%%/gfx/game/cypher1.png	267	%%DATADIR%%/gfx/game/cypher1.png
209	%%DATADIR%%/gfx/game/cypher2.png	268	%%DATADIR%%/gfx/game/cypher2.png
Lines 219-239 Link Here
219	%%DATADIR%%/gfx/game/plasmapistol.blend.tga	278	%%DATADIR%%/gfx/game/plasmapistol.blend.tga
220	%%DATADIR%%/gfx/game/plasmarifle.blend.tga	279	%%DATADIR%%/gfx/game/plasmarifle.blend.tga
221	%%DATADIR%%/gfx/game/rifle.png	280	%%DATADIR%%/gfx/game/rifle.png
		281	%%DATADIR%%/gfx/game/rocket.png
222	%%DATADIR%%/gfx/game/rocketlauncher.png	282	%%DATADIR%%/gfx/game/rocketlauncher.png
223	%%DATADIR%%/gfx/game/shieldbelt.png	283	%%DATADIR%%/gfx/game/shieldbelt.png
		284	%%DATADIR%%/gfx/game/spiderblob.png
224	%%DATADIR%%/gfx/game/switch.png	285	%%DATADIR%%/gfx/game/switch.png
225	%%DATADIR%%/gfx/game/targetter.png	286	%%DATADIR%%/gfx/game/targetter.png
		287	%%DATADIR%%/gfx/game/throwngrenade.png
226	%%DATADIR%%/gfx/game/title.png	288	%%DATADIR%%/gfx/game/title.png
227	%%DATADIR%%/gfx/game/titleBack.png	289	%%DATADIR%%/gfx/game/titleBack.png
228	%%DATADIR%%/gfx/game/uzi.png	290	%%DATADIR%%/gfx/game/uzi.png
229	%%DATADIR%%/gfx/game/violenceWarning.jpg	291	%%DATADIR%%/gfx/game/violenceWarning.jpg
		292	%%DATADIR%%/gfx/game/webbing.tga
230	%%DATADIR%%/gfx/gui/checked.png	293	%%DATADIR%%/gfx/gui/checked.png
231	%%DATADIR%%/gfx/gui/downArrow.png	294	%%DATADIR%%/gfx/gui/downArrow.png
232	%%DATADIR%%/gfx/gui/minus.png	295	%%DATADIR%%/gfx/gui/minus.png
233	%%DATADIR%%/gfx/gui/plus.png	296	%%DATADIR%%/gfx/gui/plus.png
234	%%DATADIR%%/gfx/gui/unchecked.png	297	%%DATADIR%%/gfx/gui/unchecked.png
235	%%DATADIR%%/gfx/gui/upArrow.png	298	%%DATADIR%%/gfx/gui/upArrow.png
236	%%DATADIR%%/gfx/md2/.keep_me	299	%%DATADIR%%/gfx/md2/spiderBlob.md2
		300	%%DATADIR%%/gfx/md2/tris.md2
		301	%%DATADIR%%/gfx/primitive/bioMechBlob.primitive
237	%%DATADIR%%/gfx/primitive/bioTank1.primitive	302	%%DATADIR%%/gfx/primitive/bioTank1.primitive
238	%%DATADIR%%/gfx/primitive/bioTank2.primitive	303	%%DATADIR%%/gfx/primitive/bioTank2.primitive
239	%%DATADIR%%/gfx/primitive/blob.primitive	304	%%DATADIR%%/gfx/primitive/blob.primitive
Lines 242-247 Link Here
242	%%DATADIR%%/gfx/primitive/darkBlob.primitive	307	%%DATADIR%%/gfx/primitive/darkBlob.primitive
243	%%DATADIR%%/gfx/primitive/eyeDroidCommander.primitive	308	%%DATADIR%%/gfx/primitive/eyeDroidCommander.primitive
244	%%DATADIR%%/gfx/primitive/eyedroid.primitive	309	%%DATADIR%%/gfx/primitive/eyedroid.primitive
		310	%%DATADIR%%/gfx/primitive/gunStand.primitive
245	%%DATADIR%%/gfx/primitive/item.primitive	311	%%DATADIR%%/gfx/primitive/item.primitive
246	%%DATADIR%%/gfx/primitive/keycard.primitive	312	%%DATADIR%%/gfx/primitive/keycard.primitive
247	%%DATADIR%%/gfx/primitive/lifeCrystal.primitive	313	%%DATADIR%%/gfx/primitive/lifeCrystal.primitive
Lines 249-254 Link Here
249	%%DATADIR%%/gfx/primitive/sentryGun.primitive	315	%%DATADIR%%/gfx/primitive/sentryGun.primitive
250	%%DATADIR%%/gfx/primitive/weapon.primitive	316	%%DATADIR%%/gfx/primitive/weapon.primitive
251	%%DATADIR%%/gfx/rw2/bullet.blend.raw	317	%%DATADIR%%/gfx/rw2/bullet.blend.raw
		318	%%DATADIR%%/gfx/rw2/cannonbase.blend.raw
		319	%%DATADIR%%/gfx/rw2/cannontop.blend.raw
252	%%DATADIR%%/gfx/rw2/cherry.blend.raw	320	%%DATADIR%%/gfx/rw2/cherry.blend.raw
253	%%DATADIR%%/gfx/rw2/clip.blend.raw	321	%%DATADIR%%/gfx/rw2/clip.blend.raw
254	%%DATADIR%%/gfx/rw2/cypher1.blend.raw	322	%%DATADIR%%/gfx/rw2/cypher1.blend.raw
Lines 259-280 Link Here
259	%%DATADIR%%/gfx/rw2/debris4.blend.raw	327	%%DATADIR%%/gfx/rw2/debris4.blend.raw
260	%%DATADIR%%/gfx/rw2/debris5.blend.raw	328	%%DATADIR%%/gfx/rw2/debris5.blend.raw
261	%%DATADIR%%/gfx/rw2/diamond.blend.raw	329	%%DATADIR%%/gfx/rw2/diamond.blend.raw
		330	%%DATADIR%%/gfx/rw2/eyedroidcommander.blend.raw
262	%%DATADIR%%/gfx/rw2/flamethrower.blend.raw	331	%%DATADIR%%/gfx/rw2/flamethrower.blend.raw
263	%%DATADIR%%/gfx/rw2/grenade.blend.raw	332	%%DATADIR%%/gfx/rw2/grenade.blend.raw
264	%%DATADIR%%/gfx/rw2/gun.blend.raw	333	%%DATADIR%%/gfx/rw2/gun.blend.raw
265	%%DATADIR%%/gfx/rw2/hackerSwitch.blend.raw	334	%%DATADIR%%/gfx/rw2/hackerSwitch.blend.raw
266	%%DATADIR%%/gfx/rw2/hackerswitch.blend.raw	335	%%DATADIR%%/gfx/rw2/hackerswitch.blend.raw
267	%%DATADIR%%/gfx/rw2/hook.blend.raw	336	%%DATADIR%%/gfx/rw2/hook.blend.raw
		337	%%DATADIR%%/gfx/rw2/hookfired.blend.raw
268	%%DATADIR%%/gfx/rw2/icegun.blend.raw	338	%%DATADIR%%/gfx/rw2/icegun.blend.raw
269	%%DATADIR%%/gfx/rw2/plasmapistol.blend.raw	339	%%DATADIR%%/gfx/rw2/plasmapistol.blend.raw
270	%%DATADIR%%/gfx/rw2/plasmarifle.blend.raw	340	%%DATADIR%%/gfx/rw2/plasmarifle.blend.raw
271	%%DATADIR%%/gfx/rw2/pointer.blend.raw	341	%%DATADIR%%/gfx/rw2/pointer.blend.raw
272	%%DATADIR%%/gfx/rw2/rifle.blend.raw	342	%%DATADIR%%/gfx/rw2/rifle.blend.raw
		343	%%DATADIR%%/gfx/rw2/rocket.blend.raw
273	%%DATADIR%%/gfx/rw2/rocketlauncher.blend.raw	344	%%DATADIR%%/gfx/rw2/rocketlauncher.blend.raw
274	%%DATADIR%%/gfx/rw2/shieldbelt.blend.raw	345	%%DATADIR%%/gfx/rw2/shieldbelt.blend.raw
		346	%%DATADIR%%/gfx/rw2/spiderblob.blend.raw
275	%%DATADIR%%/gfx/rw2/switch.blend.raw	347	%%DATADIR%%/gfx/rw2/switch.blend.raw
276	%%DATADIR%%/gfx/rw2/teletag.blend.raw	348	%%DATADIR%%/gfx/rw2/teletag.blend.raw
		349	%%DATADIR%%/gfx/rw2/throwngrenade.blend.raw
277	%%DATADIR%%/gfx/rw2/uzi.blend.raw	350	%%DATADIR%%/gfx/rw2/uzi.blend.raw
		351	%%DATADIR%%/gfx/rw2/webbing.blend.raw
278	%%DATADIR%%/music/A Bear Called Otso.xm	352	%%DATADIR%%/music/A Bear Called Otso.xm
279	%%DATADIR%%/music/Advancement.xm	353	%%DATADIR%%/music/Advancement.xm
280	%%DATADIR%%/music/Dark Club.s3m	354	%%DATADIR%%/music/Dark Club.s3m
Lines 369-374 Link Here
369	%%DATADIR%%/sound/combat/silencedPistol.ogg	443	%%DATADIR%%/sound/combat/silencedPistol.ogg
370	%%DATADIR%%/sound/combat/sizzle.ogg	444	%%DATADIR%%/sound/combat/sizzle.ogg
371	%%DATADIR%%/sound/combat/smallExplode.ogg	445	%%DATADIR%%/sound/combat/smallExplode.ogg
		446	%%DATADIR%%/sound/combat/spiderBlobDie.ogg
372	%%DATADIR%%/sound/combat/splat.ogg	447	%%DATADIR%%/sound/combat/splat.ogg
373	%%DATADIR%%/sound/combat/splatUnderwater.ogg	448	%%DATADIR%%/sound/combat/splatUnderwater.ogg
374	%%DATADIR%%/sound/combat/switch1.ogg	449	%%DATADIR%%/sound/combat/switch1.ogg
Lines 384-389 Link Here
384	%%DATADIR%%/sound/combat/waterIn.ogg	459	%%DATADIR%%/sound/combat/waterIn.ogg
385	%%DATADIR%%/sound/combat/waterOut.ogg	460	%%DATADIR%%/sound/combat/waterOut.ogg
386	%%DATADIR%%/sound/combat/weaponPickup.ogg	461	%%DATADIR%%/sound/combat/weaponPickup.ogg
		462	%%DATADIR%%/sound/combat/webFire.ogg
		463	%%DATADIR%%/sound/combat/webHit.ogg
		464	%%DATADIR%%/sound/combat/webWrap.ogg
387	%%DATADIR%%/sound/gui/buttonClick.ogg	465	%%DATADIR%%/sound/gui/buttonClick.ogg
388	%%DATADIR%%/sound/gui/cheatMode.ogg	466	%%DATADIR%%/sound/gui/cheatMode.ogg
389	%%DATADIR%%/textures/arctic/snow01.jpg	467	%%DATADIR%%/textures/arctic/snow01.jpg
Lines 395-400 Link Here
395	%%DATADIR%%/textures/game/LifeCrystal.png	473	%%DATADIR%%/textures/game/LifeCrystal.png
396	%%DATADIR%%/textures/game/aquaBlob.png	474	%%DATADIR%%/textures/game/aquaBlob.png
397	%%DATADIR%%/textures/game/arrow.png	475	%%DATADIR%%/textures/game/arrow.png
		476	%%DATADIR%%/textures/game/babySpiderBlob.png
398	%%DATADIR%%/textures/game/black.png	477	%%DATADIR%%/textures/game/black.png
399	%%DATADIR%%/textures/game/blood01.png	478	%%DATADIR%%/textures/game/blood01.png
400	%%DATADIR%%/textures/game/blood02.png	479	%%DATADIR%%/textures/game/blood02.png
Lines 407-412 Link Here
407	%%DATADIR%%/textures/game/bulletMark02.tga	486	%%DATADIR%%/textures/game/bulletMark02.tga
408	%%DATADIR%%/textures/game/bulletMark03.tga	487	%%DATADIR%%/textures/game/bulletMark03.tga
409	%%DATADIR%%/textures/game/c4.png	488	%%DATADIR%%/textures/game/c4.png
		489	%%DATADIR%%/textures/game/cannonBase.png
		490	%%DATADIR%%/textures/game/cannonTop1.png
410	%%DATADIR%%/textures/game/cherry.png	491	%%DATADIR%%/textures/game/cherry.png
411	%%DATADIR%%/textures/game/cherryTexture.png	492	%%DATADIR%%/textures/game/cherryTexture.png
412	%%DATADIR%%/textures/game/danger.png	493	%%DATADIR%%/textures/game/danger.png
Lines 442-447 Link Here
442	%%DATADIR%%/textures/game/grenadeLauncher.png	523	%%DATADIR%%/textures/game/grenadeLauncher.png
443	%%DATADIR%%/textures/game/grenadeTexture.png	524	%%DATADIR%%/textures/game/grenadeTexture.png
444	%%DATADIR%%/textures/game/grey.png	525	%%DATADIR%%/textures/game/grey.png
		526	%%DATADIR%%/textures/game/hackerSwitch.png
445	%%DATADIR%%/textures/game/hackerSwitch1.png	527	%%DATADIR%%/textures/game/hackerSwitch1.png
446	%%DATADIR%%/textures/game/hackerSwitch2.png	528	%%DATADIR%%/textures/game/hackerSwitch2.png
447	%%DATADIR%%/textures/game/hook.png	529	%%DATADIR%%/textures/game/hook.png
Lines 451-456 Link Here
451	%%DATADIR%%/textures/game/laserBlob.png	533	%%DATADIR%%/textures/game/laserBlob.png
452	%%DATADIR%%/textures/game/machineGunBlob.png	534	%%DATADIR%%/textures/game/machineGunBlob.png
453	%%DATADIR%%/textures/game/machineGunDroid.png	535	%%DATADIR%%/textures/game/machineGunDroid.png
		536	%%DATADIR%%/textures/game/machineGunSpiderBlob.png
454	%%DATADIR%%/textures/game/manualTargetter.png	537	%%DATADIR%%/textures/game/manualTargetter.png
455	%%DATADIR%%/textures/game/mastermindArrow.png	538	%%DATADIR%%/textures/game/mastermindArrow.png
456	%%DATADIR%%/textures/game/mastermindBackground.png	539	%%DATADIR%%/textures/game/mastermindBackground.png
Lines 472-486 Link Here
472	%%DATADIR%%/textures/game/pistolTexture.png	555	%%DATADIR%%/textures/game/pistolTexture.png
473	%%DATADIR%%/textures/game/plasmaPistol.png	556	%%DATADIR%%/textures/game/plasmaPistol.png
474	%%DATADIR%%/textures/game/plasmaRifle.png	557	%%DATADIR%%/textures/game/plasmaRifle.png
		558	%%DATADIR%%/textures/game/plasmaSpiderBlob.png
475	%%DATADIR%%/textures/game/pressurePlate1.png	559	%%DATADIR%%/textures/game/pressurePlate1.png
476	%%DATADIR%%/textures/game/pressurePlate2.png	560	%%DATADIR%%/textures/game/pressurePlate2.png
477	%%DATADIR%%/textures/game/purpleGem.png	561	%%DATADIR%%/textures/game/purpleGem.png
478	%%DATADIR%%/textures/game/redGem.png	562	%%DATADIR%%/textures/game/redGem.png
479	%%DATADIR%%/textures/game/rifle.png	563	%%DATADIR%%/textures/game/rifle.png
		564	%%DATADIR%%/textures/game/rocket.png
480	%%DATADIR%%/textures/game/rocketLauncher.png	565	%%DATADIR%%/textures/game/rocketLauncher.png
481	%%DATADIR%%/textures/game/sentryGun1.jpg	566	%%DATADIR%%/textures/game/sentryGun1.jpg
482	%%DATADIR%%/textures/game/shieldBelt.png	567	%%DATADIR%%/textures/game/shieldBelt.png
483	%%DATADIR%%/textures/game/shotGunDroid.png	568	%%DATADIR%%/textures/game/shotGunDroid.png
		569	%%DATADIR%%/textures/game/shotgunSpiderBlob.png
		570	%%DATADIR%%/textures/game/spiderBlob.png
		571	%%DATADIR%%/textures/game/spiderBlobCommander.png
484	%%DATADIR%%/textures/game/spotLightMap.png	572	%%DATADIR%%/textures/game/spotLightMap.png
485	%%DATADIR%%/textures/game/starsky.png	573	%%DATADIR%%/textures/game/starsky.png
486	%%DATADIR%%/textures/game/sunset.png	574	%%DATADIR%%/textures/game/sunset.png
Lines 489-497 Link Here
489	%%DATADIR%%/textures/game/targetter.png	577	%%DATADIR%%/textures/game/targetter.png
490	%%DATADIR%%/textures/game/teekaWeapon.png	578	%%DATADIR%%/textures/game/teekaWeapon.png
491	%%DATADIR%%/textures/game/teletag.png	579	%%DATADIR%%/textures/game/teletag.png
		580	%%DATADIR%%/textures/game/thrownGrenade.png
492	%%DATADIR%%/textures/game/uzi.png	581	%%DATADIR%%/textures/game/uzi.png
493	%%DATADIR%%/textures/game/weapon.png	582	%%DATADIR%%/textures/game/weapon.png
494	%%DATADIR%%/textures/game/weaponTexture.png	583	%%DATADIR%%/textures/game/weaponTexture.png
		584	%%DATADIR%%/textures/game/web.png
495	%%DATADIR%%/textures/game/white.png	585	%%DATADIR%%/textures/game/white.png
496	%%DATADIR%%/textures/game/yellowGem.png	586	%%DATADIR%%/textures/game/yellowGem.png
497	%%DATADIR%%/textures/grasslands/american_cherry.jpg	587	%%DATADIR%%/textures/grasslands/american_cherry.jpg
Lines 626-636 Link Here
626	@dirrm %%DATADIR%%/data/texturespecs	716	@dirrm %%DATADIR%%/data/texturespecs
627	@dirrm %%DATADIR%%/data/missions	717	@dirrm %%DATADIR%%/data/missions
628	@dirrm %%DATADIR%%/data/misc	718	@dirrm %%DATADIR%%/data/misc
629	@dirrm %%DATADIR%%/data/locale/fr
630	@dirrm %%DATADIR%%/data/locale/en	719	@dirrm %%DATADIR%%/data/locale/en
		720	@dirrm %%DATADIR%%/data/locale/de
631	@dirrm %%DATADIR%%/data/locale	721	@dirrm %%DATADIR%%/data/locale
632	@dirrm %%DATADIR%%/data/gameDefs	722	@dirrm %%DATADIR%%/data/gameDefs
633	@dirrm %%DATADIR%%/data/fonts	723	@dirrm %%DATADIR%%/data/fonts
		724	@dirrm %%DATADIR%%/data/cutscenes
634	@dirrm %%DATADIR%%/data/combatResources	725	@dirrm %%DATADIR%%/data/combatResources
635	@dirrm %%DATADIR%%/data/bsp	726	@dirrm %%DATADIR%%/data/bsp
636	@dirrm %%DATADIR%%/data	727	@dirrm %%DATADIR%%/data




--- ./makefile.orig	Wed Dec  6 17:42:21 2006
+++ ./makefile	Thu Dec  7 17:07:12 2006
@@ -12,15 +12,15 @@
 
 PREFIX = $(DESTDIR)/usr
 BINDIR = $(PREFIX)/games
-DATADIR = $(PREFIX)/share/games/blobAndConquer
-DOCDIR = $(PREFIX)/share/doc/$(PROG)
+DATADIR := $(DATADIR)/
+DOCDIR = $(DOCSDIR)/
 ICONDIR = $(PREFIX)/share/icons
 MENUDIR = $(PREFIX)/share/applications
 GNOME = $(PREFIX)/share/gnome/apps/Games
 
-CFLAGS += `sdl-config --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK) -DDEV=$(DEV)
-CFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DGAMEPLAYMANUAL=\"$(DOCDIR)index.html\" -Wall -pedantic
-LIBPATH = -L/usr/X11/lib -L/usr/X11R6/lib
-LIBS = -lGL -lGLU `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lz
+CXXFLAGS += -I$(X11BASE)/include `$(SDL_CONFIG) --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK) -DDEV=$(DEV)
+CXXFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DGAMEPLAYMANUAL=\"$(DOCDIR)index.html\" -Wall -pedantic
+LIBPATH = -L$(X11BASE)/lib
+LIBS = -lGL -lGLU `$(SDL_CONFIG) --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lz
 
 # Yes, it means compiling is a little slower... but it's less hassle
 SEARCHPATH += src/ src/3d/ src/bosses/ src/combat src/common/ src/effects/ src/entities/ src/game/ src/gui/ 
@@ -70,7 +70,7 @@
 all: $(PROG)
 
 %.o: %.cpp %.h defines.h defs.h headers.h
-	$(CXX) $(CFLAGS) -c $<

Return to bug 106482

Lines 1-30 Link Here

(-)blobandconquer/files/patch-makefile (-10 / +9 lines)
1	--- makefile.orig Thu Aug 17 07:51:40 2006	1	--- ./makefile.orig Wed Dec 6 17:42:21 2006
2	+++ makefile Thu Aug 17 07:55:36 2006	2	+++ ./makefile Thu Dec 7 17:07:12 2006
3	@@ -13,16 +13,16 @@	3	@@ -12,15 +12,15 @@
4		4
5	PREFIX=$(DESTDIR)/usr	5	PREFIX = $(DESTDIR)/usr
6	BINDIR = $(PREFIX)/games	6	BINDIR = $(PREFIX)/games
7	-DATADIR = $(PREFIX)/share/games/blobAndConquer	7	-DATADIR = $(PREFIX)/share/games/blobAndConquer
8	-DOCDIR = $(PREFIX)/share/doc/$(PROG)	8	-DOCDIR = $(PREFIX)/share/doc/$(PROG)
9	+DATADIR := $(DATADIR)/	9	+DATADIR := $(DATADIR)/
10	+DOCDIR = $(DOCSDIR)/	10	+DOCDIR = $(DOCSDIR)/
11	ICONDIR = $(PREFIX)/share/icons	11	ICONDIR = $(PREFIX)/share/icons
12	KDE = $(PREFIX)/share/applnk/Games/Arcade	12	MENUDIR = $(PREFIX)/share/applications
13	GNOME = $(PREFIX)/share/gnome/apps/Games
14		13
15	-CFLAGS += `sdl-config --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK) -DDEV=$(DEV)	14	-CFLAGS += `sdl-config --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK) -DDEV=$(DEV)
16	-CFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DGAMEPLAYMANUAL=\"$(DOCDIR)index.html\" -Wall -pedantic	15	-CFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DGAMEPLAYMANUAL=\"$(DOCDIR)index.html\" -Wall -pedantic
17	-LIBPATH = -L/usr/X11/lib -L/usr/X11R6/lib	16	-LIBPATH = -L/usr/X11/lib -L/usr/X11R6/lib
18	-LIBS = -lGL -lGLU `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lz	17	-LIBS = -lGL -lGLU `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lz
19	+CXXFLAGS += -I$(X11BASE)/include `$(SDL_CONFIG) --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK) -DDEV=$(DEV)	18	+CXXFLAGS += -I$(X11BASE)/include `$(SDL_CONFIG) --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK) -DDEV=$(DEV)
20	+CXXFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DGAMEPLAYMANUAL=\"$(DOCDIR)index.html\" -Wall	19	+CXXFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DGAMEPLAYMANUAL=\"$(DOCDIR)index.html\" -Wall -pedantic
21	+LIBPATH = -L$(X11BASE)/lib	20	+LIBPATH = -L$(X11BASE)/lib
22	+LIBS = -lGL -lGLU `$(SDL_CONFIG) --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lz	21	+LIBS = -lGL -lGLU `$(SDL_CONFIG) --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lz
23		22
24	# Yes, it means compiling is a little slower... but it's less hassle	23	# Yes, it means compiling is a little slower... but it's less hassle
25	SEARCHPATH = src/ src/3d/ src/common/ src/gui/ src/util/ src/game/ src/system/	24	SEARCHPATH += src/ src/3d/ src/bosses/ src/combat src/common/ src/effects/ src/entities/ src/game/ src/gui/
26	@@ -75,7 +75,7 @@	25	@@ -70,7 +70,7 @@
27	all: $(PROG) $(PAK)	26	all: $(PROG)
28		27
29	%.o: %.cpp %.h defines.h defs.h headers.h	28	%.o: %.cpp %.h defines.h defs.h headers.h
30	- $(CXX) $(CFLAGS) -c $<	29	- $(CXX) $(CFLAGS) -c $<