Fix package names

coreutils/PKGBUILD

@@ -8,7 +8,8 @@ arch=('i686' 'x86_64')
 license=('GPL3')
 url="http://www.gnu.org/software/coreutils"
 groups=('base')
-depends=('gmp' 'libiconv' 'libintl8')
+depends=('gmp' 'libiconv' 'libintl')
+makedepends=('gmp-devel' 'libiconv-devel' 'gettext-devel')
 install=${pkgname}.install
 source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
         coreutils-8.21-cygwin.patch

findutils/PKGBUILD

@@ -7,7 +7,8 @@ pkgdesc="GNU utilities to locate files"
 arch=('i686' 'x86_64')
 license=('GPL3')
 groups=('base')
-depends=('libiconv' 'libintl8')
+depends=('libiconv' 'libintl')
+makedepends=('libiconv-devel' 'gettext-devel')
 url="http://www.gnu.org/software/findutils"
 source=(http://mirror.lihnidos.org/GNU/alpha/gnu/findutils/${pkgname}-${pkgver}.tar.gz{,.sig}
         findutils-4.5.12-msys2.patch

flex/PKGBUILD

@@ -8,7 +8,7 @@ arch=('i686' 'x86_64')
 url="http://flex.sourceforge.net"
 license=('custom')
 groups=('base-devel')
-depends=('m4' 'sh' 'libiconv' 'libintl8')
+depends=('m4' 'sh' 'libiconv' 'libintl')
 makedepends=('libiconv-devel' 'gettext-devel')
 options=('staticlibs')
 install=flex.install

gettext/PKGBUILD

@@ -1,6 +1,6 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
-pkgname=('gettext' 'gettext-devel' 'libgettextpo0' 'libasprintf0' 'libintl8')
+pkgname=('gettext' 'gettext-devel' 'libgettextpo' 'libasprintf' 'libintl')
 pkgver=0.18.3.1
 pkgrel=1
 pkgdesc="GNU internationalization library"
@@ -85,7 +85,7 @@ package_gettext-devel() {
   cp -rf ${srcdir}/dest/usr/share/gettext ${pkgdir}/usr/share/
 }
 
-package_libintl8() {
+package_libintl() {
   pkgdesc="GNU Internationalization runtime library"
   groups=('libraries')
   
@@ -93,7 +93,7 @@ package_libintl8() {
   cp -f ${srcdir}/dest/usr/bin/msys-intl-8.dll ${pkgdir}/usr/bin/
 }
 
-package_libgettextpo0() {
+package_libgettextpo() {
   pkgdesc="GNU Internationalization runtime library"
   groups=('libraries')
   
@@ -101,7 +101,7 @@ package_libgettextpo0() {
   cp -f ${srcdir}/dest/usr/bin/msys-gettextpo-0.dll ${pkgdir}/usr/bin/
 }
 
-package_libasprintf0() {
+package_libasprintf() {
   pkgdesc="C-style formatted output in C++ (runtime)"
   groups=('libraries')
   

grep/PKGBUILD

@@ -8,7 +8,7 @@ arch=('i686' 'x86_64')
 license=('GPL3')
 url="http://www.gnu.org/software/grep/grep.html"
 groups=('base' 'base-devel')
-depends=('libiconv' 'libintl8' 'pcre' 'sh')
+depends=('libiconv' 'libintl' 'libpcre' 'sh')
 makedepends=('texinfo' 'gettext-devel' 'libiconv-devel' 'pcre-devel')
 install=${pkgname}.install
 source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}

less/PKGBUILD

@@ -8,7 +8,8 @@ license=('GPL3')
 arch=('i686' 'x86_64')
 url="http://www.greenwoodsoftware.com/less"
 groups=('base')
-depends=('ncurses' 'pcre')
+depends=('ncurses' 'libpcre')
+makedepends=('ncurses-devel' 'pcre-devel')
 source=(http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz{,.sig})
 md5sums=('935b38aa2e73c888c210dedf8fd94f49'
          'SKIP')

pcre/PKGBUILD

@@ -1,6 +1,6 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
-pkgname=('pcre' 'libpcre1' 'libpcre16_0' 'libpcre32_0' 'libpcrecpp0' 'libpcreposix0' 'libpcre-devel')
+pkgname=('pcre' 'libpcre1' 'libpcre16_0' 'libpcre32_0' 'libpcrecpp0' 'libpcreposix0' 'pcre-devel')
 pkgver=8.33
 pkgrel=1
 pkgdesc="A library that implements Perl 5-style regular expressions"
@@ -81,7 +81,7 @@ package_libpcreposix0() {
   cp -f ${srcdir}/dest/usr/bin/*pcreposix-0.dll ${pkgdir}/usr/bin/
 }
 
-package_libpcre-devel() {
+package_pcre-devel() {
   options=('staticlibs')
   
   mkdir -p ${pkgdir}/usr/bin

sed/PKGBUILD

@@ -8,7 +8,7 @@ arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/sed"
 license=('GPL3')
 groups=('base' 'base-devel')
-depends=('libintl8' 'sh')
+depends=('libintl' 'sh')
 makedepends=('gettext' 'gettext-develop')
 install=sed.install
 source=(ftp://ftp.gnu.org/pub/gnu/sed/${pkgname}-${pkgver}.tar.gz{,.sig}