From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Apr 23 11:50:05 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6579816A402 for ; Mon, 23 Apr 2007 11:50:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 475D513C44B for ; Mon, 23 Apr 2007 11:50:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l3NBo5xC099541 for ; Mon, 23 Apr 2007 11:50:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l3NBo5bh099540; Mon, 23 Apr 2007 11:50:05 GMT (envelope-from gnats) Resent-Date: Mon, 23 Apr 2007 11:50:05 GMT Resent-Message-Id: <200704231150.l3NBo5bh099540@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, VANHULLEBUS Yvan Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 635DC16A400 for ; Mon, 23 Apr 2007 11:42:14 +0000 (UTC) (envelope-from vanhu@zeninc.net) Received: from smtp.zeninc.net (reverse-25.fdn.fr [80.67.176.25]) by mx1.freebsd.org (Postfix) with ESMTP id EC6B713C4C3 for ; Mon, 23 Apr 2007 11:42:13 +0000 (UTC) (envelope-from vanhu@zeninc.net) Received: from jayce.zen.inc (jayce.zen.inc [192.168.1.7]) by smtp.zeninc.net (smtpd) with ESMTP id 1B2473F1F for ; Mon, 23 Apr 2007 13:15:20 +0200 (CEST) Received: by jayce.zen.inc (Postfix, from userid 1000) id 328302E0F0; Mon, 23 Apr 2007 13:15:20 +0200 (CEST) Message-Id: <20070423111521.328302E0F0@jayce.zen.inc> Date: Mon, 23 Apr 2007 13:15:20 +0200 (CEST) From: VANHULLEBUS Yvan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/112029: UFOAI 2.1 is out X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: VANHULLEBUS Yvan List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Apr 2007 11:50:05 -0000 >Number: 112029 >Category: ports >Synopsis: UFOAI 2.1 is out >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Apr 23 11:50:04 GMT 2007 >Closed-Date: >Last-Modified: >Originator: VANHULLEBUS Yvan >Release: FreeBSD 6.2-STABLE i386 >Organization: none >Environment: System: FreeBSD jayce.zen.inc 6.2-STABLE FreeBSD 6.2-STABLE #0: Mon Jan 22 15:43:25 CET 2007 root@jayce.zen.inc:/usr/obj/usr/src/sys/GENERIC i386 >Description: Well... UFOAI 2.1 is out. I also made the ufoai-data Makefile a bit more cleaner, and made it use --tar option of the .run file. >How-To-Repeat: Patch, update, and enjoy the new version :-) >Fix: Note: ufoai/files/patch-Makefile is now obsolete. diff -Nburp ufoai/Makefile ufoai/Makefile --- ufoai/Makefile Sun Oct 1 23:20:15 2006 +++ ufoai/Makefile Mon Apr 23 11:44:21 2007 @@ -6,8 +6,7 @@ # PORTNAME= ufoai -DISTVERSION= 2.0RC5 -PORTREVISION= 1 +DISTVERSION= 2.1 CATEGORIES= games MASTER_SITES= SF DISTNAME= ${PORTNAME:S/$/-/}${DISTVERSION:S/R/-R/}-source @@ -17,7 +16,8 @@ MAINTAINER= acm@FreeBSD.org COMMENT= A strategy game featuring tactical combat LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.9:${PORTSDIR}/graphics/jpeg \ + ogg.5:${PORTSDIR}/audio/libogg RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/default.cfg:${PORTSDIR}/games/ufoai-data USE_BZIP2= yes @@ -25,6 +25,11 @@ USE_GL= yes USE_SDL= sdl ttf USE_GETTEXT= yes USE_GMAKE= yes +GNU_CONFIGURE= yes + +CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include +LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib +CONFIGURE_ENV= CFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" DATADIR= share/${PORTNAME} SUB_FILES= pkg-message @@ -94,6 +99,9 @@ pre-install: @${ECHO} "exec ${PREFIX}/${DATADIR}/${FILE} \"$$@\"" >> ${WRKDIR}/${FILE} . endfor +post-build: + cd ${WRKSRC} && gmake lang + do-install: @${MKDIR} ${UFO_DIR}/base/i18n . for FILE in ${UFO_FILES} @@ -101,13 +109,13 @@ do-install: -e 's|@UFODIR@|${UFO_DIR}|' \ -e 's|@APP@|${FILE}|' \ ${FILESDIR}/run.sh.in > ${WRKDIR}/${FILE} - ${INSTALL_PROGRAM} ${WRKSRC}/release${ARCH}/${FILE} ${UFO_DIR} + ${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${UFO_DIR} ${INSTALL_SCRIPT} ${WRKDIR}/${FILE} ${PREFIX}/bin . endfor . for FILE in ${UFO_LIBS} - ${INSTALL_PROGRAM} ${WRKSRC}/release${ARCH}/${FILE}.so ${UFO_DIR} + ${INSTALL_PROGRAM} ${WRKSRC}/${FILE}.so ${UFO_DIR} . endfor - ${INSTALL_PROGRAM} ${WRKSRC}/release${ARCH}/game.so ${UFO_DIR}/base + ${INSTALL_PROGRAM} ${WRKSRC}/base/game.so ${UFO_DIR}/base @cd ${WRKSRC}/base/i18n && \ ${FIND} * -type d -exec ${MKDIR} "${UFO_DIR}/base/i18n/{}" \; && \ diff -Nburp ufoai/distinfo ufoai/distinfo --- ufoai/distinfo Sun Oct 1 04:10:09 2006 +++ ufoai/distinfo Tue Apr 17 10:25:17 2007 @@ -1,3 +1,3 @@ -MD5 (ufoai/ufoai-2.0-RC5-source.tar.bz2) = ac5642370d419d73af0076ad7172c363 -SHA256 (ufoai/ufoai-2.0-RC5-source.tar.bz2) = bf7b74bfec193183f4a2b03d2f22eefd27a7ba243c840c8003c83a34e8ad9361 -SIZE (ufoai/ufoai-2.0-RC5-source.tar.bz2) = 3163820 +MD5 (ufoai/ufoai-2.1-source.tar.bz2) = 36feac5e163b077e77c17303700a5650 +SHA256 (ufoai/ufoai-2.1-source.tar.bz2) = eb8e75bb523fb1249c5f99a0b27c86c3db6214b749d904682f62879452d4a498 +SIZE (ufoai/ufoai-2.1-source.tar.bz2) = 6744591 diff -Nburp ufoai/files/patch-Makefile ufoai/files/patch-Makefile --- ufoai/files/patch-Makefile Sun Oct 1 04:10:10 2006 +++ ufoai/files/patch-Makefile Thu Jan 1 01:00:00 1970 @@ -1,29 +0,0 @@ ---- 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: diff -Nburp ufoai/files/patch-src-ports-unix-cd_sdl.c ufoai/files/patch-src-ports-unix-cd_sdl.c --- ufoai/files/patch-src-ports-unix-cd_sdl.c Thu Jan 1 01:00:00 1970 +++ ufoai/files/patch-src-ports-unix-cd_sdl.c Fri Apr 20 16:29:21 2007 @@ -0,0 +1,11 @@ +--- src/ports/unix/cd_sdl.c.orig Fri Apr 20 16:27:06 2007 ++++ src/ports/unix/cd_sdl.c Fri Apr 20 16:29:11 2007 +@@ -31,7 +31,7 @@ Boston, MA 02111-1307, USA + */ + + #if defined (__FreeBSD__) +-# include ++# include + #else + # include + #endif diff -Nburp ufoai-data/Makefile ufoai-data/Makefile --- ufoai-data/Makefile Sun Oct 1 04:10:10 2006 +++ ufoai-data/Makefile Mon Apr 23 11:44:34 2007 @@ -6,7 +6,7 @@ # PORTNAME= data -DISTVERSION= 2.0rc5 +DISTVERSION= 2.1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PKGNAMEPREFIX:S/-//} @@ -28,9 +28,9 @@ DATADIR= share/${PKGNAMEPREFIX:S/-//} do-extract: @${MKDIR} ${WRKSRC} @cd ${WRKSRC} && \ - ${TAIL} -c +9390 ${_DISTDIR}/${DISTFILES} | ${TAR} xf - + ${SH} ${_DISTDIR}/${DISTFILES} --tar -xzf @cd ${WRKSRC} && \ - ${TAR} -xjf ${PORTNAME}.tar.bz2 + ${TAR} -xf ${PORTNAME}.tar post-patch: @cd ${WRKSRC}/base && \ diff -Nburp ufoai-data/distinfo ufoai-data/distinfo --- ufoai-data/distinfo Sun Oct 1 04:10:10 2006 +++ ufoai-data/distinfo Tue Apr 17 11:39:33 2007 @@ -1,3 +1,3 @@ -MD5 (ufoai/ufoai-2.0-rc5-linux.run) = 694921d1643a7ddddbcce8bbf6281938 -SHA256 (ufoai/ufoai-2.0-rc5-linux.run) = 40b1c39cefabbd85b8ed7997f1b60285a364e9cee56631b7ada482c59fdb8c84 -SIZE (ufoai/ufoai-2.0-rc5-linux.run) = 170587309 +MD5 (ufoai/ufoai-2.1-linux.run) = 9fb0329e7e9fc621e137c9adc48b568f +SHA256 (ufoai/ufoai-2.1-linux.run) = 49b13b1781e9d6adc88e233c76eca8c027b0fb816f58052096ee725fd3401a50 +SIZE (ufoai/ufoai-2.1-linux.run) = 281527458 >Release-Note: >Audit-Trail: >Unformatted: