[arch-commits] Commit in dbmail/trunk (6 files)

[Sergej Pupykin]

    Date: Thursday, September 5, 2013 @ 19:24:24
  Author: spupykin
Revision: 96799

clean up

Modified:
  dbmail/trunk/PKGBUILD
Deleted:
  dbmail/trunk/dbmail-imapd.service
  dbmail/trunk/dbmail-lmtpd.service
  dbmail/trunk/dbmail-pop3d.service
  dbmail/trunk/dbmail-timsieved.service
  dbmail/trunk/dbmail.tmpfiles

--------------------------+
 PKGBUILD                 |   24 ++++++------------------
 dbmail-imapd.service     |   11 -----------
 dbmail-lmtpd.service     |   11 -----------
 dbmail-pop3d.service     |   11 -----------
 dbmail-timsieved.service |   11 -----------
 dbmail.tmpfiles          |    1 -
 6 files changed, 6 insertions(+), 63 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-05 16:17:45 UTC (rev 96798)
+++ PKGBUILD	2013-09-05 17:24:24 UTC (rev 96799)
@@ -20,12 +20,7 @@
 	etc/xinetd.d/dbmail-pop3d
 	etc/xinetd.d/dbmail-lmtpd
 	etc/xinetd.d/dbmail-timsieved)
-source=(http://www.dbmail.org/download/3.1/dbmail-${pkgver/_/-}.tar.gz
-	dbmail.tmpfiles
-	dbmail-imapd.service
-	dbmail-lmtpd.service
-	dbmail-pop3d.service
-	dbmail-timsieved.service
+source=(http://www.dbmail.org/download/3.1/dbmail-${pkgver}.tar.gz
 	dbmail-imapd.xinetd
 	dbmail-lmtpd.xinetd
 	dbmail-pop3d.xinetd
@@ -41,24 +36,20 @@
          '4cb764894abd3914802e90602bf90a0c'
          'e78dc86355f9aaf24590bc7c6611162f')
 
-prepare() {
-  cd $srcdir/dbmail-${pkgver/_/-}/
-}
-
 build() {
-  cd $srcdir/dbmail-${pkgver/_/-}/
+  cd $srcdir/dbmail-${pkgver}/
   [ -f Makefile ] || ./configure \
     --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \
-    --with-ldap --with-sieve
+    --with-ldap --with-sieve --enable-systemd
   make
+  make -C man
 }
 
 package() {
-  cd $srcdir/dbmail-${pkgver/_/-}/
+  cd $srcdir/dbmail-${pkgver}/
   make DESTDIR=$pkgdir install
-  (cd man && make && make install DESTDIR=$pkgdir)
+  make DESTDIR=$pkgdir install -C man
 
-  mkdir $pkgdir/etc
   install -Dm644 dbmail.conf $pkgdir/etc/dbmail.conf.sample
   mkdir $pkgdir/usr/share/dbmail
   cp -r sql/* $pkgdir/usr/share/dbmail/
@@ -66,9 +57,6 @@
   cp dbmail.schema $pkgdir/usr/share/dbmail/
 
   for i in dbmail-imapd dbmail-lmtpd dbmail-pop3d dbmail-timsieved; do
-    install -Dm0644 $srcdir/$i.service $pkgdir/usr/lib/systemd/system/$i.service
     install -Dm0644 $srcdir/$i.xinetd $pkgdir/etc/xinetd.d/$i
   done
-
-  install -Dm0644 $srcdir/dbmail.tmpfiles $pkgdir/usr/lib/tmpfiles.d/dbmail.conf
 }

Deleted: dbmail-imapd.service
===================================================================
--- dbmail-imapd.service	2013-09-05 16:17:45 UTC (rev 96798)
+++ dbmail-imapd.service	2013-09-05 17:24:24 UTC (rev 96799)
@@ -1,11 +0,0 @@
-[Unit]
-Description=DBMail Imap Server
-After=syslog.target network.target mysqld.service postgresql.service
-
-[Service]
-Type=forking
-PIDFile=/run/dbmail/dbmail-imapd.pid
-ExecStart=/usr/bin/dbmail-imapd -p /run/dbmail/dbmail-imapd.pid
-
-[Install]
-WantedBy=multi-user.target

Deleted: dbmail-lmtpd.service
===================================================================
--- dbmail-lmtpd.service	2013-09-05 16:17:45 UTC (rev 96798)
+++ dbmail-lmtpd.service	2013-09-05 17:24:24 UTC (rev 96799)
@@ -1,11 +0,0 @@
-[Unit]
-Description=DBMail LMTP Server
-After=syslog.target network.target mysqld.service postgresql.service
-
-[Service]
-Type=forking
-PIDFile=/run/dbmail/dbmail-lmtpd.pid
-ExecStart=/usr/bin/dbmail-lmtpd -p /run/dbmail/dbmail-lmtpd.pid
-
-[Install]
-WantedBy=multi-user.target

Deleted: dbmail-pop3d.service
===================================================================
--- dbmail-pop3d.service	2013-09-05 16:17:45 UTC (rev 96798)
+++ dbmail-pop3d.service	2013-09-05 17:24:24 UTC (rev 96799)
@@ -1,11 +0,0 @@
-[Unit]
-Description=DBMail pop3 Server
-After=syslog.target network.target mysqld.service postgresql.service
-
-[Service]
-Type=forking
-PIDFile=/run/dbmail/dbmail-pop3d.pid
-ExecStart=/usr/bin/dbmail-pop3d -p /run/dbmail/dbmail-pop3d.pid
-
-[Install]
-WantedBy=multi-user.target

Deleted: dbmail-timsieved.service
===================================================================
--- dbmail-timsieved.service	2013-09-05 16:17:45 UTC (rev 96798)
+++ dbmail-timsieved.service	2013-09-05 17:24:24 UTC (rev 96799)
@@ -1,11 +0,0 @@
-[Unit]
-Description=DBMail Sieve Server
-After=syslog.target network.target mysqld.service postgresql.service
-
-[Service]
-Type=forking
-PIDFile=/run/dbmail/dbmail-timsieved.pid
-ExecStart=/usr/bin/dbmail-timsieved -p /run/dbmail/dbmail-timsieved.pid
-
-[Install]
-WantedBy=multi-user.target

Deleted: dbmail.tmpfiles
===================================================================
--- dbmail.tmpfiles	2013-09-05 16:17:45 UTC (rev 96798)
+++ dbmail.tmpfiles	2013-09-05 17:24:24 UTC (rev 96799)
@@ -1 +0,0 @@
-d /run/dbmail 0755 nobody nobody -