svn commit: r399986 - head/dns/knot2

[Alexey Dokuchaev]

Author: danfe
Date: Thu Oct 22 14:57:42 2015
New Revision: 399986
URL: https://svnweb.freebsd.org/changeset/ports/399986

Log:
  Unbreak the build with (non-default) DNSTAP option set.  The root cause
  here is that `kdig_CPPFLAGS += $(DNSTAP_CFLAGS)' line is missing from the
  `src/Makefile.am' file (and thus pre-generated `src/Makefile.in') which
  should contain "$libfstrm_CFLAGS $libprotobuf_c_CFLAGS" set by configure
  script.
  
  As I'd rather avoid patching `src/Makefile.in' and don't want to request
  regeneration thereof, provide DNSTAP_CPPFLAGS explicitly for the moment,
  while ideally this bug should be fixed upstream.  Add an accompanying XXX
  comment about it.
  
  PR:	203931 (partially)

Modified:
  head/dns/knot2/Makefile

Modified: head/dns/knot2/Makefile
==============================================================================
--- head/dns/knot2/Makefile	Thu Oct 22 14:57:00 2015	(r399985)
+++ head/dns/knot2/Makefile	Thu Oct 22 14:57:42 2015	(r399986)
@@ -50,6 +50,12 @@ OPTIONS_DEFINE=			DNSTAP FASTPARSER IDN
 DNSTAP_DESC=			dnstap support (see dnstap.info)
 DNSTAP_CONFIGURE_ENABLE=	dnstap
 DNSTAP_LIB_DEPENDS=		libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
+# XXX: because `kdig_CPPFLAGS += $(DNSTAP_CFLAGS)' line is missing from
+# `src/Makefile.am' file (and thus pre-generated `src/Makefile.in') which
+# should contain "$libfstrm_CFLAGS $libprotobuf_c_CFLAGS" set by configure
+# script, provide it here explicitly as patching those files would result
+# in higher line count.  Ideally this bug should be fixed upstream.
+DNSTAP_CPPFLAGS=		-I${LOCALBASE}/include
 
 FASTPARSER_DESC=		Fast zone parser (demanding compilation)
 FASTPARSER_CONFIGURE_ENABLE=	fastparser