Date: Sunday, November 22, 2015 @ 05:33:47 Author: kkeen Revision: 147368
archrelease: copy trunk to community-i686, community-x86_64 Added: cataclysm-dda/repos/community-i686/PKGBUILD (from rev 147367, cataclysm-dda/trunk/PKGBUILD) cataclysm-dda/repos/community-i686/cataclysm-dda.install (from rev 147367, cataclysm-dda/trunk/cataclysm-dda.install) cataclysm-dda/repos/community-x86_64/PKGBUILD (from rev 147367, cataclysm-dda/trunk/PKGBUILD) cataclysm-dda/repos/community-x86_64/cataclysm-dda.install (from rev 147367, cataclysm-dda/trunk/cataclysm-dda.install) Deleted: cataclysm-dda/repos/community-i686/PKGBUILD cataclysm-dda/repos/community-i686/cataclysm-dda.install cataclysm-dda/repos/community-x86_64/PKGBUILD cataclysm-dda/repos/community-x86_64/cataclysm-dda.install ----------------------------------------+ /PKGBUILD | 136 +++++++++++++++++++++++++++++++ /cataclysm-dda.install | 10 ++ community-i686/PKGBUILD | 54 ------------ community-i686/cataclysm-dda.install | 5 - community-x86_64/PKGBUILD | 54 ------------ community-x86_64/cataclysm-dda.install | 5 - 6 files changed, 146 insertions(+), 118 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2015-11-22 04:29:27 UTC (rev 147367) +++ community-i686/PKGBUILD 2015-11-22 04:33:47 UTC (rev 147368) @@ -1,54 +0,0 @@ -# $Id$ -# Maintainer: Kyle Keen <keen...@gmail.com> - -pkgname=cataclysm-dda -pkgver=0.C -pkgrel=1 -pkgdesc="A post-apocalyptic roguelike." -#url="http://cataclysmrl.blogspot.com/" -#url="http://www.cataclysm.glyphgryph.com/" -url="http://en.cataclysmdda.com/" -arch=('i686' 'x86_64') -license=("CCPL:by-sa") -depends=('ncurses' 'lua') -makedepends=('sdl2_image' 'sdl2_ttf' 'sdl2_mixer' 'freetype2') -optdepends=('sdl2_image: for tiles' - 'sdl2_ttf: for tiles' - 'freetype2: for tiles' - 'sdl2_mixer: for sound') -install=cataclysm-dda.install -source=("https://github.com/CleverRaven/Cataclysm-DDA/archive/$pkgver.tar.gz") -md5sums=('805132ab7651ba93e5247ced7fe1fc97') - -# official docs say to use lua51 -# but makefile supports lua52? -# what the heck, let's try lua53 - -# tiles + executable are about half of the package -# consider splitting? - -build() { - cd "Cataclysm-DDA-$pkgver" - - sed -i 's/ncursesw5-config/ncursesw6-config/' Makefile - #sed -i 's|"\(l.*h\)"|"lua5.1/\1"|' src/catalua.{h,cpp} - - make PREFIX=/usr RELEASE=1 ZLEVELS=1 USE_HOME_DIR=1 LUA=1 - make PREFIX=/usr RELEASE=1 ZLEVELS=1 USE_HOME_DIR=1 LUA=1 TILES=1 SOUND=1 - #LUA_BINARY="/usr/bin/lua5.1" -} - -package() { - cd "Cataclysm-DDA-$pkgver" - - # no DESTDIR - make PREFIX="$pkgdir/usr" \ - RELEASE=1 ZLEVELS=1 USE_HOME_DIR=1 LUA=1 TILES=0 SOUND=0 \ - install - # doesn't install executable? - install -Dm755 cataclysm "$pkgdir/usr/bin/cataclysm" - - make PREFIX="$pkgdir/usr" \ - RELEASE=1 ZLEVELS=1 USE_HOME_DIR=1 LUA=1 TILES=1 SOUND=1 \ - install -} Copied: cataclysm-dda/repos/community-i686/PKGBUILD (from rev 147367, cataclysm-dda/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2015-11-22 04:33:47 UTC (rev 147368) @@ -0,0 +1,68 @@ +# $Id$ +# Maintainer: Kyle Keen <keen...@gmail.com> + +pkgname=cataclysm-dda +pkgver=0.C +pkgrel=2 +pkgdesc="A post-apocalyptic roguelike." +#url="http://cataclysmrl.blogspot.com/" +#url="http://www.cataclysm.glyphgryph.com/" +url="http://en.cataclysmdda.com/" +arch=('i686' 'x86_64') +license=("CCPL:by-sa") +depends=('ncurses' 'lua') +makedepends=('sdl2_image' 'sdl2_ttf' 'sdl2_mixer' 'freetype2') +optdepends=('sdl2_image: for tiles' + 'sdl2_ttf: for tiles' + 'freetype2: for tiles' + 'sdl2_mixer: for tiles') +install=cataclysm-dda.install +source=("https://github.com/CleverRaven/Cataclysm-DDA/archive/$pkgver.tar.gz") +md5sums=('805132ab7651ba93e5247ced7fe1fc97') + +# official docs say to use lua51 +# but makefile supports lua52? +# lua53 works, but git HEAD detects/uses lua51? + +# tiles + executable are about half of the package +# next release looks like 2/3rds, consider splitting +# USE_XDG_DIR for next release + +build() { + cd "Cataclysm-DDA-$pkgver" + + sed -i 's/ncursesw5-config/ncursesw6-config/' Makefile + #sed -i 's|"\(l.*h\)"|"lua5.1/\1"|' src/catalua.{h,cpp} + + make PREFIX=/usr RELEASE=1 ZLEVELS=1 USE_HOME_DIR=1 LUA=1 + make PREFIX=/usr RELEASE=1 ZLEVELS=1 USE_HOME_DIR=1 LUA=1 TILES=1 SOUND=1 + #LUA_BINARY="/usr/bin/lua5.1" +} + +package() { + cd "Cataclysm-DDA-$pkgver" + + # no DESTDIR + make PREFIX="$pkgdir/usr" \ + RELEASE=1 ZLEVELS=1 USE_HOME_DIR=1 LUA=1 TILES=0 SOUND=0 \ + install + # doesn't install executable? + install -Dm755 cataclysm "$pkgdir/usr/bin/cataclysm" + + make PREFIX="$pkgdir/usr" \ + RELEASE=1 ZLEVELS=1 USE_HOME_DIR=1 LUA=1 TILES=1 SOUND=1 \ + install + + # Icon + install -D 'data/osx/AppIcon.iconset/icon_128x128.png' "$pkgdir/usr/share/icons/hicolor/128x128/apps/cataclysm-dda.png" + + # Docs + install -d "$pkgdir/usr/share/doc/cataclysm-dda" + cp -r doc/* "$pkgdir/usr/share/doc/cataclysm-dda" + # undo symlink + rm "$pkgdir/usr/share/doc/cataclysm-dda/JSON_LOADING_ORDER.md" + cp 'data/json/LOADING_ORDER.md' "$pkgdir/usr/share/doc/cataclysm-dda/ JSON_LOADING_ORDER.md" + + # License + install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} Deleted: community-i686/cataclysm-dda.install =================================================================== --- community-i686/cataclysm-dda.install 2015-11-22 04:29:27 UTC (rev 147367) +++ community-i686/cataclysm-dda.install 2015-11-22 04:33:47 UTC (rev 147368) @@ -1,5 +0,0 @@ -post_upgrade() { - echo "Save formats are almost always incompatible" - echo "Please delete all files in ~/.cataclysm-dda/save/" -} - Copied: cataclysm-dda/repos/community-i686/cataclysm-dda.install (from rev 147367, cataclysm-dda/trunk/cataclysm-dda.install) =================================================================== --- community-i686/cataclysm-dda.install (rev 0) +++ community-i686/cataclysm-dda.install 2015-11-22 04:33:47 UTC (rev 147368) @@ -0,0 +1,5 @@ +post_upgrade() { + echo "Save formats are almost always incompatible" + echo "Please delete all files in ~/.cataclysm-dda/save/" +} + Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2015-11-22 04:29:27 UTC (rev 147367) +++ community-x86_64/PKGBUILD 2015-11-22 04:33:47 UTC (rev 147368) @@ -1,54 +0,0 @@ -# $Id$ -# Maintainer: Kyle Keen <keen...@gmail.com> - -pkgname=cataclysm-dda -pkgver=0.C -pkgrel=1 -pkgdesc="A post-apocalyptic roguelike." -#url="http://cataclysmrl.blogspot.com/" -#url="http://www.cataclysm.glyphgryph.com/" -url="http://en.cataclysmdda.com/" -arch=('i686' 'x86_64') -license=("CCPL:by-sa") -depends=('ncurses' 'lua') -makedepends=('sdl2_image' 'sdl2_ttf' 'sdl2_mixer' 'freetype2') -optdepends=('sdl2_image: for tiles' - 'sdl2_ttf: for tiles' - 'freetype2: for tiles' - 'sdl2_mixer: for sound') -install=cataclysm-dda.install -source=("https://github.com/CleverRaven/Cataclysm-DDA/archive/$pkgver.tar.gz") -md5sums=('805132ab7651ba93e5247ced7fe1fc97') - -# official docs say to use lua51 -# but makefile supports lua52? -# what the heck, let's try lua53 - -# tiles + executable are about half of the package -# consider splitting? - -build() { - cd "Cataclysm-DDA-$pkgver" - - sed -i 's/ncursesw5-config/ncursesw6-config/' Makefile - #sed -i 's|"\(l.*h\)"|"lua5.1/\1"|' src/catalua.{h,cpp} - - make PREFIX=/usr RELEASE=1 ZLEVELS=1 USE_HOME_DIR=1 LUA=1 - make PREFIX=/usr RELEASE=1 ZLEVELS=1 USE_HOME_DIR=1 LUA=1 TILES=1 SOUND=1 - #LUA_BINARY="/usr/bin/lua5.1" -} - -package() { - cd "Cataclysm-DDA-$pkgver" - - # no DESTDIR - make PREFIX="$pkgdir/usr" \ - RELEASE=1 ZLEVELS=1 USE_HOME_DIR=1 LUA=1 TILES=0 SOUND=0 \ - install - # doesn't install executable? - install -Dm755 cataclysm "$pkgdir/usr/bin/cataclysm" - - make PREFIX="$pkgdir/usr" \ - RELEASE=1 ZLEVELS=1 USE_HOME_DIR=1 LUA=1 TILES=1 SOUND=1 \ - install -} Copied: cataclysm-dda/repos/community-x86_64/PKGBUILD (from rev 147367, cataclysm-dda/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2015-11-22 04:33:47 UTC (rev 147368) @@ -0,0 +1,68 @@ +# $Id$ +# Maintainer: Kyle Keen <keen...@gmail.com> + +pkgname=cataclysm-dda +pkgver=0.C +pkgrel=2 +pkgdesc="A post-apocalyptic roguelike." +#url="http://cataclysmrl.blogspot.com/" +#url="http://www.cataclysm.glyphgryph.com/" +url="http://en.cataclysmdda.com/" +arch=('i686' 'x86_64') +license=("CCPL:by-sa") +depends=('ncurses' 'lua') +makedepends=('sdl2_image' 'sdl2_ttf' 'sdl2_mixer' 'freetype2') +optdepends=('sdl2_image: for tiles' + 'sdl2_ttf: for tiles' + 'freetype2: for tiles' + 'sdl2_mixer: for tiles') +install=cataclysm-dda.install +source=("https://github.com/CleverRaven/Cataclysm-DDA/archive/$pkgver.tar.gz") +md5sums=('805132ab7651ba93e5247ced7fe1fc97') + +# official docs say to use lua51 +# but makefile supports lua52? +# lua53 works, but git HEAD detects/uses lua51? + +# tiles + executable are about half of the package +# next release looks like 2/3rds, consider splitting +# USE_XDG_DIR for next release + +build() { + cd "Cataclysm-DDA-$pkgver" + + sed -i 's/ncursesw5-config/ncursesw6-config/' Makefile + #sed -i 's|"\(l.*h\)"|"lua5.1/\1"|' src/catalua.{h,cpp} + + make PREFIX=/usr RELEASE=1 ZLEVELS=1 USE_HOME_DIR=1 LUA=1 + make PREFIX=/usr RELEASE=1 ZLEVELS=1 USE_HOME_DIR=1 LUA=1 TILES=1 SOUND=1 + #LUA_BINARY="/usr/bin/lua5.1" +} + +package() { + cd "Cataclysm-DDA-$pkgver" + + # no DESTDIR + make PREFIX="$pkgdir/usr" \ + RELEASE=1 ZLEVELS=1 USE_HOME_DIR=1 LUA=1 TILES=0 SOUND=0 \ + install + # doesn't install executable? + install -Dm755 cataclysm "$pkgdir/usr/bin/cataclysm" + + make PREFIX="$pkgdir/usr" \ + RELEASE=1 ZLEVELS=1 USE_HOME_DIR=1 LUA=1 TILES=1 SOUND=1 \ + install + + # Icon + install -D 'data/osx/AppIcon.iconset/icon_128x128.png' "$pkgdir/usr/share/icons/hicolor/128x128/apps/cataclysm-dda.png" + + # Docs + install -d "$pkgdir/usr/share/doc/cataclysm-dda" + cp -r doc/* "$pkgdir/usr/share/doc/cataclysm-dda" + # undo symlink + rm "$pkgdir/usr/share/doc/cataclysm-dda/JSON_LOADING_ORDER.md" + cp 'data/json/LOADING_ORDER.md' "$pkgdir/usr/share/doc/cataclysm-dda/ JSON_LOADING_ORDER.md" + + # License + install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} Deleted: community-x86_64/cataclysm-dda.install =================================================================== --- community-x86_64/cataclysm-dda.install 2015-11-22 04:29:27 UTC (rev 147367) +++ community-x86_64/cataclysm-dda.install 2015-11-22 04:33:47 UTC (rev 147368) @@ -1,5 +0,0 @@ -post_upgrade() { - echo "Save formats are almost always incompatible" - echo "Please delete all files in ~/.cataclysm-dda/save/" -} - Copied: cataclysm-dda/repos/community-x86_64/cataclysm-dda.install (from rev 147367, cataclysm-dda/trunk/cataclysm-dda.install) =================================================================== --- community-x86_64/cataclysm-dda.install (rev 0) +++ community-x86_64/cataclysm-dda.install 2015-11-22 04:33:47 UTC (rev 147368) @@ -0,0 +1,5 @@ +post_upgrade() { + echo "Save formats are almost always incompatible" + echo "Please delete all files in ~/.cataclysm-dda/save/" +} +