Attachment #87619 for bug #124231

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

Lines 5-12 Link Here

(-)games/eduke32/Makefile (-4 / +17 lines)
5	# $FreeBSD: ports/games/eduke32/Makefile,v 1.11 2008/04/19 17:48:58 miwi Exp $	5	# $FreeBSD: ports/games/eduke32/Makefile,v 1.11 2008/04/19 17:48:58 miwi Exp $
6		6
7	PORTNAME= eduke32	7	PORTNAME= eduke32
8	PORTVERSION= 20080206	8	PORTVERSION= 20080602
9	PORTREVISION= 1
10	CATEGORIES= games	9	CATEGORIES= games
11	MASTER_SITES= http://wiki.eduke32.com/stuff/	10	MASTER_SITES= http://wiki.eduke32.com/stuff/
12	DISTFILES= ${PORTNAME}_src_${PORTVERSION}${EXTRACT_SUFX}	11	DISTFILES= ${PORTNAME}_src_${PORTVERSION}${EXTRACT_SUFX}
Lines 21-27 Link Here
21	USE_SDL= mixer sdl	20	USE_SDL= mixer sdl
22	WRKSRC= ${WRKDIR}/${PORTNAME}_src_${PORTVERSION}/${PORTNAME}	21	WRKSRC= ${WRKDIR}/${PORTNAME}_src_${PORTVERSION}/${PORTNAME}
23		22
24	OPTIONS= MIDI "Enable MIDI support" on	23	OPTIONS= MIDI "Enable MIDI support" On \
		24	TIMIDITYPLUS "Use Timidity++ instead of Timidity" Off \
		25	VORBIS "Enable Ogg Vorbis support" On
25		26
26	.include "${.CURDIR}/../duke3d-data/Makefile.include"	27	.include "${.CURDIR}/../duke3d-data/Makefile.include"
27		28
Lines 31-41 Link Here
31	BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm	32	BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
32	.endif	33	.endif
33		34
34	.if !defined(WITHOUT_MIDI)	35	.if defined(WITH_MIDI)
		36	.if defined(WITH_TIMIDITYPLUS)
		37	RUN_DEPENDS+= timidity:${PORTSDIR}/audio/timidity++
		38	.else
35	RUN_DEPENDS+= timidity:${PORTSDIR}/audio/timidity	39	RUN_DEPENDS+= timidity:${PORTSDIR}/audio/timidity
36	.endif	40	.endif
		41	.endif
		42
		43	.if defined(WITH_VORBIS)
		44	LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis
		45	.endif
37		46
38	post-patch:	47	post-patch:
		48	.if defined(WITHOUT_VORBIS)
		49	@${REINPLACE_CMD} -e '/LIBS+= -lvorbis/d' ${WRKSRC}/Makefile
		50	.endif
39	.if ${ARCH} != "i386"	51	.if ${ARCH} != "i386"
40	@${REINPLACE_CMD} -Ee 's\|^(NOASM =).*\|\1 1\|' ${WRKSRC}/Makefile	52	@${REINPLACE_CMD} -Ee 's\|^(NOASM =).*\|\1 1\|' ${WRKSRC}/Makefile
41	.endif	53	.endif
Lines 47-52 Link Here
47	${WRKSRC}/Makefile \	59	${WRKSRC}/Makefile \
48	${WRKSRC}/../build/Makefile \	60	${WRKSRC}/../build/Makefile \
49	${WRKSRC}/../build/Makefile.shared	61	${WRKSRC}/../build/Makefile.shared
		62	@${REINPLACE_CMD} -e 's\|LINUX\|BSD\|' ${WRKSRC}/Makefile
50	@${REINPLACE_CMD} -e 's\|/usr/share/games/eduke32\|${DN3DDIR}\|' \	63	@${REINPLACE_CMD} -e 's\|/usr/share/games/eduke32\|${DN3DDIR}\|' \
51	${WRKSRC}/source/game.c ${WRKSRC}/source/astub.c	64	${WRKSRC}/source/game.c ${WRKSRC}/source/astub.c
52		65

Lines 1-3 Link Here

(-)games/eduke32/distinfo (-3 / +3 lines)
1	MD5 (eduke32_src_20080206.zip) = 2706f66ea5a043e5020a6b5960c72594	1	MD5 (eduke32_src_20080602.zip) = c478f1f98c1ac57844604a1ba8c98997
2	SHA256 (eduke32_src_20080206.zip) = a1d0d3fb47cb1eb21f5a299bc257ca0edb0ae91c6b7491690017418220825027	2	SHA256 (eduke32_src_20080602.zip) = 0b98ef85548015f199a4253521f1bc82d80f63977b5b94fbaf55924b912950ab
3	SIZE (eduke32_src_20080206.zip) = 1523615	3	SIZE (eduke32_src_20080602.zip) = 1629666




--- Makefile.orig	2007-10-10 23:28:16.000000000 +0200
+++ Makefile	2007-10-10 23:30:35.000000000 +0200
@@ -51,18 +51,18 @@
 
 include $(EROOT)/Makefile.shared
 
-ifeq ($(PLATFORM),LINUX)
+ifeq ($(PLATFORM),WINDOWS)
+	OBJ=obj_win
+	EOBJ=eobj_win
+else
 	OBJ=obj
 	EOBJ=eobj
-	NASMFLAGS+= -f elf
-else
-    ifeq ($(PLATFORM),WINDOWS)
-	    OBJ=obj_win
-	    EOBJ=eobj_win
-    else
-    	OBJ=obj
-    	EOBJ=eobj
-    endif
+	ifeq ($(PLATFORM),LINUX)
+		NASMFLAGS+= -f elf
+	endif
+	ifeq ($(PLATFORM),BSD)
+		NASMFLAGS+= -f elf
+	endif
 endif
 
 JMACTOBJ=$(OBJ)/util_lib.$o \

Return to bug 124231

Lines 1-31 Link Here

(-)games/eduke32/files/patch-Makefile (-31 lines)
1	--- Makefile.orig 2007-10-10 23:28:16.000000000 +0200
2	+++ Makefile 2007-10-10 23:30:35.000000000 +0200
3	@@ -51,18 +51,18 @@
4
5	include $(EROOT)/Makefile.shared
6
7	-ifeq ($(PLATFORM),LINUX)
8	+ifeq ($(PLATFORM),WINDOWS)
9	+ OBJ=obj_win
10	+ EOBJ=eobj_win
11	+else
12	OBJ=obj
13	EOBJ=eobj
14	- NASMFLAGS+= -f elf
15	-else
16	- ifeq ($(PLATFORM),WINDOWS)
17	- OBJ=obj_win
18	- EOBJ=eobj_win
19	- else
20	- OBJ=obj
21	- EOBJ=eobj
22	- endif
23	+ ifeq ($(PLATFORM),LINUX)
24	+ NASMFLAGS+= -f elf
25	+ endif
26	+ ifeq ($(PLATFORM),BSD)
27	+ NASMFLAGS+= -f elf
28	+ endif
29	endif
30
31	JMACTOBJ=$(OBJ)/util_lib.$o \