py-pyinotify: allow building on platform other than Linux, FreeBSD, and NetBSD; clean-up

4 files changed, 18 insertions, 16 deletions

diff --git a/sysutils/py-pyinotify/Makefile b/sysutils/py-pyinotify/Makefile
index 15657a5aaa5..ee0e6651f0a 100644
--- a/sysutils/py-pyinotify/Makefile
+++ b/sysutils/py-pyinotify/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/06/12 01:00:56 youri Exp $
+# $NetBSD: Makefile,v 1.2 2019/09/24 09:04:08 adam Exp $
 
 DISTNAME=	Pyinotify-0.9.6
 PKGNAME=	${PYPKGPREFIX}-pyinotify-0.9.6
@@ -12,8 +12,8 @@ HOMEPAGE=	https://github.com/seb-m/pyinotify
 COMMENT=	Python inotify library
 LICENSE=	mit
 
-EGG_NAME=	pyinotify-${PKGVERSION_NOREV}
+EGG_NAME=	${DISTNAME:tl}
 
-.include "../../lang/python/egg.mk"
 .include "../../devel/libinotify/buildlink3.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/py-pyinotify/PLIST b/sysutils/py-pyinotify/PLIST
index cb133584f7c..189dccb93b3 100644
--- a/sysutils/py-pyinotify/PLIST
+++ b/sysutils/py-pyinotify/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2018/06/12 01:00:56 youri Exp $
-${PYSITELIB}/pyinotify.pyo
-${PYSITELIB}/pyinotify.pyc
-${PYSITELIB}/inotify_syscalls.so
+@comment $NetBSD: PLIST,v 1.2 2019/09/24 09:04:08 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/inotify_syscalls.so
 ${PYSITELIB}/pyinotify.py
+${PYSITELIB}/pyinotify.pyc
+${PYSITELIB}/pyinotify.pyo
diff --git a/sysutils/py-pyinotify/distinfo b/sysutils/py-pyinotify/distinfo
index 17ac4a14415..8ed9f3c7b51 100644
--- a/sysutils/py-pyinotify/distinfo
+++ b/sysutils/py-pyinotify/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1 2018/06/12 01:00:56 youri Exp $
+$NetBSD: distinfo,v 1.2 2019/09/24 09:04:08 adam Exp $
 
 SHA1 (Pyinotify-0.9.6.tar.gz) = 815c5e5699669d44042efb12122b60e97cae7bf4
 RMD160 (Pyinotify-0.9.6.tar.gz) = 298d687320e30c80905ed7969143028045983e92
 SHA512 (Pyinotify-0.9.6.tar.gz) = 144db691c1cdfd4e52b838b8ed839b8d50d84d26a91a59b7460c3170f58a1c96b3ce4f51e6273835835291781215a87b8f2d2d87d1abf012e4c14b2cd4b3f4cf
 Size (Pyinotify-0.9.6.tar.gz) = 61159 bytes
-SHA1 (patch-setup.py) = 084ca354ca5d0b2ee3a68e609fe7c4778eb0e7b7
+SHA1 (patch-setup.py) = 7991345b06b5276438ae1b75548cac9d7de5867c
diff --git a/sysutils/py-pyinotify/patches/patch-setup.py b/sysutils/py-pyinotify/patches/patch-setup.py
index fc26b342a93..03fb962e6ba 100644
--- a/sysutils/py-pyinotify/patches/patch-setup.py
+++ b/sysutils/py-pyinotify/patches/patch-setup.py
@@ -1,19 +1,21 @@
-$NetBSD: patch-setup.py,v 1.1 2018/06/12 01:00:56 youri Exp $
+$NetBSD: patch-setup.py,v 1.2 2019/09/24 09:04:08 adam Exp $
 
 Add NetBSD.
 
 --- setup.py.orig	2015-06-04 15:28:48.000000000 +0000
 +++ setup.py
-@@ -25,7 +25,7 @@ if sys.version_info < (2, 4):
+@@ -24,10 +24,6 @@ if sys.version_info < (2, 4):
+     sys.stderr.write('This module requires at least Python 2.4\n')
      sys.exit(1)
  
- # check linux platform
+-# check linux platform
 -if not platform.startswith('linux') and not platform.startswith('freebsd'):
-+if not platform.startswith('linux') and not platform.startswith('freebsd') and not platform.startswith('netbsd'):
-     sys.stderr.write("inotify is not available on %s\n" % platform)
-     sys.exit(1)
+-    sys.stderr.write("inotify is not available on %s\n" % platform)
+-    sys.exit(1)
+ 
  
-@@ -71,7 +71,7 @@ def should_compile_ext_mod():
+ classif = [
+@@ -71,7 +67,7 @@ def should_compile_ext_mod():
          return True
  
      try_libc_name = 'c'