Remove unnecessary PLIST_SUBST and FILES_SUBST that are now provided

by the infrastructure.

Mark a couple more packages as not ready for python-3.x.

4 files changed, 31 insertions, 9 deletions

diff --git a/graphics/libv4l/Makefile b/graphics/libv4l/Makefile
index f1c5e2f1219..21475dc0df8 100644
--- a/graphics/libv4l/Makefile
+++ b/graphics/libv4l/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2015/03/17 13:55:40 jperkin Exp $
+# $NetBSD: Makefile,v 1.11 2016/08/28 15:48:32 wiz Exp $
 
 DISTNAME=	libv4l-0.4.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://people.atrpms.net/~hdegoede/
 
diff --git a/graphics/libv4l/distinfo b/graphics/libv4l/distinfo
index e9b33746795..71302c2ee1f 100644
--- a/graphics/libv4l/distinfo
+++ b/graphics/libv4l/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2015/11/03 21:34:09 agc Exp $
+$NetBSD: distinfo,v 1.14 2016/08/28 15:48:32 wiz Exp $
 
 SHA1 (libv4l-0.4.3.tar.gz) = 2539aa6b04650b97c9fc7ba95721f1e362a73031
 RMD160 (libv4l-0.4.3.tar.gz) = 4f0435d955f15602ac093385607417fab71deb17
@@ -9,10 +9,10 @@ SHA1 (patch-ab) = 5ade487d6d64d280f3fdae8afad99fbd0b6e5eda
 SHA1 (patch-ac) = 5457af836909f1c9f759c6a780daeb13968ec91f
 SHA1 (patch-ad) = 1d2568e49182efcbde47c14911b6a04e088b2578
 SHA1 (patch-ae) = 1bdefe4897c6edbe4049c52d963f1769bd916750
-SHA1 (patch-af) = b536fba33678e9b44ed22846344e523f92cd23ce
+SHA1 (patch-af) = 80ffb8b9aba0c80cac137f7755f1e7ac67a3d1e0
 SHA1 (patch-ah) = d32f2e6aa694d4f0d04e8afbf462b3e61a31bbcc
 SHA1 (patch-ai) = 8f22e4050d5e20981bfdd1fc51e572e42347c2b5
 SHA1 (patch-aj) = 521abdfba83a34716ce0909f75d784fe0b6ecc8a
 SHA1 (patch-ak) = 0465c3cc368609a3108f8d1aafcacf0ab3c61858
 SHA1 (patch-al) = 8d020ef01f9956b37f718a529306e5f13aaa03a3
-SHA1 (patch-am) = 23d75eb7e9d1959d2be87dd9aa961e55cfc58c52
+SHA1 (patch-am) = 21573a1e8cb19dd1d96b4e4898b72ef4ea22a984
diff --git a/graphics/libv4l/patches/patch-af b/graphics/libv4l/patches/patch-af
index d149e2da54d..3c78511f925 100644
--- a/graphics/libv4l/patches/patch-af
+++ b/graphics/libv4l/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.5 2013/06/24 15:57:21 jperkin Exp $
+$NetBSD: patch-af,v 1.6 2016/08/28 15:48:32 wiz Exp $
 
 * XXXX
 * `mode_t' is promoted to `int' when passed through `...'.
@@ -71,7 +71,18 @@ $NetBSD: patch-af,v 1.5 2013/06/24 15:57:21 jperkin Exp $
  
  LIBV4L_PUBLIC int close(int fd)
  {
-@@ -148,11 +169,13 @@ LIBV4L_PUBLIC void *mmap(void *start, si
+@@ -137,22 +158,19 @@ LIBV4L_PUBLIC int ioctl (int fd, unsigne
+   return v4l2_ioctl (fd, request, arg);
+ }
+ 
+-LIBV4L_PUBLIC ssize_t read (int fd, void* buffer, size_t n)
+-{
+-  return v4l2_read (fd, buffer, n);
+-}
+-
+ LIBV4L_PUBLIC void *mmap(void *start, size_t length, int prot, int flags, int fd,
+   __off_t offset)
+ {
    return v4l2_mmap(start, length, prot, flags, fd, offset);
  }
  
diff --git a/graphics/libv4l/patches/patch-am b/graphics/libv4l/patches/patch-am
index af1b672e906..b0570c89637 100644
--- a/graphics/libv4l/patches/patch-am
+++ b/graphics/libv4l/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.4 2013/06/24 15:57:21 jperkin Exp $
+$NetBSD: patch-am,v 1.5 2016/08/28 15:48:32 wiz Exp $
 
 * XXXX
 * `mode_t' is promoted to `int' when passed through `...'.
@@ -51,7 +51,18 @@ $NetBSD: patch-am,v 1.4 2013/06/24 15:57:21 jperkin Exp $
  
  LIBV4L_PUBLIC int close(int fd) {
    return v4l1_close(fd);
-@@ -114,11 +120,13 @@ LIBV4L_PUBLIC void *mmap(void *start, si
+@@ -103,22 +109,19 @@ LIBV4L_PUBLIC int ioctl (int fd, unsigne
+   return v4l1_ioctl (fd, request, arg);
+ }
+ 
+-LIBV4L_PUBLIC ssize_t read(int fd, void* buffer, size_t n)
+-{
+-  return v4l1_read (fd, buffer, n);
+-}
+-
+ LIBV4L_PUBLIC void *mmap(void *start, size_t length, int prot, int flags, int fd,
+   __off_t offset)
+ {
    return v4l1_mmap(start, length, prot, flags, fd, offset);
  }