[arch-commits] Commit in imap/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Pierre Schmitz]

    Date: Friday, August 7, 2009 @ 11:43:14
  Author: pierre
Revision: 49411

Merged revisions 49410 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/imap/trunk

........
  r49410 | pierre | 2009-08-07 17:42:40 +0200 (Fr, 07 Aug 2009) | 2 lines
  
  upgpkg: imap 2007e-1
      upstream update and a little cleanup
........

Modified:
  imap/repos/extra-x86_64/	(properties)
  imap/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)


Property changes on: imap/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /imap/trunk:1-21672
   + /imap/trunk:1-49410

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-08-07 15:42:40 UTC (rev 49410)
+++ extra-x86_64/PKGBUILD	2009-08-07 15:43:14 UTC (rev 49411)
@@ -1,19 +1,19 @@
 # $Id$
 # Maintainer: judd <jvinet at zeroflux.org>
 pkgname=imap
-pkgver=2007d
+pkgver=2007e
 pkgrel=1
 pkgdesc="An IMAP/POP server"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('APACHE')
 url="http://www.washington.edu/imap"
 depends=('openssl' 'pam')
 provides=('imap-server' 'pop3-server')
 conflicts=('courier-mta' 'courier-imap')
-source=(ftp://ftp.cac.washington.edu/imap/${pkgname}-${pkgver}.tar.Z \
-  imap ipop2 ipop3)
+source=("ftp://ftp.cac.washington.edu/imap/${pkgname}-${pkgver}.tar.gz"
+        'imap' 'ipop2' 'ipop3')
 backup=(etc/xinetd.d/{imap,ipop2,ipop3} etc/ssl/certs/{imapd,ipop3d}.pem)
-md5sums=('80cdf8366a69417818f4d73181f16b9d'
+md5sums=('7903800dc2604000016de070e0c55840'
          'e77dedb80c2fec9bf2ef784ed5f976fb'
 	 'cc3eba6453242aa0b1bc8881160b2136'
 	 '0a5e27183a9b7e8ec5f6703125371e0a')
@@ -21,7 +21,7 @@
 
 build() {
   # fix Makefile
-  cd $startdir/src/$pkgname-$pkgver/src/osdep/unix
+  cd $srcdir/$pkgname-$pkgver/src/osdep/unix
   cp Makefile Makefile.orig
   sed \
     -e "s:-g -fno-omit-frame-pointer -O6:\${CFLAGS}:" \
@@ -29,7 +29,7 @@
     -e "s:SSLCERTS=\$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:" \
     < Makefile.orig > Makefile
 
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   # NOTE: if you wish to enforce SSL, use SSLTYPE=unix.nopwd
 
 if [ "$CARCH" == "x86_64" ]; then
@@ -37,16 +37,16 @@
   else	yes "y" | make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix || return 1
 fi
 
-  mkdir -p $startdir/pkg/usr/sbin
-  install -D -m755 imapd/imapd $startdir/pkg/usr/sbin/imapd
-  install -D -m755 ipopd/ipop2d $startdir/pkg/usr/sbin/ipop2d
-  install -D -m755 ipopd/ipop3d $startdir/pkg/usr/sbin/ipop3d
+  mkdir -p $pkgdir/usr/sbin
+  install -D -m755 imapd/imapd $pkgdir/usr/sbin/imapd
+  install -D -m755 ipopd/ipop2d $pkgdir/usr/sbin/ipop2d
+  install -D -m755 ipopd/ipop3d $pkgdir/usr/sbin/ipop3d
   for i in c-client mail imap4r1 rfc822 linkage misc smtp nntp \
     osdep env_unix env fs ftl nl tcp sslio utf8 utf8aux; do
-    install -D -m644 c-client/${i}.h $startdir/pkg/usr/include/imap/${i}.h
+    install -D -m644 c-client/${i}.h $pkgdir/usr/include/imap/${i}.h
   done
-  install -D -m644 c-client/c-client.a $startdir/pkg/usr/lib/c-client.a
-  ln -sf c-client.a $startdir/pkg/usr/lib/libc-client.a
+  install -D -m644 c-client/c-client.a $pkgdir/usr/lib/c-client.a
+  ln -sf c-client.a $pkgdir/usr/lib/libc-client.a
 
   # create ssl certs for secure imap
   for i in imapd ipop3d; do
@@ -72,11 +72,11 @@
   done
 
   # install 'em
-  install -D -m600 imapd.pem $startdir/pkg/etc/ssl/certs/imapd.pem
-  install -D -m600 ipop3d.pem $startdir/pkg/etc/ssl/certs/ipop3d.pem
+  install -D -m600 imapd.pem $pkgdir/etc/ssl/certs/imapd.pem
+  install -D -m600 ipop3d.pem $pkgdir/etc/ssl/certs/ipop3d.pem
 
   # install xinetd.d configs
-  install -D -m644 ../imap $startdir/pkg/etc/xinetd.d/imap
-  install -D -m644 ../ipop2 $startdir/pkg/etc/xinetd.d/ipop2
-  install -D -m644 ../ipop3 $startdir/pkg/etc/xinetd.d/ipop3
+  install -D -m644 ../imap $pkgdir/etc/xinetd.d/imap
+  install -D -m644 ../ipop2 $pkgdir/etc/xinetd.d/ipop2
+  install -D -m644 ../ipop3 $pkgdir/etc/xinetd.d/ipop3
 }