diff --git a/apr/PKGBUILD b/apr/PKGBUILD index 72306fea..98eeda53 100644 --- a/apr/PKGBUILD +++ b/apr/PKGBUILD @@ -10,13 +10,13 @@ depends=('libcrypt') options=('!libtool') license=('APACHE') source=(http://www.apache.org/dist/apr/apr-${pkgver}.tar.bz2 - 'apr-1.5.0-msys2.patch' - 'binary-copy.patch' - 'no-undefined.patch' - 'tests-disable_testproc.patch' - 'tests-fix_paths.patch' - 'tests.patch' - 'fix-debian-layout.patch') + 'apr-1.5.0-msys2.patch' + 'binary-copy.patch' + 'no-undefined.patch' + 'tests-disable_testproc.patch' + 'tests-fix_paths.patch' + 'tests.patch' + 'fix-debian-layout.patch') md5sums=('cc93bd2c12d0d037f68e21cc6385dc31' '141c1311ef6d9a349d1dbfa4c596e672' 'b2815ff4d642ff19fc659b36cb243eed' @@ -44,7 +44,7 @@ build() { cd "${srcdir}/apr-${pkgver}" ./configure --build=${CHOST} \ --prefix=/usr \ - --libexecdir=/usr/lib/apr/modules \ + --libexecdir=/usr/lib/apr/modules \ --datadir=/usr/share/apr \ --enable-layout=Debian \ ac_cv_header_windows_h=no \ diff --git a/asciidoc/PKGBUILD b/asciidoc/PKGBUILD index bc1e2815..2b3a1aad 100644 --- a/asciidoc/PKGBUILD +++ b/asciidoc/PKGBUILD @@ -18,7 +18,7 @@ groups=('base-devel') # 'lynx: text generation' # 'w3m: text generation (alternative to lynx)') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 0001-W32-confdir.msys2.patch) + 0001-W32-confdir.msys2.patch) noextract=("${pkgname}-${pkgver}.tar.gz") md5sums=('c59018f105be8d022714b826b0be130a' 'edf28bbe5c832f4261b117275a03f457') @@ -32,15 +32,15 @@ prepare() { patch -p1 -i ${srcdir}/0001-W32-confdir.msys2.patch # python2 fix for file in asciidocapi.py a2x.py asciidoc.py filters/music/music2png.py filters/latex/latex2png.py \ - filters/code/code-filter.py filters/graphviz/graphviz2png.py; do - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file + filters/code/code-filter.py filters/graphviz/graphviz2png.py; do + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file done #sed -i -e 's_sys:python_sys:python2_g' -e 's_sys3:python_sys3:python2_g' xhtml11.conf #sed -i 's_sys:python_sys:python2_g' xhtml11-quirks.conf #sed -i -e 's/{python}/{python2}/g' \ - #-e 's#{language@python:py:#{language@python2:py:#' \ - #filters/source/source-highlight-filter.conf \ - #html5.conf xhtml11.conf xhtml11-quirks.conf + #-e 's#{language@python:py:#{language@python2:py:#' \ + #filters/source/source-highlight-filter.conf \ + #html5.conf xhtml11.conf xhtml11-quirks.conf #sed -i -e "s#'python'#'python2'#g" filters/code/code-filter.py } diff --git a/automake-wrapper/PKGBUILD b/automake-wrapper/PKGBUILD index 6815e71c..4774ecb9 100644 --- a/automake-wrapper/PKGBUILD +++ b/automake-wrapper/PKGBUILD @@ -9,18 +9,18 @@ license=('GPL') url="http://www.gentoo.org" groups=('base-devel') depends=('bash' 'gawk' - #'automake1.4' - #'automake1.5' - 'automake1.6' - 'automake1.7' - 'automake1.7' - 'automake1.8' - 'automake1.9' - 'automake1.10' - 'automake1.11' - 'automake1.12' - 'automake1.13' - 'automake1.14') + #'automake1.4' + #'automake1.5' + 'automake1.6' + 'automake1.7' + 'automake1.7' + 'automake1.8' + 'automake1.9' + 'automake1.10' + 'automake1.11' + 'automake1.12' + 'automake1.13' + 'automake1.14') #install=automake.install source=("am-wrapper-${pkgver}.sh") md5sums=('0b1f6f9288b3d1a64b858b18c958dce2') diff --git a/automake1.10/PKGBUILD b/automake1.10/PKGBUILD index 580680b9..66f55f27 100644 --- a/automake1.10/PKGBUILD +++ b/automake1.10/PKGBUILD @@ -14,8 +14,8 @@ checkdepends=('dejagnu' 'python2') install=automake.install source=(ftp://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.bz2{,.sig} automake-1.10-msys2.patch - automake1.10-documentation.patch - automake-1.10-makeinfo-fix.patch) + automake1.10-documentation.patch + automake-1.10-makeinfo-fix.patch) md5sums=('b8e67fb458da396bc35555af7ef2b49f' 'SKIP' '0cc04bed86ae6d1b5c3bd90ba3593ee6' @@ -46,27 +46,27 @@ check() { } package() { - cd ${srcdir}/automake-${pkgver} - make DESTDIR=${pkgdir} install + cd ${srcdir}/automake-${pkgver} + make DESTDIR=${pkgdir} install - # install the 1.11 versioned info files - for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do - rm -f ${f} - done - for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do - bf=`basename $f` - cp $f ${pkgdir}/usr/share/info/ - done - - # remove the unversioned executables - rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal + # install the 1.11 versioned info files + for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do + rm -f ${f} + done + for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do + bf=`basename $f` + cp $f ${pkgdir}/usr/share/info/ + done + + # remove the unversioned executables + rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal - # remove the unversioned man pages - rm -f ${pkgdir}/usr/share/man/man1/automake.1 - rm -f ${pkgdir}/usr/share/man/man1/aclocal.1 - - # remove the unversioned info files - rm -f ${pkgdir}/usr/share/info/automake.info* - - rm -rf ${pkgdir}/usr/share/doc + # remove the unversioned man pages + rm -f ${pkgdir}/usr/share/man/man1/automake.1 + rm -f ${pkgdir}/usr/share/man/man1/aclocal.1 + + # remove the unversioned info files + rm -f ${pkgdir}/usr/share/info/automake.info* + + rm -rf ${pkgdir}/usr/share/doc } diff --git a/automake1.11/PKGBUILD b/automake1.11/PKGBUILD index 350d88d7..1537dc35 100644 --- a/automake1.11/PKGBUILD +++ b/automake1.11/PKGBUILD @@ -14,8 +14,8 @@ checkdepends=('dejagnu' 'python2') install=automake.install source=(ftp://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.xz{,.sig} automake-1.11-msys2.patch - automake1.11-documentation.patch - automake-1.11-makeinfo-fix.patch) + automake1.11-documentation.patch + automake-1.11-makeinfo-fix.patch) md5sums=('cf4752287ad708f83bd3689da57a32c9' 'SKIP' 'a092a0617795ff482591b84184934276' @@ -46,27 +46,27 @@ check() { } package() { - cd ${srcdir}/automake-${pkgver} - make DESTDIR=${pkgdir} install + cd ${srcdir}/automake-${pkgver} + make DESTDIR=${pkgdir} install - # install the 1.11 versioned info files - for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do - rm -f ${f} - done - for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do - bf=`basename $f` - cp $f ${pkgdir}/usr/share/info/ - done - - # remove the unversioned executables - rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal + # install the 1.11 versioned info files + for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do + rm -f ${f} + done + for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do + bf=`basename $f` + cp $f ${pkgdir}/usr/share/info/ + done + + # remove the unversioned executables + rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal - # remove the unversioned man pages - rm -f ${pkgdir}/usr/share/man/man1/automake.1 - rm -f ${pkgdir}/usr/share/man/man1/aclocal.1 - - # remove the unversioned info files - rm -f ${pkgdir}/usr/share/info/automake.info* - - rm -rf ${pkgdir}/usr/share/doc + # remove the unversioned man pages + rm -f ${pkgdir}/usr/share/man/man1/automake.1 + rm -f ${pkgdir}/usr/share/man/man1/aclocal.1 + + # remove the unversioned info files + rm -f ${pkgdir}/usr/share/info/automake.info* + + rm -rf ${pkgdir}/usr/share/doc } diff --git a/automake1.12/PKGBUILD b/automake1.12/PKGBUILD index 285945b3..1d76e6f8 100644 --- a/automake1.12/PKGBUILD +++ b/automake1.12/PKGBUILD @@ -14,7 +14,7 @@ checkdepends=('dejagnu' 'python2') install=automake.install source=(ftp://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.xz{,.sig} automake-1.14-msys2.patch - automake1.12-documentation.patch) + automake1.12-documentation.patch) md5sums=('140e084223bf463a24c1a28427c6aec7' 'SKIP' '233d8dc0c46722a8940bac31a2a25cbc' @@ -44,30 +44,30 @@ check() { } package() { - cd ${srcdir}/automake-${pkgver} - make DESTDIR=${pkgdir} install + cd ${srcdir}/automake-${pkgver} + make DESTDIR=${pkgdir} install - mv ${pkgdir}/usr/share/aclocal/README ${pkgdir}/usr/share/aclocal/README.am12 + mv ${pkgdir}/usr/share/aclocal/README ${pkgdir}/usr/share/aclocal/README.am12 - # install the 1.12 versioned info files - for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do - rm -f ${f} - done - for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do - bf=`basename $f` - cp $f ${pkgdir}/usr/share/info/ - done - - # remove the unversioned executables - rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal + # install the 1.12 versioned info files + for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do + rm -f ${f} + done + for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do + bf=`basename $f` + cp $f ${pkgdir}/usr/share/info/ + done + + # remove the unversioned executables + rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal - # remove the unversioned man pages - rm -f ${pkgdir}/usr/share/man/man1/automake.1 - rm -f ${pkgdir}/usr/share/man/man1/aclocal.1 - - # remove the unversioned info files - rm -f ${pkgdir}/usr/share/info/automake.info* - rm -f ${pkgdir}/usr/share/info/automake-history.info* - - rm -rf ${pkgdir}/usr/share/doc + # remove the unversioned man pages + rm -f ${pkgdir}/usr/share/man/man1/automake.1 + rm -f ${pkgdir}/usr/share/man/man1/aclocal.1 + + # remove the unversioned info files + rm -f ${pkgdir}/usr/share/info/automake.info* + rm -f ${pkgdir}/usr/share/info/automake-history.info* + + rm -rf ${pkgdir}/usr/share/doc } diff --git a/automake1.13/PKGBUILD b/automake1.13/PKGBUILD index af5ca6de..cec132cc 100644 --- a/automake1.13/PKGBUILD +++ b/automake1.13/PKGBUILD @@ -14,7 +14,7 @@ checkdepends=('dejagnu' 'python2') install=automake.install source=(ftp://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.xz{,.sig} automake-1.14-msys2.patch - automake1.13-documentation.patch) + automake1.13-documentation.patch) md5sums=('71b03c1bc4f587add12604587d9276d1' 'SKIP' '233d8dc0c46722a8940bac31a2a25cbc' @@ -44,30 +44,30 @@ check() { } package() { - cd ${srcdir}/automake-${pkgver} - make DESTDIR=${pkgdir} install + cd ${srcdir}/automake-${pkgver} + make DESTDIR=${pkgdir} install - mv ${pkgdir}/usr/share/aclocal/README ${pkgdir}/usr/share/aclocal/README.am13 + mv ${pkgdir}/usr/share/aclocal/README ${pkgdir}/usr/share/aclocal/README.am13 - # install the 1.13 versioned info files - for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do - rm -f ${f} - done - for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do - bf=`basename $f` - cp $f ${pkgdir}/usr/share/info/ - done - - # remove the unversioned executables - rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal + # install the 1.13 versioned info files + for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do + rm -f ${f} + done + for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do + bf=`basename $f` + cp $f ${pkgdir}/usr/share/info/ + done + + # remove the unversioned executables + rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal - # remove the unversioned man pages - rm -f ${pkgdir}/usr/share/man/man1/automake.1 - rm -f ${pkgdir}/usr/share/man/man1/aclocal.1 - - # remove the unversioned info files - rm -f ${pkgdir}/usr/share/info/automake.info* - rm -f ${pkgdir}/usr/share/info/automake-history.info* - - rm -rf ${pkgdir}/usr/share/doc + # remove the unversioned man pages + rm -f ${pkgdir}/usr/share/man/man1/automake.1 + rm -f ${pkgdir}/usr/share/man/man1/aclocal.1 + + # remove the unversioned info files + rm -f ${pkgdir}/usr/share/info/automake.info* + rm -f ${pkgdir}/usr/share/info/automake-history.info* + + rm -rf ${pkgdir}/usr/share/doc } diff --git a/automake1.14/PKGBUILD b/automake1.14/PKGBUILD index a32ce4e3..236984ea 100644 --- a/automake1.14/PKGBUILD +++ b/automake1.14/PKGBUILD @@ -13,7 +13,7 @@ makedepends=('autoconf') checkdepends=('dejagnu' 'python2') install=automake.install source=(ftp://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.xz{,.sig} - automake1.14-documentation.patch + automake1.14-documentation.patch automake-1.14-msys2.patch) md5sums=('7fc29854c520f56b07aa232a0f880292' 'SKIP' @@ -45,30 +45,30 @@ check() { } package() { - cd ${srcdir}/automake-${pkgver} - make DESTDIR=${pkgdir} install + cd ${srcdir}/automake-${pkgver} + make DESTDIR=${pkgdir} install - mv ${pkgdir}/usr/share/aclocal/README ${pkgdir}/usr/share/aclocal/README.am14 + mv ${pkgdir}/usr/share/aclocal/README ${pkgdir}/usr/share/aclocal/README.am14 - # install the 1.14 versioned info files - for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do - rm -f ${f} - done - for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do - bf=`basename $f` - cp $f ${pkgdir}/usr/share/info/ - done - - # remove the unversioned executables - rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal + # install the 1.14 versioned info files + for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do + rm -f ${f} + done + for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do + bf=`basename $f` + cp $f ${pkgdir}/usr/share/info/ + done + + # remove the unversioned executables + rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal - # remove the unversioned man pages - rm -f ${pkgdir}/usr/share/man/man1/automake.1 - rm -f ${pkgdir}/usr/share/man/man1/aclocal.1 - - # remove the unversioned info files - rm -f ${pkgdir}/usr/share/info/automake.info* - rm -f ${pkgdir}/usr/share/info/automake-history.info* - - rm -rf ${pkgdir}/usr/share/doc + # remove the unversioned man pages + rm -f ${pkgdir}/usr/share/man/man1/automake.1 + rm -f ${pkgdir}/usr/share/man/man1/aclocal.1 + + # remove the unversioned info files + rm -f ${pkgdir}/usr/share/info/automake.info* + rm -f ${pkgdir}/usr/share/info/automake-history.info* + + rm -rf ${pkgdir}/usr/share/doc } diff --git a/automake1.6/PKGBUILD b/automake1.6/PKGBUILD index 684f1b89..675d7aa7 100644 --- a/automake1.6/PKGBUILD +++ b/automake1.6/PKGBUILD @@ -13,10 +13,10 @@ makedepends=('autoconf') checkdepends=('dejagnu' 'python2') install=automake.install source=(ftp://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.bz2 - automake1.6-add-dirlist-support.patch - automake1.6-accomodate-newer-autoconf.patch - automake1.6-documentation.patch - automake1.6-avoid-autoreconf.patch + automake1.6-add-dirlist-support.patch + automake1.6-accomodate-newer-autoconf.patch + automake1.6-documentation.patch + automake1.6-avoid-autoreconf.patch automake-1.7-msys2.patch) md5sums=('2e8053609e9d318f80db0fce29dca7e9' 'dd1c78ca9682f3f71d1b898d227d6bea' @@ -51,29 +51,29 @@ check() { } package() { - cd ${srcdir}/automake-${pkgver} - make DESTDIR=${pkgdir} install - - mv ${pkgdir}/usr/info ${pkgdir}/usr/share/ + cd ${srcdir}/automake-${pkgver} + make DESTDIR=${pkgdir} install + + mv ${pkgdir}/usr/info ${pkgdir}/usr/share/ - # install the 1.6 versioned info files - for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do - rm -f ${f} - done - for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do - bf=`basename $f` - cp $f ${pkgdir}/usr/share/info/ - done - - # remove the unversioned executables - rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal + # install the 1.6 versioned info files + for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do + rm -f ${f} + done + for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do + bf=`basename $f` + cp $f ${pkgdir}/usr/share/info/ + done + + # remove the unversioned executables + rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal - # remove the unversioned man pages - rm -f ${pkgdir}/usr/share/man/man1/automake.1 - rm -f ${pkgdir}/usr/share/man/man1/aclocal.1 - - # remove the unversioned info files - rm -f ${pkgdir}/usr/share/info/automake.info* - - rm -rf ${pkgdir}/usr/share/doc + # remove the unversioned man pages + rm -f ${pkgdir}/usr/share/man/man1/automake.1 + rm -f ${pkgdir}/usr/share/man/man1/aclocal.1 + + # remove the unversioned info files + rm -f ${pkgdir}/usr/share/info/automake.info* + + rm -rf ${pkgdir}/usr/share/doc } diff --git a/automake1.7/PKGBUILD b/automake1.7/PKGBUILD index 64d1a1f0..0cd34933 100644 --- a/automake1.7/PKGBUILD +++ b/automake1.7/PKGBUILD @@ -13,9 +13,9 @@ makedepends=('autoconf') checkdepends=('dejagnu' 'python2') install=automake.install source=(ftp://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.bz2{,.sig} - automake-1.7.9-gentoo-test-fixes.patch - automake1.7-cygwin-test-fixes.patch - automake1.7-documentation.patch + automake-1.7.9-gentoo-test-fixes.patch + automake1.7-cygwin-test-fixes.patch + automake1.7-documentation.patch automake-1.7-msys2.patch) md5sums=('571fd0b0598eb2a27dcf68adcfddfacb' 'SKIP' @@ -49,29 +49,29 @@ check() { } package() { - cd ${srcdir}/automake-${pkgver} - make DESTDIR=${pkgdir} install - - mv ${pkgdir}/usr/info ${pkgdir}/usr/share/ + cd ${srcdir}/automake-${pkgver} + make DESTDIR=${pkgdir} install + + mv ${pkgdir}/usr/info ${pkgdir}/usr/share/ - # install the 1.7 versioned info files - for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do - rm -f ${f} - done - for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do - bf=`basename $f` - cp $f ${pkgdir}/usr/share/info/ - done - - # remove the unversioned executables - rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal + # install the 1.7 versioned info files + for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do + rm -f ${f} + done + for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do + bf=`basename $f` + cp $f ${pkgdir}/usr/share/info/ + done + + # remove the unversioned executables + rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal - # remove the unversioned man pages - rm -f ${pkgdir}/usr/share/man/man1/automake.1 - rm -f ${pkgdir}/usr/share/man/man1/aclocal.1 - - # remove the unversioned info files - rm -f ${pkgdir}/usr/share/info/automake.info* - - rm -rf ${pkgdir}/usr/share/doc + # remove the unversioned man pages + rm -f ${pkgdir}/usr/share/man/man1/automake.1 + rm -f ${pkgdir}/usr/share/man/man1/aclocal.1 + + # remove the unversioned info files + rm -f ${pkgdir}/usr/share/info/automake.info* + + rm -rf ${pkgdir}/usr/share/doc } diff --git a/automake1.8/PKGBUILD b/automake1.8/PKGBUILD index 6e4876c5..7944ef7c 100644 --- a/automake1.8/PKGBUILD +++ b/automake1.8/PKGBUILD @@ -13,10 +13,10 @@ makedepends=('autoconf') checkdepends=('dejagnu' 'python2') install=automake.install source=(ftp://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.bz2{,.sig} - automake-1.8.5-gentoo-test-fixes.patch - automake1.8-vs-modern-libtool.patch - automake1.8-documentation.patch - automake1.8-cygwin-test-fixes.patch + automake-1.8.5-gentoo-test-fixes.patch + automake1.8-vs-modern-libtool.patch + automake1.8-documentation.patch + automake1.8-cygwin-test-fixes.patch automake-1.8-msys2.patch) md5sums=('0114aa6d7dc32112834b68105fb8d7e2' 'SKIP' @@ -53,28 +53,28 @@ check() { } package() { - cd ${srcdir}/automake-${pkgver} - make DESTDIR=${pkgdir} install - mv ${pkgdir}/usr/info ${pkgdir}/usr/share/ + cd ${srcdir}/automake-${pkgver} + make DESTDIR=${pkgdir} install + mv ${pkgdir}/usr/info ${pkgdir}/usr/share/ - # install the 1.8 versioned info files - for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do - rm -f ${f} - done - for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do - bf=`basename $f` - cp $f ${pkgdir}/usr/share/info/ - done - - # remove the unversioned executables - rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal + # install the 1.8 versioned info files + for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do + rm -f ${f} + done + for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do + bf=`basename $f` + cp $f ${pkgdir}/usr/share/info/ + done + + # remove the unversioned executables + rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal - # remove the unversioned man pages - rm -f ${pkgdir}/usr/share/man/man1/automake.1 - rm -f ${pkgdir}/usr/share/man/man1/aclocal.1 - - # remove the unversioned info files - rm -f ${pkgdir}/usr/share/info/automake.info* - - rm -rf ${pkgdir}/usr/share/doc + # remove the unversioned man pages + rm -f ${pkgdir}/usr/share/man/man1/automake.1 + rm -f ${pkgdir}/usr/share/man/man1/aclocal.1 + + # remove the unversioned info files + rm -f ${pkgdir}/usr/share/info/automake.info* + + rm -rf ${pkgdir}/usr/share/doc } diff --git a/automake1.9/PKGBUILD b/automake1.9/PKGBUILD index ee28396a..9d815e28 100644 --- a/automake1.9/PKGBUILD +++ b/automake1.9/PKGBUILD @@ -13,16 +13,16 @@ makedepends=('autoconf') checkdepends=('dejagnu' 'python2') install=automake.install source=(ftp://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.bz2{,.sig} - automake-1.9.6-gentoo-aclocal7-test-sleep.patch - automake-1.9.6-gentoo-ignore-comments.patch - automake-1.9.6-gentoo-include-dir-prefix.patch - automake1.9-backport-pr401-test-and-fix.patch - automake1.9-vs-modern-libtool.patch - automake1.9-cygwin-test-fixes.patch - automake1.9-documentation.patch - automake1.9-avoid-autoreconf.patch + automake-1.9.6-gentoo-aclocal7-test-sleep.patch + automake-1.9.6-gentoo-ignore-comments.patch + automake-1.9.6-gentoo-include-dir-prefix.patch + automake1.9-backport-pr401-test-and-fix.patch + automake1.9-vs-modern-libtool.patch + automake1.9-cygwin-test-fixes.patch + automake1.9-documentation.patch + automake1.9-avoid-autoreconf.patch automake-1.9-msys2.patch - automake-1.9-makeinfo-fix.patch) + automake-1.9-makeinfo-fix.patch) md5sums=('c11b8100bb311492d8220378fd8bf9e0' 'SKIP' '7c3755a846d4a5cc4c3230f3895f537a' @@ -68,27 +68,27 @@ check() { } package() { - cd ${srcdir}/automake-${pkgver} - make DESTDIR=${pkgdir} install + cd ${srcdir}/automake-${pkgver} + make DESTDIR=${pkgdir} install - # install the 1.11 versioned info files - for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do - rm -f ${f} - done - for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do - bf=`basename $f` - cp $f ${pkgdir}/usr/share/info/ - done - - # remove the unversioned executables - rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal + # install the 1.11 versioned info files + for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do + rm -f ${f} + done + for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do + bf=`basename $f` + cp $f ${pkgdir}/usr/share/info/ + done + + # remove the unversioned executables + rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal - # remove the unversioned man pages - rm -f ${pkgdir}/usr/share/man/man1/automake.1 - rm -f ${pkgdir}/usr/share/man/man1/aclocal.1 - - # remove the unversioned info files - rm -f ${pkgdir}/usr/share/info/automake.info* - - rm -rf ${pkgdir}/usr/share/doc + # remove the unversioned man pages + rm -f ${pkgdir}/usr/share/man/man1/automake.1 + rm -f ${pkgdir}/usr/share/man/man1/aclocal.1 + + # remove the unversioned info files + rm -f ${pkgdir}/usr/share/info/automake.info* + + rm -rf ${pkgdir}/usr/share/doc } diff --git a/bash-completion/PKGBUILD b/bash-completion/PKGBUILD index bf84c492..e4128212 100644 --- a/bash-completion/PKGBUILD +++ b/bash-completion/PKGBUILD @@ -11,9 +11,9 @@ groups=('base') depends=('bash') options=('!emptydirs' '!makeflags') source=(http://bash-completion.alioth.debian.org/files/${pkgname}-${pkgver}.tar.bz2 - bash-4.3.patch - bash-completion-lz4.patch - words_bad_array_subscript.patch) + bash-4.3.patch + bash-completion-lz4.patch + words_bad_array_subscript.patch) md5sums=('4e2a9f11a4042a38ee79ddcd048e8b9e' 'f964553680d88a89dbe8a7275e94bd3b' '54a801a7a2b7aaae6ad7b3b6419003fe' diff --git a/bash/PKGBUILD b/bash/PKGBUILD index 97eef245..486b9b38 100644 --- a/bash/PKGBUILD +++ b/bash/PKGBUILD @@ -13,128 +13,128 @@ groups=('base') backup=(usr/etc/bash.bash{rc,_logout} usr/etc/skel/.bash{rc,_profile,_logout}) makedepends=('gettext-devel' 'libreadline-devel>=6.3') source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig} - 'dot.bashrc' - 'dot.bash_profile' - 'dot.bash_logout' - 'dot.inputrc' - 'system.bashrc' - 'system.bash_logout' - 'system.profile' - 'profile.tzset.sh' - 'profile.lang.sh' - 0001-bash-4.3-cygwin.patch - 0002-bash-4.3-msysize.patch - 0003-bash-4.3-readline.patch - 0004-bash-4.3-deprecations.patch - 0005-bash-4.3-msys2-fix-lineendings.patch - 0006-bash-4.3-add-pwd-W-option.patch) + 'dot.bashrc' + 'dot.bash_profile' + 'dot.bash_logout' + 'dot.inputrc' + 'system.bashrc' + 'system.bash_logout' + 'system.profile' + 'profile.tzset.sh' + 'profile.lang.sh' + 0001-bash-4.3-cygwin.patch + 0002-bash-4.3-msysize.patch + 0003-bash-4.3-readline.patch + 0004-bash-4.3-deprecations.patch + 0005-bash-4.3-msys2-fix-lineendings.patch + 0006-bash-4.3-add-pwd-W-option.patch) if [ $_patchlevel -gt 000 ]; then - for (( p=1; p<=$((10#${_patchlevel})); p++ )); do - source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//./}-$(printf "%03d" $p){,.sig}) - done + for (( p=1; p<=$((10#${_patchlevel})); p++ )); do + source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//./}-$(printf "%03d" $p){,.sig}) + done fi prepare() { - cd ${srcdir}/${pkgname}-$_basever + cd ${srcdir}/${pkgname}-$_basever - for (( p=1; p<=$((10#${_patchlevel})); p++ )); do - msg "applying patch bash${_basever//./}-$(printf "%03d" $p)" - patch -p0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p) - done + for (( p=1; p<=$((10#${_patchlevel})); p++ )); do + msg "applying patch bash${_basever//./}-$(printf "%03d" $p)" + patch -p0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p) + done - patch -p1 -i $srcdir/0001-bash-4.3-cygwin.patch - patch -p1 -i $srcdir/0002-bash-4.3-msysize.patch - patch -p1 -i $srcdir/0003-bash-4.3-readline.patch - patch -p1 -i $srcdir/0004-bash-4.3-deprecations.patch - patch -p1 -i $srcdir/0005-bash-4.3-msys2-fix-lineendings.patch - patch -p1 -i $srcdir/0006-bash-4.3-add-pwd-W-option.patch + patch -p1 -i $srcdir/0001-bash-4.3-cygwin.patch + patch -p1 -i $srcdir/0002-bash-4.3-msysize.patch + patch -p1 -i $srcdir/0003-bash-4.3-readline.patch + patch -p1 -i $srcdir/0004-bash-4.3-deprecations.patch + patch -p1 -i $srcdir/0005-bash-4.3-msys2-fix-lineendings.patch + patch -p1 -i $srcdir/0006-bash-4.3-add-pwd-W-option.patch - autoconf + autoconf } build() { - cd ${srcdir}/${pkgname}-$_basever + cd ${srcdir}/${pkgname}-$_basever - ./configure --build=${CHOST} \ - --prefix=/usr \ - --enable-readline \ - --without-libintl-prefix \ - --without-libiconv-prefix \ - --with-installed-readline \ - --without-bash-malloc \ - --with-curses \ - bash_cv_func_sigsetjmp=missing \ - gt_cv_int_divbyzero_sigfpe=true + ./configure --build=${CHOST} \ + --prefix=/usr \ + --enable-readline \ + --without-libintl-prefix \ + --without-libiconv-prefix \ + --with-installed-readline \ + --without-bash-malloc \ + --with-curses \ + bash_cv_func_sigsetjmp=missing \ + gt_cv_int_divbyzero_sigfpe=true - # Prepopulate the release level. - expr ${pkgrel} > .build || : + # Prepopulate the release level. + expr ${pkgrel} > .build || : - make HISTORY_LDFLAGS= READLINE_LDFLAGS= LOCAL_LDFLAGS='-Wl,--export-all,--out-implib,lib$(@:.exe=.dll.a)' + make HISTORY_LDFLAGS= READLINE_LDFLAGS= LOCAL_LDFLAGS='-Wl,--export-all,--out-implib,lib$(@:.exe=.dll.a)' } check() { - cd ${srcdir}/${pkgname}-$_basever - make check + cd ${srcdir}/${pkgname}-$_basever + make check } package_bash() { - depends=('libintl' 'libiconv' 'libreadline>=6.3' 'msys2-runtime' 'gcc-libs') - provides=('sh') - #install=bash.install + depends=('libintl' 'libiconv' 'libreadline>=6.3' 'msys2-runtime' 'gcc-libs') + provides=('sh') + #install=bash.install - cd ${srcdir}/${pkgname}-$_basever - make DESTDIR=${pkgdir} install + cd ${srcdir}/${pkgname}-$_basever + make DESTDIR=${pkgdir} install - cp -fp ${pkgdir}/usr/bin/{ba,}sh.exe + cp -fp ${pkgdir}/usr/bin/{ba,}sh.exe - cd ${pkgdir}/usr/share/man/man1 > /dev/null - echo '.so man1/bash.1' > sh.1 - echo '.so man1/bash_builtins.1.gz' > alias.1 + cd ${pkgdir}/usr/share/man/man1 > /dev/null + echo '.so man1/bash.1' > sh.1 + echo '.so man1/bash_builtins.1.gz' > alias.1 - gzip alias.1 - for f in bg bind break builtin caller case cd command compgen complete \ - continue declare dirs disown do done elif else enable esac eval exec \ - exit export fc fg fi for function getopts hash help history if in jobs \ - let local logout popd pushd read readonly return select set shift shopt \ - source suspend then time times trap type typeset ulimit umask unalias \ - unset until wait while [ ; do - cp -fp alias.1.gz $f.1.gz - done + gzip alias.1 + for f in bg bind break builtin caller case cd command compgen complete \ + continue declare dirs disown do done elif else enable esac eval exec \ + exit export fc fg fi for function getopts hash help history if in jobs \ + let local logout popd pushd read readonly return select set shift shopt \ + source suspend then time times trap type typeset ulimit umask unalias \ + unset until wait while [ ; do + cp -fp alias.1.gz $f.1.gz + done - install -dm755 ${pkgdir}/usr/etc/skel/ + install -dm755 ${pkgdir}/usr/etc/skel/ - # system-wide configuration files - install -m644 ${srcdir}/system.bashrc ${pkgdir}/usr/etc/bash.bashrc - install -m644 ${srcdir}/system.bash_logout ${pkgdir}/usr/etc/bash.bash_logout - install -m644 ${srcdir}/system.profile ${pkgdir}/usr/etc/profile + # system-wide configuration files + install -m644 ${srcdir}/system.bashrc ${pkgdir}/usr/etc/bash.bashrc + install -m644 ${srcdir}/system.bash_logout ${pkgdir}/usr/etc/bash.bash_logout + install -m644 ${srcdir}/system.profile ${pkgdir}/usr/etc/profile - # user configuration file skeletons - install -m644 ${srcdir}/dot.bashrc ${pkgdir}/usr/etc/skel/.bashrc - install -m644 ${srcdir}/dot.inputrc ${pkgdir}/usr/etc/skel/.inputrc - install -m644 ${srcdir}/dot.bash_profile ${pkgdir}/usr/etc/skel/.bash_profile - install -m644 ${srcdir}/dot.bash_logout ${pkgdir}/usr/etc/skel/.bash_logout + # user configuration file skeletons + install -m644 ${srcdir}/dot.bashrc ${pkgdir}/usr/etc/skel/.bashrc + install -m644 ${srcdir}/dot.inputrc ${pkgdir}/usr/etc/skel/.inputrc + install -m644 ${srcdir}/dot.bash_profile ${pkgdir}/usr/etc/skel/.bash_profile + install -m644 ${srcdir}/dot.bash_logout ${pkgdir}/usr/etc/skel/.bash_logout - install -dm755 ${pkgdir}/usr/etc/profile.d/ - install -m644 ${srcdir}/profile.tzset.sh ${pkgdir}/usr/etc/profile.d/tzset.sh - install -m644 ${srcdir}/profile.lang.sh ${pkgdir}/usr/etc/profile.d/lang.sh + install -dm755 ${pkgdir}/usr/etc/profile.d/ + install -m644 ${srcdir}/profile.tzset.sh ${pkgdir}/usr/etc/profile.d/tzset.sh + install -m644 ${srcdir}/profile.lang.sh ${pkgdir}/usr/etc/profile.d/lang.sh } package_bash-devel() { - pkgdesc="Bash headers and libraries" - groups=('development') - options=('staticlibs') - backup=() + pkgdesc="Bash headers and libraries" + groups=('development') + options=('staticlibs') + backup=() - mkdir -p ${pkgdir}/usr/{include,lib} - cd ${srcdir}/bash-$_basever - cp -f libbash.dll.a ${pkgdir}/usr/lib/ + mkdir -p ${pkgdir}/usr/{include,lib} + cd ${srcdir}/bash-$_basever + cp -f libbash.dll.a ${pkgdir}/usr/lib/ - mkdir -p ${pkgdir}/usr/include/bash - for f in [^y]*.h builtins/*.h include/*.h lib/{glob,tilde}/*.h - do - /bin/install ${f} ${pkgdir}/usr/include/bash - done + mkdir -p ${pkgdir}/usr/include/bash + for f in [^y]*.h builtins/*.h include/*.h lib/{glob,tilde}/*.h + do + /bin/install ${f} ${pkgdir}/usr/include/bash + done } md5sums=('81348932d5da294953e15d4814c74dd1' diff --git a/binutils/PKGBUILD b/binutils/PKGBUILD index 7d431dc0..a3672bbc 100644 --- a/binutils/PKGBUILD +++ b/binutils/PKGBUILD @@ -16,11 +16,11 @@ makedepends=('libiconv-devel' 'gettext-devel' 'zlib-devel') options=('staticlibs' '!distcc' '!ccache') install=binutils.install source=(#http://sourceware.mirrors.tds.net/pub/sourceware.org/binutils/snapshots/binutils-${_basever}.tar.bz2 - #ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig} - http://cygwin.parentingamerica.com/x86_64/release/binutils/binutils-2.24.51-2-src.tar.xz - 02-x86-64-pc32-relocs.patch - 2.23.52-install-libiberty.patch - binutils-trunk-msys2.patch) + #ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig} + http://cygwin.parentingamerica.com/x86_64/release/binutils/binutils-2.24.51-2-src.tar.xz + 02-x86-64-pc32-relocs.patch + 2.23.52-install-libiberty.patch + binutils-trunk-msys2.patch) md5sums=('7f198636895e8e17489fc7d86342f148' 'e7e91814b32f4c4c63d4c777f5eabf7f' 'bbedd06f1acf9cab0a8dda20380cf26b' diff --git a/ca-certificates/PKGBUILD b/ca-certificates/PKGBUILD index 91c65e3a..1a063927 100644 --- a/ca-certificates/PKGBUILD +++ b/ca-certificates/PKGBUILD @@ -8,7 +8,7 @@ arch=('any') url='http://www.mozilla.org/projects/security/certs/' license=('MPL' 'GPL') source=(blacklist.txt - certdata.txt + certdata.txt nssckbi.h trust-fixes certdata2pem.py @@ -50,11 +50,11 @@ prepare() { } build() { - cd $srcdir/$pkgname-$pkgver/ - python2 certdata2pem.py - - ( - cat < ca-bundle.trust.crt + grep -w NSS_BUILTINS_LIBRARY_VERSION ${S}/nssckbi.h | awk '{print "# " $2 " " $3}'; + echo '#'; + ) > ca-bundle.trust.crt - > info.trust - > info.notrust + > info.trust + > info.notrust - local f= - for f in *.crt - do - echo "processing $f" - tbits=`sed -n '/^# openssl-trust/{s/^.*=//;p;}' $f` - distbits=`sed -n '/^# openssl-distrust/{s/^.*=//;p;}' $f` - alias=`sed -n '/^# alias=/{s/^.*=//;p;q;}' $f | sed "s/'//g" | sed 's/"//g'` - targs="" + local f= + for f in *.crt + do + echo "processing $f" + tbits=`sed -n '/^# openssl-trust/{s/^.*=//;p;}' $f` + distbits=`sed -n '/^# openssl-distrust/{s/^.*=//;p;}' $f` + alias=`sed -n '/^# alias=/{s/^.*=//;p;q;}' $f | sed "s/'//g" | sed 's/"//g'` + targs="" - if [ -n "$tbits" ] - then - for t in $tbits - do - targs="${targs} -addtrust $t" - done - fi - if [ -n "$distbits" ] - then - for t in $distbits - do - targs="${targs} -addreject $t" - done - fi - if [ -n "$targs" ] - then - echo "trust flags $targs for $f" >> info.trust - openssl x509 -text -in "$f" -trustout $targs -setalias "$alias" >> ca-bundle.trust.crt - else - echo "no trust flags for $f" >> tee -a info.notrust - openssl x509 -text -in "$f" -setalias "$alias" >> ca-bundle.neutral-trust.crt - fi - done - for p in *.p11-kit - do - cat $p >> ca-bundle.supplement.p11-kit - done - cat trust-fixes >> ca-bundle.supplement.p11-kit + if [ -n "$tbits" ] + then + for t in $tbits + do + targs="${targs} -addtrust $t" + done + fi + if [ -n "$distbits" ] + then + for t in $distbits + do + targs="${targs} -addreject $t" + done + fi + if [ -n "$targs" ] + then + echo "trust flags $targs for $f" >> info.trust + openssl x509 -text -in "$f" -trustout $targs -setalias "$alias" >> ca-bundle.trust.crt + else + echo "no trust flags for $f" >> tee -a info.notrust + openssl x509 -text -in "$f" -setalias "$alias" >> ca-bundle.neutral-trust.crt + fi + done + for p in *.p11-kit + do + cat $p >> ca-bundle.supplement.p11-kit + done + cat trust-fixes >> ca-bundle.supplement.p11-kit - asciidoc -v -d manpage -b docbook -o update-ca-trust.8.xml update-ca-trust.8.txt - xsltproc --nonet -o update-ca-trust.8 /etc/asciidoc/docbook-xsl/manpage.xsl update-ca-trust.8.xml + asciidoc -v -d manpage -b docbook -o update-ca-trust.8.xml update-ca-trust.8.txt + xsltproc --nonet -o update-ca-trust.8 /etc/asciidoc/docbook-xsl/manpage.xsl update-ca-trust.8.xml } package() { - cd $srcdir/$pkgname-$pkgver/ - - mkdir -p ${pkgdir}/usr/{etc,bin,lib,share} - mkdir -p ${pkgdir}/usr/share/man/man8 - - cp -f update-ca-trust ${pkgdir}/usr/bin/ - cp -f update-ca-trust.8 ${pkgdir}/usr/share/man/man8/ + cd $srcdir/$pkgname-$pkgver/ + + mkdir -p ${pkgdir}/usr/{etc,bin,lib,share} + mkdir -p ${pkgdir}/usr/share/man/man8 + + cp -f update-ca-trust ${pkgdir}/usr/bin/ + cp -f update-ca-trust.8 ${pkgdir}/usr/share/man/man8/ - # for p11-kit - mkdir -p ${pkgdir}/usr/lib/p11-kit - cp -f update-ca-trust ${pkgdir}/usr/lib/p11-kit/p11-kit-extract-trust - - mkdir -p ${pkgdir}/usr/share/pki/ca-trust-source - for file in ca-bundle.{trust.crt,neutral-trust.crt,supplement.p11-kit} - do - cp -f $file ${pkgdir}/usr/share/pki/ca-trust-source - done - cp -f README.usr ${D}/usr/share/pki/ca-trust-source/README + # for p11-kit + mkdir -p ${pkgdir}/usr/lib/p11-kit + cp -f update-ca-trust ${pkgdir}/usr/lib/p11-kit/p11-kit-extract-trust + + mkdir -p ${pkgdir}/usr/share/pki/ca-trust-source + for file in ca-bundle.{trust.crt,neutral-trust.crt,supplement.p11-kit} + do + cp -f $file ${pkgdir}/usr/share/pki/ca-trust-source + done + cp -f README.usr ${D}/usr/share/pki/ca-trust-source/README - # touch all files overwritten by update-ca-trust for easy cleanup - mkdir -p ${pkgdir}/usr/etc/pki/ca-trust/{extracted,source} - mkdir -p ${pkgdir}/usr/etc/pki/ca-trust/source/{anchors,blacklist} - mkdir -p ${pkgdir}/usr/etc/pki/ca-trust/extracted/{openssl,pem,java} - - cp -f README.extr ${pkgdir}/usr/etc/pki/ca-trust/extracted/README + # touch all files overwritten by update-ca-trust for easy cleanup + mkdir -p ${pkgdir}/usr/etc/pki/ca-trust/{extracted,source} + mkdir -p ${pkgdir}/usr/etc/pki/ca-trust/source/{anchors,blacklist} + mkdir -p ${pkgdir}/usr/etc/pki/ca-trust/extracted/{openssl,pem,java} + + cp -f README.extr ${pkgdir}/usr/etc/pki/ca-trust/extracted/README - cp -f README.openssl ${pkgdir}/usr/etc/pki/ca-trust/extracted/openssl/README - touch ${pkgdir}/usr/etc/pki/ca-trust/extracted/openssl/ca-bundle.trust.crt + cp -f README.openssl ${pkgdir}/usr/etc/pki/ca-trust/extracted/openssl/README + touch ${pkgdir}/usr/etc/pki/ca-trust/extracted/openssl/ca-bundle.trust.crt - cp -f README.pem ${pkgdir}/usr/etc/pki/ca-trust/extracted/pem/README - touch ${pkgdir}/usr/etc/pki/ca-trust/extracted/pem/{tls,email,objsign}-ca-bundle.pem + cp -f README.pem ${pkgdir}/usr/etc/pki/ca-trust/extracted/pem/README + touch ${pkgdir}/usr/etc/pki/ca-trust/extracted/pem/{tls,email,objsign}-ca-bundle.pem - cp -f README.java ${pkgdir}/usr/etc/pki/ca-trust/extracted/java/README - touch ${pkgdir}/usr/etc/pki/ca-trust/extracted/java/cacerts + cp -f README.java ${pkgdir}/usr/etc/pki/ca-trust/extracted/java/README + touch ${pkgdir}/usr/etc/pki/ca-trust/extracted/java/cacerts - cp -f README.src ${pkgdir}/usr/etc/pki/ca-trust/source/README + cp -f README.src ${pkgdir}/usr/etc/pki/ca-trust/source/README - # for OpenSSL and static ca-certificates consumers - mkdir -p ${pkgdir}/usr/ssl/certs - cp -f ${pkgdir}/usr/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem ${pkgdir}/usr/ssl/certs/ca-bundle.crt - cp -f ${pkgdir}/usr/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem ${pkgdir}/usr/ssl/cert.pem - cp -f ${pkgdir}/usr/etc/pki/ca-trust/extracted/openssl/ca-bundle.trust.crt ${pkgdir}/usr/ssl/certs/ca-bundle.trust.crt + # for OpenSSL and static ca-certificates consumers + mkdir -p ${pkgdir}/usr/ssl/certs + cp -f ${pkgdir}/usr/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem ${pkgdir}/usr/ssl/certs/ca-bundle.crt + cp -f ${pkgdir}/usr/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem ${pkgdir}/usr/ssl/cert.pem + cp -f ${pkgdir}/usr/etc/pki/ca-trust/extracted/openssl/ca-bundle.trust.crt ${pkgdir}/usr/ssl/certs/ca-bundle.trust.crt } diff --git a/cocom/PKGBUILD b/cocom/PKGBUILD index ea5f3954..ee576ccf 100644 --- a/cocom/PKGBUILD +++ b/cocom/PKGBUILD @@ -13,9 +13,9 @@ source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkg md5sums=('c95c5504fd76f4e05c4155ed840cc756') prepare() { - cd ${srcdir}/${pkgname}-${pkgver}/REGEX + cd ${srcdir}/${pkgname}-${pkgver}/REGEX - autoreconf -fi + autoreconf -fi } build() { diff --git a/coreutils/PKGBUILD b/coreutils/PKGBUILD index 231e7b4b..e934b220 100644 --- a/coreutils/PKGBUILD +++ b/coreutils/PKGBUILD @@ -13,15 +13,15 @@ makedepends=('gmp-devel' 'libiconv-devel' 'gettext-devel' 'help2man') install=${pkgname}.install source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig} coreutils-8.15-3.src.patch - coreutils-8.15-fix-dummy-man-invocation.patch - coreutils-8.15-fix-libstdbuf-link.patch - coreutils-8.15-fix-man-deps.patch - coreutils-8.15-fix-manpages.patch - coreutils-8.15-manifest.patch - coreutils-8.15-msys1-0x0d.patch - coreutils-8.15-msys2-add-to-gnulib.patch - coreutils-8.15-msys2-src.patch - coreutils-8.15-msys2.patch) + coreutils-8.15-fix-dummy-man-invocation.patch + coreutils-8.15-fix-libstdbuf-link.patch + coreutils-8.15-fix-man-deps.patch + coreutils-8.15-fix-manpages.patch + coreutils-8.15-manifest.patch + coreutils-8.15-msys1-0x0d.patch + coreutils-8.15-msys2-add-to-gnulib.patch + coreutils-8.15-msys2-src.patch + coreutils-8.15-msys2.patch) md5sums=('8fb0ae2267aa6e728958adc38f8163a2' 'SKIP' '2a2144d1ae5fb05dc0557677c906c22f' @@ -36,42 +36,42 @@ md5sums=('8fb0ae2267aa6e728958adc38f8163a2' '3eb55deabe4e3fe60caf3143912ce059') prepare() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver} - patch -p2 -i $srcdir/coreutils-8.15-3.src.patch - patch -p2 -i $srcdir/coreutils-8.15-fix-dummy-man-invocation.patch - patch -p2 -i $srcdir/coreutils-8.15-fix-libstdbuf-link.patch - patch -p2 -i $srcdir/coreutils-8.15-fix-man-deps.patch - patch -p2 -i $srcdir/coreutils-8.15-fix-manpages.patch - patch -p2 -i $srcdir/coreutils-8.15-manifest.patch - patch -p2 -i $srcdir/coreutils-8.15-msys1-0x0d.patch - patch -p2 -i $srcdir/coreutils-8.15-msys2-add-to-gnulib.patch - patch -p1 -i $srcdir/coreutils-8.15-msys2-src.patch - patch -p1 -i $srcdir/coreutils-8.15-msys2.patch + patch -p2 -i $srcdir/coreutils-8.15-3.src.patch + patch -p2 -i $srcdir/coreutils-8.15-fix-dummy-man-invocation.patch + patch -p2 -i $srcdir/coreutils-8.15-fix-libstdbuf-link.patch + patch -p2 -i $srcdir/coreutils-8.15-fix-man-deps.patch + patch -p2 -i $srcdir/coreutils-8.15-fix-manpages.patch + patch -p2 -i $srcdir/coreutils-8.15-manifest.patch + patch -p2 -i $srcdir/coreutils-8.15-msys1-0x0d.patch + patch -p2 -i $srcdir/coreutils-8.15-msys2-add-to-gnulib.patch + patch -p1 -i $srcdir/coreutils-8.15-msys2-src.patch + patch -p1 -i $srcdir/coreutils-8.15-msys2.patch } build() { - [[ -d $srcdir/build-${CHOST} ]] && rm -rf $srcdir/build-${CHOST} - mkdir -p $srcdir/build-${CHOST} && cd $srcdir/build-${CHOST} - - #cd ${srcdir}/${pkgname}-${pkgver} - ../${pkgname}-${pkgver}/configure --build=${CHOST} \ - --prefix=/usr \ - --libexecdir=/usr/lib \ - --program-transform-name=s/kill/gkill/ \ - --without-libintl-prefix \ - --without-libiconv-prefix \ - --enable-install-program=arch,hostname \ - --enable-no-install-program=uptime + [[ -d $srcdir/build-${CHOST} ]] && rm -rf $srcdir/build-${CHOST} + mkdir -p $srcdir/build-${CHOST} && cd $srcdir/build-${CHOST} + + #cd ${srcdir}/${pkgname}-${pkgver} + ../${pkgname}-${pkgver}/configure --build=${CHOST} \ + --prefix=/usr \ + --libexecdir=/usr/lib \ + --program-transform-name=s/kill/gkill/ \ + --without-libintl-prefix \ + --without-libiconv-prefix \ + --enable-install-program=arch,hostname \ + --enable-no-install-program=uptime - make -j1 + make -j1 } package() { - cd $srcdir/build-${CHOST} - make DESTDIR=${pkgdir} install + cd $srcdir/build-${CHOST} + make DESTDIR=${pkgdir} install - mkdir -p ${pkgdir}/usr/etc - install -m644 ${srcdir}/${pkgname}-${pkgver}/src/dircolors.hin ${pkgdir}/usr/etc/DIR_COLORS + mkdir -p ${pkgdir}/usr/etc + install -m644 ${srcdir}/${pkgname}-${pkgver}/src/dircolors.hin ${pkgdir}/usr/etc/DIR_COLORS } diff --git a/curl/PKGBUILD b/curl/PKGBUILD index db99ee0e..aa861871 100644 --- a/curl/PKGBUILD +++ b/curl/PKGBUILD @@ -12,8 +12,8 @@ makedepends=('libmetalink-devel' 'libidn-devel' 'libssh2-devel' 'openssl-devel' #provides=('libcurl.so') options=('!libtool' 'strip' '!debug') source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} - curl-7.32.0-msys2.patch - 7.33.0-libdeps.patch) + curl-7.32.0-msys2.patch + 7.33.0-libdeps.patch) md5sums=('643a7030b27449e76413d501d4b8eb57' 'SKIP' '255b3bf8fe8704adfb95222865589d16' diff --git a/cvs/PKGBUILD b/cvs/PKGBUILD index 9f6ff302..37256ac5 100644 --- a/cvs/PKGBUILD +++ b/cvs/PKGBUILD @@ -12,31 +12,31 @@ makedepends=('heimdal-devel' 'zlib-devel' 'gcc' 'libcrypt-devel' 'openssl-devel' options=('staticlibs') install=cvs.install source=(ftp://ftp.gnu.org/non-gnu/cvs/source/stable/${pkgver}/${pkgname}-${pkgver}.tar.bz2 - cvs-1.11.1p1-bs.patch - cvs-1.11.19-abortabort.patch - cvs-1.11.19-comp.patch - cvs-1.11.19-extzlib.patch - cvs-1.11.19-logmsg.patch - cvs-1.11.19-netbsd-tag.patch - cvs-1.11.19-tagname.patch - cvs-1.11.19-tmp.patch - cvs-1.11.21-diff-kk.patch - cvs-1.11.21-diff.patch - cvs-1.11.21-proxy.patch - cvs-1.11.21-sort.patch - cvs-1.11.22-cvspass.patch - cvs-1.11.22-ipv6-proxy.patch - cvs-1.11.22-stdinargs.patch - cvs-1.11.23-Back-port-KeywordExpand-configuration-keyword.patch - cvs-1.11.23-cve-2010-3846.patch - cvs-1.11.23-Fix-proxy-response-parser.patch - cvs-1.11.23-getline64.patch - cvs-1.11.23-make_make_check_sanity_testing_verbose.patch - cvs-1.11.23-Pass-server-IP-address-instead-of-hostname-to-GSSAPI.patch - cvs-1.11.23-remove_undefined_date_from_cvs_1_header.patch - cvs-1.11.23-sanity.patch - cvs-1.11.23-doc-Add-mandatory-argument-to-sp.patch - ) + cvs-1.11.1p1-bs.patch + cvs-1.11.19-abortabort.patch + cvs-1.11.19-comp.patch + cvs-1.11.19-extzlib.patch + cvs-1.11.19-logmsg.patch + cvs-1.11.19-netbsd-tag.patch + cvs-1.11.19-tagname.patch + cvs-1.11.19-tmp.patch + cvs-1.11.21-diff-kk.patch + cvs-1.11.21-diff.patch + cvs-1.11.21-proxy.patch + cvs-1.11.21-sort.patch + cvs-1.11.22-cvspass.patch + cvs-1.11.22-ipv6-proxy.patch + cvs-1.11.22-stdinargs.patch + cvs-1.11.23-Back-port-KeywordExpand-configuration-keyword.patch + cvs-1.11.23-cve-2010-3846.patch + cvs-1.11.23-Fix-proxy-response-parser.patch + cvs-1.11.23-getline64.patch + cvs-1.11.23-make_make_check_sanity_testing_verbose.patch + cvs-1.11.23-Pass-server-IP-address-instead-of-hostname-to-GSSAPI.patch + cvs-1.11.23-remove_undefined_date_from_cvs_1_header.patch + cvs-1.11.23-sanity.patch + cvs-1.11.23-doc-Add-mandatory-argument-to-sp.patch + ) md5sums=('0213ea514e231559d6ff8f80a34117f0' 'e447b7d85674ae63bef7036fc7b2b669' '41edb97470e684fc6a7d1d17f5d340be' diff --git a/cyrus-sasl/PKGBUILD b/cyrus-sasl/PKGBUILD index 8ce75872..4d137011 100644 --- a/cyrus-sasl/PKGBUILD +++ b/cyrus-sasl/PKGBUILD @@ -12,15 +12,15 @@ makedepends=('heimdal-devel' 'openssl-devel' 'libsqlite-devel' 'libcrypt-devel') options=('emptydirs' 'strip' '!makeflags') source=(http://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz 01-no-undefined.patch - 02-exeext.patch - 03-fix-plugins.patch - 04-manpage-paths.patch - 05-remove-warnings.patch - 06-fix-sqlite-search.patch - 07-fix-pkgconfig.patch - 08-cyrus-sasl-2.1.26-size_t.patch - cyrus-sasl-2.1.26-msys2.patch - ) + 02-exeext.patch + 03-fix-plugins.patch + 04-manpage-paths.patch + 05-remove-warnings.patch + 06-fix-sqlite-search.patch + 07-fix-pkgconfig.patch + 08-cyrus-sasl-2.1.26-size_t.patch + cyrus-sasl-2.1.26-msys2.patch + ) md5sums=('a7f4e5e559a0e37b3ffc438c9456e425' '7f52862a74ada70ed2e257990f9b4334' 'd7ff8a6d1902478190c705a580b4bd80' @@ -33,55 +33,55 @@ md5sums=('a7f4e5e559a0e37b3ffc438c9456e425' 'b48df2818c4836801445d9dee0adfaa0') prepare() { - cd ${srcdir}/$pkgname-$pkgver + cd ${srcdir}/$pkgname-$pkgver - patch -p1 -i ${srcdir}/01-no-undefined.patch - patch -p1 -i ${srcdir}/02-exeext.patch - patch -p1 -i ${srcdir}/03-fix-plugins.patch - patch -p1 -i ${srcdir}/04-manpage-paths.patch - patch -p1 -i ${srcdir}/05-remove-warnings.patch - patch -p1 -i ${srcdir}/06-fix-sqlite-search.patch - patch -p2 -i ${srcdir}/07-fix-pkgconfig.patch - patch -p1 -i ${srcdir}/08-cyrus-sasl-2.1.26-size_t.patch - patch -p1 -i ${srcdir}/cyrus-sasl-2.1.26-msys2.patch - - sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in - rm -f config/config.guess config/config.sub - rm -f config/ltconfig config/ltmain.sh config/libtool.m4 - rm -fr autom4te.cache - libtoolize -c - aclocal -I config -I cmulocal - automake -a -c - autoheader - autoconf - - pushd saslauthd - rm -f config/config.guess config/config.sub - rm -f config/ltconfig config/ltmain.sh config/libtool.m4 - rm -fr autom4te.cache - libtoolize -c - aclocal -I config -I ../cmulocal -I ../config - automake -a -c - autoheader - autoconf - popd + patch -p1 -i ${srcdir}/01-no-undefined.patch + patch -p1 -i ${srcdir}/02-exeext.patch + patch -p1 -i ${srcdir}/03-fix-plugins.patch + patch -p1 -i ${srcdir}/04-manpage-paths.patch + patch -p1 -i ${srcdir}/05-remove-warnings.patch + patch -p1 -i ${srcdir}/06-fix-sqlite-search.patch + patch -p2 -i ${srcdir}/07-fix-pkgconfig.patch + patch -p1 -i ${srcdir}/08-cyrus-sasl-2.1.26-size_t.patch + patch -p1 -i ${srcdir}/cyrus-sasl-2.1.26-msys2.patch + + sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in + rm -f config/config.guess config/config.sub + rm -f config/ltconfig config/ltmain.sh config/libtool.m4 + rm -fr autom4te.cache + libtoolize -c + aclocal -I config -I cmulocal + automake -a -c + autoheader + autoconf + + pushd saslauthd + rm -f config/config.guess config/config.sub + rm -f config/ltconfig config/ltmain.sh config/libtool.m4 + rm -fr autom4te.cache + libtoolize -c + aclocal -I config -I ../cmulocal -I ../config + automake -a -c + autoheader + autoconf + popd } build() { - cd ${srcdir}/$pkgname-$pkgver - ./configure \ - --prefix=/usr \ - --build=$CHOST \ - --host=$CHOST \ - --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \ - --with-plugindir=/usr/lib/sasl2 \ - --disable-static --enable-shared \ - --enable-sql \ - --with-sqlite3=/usr \ - --disable-ldapdb \ - sasl_cv_dlsym_adds_uscore=yes + cd ${srcdir}/$pkgname-$pkgver + ./configure \ + --prefix=/usr \ + --build=$CHOST \ + --host=$CHOST \ + --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \ + --with-plugindir=/usr/lib/sasl2 \ + --disable-static --enable-shared \ + --enable-sql \ + --with-sqlite3=/usr \ + --disable-ldapdb \ + sasl_cv_dlsym_adds_uscore=yes - make CFLAGS="$CFLAGS -Wall -Wno-char-subscripts -Wno-unused -Wno-pointer-sign -Wno-uninitialized" + make CFLAGS="$CFLAGS -Wall -Wno-char-subscripts -Wno-unused -Wno-pointer-sign -Wno-uninitialized" } diff --git a/diffstat/PKGBUILD b/diffstat/PKGBUILD index 15356cfa..8ce1d515 100644 --- a/diffstat/PKGBUILD +++ b/diffstat/PKGBUILD @@ -10,7 +10,7 @@ depends=('msys2-runtime') groups=('base-devel') license=('MIT') source=("ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz" - diffstat-1.58-msys2.patch) + diffstat-1.58-msys2.patch) md5sums=('6d6e13f7dcfe4db5da65c5175260ea47' 'a3378b96b375f922c76829dc2b58202f') @@ -24,8 +24,8 @@ build () { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --build=${CHOST} \ - --prefix=/usr \ - --mandir=/usr/share/man + --prefix=/usr \ + --mandir=/usr/share/man make } diff --git a/docbook-xsl/PKGBUILD b/docbook-xsl/PKGBUILD index 604760a4..4ee72205 100644 --- a/docbook-xsl/PKGBUILD +++ b/docbook-xsl/PKGBUILD @@ -13,21 +13,21 @@ source=("http://downloads.sourceforge.net/docbook/${pkgname}-${pkgver}.tar.bz2") md5sums=('6dd0f89131cc35bf4f2ed105a1c17771') package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver} - _pkgroot=${pkgdir}/usr/share/xml/docbook/xsl-stylesheets-${pkgver} + _pkgroot=${pkgdir}/usr/share/xml/docbook/xsl-stylesheets-${pkgver} - install -dm755 ${_pkgroot} - install -m644 VERSION VERSION.xsl ${_pkgroot} + install -dm755 ${_pkgroot} + install -m644 VERSION VERSION.xsl ${_pkgroot} - for fn in assembly common eclipse epub epub3 fo highlighting html htmlhelp javahelp lib \ - manpages params profiling roundtrip template website xhtml xhtml-1_1 xhtml5; do - install -dm755 ${_pkgroot}/${fn} - install -m644 ${fn}/*.{xml,xsl,dtd,ent} ${_pkgroot}/${fn} || true # ignore missing files - done + for fn in assembly common eclipse epub epub3 fo highlighting html htmlhelp javahelp lib \ + manpages params profiling roundtrip template website xhtml xhtml-1_1 xhtml5; do + install -dm755 ${_pkgroot}/${fn} + install -m644 ${fn}/*.{xml,xsl,dtd,ent} ${_pkgroot}/${fn} || true # ignore missing files + done - install -dm755 ${pkgdir}/etc/xml - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - - mv -f ${pkgdir}/etc ${pkgdir}/usr/ + install -dm755 ${pkgdir}/etc/xml + install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + + mv -f ${pkgdir}/etc ${pkgdir}/usr/ } diff --git a/dos2unix/PKGBUILD b/dos2unix/PKGBUILD index 60c6d78f..dbeeec06 100644 --- a/dos2unix/PKGBUILD +++ b/dos2unix/PKGBUILD @@ -12,7 +12,7 @@ groups=('base-devel') makedepends=('perl') conflicts=('hd2u') source=("http://waterlan.home.xs4all.nl/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 0001-msysize.msys2.patch) + 0001-msysize.msys2.patch) sha256sums=('f5268c5b28a1983537210c72b3fd43f4aad17a8dacb6727b615b56dca2ef9a04' '8b7d35bda25377b23bc49e7a8796cd9a239c46973eb8c9351da03390ae6a591a') diff --git a/expat/PKGBUILD b/expat/PKGBUILD index b5e7ea99..9ef7e473 100644 --- a/expat/PKGBUILD +++ b/expat/PKGBUILD @@ -14,9 +14,9 @@ md5sums=('dd7dab7a5fea97d2a6a43f511449b7cd' 'cd80d7df279e63dafb1bda6652f95caa') prepare() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver} - patch -p1 -i ${srcdir}/msys2-expat-2.1.0.patch + patch -p1 -i ${srcdir}/msys2-expat-2.1.0.patch } build() { diff --git a/file/PKGBUILD b/file/PKGBUILD index 350a4474..4be9a920 100644 --- a/file/PKGBUILD +++ b/file/PKGBUILD @@ -12,47 +12,47 @@ depends=('zlib') makedepends=('python2' 'python3' 'zlib-devel') options=('!libtool') source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz - file-5.17-msys2.patch - file-5.15-fix-regexp.patch) + file-5.17-msys2.patch + file-5.15-fix-regexp.patch) md5sums=('d420d8f2990cd344673acfbf8d76ff5a' '1538c425504bce1cd01126a385b70eb1' 'f29d52a9c614967b5f3c7d67f0983103') prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ${srcdir}/file-5.17-msys2.patch - patch -p1 -i ${srcdir}/file-5.15-fix-regexp.patch + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ${srcdir}/file-5.17-msys2.patch + patch -p1 -i ${srcdir}/file-5.15-fix-regexp.patch - autoreconf -fi + autoreconf -fi } build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ - --prefix=/usr \ - --build=${CHOST} \ - --host=${CHOST} \ - --target=${CHOST} \ - --enable-fsect-man5 - make + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --build=${CHOST} \ + --host=${CHOST} \ + --target=${CHOST} \ + --enable-fsect-man5 + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR=${pkgdir} install - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING + install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING - PYTHON_SITELIB=$(python2 -c 'from distutils.sysconfig import * ; print get_python_lib(0,0);') - PYTHON3_SITELIB=$(python3 -c 'from distutils.sysconfig import * ; print(get_python_lib(0,0));') + PYTHON_SITELIB=$(python2 -c 'from distutils.sysconfig import * ; print get_python_lib(0,0);') + PYTHON3_SITELIB=$(python3 -c 'from distutils.sysconfig import * ; print(get_python_lib(0,0));') - mkdir -p ${pkgdir}/$PYTHON_SITELIB - mkdir -p ${pkgdir}/$PYTHON3_SITELIB - cp -f ${srcdir}/${pkgname}-${pkgver}/python/magic.py ${pkgdir}/$PYTHON_SITELIB - cp -f ${srcdir}/${pkgname}-${pkgver}/python/magic.py ${pkgdir}/$PYTHON3_SITELIB + mkdir -p ${pkgdir}/$PYTHON_SITELIB + mkdir -p ${pkgdir}/$PYTHON3_SITELIB + cp -f ${srcdir}/${pkgname}-${pkgver}/python/magic.py ${pkgdir}/$PYTHON_SITELIB + cp -f ${srcdir}/${pkgname}-${pkgver}/python/magic.py ${pkgdir}/$PYTHON3_SITELIB - cat ${srcdir}/${pkgname}-${pkgver}/magic/Magdir/* > ${pkgdir}/usr/share/misc/magic - cp -rf ${pkgdir}/usr/share/misc/magic ${pkgdir}/usr/share/magic - mkdir -p ${pkgdir}/usr/share/file - cp -rf ${pkgdir}/usr/share/magic ${pkgdir}/usr/share/file/magic + cat ${srcdir}/${pkgname}-${pkgver}/magic/Magdir/* > ${pkgdir}/usr/share/misc/magic + cp -rf ${pkgdir}/usr/share/misc/magic ${pkgdir}/usr/share/magic + mkdir -p ${pkgdir}/usr/share/file + cp -rf ${pkgdir}/usr/share/magic ${pkgdir}/usr/share/file/magic } diff --git a/flex/PKGBUILD b/flex/PKGBUILD index 9cc7f9de..4f50b2b6 100644 --- a/flex/PKGBUILD +++ b/flex/PKGBUILD @@ -22,42 +22,42 @@ md5sums=('77d44c6bb8c0705e0017ab9a84a1502b' '94446affa390d1444cbf9cf5a77c723f') prepare() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver - patch -p2 -i $srcdir/2.5.37-vpath.patch - patch -p1 -i $srcdir/flex-2.5.38-msys2.patch + patch -p2 -i $srcdir/2.5.37-vpath.patch + patch -p1 -i $srcdir/flex-2.5.38-msys2.patch - ./autogen.sh + ./autogen.sh } build() { - cd $srcdir/$pkgname-$pkgver - ./configure --build=${CHOST} \ - --prefix=/usr \ - --without-libiconv-prefix \ - --without-libintl-prefix \ - --enable-static \ - --disable-shared - make + cd $srcdir/$pkgname-$pkgver + ./configure --build=${CHOST} \ + --prefix=/usr \ + --without-libiconv-prefix \ + --without-libintl-prefix \ + --enable-static \ + --disable-shared + make } check() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver - # these tests used features removed in bison-2.6 - sed -i -e '/test-bison-yylloc/d' -e '/test-bison-yylval/d' tests/Makefile.in + # these tests used features removed in bison-2.6 + sed -i -e '/test-bison-yylloc/d' -e '/test-bison-yylval/d' tests/Makefile.in - make check + make check } package() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - install -Dm755 $srcdir/lex.sh $pkgdir/usr/bin/lex - #cp -f $pkgdir/usr/bin/flex.exe $pkgdir/usr/bin/flex++ + make DESTDIR=$pkgdir install + install -Dm755 $srcdir/lex.sh $pkgdir/usr/bin/lex + #cp -f $pkgdir/usr/bin/flex.exe $pkgdir/usr/bin/flex++ - install -Dm644 COPYING \ - $pkgdir/usr/share/licenses/$pkgname/license.txt + install -Dm644 COPYING \ + $pkgdir/usr/share/licenses/$pkgname/license.txt } diff --git a/gc/PKGBUILD b/gc/PKGBUILD index 45b10ed9..d1531c11 100644 --- a/gc/PKGBUILD +++ b/gc/PKGBUILD @@ -10,8 +10,8 @@ gropus=('libraries') url="http://www.hpl.hp.com/personal/Hans_Boehm/gc/" license=('GPL') source=("http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/${pkgbase}-7.2d.tar.gz" - gc-7.2-msys2.patch - gc-7.2d-patch64.diff) + gc-7.2-msys2.patch + gc-7.2d-patch64.diff) depends=('gcc-libs') options=('!libtool') md5sums=('91340b28c61753a789eb6077675d87d2' @@ -29,10 +29,10 @@ build() { cd "${srcdir}/${pkgbase}-7.2" ./configure --build=${CHOST} \ --prefix=/usr \ - --enable-cplusplus \ - --enable-threads=pthreads \ - --without-libatomic-ops \ - --disable-static + --enable-cplusplus \ + --enable-threads=pthreads \ + --without-libatomic-ops \ + --disable-static make # Install to dest diff --git a/gdb/PKGBUILD b/gdb/PKGBUILD index edd38627..73b809e6 100644 --- a/gdb/PKGBUILD +++ b/gdb/PKGBUILD @@ -14,8 +14,8 @@ depends=("libiconv" "zlib" "expat" "libiconv" "python2") makedepends=("libiconv-devel" "zlib-devel" "ncurses-devel" "liblzma-devel") options=('staticlibs' '!distcc' '!ccache') source=("ftp://mirrors.kernel.org/sources.redhat.com/gdb/releases/gdb-${pkgver}.tar.bz2" - 'gdbinit' - 'gdb-7.6-msys2.patch') + 'gdbinit' + 'gdb-7.6-msys2.patch') md5sums=('fbc4dab4181e6e9937075b43a4ce2732' 'dec2439447cb1accf037457b459093f7' 'f06ddf7417948d03385873ae10e5b5db') diff --git a/gettext/PKGBUILD b/gettext/PKGBUILD index 4bb2d9d3..fef88dc0 100644 --- a/gettext/PKGBUILD +++ b/gettext/PKGBUILD @@ -27,7 +27,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --build=${CHOST} \ --prefix=/usr \ - --with-included-libcroco \ + --with-included-libcroco \ --with-included-libunistring \ --with-included-libxml \ --with-included-glib \ @@ -39,7 +39,7 @@ build() { --disable-native-java \ --disable-csharp \ --disable-openmp \ - ac_cv_header_spawn_h=no + ac_cv_header_spawn_h=no make diff --git a/glib2/PKGBUILD b/glib2/PKGBUILD index e76306a7..314945cb 100644 --- a/glib2/PKGBUILD +++ b/glib2/PKGBUILD @@ -10,18 +10,18 @@ arch=('i686' 'x86_64') makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'libpcre' 'libffi') source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz revert-warn-glib-compile-schemas.patch - 2.16-tests.patch - 2.24.1-gmodule.patch - 2.34.3-m4macros.patch - 2.36.3-gcredentials-cygwin.patch - 2.36.3-not-win32.patch - 2.36.3-visibility.patch - 2.36.4-gmutex-cygwin.patch - 2.36.4-goption-cygwin.patch - 2.36.4-gspawn-cygwin.patch - 2.36.4-gtk-doc-vpath.patch - 2.36.4-gutf8-cygwin.patch - glib-2.38.1-msys2.patch) + 2.16-tests.patch + 2.24.1-gmodule.patch + 2.34.3-m4macros.patch + 2.36.3-gcredentials-cygwin.patch + 2.36.3-not-win32.patch + 2.36.3-visibility.patch + 2.36.4-gmutex-cygwin.patch + 2.36.4-goption-cygwin.patch + 2.36.4-gspawn-cygwin.patch + 2.36.4-gtk-doc-vpath.patch + 2.36.4-gutf8-cygwin.patch + glib-2.38.1-msys2.patch) sha256sums=('056a9854c0966a0945e16146b3345b7a82562a5ba4d5516fd10398732aea5734' '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97' '3bfcc379e2d8b893e2c7e419442a006886568ab960f5aea6044cbfe28f9f9e4f' @@ -38,135 +38,135 @@ sha256sums=('056a9854c0966a0945e16146b3345b7a82562a5ba4d5516fd10398732aea5734' '34050b0a2ac2ed82572e32c0103d2ebd1f468a80a94917667f57edef5d0f62ad') prepare() { - cd glib-$pkgver - patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch + cd glib-$pkgver + patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch - patch -p2 -i ${srcdir}/2.16-tests.patch - patch -p2 -i ${srcdir}/2.24.1-gmodule.patch - patch -p2 -i ${srcdir}/2.34.3-m4macros.patch - patch -p2 -i ${srcdir}/2.36.3-gcredentials-cygwin.patch - patch -p2 -i ${srcdir}/2.36.3-not-win32.patch - patch -p2 -i ${srcdir}/2.36.3-visibility.patch - patch -p2 -i ${srcdir}/2.36.4-gmutex-cygwin.patch - patch -p2 -i ${srcdir}/2.36.4-goption-cygwin.patch - patch -p2 -i ${srcdir}/2.36.4-gspawn-cygwin.patch - patch -p2 -i ${srcdir}/2.36.4-gtk-doc-vpath.patch - patch -p2 -i ${srcdir}/2.36.4-gutf8-cygwin.patch - patch -p1 -i ${srcdir}/glib-2.38.1-msys2.patch + patch -p2 -i ${srcdir}/2.16-tests.patch + patch -p2 -i ${srcdir}/2.24.1-gmodule.patch + patch -p2 -i ${srcdir}/2.34.3-m4macros.patch + patch -p2 -i ${srcdir}/2.36.3-gcredentials-cygwin.patch + patch -p2 -i ${srcdir}/2.36.3-not-win32.patch + patch -p2 -i ${srcdir}/2.36.3-visibility.patch + patch -p2 -i ${srcdir}/2.36.4-gmutex-cygwin.patch + patch -p2 -i ${srcdir}/2.36.4-goption-cygwin.patch + patch -p2 -i ${srcdir}/2.36.4-gspawn-cygwin.patch + patch -p2 -i ${srcdir}/2.36.4-gtk-doc-vpath.patch + patch -p2 -i ${srcdir}/2.36.4-gutf8-cygwin.patch + patch -p1 -i ${srcdir}/glib-2.38.1-msys2.patch - libtoolize --force --copy - autoreconf -fi + libtoolize --force --copy + autoreconf -fi } build() { - export lt_cv_deplibs_check_method='pass_all' - cd glib-$pkgver - ./configure \ - --build=${CHOST} \ - --host=${CHOST} \ - --prefix=/usr \ - --disable-libelf \ - --with-pcre=system \ - --with-threads=posix \ - --enable-shared \ - --disable-static \ - --disable-silent-rules \ - ac_cv_header_winsock2_h=no \ - ac_cv_header_mswsock_h=no - make VERBOSE=1 + export lt_cv_deplibs_check_method='pass_all' + cd glib-$pkgver + ./configure \ + --build=${CHOST} \ + --host=${CHOST} \ + --prefix=/usr \ + --disable-libelf \ + --with-pcre=system \ + --with-threads=posix \ + --enable-shared \ + --disable-static \ + --disable-silent-rules \ + ac_cv_header_winsock2_h=no \ + ac_cv_header_mswsock_h=no + make VERBOSE=1 - make completiondir=/usr/share/bash-completion/completions DESTDIR="$srcdir/dest" install - pushd $srcdir/dest/usr/share/gdb/auto-load > /dev/null - mv libglib* msys-glib-2.0-0.dll-gdb.py - mv libgobject* msys-gobject-2.0-0.dll-gdb.py - popd > /dev/null + make completiondir=/usr/share/bash-completion/completions DESTDIR="$srcdir/dest" install + pushd $srcdir/dest/usr/share/gdb/auto-load > /dev/null + mv libglib* msys-glib-2.0-0.dll-gdb.py + mv libgobject* msys-gobject-2.0-0.dll-gdb.py + popd > /dev/null } check() { - cd glib-$pkgver - #make -k check || : + cd glib-$pkgver + #make -k check || : } package_glib2() { - depends=('pcre' 'libffi') - optdepends=('python2: for gdbus-codegen and gtester-report') - options=('!docs' '!emptydirs') - license=('LGPL') + depends=('pcre' 'libffi') + optdepends=('python2: for gdbus-codegen and gtester-report') + options=('!docs' '!emptydirs') + license=('LGPL') - #cd glib-$pkgver - #make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install + #cd glib-$pkgver + #make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install - mkdir -p $pkgdir/usr/{bin,lib,share} - cp -f $srcdir/dest/usr/bin/*.dll $pkgdir/usr/bin/ - for file in gdbus gio-querymodules glib-compile-schemas gobject-query gsettings; do - cp -f $srcdir/dest/usr/bin/${file}.exe $pkgdir/usr/bin/ - done + mkdir -p $pkgdir/usr/{bin,lib,share} + cp -f $srcdir/dest/usr/bin/*.dll $pkgdir/usr/bin/ + for file in gdbus gio-querymodules glib-compile-schemas gobject-query gsettings; do + cp -f $srcdir/dest/usr/bin/${file}.exe $pkgdir/usr/bin/ + done - cp -rf $srcdir/dest/usr/lib/gio $pkgdir/usr/lib/ - #cp -rf $srcdir/dest/usr/share/doc $pkgdir/usr/share/ - cp -rf $srcdir/dest/usr/share/gdb $pkgdir/usr/share/ + cp -rf $srcdir/dest/usr/lib/gio $pkgdir/usr/lib/ + #cp -rf $srcdir/dest/usr/share/doc $pkgdir/usr/share/ + cp -rf $srcdir/dest/usr/share/gdb $pkgdir/usr/share/ - mkdir -p $pkgdir/usr/share/{man,glib-2.0} - cp -rf $srcdir/dest/usr/share/glib-2.0/gdb $pkgdir/usr/share/glib-2.0/ - cp -rf $srcdir/dest/usr/share/glib-2.0/schemas $pkgdir/usr/share/glib-2.0/ - cp -rf $srcdir/dest/usr/share/locale $pkgdir/usr/share/ - mkdir -p $pkgdir/usr/share/man/man1 - cp -rf $srcdir/dest/usr/share/man/man1/gdbus.* $pkgdir/usr/share/man/man1/ - cp -rf $srcdir/dest/usr/share/man/man1/gio* $pkgdir/usr/share/man/man1/ - cp -rf $srcdir/dest/usr/share/man/man1/glib-compile-schemas* $pkgdir/usr/share/man/man1/ - cp -rf $srcdir/dest/usr/share/man/man1/gobject* $pkgdir/usr/share/man/man1/ - cp -rf $srcdir/dest/usr/share/man/man1/gsettings.* $pkgdir/usr/share/man/man1/ + mkdir -p $pkgdir/usr/share/{man,glib-2.0} + cp -rf $srcdir/dest/usr/share/glib-2.0/gdb $pkgdir/usr/share/glib-2.0/ + cp -rf $srcdir/dest/usr/share/glib-2.0/schemas $pkgdir/usr/share/glib-2.0/ + cp -rf $srcdir/dest/usr/share/locale $pkgdir/usr/share/ + mkdir -p $pkgdir/usr/share/man/man1 + cp -rf $srcdir/dest/usr/share/man/man1/gdbus.* $pkgdir/usr/share/man/man1/ + cp -rf $srcdir/dest/usr/share/man/man1/gio* $pkgdir/usr/share/man/man1/ + cp -rf $srcdir/dest/usr/share/man/man1/glib-compile-schemas* $pkgdir/usr/share/man/man1/ + cp -rf $srcdir/dest/usr/share/man/man1/gobject* $pkgdir/usr/share/man/man1/ + cp -rf $srcdir/dest/usr/share/man/man1/gsettings.* $pkgdir/usr/share/man/man1/ - cp -rf $srcdir/dest/usr/share/bash-completion $pkgdir/usr/share/ + cp -rf $srcdir/dest/usr/share/bash-completion $pkgdir/usr/share/ - for _i in "$pkgdir/usr/share/bash-completion/completions/"*; do - chmod -x "$_i" - done + for _i in "$pkgdir/usr/share/bash-completion/completions/"*; do + chmod -x "$_i" + done } package_glib2-devel() { - pkgdesc="glib2 headers and libraries" - groups=('development') - depends=("glib2=${pkgver}") - options=('emptydirs') + pkgdesc="glib2 headers and libraries" + groups=('development') + depends=("glib2=${pkgver}") + options=('emptydirs') - mkdir -p $pkgdir/usr/{bin,lib,share} - cp -f $srcdir/dest/usr/bin/gdbus-codegen $pkgdir/usr/bin/ - cp -f $srcdir/dest/usr/bin/glib-* $pkgdir/usr/bin/ - rm -f $pkgdir/usr/bin/glib-compile-schemas* - cp -f $srcdir/dest/usr/bin/gresource* $pkgdir/usr/bin/ - cp -f $srcdir/dest/usr/bin/gtester* $pkgdir/usr/bin/ + mkdir -p $pkgdir/usr/{bin,lib,share} + cp -f $srcdir/dest/usr/bin/gdbus-codegen $pkgdir/usr/bin/ + cp -f $srcdir/dest/usr/bin/glib-* $pkgdir/usr/bin/ + rm -f $pkgdir/usr/bin/glib-compile-schemas* + cp -f $srcdir/dest/usr/bin/gresource* $pkgdir/usr/bin/ + cp -f $srcdir/dest/usr/bin/gtester* $pkgdir/usr/bin/ - cp -rf $srcdir/dest/usr/lib/pkgconfig $pkgdir/usr/lib/ - cp -f $srcdir/dest/usr/lib/*.a $pkgdir/usr/lib/ - cp -rf $srcdir/dest/usr/lib/gio* $pkgdir/usr/lib/ - cp -rf $srcdir/dest/usr/lib/glib* $pkgdir/usr/lib/ + cp -rf $srcdir/dest/usr/lib/pkgconfig $pkgdir/usr/lib/ + cp -f $srcdir/dest/usr/lib/*.a $pkgdir/usr/lib/ + cp -rf $srcdir/dest/usr/lib/gio* $pkgdir/usr/lib/ + cp -rf $srcdir/dest/usr/lib/glib* $pkgdir/usr/lib/ - cp -rf $srcdir/dest/usr/include $pkgdir/usr/ - cp -rf $srcdir/dest/usr/share/aclocal $pkgdir/usr/share/ - cp -rf $srcdir/dest/usr/share/glib-2.0 $pkgdir/usr/share/ - rm -rf $pkgdir/usr/share/glib-2.0/gdb - rm -rf $pkgdir/usr/share/glib-2.0/schemas + cp -rf $srcdir/dest/usr/include $pkgdir/usr/ + cp -rf $srcdir/dest/usr/share/aclocal $pkgdir/usr/share/ + cp -rf $srcdir/dest/usr/share/glib-2.0 $pkgdir/usr/share/ + rm -rf $pkgdir/usr/share/glib-2.0/gdb + rm -rf $pkgdir/usr/share/glib-2.0/schemas - mkdir -p $pkgdir/usr/share/man/man1 - cp -rf $srcdir/dest/usr/share/man/man1/gdbus-codegen* $pkgdir/usr/share/man/man1/ - cp -rf $srcdir/dest/usr/share/man/man1/glib-* $pkgdir/usr/share/man/man1/ - rm -f $pkgdir/usr/share/man/man1/glib-compile-schemas* - cp -rf $srcdir/dest/usr/share/man/man1/gresource* $pkgdir/usr/share/man/man1/ - cp -rf $srcdir/dest/usr/share/man/man1/gtester* $pkgdir/usr/share/man/man1/ + mkdir -p $pkgdir/usr/share/man/man1 + cp -rf $srcdir/dest/usr/share/man/man1/gdbus-codegen* $pkgdir/usr/share/man/man1/ + cp -rf $srcdir/dest/usr/share/man/man1/glib-* $pkgdir/usr/share/man/man1/ + rm -f $pkgdir/usr/share/man/man1/glib-compile-schemas* + cp -rf $srcdir/dest/usr/share/man/man1/gresource* $pkgdir/usr/share/man/man1/ + cp -rf $srcdir/dest/usr/share/man/man1/gtester* $pkgdir/usr/share/man/man1/ } package_glib2-docs() { - pkgdesc="Documentation for glib2" - conflicts=('gobject2-docs') - replaces=('gobject2-docs') - license=('custom') - options=('docs' '!emptydirs') + pkgdesc="Documentation for glib2" + conflicts=('gobject2-docs') + replaces=('gobject2-docs') + license=('custom') + options=('docs' '!emptydirs') - cd glib-$pkgver/docs - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/glib2-docs" - install -m644 reference/COPYING "${pkgdir}/usr/share/licenses/glib2-docs/" + cd glib-$pkgver/docs + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/glib2-docs" + install -m644 reference/COPYING "${pkgdir}/usr/share/licenses/glib2-docs/" - rm -rf "${pkgdir}/usr/share/man" + rm -rf "${pkgdir}/usr/share/man" } diff --git a/gmp/PKGBUILD b/gmp/PKGBUILD index 0fa0ae48..aafe566d 100644 --- a/gmp/PKGBUILD +++ b/gmp/PKGBUILD @@ -11,7 +11,7 @@ depends=() license=('LGPL3') install=gmp.install source=(ftp://ftp.gmplib.org/pub/gmp-${pkgver}/gmp-${pkgver}a.tar.xz{,.sig} - gmp-5.1.2-msys2.patch) + gmp-5.1.2-msys2.patch) md5sums=('1e6da4e434553d2811437aa42c7f7c76' 'SKIP' '50e7a6017b601f073da044f5a5b36905') diff --git a/gnupg/PKGBUILD b/gnupg/PKGBUILD index 1b0a6c83..956f6964 100644 --- a/gnupg/PKGBUILD +++ b/gnupg/PKGBUILD @@ -11,7 +11,7 @@ optdepends=('curl: gpg2keys_curl') makedepends=('curl') depends=('bzip2' 'libcurl' 'libiconv' 'libintl') source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig} - 'gnupg-1.4.15-msys2.patch') + 'gnupg-1.4.15-msys2.patch') sha1sums=('63ebf0ab375150903c65738070e4105200197fd4' 'SKIP' '3a3ef80e6b95d6b314e3accdec84eb7360d22fce') @@ -23,32 +23,32 @@ provides=("gnupg=${pkgver}") replaces=('gnupg2') prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ${srcdir}/gnupg-1.4.15-msys2.patch - - ./autogen.sh + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ${srcdir}/gnupg-1.4.15-msys2.patch + + ./autogen.sh } build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ - --build=${CHOST} \ - --prefix=/usr \ - --sysconfdir=/etc \ - --sbindir=/usr/bin \ - --libexecdir=/usr/lib/gnupg \ - --enable-maintainer-mode + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --build=${CHOST} \ + --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/usr/bin \ + --libexecdir=/usr/lib/gnupg \ + --enable-maintainer-mode - make + make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check + cd "${srcdir}/${pkgname}-${pkgver}" + make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - # mv -f ${pkgdir}/etc ${pkgdir}/usr/ + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + # mv -f ${pkgdir}/etc ${pkgdir}/usr/ } diff --git a/gperf/PKGBUILD b/gperf/PKGBUILD index 93f6993c..8f00fa78 100644 --- a/gperf/PKGBUILD +++ b/gperf/PKGBUILD @@ -11,7 +11,7 @@ groups=('base-devel') depends=('gcc-libs' 'texinfo') install=gperf.install source=("http://ftp.gnu.org/pub/gnu/gperf/${pkgname}-${pkgver}.tar.gz"{,.sig} - gperf-3.0.4-tests-cygwin-setmode.patch) + gperf-3.0.4-tests-cygwin-setmode.patch) sha1sums=('e32d4aff8f0c730c9a56554377b2c6d82d0951b8' 'SKIP' 'fd84ee0da23320e7b2bda76a340e5b00dad7f042') diff --git a/gpgme/PKGBUILD b/gpgme/PKGBUILD index 4bc2cc0e..9dc321e4 100644 --- a/gpgme/PKGBUILD +++ b/gpgme/PKGBUILD @@ -11,8 +11,8 @@ license=('LGPL') depends=('libgpg-error' 'gnupg') options=('!libtool' '!emptydirs') source=(ftp://ftp.gnupg.org/gcrypt/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2{,.sig} - 1.4.2-without-libassuan.patch - gpgme-1.4.2-msys2.patch) + 1.4.2-without-libassuan.patch + gpgme-1.4.2-msys2.patch) md5sums=('334e524cffa8af4e2f43ae8afe585672' 'SKIP' '06dc75d7c83b6925be6ad00334c51032' @@ -30,11 +30,11 @@ prepare() { build() { cd ${srcdir}/${pkgbase}-${pkgver} ./configure --build=${CHOST} \ - --prefix=/usr \ - --with-gpg=/usr/bin/gpg \ - --without-gpgsm \ - --without-gpgconf \ - --without-g13 + --prefix=/usr \ + --with-gpg=/usr/bin/gpg \ + --without-gpgsm \ + --without-gpgconf \ + --without-g13 make no_undefined=-no-undefined make DESTDIR=${srcdir}/dest install diff --git a/gtk-doc/PKGBUILD b/gtk-doc/PKGBUILD index abe6ffad..24dad6aa 100644 --- a/gtk-doc/PKGBUILD +++ b/gtk-doc/PKGBUILD @@ -9,47 +9,47 @@ url="http://www.gtk.org/gtk-doc/" license=("GPL" "FDL") options=(staticlibs strip) depends=("docbook-xsl" - #"gnome-doc-utils" - "perl" - "vim" - #"source-highlight" - ) + #"gnome-doc-utils" + "perl" + "vim" + #"source-highlight" + ) makedepends=( - #'jade' - "libxml2" - "python3" - 'itstool' - #'dblatex' - ) + #'jade' + "libxml2" + "python3" + 'itstool' + #'dblatex' + ) optdepends=(#"${_mingw_suff}-jade: SGML support" #"${_mingw_suff}-dblatex: PDF support" - ) + ) url="http://www.gtk.org/gtk-doc/" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz) md5sums=('1d1b5c074598415454a4be88228cc8f2') prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - libtoolize --force --copy - autoreconf -fi + cd "${srcdir}/${pkgname}-${pkgver}" + libtoolize --force --copy + autoreconf -fi } build() { - mkdir -p "${srcdir}/build-${CHOST}" - cd "${srcdir}/build-${CHOST}" - #export PYTHON=/usr/bin/python2 - #export XMLCATALOG=/usr/bin/xmlcatalog - ../${pkgname}-${pkgver}/configure \ - --prefix=/usr \ - --build=${CHOST} \ - --host=${CHOST} \ - --enable-shared \ - --enable-static \ - --with-xml-catalog=/etc/xml/catalog - make + mkdir -p "${srcdir}/build-${CHOST}" + cd "${srcdir}/build-${CHOST}" + #export PYTHON=/usr/bin/python2 + #export XMLCATALOG=/usr/bin/xmlcatalog + ../${pkgname}-${pkgver}/configure \ + --prefix=/usr \ + --build=${CHOST} \ + --host=${CHOST} \ + --enable-shared \ + --enable-static \ + --with-xml-catalog=/etc/xml/catalog + make } package() { - cd "${srcdir}/build-${CHOST}" - make DESTDIR="$pkgdir" install + cd "${srcdir}/build-${CHOST}" + make DESTDIR="$pkgdir" install } \ No newline at end of file diff --git a/guile/PKGBUILD b/guile/PKGBUILD index e67a19a5..e48e82b8 100644 --- a/guile/PKGBUILD +++ b/guile/PKGBUILD @@ -12,11 +12,11 @@ depends=('gmp' 'libltdl' 'ncurses' 'texinfo' 'libunistring' 'libgc' 'libffi') makedepends=('gmp-devel' 'ncurses-devel' 'libunistring-devel' 'libgc-devel' 'libffi-devel') install=guile.install source=("ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 0002-install-fix.all.patch - 2.0.9-module-ldflags.patch - 0003-fix-gnulib.all.patch - guile-2.0.9-export-symbols.patch - guile-2.0.9-msys2.patch) + 0002-install-fix.all.patch + 2.0.9-module-ldflags.patch + 0003-fix-gnulib.all.patch + guile-2.0.9-export-symbols.patch + guile-2.0.9-msys2.patch) options=('!libtool') md5sums=('531839c3fe887382ca9d4774db544d34' 'ed5d94a5bcefd1ebedb3dc76f98de4b5' @@ -41,18 +41,18 @@ build() { cd "${srcdir}/${pkgbase}-${pkgver}" ./configure --build=${CHOST} \ --prefix=/usr \ - --disable-debug-malloc \ - --disable-guile-debug \ - --disable-error-on-warning \ - --disable-rpath \ - --enable-deprecated \ - --enable-networking \ - --enable-nls \ - --enable-posix \ - --enable-regex \ - --with-threads \ - --with-modules \ - --disable-static + --disable-debug-malloc \ + --disable-guile-debug \ + --disable-error-on-warning \ + --disable-rpath \ + --enable-deprecated \ + --enable-networking \ + --enable-nls \ + --enable-posix \ + --enable-regex \ + --with-threads \ + --with-modules \ + --disable-static make make DESTDIR="${srcdir}/dest" install } diff --git a/gyp-svn/PKGBUILD b/gyp-svn/PKGBUILD index 23aa30a0..d15a5811 100644 --- a/gyp-svn/PKGBUILD +++ b/gyp-svn/PKGBUILD @@ -13,7 +13,7 @@ makedepends=('subversion') depends=('python2' 'python2-setuptools') license=('custom') source=("gyp::svn+http://gyp.googlecode.com/svn/trunk/" - 'gyp-msysize.patch') + 'gyp-msysize.patch') md5sums=('SKIP' '9f3b677e8f6177f1533615fd7e7cff26') diff --git a/heimdal/PKGBUILD b/heimdal/PKGBUILD index 6f7008da..1340c7e3 100644 --- a/heimdal/PKGBUILD +++ b/heimdal/PKGBUILD @@ -11,11 +11,11 @@ depends=('libsqlite' 'libreadline' 'ncurses') #libldap options=('!libtool' '!emptydirs') groups=('net-utils') source=(http://www.h5l.org/dist/src/heimdal-${pkgver}.tar.gz - 1.2.1-test-modules.patch - 1.5.2-hdbdir.patch - 1.5.2-install-catman.patch - 1.5.2-roken-signal.patch - heimdal-1.5.2-msys2.patch + 1.2.1-test-modules.patch + 1.5.2-hdbdir.patch + 1.5.2-install-catman.patch + 1.5.2-roken-signal.patch + heimdal-1.5.2-msys2.patch ) md5sums=('30b379e3de12f332fbd201131f02ffca' '11fc922e2d294570b00290466a4922da' @@ -40,23 +40,23 @@ build() { cd ${srcdir}/heimdal-${pkgver} ./configure --build=${CHOST} \ - --prefix=/usr \ - --enable-shared=yes \ - --disable-static \ - --without-x \ - --sysconfdir=/etc/krb5 \ - --mandir=/usr/share/man \ - --datadir=/var/lib/heimdal \ - --localstatedir=/var/lib/heimdal \ - --with-openssl=/usr \ - --with-readline-lib=/usr/lib \ - --with-readline-include=/usr/include/readline \ - --with-sqlite3-lib=/usr/lib \ - --with-sqlite3-include=/usr/include \ - --libexecdir=/usr/sbin \ - --disable-kcm \ - --disable-ndbm-db \ - --disable-heimdal-documentation + --prefix=/usr \ + --enable-shared=yes \ + --disable-static \ + --without-x \ + --sysconfdir=/etc/krb5 \ + --mandir=/usr/share/man \ + --datadir=/var/lib/heimdal \ + --localstatedir=/var/lib/heimdal \ + --with-openssl=/usr \ + --with-readline-lib=/usr/lib \ + --with-readline-include=/usr/include/readline \ + --with-sqlite3-lib=/usr/lib \ + --with-sqlite3-include=/usr/include \ + --libexecdir=/usr/sbin \ + --disable-kcm \ + --disable-ndbm-db \ + --disable-heimdal-documentation make LDFLAGS="${LDFLAGS} -no-undefined" -j1 } @@ -84,13 +84,13 @@ setup() { install -D -m644 ${srcdir}/heimdal-${pkgver}/krb5.conf ${destdir}/usr/etc/krb5/krb5.conf # Remove conflicts - rm -rf ${destdir}/usr/share/man/man5/ftpusers.5* # man-pages + rm -rf ${destdir}/usr/share/man/man5/ftpusers.5* # man-pages rm -rf ${destdir}/usr/share/man/man3/{DES,DH,EVP,OpenSSL,RAND,RSA}* # openssl rm -rf ${destdir}/usr/share/man/man3/os.3* # erlang # Install the license install -Dm644 ${srcdir}/heimdal-${pkgver}/LICENSE \ - ${destdir}/usr/share/licenses/${pkgname}/LICENSE + ${destdir}/usr/share/licenses/${pkgname}/LICENSE } package_heimdal() { diff --git a/help2man/PKGBUILD b/help2man/PKGBUILD index 0928efc1..0b1bf794 100644 --- a/help2man/PKGBUILD +++ b/help2man/PKGBUILD @@ -11,7 +11,7 @@ groups=('base-devel') depends=('perl-Locale-Gettext' 'libintl') install=help2man.install source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz" - 1.40.4-cygwin-nls.patch) + 1.40.4-cygwin-nls.patch) md5sums=('a5dc6530340b41f0e492d400670dd7ae' 'dcd0c0843e177d264f4199e4ea84d142') @@ -26,8 +26,8 @@ build() { ./configure --build=${CHOST} \ --prefix=/usr \ --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --libdir=/usr/lib + --infodir=/usr/share/info \ + --libdir=/usr/lib make -j1 } diff --git a/icu/PKGBUILD b/icu/PKGBUILD index 90e5097f..2613c4ec 100644 --- a/icu/PKGBUILD +++ b/icu/PKGBUILD @@ -10,10 +10,10 @@ license=('custom:"icu"') depends=('gcc-libs' 'sh') source=(http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz 51.1-cygwin-no-w32api.patch - 51.1-cygwin-tests.patch - 51.1-cygwin-tools.patch - 51.1-cygwin-x64.patch - icu-51.2-msys2.patch) + 51.1-cygwin-tests.patch + 51.1-cygwin-tools.patch + 51.1-cygwin-x64.patch + icu-51.2-msys2.patch) sha256sums=('deb027a05f1b3bec03298b96fb93b28c84e9683c22e6f94effa67fdc7bd704cc' '9a0045f8670308f6f6fb218a4cac02411929893c86065fd675d8d939a088eb19' 'd62f62df644a944aead5d66c94c686693dc1aab710506fa539d99e7f6d8abc9c' @@ -22,66 +22,66 @@ sha256sums=('deb027a05f1b3bec03298b96fb93b28c84e9683c22e6f94effa67fdc7bd704cc' 'baf87e577a8226d31f5169495cb0ccb8a647b3dce73cccc9f6d80bceb2ad8a03') prepare() { - cd ${srcdir}/icu/source - patch -p2 -i ${srcdir}/51.1-cygwin-no-w32api.patch - patch -p2 -i ${srcdir}/51.1-cygwin-tests.patch - patch -p2 -i ${srcdir}/51.1-cygwin-tools.patch - patch -p2 -i ${srcdir}/51.1-cygwin-x64.patch - patch -p2 -i ${srcdir}/icu-51.2-msys2.patch + cd ${srcdir}/icu/source + patch -p2 -i ${srcdir}/51.1-cygwin-no-w32api.patch + patch -p2 -i ${srcdir}/51.1-cygwin-tests.patch + patch -p2 -i ${srcdir}/51.1-cygwin-tools.patch + patch -p2 -i ${srcdir}/51.1-cygwin-x64.patch + patch -p2 -i ${srcdir}/icu-51.2-msys2.patch - libtoolize --force --copy - autoreconf -fi + libtoolize --force --copy + autoreconf -fi } build() { - cd ${srcdir}/icu/source - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --sbindir=/usr/bin - make + cd ${srcdir}/icu/source + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --sbindir=/usr/bin + make - make -j1 DESTDIR=${srcdir}/dest install - pushd ${srcdir}/dest/usr/lib - # fix installation directory - mv msys-icu*${pkgver%%.*}.dll ${srcdir}/dest/usr/bin/ - # remove unversioned DLL symlinks - rm -f *.dll - # create unversioned implib symlinks - for l in *.dll.a; do - #dosym ${l} /usr/lib/${l//${pkgver%%.*}} - cp ${l} ${l//${pkgver%%.*}} - done - popd + make -j1 DESTDIR=${srcdir}/dest install + pushd ${srcdir}/dest/usr/lib + # fix installation directory + mv msys-icu*${pkgver%%.*}.dll ${srcdir}/dest/usr/bin/ + # remove unversioned DLL symlinks + rm -f *.dll + # create unversioned implib symlinks + for l in *.dll.a; do + #dosym ${l} /usr/lib/${l//${pkgver%%.*}} + cp ${l} ${l//${pkgver%%.*}} + done + popd - sed -e '/^ICUUC_FILE=/ s/libdir/bindir/' \ - -e 's/l${LIBICU}/l${ICUPREFIX}/g' \ - -e '/l${ICUPREFIX}/ s/${ICULIBSUFFIX_VERSION}//g' \ - -i ${srcdir}/dest/usr/bin/icu-config \ - || error "sed icu-config failed" + sed -e '/^ICUUC_FILE=/ s/libdir/bindir/' \ + -e 's/l${LIBICU}/l${ICUPREFIX}/g' \ + -e '/l${ICUPREFIX}/ s/${ICULIBSUFFIX_VERSION}//g' \ + -i ${srcdir}/dest/usr/bin/icu-config \ + || error "sed icu-config failed" - # Install license - install -Dm644 ${srcdir}/icu/license.html ${srcdir}/dest/usr/share/licenses/icu/license.html + # Install license + install -Dm644 ${srcdir}/icu/license.html ${srcdir}/dest/usr/share/licenses/icu/license.html } check() { - cd icu/source - make -k check # passes all + cd icu/source + make -k check # passes all } package_icu() { - depends=('gcc-libs') - groups=('libraries') - mkdir -p $pkgdir/usr/bin - cp -f $srcdir/dest/usr/bin/*.dll $pkgdir/usr/bin/ + depends=('gcc-libs') + groups=('libraries') + mkdir -p $pkgdir/usr/bin + cp -f $srcdir/dest/usr/bin/*.dll $pkgdir/usr/bin/ } package_icu-devel() { - pkgdesc="ICU headers and libraries" - groups=('development') - depends=("icu=${pkgver}") - - cp -rf $srcdir/dest/usr $pkgdir/ - rm -f $pkgdir/usr/bin/*.dll + pkgdesc="ICU headers and libraries" + groups=('development') + depends=("icu=${pkgver}") + + cp -rf $srcdir/dest/usr $pkgdir/ + rm -f $pkgdir/usr/bin/*.dll } diff --git a/itstool/PKGBUILD b/itstool/PKGBUILD index 971bf45d..30df4d26 100644 --- a/itstool/PKGBUILD +++ b/itstool/PKGBUILD @@ -12,20 +12,20 @@ source=(http://files.itstool.org/itstool/${pkgname}-$pkgver.tar.bz2) sha256sums=('bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a') prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i '1s|#!/usr/bin/python|&2|' itstool itstool.in - sed -i 's/| python/&2/' configure.ac - autoreconf -fi + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i '1s|#!/usr/bin/python|&2|' itstool itstool.in + sed -i 's/| python/&2/' configure.ac + autoreconf -fi } build() { - mkdir -p "${srcdir}/build-${CHOST}" - cd "${srcdir}/build-${CHOST}" + mkdir -p "${srcdir}/build-${CHOST}" + cd "${srcdir}/build-${CHOST}" ../${pkgname}-${pkgver}/configure \ - --prefix=/usr \ - --build=${CHOST} \ - --host=${CHOST} \ - --target=${CHOST} + --prefix=/usr \ + --build=${CHOST} \ + --host=${CHOST} \ + --target=${CHOST} make } @@ -36,5 +36,5 @@ check() { package() { cd "${srcdir}/build-${CHOST}" - make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" install } diff --git a/lftp/PKGBUILD b/lftp/PKGBUILD index 8858256e..3808d40e 100644 --- a/lftp/PKGBUILD +++ b/lftp/PKGBUILD @@ -13,8 +13,8 @@ optdepends=('perl: needed for convert-netscape-cookies and verify-file') url="http://lftp.yar.ru/" backup=('etc/lftp.conf') source=(http://lftp.yar.ru/ftp/${pkgname}-${pkgver}.tar.xz{,.asc} - lftp-4.4.15-msysize.patch - lftp-4.4.15-no-undefined.patch) + lftp-4.4.15-msysize.patch + lftp-4.4.15-no-undefined.patch) md5sums=('f19cc0cea1d427aa2a952b27661b91e5' 'SKIP' '9b34d1d402d804cf3660d8a9fd0c00a4' diff --git a/libedit/PKGBUILD b/libedit/PKGBUILD index bdb9dda2..fd290e64 100644 --- a/libedit/PKGBUILD +++ b/libedit/PKGBUILD @@ -31,7 +31,7 @@ build() { ./configure --build=${CHOST} --prefix=/usr \ --enable-widec \ CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" \ - LDFLAGS="$LDFLAGS -L/usr/lib/ncursesw" + LDFLAGS="$LDFLAGS -L/usr/lib/ncursesw" make make DESTDIR=${srcdir}/dest install diff --git a/libgcrypt/PKGBUILD b/libgcrypt/PKGBUILD index 06ae16b3..b93c04d2 100644 --- a/libgcrypt/PKGBUILD +++ b/libgcrypt/PKGBUILD @@ -27,7 +27,7 @@ prepare() { build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --build=${CHOST} --prefix=/usr \ - --disable-static + --disable-static make no_undefined=-no-undefined make DESTDIR=${srcdir}/dest install diff --git a/libgpg-error/PKGBUILD b/libgpg-error/PKGBUILD index d9772653..063bab74 100644 --- a/libgpg-error/PKGBUILD +++ b/libgpg-error/PKGBUILD @@ -9,7 +9,7 @@ url="http://www.gnupg.org" license=('LGPL') depends=('msys2-runtime' 'sh' 'libiconv' 'libintl') source=(ftp://ftp.gnupg.org/gcrypt/libgpg-error/${pkgname}-${pkgver}.tar.bz2{,.sig} - #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgpg-error/${pkgname}-${pkgver}.tar.bz2 + #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgpg-error/${pkgname}-${pkgver}.tar.bz2 libgpg-error-1.12-msys2.patch) sha1sums=('259f359cd1440b21840c3a78e852afd549c709b8' 'SKIP' @@ -26,7 +26,7 @@ build() { cd "${srcdir}"/${pkgname}-${pkgver} ./configure --build=${CHOST} \ --prefix=/usr \ - --without-libiconv-prefix --without-libintl-prefix + --without-libiconv-prefix --without-libintl-prefix make no_undefined=-no-undefined make DESTDIR="${srcdir}/dest" install } diff --git a/libiconv/PKGBUILD b/libiconv/PKGBUILD index dd64d161..e800db2b 100644 --- a/libiconv/PKGBUILD +++ b/libiconv/PKGBUILD @@ -21,12 +21,12 @@ md5sums=('e34509b1623cec449dfeb73d7ce9c6c6' options=(!libtool) prepare() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver} - patch -p2 -i ${srcdir}/1.14-cross-install.patch - patch -p2 -i ${srcdir}/libiconv-1.14-reloc.patch - patch -p2 -i ${srcdir}/libiconv-1.14-wchar.patch - patch -p1 -i ${srcdir}/msys2-libiconv-1.14.patch + patch -p2 -i ${srcdir}/1.14-cross-install.patch + patch -p2 -i ${srcdir}/libiconv-1.14-reloc.patch + patch -p2 -i ${srcdir}/libiconv-1.14-wchar.patch + patch -p1 -i ${srcdir}/msys2-libiconv-1.14.patch } build() { diff --git a/libxml2/PKGBUILD b/libxml2/PKGBUILD index cb450cca..cb63025a 100644 --- a/libxml2/PKGBUILD +++ b/libxml2/PKGBUILD @@ -65,7 +65,7 @@ build() { --prefix=/usr \ --enable-ipv6 \ --with-history \ - --with-python=/usr/bin/python2 \ + --with-python=/usr/bin/python2 \ --with-html-dir=/usr/share/doc \ --with-html-subdir=libxml2/html make diff --git a/man/PKGBUILD b/man/PKGBUILD index 171d43b9..9a2525d9 100644 --- a/man/PKGBUILD +++ b/man/PKGBUILD @@ -44,7 +44,7 @@ package() { cat >> ${pkgdir}/usr/share/man/man1/manpath.1 <<-_EOF .so man1/man.1 _EOF - + cd ${pkgdir}/usr/bin cp -f ${pkgdir}/usr/bin/man.exe ${pkgdir}/usr/bin/manpath.exe diff --git a/mc/PKGBUILD b/mc/PKGBUILD index b3632eda..853e8fef 100644 --- a/mc/PKGBUILD +++ b/mc/PKGBUILD @@ -30,46 +30,46 @@ backup=('etc/mc/edit.indent.rc' 'etc/mc/mc.menu' 'etc/mc/sfs.ini') source=("http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2" - 4.7.5.2-ncursesw-term.h.patch - mc-4.8.10-msys2.patch) + 4.7.5.2-ncursesw-term.h.patch + mc-4.8.10-msys2.patch) prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np2 -i "${srcdir}/4.7.5.2-ncursesw-term.h.patch" - patch -Np1 -i "${srcdir}/mc-4.8.10-msys2.patch" + patch -Np2 -i "${srcdir}/4.7.5.2-ncursesw-term.h.patch" + patch -Np1 -i "${srcdir}/mc-4.8.10-msys2.patch" - autoreconf -fi + autoreconf -fi } build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --build=${CHOST} \ - --prefix=/usr \ - --sysconfdir=/etc \ - --without-libintl-prefix \ - --without-libiconv-prefix \ - --with-screen=ncursesw \ - --enable-charset \ - --libexecdir=/usr/lib + ./configure --build=${CHOST} \ + --prefix=/usr \ + --sysconfdir=/etc \ + --without-libintl-prefix \ + --without-libiconv-prefix \ + --with-screen=ncursesw \ + --enable-charset \ + --libexecdir=/usr/lib - make + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - mv -f ${pkgdir}/etc ${pkgdir}/usr/ + make DESTDIR="${pkgdir}" install + mv -f ${pkgdir}/etc ${pkgdir}/usr/ - # Fix FS#15177 - sed 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \ - -i "${pkgdir}/usr/lib/mc/extfs.d/uzip" + # Fix FS#15177 + sed 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \ + -i "${pkgdir}/usr/lib/mc/extfs.d/uzip" - sed 's#/usr/bin/env python#/usr/bin/python2#' \ - -i "${pkgdir}/usr/lib/mc/extfs.d/s3+" + sed 's#/usr/bin/env python#/usr/bin/python2#' \ + -i "${pkgdir}/usr/lib/mc/extfs.d/s3+" } md5sums=('a64c426364bfaee56b628f6c0738aade' diff --git a/mercurial/PKGBUILD b/mercurial/PKGBUILD index 5251f6a4..c0bf166c 100644 --- a/mercurial/PKGBUILD +++ b/mercurial/PKGBUILD @@ -13,7 +13,7 @@ depends=('python2') backup=('usr/etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile' - mercurial-2.6.1-msys2.patch) + mercurial-2.6.1-msys2.patch) md5sums=('1caeed1bea1232598fc5ce5d6d109f56' '43e1d36564d4c7fbe9a091d3ea370a44' 'c4fe47468f6fef63ce1c72d14307d312') diff --git a/mingw-w64-cross-binutils/PKGBUILD b/mingw-w64-cross-binutils/PKGBUILD index 5a1a0ce7..9b008e0c 100644 --- a/mingw-w64-cross-binutils/PKGBUILD +++ b/mingw-w64-cross-binutils/PKGBUILD @@ -19,9 +19,9 @@ options=('staticlibs' '!distcc' '!ccache' '!buildflags') #install=binutils.install source=(#"ftp://mirrors.kernel.org/sources.redhat.com/binutils/snapshots/binutils-${_basever}.tar.bz2" ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig} - 'binutils-trunk-msys2.patch') + 'binutils-trunk-msys2.patch') md5sums=('e0f71a7b2ddab0f8612336ac81d9636b' - 'SKIP' + 'SKIP' '6f7175b7ed29bc597f0d300500e2b651') _targets="i686-w64-mingw32 x86_64-w64-mingw32" @@ -48,14 +48,14 @@ build() { local _conf='' fi ${srcdir}/binutils-${pkgver}/configure \ - --build=${CHOST} \ - --host=${CHOST} \ - --target=${_target} \ + --build=${CHOST} \ + --host=${CHOST} \ + --target=${_target} \ --prefix=/opt \ --disable-werror \ - --enable-lto \ - --with-libiconv-prefix=/usr \ - $_conf + --enable-lto \ + --with-libiconv-prefix=/usr \ + $_conf make done diff --git a/mingw-w64-cross-crt/PKGBUILD b/mingw-w64-cross-crt/PKGBUILD index e9f5b064..b52957ce 100644 --- a/mingw-w64-cross-crt/PKGBUILD +++ b/mingw-w64-cross-crt/PKGBUILD @@ -29,32 +29,32 @@ pkgver() { } build() { - for _target in ${_targets}; do + for _target in ${_targets}; do msg "Building ${_target} CRT" - case "$_target" in - i686*) - _crt_configure_args="--disable-lib64 --enable-lib32" - ;; - x86_64*) - _crt_configure_args="--disable-lib32 --enable-lib64" - ;; - esac + case "$_target" in + i686*) + _crt_configure_args="--disable-lib64 --enable-lib32" + ;; + x86_64*) + _crt_configure_args="--disable-lib32 --enable-lib64" + ;; + esac mkdir -p ${srcdir}/crt-${_target} && cd ${srcdir}/crt-${_target} ${srcdir}/${_realname}/configure \ - --build=${CHOST} \ - --prefix=/opt/${_target} \ - --host=${_target} \ - --enable-wildcard \ + --build=${CHOST} \ + --prefix=/opt/${_target} \ + --host=${_target} \ + --enable-wildcard \ ${_crt_configure_args} make - done + done } package() { - for _target in ${_targets}; do - msg "Installing ${_target} crt" - cd ${srcdir}/crt-${_target} - make DESTDIR=${pkgdir} install - done + for _target in ${_targets}; do + msg "Installing ${_target} crt" + cd ${srcdir}/crt-${_target} + make DESTDIR=${pkgdir} install + done } diff --git a/mingw-w64-cross-gcc/PKGBUILD b/mingw-w64-cross-gcc/PKGBUILD index 9ba136da..056e89da 100644 --- a/mingw-w64-cross-gcc/PKGBUILD +++ b/mingw-w64-cross-gcc/PKGBUILD @@ -18,24 +18,24 @@ replaces=() backup=() options=('!strip' 'staticlibs' '!emptydirs' '!buildflags') source=("ftp://gcc.gnu.org/pub/gcc/releases/${_realname}-${pkgver}/${_realname}-${pkgver}.tar.bz2" - 'gcc-4.8-filename-output.patch' - 'gcc-4.8-lambda-ICE.patch' - 'gcc-4.8-iconv.patch' - '4.8-libgcc-references.patch' - 'gcc-4.8-libstdc++export.patch' - 'gcc-4.7-stdthreads.patch' - '4.7-execstack.patch' - '4.7-libffi-noinst.patch' - '4.7-libitm-cygwin.patch' - '4.7-libstdc-cygwin.patch' - '4.8-libatomic-cygwin.patch' - '4.8-libdecnumber-cygwin64.patch' - '4.8-libffi-cygwin64.patch' - '4.8-lto-plugin-soname.patch' - '4.8-picflag-cygwin64.patch' - '4.8-specs-cygwin.patch' - 'gcc-4.8.0-configure-msys2.patch' - 'gcc-4.8.0-msys2-spec.patch') + 'gcc-4.8-filename-output.patch' + 'gcc-4.8-lambda-ICE.patch' + 'gcc-4.8-iconv.patch' + '4.8-libgcc-references.patch' + 'gcc-4.8-libstdc++export.patch' + 'gcc-4.7-stdthreads.patch' + '4.7-execstack.patch' + '4.7-libffi-noinst.patch' + '4.7-libitm-cygwin.patch' + '4.7-libstdc-cygwin.patch' + '4.8-libatomic-cygwin.patch' + '4.8-libdecnumber-cygwin64.patch' + '4.8-libffi-cygwin64.patch' + '4.8-lto-plugin-soname.patch' + '4.8-picflag-cygwin64.patch' + '4.8-specs-cygwin.patch' + 'gcc-4.8.0-configure-msys2.patch' + 'gcc-4.8.0-msys2-spec.patch') md5sums=('a3d7d63b9cb6b6ea049469a0c4a43c9d' '40cb437805e2f7a006aa0d0c3098ab0f' '6eb6e080dbf7bc6825f53a0aaa6c4ef9' @@ -60,104 +60,104 @@ _threads="win32" _targets="i686-w64-mingw32 x86_64-w64-mingw32" prepare() { - cd ${srcdir}/${_realname}-${pkgver} + cd ${srcdir}/${_realname}-${pkgver} - #do not install libiberty - sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in - # hack! - some configure tests for header files using "$CPP $CPPFLAGS" - #sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure + #do not install libiberty + sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in + # hack! - some configure tests for header files using "$CPP $CPPFLAGS" + #sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure - patch -p0 -i ${srcdir}/gcc-4.8-filename-output.patch - patch -p1 -i ${srcdir}/gcc-4.8-lambda-ICE.patch - #patch -p1 -i ${srcdir}/gcc-4.8-iconv.patch + patch -p0 -i ${srcdir}/gcc-4.8-filename-output.patch + patch -p1 -i ${srcdir}/gcc-4.8-lambda-ICE.patch + #patch -p1 -i ${srcdir}/gcc-4.8-iconv.patch - patch -p0 -i ${srcdir}/4.8-libgcc-references.patch - patch -p1 -i ${srcdir}/gcc-4.8-libstdc++export.patch - patch -p1 -i ${srcdir}/gcc-4.7-stdthreads.patch - - #MSYS/Cygwin patches - patch -p2 -i ${srcdir}/4.7-execstack.patch - patch -p2 -i ${srcdir}/4.8-libatomic-cygwin.patch - patch -p2 -i ${srcdir}/4.8-libdecnumber-cygwin64.patch - patch -p2 -i ${srcdir}/4.7-libffi-noinst.patch - patch -p2 -i ${srcdir}/4.8-libffi-cygwin64.patch - patch -p2 -i ${srcdir}/4.7-libitm-cygwin.patch - patch -p2 -i ${srcdir}/4.7-libstdc-cygwin.patch - patch -p2 -i ${srcdir}/4.8-lto-plugin-soname.patch - patch -p2 -i ${srcdir}/4.8-picflag-cygwin64.patch - patch -p0 -i ${srcdir}/4.8-specs-cygwin.patch - patch -p1 -i ${srcdir}/gcc-4.8.0-configure-msys2.patch - patch -p1 -i ${srcdir}/gcc-4.8.0-msys2-spec.patch + patch -p0 -i ${srcdir}/4.8-libgcc-references.patch + patch -p1 -i ${srcdir}/gcc-4.8-libstdc++export.patch + patch -p1 -i ${srcdir}/gcc-4.7-stdthreads.patch + + #MSYS/Cygwin patches + patch -p2 -i ${srcdir}/4.7-execstack.patch + patch -p2 -i ${srcdir}/4.8-libatomic-cygwin.patch + patch -p2 -i ${srcdir}/4.8-libdecnumber-cygwin64.patch + patch -p2 -i ${srcdir}/4.7-libffi-noinst.patch + patch -p2 -i ${srcdir}/4.8-libffi-cygwin64.patch + patch -p2 -i ${srcdir}/4.7-libitm-cygwin.patch + patch -p2 -i ${srcdir}/4.7-libstdc-cygwin.patch + patch -p2 -i ${srcdir}/4.8-lto-plugin-soname.patch + patch -p2 -i ${srcdir}/4.8-picflag-cygwin64.patch + patch -p0 -i ${srcdir}/4.8-specs-cygwin.patch + patch -p1 -i ${srcdir}/gcc-4.8.0-configure-msys2.patch + patch -p1 -i ${srcdir}/gcc-4.8.0-msys2-spec.patch } build() { - for _target in ${_targets}; do - mkdir -p ${srcdir}/gcc-build-${_target} && cd ${srcdir}/gcc-build-${_target} + for _target in ${_targets}; do + mkdir -p ${srcdir}/gcc-build-${_target} && cd ${srcdir}/gcc-build-${_target} - case "${_target}" in - i686*) - local _conf="--disable-sjlj-exceptions --with-dwarf2" - local _arch=i686 - ;; - - x86_64*) - local _arch=x86-64 - local _conf="" - ;; - esac + case "${_target}" in + i686*) + local _conf="--disable-sjlj-exceptions --with-dwarf2" + local _arch=i686 + ;; + + x86_64*) + local _arch=x86-64 + local _conf="" + ;; + esac - ../${_realname}-${pkgver}/configure \ - --prefix=/opt \ - --build=${CHOST} \ - --host=${CHOST} \ - --target=${_target} \ - --libexecdir=/opt/lib \ - --disable-bootstrap \ - --with-arch=${_arch} \ - --with-tune=generic \ - --enable-languages=c,lto,c++,fortran \ - --enable-shared --enable-static \ - --enable-threads=${_threads} \ - --enable-graphite \ - --enable-fully-dynamic-string \ - --enable-libstdcxx-time=yes \ - --disable-libstdcxx-pch \ - --disable-libstdcxx-debug \ - --enable-cloog-backend=isl \ - --enable-version-specific-runtime-libs \ - --disable-cloog-version-check --disable-isl-version-check \ - --enable-lto \ - --enable-libgomp \ - --disable-multilib \ - --enable-checking=release \ - --disable-rpath \ - --disable-win32-registry \ - --disable-werror \ - --disable-symvers \ - --with-libiconv \ - --with-system-zlib \ - --with-{gmp,mpfr,mpc,isl,cloog}=/usr \ - --with-gnu-as --with-gnu-ld \ - ${_conf} \ - CFLAGS="-O2 -pipe" \ - CXXFALGS="-O2 -pipe" + ../${_realname}-${pkgver}/configure \ + --prefix=/opt \ + --build=${CHOST} \ + --host=${CHOST} \ + --target=${_target} \ + --libexecdir=/opt/lib \ + --disable-bootstrap \ + --with-arch=${_arch} \ + --with-tune=generic \ + --enable-languages=c,lto,c++,fortran \ + --enable-shared --enable-static \ + --enable-threads=${_threads} \ + --enable-graphite \ + --enable-fully-dynamic-string \ + --enable-libstdcxx-time=yes \ + --disable-libstdcxx-pch \ + --disable-libstdcxx-debug \ + --enable-cloog-backend=isl \ + --enable-version-specific-runtime-libs \ + --disable-cloog-version-check --disable-isl-version-check \ + --enable-lto \ + --enable-libgomp \ + --disable-multilib \ + --enable-checking=release \ + --disable-rpath \ + --disable-win32-registry \ + --disable-werror \ + --disable-symvers \ + --with-libiconv \ + --with-system-zlib \ + --with-{gmp,mpfr,mpc,isl,cloog}=/usr \ + --with-gnu-as --with-gnu-ld \ + ${_conf} \ + CFLAGS="-O2 -pipe" \ + CXXFALGS="-O2 -pipe" - make all - done + make all + done } package() { - for _target in ${_targets}; do - cd ${srcdir}/gcc-build-${_target} - make -j1 DESTDIR=${pkgdir} install - mv ${pkgdir}/opt/lib/gcc/${_target}/lib/libgcc_s.a ${pkgdir}/opt/lib/gcc/${_target}/${pkgver}/ - mv ${pkgdir}/opt/lib/gcc/${_target}/libgcc*.dll ${pkgdir}/opt/lib/gcc/${_target}/${pkgver}/ - for _f in ${pkgdir}/opt/bin/*.exe; do - strip -s ${_f} - done - for _f in ${pkgdir}/opt/lib/gcc/${_target}/${pkgver}/*.exe; do - strip -s ${_f} - done - rm -rf ${pkgdir}/opt/share - done + for _target in ${_targets}; do + cd ${srcdir}/gcc-build-${_target} + make -j1 DESTDIR=${pkgdir} install + mv ${pkgdir}/opt/lib/gcc/${_target}/lib/libgcc_s.a ${pkgdir}/opt/lib/gcc/${_target}/${pkgver}/ + mv ${pkgdir}/opt/lib/gcc/${_target}/libgcc*.dll ${pkgdir}/opt/lib/gcc/${_target}/${pkgver}/ + for _f in ${pkgdir}/opt/bin/*.exe; do + strip -s ${_f} + done + for _f in ${pkgdir}/opt/lib/gcc/${_target}/${pkgver}/*.exe; do + strip -s ${_f} + done + rm -rf ${pkgdir}/opt/share + done } diff --git a/mingw-w64-cross-headers/PKGBUILD b/mingw-w64-cross-headers/PKGBUILD index ab99bb41..a193df49 100644 --- a/mingw-w64-cross-headers/PKGBUILD +++ b/mingw-w64-cross-headers/PKGBUILD @@ -29,26 +29,26 @@ pkgver() { } build() { - for _target in ${_targets}; do + for _target in ${_targets}; do msg "Configuring ${_target} headers" mkdir -p ${srcdir}/headers-${_target} && cd ${srcdir}/headers-${_target} ${srcdir}/${_realname}/configure \ - --build=${CHOST} \ - --host=${_target} \ - --prefix=/opt/${_target} \ - --enable-sdk=all \ - --enable-secure-api - done + --build=${CHOST} \ + --host=${_target} \ + --prefix=/opt/${_target} \ + --enable-sdk=all \ + --enable-secure-api + done } package() { - for _target in ${_targets}; do + for _target in ${_targets}; do msg "Installing ${_target} headers" cd ${srcdir}/headers-${_target} make DESTDIR=${pkgdir} install - + rm ${pkgdir}/opt/${_target}/include/pthread_signal.h rm ${pkgdir}/opt/${_target}/include/pthread_time.h rm ${pkgdir}/opt/${_target}/include/pthread_unistd.h - done + done } diff --git a/mingw-w64-cross-winpthreads/PKGBUILD b/mingw-w64-cross-winpthreads/PKGBUILD index 0ecf7458..00edf270 100644 --- a/mingw-w64-cross-winpthreads/PKGBUILD +++ b/mingw-w64-cross-winpthreads/PKGBUILD @@ -28,21 +28,21 @@ pkgver() { } build() { - for _target in ${_targets}; do + for _target in ${_targets}; do mkdir -p ${srcdir}/winpthreads-build-${_target} && cd ${srcdir}/winpthreads-build-${_target} ${srcdir}/${_realname}/configure \ - --prefix=/opt/${_target} \ - --build=${CHOST} \ - --host=${_target} \ - --enable-static \ - --enable-shared + --prefix=/opt/${_target} \ + --build=${CHOST} \ + --host=${_target} \ + --enable-static \ + --enable-shared make - done + done } package() { - for _target in ${_targets}; do - cd ${srcdir}/winpthreads-build-${_target} - make DESTDIR=${pkgdir} install - done + for _target in ${_targets}; do + cd ${srcdir}/winpthreads-build-${_target} + make DESTDIR=${pkgdir} install + done } diff --git a/mingw-w64-cross-zlib/PKGBUILD b/mingw-w64-cross-zlib/PKGBUILD index 2eb08210..daaef55f 100644 --- a/mingw-w64-cross-zlib/PKGBUILD +++ b/mingw-w64-cross-zlib/PKGBUILD @@ -14,7 +14,7 @@ depends=('') makedepends=("${_mingw_suff}-gcc") options=('staticlibs' '!strip' '!libtool' '!emptydirs' '!buildflags') source=("http://zlib.net/current/${_realname}-${pkgver}.tar.gz" - 01-zlib-1.2.7-1-buildsys.mingw.patch + 01-zlib-1.2.7-1-buildsys.mingw.patch 02-no-undefined.mingw.patch 03-dont-put-sodir-into-L.mingw.patch 04-wrong-w8-check.mingw.patch @@ -29,30 +29,30 @@ md5sums=('44d667c142d7cda120332623eab69f40' _targets="i686-w64-mingw32 x86_64-w64-mingw32" prepare() { - cd ${srcdir}/${_realname}-${pkgver} - grep -A 24 '^ Copyright' zlib.h > LICENSE - - patch -p2 -i ${srcdir}/01-zlib-1.2.7-1-buildsys.mingw.patch - patch -p2 -i ${srcdir}/02-no-undefined.mingw.patch - patch -p2 -i ${srcdir}/03-dont-put-sodir-into-L.mingw.patch - patch -p2 -i ${srcdir}/04-wrong-w8-check.mingw.patch - patch -p2 -i ${srcdir}/05-fix-a-typo.mingw.patch + cd ${srcdir}/${_realname}-${pkgver} + grep -A 24 '^ Copyright' zlib.h > LICENSE + + patch -p2 -i ${srcdir}/01-zlib-1.2.7-1-buildsys.mingw.patch + patch -p2 -i ${srcdir}/02-no-undefined.mingw.patch + patch -p2 -i ${srcdir}/03-dont-put-sodir-into-L.mingw.patch + patch -p2 -i ${srcdir}/04-wrong-w8-check.mingw.patch + patch -p2 -i ${srcdir}/05-fix-a-typo.mingw.patch } build() { - for _target in ${_targets}; do + for _target in ${_targets}; do msg "Configuring ${_realname} for ${_target}" - cp -rf ${srcdir}/${_realname}-${pkgver} ${srcdir}/${_realname}-${_target} + cp -rf ${srcdir}/${_realname}-${pkgver} ${srcdir}/${_realname}-${_target} cd ${srcdir}/${_realname}-${_target} CHOST=${_target} ./configure --prefix=/opt/${_target} --shared - make - done + make + done } package() { - for _target in ${_targets}; do + for _target in ${_targets}; do msg "Installing ${_realname} for ${_target}" cd ${srcdir}/${_realname}-${_target} make DESTDIR=${pkgdir} install - done + done } diff --git a/mpc/PKGBUILD b/mpc/PKGBUILD index 4d842137..463bbf72 100644 --- a/mpc/PKGBUILD +++ b/mpc/PKGBUILD @@ -18,11 +18,11 @@ sha1sums=('5072d82ab50ec36cc8c0e320b5c377adb48abe70' options=('!emptydirs') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i $srcdir/mpc-1.0.1-msys2.patch - ./configure --prefix=/usr --enable-shared --disable-static - make - make DESTDIR="$srcdir/dest" install + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i $srcdir/mpc-1.0.1-msys2.patch + ./configure --prefix=/usr --enable-shared --disable-static + make + make DESTDIR="$srcdir/dest" install } check() { diff --git a/msys2-base/PKGBUILD b/msys2-base/PKGBUILD index 719dcc14..b580de9d 100644 --- a/msys2-base/PKGBUILD +++ b/msys2-base/PKGBUILD @@ -9,14 +9,14 @@ url="https://sourceforge.net/projects/msys2/" license=('BSD') groups=('base') source=('cmd' - 'dep-search' - 'mingw32_shell.bat' - 'mingw64_shell.bat' - 'msys2_shell.bat' - 'msys.ico' - 'regen-info.sh' - 'start' - 'shells') + 'dep-search' + 'mingw32_shell.bat' + 'mingw64_shell.bat' + 'msys2_shell.bat' + 'msys.ico' + 'regen-info.sh' + 'start' + 'shells') md5sums=('bf6a73107768c9b7f667430cfcb1d840' 'dc5eeca33943c8ebb743ce21ce2193e3' 'e7dde9df74ba22119895cec9db5c9476' @@ -28,15 +28,15 @@ md5sums=('bf6a73107768c9b7f667430cfcb1d840' '40132f918d61aaa3022ac4594a325627') package() { - mkdir -p $pkgdir/usr/{bin,etc,sbin} + mkdir -p $pkgdir/usr/{bin,etc,sbin} - cp -f $srcdir/mingw32_shell.bat $pkgdir/usr/ - cp -f $srcdir/mingw64_shell.bat $pkgdir/usr/ - cp -f $srcdir/msys2_shell.bat $pkgdir/usr/ - cp -f $srcdir/msys.ico $pkgdir/usr/ - cp -f $srcdir/cmd $pkgdir/usr/bin/ - cp -f $srcdir/start $pkgdir/usr/bin - cp -f $srcdir/dep-search $pkgdir/usr/bin - cp -f $srcdir/regen-info.sh $pkgdir/usr/sbin/ - cp -f $srcdir/shells $pkgdir/usr/etc/ + cp -f $srcdir/mingw32_shell.bat $pkgdir/usr/ + cp -f $srcdir/mingw64_shell.bat $pkgdir/usr/ + cp -f $srcdir/msys2_shell.bat $pkgdir/usr/ + cp -f $srcdir/msys.ico $pkgdir/usr/ + cp -f $srcdir/cmd $pkgdir/usr/bin/ + cp -f $srcdir/start $pkgdir/usr/bin + cp -f $srcdir/dep-search $pkgdir/usr/bin + cp -f $srcdir/regen-info.sh $pkgdir/usr/sbin/ + cp -f $srcdir/shells $pkgdir/usr/etc/ } diff --git a/msys2-runtime/PKGBUILD b/msys2-runtime/PKGBUILD index 6fd71385..7f745ff8 100644 --- a/msys2-runtime/PKGBUILD +++ b/msys2-runtime/PKGBUILD @@ -24,71 +24,71 @@ md5sums=('SKIP' 'bed0df57b402888885811cb7642022e8' '4e39847e44316ae7376323e0b7538504') pkgver() { - cd "$srcdir/msys2-runtime" - #printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" - printf "%s.%s.%s" "${_ver_base}" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + cd "$srcdir/msys2-runtime" + #printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + printf "%s.%s.%s" "${_ver_base}" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } prepare() { - cd "$srcdir/msys2-runtime" - patch -p1 -i ${srcdir}/0001-Expand-CYGWIN-error_start-processing.patch + cd "$srcdir/msys2-runtime" + patch -p1 -i ${srcdir}/0001-Expand-CYGWIN-error_start-processing.patch # Experimental! -# patch -p1 -i ${srcdir}/0002-revert-mounting.patch +# patch -p1 -i ${srcdir}/0002-revert-mounting.patch # This is the new code, but it doesn't handle Unix PATH lists very well. -# patch -p1 -i ${srcdir}/0003-Add-msys2_path_conv.patch - patch -p1 -i ${srcdir}/0004-Fix-cygwin-path_conv-of-root.patch +# patch -p1 -i ${srcdir}/0003-Add-msys2_path_conv.patch + patch -p1 -i ${srcdir}/0004-Fix-cygwin-path_conv-of-root.patch } build() { - [[ -d $srcdir/build-${CHOST} ]] && rm -rf $srcdir/build-${CHOST} - mkdir -p $srcdir/build-${CHOST} && cd $srcdir/build-${CHOST} + [[ -d $srcdir/build-${CHOST} ]] && rm -rf $srcdir/build-${CHOST} + mkdir -p $srcdir/build-${CHOST} && cd $srcdir/build-${CHOST} - # Gives more verbose compile output when debugging. - if check_option "debug" "y"; then - export CCWRAP_VERBOSE=1 - OPTIM="-O0" - else - OPTIM="-O2" - fi + # Gives more verbose compile output when debugging. + if check_option "debug" "y"; then + export CCWRAP_VERBOSE=1 + OPTIM="-O0" + else + OPTIM="-O2" + fi - CFLAGS="$OPTIM -pipe -ggdb" - CXXFLAGS="$OPTIM -pipe -ggdb" + CFLAGS="$OPTIM -pipe -ggdb" + CXXFLAGS="$OPTIM -pipe -ggdb" - ${srcdir}/msys2-runtime/configure \ - --prefix=/usr \ - --build=${CHOST} \ - --sysconfdir=/etc - LANG=C make - LANG=C make -j1 DESTDIR=${srcdir}/dest install - rm -rf ${srcdir}/dest/etc + ${srcdir}/msys2-runtime/configure \ + --prefix=/usr \ + --build=${CHOST} \ + --sysconfdir=/etc + LANG=C make + LANG=C make -j1 DESTDIR=${srcdir}/dest install + rm -rf ${srcdir}/dest/etc } package_msys2-runtime() { - pkgdesc="Posix emulation engine for Windows" - groups=('base') - options=('!strip') - #install=msys2-runtime.install + pkgdesc="Posix emulation engine for Windows" + groups=('base') + options=('!strip') + #install=msys2-runtime.install - mkdir -p $pkgdir/usr - cp -rf ${srcdir}/dest/usr/bin $pkgdir/usr/ - rm -f $pkgdir/usr/bin/msys-2.0.dbg - rm -f $pkgdir/usr/bin/cyglsa-config - rm -f $pkgdir/usr/bin/cyglsa.dll - rm -f $pkgdir/usr/bin/cyglsa64.dll - rm -f $pkgdir/usr/bin/cygserver-config - cp -rf ${srcdir}/dest/usr/share $pkgdir/usr/ + mkdir -p $pkgdir/usr + cp -rf ${srcdir}/dest/usr/bin $pkgdir/usr/ + rm -f $pkgdir/usr/bin/msys-2.0.dbg + rm -f $pkgdir/usr/bin/cyglsa-config + rm -f $pkgdir/usr/bin/cyglsa.dll + rm -f $pkgdir/usr/bin/cyglsa64.dll + rm -f $pkgdir/usr/bin/cygserver-config + cp -rf ${srcdir}/dest/usr/share $pkgdir/usr/ } package_msys2-runtime-devel() { - pkgdesc="MSYS2 headers and libraries" - groups=('MSYS2-devel') - depends=("msys2-runtime=${pkgver}") - options=('staticlibs' '!strip') + pkgdesc="MSYS2 headers and libraries" + groups=('MSYS2-devel') + depends=("msys2-runtime=${pkgver}") + options=('staticlibs' '!strip') - mkdir -p $pkgdir/usr/bin - cp -f ${srcdir}/dest/usr/bin/msys-2.0.dbg $pkgdir/usr/bin/ - cp -rLf ${srcdir}/dest/usr/${CHOST}/include $pkgdir/usr/ - rm -f $pkgdir/usr/include/iconv.h - rm -f $pkgdir/usr/include/unctrl.h - cp -rLf ${srcdir}/dest/usr/${CHOST}/lib $pkgdir/usr/ + mkdir -p $pkgdir/usr/bin + cp -f ${srcdir}/dest/usr/bin/msys-2.0.dbg $pkgdir/usr/bin/ + cp -rLf ${srcdir}/dest/usr/${CHOST}/include $pkgdir/usr/ + rm -f $pkgdir/usr/include/iconv.h + rm -f $pkgdir/usr/include/unctrl.h + cp -rLf ${srcdir}/dest/usr/${CHOST}/lib $pkgdir/usr/ } diff --git a/msys2-w32api-runtime/PKGBUILD b/msys2-w32api-runtime/PKGBUILD index cc268911..12d41e62 100644 --- a/msys2-w32api-runtime/PKGBUILD +++ b/msys2-w32api-runtime/PKGBUILD @@ -40,14 +40,14 @@ build() { esac ./configure \ - --prefix=/crt \ - --build=${CHOST} \ - --host=${MINGW_CHOST} \ - --enable-w32api \ - ${_libs} \ - CFLAGS='-I/usr/include/w32api' \ - CXXFLAGS='-I/usr/include/w32api' \ - CPPFLAGS='-I/usr/include/w32api' + --prefix=/crt \ + --build=${CHOST} \ + --host=${MINGW_CHOST} \ + --enable-w32api \ + ${_libs} \ + CFLAGS='-I/usr/include/w32api' \ + CXXFLAGS='-I/usr/include/w32api' \ + CPPFLAGS='-I/usr/include/w32api' make } diff --git a/nano/PKGBUILD b/nano/PKGBUILD index cf04fabc..282836cb 100644 --- a/nano/PKGBUILD +++ b/nano/PKGBUILD @@ -12,10 +12,10 @@ depends=('ncurses' 'sh') backup=('etc/nanorc') install=nano.install source=(http://www.nano-editor.org/dist/v2.3/${pkgname}-${pkgver}.tar.gz - 2.2.4-wchar.patch - nano-2.3.2-fix-ncurses-location.patch - nano-2.3.2-msys2.patch - nano-2.3.2-winio-fix.patch) + 2.2.4-wchar.patch + nano-2.3.2-fix-ncurses-location.patch + nano-2.3.2-msys2.patch + nano-2.3.2-winio-fix.patch) md5sums=('6451aeae836471cadea8567c44a46c99' '85fd83d3de15f8820bec392a0a938274' '9480df57b2938717880d2d3d687cbdcf' @@ -38,7 +38,7 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --enable-color \ - --without-slang \ + --without-slang \ --enable-nanorc \ CFLAGS="${CFLAGS} -I/usr/include/ncursesw" \ CPPFLAGS="${CPPFLAGS} -I/usr/include/ncursesw" diff --git a/nettle/PKGBUILD b/nettle/PKGBUILD index 3e88a525..06f06ebc 100644 --- a/nettle/PKGBUILD +++ b/nettle/PKGBUILD @@ -11,7 +11,7 @@ groups=('net-utils') depends=('gmp') makedepends=('gmp-devel') source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz{,.sig} - 2.6-soname.patch + 2.6-soname.patch nettle-2.6-msys2.patch) md5sums=('003d5147911317931dd453520eb234a5' 'SKIP' @@ -30,7 +30,7 @@ prepare() { build() { cd "$srcdir/$pkgname-$pkgver" ./configure --build=${CHOST} --prefix=/usr --libdir=/usr/lib \ - --enable-shared --disable-assembler + --enable-shared --disable-assembler make diff --git a/openssh/PKGBUILD b/openssh/PKGBUILD index 8fdee09e..678b6b75 100644 --- a/openssh/PKGBUILD +++ b/openssh/PKGBUILD @@ -20,51 +20,51 @@ sha1sums=('b850fd1af704942d9b3c2eff7ef6b3a59b6a6b6e' backup=('usr/etc/ssh/ssh_config') prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ${srcdir}/openssh-6.3p1-fix-man-install.patch - patch -p1 -i ${srcdir}/openssh-6.3p1-msys2.patch + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ${srcdir}/openssh-6.3p1-fix-man-install.patch + patch -p1 -i ${srcdir}/openssh-6.3p1-msys2.patch } build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ - --build=${CHOST} \ - --prefix=/usr \ - --sbindir=/usr/bin \ - --libexecdir=/usr/lib/ssh \ - --sysconfdir=/etc/ssh \ - --with-libedit \ - --with-kerberos5=/usr \ - --disable-strip + ./configure \ + --build=${CHOST} \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --libexecdir=/usr/lib/ssh \ + --sysconfdir=/etc/ssh \ + --with-libedit \ + --with-kerberos5=/usr \ + --disable-strip - make + make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" - make tests || - grep $USER /etc/passwd | grep -q /bin/false - # connect.sh fails when run with stupid login shell + make tests || + grep $USER /etc/passwd | grep -q /bin/false + # connect.sh fails when run with stupid login shell } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" install - #ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz - install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" + #ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz + install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" - install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh - install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id - install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1 + install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh + install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id + install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1 - mv -f "${pkgdir}"/etc "${pkgdir}"/usr/ - mv -f "${pkgdir}"/var "${pkgdir}"/usr/ - rm -f "${pkgdir}"/usr/etc/ssh/sshd_config - rm -f "${pkgdir}"/usr/bin/sshd.exe - rm -f "${pkgdir}"/usr/sbin/sshd.exe - rm -f "${pkgdir}"/usr/lib/ssh/sftp-server.exe + mv -f "${pkgdir}"/etc "${pkgdir}"/usr/ + mv -f "${pkgdir}"/var "${pkgdir}"/usr/ + rm -f "${pkgdir}"/usr/etc/ssh/sshd_config + rm -f "${pkgdir}"/usr/bin/sshd.exe + rm -f "${pkgdir}"/usr/sbin/sshd.exe + rm -f "${pkgdir}"/usr/lib/ssh/sftp-server.exe } diff --git a/openssl/PKGBUILD b/openssl/PKGBUILD index 9cb0d981..dae6bc30 100644 --- a/openssl/PKGBUILD +++ b/openssl/PKGBUILD @@ -33,82 +33,82 @@ md5sums=('de62b43dfcd858e66a74bee1c834e959' '5d5598338fc5f95b824e46a5fb303db0') prepare() { - cd $startdir/ - [ -d $srcdir/$pkgname-$_ver ] || tar -xzvf ${pkgname}-${_ver}.tar.gz -C $srcdir - cd $srcdir/$pkgname-$_ver + cd $startdir/ + [ -d $srcdir/$pkgname-$_ver ] || tar -xzvf ${pkgname}-${_ver}.tar.gz -C $srcdir + cd $srcdir/$pkgname-$_ver - # remove rpath: http://bugs.archlinux.org/task/14367 - patch -p0 -i $srcdir/no-rpath.patch - # set ca dir to /etc/ssl by default - patch -p0 -i $srcdir/ca-dir.patch + # remove rpath: http://bugs.archlinux.org/task/14367 + patch -p0 -i $srcdir/no-rpath.patch + # set ca dir to /etc/ssl by default + patch -p0 -i $srcdir/ca-dir.patch - patch -p1 -i $srcdir/openssl-1.0.1f-manfix.patch - patch -p1 -i $srcdir/openssl-1.0.1e-cygwin64.patch - patch -p1 -i $srcdir/openssl-1.0.1e-msys2.patch - patch -p1 -i $srcdir/openssl-1.0.0-beta5-enginesdir.patch + patch -p1 -i $srcdir/openssl-1.0.1f-manfix.patch + patch -p1 -i $srcdir/openssl-1.0.1e-cygwin64.patch + patch -p1 -i $srcdir/openssl-1.0.1e-msys2.patch + patch -p1 -i $srcdir/openssl-1.0.0-beta5-enginesdir.patch } build() { - cd $srcdir/$pkgname-$_ver + cd $srcdir/$pkgname-$_ver - if [ "${CARCH}" == 'x86_64' ]; then - openssltarget='Msys-x86_64' - elif [ "${CARCH}" == 'i686' ]; then - openssltarget='Msys' - fi + if [ "${CARCH}" == 'x86_64' ]; then + openssltarget='Msys-x86_64' + elif [ "${CARCH}" == 'i686' ]; then + openssltarget='Msys' + fi - ./Configure --prefix=/usr \ - --openssldir=/usr/ssl \ - --enginesdir=/usr/lib/openssl/engines \ - --libdir=lib \ - shared \ - zlib \ - no-idea \ - no-rc5 \ - no-asm \ - ${openssltarget} - - make depend - make - make INSTALL_PREFIX=${srcdir}/dest MANDIR=/usr/share/man MANSUFFIX=ssl install + ./Configure --prefix=/usr \ + --openssldir=/usr/ssl \ + --enginesdir=/usr/lib/openssl/engines \ + --libdir=lib \ + shared \ + zlib \ + no-idea \ + no-rc5 \ + no-asm \ + ${openssltarget} + + make depend + make + make INSTALL_PREFIX=${srcdir}/dest MANDIR=/usr/share/man MANSUFFIX=ssl install } check() { - cd $srcdir/$pkgname-$_ver + cd $srcdir/$pkgname-$_ver - make test + make test } package_openssl() { depends=('libopenssl' 'perl' 'zlib') - - mkdir -p $pkgdir/usr/bin - cp -f ${srcdir}/dest/usr/bin/*.exe $pkgdir/usr/bin/ - cp -f ${srcdir}/dest/usr/bin/c_rehash $pkgdir/usr/bin/ - cp -rf ${srcdir}/dest/usr/share $pkgdir/usr/ - cp -rf ${srcdir}/dest/usr/ssl $pkgdir/usr/ - install -D -m644 $srcdir/$pkgname-$_ver/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + + mkdir -p $pkgdir/usr/bin + cp -f ${srcdir}/dest/usr/bin/*.exe $pkgdir/usr/bin/ + cp -f ${srcdir}/dest/usr/bin/c_rehash $pkgdir/usr/bin/ + cp -rf ${srcdir}/dest/usr/share $pkgdir/usr/ + cp -rf ${srcdir}/dest/usr/ssl $pkgdir/usr/ + install -D -m644 $srcdir/$pkgname-$_ver/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE } package_libopenssl() { - depends=('zlib') - groups=('libraries') + depends=('zlib') + groups=('libraries') - mkdir -p $pkgdir/usr/bin - cp -f $srcdir/dest/usr/bin/*.dll $pkgdir/usr/bin/ + mkdir -p $pkgdir/usr/bin + cp -f $srcdir/dest/usr/bin/*.dll $pkgdir/usr/bin/ - mkdir -p $pkgdir/usr/lib/openssl - cp -rf $srcdir/dest/usr/lib/engines ${pkgdir}/usr/lib/openssl/ - chmod -R 755 ${pkgdir}/usr/lib/openssl/engines + mkdir -p $pkgdir/usr/lib/openssl + cp -rf $srcdir/dest/usr/lib/engines ${pkgdir}/usr/lib/openssl/ + chmod -R 755 ${pkgdir}/usr/lib/openssl/engines } package_openssl-devel() { - pkgdesc="Openssl headers and libraries" - groups=('development') - depends=("libopenssl=${pkgver}") + pkgdesc="Openssl headers and libraries" + groups=('development') + depends=("libopenssl=${pkgver}") - mkdir -p $pkgdir/usr/lib - cp -rf $srcdir/dest/usr/include $pkgdir/usr/ - cp -rf $srcdir/dest/usr/lib/pkgconfig $pkgdir/usr/lib/ - cp -f $srcdir/dest/usr/lib/*.a $pkgdir/usr/lib + mkdir -p $pkgdir/usr/lib + cp -rf $srcdir/dest/usr/include $pkgdir/usr/ + cp -rf $srcdir/dest/usr/lib/pkgconfig $pkgdir/usr/lib/ + cp -f $srcdir/dest/usr/lib/*.a $pkgdir/usr/lib } diff --git a/p11-kit/PKGBUILD b/p11-kit/PKGBUILD index 3d2c6ea9..2787dd34 100644 --- a/p11-kit/PKGBUILD +++ b/p11-kit/PKGBUILD @@ -12,7 +12,7 @@ source=($url/releases/$pkgname-$pkgver.tar.gz{,.sig} 0.19.1-trust-shrext.patch p11-kit-0.18.7-msys2.patch p11-kit-fix-readlink.patch - 0.18.7-win8-x64.patch) + 0.18.7-win8-x64.patch) md5sums=('757b97ee4ac0ce598661a90cd784c4f1' 'SKIP' '4a1d9752bb1d3776b2dbc73504915912' diff --git a/p7zip/PKGBUILD b/p7zip/PKGBUILD index e48a2472..308727ea 100644 --- a/p7zip/PKGBUILD +++ b/p7zip/PKGBUILD @@ -12,10 +12,10 @@ makedepends=('nasm') groups=('compression') options=('emptydirs') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}_${pkgver}_src_all.tar.bz2" - 01_makefile_9.20.1.patch - 02_man_9.20.1.patch - 03_respect-umask-partial_9.20.1.patch - p7zip-9.20.1-1.src.patch) + 01_makefile_9.20.1.patch + 02_man_9.20.1.patch + 03_respect-umask-partial_9.20.1.patch + p7zip-9.20.1-1.src.patch) sha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7' '4ec01e226688a64775cebc1f9c6b0b8fe38ee12a' 'd071a69f00886d56e6546257715c9201547d4709' @@ -26,12 +26,12 @@ options=('!makeflags') prepare() { cd "${srcdir}/${pkgname}_${pkgver}" - + patch -p1 -i ${srcdir}/01_makefile_9.20.1.patch patch -p1 -i ${srcdir}/02_man_9.20.1.patch patch -p1 -i ${srcdir}/03_respect-umask-partial_9.20.1.patch patch -p1 -i ${srcdir}/p7zip-9.20.1-1.src.patch - + [[ $CARCH = x86_64 ]] \ && cp makefile.cygwin makefile.machine \ || cp makefile.cygwin_asm makefile.machine @@ -59,7 +59,7 @@ package() { #cat install.sh.orig | sed -e "$sedexp1" -e "$sedexp2" > ./install.sh #chmod +x install.sh #./install.sh - + make install \ DEST_DIR="${pkgdir}" \ DEST_HOME="/usr" \ @@ -68,9 +68,9 @@ package() { # Licenses #install -d "${pkgdir}"/usr/share/licenses/p7zip #ln -s -t "${pkgdir}"/usr/share/licenses/p7zip \ - # /usr/share/doc/p7zip/DOCS/License.txt \ - # /usr/share/doc/p7zip/DOCS/unRarLicense.txt - + # /usr/share/doc/p7zip/DOCS/License.txt \ + # /usr/share/doc/p7zip/DOCS/unRarLicense.txt + #cp contrib/gzip-like_CLI_wrapper_for_7z/README ${B}/p7zip-script.README #dodoc p7zip-script.README diff --git a/pacman-mirrors/PKGBUILD b/pacman-mirrors/PKGBUILD index 3a8ca5ce..a06d82dc 100644 --- a/pacman-mirrors/PKGBUILD +++ b/pacman-mirrors/PKGBUILD @@ -9,8 +9,8 @@ url="http://msys2.sourceforge.net/" license=('GPL') groups=('base') source=(mirrorlist.msys - mirrorlist.mingw32 - mirrorlist.mingw64) + mirrorlist.mingw32 + mirrorlist.mingw64) md5sums=('7254db57c1d304ba7a47d7fcf16f467d' 'ef2c12657918563997004431bf671813' '15b6a209833feab06756a4db74bf4975') diff --git a/pacman/PKGBUILD b/pacman/PKGBUILD index 74cd0750..1cc7ab44 100644 --- a/pacman/PKGBUILD +++ b/pacman/PKGBUILD @@ -10,12 +10,12 @@ url="http://www.archlinux.org/pacman/" license=('GPL') groups=('base' 'base-devel') depends=('bash>=4.2.045' - 'msys2-runtime' - 'libarchive>=3.1.2' - 'curl>=7.19.4' - 'libgpgme' - 'pacman-mirrors' - 'which') + 'msys2-runtime' + 'libarchive>=3.1.2' + 'curl>=7.19.4' + 'libgpgme' + 'pacman-mirrors' + 'which') checkdepends=('python2') makedepends=('git') optdepends=() @@ -23,16 +23,16 @@ provides=('pacman-contrib') conflicts=('pacman-contrib') replaces=('pacman-contrib') backup=(#"usr/etc/pacman.conf" - "usr/etc/makepkg.conf" - "usr/etc/makepkg_mingw32.conf" - "usr/etc/makepkg_mingw64.conf") + "usr/etc/makepkg.conf" + "usr/etc/makepkg_mingw32.conf" + "usr/etc/makepkg_mingw64.conf") source=("$pkgname"::'git://github.com/Alexpux/MSYS2-pacman.git' - "pacman.conf.i686" - "pacman.conf.x86_64" - "makepkg.conf" - "makepkg_mingw32.conf" - "makepkg_mingw64.conf" - "makepkg-mingw") + "pacman.conf.i686" + "pacman.conf.x86_64" + "makepkg.conf" + "makepkg_mingw32.conf" + "makepkg_mingw64.conf" + "makepkg-mingw") md5sums=('SKIP' 'b079f3989407f048439649cf7f5b183a' 'b079f3989407f048439649cf7f5b183a' @@ -42,75 +42,75 @@ md5sums=('SKIP' '2ed9a2406554fc69b4f3f4474a7c03d6') pkgver() { - cd "$srcdir/$pkgname" - #printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" - printf "%s.%s.%s" "${_base_ver}" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + cd "$srcdir/$pkgname" + #printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + printf "%s.%s.%s" "${_base_ver}" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } prepare() { - cd $srcdir/$pkgname + cd $srcdir/$pkgname } build() { - cd $srcdir/$pkgname - ./autogen.sh + cd $srcdir/$pkgname + ./autogen.sh - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --enable-doc \ - --with-scriptlet-shell=/usr/bin/bash \ - --with-pkg-ext=.pkg.tar.xz - make - make -C contrib + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --enable-doc \ + --with-scriptlet-shell=/usr/bin/bash \ + --with-pkg-ext=.pkg.tar.xz + make + make -C contrib } check() { - make -C "$pkgname" check + make -C "$pkgname" check } package() { - cd $srcdir/$pkgname - make -j1 DESTDIR=$pkgdir install - make -j1 DESTDIR=$pkgdir -C contrib install + cd $srcdir/$pkgname + make -j1 DESTDIR=$pkgdir install + make -j1 DESTDIR=$pkgdir -C contrib install - # Workaround for MSYS - place all files in /usr - mv -f $pkgdir/etc $pkgdir/usr/ - mv -f $pkgdir/var $pkgdir/usr/ + # Workaround for MSYS - place all files in /usr + mv -f $pkgdir/etc $pkgdir/usr/ + mv -f $pkgdir/var $pkgdir/usr/ - # install Arch specific stuff - install -dm755 $pkgdir/usr/etc - install -m644 $srcdir/pacman.conf.$CARCH $pkgdir/usr/etc/pacman.conf + # install Arch specific stuff + install -dm755 $pkgdir/usr/etc + install -m644 $srcdir/pacman.conf.$CARCH $pkgdir/usr/etc/pacman.conf - case "$CARCH" in - i686) - mycarch="i686" - mychost="i686-pc-msys" - myflags="-march=i686" - ;; - x86_64) - mycarch="x86_64" - mychost="x86_64-pc-msys" - myflags="-march=x86-64" - ;; - esac + case "$CARCH" in + i686) + mycarch="i686" + mychost="i686-pc-msys" + myflags="-march=i686" + ;; + x86_64) + mycarch="x86_64" + mychost="x86_64-pc-msys" + myflags="-march=x86-64" + ;; + esac - install -m644 $srcdir/makepkg.conf $pkgdir/usr/etc/ - install -m644 $srcdir/makepkg_mingw32.conf $pkgdir/usr/etc/ - install -m644 $srcdir/makepkg_mingw64.conf $pkgdir/usr/etc/ - install -m755 $srcdir/makepkg-mingw $pkgdir/usr/bin/ + install -m644 $srcdir/makepkg.conf $pkgdir/usr/etc/ + install -m644 $srcdir/makepkg_mingw32.conf $pkgdir/usr/etc/ + install -m644 $srcdir/makepkg_mingw64.conf $pkgdir/usr/etc/ + install -m755 $srcdir/makepkg-mingw $pkgdir/usr/bin/ - # set things correctly in the default conf file - sed -i $pkgdir/usr/etc/makepkg.conf \ - -e "s|@CARCH[@]|$mycarch|g" \ - -e "s|@CHOST[@]|$mychost|g" \ - -e "s|@CARCHFLAGS[@]|$myflags|g" + # set things correctly in the default conf file + sed -i $pkgdir/usr/etc/makepkg.conf \ + -e "s|@CARCH[@]|$mycarch|g" \ + -e "s|@CHOST[@]|$mychost|g" \ + -e "s|@CARCHFLAGS[@]|$myflags|g" - # put bash_completion in the right location - install -dm755 ${pkgdir}/usr/share/bash-completion/completions - mv ${pkgdir}/usr/etc/bash_completion.d/pacman \ - ${pkgdir}/usr/share/bash-completion/completions - rmdir ${pkgdir}/usr/etc/bash_completion.d + # put bash_completion in the right location + install -dm755 ${pkgdir}/usr/share/bash-completion/completions + mv ${pkgdir}/usr/etc/bash_completion.d/pacman \ + ${pkgdir}/usr/share/bash-completion/completions + rmdir ${pkgdir}/usr/etc/bash_completion.d - for f in makepkg pacman-key; do - ln -s pacman "$pkgdir/usr/share/bash-completion/completions/$f" - done + for f in makepkg pacman-key; do + ln -s pacman "$pkgdir/usr/share/bash-completion/completions/$f" + done } diff --git a/patch/PKGBUILD b/patch/PKGBUILD index b0af6bfe..e1bb9423 100644 --- a/patch/PKGBUILD +++ b/patch/PKGBUILD @@ -29,7 +29,7 @@ prepare() { # http://savannah.gnu.org/bugs/?37500 patch -Np1 -i \ $srcdir/patch-2.7.1-initialize-data-structures-early-enough.patch - + patch -Np1 -i $srcdir/msys2-patch-2.7.1.patch patch -Np2 -i $srcdir/msys2-patch-manifest.patch @@ -41,7 +41,7 @@ build() { ./configure --build=${CHOST} \ --prefix=/usr \ - ac_cv_func_setmode_dos=yes + ac_cv_func_setmode_dos=yes make } diff --git a/perl-Authen-SASL/PKGBUILD b/perl-Authen-SASL/PKGBUILD index 4625d790..7ebda8cb 100644 --- a/perl-Authen-SASL/PKGBUILD +++ b/perl-Authen-SASL/PKGBUILD @@ -12,7 +12,7 @@ depends=('perl') groups=('perl-modules') options=('!emptydirs') source=(http://www.cpan.org/authors/id/G/GB/GBARR/${_realname}-${pkgver}.tar.gz - Authen-SASL-2.16.patch) + Authen-SASL-2.16.patch) md5sums=('7c03a689d4c689e5a9e2f18a1c586b2f' '622760382e0b2bb9ed53f488a8f50a5c') diff --git a/perl-HTTP-Message/PKGBUILD b/perl-HTTP-Message/PKGBUILD index 1629f017..7758712a 100644 --- a/perl-HTTP-Message/PKGBUILD +++ b/perl-HTTP-Message/PKGBUILD @@ -11,7 +11,7 @@ groups=('perl-modules') license=('PerlArtistic' 'GPL') options=('!emptydirs') depends=('perl>=5.8.8' 'perl-Encode-Locale>=1' 'perl-HTML-Parser>=3.33' - 'perl-HTTP-Date>=6' 'perl-LWP-MediaTypes>=6' 'perl-URI>=1.10') + 'perl-HTTP-Date>=6' 'perl-LWP-MediaTypes>=6' 'perl-URI>=1.10') checkdepends=('perl-IO-HTML') conflicts=('perl-libwww<6') source=("http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz") diff --git a/perl-Locale-Gettext/PKGBUILD b/perl-Locale-Gettext/PKGBUILD index 3f60cc42..ceb39468 100644 --- a/perl-Locale-Gettext/PKGBUILD +++ b/perl-Locale-Gettext/PKGBUILD @@ -13,8 +13,8 @@ depends=('gettext' 'perl') options=(!emptydirs) source=("http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/${_realname}-${pkgver}.tar.gz" 'compatibility-with-POSIX-module.patch' - '1.05-as-needed.patch' - 'doc-update.diff') + '1.05-as-needed.patch' + 'doc-update.diff') md5sums=('f3d3f474a1458f37174c410dfef61a46' '854302f34d01a2f8ae739187788973dd' '5373a6d1547e4938c29e383ceb0fcb03' diff --git a/perl-MIME-tools/PKGBUILD b/perl-MIME-tools/PKGBUILD index bb40bbdc..edd5bce7 100644 --- a/perl-MIME-tools/PKGBUILD +++ b/perl-MIME-tools/PKGBUILD @@ -11,12 +11,12 @@ license=('GPL' 'PerlArtistic') depends=('perl-MailTools' 'perl-IO-stringy' 'perl-Convert-BinHex') options=('!emptydirs') provides=('perl-MIME-Body=5.428.0' 'perl-MIME-Decoder' 'perl-MIME-Decoder-Base64' - 'perl-MIME-Decoder-Binary' 'perl-MIME-Decoder-Binhex' 'perl-MIME-Decoder-gzip64' - 'perl-MIME-Decoder-nbit' 'perl-MIME-Decoder-Quotedprint' 'perl-MIME-decoder-uu' - 'perl-MIME-Entity' 'perl-MIME-Field-Contdisp=5.428.0' 'perl-MIME-Field-Contraenc=5.428.0' - 'perl-MIME-Field-Conttype=5.428.0' 'perl-MIME-Field-Paramval=5.428.0' 'perl-MIME-Head=5.428.0' - 'perl-MIME-Parser' 'perl-MIME-Parser-Filer' 'perl-MIME-Parser-Reader' - 'perl-MIME-Parser-Results' 'perl-MIME-WordDecoder' 'perl-MIME-Words=5.428.0') + 'perl-MIME-Decoder-Binary' 'perl-MIME-Decoder-Binhex' 'perl-MIME-Decoder-gzip64' + 'perl-MIME-Decoder-nbit' 'perl-MIME-Decoder-Quotedprint' 'perl-MIME-decoder-uu' + 'perl-MIME-Entity' 'perl-MIME-Field-Contdisp=5.428.0' 'perl-MIME-Field-Contraenc=5.428.0' + 'perl-MIME-Field-Conttype=5.428.0' 'perl-MIME-Field-Paramval=5.428.0' 'perl-MIME-Head=5.428.0' + 'perl-MIME-Parser' 'perl-MIME-Parser-Filer' 'perl-MIME-Parser-Reader' + 'perl-MIME-Parser-Results' 'perl-MIME-WordDecoder' 'perl-MIME-Words=5.428.0') source=("http://www.cpan.org/authors/id/D/DS/DSKOLL/${_realname}-${pkgver}.tar.gz") md5sums=('7706e1f592d3f57981a7f7baaf9277a0') diff --git a/perl-libwww/PKGBUILD b/perl-libwww/PKGBUILD index 24d572e9..20f8e73c 100644 --- a/perl-libwww/PKGBUILD +++ b/perl-libwww/PKGBUILD @@ -21,7 +21,7 @@ sha1sums=('e10b097a4a2f04efcb3549b6543e16534b46064d') build() { cd libwww-perl-${pkgver} perl Makefile.PL INSTALLDIRS=vendor - #--aliases + #--aliases make } diff --git a/perl/PKGBUILD b/perl/PKGBUILD index 5a9cdf27..910a00af 100644 --- a/perl/PKGBUILD +++ b/perl/PKGBUILD @@ -16,7 +16,7 @@ source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 perl-5.18.0-cygwin.patch perl-5.18.0-msys2.patch perl-5.18.0-pod-parser-msys2.patch - perl-nostdio.patch) + perl-nostdio.patch) install=perl.install options=('makeflags' '!purge') md5sums=('d549b16ee4e9210988da39193a9389c1' @@ -30,19 +30,19 @@ md5sums=('d549b16ee4e9210988da39193a9389c1' # workaround to let the integrity check find the correct provides array #if [[ ${0##*/} = "parse_pkgbuilds.sh" ]]; then -# true && provides=($(bsdtar -q -O -xf "/srv/ftp/pool/packages/$pkgname-$pkgver-$pkgrel-$CARCH.pkg.tar.xz" .PKGINFO | sed -rn 's#^provides = (.*)#\1#p')) +# true && provides=($(bsdtar -q -O -xf "/srv/ftp/pool/packages/$pkgname-$pkgver-$pkgrel-$CARCH.pkg.tar.xz" .PKGINFO | sed -rn 's#^provides = (.*)#\1#p')) #fi prepare() { - chmod -R -644 ${srcdir}/${pkgname}-${pkgver} - cd ${srcdir}/${pkgname}-${pkgver} + chmod -R -644 ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver} - patch -p1 -i ${srcdir}/perl-5.18.0-cygwin.patch - patch -p1 -i ${srcdir}/perl-5.18.0-msys2.patch - patch -p1 -i ${srcdir}/perl-5.18.0-pod-parser-msys2.patch - patch -p1 -i ${srcdir}/perl-nostdio.patch + patch -p1 -i ${srcdir}/perl-5.18.0-cygwin.patch + patch -p1 -i ${srcdir}/perl-5.18.0-msys2.patch + patch -p1 -i ${srcdir}/perl-5.18.0-pod-parser-msys2.patch + patch -p1 -i ${srcdir}/perl-nostdio.patch - cat > Policy.sh <<_EOF + cat > Policy.sh <<_EOF #!/bin/sh prefix="/usr" siteprefix="/usr" @@ -73,80 +73,80 @@ _EOF } build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver} - #export MSYS=winsymlinks:nativestrict + #export MSYS=winsymlinks:nativestrict - #MSYS=winsymlinks:nativestrict - ./Configure -d -e -Dprefix=/usr -Dusethreads \ - -Darchname=${ARCH}-msys-threads \ - -Dmyarchname=${ARCH}-msys \ - -Dlibperl=msys-perl5_18.dll \ - -Dcc=gcc -Dld=g++ + #MSYS=winsymlinks:nativestrict + ./Configure -d -e -Dprefix=/usr -Dusethreads \ + -Darchname=${ARCH}-msys-threads \ + -Dmyarchname=${ARCH}-msys \ + -Dlibperl=msys-perl5_18.dll \ + -Dcc=gcc -Dld=g++ - LANG=C make - #unset MSYS + LANG=C make + #unset MSYS } check() { - cd ${srcdir}/${pkgname}-${pkgver} - TEST_JOBS=$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/') make test_harness || true - #make test + cd ${srcdir}/${pkgname}-${pkgver} + TEST_JOBS=$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/') make test_harness || true + #make test } package() { - # hack to work around makepkg running the subshell in check_sanity() - new_provides=($(cd "$srcdir/perl-$pkgver"; ./perl -Ilib "$srcdir/provides.pl" .)) - provides=(${new_provides[@]}) + # hack to work around makepkg running the subshell in check_sanity() + new_provides=($(cd "$srcdir/perl-$pkgver"; ./perl -Ilib "$srcdir/provides.pl" .)) + provides=(${new_provides[@]}) - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR="$pkgdir" install + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR="$pkgdir" install - find ${pkgdir}/usr/lib -type f -exec chmod 0644 {} \; - # prevent xsinit-generated code from referencing boot_Win32CORE - sed -i -e "s/^\(static_ext\)=.*/\1=' '/" \ - ${pkgdir}/usr/lib/perl5/${pkgver%.*}/${CARCH}-msys-threads/Config_heavy.pl + find ${pkgdir}/usr/lib -type f -exec chmod 0644 {} \; + # prevent xsinit-generated code from referencing boot_Win32CORE + sed -i -e "s/^\(static_ext\)=.*/\1=' '/" \ + ${pkgdir}/usr/lib/perl5/${pkgver%.*}/${CARCH}-msys-threads/Config_heavy.pl - ### Perl Settings ### - # Change man page extensions for site and vendor module builds. - # Set no mail address since bug reports should go to the bug tracker - # and not someone's email. - #sed -e '/^man1ext=/ s/1perl/1p/' -e '/^man3ext=/ s/3perl/3pm/' \ - # -e "/^cf_email=/ s/'.*'/''/" \ - # -e "/^perladmin=/ s/'.*'/''/" \ - # -i ${pkgdir}/usr/lib/perl5/${pkgver%.*}/Config_heavy.pl + ### Perl Settings ### + # Change man page extensions for site and vendor module builds. + # Set no mail address since bug reports should go to the bug tracker + # and not someone's email. + #sed -e '/^man1ext=/ s/1perl/1p/' -e '/^man3ext=/ s/3perl/3pm/' \ + # -e "/^cf_email=/ s/'.*'/''/" \ + # -e "/^perladmin=/ s/'.*'/''/" \ + # -i ${pkgdir}/usr/lib/perl5/${pkgver%.*}/Config_heavy.pl - ### CPAN Settings ### - # Set CPAN default config to use the site directories. - sed -e '/(makepl_arg =>/ s/""/"INSTALLDIRS=site"/' \ - -e '/(mbuildpl_arg =>/ s/""/"installdirs=site"/' \ - -i ${pkgdir}/usr/lib/perl5/${pkgver%.*}/CPAN/FirstTime.pm + ### CPAN Settings ### + # Set CPAN default config to use the site directories. + sed -e '/(makepl_arg =>/ s/""/"INSTALLDIRS=site"/' \ + -e '/(mbuildpl_arg =>/ s/""/"installdirs=site"/' \ + -i ${pkgdir}/usr/lib/perl5/${pkgver%.*}/CPAN/FirstTime.pm - ### CPANPLUS Settings ### - # Set CPANPLUS default config to use the site directories. - sed -e "/{'makemakerflags'}/ s/'';/'INSTALLDIRS=site';/" \ - -e "/{'buildflags'}/ s/'';/'installdirs=site';/" \ - -i ${pkgdir}/usr/lib/perl5/${pkgver%.*}/CPANPLUS/Config.pm + ### CPANPLUS Settings ### + # Set CPANPLUS default config to use the site directories. + sed -e "/{'makemakerflags'}/ s/'';/'INSTALLDIRS=site';/" \ + -e "/{'buildflags'}/ s/'';/'installdirs=site';/" \ + -i ${pkgdir}/usr/lib/perl5/${pkgver%.*}/CPANPLUS/Config.pm - # Profile script to set paths to perl scripts. - #install -D -m755 ${srcdir}/perlbin.sh \ - # ${pkgdir}/etc/profile.d/perlbin.sh - # Profile script to set paths to perl scripts on csh. (FS#22441) - #install -D -m755 ${srcdir}/perlbin.csh \ - # ${pkgdir}/etc/profile.d/perlbin.csh + # Profile script to set paths to perl scripts. + #install -D -m755 ${srcdir}/perlbin.sh \ + # ${pkgdir}/etc/profile.d/perlbin.sh + # Profile script to set paths to perl scripts on csh. (FS#22441) + #install -D -m755 ${srcdir}/perlbin.csh \ + # ${pkgdir}/etc/profile.d/perlbin.csh - #(cd ${pkgdir}/usr/bin; mv perl${pkgver} perl) - #(cd ${pkgdir}/usr/bin/core_perl; ln -sf c2ph pstruct; ln -sf s2p psed) + #(cd ${pkgdir}/usr/bin; mv perl${pkgver} perl) + #(cd ${pkgdir}/usr/bin/core_perl; ln -sf c2ph pstruct; ln -sf s2p psed) - # Remove all pod files *except* those under /usr/share/perl5/core_perl/pod/ - # (FS#16488) - #rm -f $pkgdir/usr/share/perl5/core_perl/*.pod - #for d in $pkgdir/usr/share/perl5/core_perl/*; do - # if [ -d $d -a $(basename $d) != "pod" ]; then - # find $d -name *.pod -delete - # fi - #done - find $pkgdir/usr/lib -name *.pod -delete - find $pkgdir -name .packlist -delete + # Remove all pod files *except* those under /usr/share/perl5/core_perl/pod/ + # (FS#16488) + #rm -f $pkgdir/usr/share/perl5/core_perl/*.pod + #for d in $pkgdir/usr/share/perl5/core_perl/*; do + # if [ -d $d -a $(basename $d) != "pod" ]; then + # find $d -name *.pod -delete + # fi + #done + find $pkgdir/usr/lib -name *.pod -delete + find $pkgdir -name .packlist -delete } diff --git a/pkgfile/PKGBUILD b/pkgfile/PKGBUILD index deec51d0..c8dbaa63 100644 --- a/pkgfile/PKGBUILD +++ b/pkgfile/PKGBUILD @@ -11,33 +11,33 @@ license=('MIT') depends=('libarchive' 'curl' 'pcre' 'pacman') options=('emptydirs') source=("http://code.falconindy.com/archive/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig} - 'fix-msys-build.patch') + 'fix-msys-build.patch') install=pkgfile.install md5sums=('7b4e20bf3ec6604cd439d5acd6ca871d' 'SKIP' '7f8bb120e211d8a9605a1ec77029131b') prepare() { - cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i ${srcdir}/fix-msys-build.patch + cd "$srcdir/$pkgname-$pkgver" + patch -p1 -i ${srcdir}/fix-msys-build.patch } build() { - [[ -d "$srcdir/build-${CHOST}" ]] && rm -rf "$srcdir/build-${CHOST}" - mkdir "$srcdir/build-${CHOST}" && cd "$srcdir/build-${CHOST}" - #cd "$pkgname-$pkgver" + [[ -d "$srcdir/build-${CHOST}" ]] && rm -rf "$srcdir/build-${CHOST}" + mkdir "$srcdir/build-${CHOST}" && cd "$srcdir/build-${CHOST}" + #cd "$pkgname-$pkgver" - ../$pkgname-$pkgver/configure - make + ../$pkgname-$pkgver/configure + make - # generate a license file - sed '/\*\//q' $srcdir/$pkgname-$pkgver/src/pkgfile.c >LICENSE + # generate a license file + sed '/\*\//q' $srcdir/$pkgname-$pkgver/src/pkgfile.c >LICENSE } package() { - cd "$srcdir/build-${CHOST}" + cd "$srcdir/build-${CHOST}" - make DESTDIR="$pkgdir" install - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - mv "$pkgdir/var" "$pkgdir/usr/" + make DESTDIR="$pkgdir" install + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + mv "$pkgdir/var" "$pkgdir/usr/" } diff --git a/python2/PKGBUILD b/python2/PKGBUILD index 7771c3a8..8e375821 100644 --- a/python2/PKGBUILD +++ b/python2/PKGBUILD @@ -15,22 +15,22 @@ makedepends=('libbz2-devel' 'openssl-devel' 'zlib-devel' 'libexpat-devel' 'libsq conflicts=('python<3') options=('!makeflags') source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz - Python-2.7.5-reorder-bininstall-ln-symlink-creation.patch - python-2.7.5-msys2.patch - Python-2.7.5-fix-sqlite-module.patch - 2.7.5-tkinter-x11.patch - 2.7.5-ssl-threads.patch - 2.7.5-no-libm.patch - 2.7.5-ncurses-abi6.patch - 2.7.5-getpath-exe-extension.patch - 2.7.5-FD_SETSIZE.patch - 2.7.5-export-PySignal_SetWakeupFd.patch - 2.7.5-export-PyNode_SizeOf.patch - 2.7.5-dylib.patch - 2.7.5-dbm.patch - 2.7.5-ctypes-util-find_library.patch - 2.7.5-allow-windows-paths-for-executable.patch - 2.7.6-allow-win-drives-in-os-path-isabs.patch) + Python-2.7.5-reorder-bininstall-ln-symlink-creation.patch + python-2.7.5-msys2.patch + Python-2.7.5-fix-sqlite-module.patch + 2.7.5-tkinter-x11.patch + 2.7.5-ssl-threads.patch + 2.7.5-no-libm.patch + 2.7.5-ncurses-abi6.patch + 2.7.5-getpath-exe-extension.patch + 2.7.5-FD_SETSIZE.patch + 2.7.5-export-PySignal_SetWakeupFd.patch + 2.7.5-export-PyNode_SizeOf.patch + 2.7.5-dylib.patch + 2.7.5-dbm.patch + 2.7.5-ctypes-util-find_library.patch + 2.7.5-allow-windows-paths-for-executable.patch + 2.7.6-allow-win-drives-in-os-path-isabs.patch) sha1sums=('8321636af2acbeaa68fc635d7dda7369ed446a80' '76474752d5b84ad78d53f418d554b5c706fcbca7' '2b5f115573d089801f023c16bacc08963f039272' @@ -96,17 +96,17 @@ build() { export OPT="${CFLAGS}" ./configure --build=${CHOST} \ - --prefix=/usr \ - --enable-shared \ - --enable-ipv6 \ - --with-libc= \ - --with-libm= \ - --with-system-expat \ - --with-system-ffi \ - --with-threads \ - ac_cv_func_bind_textdomain_codeset=yes \ - CPPFLAGS="${CPPFLAGS} -I/usr/include/ncursesw" \ - LDFLAGS="${LDFLAGS} -L." + --prefix=/usr \ + --enable-shared \ + --enable-ipv6 \ + --with-libc= \ + --with-libm= \ + --with-system-expat \ + --with-system-ffi \ + --with-threads \ + ac_cv_func_bind_textdomain_codeset=yes \ + CPPFLAGS="${CPPFLAGS} -I/usr/include/ncursesw" \ + LDFLAGS="${LDFLAGS} -L." make } diff --git a/python3/PKGBUILD b/python3/PKGBUILD index 73003417..e6a7eda8 100644 --- a/python3/PKGBUILD +++ b/python3/PKGBUILD @@ -16,25 +16,25 @@ provides=('python3') replaces=('python3') options=('!makeflags') source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz - 3.3-ctypes-libpython.patch - 3.3-ctypes-util-find_library.patch - 3.3-cygwin-soname.patch - 3.3-dbm.patch - 3.3-distutils-shlibext.patch - 3.3-enable-new-dtags.patch - 3.3-export-PyNode_SizeOf.patch - 3.3-export-PySignal_SetWakeupFd.patch - 3.3-fix-PyAPI-declaration.patch - 3.3-ncurses-abi6.patch - 3.3-PATH_MAX.patch - 3.3-pep3149.patch - 3.3-ssl-threads.patch - 3.3-thread-cygwin64.patch - 3.3-tkinter.patch - 3.3.2-allow-windows-paths-for-executable.patch - 3.3.2-cygwin-siginfo.patch - python-3.3.2-msys2.patch - 3.3.3-allow-win-drives-in-os-path-isabs.patch) + 3.3-ctypes-libpython.patch + 3.3-ctypes-util-find_library.patch + 3.3-cygwin-soname.patch + 3.3-dbm.patch + 3.3-distutils-shlibext.patch + 3.3-enable-new-dtags.patch + 3.3-export-PyNode_SizeOf.patch + 3.3-export-PySignal_SetWakeupFd.patch + 3.3-fix-PyAPI-declaration.patch + 3.3-ncurses-abi6.patch + 3.3-PATH_MAX.patch + 3.3-pep3149.patch + 3.3-ssl-threads.patch + 3.3-thread-cygwin64.patch + 3.3-tkinter.patch + 3.3.2-allow-windows-paths-for-executable.patch + 3.3.2-cygwin-siginfo.patch + python-3.3.2-msys2.patch + 3.3.3-allow-win-drives-in-os-path-isabs.patch) sha1sums=('af4e75a34bd538c79b9871227c2e7f56569ac107' 'd1bef43a80fbc99524fe599dabb84977fc4f458d' '92109d70e398605c075cd969a89a7f16abd1ce59' @@ -92,18 +92,18 @@ build() { cd "${srcdir}/Python-${pkgver}" ./configure --build=${CHOST} \ - --prefix=/usr \ - --build=$MY_TARGET \ - --enable-shared \ - --enable-ipv6 \ - --with-libc= \ - --with-libm= \ - --with-system-expat \ - --with-system-ffi \ - ac_cv_func_bind_textdomain_codeset=yes \ - --with-threads \ - CPPFLAGS="${CPPFLAGS} -I/usr/include/ncursesw" \ - LDFLAGS="${LDFLAGS} -L." + --prefix=/usr \ + --build=$MY_TARGET \ + --enable-shared \ + --enable-ipv6 \ + --with-libc= \ + --with-libm= \ + --with-system-expat \ + --with-system-ffi \ + ac_cv_func_bind_textdomain_codeset=yes \ + --with-threads \ + CPPFLAGS="${CPPFLAGS} -I/usr/include/ncursesw" \ + LDFLAGS="${LDFLAGS} -L." make } diff --git a/rcs/PKGBUILD b/rcs/PKGBUILD index 9a772d75..785c9252 100644 --- a/rcs/PKGBUILD +++ b/rcs/PKGBUILD @@ -9,7 +9,7 @@ license=('GPL3') arch=('i686' 'x86_64') groups=('base-devel') source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz" - rcs-5.8.1-msys2.patch) + rcs-5.8.1-msys2.patch) sha1sums=('5972a7f97ab307e775083144cdf6b425c4aba7fe' '386363b5866e3331d351c1dd60289765cdfe06f9') @@ -22,17 +22,17 @@ prepare() { } build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --build=${CHOST} --prefix=/usr - make + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --build=${CHOST} --prefix=/usr + make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check + cd "${srcdir}/${pkgname}-${pkgver}" + make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make prefix="${pkgdir}/usr" install + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix="${pkgdir}/usr" install } diff --git a/readline/PKGBUILD b/readline/PKGBUILD index 5581cb84..fbe0111e 100644 --- a/readline/PKGBUILD +++ b/readline/PKGBUILD @@ -17,8 +17,8 @@ makedepends=('ncurses-devel') options=('!emptydirs') install=readline.install source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz{,.sig} - readline-6.3-cygwin.patch - readline-6.3-msys2.patch) + readline-6.3-cygwin.patch + readline-6.3-msys2.patch) if [ $_patchlevel -gt 00 ]; then for (( p=1; p<=$((10#${_patchlevel})); p++ )); do source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//./}-$(printf "%03d" $p){,.sig}) @@ -40,45 +40,45 @@ md5sums=('33c8fb279e981274f485fd91da77e94a' 'SKIP') prepare() { - cd ${srcdir}/${pkgbase}-$_basever - for (( p=1; p<=$((10#${_patchlevel})); p++ )); do - msg "applying patch readline${_basever//./}-$(printf "%03d" $p)" - patch -p0 -i $srcdir/readline${_basever//./}-$(printf "%03d" $p) - done - patch -p1 -i $srcdir/readline-6.3-cygwin.patch - patch -p1 -i $srcdir/readline-6.3-msys2.patch + cd ${srcdir}/${pkgbase}-$_basever + for (( p=1; p<=$((10#${_patchlevel})); p++ )); do + msg "applying patch readline${_basever//./}-$(printf "%03d" $p)" + patch -p0 -i $srcdir/readline${_basever//./}-$(printf "%03d" $p) + done + patch -p1 -i $srcdir/readline-6.3-cygwin.patch + patch -p1 -i $srcdir/readline-6.3-msys2.patch } build() { - cd ${srcdir}/${pkgbase}-$_basever + cd ${srcdir}/${pkgbase}-$_basever - # Remove RPATH from shared objects (FS#14366) - sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf + # Remove RPATH from shared objects (FS#14366) + sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf - ./configure \ - --prefix=/usr \ - --build=${CHOST} \ - --host=${CHOST} \ - --with-curses \ - bash_cv_termcap_lib=libncurses - make VERBOSE=1 + ./configure \ + --prefix=/usr \ + --build=${CHOST} \ + --host=${CHOST} \ + --with-curses \ + bash_cv_termcap_lib=libncurses + make VERBOSE=1 - make DESTDIR=$srcdir/dest install + make DESTDIR=$srcdir/dest install } package_libreadline() { - mkdir -p ${pkgdir}/usr - cp -rf $srcdir/dest/usr/bin ${pkgdir}/usr/ - cp -rf $srcdir/dest/usr/share ${pkgdir}/usr/ + mkdir -p ${pkgdir}/usr + cp -rf $srcdir/dest/usr/bin ${pkgdir}/usr/ + cp -rf $srcdir/dest/usr/share ${pkgdir}/usr/ } package_libreadline-devel() { - groups=('development') - options=('!staticlibs') - depends=("libreadline=${pkgver}") - pkgdesc="readline headers and libraries" + groups=('development') + options=('!staticlibs') + depends=("libreadline=${pkgver}") + pkgdesc="readline headers and libraries" - mkdir -p ${pkgdir}/usr - cp -rf $srcdir/dest/usr/include ${pkgdir}/usr/ - cp -rf $srcdir/dest/usr/lib ${pkgdir}/usr/ + mkdir -p ${pkgdir}/usr + cp -rf $srcdir/dest/usr/include ${pkgdir}/usr/ + cp -rf $srcdir/dest/usr/lib ${pkgdir}/usr/ } diff --git a/rebase/PKGBUILD b/rebase/PKGBUILD index b80da1c3..2cd969f5 100644 --- a/rebase/PKGBUILD +++ b/rebase/PKGBUILD @@ -12,34 +12,34 @@ depends=('msys2-runtime' 'dash') makedepends=('coreutils' 'grep' 'gzip' 'sed') source=(rebase-4.4.1.tar.bz2 'rebase-4.4.0-msys2.patch' - 'autorebase.bat' - rebaseall-add-python-exts.patch) + 'autorebase.bat' + rebaseall-add-python-exts.patch) sha1sums=('8f60d206e708b4ad77eb3223601637b5b3205021' '0df8af56cda5f1512798f8d4c216b684bcad5554' 'e25b323bda0e71fd7cda44c42be3945052d809c9' '03f69430fba022ba968be7493705786d15ece79b') prepare() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i $srcdir/rebase-4.4.0-msys2.patch - patch -p1 -i $srcdir/rebaseall-add-python-exts.patch - autoreconf -fi + patch -p1 -i $srcdir/rebase-4.4.0-msys2.patch + patch -p1 -i $srcdir/rebaseall-add-python-exts.patch + autoreconf -fi } build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - CXXFLAGS="-static -static-libgcc -static-libstdc++" \ - CFLAGS="-static -static-libgcc" - make + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + CXXFLAGS="-static -static-libgcc -static-libstdc++" \ + CFLAGS="-static -static-libgcc" + make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-$pkgver" - make DESTDIR=${pkgdir} install - cp -f ${srcdir}/autorebase.bat ${pkgdir}/usr + make DESTDIR=${pkgdir} install + cp -f ${srcdir}/autorebase.bat ${pkgdir}/usr } diff --git a/ruby/PKGBUILD b/ruby/PKGBUILD index d4a9a634..75b0ea8e 100644 --- a/ruby/PKGBUILD +++ b/ruby/PKGBUILD @@ -10,7 +10,7 @@ makedepends=('openssl' 'libffi' 'doxygen' 'libyaml') options=('!emptydirs' '!makeflags' 'staticlibs') source=("http://cache.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2" 'gemrc' - 'ruby-2.0.0-p353-msys2-full.patch') + 'ruby-2.0.0-p353-msys2-full.patch') md5sums=('20eb8f067d20f6b76b7e16cce2a85a55' '6fb8e7a09955e0f64be3158fb4a27e7a' '7988176faee0b07dd9bd2370c0ed3b84') @@ -27,7 +27,7 @@ build() { PKG_CONFIG=/usr/bin/pkg-config ./configure \ --build=${CHOST} \ - --prefix=/usr \ + --prefix=/usr \ --sysconfdir=/etc \ --enable-shared \ --enable-shared \ diff --git a/scons/PKGBUILD b/scons/PKGBUILD index 4d9a0656..2163aa7f 100644 --- a/scons/PKGBUILD +++ b/scons/PKGBUILD @@ -10,8 +10,8 @@ url="http://scons.org" license=('MIT') depends=('python2') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" - cygwin-use_usr_bin.patch - scons-2.3.1-cyglink-msys2.patch) + cygwin-use_usr_bin.patch + scons-2.3.1-cyglink-msys2.patch) md5sums=('60a3cfb98b661df9f4406c61b5686bd7' 'e1f81fdd3b0748674d982b2ecbc379c5' '913e9adcbb5a738a4cc33798d05441db') diff --git a/serf/PKGBUILD b/serf/PKGBUILD index afe4190d..aae16768 100644 --- a/serf/PKGBUILD +++ b/serf/PKGBUILD @@ -13,9 +13,9 @@ depends=('apr-util') makedepends=('scons') options=('staticlibs') source=(http://serf.googlecode.com/svn/src_releases/${pkgbase}-${pkgver}.tar.bz2 - 03-destdir.patch - 05-disable-SHLIBVERSION.patch - 06-strcasecmp.patch) + 03-destdir.patch + 05-disable-SHLIBVERSION.patch + 06-strcasecmp.patch) md5sums=('9820da2c46ee10773309f0de657cddfd' 'cb0cc5190fc77c349a8a3ccc0892bc37' '4ef49148ee9e19bb718de41294b5643c' @@ -33,7 +33,7 @@ build() { cd ${pkgbase}-${pkgver} scons PREFIX=/usr \ CFLAGS="${CFLAGS}" - + install -d "${srcdir}/dest/usr" scons DESTDIR="${srcdir}/dest" install diff --git a/sqlite/PKGBUILD b/sqlite/PKGBUILD index b0eda71a..bcd86d78 100644 --- a/sqlite/PKGBUILD +++ b/sqlite/PKGBUILD @@ -13,12 +13,12 @@ url="http://www.sqlite.org/" depends=('libreadline' 'icu' 'zlib') makedepends=('libreadline-devel' 'icu-devel' 'zlib-devel') source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA) - http://www.sqlite.org/2014/sqlite-autoconf-$_amalgamationver.tar.gz - http://www.sqlite.org/2014/sqlite-doc-${_docver}.zip - license.txt - 'sqlite-3.8.0.1-msys2.patch' - 'sqlite3-3.8.3-2.src.patch' - 'sqlite-3.8.3-cygwin-need-_XOPEN_SORCE.patch') + http://www.sqlite.org/2014/sqlite-autoconf-$_amalgamationver.tar.gz + http://www.sqlite.org/2014/sqlite-doc-${_docver}.zip + license.txt + 'sqlite-3.8.0.1-msys2.patch' + 'sqlite3-3.8.3-2.src.patch' + 'sqlite-3.8.3-cygwin-need-_XOPEN_SORCE.patch') options=('!libtool' '!emptydirs') sha1sums=('c2a21d71d0c7dc3af71cf90f04dfd22ecfb280c2' '199c977b948d3e6b9b0b165cb661275e0856d38e' @@ -37,38 +37,38 @@ prepare() { } build() { - export CPPFLAGS="$CPPFLAGS \ - -DHAVE_MALLOC_H \ - -DHAVE_MALLOC_USABLE_SIZE \ - -DSQLITE_DEFAULT_FILE_FORMAT=4 \ - -DSQLITE_ENABLE_COLUMN_METADATA=1 \ - -DSQLITE_ENABLE_EXPLAIN_COMMENTS=1 \ - -DSQLITE_ENABLE_FTS3=1 \ - -DSQLITE_ENABLE_FTS4=1 \ - -DSQLITE_ENABLE_LOCKING_STYLE=1 \ - -DSQLITE_ENABLE_RTREE=1 \ - -DSQLITE_ENABLE_SQLLOG=1 \ - -DSQLITE_ENABLE_STAT4=1 \ - -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 \ - -DSQLITE_OS_UNIX=1 \ - -DSQLITE_OS_WIN=1 \ - -DSQLITE_SOUNDEX=1 \ - -DSQLITE_WIN32_NO_ANSI=1 \ - -DSQLITE_WINNT_MAX_PATH_CHARS=4096" + export CPPFLAGS="$CPPFLAGS \ + -DHAVE_MALLOC_H \ + -DHAVE_MALLOC_USABLE_SIZE \ + -DSQLITE_DEFAULT_FILE_FORMAT=4 \ + -DSQLITE_ENABLE_COLUMN_METADATA=1 \ + -DSQLITE_ENABLE_EXPLAIN_COMMENTS=1 \ + -DSQLITE_ENABLE_FTS3=1 \ + -DSQLITE_ENABLE_FTS4=1 \ + -DSQLITE_ENABLE_LOCKING_STYLE=1 \ + -DSQLITE_ENABLE_RTREE=1 \ + -DSQLITE_ENABLE_SQLLOG=1 \ + -DSQLITE_ENABLE_STAT4=1 \ + -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 \ + -DSQLITE_OS_UNIX=1 \ + -DSQLITE_OS_WIN=1 \ + -DSQLITE_SOUNDEX=1 \ + -DSQLITE_WIN32_NO_ANSI=1 \ + -DSQLITE_WINNT_MAX_PATH_CHARS=4096" - # build sqlite - cd "$srcdir"/sqlite-autoconf-$_amalgamationver - ./configure --build=${CHOST} --prefix=/usr \ - --disable-static - make + # build sqlite + cd "$srcdir"/sqlite-autoconf-$_amalgamationver + ./configure --build=${CHOST} --prefix=/usr \ + --disable-static + make - make DESTDIR=${srcdir}/dest install + make DESTDIR=${srcdir}/dest install - # build the tcl extension - #cd "$srcdir"/sqlite-autoconf-$_amalgamationver/tea - #./configure --prefix=/usr \ - #--with-system-sqlite - #make + # build the tcl extension + #cd "$srcdir"/sqlite-autoconf-$_amalgamationver/tea + #./configure --prefix=/usr \ + #--with-system-sqlite + #make } package_sqlite() { diff --git a/subversion/PKGBUILD b/subversion/PKGBUILD index d0076ac8..bb812c9e 100644 --- a/subversion/PKGBUILD +++ b/subversion/PKGBUILD @@ -18,24 +18,24 @@ options=('!makeflags' '!libtool' '!emptydirs') noextract=("subversion-${pkgver}.tar.bz2") source=(http://www.apache.org/dist/subversion/subversion-${pkgver}.tar.bz2{,.asc} svnclean - 01-make-build-directories.patch - 02-fix-linking.patch - 03-fix-linking-perl.patch - 04-fix-switch-tests.patch - 05-retry-loop.patch - 06-svnadmin-binary-mode.patch - 07-fix-path-tests.patch - 08-ruby-test-fix.patch - 09-wincrypt.patch - 10-perl-vendors.patch - 11-XFAIL-case-sensitive-move-tests.patch - 12-fix-svnlook-test.patch - 14-dso_open.patch - 14-fix_svnauthz_tests.patch - 15-XFAIL_case_sensitive_tree_conflict.patch - 16-XFAIL_sqlite3_temp_table_tests.patch - subversion-1.8.0-msys2.patch - remove-checking-symlink.patch) + 01-make-build-directories.patch + 02-fix-linking.patch + 03-fix-linking-perl.patch + 04-fix-switch-tests.patch + 05-retry-loop.patch + 06-svnadmin-binary-mode.patch + 07-fix-path-tests.patch + 08-ruby-test-fix.patch + 09-wincrypt.patch + 10-perl-vendors.patch + 11-XFAIL-case-sensitive-move-tests.patch + 12-fix-svnlook-test.patch + 14-dso_open.patch + 14-fix_svnauthz_tests.patch + 15-XFAIL_case_sensitive_tree_conflict.patch + 16-XFAIL_sqlite3_temp_table_tests.patch + subversion-1.8.0-msys2.patch + remove-checking-symlink.patch) md5sums=('db04a587c68e38da6d0e342e6508f514' 'SKIP' '07ee0cb01bdf8468cb8d4c22c0d6bc04' @@ -68,7 +68,7 @@ prepare() { sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ tools/hook-scripts/{,mailer/{,tests/}}*.py \ - tools/client-side/mergeinfo-sanitizer.py + tools/client-side/mergeinfo-sanitizer.py sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gen-make.py build/getversion.py sed -i 's|except IOError,|except IOError as|' build/getversion.py @@ -105,26 +105,26 @@ build() { --without-gnome-keyring \ --enable-shared --disable-static \ --with-ruby-sitedir=/usr/lib/ruby/vendor_ruby \ - --enable-disallowing-of-undefined-references \ - --enable-local-library-preloading \ + --enable-disallowing-of-undefined-references \ + --enable-local-library-preloading \ #make LT_LDFLAGS="-L$Fdestdir/usr/lib" # make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ # swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl swig-rb - - - make clean-swig - make autogen-swig - make all + + + make clean-swig + make autogen-swig + make all - plain "Compiling swig bindings: ruby" - make swig-rb + plain "Compiling swig bindings: ruby" + make swig-rb - plain "Compiling swig bindings: perl" - make swig-pl + plain "Compiling swig bindings: perl" + make swig-pl - plain "Compiling swig bindings: python" - make swig-py swig_pydir=${PYTHON_SITELIB}/libsvn swig_pydir_extra=${PYTHON_SITELIB}/svn + plain "Compiling swig bindings: python" + make swig-py swig_pydir=${PYTHON_SITELIB}/libsvn swig_pydir_extra=${PYTHON_SITELIB}/svn } #check() { diff --git a/swig/PKGBUILD b/swig/PKGBUILD index bf6b5cfd..6f2d37e1 100644 --- a/swig/PKGBUILD +++ b/swig/PKGBUILD @@ -10,7 +10,7 @@ license=('custom') groups=('base-devel') depends=('zlib' 'libpcre') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz - swig-2.0.10-msys2.patch) + swig-2.0.10-msys2.patch) sha1sums=('10a1cc5ba6abbc7282b8146ccc0d8eefe233bfab' '2eddacacf7606aa0d9824bd5d7e5fa53f6b80d27') diff --git a/tzcode/PKGBUILD b/tzcode/PKGBUILD index 1d427ef0..d42d3b84 100644 --- a/tzcode/PKGBUILD +++ b/tzcode/PKGBUILD @@ -14,13 +14,13 @@ groups=('base') depends=('coreutils' 'gawk' 'sed') source=(http://www.iana.org/time-zones/repository/releases/${pkgname}${_ver}.tar.gz http://www.iana.org/time-zones/repository/releases/tzdata${_ver}.tar.gz - tzcode-makefile.patch - tzcode-makefile-exe-extensions.patch - tzcode-tzfile.patch - tzcode-cygwin.patch - tzcode-man1.patch - tzcode-man3.patch - tzcode-man8.patch) + tzcode-makefile.patch + tzcode-makefile-exe-extensions.patch + tzcode-tzfile.patch + tzcode-cygwin.patch + tzcode-man1.patch + tzcode-man3.patch + tzcode-man8.patch) sha1sums=('d5a8be5e2414c5f500de9ab2d3472009583ad9dc' 'be5ec909a9ee363a80dc88b2d1ae9690cacac4b2' '9d85e92e6fb8d823b48591508bcf77728dff2fa8' diff --git a/vim/PKGBUILD b/vim/PKGBUILD index 6e752e2c..1b40aad6 100644 --- a/vim/PKGBUILD +++ b/vim/PKGBUILD @@ -14,7 +14,7 @@ depends=('ncurses') groups=('editors') makedepends=('gawk' 'perl' 'python2' 'python3' 'ruby' 'mercurial' 'libiconv') source=(#"${pkgname}-${pkgver}"::"hg+http://vim.googlecode.com/hg/vim#tag=v${pkgver//./-}" - "${pkgname}-${pkgver}.tar.xz" + "${pkgname}-${pkgver}.tar.xz" "${pkgname}-${pkgver}.tar.xz.sig" 'dot.vimrc' 7.3-cygwin-mouse.patch @@ -67,7 +67,7 @@ prepare() { patch -p2 -i ${srcdir}/7.3-cygwin-mouse.patch patch -p2 -i ${srcdir}/7.3-virc.patch patch -p2 -i ${srcdir}/7.3-cygwin-python-dyn.patch - + # define the place for the global (g)vimrc file (set to /etc/vimrc) #sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' \ # vim-build/src/feature.h @@ -82,45 +82,45 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} # ./configure \ - # --prefix=/usr \ - # --build=${CHOST} \ - # --with-features=small \ - # --with-tlib=ncursesw \ - # --enable-multibyte \ - # --disable-luainterp \ - # --disable-perlinterp \ - # --disable-pythoninterp \ - # --disable-python3interp \ - # --disable-rubyinterp \ - # --disable-tclinterp \ - # --disable-gpm --disable-sysmouse \ - # --disable-gui --without-x \ - # --with-compiledby="" - # make auto/osdef.h - # make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/vim${slot/\.} || die "make 2 fail" - # mv vim.exe vi.exe - # make distclean - + # --prefix=/usr \ + # --build=${CHOST} \ + # --with-features=small \ + # --with-tlib=ncursesw \ + # --enable-multibyte \ + # --disable-luainterp \ + # --disable-perlinterp \ + # --disable-pythoninterp \ + # --disable-python3interp \ + # --disable-rubyinterp \ + # --disable-tclinterp \ + # --disable-gpm --disable-sysmouse \ + # --disable-gui --without-x \ + # --with-compiledby="" + # make auto/osdef.h + # make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/vim${slot/\.} || die "make 2 fail" + # mv vim.exe vi.exe + # make distclean + ./configure \ - --prefix=/usr \ - --build=${CHOST} \ - --with-features=huge \ - --with-tlib=ncursesw \ - --enable-cscope \ - --enable-multibyte \ - --enable-luainterp=dynamic \ - --enable-perlinterp=dynamic \ - --enable-pythoninterp=dynamic \ - --enable-python3interp=dynamic \ - --enable-rubyinterp=dynamic \ - --disable-tclinterp \ - --disable-gpm --disable-sysmouse \ - --disable-gui --without-x \ - CPPFLAGS="${CPPFLAGS} -I/usr/include/ncursesw" \ - --with-compiledby="" + --prefix=/usr \ + --build=${CHOST} \ + --with-features=huge \ + --with-tlib=ncursesw \ + --enable-cscope \ + --enable-multibyte \ + --enable-luainterp=dynamic \ + --enable-perlinterp=dynamic \ + --enable-pythoninterp=dynamic \ + --enable-python3interp=dynamic \ + --enable-rubyinterp=dynamic \ + --disable-tclinterp \ + --disable-gpm --disable-sysmouse \ + --disable-gui --without-x \ + CPPFLAGS="${CPPFLAGS} -I/usr/include/ncursesw" \ + --with-compiledby="" - #make auto/osdef.h - make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/vim${_topver/\.} + #make auto/osdef.h + make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/vim${_topver/\.} } check() { diff --git a/which/PKGBUILD b/which/PKGBUILD index 6f45fa1f..1ad1968b 100644 --- a/which/PKGBUILD +++ b/which/PKGBUILD @@ -16,24 +16,24 @@ md5sums=('95be0501a466e515422cde4af46b2744' '9315cae265dd34eaf7aae9a23ac1840e') prepare() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -p1 -i ${srcdir}/am-1.14.all.patch + cd ${srcdir}/${pkgname}-${pkgver} + patch -p1 -i ${srcdir}/am-1.14.all.patch } build() { - [[ -d ${srcdir}/build-${CHOST} ]] && rm -rf ${srcdir}/build-${CHOST} - mkdir ${srcdir}/build-${CHOST} && cd ${srcdir}/build-${CHOST} - - ../${pkgname}-${pkgver}/configure \ - --prefix=/usr \ - --build=${CHOST} \ - --host=${CHOST} \ - --target=${CHOST} - - make + [[ -d ${srcdir}/build-${CHOST} ]] && rm -rf ${srcdir}/build-${CHOST} + mkdir ${srcdir}/build-${CHOST} && cd ${srcdir}/build-${CHOST} + + ../${pkgname}-${pkgver}/configure \ + --prefix=/usr \ + --build=${CHOST} \ + --host=${CHOST} \ + --target=${CHOST} + + make } package() { - cd ${srcdir}/build-${CHOST} - make install DESTDIR=${pkgdir} + cd ${srcdir}/build-${CHOST} + make install DESTDIR=${pkgdir} } diff --git a/xz/PKGBUILD b/xz/PKGBUILD index 105abdab..3d256990 100644 --- a/xz/PKGBUILD +++ b/xz/PKGBUILD @@ -22,12 +22,12 @@ prepare() { } build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver} - ./configure --build=${CHOST} \ + ./configure --build=${CHOST} \ --prefix=/usr - make - make DESTDIR="${srcdir}/dest" install + make + make DESTDIR="${srcdir}/dest" install } check() { diff --git a/yaml/PKGBUILD b/yaml/PKGBUILD index a63e4e45..fca3961f 100644 --- a/yaml/PKGBUILD +++ b/yaml/PKGBUILD @@ -8,8 +8,8 @@ arch=('i686' 'x86_64') url="http://pyyaml.org/wiki/LibYAML" license=('MIT') source=(http://pyyaml.org/download/libyaml/yaml-$pkgver.tar.gz - 'yaml-0.1.4-fix-undefined.patch' - 'yaml-0.1.4-msys2.patch') + 'yaml-0.1.4-fix-undefined.patch' + 'yaml-0.1.4-msys2.patch') md5sums=('36c852831d02cf90508c29852361d01b' 'a95f36e309521dbfed5aaf177d47ce00' 'a8d5375a23b85daed680f37a7a48ddc0') diff --git a/zlib/PKGBUILD b/zlib/PKGBUILD index cffe5422..941198bb 100644 --- a/zlib/PKGBUILD +++ b/zlib/PKGBUILD @@ -10,7 +10,7 @@ license=('custom') url="http://www.zlib.net/" depends=('') source=(#"http://zlib.net/current/zlib-${pkgver}.tar.gz" - "http://sourceforge.net/projects/libpng/files/zlib/${pkgver}/zlib-${pkgver}.tar.gz" + "http://sourceforge.net/projects/libpng/files/zlib/${pkgver}/zlib-${pkgver}.tar.gz" 1.2.7-minizip-cygwin.patch 1.2.7-zlib-symbols.patch zlib-1.2.8-msys2.patch) @@ -20,12 +20,12 @@ md5sums=('44d667c142d7cda120332623eab69f40' '4f9254af5ffd4e3fdf06c3599b5d326b') prepare() { - cd ${srcdir}/${pkgname}-${pkgver} - grep -A 24 '^ Copyright' zlib.h > LICENSE - - patch -p2 -i ${srcdir}/1.2.7-minizip-cygwin.patch - patch -p2 -i ${srcdir}/1.2.7-zlib-symbols.patch - patch -p1 -i ${srcdir}/zlib-1.2.8-msys2.patch + cd ${srcdir}/${pkgname}-${pkgver} + grep -A 24 '^ Copyright' zlib.h > LICENSE + + patch -p2 -i ${srcdir}/1.2.7-minizip-cygwin.patch + patch -p2 -i ${srcdir}/1.2.7-zlib-symbols.patch + patch -p1 -i ${srcdir}/zlib-1.2.8-msys2.patch } build() { @@ -53,7 +53,7 @@ package_zlib-devel() { groups=('development') options=('staticlibs') # needed by binutils testsuite depends=("zlib=${pkgver}") - + mkdir -p ${pkgdir}/usr cp -rf $srcdir/dest/usr/include ${pkgdir}/usr/ cp -rf $srcdir/dest/usr/lib ${pkgdir}/usr/