Attachment #138298 for bug #184231

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




ALL_TARGET=	${PORTNAME}
MAKE_JOBS_UNSAFE=	yes

CFLAGS+=	-I${LOCALBASE}/include/libpng15

PLIST_FILES=	bin/${PORTNAME} man/man6/tuxpuck.6.gz

post-patch:
.for i in intro.c timer.c tuxpuck.c tuxpuck.h video.c
	@${REINPLACE_CMD} -e \
		's|timer_create|_timer_create|g' ${WRKSRC}/${i}
.endfor
.for i in data utils
	@${REINPLACE_CMD} -e \
		's|^CC|#CC| ; \
		 s|^CFLAGS|#CFLAGS| ; \
		 s|sdl-config|$$(SDL_CONFIG)|' ${WRKSRC}/${i}/Makefile
.endfor

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin




 
 %.o	: %.c
-	$(CC) $(CFLAGS) `sdl-config --cflags` -c -o $@ $<
+	$(CC) $(CFLAGS) `$(SDL_CONFIG) --cflags` `libpng-config --cflags` -c -o $@ $<
 
 $(NAME) : $(OBJS)
 	cd data; $(MAKE)
-	$(CC) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \
+	$(CC) $(CFLAGS) $(OBJS) data/libdata.a `$(SDL_CONFIG) --libs` `libpng-config --libs` -lm \
 	-ljpeg -lz -lvorbisfile -lvorbis -logg -o $(NAME)
 
 w32icon.o : data/icons/tuxpuck.ico

Return to bug 184231

Lines 16-27 Link Here

(-)games/tuxpuck/files/patch-Makefile (-2 / +2 lines)
16		16
17	%.o : %.c	17	%.o : %.c
18	- $(CC) $(CFLAGS) `sdl-config --cflags` -c -o $@ $<	18	- $(CC) $(CFLAGS) `sdl-config --cflags` -c -o $@ $<
19	+ $(CC) $(CFLAGS) `$(SDL_CONFIG) --cflags` -c -o $@ $<	19	+ $(CC) $(CFLAGS) `$(SDL_CONFIG) --cflags` `libpng-config --cflags` -c -o $@ $<
20		20
21	$(NAME) : $(OBJS)	21	$(NAME) : $(OBJS)
22	cd data; $(MAKE)	22	cd data; $(MAKE)
23	- $(CC) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \	23	- $(CC) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \
24	+ $(CC) $(CFLAGS) $(OBJS) data/libdata.a `$(SDL_CONFIG) --libs` -lm -lpng \	24	+ $(CC) $(CFLAGS) $(OBJS) data/libdata.a `$(SDL_CONFIG) --libs` `libpng-config --libs` -lm \
25	-ljpeg -lz -lvorbisfile -lvorbis -logg -o $(NAME)	25	-ljpeg -lz -lvorbisfile -lvorbis -logg -o $(NAME)
26		26
27	w32icon.o : data/icons/tuxpuck.ico	27	w32icon.o : data/icons/tuxpuck.ico

Lines 22-36 Link Here

(-)games/tuxpuck/Makefile (-6 / +10 lines)
22	ALL_TARGET= ${PORTNAME}	22	ALL_TARGET= ${PORTNAME}
23	MAKE_JOBS_UNSAFE= yes	23	MAKE_JOBS_UNSAFE= yes
24		24
25	CFLAGS+= -I${LOCALBASE}/include/libpng15
26
27	PLIST_FILES= bin/${PORTNAME} man/man6/tuxpuck.6.gz	25	PLIST_FILES= bin/${PORTNAME} man/man6/tuxpuck.6.gz
28		26
29	post-patch:	27	post-patch:
30	cd ${WRKSRC}; \	28	.for i in intro.c timer.c tuxpuck.c tuxpuck.h video.c
31	${REINPLACE_CMD} 's\|timer_create\|_timer_create\|g' \	29	@${REINPLACE_CMD} -e \
32	tuxpuck.c video.c timer.c intro.c tuxpuck.h	30	's\|timer_create\|_timer_create\|g' ${WRKSRC}/${i}
33	${REINPLACE_CMD} -e 's\|sdl-config\|$$(SDL_CONFIG)\|g' ${WRKSRC}/utils/Makefile	31	.endfor
		32	.for i in data utils
		33	@${REINPLACE_CMD} -e \
		34	's\|^CC\|#CC\| ; \
		35	s\|^CFLAGS\|#CFLAGS\| ; \
		36	s\|sdl-config\|$$(SDL_CONFIG)\|' ${WRKSRC}/${i}/Makefile
		37	.endfor
34		38
35	do-install:	39	do-install:
36	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin	40	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin