From b012ec8ef909887dfa9f32d577d443dab608384a Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Thu, 12 Sep 2019 03:14:36 -0500
Subject: user/dejagnu: merge into system/dejagnu

---
 system/dejagnu/APKBUILD | 17 +++++++----------
 user/dejagnu/APKBUILD   | 37 -------------------------------------
 2 files changed, 7 insertions(+), 47 deletions(-)
 delete mode 100644 user/dejagnu/APKBUILD

diff --git a/system/dejagnu/APKBUILD b/system/dejagnu/APKBUILD
index a09fec2b1..897f75d8f 100644
--- a/system/dejagnu/APKBUILD
+++ b/system/dejagnu/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=dejagnu
-pkgver=1.6.1
+pkgver=1.6.2
 pkgrel=0
-pkgdesc="A framework for testing other programs"
+pkgdesc="Framework for testing other programs"
 url="https://www.gnu.org/software/dejagnu/"
 arch="noarch"
 license="GPL-3.0+"
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc"
 source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,14 +23,12 @@ build() {
 	make
 }
 
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
 check() {
-	cd "$builddir"
 	make check
 }
 
-sha512sums="887aa7c8b8698fe193f393b75479aad2c0724d6baa52e6f7172c48172f6546956c5f932afb574ba38b7c79e630981eeaf1d6d3c9edb3862ab5f39c5c09dce682  dejagnu-1.6.1.tar.gz"
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="ae527ce245871d49b84773d0d14b1ea6b2316c88097eeb84091a3aa885ff007eeaa1cd9c5b002d94a956d218451079b5e170561ffa43a291d9d82283aa834042  dejagnu-1.6.2.tar.gz"
diff --git a/user/dejagnu/APKBUILD b/user/dejagnu/APKBUILD
deleted file mode 100644
index 53018f36f..000000000
--- a/user/dejagnu/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: A. Wilcox <awilfox@adelielinux.org>
-# Maintainer: A. Wilcox <awilfox@adelielinux.org>
-pkgname=dejagnu
-pkgver=1.6.2
-pkgrel=0
-pkgdesc="Framework for testing other programs"
-url="https://www.gnu.org/software/dejagnu/"
-arch="noarch"
-license="GPL-3.0+"
-depends="expect"
-makedepends="$depends tcl>=8.5"
-subpackages="$pkgname-dev $pkgname-doc"
-source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="ae527ce245871d49b84773d0d14b1ea6b2316c88097eeb84091a3aa885ff007eeaa1cd9c5b002d94a956d218451079b5e170561ffa43a291d9d82283aa834042  dejagnu-1.6.2.tar.gz"
-- 
cgit v1.2.3-60-g2f50