yasm: Update to 1.3.0

yasm/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname=('yasm' 'yasm-devel')
-pkgver=1.2.0
+pkgver=1.3.0
 pkgrel=1
 pkgdesc="A rewrite of NASM to allow for multiple syntax supported (NASM, TASM, GAS, etc.)"
 arch=('i686' 'x86_64')
@@ -10,15 +10,15 @@ url="http://www.tortall.net/projects/yasm/"
 license=('BSD' 'GPL2' 'LGPL2.1' 'PerlArtistic')
 options=('staticlibs')
 source=(http://www.tortall.net/projects/yasm/releases/${pkgname}-${pkgver}.tar.gz
-        'yasm-1.2.0-1.src.patch'
-        'update-config-sub-guess.patch')
-sha1sums=('773d28f27f83c44ac35079add0d3167ca6c1def8'
-          '5a7dae77b2a1230e1d3a1123fcf63633d756c4d7'
-          '340b4b26cecca8f04ec977506f80d772b0123adb')
+        'msysize.patch'
+        'yasm-1.2.0-1.src.patch')
+sha1sums=('b7574e9f0826bedef975d64d3825f75fbaeef55e'
+          '11548c2ec879f6c026e01d8e0fc230fb14d65a8a'
+          '5a7dae77b2a1230e1d3a1123fcf63633d756c4d7')
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  patch -p1 -i ${srcdir}/update-config-sub-guess.patch
+  patch -p1 -i ${srcdir}/msysize.patch
   patch -p2 -i ${srcdir}/yasm-1.2.0-1.src.patch
   
   autoreconf -fi
@@ -28,18 +28,7 @@ build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --build=${CHOST}
   make
-}
-
-setup() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${destdir}" install
-  
-  cp -f ${destdir}/usr/bin/ytasm.exe ${destdir}/usr/bin/tasm.exe
-  
-  cp -f ${destdir}/usr/share/man/man1/ytasm.1 ${destdir}/usr/share/man/man1/tasm.1
-  cp -f ${destdir}/usr/share/man/man1/ytasm.1 ${destdir}/usr/share/man/man1/vsyasm.1
-  install -Dm644 COPYING "${destdir}/usr/share/licenses/yasm/LICENSE"
-  install -Dm644 BSD.txt "${destdir}/usr/share/licenses/yasm/BSD.txt"
+  make DESTDIR="${srcdir}/dest" install
 }
 
 check() {
@@ -50,13 +39,13 @@ check() {
 package_yasm() {
   mkdir -p ${pkgdir}/usr
   
-  cp -rf ${destdir}/usr/bin ${pkgdir}/usr/
-  cp -rf ${destdir}/usr/share ${pkgdir}/usr/
+  cp -rf ${srcdir}/dest/usr/bin ${pkgdir}/usr/
+  cp -rf ${srcdir}/dest/usr/share ${pkgdir}/usr/
 }
 
 package_yasm-devel() {
   mkdir -p ${pkgdir}/usr
   
-  cp -rf ${destdir}/usr/include ${pkgdir}/usr/
-  cp -rf ${destdir}/usr/lib ${pkgdir}/usr/
+  cp -rf ${srcdir}/dest/usr/include ${pkgdir}/usr/
+  cp -rf ${srcdir}/dest/usr/lib ${pkgdir}/usr/
 }

yasm/msysize.patch

@@ -0,0 +1,82 @@
+diff -Naur yasm-1.3.0-orig/config/compile yasm-1.3.0/config/compile
+--- yasm-1.3.0-orig/config/compile	2014-01-02 23:14:59.000000000 +0400
++++ yasm-1.3.0/config/compile	2014-08-15 22:28:14.555600000 +0400
+@@ -53,7 +53,7 @@
+ 	  MINGW*)
+ 	    file_conv=mingw
+ 	    ;;
+-	  CYGWIN*)
++	  CYGWIN*|MSYS*)
+ 	    file_conv=cygwin
+ 	    ;;
+ 	  *)
+@@ -67,7 +67,7 @@
+ 	mingw/*)
+ 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+ 	  ;;
+-	cygwin/*)
++	cygwin/*|msys/*)
+ 	  file=`cygpath -m "$file" || echo "$file"`
+ 	  ;;
+ 	wine/*)
+diff -Naur yasm-1.3.0-orig/config/config.guess yasm-1.3.0/config/config.guess
+--- yasm-1.3.0-orig/config/config.guess	2014-05-12 01:58:10.000000000 +0400
++++ yasm-1.3.0/config/config.guess	2014-08-15 22:28:46.114400000 +0400
+@@ -844,6 +844,9 @@
+     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ 	echo x86_64-unknown-cygwin
+ 	exit ;;
++    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
++	echo x86_64-unknown-msys
++	exit ;;
+     p*:CYGWIN*:*)
+ 	echo powerpcle-unknown-cygwin
+ 	exit ;;
+diff -Naur yasm-1.3.0-orig/config/config.rpath yasm-1.3.0/config/config.rpath
+--- yasm-1.3.0-orig/config/config.rpath	2014-08-10 22:39:19.000000000 +0400
++++ yasm-1.3.0/config/config.rpath	2014-08-15 22:30:10.136000000 +0400
+@@ -57,7 +57,7 @@
+     aix*)
+       wl='-Wl,'
+       ;;
+-    mingw* | cygwin* | pw32* | os2* | cegcc*)
++    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+       ;;
+     hpux9* | hpux10* | hpux11*)
+       wl='-Wl,'
+@@ -149,7 +149,7 @@
+ hardcode_minus_L=no
+ 
+ case "$host_os" in
+-  cygwin* | mingw* | pw32* | cegcc*)
++  cygwin* | msys* | mingw* | pw32* | cegcc*)
+     # FIXME: the MSVC++ port hasn't been tested in a loooong time
+     # When not using gcc, we currently assume that we are using
+     # Microsoft Visual C++.
+@@ -198,7 +198,7 @@
+         ld_shlibs=no
+       fi
+       ;;
+-    cygwin* | mingw* | pw32* | cegcc*)
++    cygwin* | msys* | mingw* | pw32* | cegcc*)
+       # hardcode_libdir_flag_spec is actually meaningless, as there is
+       # no search path for DLLs.
+       hardcode_libdir_flag_spec='-L$libdir'
+@@ -348,7 +348,7 @@
+       ;;
+     bsdi[45]*)
+       ;;
+-    cygwin* | mingw* | pw32* | cegcc*)
++    cygwin* | msys* | mingw* | pw32* | cegcc*)
+       # When not using gcc, we currently assume that we are using
+       # Microsoft Visual C++.
+       # hardcode_libdir_flag_spec is actually meaningless, as there is
+@@ -537,7 +537,7 @@
+   bsdi[45]*)
+     library_names_spec='$libname$shrext'
+     ;;
+-  cygwin* | mingw* | pw32* | cegcc*)
++  cygwin* | msys* | mingw* | pw32* | cegcc*)
+     shrext=.dll
+     library_names_spec='$libname.dll.a $libname.lib'
+     ;;