[arch-commits] Commit in mailutils/repos (10 files)
Sergej Pupykin
spupykin at nymeria.archlinux.org
Wed May 29 10:59:29 UTC 2013
Date: Wednesday, May 29, 2013 @ 12:59:29
Author: spupykin
Revision: 91917
archrelease: copy trunk to community-i686, community-x86_64
Added:
mailutils/repos/community-i686/PKGBUILD
(from rev 91916, mailutils/trunk/PKGBUILD)
mailutils/repos/community-i686/build-fix.patch
(from rev 91916, mailutils/trunk/build-fix.patch)
mailutils/repos/community-i686/mailutils.install
(from rev 91916, mailutils/trunk/mailutils.install)
mailutils/repos/community-x86_64/PKGBUILD
(from rev 91916, mailutils/trunk/PKGBUILD)
mailutils/repos/community-x86_64/build-fix.patch
(from rev 91916, mailutils/trunk/build-fix.patch)
mailutils/repos/community-x86_64/mailutils.install
(from rev 91916, mailutils/trunk/mailutils.install)
Deleted:
mailutils/repos/community-i686/PKGBUILD
mailutils/repos/community-i686/mailutils.install
mailutils/repos/community-x86_64/PKGBUILD
mailutils/repos/community-x86_64/mailutils.install
------------------------------------+
/PKGBUILD | 84 +++++++++++++++++++++++++++++++++++
/mailutils.install | 40 ++++++++++++++++
community-i686/PKGBUILD | 46 -------------------
community-i686/build-fix.patch | 13 +++++
community-i686/mailutils.install | 20 --------
community-x86_64/PKGBUILD | 46 -------------------
community-x86_64/build-fix.patch | 13 +++++
community-x86_64/mailutils.install | 20 --------
8 files changed, 150 insertions(+), 132 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-05-29 10:59:09 UTC (rev 91916)
+++ community-i686/PKGBUILD 2013-05-29 10:59:29 UTC (rev 91917)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=mailutils
-pkgver=2.2
-pkgrel=4
-pkgdesc="MUA command line tool (mailx)"
-arch=(i686 x86_64)
-url="http://www.gnu.org/software/mailutils/"
-license=('GPL')
-depends=('libldap' 'pam' 'gnutls' 'guile')
-makedepends=('python2' 'emacs')
-optdepends=('python2')
-conflicts=('libsieve')
-install=mailutils.install
-options=(zipman !emptydirs)
-source=(http://ftp.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.bz2)
-md5sums=('834d2f616b922856127ecfe6c2de7d1a')
-
-build() {
- cd "$srcdir/mailutils-$pkgver"
-
- py2=`pacman -Q python2 | cut -d\ -f2 | cut -d. -f1-2`
- py3=`pacman -Q python | cut -d\ -f2 | cut -d. -f1-2`
-
- export PYTHON=/usr/bin/python2
- export PYTHON_CONFIG=/usr/bin/python2-config
- export CFLAGS="$CFLAGS `pkg-config --cflags python-$py2`"
- export LDFLAGS="$LDFLAGS `pkg-config --libs python-$py2`"
-
- [ -f Makefile ] || ./configure --prefix=/usr --with-gdbm --with-gnutls \
- --libexecdir=/usr/lib/$pkgname --without-fribidi \
- --without-tcp-wrappers
-# [ -z "$py3" ] || find -type f -name Makefile -exec sed -i "s|python$py3|python$py2|" {} \;
- make -j1
-}
-
-package() {
- cd "$srcdir/mailutils-$pkgver"
- make -j1 DESTDIR=$pkgdir install
- rm -f $pkgdir/usr/share/info/dir
- mv $pkgdir/usr/bin/mail $pkgdir/usr/bin/gnu-mail
- mv $pkgdir/usr/share/man/man1/mail.1 $pkgdir/usr/share/man/man1/gnu-mail.1
- chown -R root:root $pkgdir
-}
Copied: mailutils/repos/community-i686/PKGBUILD (from rev 91916, mailutils/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-05-29 10:59:29 UTC (rev 91917)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=mailutils
+pkgver=2.2
+pkgrel=5
+pkgdesc="MUA command line tool (mailx)"
+arch=(i686 x86_64)
+url="http://www.gnu.org/software/mailutils/"
+license=('GPL')
+depends=('libldap' 'pam' 'gnutls' 'guile')
+makedepends=('emacs')
+conflicts=('libsieve')
+install=mailutils.install
+options=(zipman !emptydirs)
+source=(http://ftp.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.bz2
+ build-fix.patch)
+md5sums=('834d2f616b922856127ecfe6c2de7d1a'
+ 'e83709ffdcdb257dfab443ef77c89574')
+
+prepare() {
+ cd "$srcdir/mailutils-$pkgver"
+ patch -p1 <$srcdir/build-fix.patch
+}
+
+build() {
+ cd "$srcdir/mailutils-$pkgver"
+ [ -f Makefile ] || ./configure --prefix=/usr --with-gdbm --with-gnutls \
+ --libexecdir=/usr/lib/$pkgname --without-fribidi \
+ --without-tcp-wrappers --sbindir=/usr/bin
+ make -j1
+}
+
+package() {
+ cd "$srcdir/mailutils-$pkgver"
+ make -j1 DESTDIR=$pkgdir install
+ rm -f $pkgdir/usr/share/info/dir
+ mv $pkgdir/usr/bin/mail $pkgdir/usr/bin/gnu-mail
+ mv $pkgdir/usr/share/man/man1/mail.1 $pkgdir/usr/share/man/man1/gnu-mail.1
+ chown -R root:root $pkgdir
+}
Copied: mailutils/repos/community-i686/build-fix.patch (from rev 91916, mailutils/trunk/build-fix.patch)
===================================================================
--- community-i686/build-fix.patch (rev 0)
+++ community-i686/build-fix.patch 2013-05-29 10:59:29 UTC (rev 91917)
@@ -0,0 +1,13 @@
+diff -wbBur mailutils-2.2/lib/Makefile.in mailutils-2.2.q/lib/Makefile.in
+--- mailutils-2.2/lib/Makefile.in 2010-09-08 13:58:58.000000000 +0400
++++ mailutils-2.2.q/lib/Makefile.in 2013-05-29 14:51:14.064888989 +0400
+@@ -1861,7 +1861,8 @@
+ -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \
+ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+- -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
++ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
++ -e 's|_GL_WARN_ON_USE (gets.*||'; \
+ } > $@-t && \
+ mv $@-t $@
+
Deleted: community-i686/mailutils.install
===================================================================
--- community-i686/mailutils.install 2013-05-29 10:59:09 UTC (rev 91916)
+++ community-i686/mailutils.install 2013-05-29 10:59:29 UTC (rev 91917)
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(mailutils.info mailutils.info-1 mailutils.info-2)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
Copied: mailutils/repos/community-i686/mailutils.install (from rev 91916, mailutils/trunk/mailutils.install)
===================================================================
--- community-i686/mailutils.install (rev 0)
+++ community-i686/mailutils.install 2013-05-29 10:59:29 UTC (rev 91917)
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(mailutils.info mailutils.info-1 mailutils.info-2)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-05-29 10:59:09 UTC (rev 91916)
+++ community-x86_64/PKGBUILD 2013-05-29 10:59:29 UTC (rev 91917)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=mailutils
-pkgver=2.2
-pkgrel=4
-pkgdesc="MUA command line tool (mailx)"
-arch=(i686 x86_64)
-url="http://www.gnu.org/software/mailutils/"
-license=('GPL')
-depends=('libldap' 'pam' 'gnutls' 'guile')
-makedepends=('python2' 'emacs')
-optdepends=('python2')
-conflicts=('libsieve')
-install=mailutils.install
-options=(zipman !emptydirs)
-source=(http://ftp.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.bz2)
-md5sums=('834d2f616b922856127ecfe6c2de7d1a')
-
-build() {
- cd "$srcdir/mailutils-$pkgver"
-
- py2=`pacman -Q python2 | cut -d\ -f2 | cut -d. -f1-2`
- py3=`pacman -Q python | cut -d\ -f2 | cut -d. -f1-2`
-
- export PYTHON=/usr/bin/python2
- export PYTHON_CONFIG=/usr/bin/python2-config
- export CFLAGS="$CFLAGS `pkg-config --cflags python-$py2`"
- export LDFLAGS="$LDFLAGS `pkg-config --libs python-$py2`"
-
- [ -f Makefile ] || ./configure --prefix=/usr --with-gdbm --with-gnutls \
- --libexecdir=/usr/lib/$pkgname --without-fribidi \
- --without-tcp-wrappers
-# [ -z "$py3" ] || find -type f -name Makefile -exec sed -i "s|python$py3|python$py2|" {} \;
- make -j1
-}
-
-package() {
- cd "$srcdir/mailutils-$pkgver"
- make -j1 DESTDIR=$pkgdir install
- rm -f $pkgdir/usr/share/info/dir
- mv $pkgdir/usr/bin/mail $pkgdir/usr/bin/gnu-mail
- mv $pkgdir/usr/share/man/man1/mail.1 $pkgdir/usr/share/man/man1/gnu-mail.1
- chown -R root:root $pkgdir
-}
Copied: mailutils/repos/community-x86_64/PKGBUILD (from rev 91916, mailutils/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-05-29 10:59:29 UTC (rev 91917)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=mailutils
+pkgver=2.2
+pkgrel=5
+pkgdesc="MUA command line tool (mailx)"
+arch=(i686 x86_64)
+url="http://www.gnu.org/software/mailutils/"
+license=('GPL')
+depends=('libldap' 'pam' 'gnutls' 'guile')
+makedepends=('emacs')
+conflicts=('libsieve')
+install=mailutils.install
+options=(zipman !emptydirs)
+source=(http://ftp.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.bz2
+ build-fix.patch)
+md5sums=('834d2f616b922856127ecfe6c2de7d1a'
+ 'e83709ffdcdb257dfab443ef77c89574')
+
+prepare() {
+ cd "$srcdir/mailutils-$pkgver"
+ patch -p1 <$srcdir/build-fix.patch
+}
+
+build() {
+ cd "$srcdir/mailutils-$pkgver"
+ [ -f Makefile ] || ./configure --prefix=/usr --with-gdbm --with-gnutls \
+ --libexecdir=/usr/lib/$pkgname --without-fribidi \
+ --without-tcp-wrappers --sbindir=/usr/bin
+ make -j1
+}
+
+package() {
+ cd "$srcdir/mailutils-$pkgver"
+ make -j1 DESTDIR=$pkgdir install
+ rm -f $pkgdir/usr/share/info/dir
+ mv $pkgdir/usr/bin/mail $pkgdir/usr/bin/gnu-mail
+ mv $pkgdir/usr/share/man/man1/mail.1 $pkgdir/usr/share/man/man1/gnu-mail.1
+ chown -R root:root $pkgdir
+}
Copied: mailutils/repos/community-x86_64/build-fix.patch (from rev 91916, mailutils/trunk/build-fix.patch)
===================================================================
--- community-x86_64/build-fix.patch (rev 0)
+++ community-x86_64/build-fix.patch 2013-05-29 10:59:29 UTC (rev 91917)
@@ -0,0 +1,13 @@
+diff -wbBur mailutils-2.2/lib/Makefile.in mailutils-2.2.q/lib/Makefile.in
+--- mailutils-2.2/lib/Makefile.in 2010-09-08 13:58:58.000000000 +0400
++++ mailutils-2.2.q/lib/Makefile.in 2013-05-29 14:51:14.064888989 +0400
+@@ -1861,7 +1861,8 @@
+ -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \
+ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+- -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
++ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
++ -e 's|_GL_WARN_ON_USE (gets.*||'; \
+ } > $@-t && \
+ mv $@-t $@
+
Deleted: community-x86_64/mailutils.install
===================================================================
--- community-x86_64/mailutils.install 2013-05-29 10:59:09 UTC (rev 91916)
+++ community-x86_64/mailutils.install 2013-05-29 10:59:29 UTC (rev 91917)
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(mailutils.info mailutils.info-1 mailutils.info-2)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
Copied: mailutils/repos/community-x86_64/mailutils.install (from rev 91916, mailutils/trunk/mailutils.install)
===================================================================
--- community-x86_64/mailutils.install (rev 0)
+++ community-x86_64/mailutils.install 2013-05-29 10:59:29 UTC (rev 91917)
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(mailutils.info mailutils.info-1 mailutils.info-2)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
More information about the arch-commits
mailing list