Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/libexec/httpd/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/src/libexec/httpd/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -p -r1.22.2.1 -r1.22.2.2
--- src/libexec/httpd/Makefile	2015/04/23 19:38:11	1.22.2.1
+++ src/libexec/httpd/Makefile	2016/04/10 10:33:11	1.22.2.2
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.22.2.1 2015/04/23 19:38:11 snj Exp $
+#	$NetBSD: Makefile,v 1.22.2.2 2016/04/10 10:33:11 martin Exp $
 #
 #	$eterna: Makefile,v 1.30 2010/07/11 00:34:27 mrg Exp $
 #
@@ -15,6 +15,10 @@
 #	DO_HTPASSWD		/* support .htpasswd files */
 #	NO_LUA_SUPPORT		/* don't support Lua for dynamic content */
 #
+# other system specific defines:
+#	HAVE_NBUTIL_H		/* netbsd compat is in <nbutil.h>
+#				(don't forget to also enable -lnbutil)
+#
 # these are usually set via the "COPTS" variable, or some other method
 # for setting CFLAGS relevant to your make, eg
 #   % make COPTS="-DDO_HTPASSWD"
@@ -33,6 +37,17 @@ DPADD=	${LIBCRYPT} ${LIBLUA} ${LIBM}
 
 WARNS?=	4
 
+.if defined(.OS.MAKE)
+OPSYS=	${.OS.MAKE}
+.else
+OPSYS:=	${:!uname -s!:S/-//g:S/\///g}
+.endif
+
+.if ${OPSYS} == "QNX"
+CPPFLAGS+=	-DHAVE_NBUTIL_H
+LDADD+=		-lnbutil
+.endif
+
 .include <bsd.own.mk>
 
 .if ${MKCRYPTO} != "no"