Adding missing licenses, thanks to WoefulDerelict.

2 files changed, 17 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ace96e2ce982..e5bd0f539985 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,17 @@
 # Generated by mksrcinfo v8
-# Sat Feb 27 07:46:44 UTC 2016
+# Thu Apr 14 14:25:19 UTC 2016
 pkgbase = heirloom-cvs
 	pkgdesc = The Heirloom Toolchest of standard UNIX utilities, derived from original UNIX tools.
 	pkgver = 2014.07.15
-	pkgrel = 2
+	pkgrel = 3
 	url = http://heirloom.sourceforge.net/tools.html
 	arch = i686
 	arch = x86_64
-	license = custom:"opensolaris"
+	license = GPL
+	license = LGPL
 	license = custom:"lucent"
+	license = custom:"opensolaris"
+	license = custom
 	makedepends = cvs
 	makedepends = bc
 	depends = heirloom-sh-cvs
diff --git a/PKGBUILD b/PKGBUILD
index 413c13dd2bfd..a3de8d8a3733 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,11 +3,11 @@
 # Maintainer: aksr <aksr at t-com dot me>
 pkgname=heirloom-cvs
 pkgver=2014.07.15
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 pkgdesc="The Heirloom Toolchest of standard UNIX utilities, derived from original UNIX tools."
 url="http://heirloom.sourceforge.net/tools.html"
-license=('custom:"opensolaris"' 'custom:"lucent"')
+license=('GPL' 'LGPL' 'custom:"lucent"' 'custom:"opensolaris"' 'custom')
 depends=('heirloom-sh-cvs' 'heirloom-devtools-cvs')
 makedepends=('cvs' 'bc')
 source=('000-config.diff' '001-staticdep.diff' '002-nowhat.diff' 'makefile.patch')
@@ -24,33 +24,29 @@ sha256sums=('fff4800193c75b065efd85d70c88e9b85ed40bddf9fe7a742b7c8a2727a75d44'
             '0116a8bb3c1e89c073c3dc7a4b3006c69978d80998c5e9d0ae8c5aa35fcd1dae'
             '9936108bf2e226ad99d66a213649eb35ea16ccee5e2594b84c328ba4eafa2ad2')
 
-_hmake() {
-  env PATH="/usr/heirloom/bin:$PATH" MAKEFLAGS="" make "$@"
-}
-
 prepare() {
   cvs -d:pserver:anonymous:@heirloom.cvs.sourceforge.net:/cvsroot/heirloom login
   cvs -d:pserver:anonymous:@heirloom.cvs.sourceforge.net:/cvsroot/heirloom co -P heirloom
   rm -rf $srcdir/build
-  cp -ar $srcdir/heirloom $srcdir/build
-  cd "$srcdir/build"
+  cd "$srcdir/${pkgname%-*}"
   patch -p1 < ../000-config.diff
   patch -p1 < ../001-staticdep.diff
   patch -p1 < ../002-nowhat.diff
-  patch $srcdir/build/makefile -i $srcdir/makefile.patch
+  patch makefile -i ../makefile.patch
 }
 
 build() {
-  cd "$srcdir/build"
+  cd "$srcdir/${pkgname%-*}"
   make -j1
 }
 
 package() {
-  cd "$srcdir/build"
+  cd "$srcdir/${pkgname%-*}"
   make install ROOT="$pkgdir"
-  cd "$srcdir/heirloom/LICENSE"
-  install -Dm0644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  install -m0644 OPENSOLARIS.LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/OPENSOLARIS.LICENSE
-  install -m0644 LUCENT ${pkgdir}/usr/share/licenses/${pkgname}/LUCENT
+  cd "$srcdir/${pkgname%-*}"
+  cd "LICENSE/"
+  for i in COPYING COPYING.LGPL LICENSE LUCENT OPENSOLARIS.LICENSE README; do
+    install -Dm0644 $i ${pkgdir}/usr/share/licenses/${pkgname%-*}/$i
+  done
 }