diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2013-12-20 23:32:26 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2013-12-20 23:32:26 +0000 |
| commit | b7f413ebeb4af214aac7f0b2557429642e98730f (patch) | |
| tree | 6282a69d12517f91e9c6d9fec15b2ac7cd1ec9d9 /games/osgg | |
| parent | 1a24dea34b16db8d7d5daaa93c4fa30060a92a63 (diff) | |
| download | ports-b7f413ebeb4af214aac7f0b2557429642e98730f.tar.gz ports-b7f413ebeb4af214aac7f0b2557429642e98730f.zip | |
- Support staging
- Fix segfault when built with clang
Notes
Notes:
svn path=/head/; revision=337103
Diffstat (limited to 'games/osgg')
| -rw-r--r-- | games/osgg/Makefile | 17 | ||||
| -rw-r--r-- | games/osgg/files/patch-main.cpp | 12 | ||||
| -rw-r--r-- | games/osgg/pkg-plist | 24 |
3 files changed, 19 insertions, 34 deletions
diff --git a/games/osgg/Makefile b/games/osgg/Makefile index 9050f9cf798e..ed1f5774a3dc 100644 --- a/games/osgg/Makefile +++ b/games/osgg/Makefile @@ -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> diff --git a/games/osgg/files/patch-main.cpp b/games/osgg/files/patch-main.cpp index 92d5ff40aee0..98f208c96832 100644 --- a/games/osgg/files/patch-main.cpp +++ b/games/osgg/files/patch-main.cpp @@ -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) diff --git a/games/osgg/pkg-plist b/games/osgg/pkg-plist deleted file mode 100644 index 5303199264a3..000000000000 --- a/games/osgg/pkg-plist +++ /dev/null @@ -1,24 +0,0 @@ -bin/osgg -%%DATADIR%%/Bandal.ttf -%%DATADIR%%/base.txt -%%DATADIR%%/boom.ogg -%%DATADIR%%/enemy.txt -%%DATADIR%%/icon.png -%%DATADIR%%/laser.ogg -%%DATADIR%%/levels/0.level -%%DATADIR%%/levels/1.level -%%DATADIR%%/levels/10.level -%%DATADIR%%/levels/11.level -%%DATADIR%%/levels/12.level -%%DATADIR%%/levels/2.level -%%DATADIR%%/levels/3.level -%%DATADIR%%/levels/4.level -%%DATADIR%%/levels/5.level -%%DATADIR%%/levels/6.level -%%DATADIR%%/levels/7.level -%%DATADIR%%/levels/8.level -%%DATADIR%%/levels/9.level -%%DATADIR%%/nozzloop.ogg -%%DATADIR%%/ship.txt -@dirrm %%DATADIR%%/levels -@dirrm %%DATADIR%% |