Added a way to install troff side by side with groff and grap package.

2 files changed, 34 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6a021d4ca0da..e15702ae4659 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = troff-git
 	pkgdesc = A port of Plan9 troff tools to Linux, contains troff, tr2ps (dpost), eqn, tbl, pic, and grap.
-	pkgver = 0.r72.dc0f798
-	pkgrel = 2
+	pkgver = r78.593565b
+	pkgrel = 1
 	url = http://repo.or.cz/w/troff.git
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index ee12a9675cbc..4088e0bbdf6e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: aksr <aksr at t-com dot me>
 pkgname=troff-git
-pkgver=0.r72.dc0f798
-pkgrel=2
+pkgver=r78.593565b
+pkgrel=1
 epoch=
 pkgdesc="A port of Plan9 troff tools to Linux, contains troff, tr2ps (dpost), eqn, tbl, pic, and grap."
 arch=('i686' 'x86_64')
@@ -13,7 +13,6 @@ makedepends=('git')
 optdepends=()
 checkdepends=()
 provides=('troff')
-conflicts=('groff' 'grap')
 replaces=()
 backup=()
 options=()
@@ -26,12 +25,26 @@ sha1sums=('SKIP')
 
 pkgver() {
   cd "$srcdir/$pkgname"
-  printf "0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
+prefix="/usr"
+libdir="$prefix/lib/troff"
+docdir="/share/doc"
+## uncomment bellow to avoid conflict with groff and grap package by installing to, e.g. /opt directory
+#prefix="/opt/$pkgname"
+#libdir="$prefix/lib"
+#docdir="/doc"
+
+licensedir="/usr/share/licenses/$pkgname/"
+
+if [ "$prefix" == "/usr" ]; then
+  conflicts=('groff' 'grap')
+fi
+
 prepare() {
   cd "$srcdir/$pkgname"
-  sed -i 's/\/root\/troff\/home/\/usr\/share\/troff/ ' conf.mk
+  sed -i "s|/root/troff/home|$libdir|" conf.mk
 }
 
 build() {
@@ -42,18 +55,21 @@ build() {
 }
 
 package() {
-  mkdir -p $pkgdir/usr/share/{doc/$pkgname,licenses/$pkgname,troff}
   cd "$srcdir/$pkgname"
-  install -Dm755 eqn/eqn $pkgdir/usr/bin/eqn
-  install -Dm755 grap/grap $pkgdir/usr/bin/grap
-  install -Dm755 pic/pic $pkgdir/usr/bin/pic
-  install -Dm755 refer/refer $pkgdir/usr/bin/refer
-  install -Dm755 tbl/tbl $pkgdir/usr/bin/tbl
-  install -Dm755 troff/troff $pkgdir/usr/bin/troff
-  install -Dm755 tr2ps/tr2ps $pkgdir/usr/bin/tr2ps
-  install -Dm644 README $pkgdir/usr/share/doc/$pkgname/README
-  install -Dm644 NOTICE $pkgdir/usr/share/licenses/$pkgname/NOTICE
+  prefix=$pkgdir/$prefix
+  install -Dm755 eqn/eqn $prefix/bin/eqn
+  install -Dm755 grap/grap $prefix/bin/grap
+  install -Dm755 pic/pic $prefix/bin/pic
+  install -Dm755 refer/refer $prefix/bin/refer
+  install -Dm755 tbl/tbl $prefix/bin/tbl
+  install -Dm755 troff/troff $prefix/bin/troff
+  install -Dm755 tr2ps/tr2ps $prefix/bin/tr2ps
+  install -Dm644 README $prefix/$docdir/README
+  install -Dm644 NOTICE $pkgdir/$licensedir/NOTICE
+
+  libdir=$pkgdir/$libdir
+  mkdir -p $libdir
   cd "$srcdir/$pkgname/home"
-  cp -a font hyphen ps term tmac $pkgdir/usr/share/troff
+  cp -a font hyphen ps term tmac $libdir/
 }