Merge branch '2.8' into 3.0

dnsmasq/.md5sum

@@ -1,3 +1,3 @@
 d1b2a1f31cea2c529358d7e73bcda6bd  dnsmasq
-2bbf1c7bf708abfed52e59101f796fe2  dnsmasq-2.64.tar.xz
+23b411df85291a0be4d2ce037fa4ac6f  dnsmasq-2.65.tar.xz
 7849643871a6de02fd04214fef307248  dnsmasq-config.patch

dnsmasq/Pkgfile

@@ -3,7 +3,7 @@
 # Maintainer:  Juergen Daubert, jue at crux dot nu
 
 name=dnsmasq
-version=2.64
+version=2.65
 release=1
 source=(http://www.thekelleys.org.uk/$name/$name-$version.tar.xz \
         $name-config.patch dnsmasq)

transmission-gtk/.md5sum

@@ -1 +1 @@
-86479f9bb378b793ce7a8a71f5b15904  transmission-2.72.tar.xz
+7eac652f7c5838c194a4077328fe6bf3  transmission-2.74.tar.xz

transmission-gtk/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on:  curl intltool gtk3 libevent
 
 name=transmission-gtk
-version=2.72
+version=2.74
 release=1
 source=(http://download.m0k.org/transmission/files/transmission-$version.tar.xz)
 

transmission/.md5sum

@@ -1 +1 @@
-86479f9bb378b793ce7a8a71f5b15904  transmission-2.72.tar.xz
+7eac652f7c5838c194a4077328fe6bf3  transmission-2.74.tar.xz

transmission/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on:  curl libevent
 
 name=transmission
-version=2.72
+version=2.74
 release=1
 source=(http://download.m0k.org/$name/files/$name-$version.tar.xz)
 

w3m/Pkgfile

@@ -14,11 +14,12 @@ build() {
 
     sed -i s/showaudio/mplayer/ config.h.in
     sed -i '836d' main.c # function type is void
+    sed -i 's/file_handle/file_foo/' istream.{c,h}
 
     ./configure \
         --prefix=/usr \
         --libexecdir=/usr/lib \
-  --mandir=/usr/man \
+        --mandir=/usr/man \
         --disable-image \
         --disable-gopher \
         --disable-japanese \