...

4 files changed, 21 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b8e253dcedea..91ee34b79eca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mailx-git
 	pkgdesc = A small mailx clone, optimized to handle large mbox files.
 	pkgver = r134.8d4e5b7
-	pkgrel = 1
+	pkgrel = 2
 	url = http://repo.or.cz/w/mailx.git
 	install = mailx-git.install
 	arch = i686
@@ -10,14 +10,10 @@ pkgbase = mailx-git
 	makedepends = git
 	optdepends = pop3-git: A simple pop3 mail client.
 	optdepends = smtp-git: A simple smtp mail sender.
+	provides = mailx
 	source = mailx-git::git://repo.or.cz/mailx.git
 	source = config.h
 	md5sums = SKIP
 	md5sums = 7972f21dfbe0d3dcaee90bc217edd389
-	sha1sums = SKIP
-	sha1sums = 0f67056328d0a8542984db302caa4fbc68fc7cc0
-	sha256sums = SKIP
-	sha256sums = 7a6fcea1421ba128941c4f3c8598dbb1285ae84daf3315288e6c891902aae47d
 
 pkgname = mailx-git
-
diff --git a/PKGBUILD b/PKGBUILD
index f025045e6da4..07e1fa48e795 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,54 +1,39 @@
 # Maintainer: aksr <aksr at t-com dot me>
 pkgname=mailx-git
 pkgver=r134.8d4e5b7
-pkgrel=1
-epoch=
-pkgdesc="A small mailx clone, optimized to handle large mbox files."
+pkgrel=2
+pkgdesc='A small mailx clone, optimized to handle large mbox files.'
 arch=('i686' 'x86_64')
-url="http://litcave.rudi.ir/"
-url="http://repo.or.cz/w/mailx.git"
+url='http://litcave.rudi.ir/'
+url='http://repo.or.cz/w/mailx.git'
 license=('custom:BSD')
-groups=()
-depends=('')
 makedepends=('git')
 optdepends=('pop3-git: A simple pop3 mail client.' 
             'smtp-git: A simple smtp mail sender.')
 checkdepends=()
-provides=('')
-conflicts=('')
-replaces=()
-backup=()
-options=()
-changelog=
-install=${pkgname}.install
-source=("$pkgname::git://repo.or.cz/mailx.git"
-         config.h)
-noextract=()
+provides=("${pkgname%-*}")
+install="${pkgname}".install
+source=("$pkgname::git://repo.or.cz/mailx.git" config.h)
 md5sums=('SKIP'
          '7972f21dfbe0d3dcaee90bc217edd389')
-sha1sums=('SKIP'
-          '0f67056328d0a8542984db302caa4fbc68fc7cc0')
-sha256sums=('SKIP'
-            '7a6fcea1421ba128941c4f3c8598dbb1285ae84daf3315288e6c891902aae47d')
 
 pkgver() {
-  cd "$srcdir/$pkgname"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	cd "$srcdir/$pkgname"
+	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-  cd $srcdir/$pkgname
-  cp ../config.h config.h
+	cd $srcdir/$pkgname
+	cp ../config.h config.h
 }
 
 build() {
-  cd $srcdir/$pkgname
-  make
+	cd $srcdir/$pkgname
+	make
 }
 
 package() {
-  cd "$srcdir/$pkgname"
-  install -Dm755 mailx  $pkgdir/usr/bin/neatmailx
-  install -Dm644 README $pkgdir/usr/share/doc/$pkgname/README
+	cd "$srcdir/$pkgname"
+	install -Dm755 mailx  $pkgdir/usr/bin/neatmailx
+	install -Dm644 README $pkgdir/usr/share/doc/$pkgname/README
 }
-
diff --git a/config.h b/config.h
index 41c1fc639eee..3e885d1fd1d8 100644
--- a/config.h
+++ b/config.h
@@ -1,6 +1,6 @@
 #define PAGER			"pg"
 #define EDITOR			"vi"
-#define VISUAL			"vi"
+#define VISUAL			"vim"
 #define SENDMAIL		"sendmail"
 #define FOLDER			"/home/me/.mailx/"
 #define RECORD			"+inbox"
diff --git a/mailx-git.install b/mailx-git.install
index 768261a29042..6c028747d3be 100644
--- a/mailx-git.install
+++ b/mailx-git.install
@@ -1,5 +1,4 @@
 post_install(){
-  echo "==> Renamed to neatmailx to avoid conflict with other mailx packages."
-  echo "    To use mailx you need to edit 'config.h'."
+	echo "==> Renamed to neatmailx to avoid conflict with other mailx packages."
+	echo "    To use mailx you need to edit 'config.h'."
 }
-