Date: Sat, 21 Dec 2013 10:27:26 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337127 - in branches/2014Q1/games/osgg: . files Message-ID: <201312211027.rBLARQj1078792@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Sat Dec 21 10:27:26 2013 New Revision: 337127 URL: http://svnweb.freebsd.org/changeset/ports/337127 Log: MFH: r337103 - Support staging - Fix segfault when built with clang Approved by: portmgr (implicit) Deleted: branches/2014Q1/games/osgg/pkg-plist Modified: branches/2014Q1/games/osgg/Makefile branches/2014Q1/games/osgg/files/patch-main.cpp Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/osgg/Makefile ============================================================================== --- branches/2014Q1/games/osgg/Makefile Sat Dec 21 10:26:24 2013 (r337126) +++ branches/2014Q1/games/osgg/Makefile Sat Dec 21 10:27:26 2013 (r337127) @@ -16,7 +16,12 @@ USE_GL= yes WRKSRC= ${WRKDIR}/${PORTNAME} -NO_STAGE= yes +PLIST_FILES= bin/${PORTNAME} +PORTDATA= * + +post-extract: + @${FIND} -d ${WRKSRC} -name .svn -exec ${RM} -rf {} \; + post-patch: @${RM} -f ${WRKSRC}/osgg @${REINPLACE_CMD} -e 's|"[a-z]*.txt"|DATADIR&|; s|endian.h|sys/&|' \ @@ -24,16 +29,12 @@ post-patch: do-build: cd ${WRKSRC} && ${CXX} ${CXXFLAGS} `${SDL_CONFIG} --libs --cflags` \ - -lGL -lSDL_image -lSDL_ttf -lSDL_mixer -o osgg \ + -lGL -lSDL_image -lSDL_ttf -lSDL_mixer -o ${PORTNAME} \ -DDATADIR="\"${DATADIR}/\"" \ main.cpp text.cpp sound.cpp do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/osgg ${PREFIX}/bin/ - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/*.txt ${WRKSRC}/*.ogg ${WRKSRC}/Bandal.ttf \ - ${WRKSRC}/icon.png ${DATADIR} - ${MKDIR} ${DATADIR}/levels - ${INSTALL_DATA} ${WRKSRC}/levels/* ${DATADIR}/levels + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ + cd ${WRKSRC} && ${COPYTREE_SHARE} "*.txt *.ogg Bandal.ttf icon.png levels" ${STAGEDIR}${DATADIR}/ .include <bsd.port.mk> Modified: branches/2014Q1/games/osgg/files/patch-main.cpp ============================================================================== --- branches/2014Q1/games/osgg/files/patch-main.cpp Sat Dec 21 10:26:24 2013 (r337126) +++ branches/2014Q1/games/osgg/files/patch-main.cpp Sat Dec 21 10:27:26 2013 (r337127) @@ -1,5 +1,5 @@ ---- main.cpp.orig 2013-09-13 20:24:16.310226753 +0400 -+++ main.cpp 2013-09-13 20:24:50.127352703 +0400 +--- main.cpp.orig 2009-03-14 01:46:04.000000000 +0300 ++++ main.cpp 2013-12-21 03:29:52.401817465 +0400 @@ -26,6 +26,7 @@ #include <fstream> #include <iostream> @@ -8,3 +8,11 @@ #include <sys/time.h> +@@ -340,6 +341,7 @@ + } + } + } ++ return false; + } + + void classBullets::shoot(entity owner, gPs velocity)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312211027.rBLARQj1078792>