Date: Mon, 2 Dec 2013 13:30:00 GMT From: dfilter@FreeBSD.ORG (dfilter service) To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/184342: commit references a PR Message-ID: <201312021330.rB2DU0LA042451@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/184342; it has been noted by GNATS. From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/184342: commit references a PR Date: Mon, 2 Dec 2013 13:23:34 +0000 (UTC) Author: wg Date: Mon Dec 2 13:23:26 2013 New Revision: 335483 URL: http://svnweb.freebsd.org/changeset/ports/335483 Log: games/megaglest: update to 3.9.0.4 - Update to 3.9.0.4 [1] - Allow staging - Convert lib depends to new format PR: ports/184342 [1] Submitted by: maintainer Deleted: head/games/megaglest/files/patch-mk-cmake-modules-FindMiniupnpc.cmake head/games/megaglest/files/patch-source-share_lib-sources-platform-posix-socket.cpp head/games/megaglest/files/patch-source-shared_lib-CMakeLists.txt Modified: head/games/megaglest/Makefile head/games/megaglest/distinfo head/games/megaglest/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp Modified: head/games/megaglest/Makefile ============================================================================== --- head/games/megaglest/Makefile Mon Dec 2 12:49:29 2013 (r335482) +++ head/games/megaglest/Makefile Mon Dec 2 13:23:26 2013 (r335483) @@ -2,21 +2,20 @@ # $FreeBSD$ PORTNAME= megaglest -PORTVERSION= 3.7.1 -PORTREVISION= 2 +PORTVERSION= 3.9.0.4 CATEGORIES= games -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}_${PORTVERSION}/ +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}_3.9.0/ DISTNAME= ${PORTNAME}-source-${PORTVERSION} MAINTAINER= rnejdl@ringofsaturn.com COMMENT= Open source 3D real-time strategy game -LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \ - jpeg:${PORTSDIR}/graphics/jpeg \ - png15:${PORTSDIR}/graphics/png \ - xerces-c:${PORTSDIR}/textproc/xerces-c2 \ - ftgl:${PORTSDIR}/graphics/ftgl \ - vorbis:${PORTSDIR}/audio/libvorbis +LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ + libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libpng15.so:${PORTSDIR}/graphics/png \ + libxerces-c.so:${PORTSDIR}/textproc/xerces-c2 \ + libftgl.so:${PORTSDIR}/graphics/ftgl \ + libvorbis.so:${PORTSDIR}/audio/libvorbis BUILD_DEPENDS= ${LOCALBASE}/include/libircclient.h:${PORTSDIR}/irc/libircclient \ ${LOCALBASE}/include/miniupnpc/miniupnpc.h:${PORTSDIR}/net/miniupnpc RUN_DEPENDS= ${DATADIR}/tutorials/2_basic_tutorial/2_basic_tutorial.xml:${PORTSDIR}/games/megaglest-data @@ -33,44 +32,31 @@ USE_SDL= yes USE_WX= 2.8+ CFLAGS+= -I${LOCALBASE}/include/libpng15 -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +WRKSRC= ${WRKDIR}/${PORTNAME}-3.9.0 OPTIONS_DEFINE= EDITOR +OPTIONS_SUB= yes EDITOR_DESC= Install MegaGlest Editor -NO_STAGE= yes .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MEDITOR} -PLIST_SUB+= EDITOR="" -.else -PLIST_SUB+= EDITOR="@comment " -.endif - -post-patch: - @${REINPLACE_CMD} -e '/<curl\/types.h>/d' \ - ${WRKSRC}/source/shared_lib/sources/platform/posix/miniftpclient.cpp - do-install: - ${STRIP_CMD} ${WRKSRC}/mk/linux/megaglest - @${MKDIR} ${DATADIR} -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} -.endif - ${INSTALL_PROGRAM} ${WRKSRC}/mk/linux/megaglest ${PREFIX}/bin/${PORTNAME} + ${STRIP_CMD} ${WRKSRC}/source/glest_game/megaglest + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_PROGRAM} ${WRKSRC}/source/glest_game/megaglest ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .for f in glest.ini glestkeys.ini servers.ini - ${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR} -.endfor -.for f in AUTHORS.source_code.txt CHANGELOG.txt README.txt COPYRIGHT.source_code.txt - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR} .endfor +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR} +. for f in AUTHORS.source_code.txt CHANGELOG.txt README.txt COPYRIGHT.source_code.txt + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} +. endfor +.endif .if ${PORT_OPTIONS:MEDITOR} - ${INSTALL_PROGRAM} ${WRKSRC}/mk/linux/megaglest_editor ${PREFIX}/bin/megaglest_editor + ${INSTALL_PROGRAM} ${WRKSRC}/source/glest_map_editor/megaglest_editor ${STAGEDIR}${PREFIX}/bin/megaglest_editor .endif -post-install: - @${CAT} ${PKGMESSAGE} - .include <bsd.port.pre.mk> .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" Modified: head/games/megaglest/distinfo ============================================================================== --- head/games/megaglest/distinfo Mon Dec 2 12:49:29 2013 (r335482) +++ head/games/megaglest/distinfo Mon Dec 2 13:23:26 2013 (r335483) @@ -1,2 +1,2 @@ -SHA256 (megaglest-source-3.7.1.tar.xz) = 0222196c6a274cfd1b5fd074206a6bedcf3da4f343345f3e2682e704f94adc26 -SIZE (megaglest-source-3.7.1.tar.xz) = 1439864 +SHA256 (megaglest-source-3.9.0.4.tar.xz) = 3362ade61af3c01c2d8976d2d481769698dc0c800f35251b8c5489f8e41d9bc3 +SIZE (megaglest-source-3.9.0.4.tar.xz) = 1596692 Modified: head/games/megaglest/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp ============================================================================== --- head/games/megaglest/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp Mon Dec 2 12:49:29 2013 (r335482) +++ head/games/megaglest/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp Mon Dec 2 13:23:26 2013 (r335483) @@ -1,14 +1,13 @@ ---- source/shared_lib/sources/platform/posix/ircclient.cpp 2012-11-10 03:22:28.000000000 -0600 -+++ source/shared_lib/sources/platform/posix/ircclient.cpp.new 2012-11-20 11:51:10.000000000 -0600 -@@ -14,11 +14,7 @@ - #include "util.h" - #include "platform_common.h" +--- source/shared_lib/sources/platform/posix/ircclient.cpp.orig 2013-11-22 15:51:23.000000000 -0600 ++++ source/shared_lib/sources/platform/posix/ircclient.cpp 2013-11-22 15:51:42.000000000 -0600 +@@ -19,10 +19,7 @@ + #if !defined(DISABLE_IRCCLIENT) + #include <libircclient.h> -- -// upstream moved some defines into new headers as of 1.6 -#ifndef LIBIRCCLIENT_PRE1_6 #include <libirc_rfcnumeric.h> -#endif - #include <stdio.h> - #include <stdarg.h> + #endif + _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312021330.rB2DU0LA042451>