remove bmake depends; package name clash fix

2 files changed, 13 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8172b4a4a157..b6f56c5030c1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
-pkgbase = leave
-	pkgdesc = program to remind you when to leave from Debian based on NetBSD sources
+pkgbase = bsd-leave
+	pkgdesc = program to remind you when to leave
 	pkgver = 1.12_2.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://ftp.de.debian.org/debian/pool/main/l/leave/
 	arch = x86_64
 	license = BSD
-	makedepends = bmake
 	depends = glibc
-	source = http://ftp.de.debian.org/debian/pool/main/l/leave/leave_1.12.orig.tar.gz
-	source = http://ftp.de.debian.org/debian/pool/main/l/leave/leave_1.12-2.1.diff.gz
+	source = http://ftp.de.debian.org/debian/pool/main/l/leave/bsd-leave_1.12.orig.tar.gz
+	source = http://ftp.de.debian.org/debian/pool/main/l/leave/bsd-leave_1.12-2.1.diff.gz
 	sha256sums = de30529de8abf49004da4120ca352d5c588a657f8845e44d5e83a4860e6bbe1f
 	sha256sums = 5e05d20357881e73c907b66716865e351b6e4e0e80eef472ff0dbe306abe19b5
 
-pkgname = leave
+pkgname = bsd-leave
diff --git a/PKGBUILD b/PKGBUILD
index 7b76214905ea..828a3e6540c2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Hans-Nikolai Viessmann <hans AT viess DOT mn>
-pkgname=leave
+pkgname=bsd-leave
 _debver=1.12
 _debrel=2.1
 pkgver="${_debver}_${_debrel}"
-pkgrel=1
-pkgdesc="program to remind you when to leave from Debian based on NetBSD sources"
+pkgrel=2
+pkgdesc="program to remind you when to leave"
 arch=('x86_64')
 url="http://ftp.de.debian.org/debian/pool/main/l/leave/"
 license=('BSD')
 depends=('glibc')
-makedepends=('bmake')
 source=("http://ftp.de.debian.org/debian/pool/main/l/leave/${pkgname}_${_debver}.orig.tar.gz"
         "http://ftp.de.debian.org/debian/pool/main/l/leave/${pkgname}_${_debver}-${_debrel}.diff.gz")
 sha256sums=('de30529de8abf49004da4120ca352d5c588a657f8845e44d5e83a4860e6bbe1f'
@@ -24,19 +23,13 @@ prepare() {
 build() {
 	cd "$pkgname-$_debver"
 
-    export USE_AWK=/usr/bin/gawk
-    export USE_INSTALL=/usr/bin/install
-    export PREFIX=/usr SYSCONFDIR=/etc MANTARGET=man MANDIR=/usr/share/man LIBEXECDIR=/usr/lib
-    # avoid BSD specific stuff
-    export CFLAGS="${CFLAGS} -D__COPYRIGHT\(x\)= -D__RCSID\(x\)="
-    bmake all
+    gcc -o leave leave.c $CFLAGS $CPPFLAGS -D__COPYRIGHT\(x\)= -D__RCSID\(x\)= $LDFLAGS
 }
 
 package() {
 	cd "$pkgname-$_debver"
 
-    install -D -m 0644 debian/copyright ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
-    export PREFIX=/usr SYSCONFDIR=/etc MANTARGET=man MANDIR=/usr/share/man LIBEXECDIR=/usr/lib
-	bmake DESTDIR="$pkgdir/" install
+    install -Dm644 debian/copyright ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    install -Dm755 leave "$pkgdir"/usr/bin/leave
+    install -Dm644 leave.1 "$pkgdir"/usr/share/man/man1/leave.1
 }