--- sysutils/iichid/Makefile	
+++ sysutils/iichid/Makefile	
@@ -2,33 +2,37 @@ 
 # $FreeBSD$
 
 PORTNAME=	iichid
-DISTVERSION=	0.0.1
+DISTVERSION=	0.0.3
 CATEGORIES=	sysutils
 
 MAINTAINER=	imp@FreeBSD.org
 COMMENT=	Generic FreeBSD HID layer for I2C and USB devices
 
 LICENSE=	BSD2CLAUSE
-#LICENSE_FILE=	Not yet packaged
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 IGNORE_FreeBSD_11=	Requires FreeBSD 12.1 or later
-ONLY_FOR_ARCHS=		aarch64 amd64 i386
-ONLY_FOR_ARCHS_REASON=	Requires architecture supporting ACPI
+ONLY_FOR_ARCHS=	aarch64 amd64 i386
+ONLY_FOR_ARCHS_REASON=	I2C transport requires architecture supporting ACPI
 
-USES=	kmod uidfix
+USES=		kmod uidfix
 
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	wulf7
 
-# Strip -Werror from sys/conf/kmod.mk
-MAKE_ENV=	WERROR=""
-
 PLIST_FILES=	${KMODDIR}/iichid.ko
 
-# USB backend is not yet complete and
-# interferes with existing USB drivers
-post-patch:
-	${REINPLACE_CMD} -e '/usbhid.c/s/^/#/' ${WRKSRC}/Makefile
+# USB backend is disabled by default as it interferes with existing USB drivers
+OPTIONS_DEFINE=		DEBUG I2C USB
+OPTIONS_DEFAULT=	I2C
+I2C_DESC=		HID over I2C support
+USB_DESC=		HID over USB support
+
+I2C_MAKE_ARGS_OFF=	-DDISABLE_I2CHID
+USB_MAKE_ARGS_OFF=	-DDISABLE_USBHID
+
+post-patch-DEBUG-off:
+	${REINPLACE_CMD} -e '/iichid_debug =/s/1/0/' ${WRKSRC}/iichid.c
 
 .include <bsd.port.mk>
--- sysutils/iichid/distinfo	
+++ sysutils/iichid/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1581662226
-SHA256 (wulf7-iichid-0.0.1_GH0.tar.gz) = 282540487df1eb3f202f7beb440f68f43801662cb8f817931f09879c1f007a98
-SIZE (wulf7-iichid-0.0.1_GH0.tar.gz) = 51001
+TIMESTAMP = 1594041772
+SHA256 (wulf7-iichid-0.0.3_GH0.tar.gz) = a548af4c2bfd121ec766d4203c70900b256a4b6e99cf4d9f643b9cfc8818efc7
+SIZE (wulf7-iichid-0.0.3_GH0.tar.gz) = 88651
--- sysutils/iichid/pkg-message	
+++ sysutils/iichid/pkg-message	
@@ -1,5 +1,11 @@ 
+[
+{ type: install
+  message: <<EOM
 iichid is currently in-development and EXPERIMENTAL. This port provides
 an easy and quick method for users to test this code to encourage early
 testing, feedback and bug reports.
 
 Please report successes and issues to: https://github.com/wulf7/iichid
+EOM
+}
+]