Split packages

2 files changed, 137 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 02cee77e3229..f9662b06939f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,44 @@
 pkgbase = freeminer-git
-	pkgdesc = An open source sandbox game inspired by Minecraft. Development version.
-	pkgver = 0.4.14.8.769.ge9e73d7
+	pkgver = 0.4.14.8.897.gb72980e7c
 	pkgrel = 2
 	url = http://freeminer.org/
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	license = CCPL:cc-by-sa-3.0
+	makedepends = leveldb
+	makedepends = curl
+	makedepends = hiredis
+	makedepends = sqlite
+	makedepends = luajit
+	makedepends = irrlicht
+	makedepends = openal
+	makedepends = enet
+	makedepends = jsoncpp
+	makedepends = libvorbis
+	makedepends = hicolor-icon-theme
+	makedepends = freetype2
 	makedepends = cmake
-	makedepends = git
 	makedepends = msgpack-c
 	makedepends = clang
+	makedepends = git
+	source = git+https://github.com/freeminer/freeminer.git
+	source = git+https://github.com/freeminer/default.git
+	source = git+https://github.com/kaadmy/pixture.git
+	source = fix_enet_lib.patch
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = 8bdd0226cce1a8773feb840f90c392481d5486ef2bca5b144c1626df33a0bda861d93ccfb451eb5013aa42ab6fe2b029f44c02e9b85b32ed80a6668985deeb62
+
+pkgname = freeminer-git
+	pkgdesc = An open source sandbox game inspired by Minecraft
+	depends = freeminer-common-git
 	depends = leveldb
 	depends = curl
 	depends = hiredis
 	depends = sqlite
 	depends = luajit
-	depends = xdg-utils
 	depends = irrlicht
 	depends = openal
 	depends = enet
@@ -24,16 +46,25 @@ pkgbase = freeminer-git
 	depends = libvorbis
 	depends = hicolor-icon-theme
 	depends = freetype2
-	provides = freeminer=0.4.14.8.769.ge9e73d7
+	provides = freeminer=0.4.14.8.897.gb72980e7c
 	conflicts = freeminer
-	source = git+https://github.com/freeminer/freeminer.git
-	source = git+https://github.com/freeminer/default.git
-	source = git+https://github.com/kaadmy/pixture.git
-	source = fix_enet_lib.patch
-	sha512sums = SKIP
-	sha512sums = SKIP
-	sha512sums = SKIP
-	sha512sums = 8bdd0226cce1a8773feb840f90c392481d5486ef2bca5b144c1626df33a0bda861d93ccfb451eb5013aa42ab6fe2b029f44c02e9b85b32ed80a6668985deeb62
 
-pkgname = freeminer-git
+pkgname = freeminer-server-git
+	pkgdesc = Server of an open source sandbox game inspired by Minecraft
+	depends = freeminer-common-git
+	depends = leveldb
+	depends = curl
+	depends = hiredis
+	depends = sqlite
+	depends = luajit
+	depends = enet
+	depends = jsoncpp
+	provides = freeminer-server=0.4.14.8.897.gb72980e7c
+	conflicts = freeminer-server
+
+pkgname = freeminer-common-git
+	pkgdesc = Common data files for freeminer-git and freeminer-server-git
+	arch = any
+	provides = freeminer-common=0.4.14.8.897.gb72980e7c
+	conflicts = freeminer-common
 
diff --git a/PKGBUILD b/PKGBUILD
index 34bb0ac02c53..567c3d2bf0f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,26 +2,25 @@
 # Contributor: Martin C. Doege <mdoege at compuserve dot com>
 # Contributor: kusakata <shohei atmark kusakata period com>
 
-_pkgname=freeminer
-pkgname=${_pkgname}-git
-pkgver=0.4.14.8.769.ge9e73d7
+_pkgbase=freeminer
+pkgbase="${_pkgbase}-git"
+pkgname=("${_pkgbase}-git" "${_pkgbase}-server-git" "${_pkgbase}-common-git")
+pkgver=0.4.14.8.897.gb72980e7c
 pkgrel=2
-pkgdesc='An open source sandbox game inspired by Minecraft. Development version.'
 arch=('i686' 'x86_64')
 url='http://freeminer.org/'
 license=('GPL3' 'CCPL:cc-by-sa-3.0')
 
-depends=(
-	'leveldb' 'curl' 'hiredis' 'sqlite' 'luajit' 'xdg-utils' 'irrlicht'
-	'openal' 'enet' 'jsoncpp' 'libvorbis' 'hicolor-icon-theme' 'freetype2'
+makedepends=(
+	'leveldb' 'curl' 'hiredis' 'sqlite' 'luajit'
+	'irrlicht' 'openal' 'enet' 'jsoncpp' 'libvorbis'
+	'hicolor-icon-theme' 'freetype2' 'cmake' 'msgpack-c' 'clang'
+	'git'
 )
-makedepends=('cmake' 'git' 'msgpack-c' 'clang')
-provides=("${_pkgname}=${pkgver}")
-conflicts=("${_pkgname}")
 
 source=(
-	"git+https://github.com/${_pkgname}/${_pkgname}.git"
-	"git+https://github.com/${_pkgname}/default.git"
+	"git+https://github.com/${_pkgbase}/${_pkgbase}.git"
+	"git+https://github.com/${_pkgbase}/default.git"
 	"git+https://github.com/kaadmy/pixture.git"
 	'fix_enet_lib.patch'
 )
@@ -34,16 +33,16 @@ sha512sums=(
 
 pkgver() {
 	# Updating package version
-	cd "${srcdir}"/${_pkgname}
+	cd "${srcdir}"/${_pkgbase}
 	git describe --long --tags 2>/dev/null | sed 's/-/./g'
 }
 
 prepare() {
-	cd "${srcdir}"/${_pkgname}
-	
+	cd "${srcdir}"/${_pkgbase}
+
 	# Use Arch's enet lib
 	patch -Np1 < ../fix_enet_lib.patch
-	
+
 	# Remove msgpack-c, enet and jsoncpp submodules
 	git submodule deinit src/external/{msgpack-c,enet,jsoncpp}
 	git rm --cached src/external/{msgpack-c,enet,jsoncpp}
@@ -51,31 +50,98 @@ prepare() {
 	git config -f .gitmodules --remove-section submodule.src/external/enet
 	git config -f .gitmodules --remove-section submodule.src/external/jsoncpp
 	git add .gitmodules
-	
+
 	# Configure submodules
 	git config submodule.games/default.url "${srcdir}"/default
 	git config submodule.games/pixture.url "${srcdir}"/pixture
 	git submodule update --init
-	
-	# Build directory
-	mkdir -p "${srcdir}"/build
+
+	# Create build directory
+	mkdir -p "${srcdir}"/build-{client,server}
 }
 
 build() {
-	# Building package
-	cd "${srcdir}"/build
-	cmake ../${_pkgname} \
+	# Building client
+	cd "${srcdir}"/build-client
+	cmake ../${_pkgbase} \
 		-DCMAKE_C_COMPILER=clang \
 		-DCMAKE_CXX_COMPILER=clang++ \
 		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DBUILD_CLIENT=1 \
+		-DBUILD_SERVER=0 \
+		-DRUN_IN_PLACE=0 \
+		-DENABLE_SYSTEM_JSONCPP=1 \
+		-DENABLE_SYSTEM_MSGPACK=1
+	make
+
+	# Building server
+	cd "${srcdir}"/build-server
+	cmake ../${_pkgbase} \
+		-DCMAKE_C_COMPILER=clang \
+		-DCMAKE_CXX_COMPILER=clang++ \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DBUILD_CLIENT=0 \
+		-DBUILD_SERVER=1 \
 		-DRUN_IN_PLACE=0 \
 		-DENABLE_SYSTEM_JSONCPP=1 \
 		-DENABLE_SYSTEM_MSGPACK=1
 	make
 }
 
-package() {
-	# Installing package
-	cd "${srcdir}"/build
+package_freeminer-git() {
+	pkgdesc='An open source sandbox game inspired by Minecraft'
+	depends=(
+		"${_pkgbase}-common-git" 'leveldb' 'curl' 'hiredis' 'sqlite'
+		'luajit' 'irrlicht' 'openal' 'enet' 'jsoncpp'
+		'libvorbis' 'hicolor-icon-theme' 'freetype2'
+	)
+	provides=("${_pkgbase}=${pkgver}")
+	conflicts=("${_pkgbase}")
+
+	# Installing client
+	cd "${srcdir}"/build-client
 	make DESTDIR="${pkgdir}" install
+
+	# Translations
+	cp -R locale "${pkgdir}"/usr/share/
+
+	# Provided by freeminer-common
+	rm -fR "${pkgdir}"/usr/share/{${_pkgbase},doc}
+
+	# Provided by freeminer-server
+	rm -f "${pkgdir}"/usr/share/man/man6/${_pkgbase}server.6
+}
+
+package_freeminer-server-git() {
+	pkgdesc='Server of an open source sandbox game inspired by Minecraft'
+	depends=(
+		"${_pkgbase}-common-git" 'leveldb' 'curl' 'hiredis' 'sqlite'
+		'luajit' 'enet' 'jsoncpp'
+	)
+	provides=("${_pkgbase}-server=${pkgver}")
+	conflicts=("${_pkgbase}-server")
+
+	# Installing server
+	cd "${srcdir}"/build-server
+	make DESTDIR="${pkgdir}" install
+
+	# Provided by freeminer
+	rm -fR "${pkgdir}"/usr/share/{metainfo,appdata,applications,icons}
+	rm -f "${pkgdir}"/usr/share/man/man6/${_pkgbase}.6
+
+	# Provided by freeminer-common
+	rm -fR "${pkgdir}"/usr/share/{${_pkgbase},doc}
+}
+
+package_freeminer-common-git() {
+	pkgdesc="Common data files for ${_pkgbase}-git and ${_pkgbase}-server-git"
+	arch=('any')
+	provides=("${_pkgbase}-common=${pkgver}")
+	conflicts=("${_pkgbase}-common")
+
+	# Install common data files
+	cd "${srcdir}"/${_pkgbase}
+	mkdir -p "${pkgdir}"/usr/share/${_pkgbase}/{,doc}
+	cp -R {games,builtin,client,fonts,textures} "${pkgdir}"/usr/share/${_pkgbase}/
+	cp doc/*.txt "${pkgdir}"/usr/share/${_pkgbase}/doc/
 }