Date: Sat, 6 Jun 2009 02:57:43 +0400 (MSD) From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: alepulver@FreeBSD.org Subject: ports/135303: [PATCH] games/warzone2100: update to 2.2.0 Message-ID: <20090605225743.CA353108839@hades.panopticon> Resent-Message-ID: <200906052300.n55N0Wsd065383@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 135303 >Category: ports >Synopsis: [PATCH] games/warzone2100: update to 2.2.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Jun 05 23:00:32 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Dmitry Marakasov >Release: FreeBSD 8.0-CURRENT i386 >Organization: >Environment: System: FreeBSD hades.panopticon 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Mon Jun 1 22:13:51 MSD >Description: - Update to 2.2.0 - Add SF mirror - Mark MAKE_JOBS_SAFE - Add WITHOUT_NLS support - Unfortunately, no longer builds on 6.x :( The new required dependency (graphics/quesoglc) was just committed. Port maintainer (alepulver@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- warzone2100-2.2.0.patch begins here --- Index: Makefile =================================================================== RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/games/warzone2100/Makefile,v retrieving revision 1.26 diff -u -u -r1.26 Makefile --- Makefile 4 Apr 2009 12:05:21 -0000 1.26 +++ Makefile 5 Jun 2009 22:55:13 -0000 @@ -6,23 +6,27 @@ # PORTNAME= warzone2100 -PORTVERSION= 2.0.10 -PORTREVISION= 2 +PORTVERSION= 2.2.0 CATEGORIES= games -MASTER_SITES= http://download.gna.org/warzone/releases/2.0/ +MASTER_SITES= SF \ + http://download.gna.org/warzone/releases/${PORTVERSION:C/^([0-9]+\.[0-9]+)\..*$/\1/}/ MAINTAINER= alepulver@FreeBSD.org COMMENT= Innovative 3D real-time strategy game BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ - unzip:${PORTSDIR}/archivers/unzip + unzip:${PORTSDIR}/archivers/unzip \ + ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ mad.2:${PORTSDIR}/audio/libmad \ ogg.5:${PORTSDIR}/audio/libogg \ openal.0:${PORTSDIR}/audio/openal \ physfs.1:${PORTSDIR}/devel/physfs \ png.5:${PORTSDIR}/graphics/png \ - vorbis.4:${PORTSDIR}/audio/libvorbis + vorbis.4:${PORTSDIR}/audio/libvorbis \ + GLC.0:${PORTSDIR}/graphics/quesoglc \ + theora.0:${PORTSDIR}/multimedia/libtheora \ + popt.0:${PORTSDIR}/devel/popt USE_BISON= build GNU_CONFIGURE= yes @@ -33,11 +37,41 @@ CONFIGURE_ARGS= --program-transform-name="" --with-distributor="FreeBSD ports" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ - LIBS="${PTHREAD_LIBS}" + LIBS="${PTHREAD_LIBS}" \ + PATH="${LOCALBASE}/bin:$$PATH" REINPLACE_ARGS= -i '' +MAKE_JOBS_SAFE= yes +PORTDOCS= * + +.if !defined(WITHOUT_NLS) +USE_GETTEXT= yes +PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " +.endif + +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 700004 +BROKEN= Does not build +.endif post-patch: - @${REINPLACE_CMD} -e 's|-m32||' ${WRKSRC}/configure + @${REINPLACE_CMD} -e '/_XOPEN_SOURCE/ d' ${WRKSRC}/config.h.in + @${REINPLACE_CMD} -e 's|NSIG|32|g; s|SIGPOLL|SIGIO|g' \ + ${WRKSRC}/lib/exceptionhandler/exceptionhandler.c + @${REINPLACE_CMD} -e '/include.*alloca/ d' \ + ${WRKSRC}/lib/framework/config-macosx.h \ + ${WRKSRC}/lib/framework/resource_parser.tab.c \ + ${WRKSRC}/lib/framework/strres_parser.tab.c \ + ${WRKSRC}/lib/framework/wzglobal.h \ + ${WRKSRC}/lib/gamelib/audp_parser.tab.c \ + ${WRKSRC}/lib/script/chat_parser.tab.c \ + ${WRKSRC}/lib/script/script_parser.tab.c \ + ${WRKSRC}/src/message_parser.tab.c \ + ${WRKSRC}/src/scriptvals_parser.tab.c + @${REINPLACE_CMD} -e 's|-m32||; s|-Werror||g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|AUTHORS||; s|COPYING COPYING\.README||' \ ${WRKSRC}/Makefile.in .if defined(NOPORTDOCS) @@ -48,4 +82,4 @@ .else .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> Index: distinfo =================================================================== RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/games/warzone2100/distinfo,v retrieving revision 1.11 diff -u -u -r1.11 distinfo --- distinfo 4 Jan 2008 09:24:50 -0000 1.11 +++ distinfo 4 Jun 2009 12:16:18 -0000 @@ -1,3 +1,3 @@ -MD5 (warzone2100-2.0.10.tar.bz2) = d27b89fde2c8017020756441bdd2a67b -SHA256 (warzone2100-2.0.10.tar.bz2) = a70d53173b49d31ab8b730a82d2b0127a9fb23eb6da1cdc6e38c8dbfecaa207a -SIZE (warzone2100-2.0.10.tar.bz2) = 13304863 +MD5 (warzone2100-2.2.0.tar.bz2) = 18ce8b1778903cb4bbf153b19b575944 +SHA256 (warzone2100-2.2.0.tar.bz2) = c176329bf6a148915dca69e399bf50e63cb26319885e395cb0bc2c1597c48c2a +SIZE (warzone2100-2.2.0.tar.bz2) = 48641710 Index: pkg-plist =================================================================== RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/games/warzone2100/pkg-plist,v retrieving revision 1.7 diff -u -u -r1.7 pkg-plist --- pkg-plist 12 Dec 2007 17:23:17 -0000 1.7 +++ pkg-plist 5 Jun 2009 18:44:09 -0000 @@ -1,17 +1,43 @@ bin/warzone2100 -%%DATADIR%%/mp.wz -%%DATADIR%%/warzone.wz -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/Readme.de -%%PORTDOCS%%%%DOCSDIR%%/Readme.de.xhtml -%%PORTDOCS%%%%DOCSDIR%%/Readme.en -%%PORTDOCS%%%%DOCSDIR%%/Readme.en.xhtml -%%PORTDOCS%%%%DOCSDIR%%/styles/readme.print.css -%%PORTDOCS%%%%DOCSDIR%%/styles/readme.screen.css -share/icons/warzone2100.png share/applications/warzone2100.desktop +share/icons/warzone2100.png +%%NLS%%share/locale/cs/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/da/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/de/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/en_GB/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/es/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/fi/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/fr/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/fy/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/ga/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/it/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/la/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/lt/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/nb/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/nl/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/pl/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/pt/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/ro/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/ru/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/sl/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/warzone2100.mo +%%DATADIR%%/base.wz +%%DATADIR%%/mods/multiplay/aivolution.wz +%%DATADIR%%/mods/multiplay/ntw.wz +%%DATADIR%%/mp.wz +%%DATADIR%%/music/menu.ogg +%%DATADIR%%/music/music.wpl +%%DATADIR%%/music/track1.ogg +%%DATADIR%%/music/track2.ogg +@dirrm %%DATADIR%%/music +@dirrm %%DATADIR%%/mods/multiplay +@dirrm %%DATADIR%%/mods @dirrm %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%%/styles -%%PORTDOCS%%@dirrm %%DOCSDIR%% +%%NLS%%@dirrmtry share/locale/la/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/la +%%NLS%%@dirrmtry share/locale/fy/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/fy @dirrmtry share/applications @dirrmtry share/icons --- warzone2100-2.2.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090605225743.CA353108839>