Take ownership and update package

3 files changed, 42 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d80e62e54b01..cde03a2440f9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = uctags-git
 	pkgdesc = Universal ctags (patched to allow installing alongside original ctags)
-	pkgver = 0.r6004+6aa62c97
+	pkgver = r9582.966e51373
 	pkgrel = 1
 	url = https://ctags.io/
 	arch = x86_64
@@ -11,8 +11,9 @@ pkgbase = uctags-git
 	depends = jansson
 	depends = libyaml
 	depends = bash
-	source = git+https://github.com/universal-ctags/ctags.git
-	md5sums = SKIP
+	provides = ctags
+	conflicts = ctags
+	source = uctags-git::git+https://github.com/universal-ctags/ctags.git
+	sha256sums = SKIP
 
 pkgname = uctags-git
-
diff --git a/.gitignore b/.gitignore
index d414605ea1f2..b81604210d10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
-/ctags/
-/pkg/
-/src/
-*.tar.xz
+src
+pkg
+uctags-git
+*.pkg.tar.*
+tags
diff --git a/PKGBUILD b/PKGBUILD
index 4cd9311865a2..17546595dc8a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,7 @@
-# Maintainer: Craig Barnes (cbb)
+# Maintainer: Tony Lambiris <tony@libpcap.net>
 
-_gitname=ctags
 pkgname=uctags-git
-pkgver=0.r6004+6aa62c97
+pkgver=r9582.966e51373
 pkgrel=1
 pkgdesc='Universal ctags (patched to allow installing alongside original ctags)'
 arch=('x86_64')
@@ -10,28 +9,45 @@ url='https://ctags.io/'
 license=('GPL')
 depends=('libxml2' 'jansson' 'libyaml' 'bash')
 makedepends=('git' 'python-docutils')
-source=("git+https://github.com/universal-ctags/${_gitname}.git")
-md5sums=('SKIP')
+provides=('ctags')
+conflicts=('ctags')
+source=("${pkgname}::git+https://github.com/universal-ctags/ctags.git")
+sha256sums=('SKIP')
 
 pkgver() {
-    cd "$srcdir/$_gitname"
-    printf "0.r%s+%s" \
-        "$(git rev-list --count HEAD)" \
-        "$(git rev-parse --short HEAD)"
+	cd "${srcdir}/${pkgname}"
+
+	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-    cd "$srcdir/$_gitname"
+    cd "${srcdir}/${pkgname}"
+
     ./autogen.sh
     ./configure --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc
+
     make
 }
 
 package() {
-    cd "$srcdir/$_gitname"
-    install -Dm755 ctags "$pkgdir/usr/bin/uctags"
-    install -Dm755 readtags "$pkgdir/usr/bin/ureadtags"
-    MANPREFIX="$pkgdir/usr/share/man"
-    install -Dm644 man/ctags.1 "$MANPREFIX/man1/uctags.1"
-    install -Dm644 man/ctags-optlib.7 "$MANPREFIX/man7/uctags-optlib.7"
+    cd "${srcdir}/${pkgname}"
+
+    install -Dm755 ctags "${pkgdir}/usr/bin/ctags"
+    install -Dm755 readtags "${pkgdir}/usr/bin/readtags"
+    install -Dm755 optscript "${pkgdir}/usr/bin/optscript"
+
+    MANPREFIX="${pkgdir}/usr/share/man"
+	install -dm755 "${pkgdir}"/usr/share/man/man{1,5,7}
+
+	for i in man/*.1; do \
+		gzip -c "${i}" > "${MANPREFIX}/man1/$(basename ${i}).gz";
+	done
+
+	for i in man/*.5; do \
+		gzip -c "${i}" > "${MANPREFIX}/man5/$(basename ${i}).gz";
+	done
+
+	for i in man/*.7; do \
+		gzip -c "${i}" > "${MANPREFIX}/man7/$(basename ${i}).gz";
+	done
 }