[arch-commits] Commit in mailx/trunk (PKGBUILD mailx-8.1.1.patch mailx-destdir.patch)

[Allan McRae]

    Date: Friday, November 19, 2010 @ 08:27:02
  Author: allan
Revision: 99907

begin PKGBUILD clean-up

Added:
  mailx/trunk/mailx-destdir.patch
    (from rev 99902, mailx/trunk/mailx-8.1.1.patch)
Modified:
  mailx/trunk/PKGBUILD
Deleted:
  mailx/trunk/mailx-8.1.1.patch

---------------------+
 PKGBUILD            |   22 +++++++++++++++-------
 mailx-8.1.1.patch   |   32 --------------------------------
 mailx-destdir.patch |   32 ++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-19 13:17:21 UTC (rev 99906)
+++ PKGBUILD	2010-11-19 13:27:02 UTC (rev 99907)
@@ -1,6 +1,7 @@
 # $Id$
-# Maintainer: judd <jvinet at zeroflux.org>
+# Maintainer:
 # Committer: Judd Vinet <jvinet at zeroflux.org>
+
 pkgname=mailx
 pkgver=8.1.1
 pkgrel=7
@@ -13,16 +14,23 @@
 optdepends=('smtp-forwarder: for sending mail')
 backup=('etc/mail.rc')
 source=(ftp://ftp.archlinux.org/other/mailx/$pkgname-$pkgver-fixed.tar.gz \
-        mailx-$pkgver.patch mailx-gcc4.patch)
-md5sums=('63cad526ac64b57bcba2c0daaa1f3048' '905cfa35b5131524bfec0c677d456bd3'\
+        mailx-destdir.patch
+        mailx-gcc4.patch)
+md5sums=('63cad526ac64b57bcba2c0daaa1f3048'
+         'd8037e4454d2455603de5137fb776182'
          '8716c7c7b3f5d348443230e2fe543bf6')
 
 build() {
   cd $srcdir/$pkgname-$pkgver-fixed
-  patch -Np1 -i $srcdir/mailx-$pkgver.patch || return 1
-  patch -Np0 -i $srcdir/mailx-gcc4.patch || return 1
-  sed -i 's#/man/#/share/man/#' Makefile
-  make all || return 1
+  
+  patch -Np1 -i $srcdir/mailx-destdir.patch
+  patch -Np0 -i $srcdir/mailx-gcc4.patch
+
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver-fixed
   make DESTDIR=$pkgdir install
   
   install -dm755 $pkgdir/usr/share/licenses/mailx/

Deleted: mailx-8.1.1.patch
===================================================================
--- mailx-8.1.1.patch	2010-11-19 13:17:21 UTC (rev 99906)
+++ mailx-8.1.1.patch	2010-11-19 13:27:02 UTC (rev 99907)
@@ -1,32 +0,0 @@
-diff -Naur mailx-8.1.1-fixed-orig/Makefile mailx-8.1.1-fixed/Makefile
---- mailx-8.1.1-fixed-orig/Makefile	Thu Mar 16 09:30:36 2000
-+++ mailx-8.1.1-fixed/Makefile	Wed Feb 27 12:50:09 2002
-@@ -7,18 +7,20 @@
- BINOWN = root
- BINGRP = mail
- 
-+DESTDIR = 
-+
- all:
- 	gcc $(SRCS) -o $(PROG)
- 
- install:
--	mkdir -p /usr/share/misc
--	mkdir -p /usr/share/man/man1
--	mkdir -p /etc
--	mkdir -p /usr/bin
--	install -o $(BINOWN) -g $(BINGRP) -m 2755 $(PROG) /usr/bin
--	install -o root -g root -m 644 mail.1 /usr/share/man/man1
-+	mkdir -p $(DESTDIR)/usr/share/misc
-+	mkdir -p $(DESTDIR)/usr/man/man1
-+	mkdir -p $(DESTDIR)/etc
-+	mkdir -p $(DESTDIR)/usr/bin
-+	install -o $(BINOWN) -g $(BINGRP) -m 2755 $(PROG) $(DESTDIR)/usr/bin
-+	install -o root -g root -m 644 mail.1 $(DESTDIR)/usr/man/man1
- 	cd misc; install -c -o ${BINOWN} -g ${BINGRP} \
--	    -m 444 ${SFILES} /usr/share/misc
-+	    -m 444 ${SFILES} $(DESTDIR)/usr/share/misc
- 	cd misc; install -c -o root -g root \
--	    -m 644 ${EFILES} /etc
-+	    -m 644 ${EFILES} $(DESTDIR)/etc
- 

Copied: mailx/trunk/mailx-destdir.patch (from rev 99902, mailx/trunk/mailx-8.1.1.patch)
===================================================================
--- mailx-destdir.patch	                        (rev 0)
+++ mailx-destdir.patch	2010-11-19 13:27:02 UTC (rev 99907)
@@ -0,0 +1,32 @@
+diff -Naur mailx-8.1.1-fixed-orig/Makefile mailx-8.1.1-fixed/Makefile
+--- mailx-8.1.1-fixed-orig/Makefile	Thu Mar 16 09:30:36 2000
++++ mailx-8.1.1-fixed/Makefile	Wed Feb 27 12:50:09 2002
+@@ -7,18 +7,20 @@
+ BINOWN = root
+ BINGRP = mail
+ 
++DESTDIR = 
++
+ all:
+ 	gcc $(SRCS) -o $(PROG)
+ 
+ install:
+-	mkdir -p /usr/share/misc
+-	mkdir -p /usr/share/man/man1
+-	mkdir -p /etc
+-	mkdir -p /usr/bin
+-	install -o $(BINOWN) -g $(BINGRP) -m 2755 $(PROG) /usr/bin
+-	install -o root -g root -m 644 mail.1 /usr/share/man/man1
++	mkdir -p $(DESTDIR)/usr/share/misc
++	mkdir -p $(DESTDIR)/usr/share/man/man1
++	mkdir -p $(DESTDIR)/etc
++	mkdir -p $(DESTDIR)/usr/bin
++	install -o $(BINOWN) -g $(BINGRP) -m 2755 $(PROG) $(DESTDIR)/usr/bin
++	install -o root -g root -m 644 mail.1 $(DESTDIR)/usr/share/man/man1
+ 	cd misc; install -c -o ${BINOWN} -g ${BINGRP} \
+-	    -m 444 ${SFILES} /usr/share/misc
++	    -m 444 ${SFILES} $(DESTDIR)/usr/share/misc
+ 	cd misc; install -c -o root -g root \
+-	    -m 644 ${EFILES} /etc
++	    -m 644 ${EFILES} $(DESTDIR)/etc
+