From d18f07891795142371f648feeb8d7b8a80e30adc Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Mon, 23 Jul 2018 21:24:41 -0500
Subject: user/emacs: modernise

---
 user/emacs/APKBUILD | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'user')

diff --git a/user/emacs/APKBUILD b/user/emacs/APKBUILD
index 0092c9070..362b9ac7c 100644
--- a/user/emacs/APKBUILD
+++ b/user/emacs/APKBUILD
@@ -5,10 +5,10 @@ pkgver=26.1
 pkgrel=0
 pkgdesc="The extensible, customizable, self-documenting real-time display editor"
 arch="all"
-depends="emacs-nox"
 options="!check !dbg"
-url="https://www.gnu.org/software/emacs/emacs.html"
-license="GPL-3.0"
+url="https://www.gnu.org/software/emacs/"
+license="GPL-3.0+"
+depends="emacs-nox"
 makedepends="autoconf automake linux-headers paxmark 
 	librsvg-dev giflib-dev libxpm-dev gtk+2.0-dev gconf-dev alsa-lib-dev
 	glib-dev fontconfig-dev libpng-dev
@@ -24,7 +24,6 @@ prepare() {
 	./autogen.sh || return 1
 }
 
-builddir="$srcdir/emacs-$pkgver"
 _build_variant() {
 	cd "$builddir/$1"
 	shift
@@ -119,19 +118,19 @@ _subpackage() {
 }
 
 nox() {
-	pkgdesc="$pkgdesc - without X11"
+	pkgdesc="$pkgdesc - terminal frontend"
 	depends="!emacs-x11 !emacs-gtk2"
 	_subpackage nox
 }
 
 x11() {
-	pkgdesc="$pkgdesc - with X11"
+	pkgdesc="$pkgdesc - X11 frontend"
 	depends="!emacs-nox !emacs-gtk2 hicolor-icon-theme desktop-file-utils"
 	_subpackage x11
 }
 
 gtk2() {
-	pkgdesc="$pkgdesc - with GTK2"
+	pkgdesc="$pkgdesc - GTK+ 2 frontend"
 	depends="!emacs-nox !emacs-x11 hicolor-icon-theme desktop-file-utils"
 	_subpackage gtk2
 }
-- 
cgit v1.2.3-70-g09d2