[arch-commits] Commit in s-nail/trunk (PKGBUILD PKGBUILD.new)

[Gaëtan Bisson]

    Date: Sunday, July 16, 2017 @ 22:07:10
  Author: bisson
Revision: 300663

upstream update

Modified:
  s-nail/trunk/PKGBUILD
Deleted:
  s-nail/trunk/PKGBUILD.new

--------------+
 PKGBUILD     |   22 +++++++++++-----------
 PKGBUILD.new |   53 -----------------------------------------------------
 2 files changed, 11 insertions(+), 64 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-16 19:42:48 UTC (rev 300662)
+++ PKGBUILD	2017-07-16 22:07:10 UTC (rev 300663)
@@ -5,8 +5,8 @@
 # Contributor: Andreas Wagner <Andreas.Wagner at em.uni-frankfurt.de>
 
 pkgname=s-nail
-pkgver=14.8.16
-pkgrel=2
+pkgver=14.9.0
+pkgrel=1
 pkgdesc='Mail processing system with a command syntax reminiscent of ed'
 url='http://www.sdaoden.eu/code.html#s-nail'
 license=('custom:BSD')
@@ -15,7 +15,7 @@
 optdepends=('smtp-forwarder: for sending mail')
 validpgpkeys=('232C220BCB5690A37BD22FFDEB66022795F382CE')
 source=("https://www.sdaoden.eu/downloads/${pkgname}-${pkgver}.tar.xz"{,.asc})
-sha256sums=('9b6123499eea070d6f6c242661aed1522826d9fa78abc26d55e5dc2339b959df'
+sha256sums=('8e9b57f92e6ad7003c3ec48a0a985376f6a1c8df258242852cc39e02dfc887b7'
             'SKIP')
 
 groups=('base')
@@ -28,15 +28,15 @@
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	CFLAGS+=" $CPPFLAGS"
 	make \
-		PREFIX=/usr \
-		SYSCONFDIR=/etc \
-		LIBEXECDIR=/usr/lib \
-		MAILSPOOL=/var/spool/mail \
-		SID= NAIL=mail \
-		WANT_AUTOCC=0 \
+		VAL_PREFIX=/usr \
+		VAL_SYSCONFDIR=/etc \
+		VAL_LIBEXECDIR=/usr/lib \
+		VAL_MAIL=/var/spool/mail \
+		VAL_SID= VAL_MAILX=mail \
+		OPT_AUTOCC=0 \
 		config
 
-	make build
+	make MAKEJOBS=--jobs build
 }
 
 check() {
@@ -46,7 +46,7 @@
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" packager-install
+	make DESTDIR="${pkgdir}" install
 	ln -sf mail "${pkgdir}"/usr/bin/mailx
 	ln -sf mail.1.gz "${pkgdir}"/usr/share/man/man1/mailx.1.gz
 	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"

Deleted: PKGBUILD.new
===================================================================
--- PKGBUILD.new	2017-07-16 19:42:48 UTC (rev 300662)
+++ PKGBUILD.new	2017-07-16 22:07:10 UTC (rev 300663)
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 290006 2017-03-04 23:03:48Z jgc $
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s at arch@gmail.com>
-# Contributor: Andreas Wagner <Andreas.Wagner at em.uni-frankfurt.de>
-
-pkgname=s-nail
-pkgver=14.8.16
-pkgrel=2
-pkgdesc='Mail processing system with a command syntax reminiscent of ed'
-url='http://www.sdaoden.eu/code.html#s-nail'
-license=('custom:BSD')
-arch=('i686' 'x86_64')
-depends=('openssl' 'krb5' 'libidn')
-optdepends=('smtp-forwarder: for sending mail')
-validpgpkeys=('232C220BCB5690A37BD22FFDEB66022795F382CE')
-source=("https://www.sdaoden.eu/downloads/${pkgname}-${pkgver}.tar.xz"{,.asc})
-sha256sums=('9b6123499eea070d6f6c242661aed1522826d9fa78abc26d55e5dc2339b959df'
-            'SKIP')
-
-groups=('base')
-backup=('etc/mail.rc')
-replaces=('mailx' 'mailx-heirloom' 'heirloom-mailx')
-provides=('mailx' 'mailx-heirloom' 'heirloom-mailx')
-conflicts=('mailx' 'mailx-heirloom' 'heirloom-mailx')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	CFLAGS+=" $CPPFLAGS"
-	make \
-		VAL_PREFIX=/usr \
-		VAL_SYSCONFDIR=/etc \
-		VAL_LIBEXECDIR=/usr/lib \
-		VAL_MAIL=/var/spool/mail \
-		VAL_SID= VAL_MAILX=mail \
-		OPT_AUTOCC=0 \
-		config
-
-	make MAKEJOBS=--jobs build
-}
-
-check() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make test
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	ln -sf mail "${pkgdir}"/usr/bin/mailx
-	ln -sf mail.1.gz "${pkgdir}"/usr/share/man/man1/mailx.1.gz
-	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-}