[arch-commits] Commit in postfix/repos (3 files)

[Eric Belanger]

    Date: Sunday, May 11, 2008 @ 00:25:32
  Author: eric
Revision: 1489

fixing svn conflict

Modified:
  postfix/repos/extra-i686/	(properties)
  postfix/repos/extra-i686/PKGBUILD
  postfix/repos/extra-i686/postfix.install

-----------------+
 PKGBUILD        |   13 +++++--------
 postfix.install |    5 -----
 2 files changed, 5 insertions(+), 13 deletions(-)


Property changes on: postfix/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /postfix/trunk:1
   + /postfix/trunk:1-1488

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-05-11 04:13:14 UTC (rev 1488)
+++ extra-i686/PKGBUILD	2008-05-11 04:25:32 UTC (rev 1489)
@@ -2,7 +2,7 @@
 # Contributor: Jeff Brodnax <tullyarcher at bellsouth.net>
 # Maintainer: Dale Blount <dale at archlinux.org>
 pkgname=postfix
-pkgver=2.5.1
+pkgver=2.4.7
 pkgrel=1
 pkgdesc="Secure, fast, easy to administer drop in replacement for Sendmail (MTA)"
 arch=(i686 x86_64)
@@ -19,12 +19,9 @@
 url="http://www.postfix.org/"
 source=(ftp://ftp.porcupine.org/mirrors/postfix-release/official/$pkgname-$pkgver.tar.gz \
         $pkgname.patch.bz2 \
-	$pkgname \
-	$pkgname.install)
-md5sums=('95a559c509081fdd07d78eafd4f4c3b4'
-         'a3c45ff23ef036143711793fcf2478c3'
-         '35f0bc4d5a318d27fda3f79551a0e923'
-         '469ce1ce887bafb2afd243c4c64c843a')
+	$pkgname)
+md5sums=('bf7cf64513bb701347665b0440019884' 'a3c45ff23ef036143711793fcf2478c3'\
+         '35f0bc4d5a318d27fda3f79551a0e923')
 
 build() {
 	cd $startdir/src/$pkgname-$pkgver
@@ -43,7 +40,7 @@
 		install_root="$startdir/pkg" \
 		daemon_directory="/usr/lib/$pkgname" \
 		sample_directory="/etc/$pkgname/sample" \
-		manpage_directory="/usr/man"
+		manpage_directory="/usr/share/man"
 
 	cd $startdir/pkg
 	cat $startdir/src/$pkgname.patch |patch -Np0 || return 1

Modified: extra-i686/postfix.install
===================================================================
--- extra-i686/postfix.install	2008-05-11 04:13:14 UTC (rev 1488)
+++ extra-i686/postfix.install	2008-05-11 04:25:32 UTC (rev 1489)
@@ -35,8 +35,3 @@
     groupdel postfix &> /dev/null
     groupdel postdrop &> /dev/null
 }
-
-op=$1
-shift
-
-$op $*