Attachment #77855 for bug #112029

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

Lines 6-13 Link Here

(-)ufoai/Makefile (-6 / +14 lines)
6	#	6	#
7		7
8	PORTNAME= ufoai	8	PORTNAME= ufoai
9	DISTVERSION= 2.0RC5	9	DISTVERSION= 2.1
10	PORTREVISION= 1
11	CATEGORIES= games	10	CATEGORIES= games
12	MASTER_SITES= SF	11	MASTER_SITES= SF
13	DISTNAME= ${PORTNAME:S/$/-/}${DISTVERSION:S/R/-R/}-source	12	DISTNAME= ${PORTNAME:S/$/-/}${DISTVERSION:S/R/-R/}-source
Lines 17-23 MAINTAINER= acm@FreeBSD.org Link Here
17	COMMENT= A strategy game featuring tactical combat	16	COMMENT= A strategy game featuring tactical combat
18		17
19	LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis \	18	LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis \
20	jpeg.9:${PORTSDIR}/graphics/jpeg	19	jpeg.9:${PORTSDIR}/graphics/jpeg \
		20	ogg.5:${PORTSDIR}/audio/libogg
21	RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/default.cfg:${PORTSDIR}/games/ufoai-data	21	RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/default.cfg:${PORTSDIR}/games/ufoai-data
22		22
23	USE_BZIP2= yes	23	USE_BZIP2= yes
Lines 25-30 USE_GL= yes Link Here
25	USE_SDL= sdl ttf	25	USE_SDL= sdl ttf
26	USE_GETTEXT= yes	26	USE_GETTEXT= yes
27	USE_GMAKE= yes	27	USE_GMAKE= yes
		28	GNU_CONFIGURE= yes
		29
		30	CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include
		31	LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib
		32	CONFIGURE_ENV= CFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
28		33
29	DATADIR= share/${PORTNAME}	34	DATADIR= share/${PORTNAME}
30	SUB_FILES= pkg-message	35	SUB_FILES= pkg-message
Lines 94-99 pre-install: Link Here
94	@${ECHO} "exec ${PREFIX}/${DATADIR}/${FILE} \"$$@\"" >> ${WRKDIR}/${FILE}	99	@${ECHO} "exec ${PREFIX}/${DATADIR}/${FILE} \"$$@\"" >> ${WRKDIR}/${FILE}
95	. endfor	100	. endfor
96		101
		102	post-build:
		103	cd ${WRKSRC} && gmake lang
		104
97	do-install:	105	do-install:
98	@${MKDIR} ${UFO_DIR}/base/i18n	106	@${MKDIR} ${UFO_DIR}/base/i18n
99	. for FILE in ${UFO_FILES}	107	. for FILE in ${UFO_FILES}
Lines 101-113 do-install: Link Here
101	-e 's\|@UFODIR@\|${UFO_DIR}\|' \	109	-e 's\|@UFODIR@\|${UFO_DIR}\|' \
102	-e 's\|@APP@\|${FILE}\|' \	110	-e 's\|@APP@\|${FILE}\|' \
103	${FILESDIR}/run.sh.in > ${WRKDIR}/${FILE}	111	${FILESDIR}/run.sh.in > ${WRKDIR}/${FILE}
104	${INSTALL_PROGRAM} ${WRKSRC}/release${ARCH}/${FILE} ${UFO_DIR}	112	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${UFO_DIR}
105	${INSTALL_SCRIPT} ${WRKDIR}/${FILE} ${PREFIX}/bin	113	${INSTALL_SCRIPT} ${WRKDIR}/${FILE} ${PREFIX}/bin
106	. endfor	114	. endfor
107	. for FILE in ${UFO_LIBS}	115	. for FILE in ${UFO_LIBS}
108	${INSTALL_PROGRAM} ${WRKSRC}/release${ARCH}/${FILE}.so ${UFO_DIR}	116	${INSTALL_PROGRAM} ${WRKSRC}/${FILE}.so ${UFO_DIR}
109	. endfor	117	. endfor
110	${INSTALL_PROGRAM} ${WRKSRC}/release${ARCH}/game.so ${UFO_DIR}/base	118	${INSTALL_PROGRAM} ${WRKSRC}/base/game.so ${UFO_DIR}/base
111		119
112	@cd ${WRKSRC}/base/i18n && \	120	@cd ${WRKSRC}/base/i18n && \
113	${FIND} * -type d -exec ${MKDIR} "${UFO_DIR}/base/i18n/{}" \; && \	121	${FIND} * -type d -exec ${MKDIR} "${UFO_DIR}/base/i18n/{}" \; && \

Lines 1-3 Link Here

(-)ufoai/distinfo (-3 / +3 lines)
1	MD5 (ufoai/ufoai-2.0-RC5-source.tar.bz2) = ac5642370d419d73af0076ad7172c363	1	MD5 (ufoai/ufoai-2.1-source.tar.bz2) = 36feac5e163b077e77c17303700a5650
2	SHA256 (ufoai/ufoai-2.0-RC5-source.tar.bz2) = bf7b74bfec193183f4a2b03d2f22eefd27a7ba243c840c8003c83a34e8ad9361	2	SHA256 (ufoai/ufoai-2.1-source.tar.bz2) = eb8e75bb523fb1249c5f99a0b27c86c3db6214b749d904682f62879452d4a498
3	SIZE (ufoai/ufoai-2.0-RC5-source.tar.bz2) = 3163820	3	SIZE (ufoai/ufoai-2.1-source.tar.bz2) = 6744591




--- Makefile	Sat Sep 30 13:30:44 2006
+++ Makefile	Sat Sep 30 20:44:26 2006
@@ -346,6 +346,15 @@
 	endif
 endif # ARCH i386
 
+ifeq ($(ARCH),amd64)
+	ifeq ($(strip $(BUILD_GLX)),YES)
+		TARGETS += $(BUILDDIR)/ref_glx.$(SHLIBEXT)
+	endif
+	ifeq ($(strip $(BUILD_SDLUFO)),YES)
+		TARGETS += $(BUILDDIR)/ref_sdl.$(SHLIBEXT)
+	endif
+endif # ARCH FreeBSD/amd64
+
 ifeq ($(strip $(BUILD_COMPILETOOLS)),YES)
 	TARGETS += $(BUILDDIR)/ufo2map
 endif
@@ -1326,8 +1335,8 @@
 	for po in $$pofiles; do \
 	  po=`basename $$po`; \
 	  dir=`echo $$po | sed -e 's,\.po,,'`; \
-	  mkdir -p ../base/i18n/$$dir/LC_MESSAGES; \
-	  msgfmt -v -o ../base/i18n/$$dir/LC_MESSAGES/ufoai.mo po/$$po; \
+	  mkdir -p base/i18n/$$dir/LC_MESSAGES; \
+	  msgfmt -v -o base/i18n/$$dir/LC_MESSAGES/ufoai.mo po/$$po; \
 	done
 
 docs:

Line 0 Link Here

(-)ufoai/files/patch-src-ports-unix-cd_sdl.c (+11 lines)
	1	--- src/ports/unix/cd_sdl.c.orig Fri Apr 20 16:27:06 2007
	2	+++ src/ports/unix/cd_sdl.c Fri Apr 20 16:29:11 2007
	3	@@ -31,7 +31,7 @@ Boston, MA 02111-1307, USA
	4	*/
	5
	6	#if defined (__FreeBSD__)
	7	-# include <SDL.h>
	8	+# include <SDL/SDL.h>
	9	#else
	10	# include <SDL/SDL.h>
	11	#endif




#

PORTNAME=	data
DISTVERSION=	2.1
CATEGORIES=	games
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PKGNAMEPREFIX:S/-//}

do-extract:
	@${MKDIR} ${WRKSRC}
	@cd ${WRKSRC} && \
		${SH} ${_DISTDIR}/${DISTFILES} --tar -xzf
	@cd ${WRKSRC} && \
		${TAR} -xf ${PORTNAME}.tar

post-patch:
	@cd ${WRKSRC}/base && \

Lines 1-3 Link Here

(-)ufoai-data/distinfo (-3 / +3 lines)
1	MD5 (ufoai/ufoai-2.0-rc5-linux.run) = 694921d1643a7ddddbcce8bbf6281938	1	MD5 (ufoai/ufoai-2.1-linux.run) = 9fb0329e7e9fc621e137c9adc48b568f
2	SHA256 (ufoai/ufoai-2.0-rc5-linux.run) = 40b1c39cefabbd85b8ed7997f1b60285a364e9cee56631b7ada482c59fdb8c84	2	SHA256 (ufoai/ufoai-2.1-linux.run) = 49b13b1781e9d6adc88e233c76eca8c027b0fb816f58052096ee725fd3401a50
3	SIZE (ufoai/ufoai-2.0-rc5-linux.run) = 170587309	3	SIZE (ufoai/ufoai-2.1-linux.run) = 281527458

Return to bug 112029

Lines 1-29 Link Here

(-)ufoai/files/patch-Makefile (-29 lines)
1	--- Makefile Sat Sep 30 13:30:44 2006
2	+++ Makefile Sat Sep 30 20:44:26 2006
3	@@ -346,6 +346,15 @@
4	endif
5	endif # ARCH i386
6
7	+ifeq ($(ARCH),amd64)
8	+ ifeq ($(strip $(BUILD_GLX)),YES)
9	+ TARGETS += $(BUILDDIR)/ref_glx.$(SHLIBEXT)
10	+ endif
11	+ ifeq ($(strip $(BUILD_SDLUFO)),YES)
12	+ TARGETS += $(BUILDDIR)/ref_sdl.$(SHLIBEXT)
13	+ endif
14	+endif # ARCH FreeBSD/amd64
15	+
16	ifeq ($(strip $(BUILD_COMPILETOOLS)),YES)
17	TARGETS += $(BUILDDIR)/ufo2map
18	endif
19	@@ -1326,8 +1335,8 @@
20	for po in $$pofiles; do \
21	po=`basename $$po`; \
22	dir=`echo $$po \| sed -e 's,\.po,,'`; \
23	- mkdir -p ../base/i18n/$$dir/LC_MESSAGES; \
24	- msgfmt -v -o ../base/i18n/$$dir/LC_MESSAGES/ufoai.mo po/$$po; \
25	+ mkdir -p base/i18n/$$dir/LC_MESSAGES; \
26	+ msgfmt -v -o base/i18n/$$dir/LC_MESSAGES/ufoai.mo po/$$po; \
27	done
28
29	docs:

Lines 6-12 Link Here

(-)ufoai-data/Makefile (-3 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= data	8	PORTNAME= data
9	DISTVERSION= 2.0rc5	9	DISTVERSION= 2.1
10	CATEGORIES= games	10	CATEGORIES= games
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PKGNAMEPREFIX:S/-//}	12	MASTER_SITE_SUBDIR= ${PKGNAMEPREFIX:S/-//}
Lines 28-36 DATADIR= share/${PKGNAMEPREFIX:S/-//} Link Here
28	do-extract:	28	do-extract:
29	@${MKDIR} ${WRKSRC}	29	@${MKDIR} ${WRKSRC}
30	@cd ${WRKSRC} && \	30	@cd ${WRKSRC} && \
31	${TAIL} -c +9390 ${_DISTDIR}/${DISTFILES} \| ${TAR} xf -	31	${SH} ${_DISTDIR}/${DISTFILES} --tar -xzf
32	@cd ${WRKSRC} && \	32	@cd ${WRKSRC} && \
33	${TAR} -xjf ${PORTNAME}.tar.bz2	33	${TAR} -xf ${PORTNAME}.tar
34		34
35	post-patch:	35	post-patch:
36	@cd ${WRKSRC}/base && \	36	@cd ${WRKSRC}/base && \