libhid: cleanup; fixed building on Darwin (PR 49565)

3 files changed, 25 insertions, 14 deletions

diff --git a/devel/libhid/Makefile b/devel/libhid/Makefile
index 1e90bfefdbe..4b1407e0ce4 100644
--- a/devel/libhid/Makefile
+++ b/devel/libhid/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2017/01/01 14:43:31 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2017/12/10 15:46:26 adam Exp $
 
 DISTNAME=	libhid-0.2.16
 PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://sourceforge.net/projects/salix-sbo/files/13.37/libhid/
+MASTER_SITES+=	https://alioth.debian.org/frs/download.php/file/1958/
 LICENSE=	gnu-gpl-v2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -11,24 +12,18 @@ HOMEPAGE=	http://libhid.alioth.debian.org/
 COMMENT=	Abstraction layer for HID-class devices over USB/serial
 
 BUILD_DEPENDS+=	docbook-[0-9]*:../../textproc/docbook
-#BUILD_DEPENDS+=	swig-[0-9]*:../../devel/swig
 
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake
 USE_LIBTOOL=	yes
-
-PLIST_SUBST+=	PYSITELIB=${PYSITELIB}
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not yet ported as of 0.2.16
-
+USE_TOOLS+=	gmake
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	PYTHON_LDFLAGS="-L${PREFIX}/lib -lpython${PYVERSSUFFIX}"
 
-.include "../../lang/python/application.mk"
-# PLIST_SUBST+=	PYSITELIB=${PYSITELIB}
-#.include "../../lang/python/extension.mk"
-#.include "../../lang/python/distutils.mk"
+PY_PATCHPLIST=	yes
 
+PYTHON_VERSIONS_ACCEPTED=	27 # not yet ported as of 0.2.16
+
+.include "../../lang/python/extension.mk"
 .include "../../devel/libusb/buildlink3.mk"
 .include "../../devel/swig/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libhid/distinfo b/devel/libhid/distinfo
index 0aa50dc4e79..86573287456 100644
--- a/devel/libhid/distinfo
+++ b/devel/libhid/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2016/06/15 18:38:07 rumko Exp $
+$NetBSD: distinfo,v 1.4 2017/12/10 15:46:26 adam Exp $
 
 SHA1 (libhid-0.2.16.tar.gz) = 9a25fef674e8f20f97fea6700eb91c21ebbbcc02
 RMD160 (libhid-0.2.16.tar.gz) = f61f016ae54bc5532202fd676d38d1f684e7ab8d
@@ -7,5 +7,6 @@ Size (libhid-0.2.16.tar.gz) = 435245 bytes
 SHA1 (patch-configure) = 25b58acacaaa8dd783cc84e3908bc8489b0c9ee8
 SHA1 (patch-hidparser_hidtypes.h) = ddd475dad764e299c0eead170338376c6a03d579
 SHA1 (patch-include_hid.h) = 7f6f73eaabc47fdf39b3d669998ec3ed27d4847f
+SHA1 (patch-src_Makefile.in) = 3fa444b41faed760614d646d150d94804d9d9d76
 SHA1 (patch-src_bsd_c) = 5087ed4eb594f5e6ce66b6ca3d01fbceebf0848f
 SHA1 (patch-test_lshid_c) = 2f655da7bc316354987efd22a5d2b1f60342be91
diff --git a/devel/libhid/patches/patch-src_Makefile.in b/devel/libhid/patches/patch-src_Makefile.in
new file mode 100644
index 00000000000..a31d862ede8
--- /dev/null
+++ b/devel/libhid/patches/patch-src_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2017/12/10 15:46:26 adam Exp $
+
+Fix linking on Darwin.
+
+--- src/Makefile.in.orig	2017-12-10 15:35:53.000000000 +0000
++++ src/Makefile.in
+@@ -39,7 +39,7 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ @OS_BSD_FALSE@@OS_DARWIN_TRUE@@OS_LINUX_FALSE@@OS_SOLARIS_FALSE@am__append_1 = -no-cpp-precomp
+-@OS_BSD_FALSE@@OS_DARWIN_TRUE@@OS_LINUX_FALSE@@OS_SOLARIS_FALSE@am__append_2 = -lIOKit -framework "CoreFoundation"
++@OS_BSD_FALSE@@OS_DARWIN_TRUE@@OS_LINUX_FALSE@@OS_SOLARIS_FALSE@am__append_2 = -framework IOKit -framework "CoreFoundation"
+ bin_PROGRAMS = libhid-detach-device$(EXEEXT)
+ subdir = src
+ DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \