svn commit: r414585 - in head/emulators/i386-wine-devel: . files

[David Naylor]

Author: dbn
Date: Wed May  4 06:10:36 2016
New Revision: 414585
URL: https://svnweb.freebsd.org/changeset/ports/414585

Log:
  emulators/i386-wine-devel: update to 1.9.9
  
  Changes:
   - fix: faulty assumption in plists merge script: the first plist may not
          always be peekable.

Modified:
  head/emulators/i386-wine-devel/Makefile.inc
  head/emulators/i386-wine-devel/distinfo
  head/emulators/i386-wine-devel/files/mergeplist.py

Modified: head/emulators/i386-wine-devel/Makefile.inc
==============================================================================
--- head/emulators/i386-wine-devel/Makefile.inc	Wed May  4 05:56:29 2016	(r414584)
+++ head/emulators/i386-wine-devel/Makefile.inc	Wed May  4 06:10:36 2016	(r414585)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wine
-PORTVERSION=	1.9.8
+PORTVERSION=	1.9.9
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	LOCAL/dbn/repos/wine/${DIST_SUBDIR}/

Modified: head/emulators/i386-wine-devel/distinfo
==============================================================================
--- head/emulators/i386-wine-devel/distinfo	Wed May  4 05:56:29 2016	(r414584)
+++ head/emulators/i386-wine-devel/distinfo	Wed May  4 06:10:36 2016	(r414585)
@@ -1,12 +1,12 @@
-SHA256 (freebsd:9:x86:64/i386-wine-devel-1.9.8,1.txz) = d2b5ee3986becbe7a8c53661588e8428384968a162b37167ac284c67606f1f08
-SIZE (freebsd:9:x86:64/i386-wine-devel-1.9.8,1.txz) = 39057180
-SHA256 (freebsd:9:x86:64/i386-wine-staging-1.9.8,1.txz) = d921c79c93349f4c36967f36fc3346fc94fd9ac220732b2c8e1197e3e3b7a24f
-SIZE (freebsd:9:x86:64/i386-wine-staging-1.9.8,1.txz) = 41742412
-SHA256 (freebsd:10:x86:64/i386-wine-devel-1.9.8,1.txz) = 843fcda863f261189e5f193eb0982d7cd7cf5db06b16c8fea9654b76fc9fd20b
-SIZE (freebsd:10:x86:64/i386-wine-devel-1.9.8,1.txz) = 39168180
-SHA256 (freebsd:10:x86:64/i386-wine-staging-1.9.8,1.txz) = 55ed08344fb90ce2ac69c5cf0cd432eae6951754d922093e927cd5f3f9a94e8f
-SIZE (freebsd:10:x86:64/i386-wine-staging-1.9.8,1.txz) = 41858004
-SHA256 (freebsd:11:x86:64/i386-wine-devel-1.9.8,1.txz) = f530c4ee3a2b2d1bc6963cb108c504126441a5540dab86293e28201f1f69263d
-SIZE (freebsd:11:x86:64/i386-wine-devel-1.9.8,1.txz) = 38735048
-SHA256 (freebsd:11:x86:64/i386-wine-staging-1.9.8,1.txz) = 627b6a388c66b314e49cae2881bf6cf3d0b7a5ee1c80bb68ff4f6e2915a890bb
-SIZE (freebsd:11:x86:64/i386-wine-staging-1.9.8,1.txz) = 41416612
+SHA256 (freebsd:9:x86:64/i386-wine-devel-1.9.9,1.txz) = 3e41676700b6bec7799a1ce1ef4daedb3d73d73e5d88567e347755c48f273c34
+SIZE (freebsd:9:x86:64/i386-wine-devel-1.9.9,1.txz) = 39102052
+SHA256 (freebsd:9:x86:64/i386-wine-staging-1.9.9,1.txz) = ad5799382d61bf46ad5dd8d96c437d96ec8610d0e08d14f6a1df55ad048cf92a
+SIZE (freebsd:9:x86:64/i386-wine-staging-1.9.9,1.txz) = 41791860
+SHA256 (freebsd:10:x86:64/i386-wine-devel-1.9.9,1.txz) = 549bee9b7db9bb3ccc66a24a50d0b6ff7565f3137ce0d3cc5515c17c141da994
+SIZE (freebsd:10:x86:64/i386-wine-devel-1.9.9,1.txz) = 39200140
+SHA256 (freebsd:10:x86:64/i386-wine-staging-1.9.9,1.txz) = dd1942cc76c6258267fe52892fdf6385a4fdab42f28bbed2d3b580763fe2eb38
+SIZE (freebsd:10:x86:64/i386-wine-staging-1.9.9,1.txz) = 41895200
+SHA256 (freebsd:11:x86:64/i386-wine-devel-1.9.9,1.txz) = 8094d7c5eed593ccca98218538b55784de23fe55d184f68a9afc3e0318e3dd1a
+SIZE (freebsd:11:x86:64/i386-wine-devel-1.9.9,1.txz) = 38768272
+SHA256 (freebsd:11:x86:64/i386-wine-staging-1.9.9,1.txz) = c5dc7dde83278a4a2ee9f9eb9d60f9bd1e6be1695939dcbe4cb02a6bcb92fc32
+SIZE (freebsd:11:x86:64/i386-wine-staging-1.9.9,1.txz) = 41441092

Modified: head/emulators/i386-wine-devel/files/mergeplist.py
==============================================================================
--- head/emulators/i386-wine-devel/files/mergeplist.py	Wed May  4 05:56:29 2016	(r414584)
+++ head/emulators/i386-wine-devel/files/mergeplist.py	Wed May  4 06:10:36 2016	(r414585)
@@ -101,8 +101,9 @@ def gen_list(plists):
             plists[i] = OrderedSet(line.strip() for line in file.readlines())
     empty = sum(len(plist) == 0 for plist in plists)
     while empty < plists_len:
-        line = plists[0].peek()
         # Test if the top of the plists are all common
+        if not empty:
+            line = plists[0].peek()
         if not empty and all(line == plist.peek() for plist in plists):
             yield line
             for plist in plists: