upgpkg: obfs4-git 130.69ffcc3-1

Clean up package a bit

2 files changed, 34 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 22a449395035..079cb7a34076 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,18 @@
 pkgbase = obfs4-git
-	pkgdesc = The obfourscator - tor project
+	pkgdesc = The obfourscator - a pluggable transport proxy written in Go
 	pkgver = 130.69ffcc3
 	pkgrel = 1
 	url = https://gitweb.torproject.org/pluggable-transports/obfs4.git/
 	arch = i686
 	arch = x86_64
-	license = custom
-	makedepends = go
+	license = BSD
 	makedepends = git
+	makedepends = go
+	optdepends = tor: you need tor to use this package
+	provides = obfs4proxy
+	conflicts = obfs4proxy
 	source = git+https://git.torproject.org/pluggable-transports/obfs4.git
-	sha1sums = SKIP
+	sha256sums = SKIP
 
 pkgname = obfs4-git
 
diff --git a/PKGBUILD b/PKGBUILD
index fd385466d55a..45c8a4ce5595 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,38 @@
-# Maintainer: FzerorubigD <Fzerorubigd {AT} GMail {DOT} com>
+# Maintainer: mutantmonkey <aur@mutantmonkey.in>
+# Contributor: shyokou <shyokou at gmail dot com>
+# Contributor: FzerorubigD <Fzerorubigd {AT} GMail {DOT} com>
 pkgname=obfs4-git
+_gitname=obfs4
 pkgver=130.69ffcc3
 pkgrel=1
-pkgdesc="The obfourscator - tor project"
+pkgdesc='The obfourscator - a pluggable transport proxy written in Go'
 arch=('i686' 'x86_64')
-url="https://gitweb.torproject.org/pluggable-transports/obfs4.git/"
-license=('custom')
-depends=()
-makedepends=('go' 'git')
+url='https://gitweb.torproject.org/pluggable-transports/obfs4.git/'
+license=('BSD')
+conflicts=('obfs4proxy')
+provides=('obfs4proxy')
+makedepends=('git' 'go')
+optdepends=('tor: you need tor to use this package')
 source=('git+https://git.torproject.org/pluggable-transports/obfs4.git')
+sha256sums=('SKIP')
+_gourl=git.torproject.org/pluggable-transports/obfs4.git/obfs4proxy
 
-sha1sums=('SKIP')
-
-_gitname=obfs4
-
-pkgver() {
-        cd "${srcdir}/${_gitname}"
-        echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+pkgver()	{
+  cd $_gitname
+  echo $(git rev-list --count master).$(git rev-parse --short master)
 }
 
-build() {
-	mkdir -p ${srcdir}/src/${_gitname}
-        cd "${srcdir}/${_gitname}"
-	git --work-tree=${srcdir}/src/${_gitname} checkout -f master
-	cd ${srcdir}/src/${_gitname}/obfs4proxy
-	GOPATH=${srcdir} go get -v
+build()	{
+  cd "${srcdir}/${_gitname}/obfs4proxy"
+  GOPATH="$srcdir" go get -v -x ${_gourl}/...
 }
 
-package() {
-  mkdir -p $pkgdir/usr/bin
-  install -m755 $srcdir/bin/obfs4proxy $pkgdir/usr/bin/obfs4proxy
+package()	{
+  cd "$srcdir"
+  install -Dm0755 bin/obfs4proxy "${pkgdir}/usr/bin/obfs4proxy"
+  install -Dm0644 ${_gitname}/doc/obfs4proxy.1 "${pkgdir}/usr/share/man/man1/obfs4proxy.1"
+  install -Dm0644 ${_gitname}/ChangeLog "${pkgdir}/usr/share/doc/${pkgname}/ChangeLog"
+  install -Dm0644 ${_gitname}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
+
+## vim:set ts=2 sw=2 et: