update the dependency on fbterm

Other changes:
- Use the 'source' field to specify git repo, instead of cloning
the repo in 'build' function.
- Use common versioning method for git repos.
- Fixed the format and grammar of the install message.
- Deleted irrelevant install messages.

3 files changed, 30 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 43526641488a..f5323a475624 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,16 @@
 pkgbase = fcitx-fbterm-git
-	pkgdesc = add fbterm support to fcitx
-	pkgver = 20110825
+	pkgdesc = Fbterm support for fcitx
+	pkgver = 0.2.0.r1.ga0ecce1
 	pkgrel = 1
 	url = https://github.com/fcitx/fcitx-fbterm
 	install = fcitx-fbterm-git.install
 	arch = x86_64
 	arch = i686
 	license = GPLv2
-	depends = fbterm-git
+	depends = fbterm
 	depends = fcitx
 	provides = fcitx-fbterm
+	source = git+https://github.com/fcitx/fcitx-fbterm
+	md5sums = SKIP
 
 pkgname = fcitx-fbterm-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 41a5329d441f..f970618ee373 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,36 @@
-## Maintainer: realasking
+## Maintainer: OliverLew <oliver_lew at outlook dot com>
+## Contributor: realasking
+_pkgname=fcitx-fbterm
 pkgname=fcitx-fbterm-git
-pkgver=20110825
+pkgver=0.2.0.r1.ga0ecce1
 pkgrel=1
-pkgdesc='add fbterm support to fcitx'
+pkgdesc='Fbterm support for fcitx'
 arch=(x86_64 i686)
 url='https://github.com/fcitx/fcitx-fbterm'
 license=('GPLv2')
-depends=('fbterm-git' 'fcitx')
+depends=('fbterm' 'fcitx')
 provides=('fcitx-fbterm')
-source=()
-md5sums=()
-install="${pkgname}.install"
+source=("git+https://github.com/fcitx/$_pkgname")
+md5sums=('SKIP')
+install=$pkgname.install
 
-_proj=https://github.com/fcitx/fcitx-fbterm.git
-_name=fcitx-fbterm
+pkgver() {
+	cd "$_pkgname"
+	( set -o pipefail
+	  git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+	  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	)
+}
 
 build() {
-	cd "$srcdir" 
-	msg "Starting Git..."
-	if [[ -d "$_proj" ]]; then
-	    cd "$_proj" 
-	    git pull origin
-	else
-	    git clone "$_proj" "$_name"
-	fi
-	msg "Project synchronization Finished."
-	msg "Starting build..."
-	
-	cd "$_name"
-	mkdir build 
-	cd build 
+	cd "$_pkgname"
+	mkdir -p build
+	cd build
 	cmake .. -DCMAKE_INSTALL_PREFIX=/usr
 	make
 }
 
 package() {
-	cd "$srcdir/$_name/build"
-	make DESTDIR="${pkgdir}" install 
+	cd "$_pkgname/build"
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/fcitx-fbterm-git.install b/fcitx-fbterm-git.install
index 5b33c9a69d2a..53a041b861ce 100644
--- a/fcitx-fbterm-git.install
+++ b/fcitx-fbterm-git.install
@@ -1,19 +1,15 @@
 post_install() {
 	cat <<EOF
 
-Before run this application at first time, please type listed commands below:
+Before running this application for the first time, please run the following commands:
 
-sudo gpasswd -a YOUR_USERNAME video 
-sudo setcap 'cap_sys_tty_config+ep' /usr/bin/fbterm 
-sudo chmod u+s /usr/bin/fbterm 
+sudo gpasswd -a YOUR_USERNAME video
+sudo setcap 'cap_sys_tty_config+ep' /usr/bin/fbterm
+sudo chmod u+s /usr/bin/fbterm
 
 And then add this line to your .fbtermrc:
 
 input-method=fcitx-fbterm
-
-If you want to display and input Chinese characters when you login to the tty without typing a series commands, please add this line to your .bashrc:
-
-[[ \$(tty) == \/dev\/tty[0-9]* ]] && /usr/bin/fbterm && exit
 EOF
 }