Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 30 Oct 2015 12:41:06 +0000 (UTC)
From:      Oliver Lehmann <oliver@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r400536 - head/multimedia/xawtv
Message-ID:  <201510301241.t9UCf6B8015808@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: oliver
Date: Fri Oct 30 12:41:06 2015
New Revision: 400536
URL: https://svnweb.freebsd.org/changeset/ports/400536

Log:
  Fix include path to pick uÃp local headers first instead of LOCALBASE stuff.
  This fixes a header conflict with libevent2
  
  PR:		204125
  Submitted by:	KOT@MATPOCKuH.Ru

Modified:
  head/multimedia/xawtv/Makefile

Modified: head/multimedia/xawtv/Makefile
==============================================================================
--- head/multimedia/xawtv/Makefile	Fri Oct 30 11:39:31 2015	(r400535)
+++ head/multimedia/xawtv/Makefile	Fri Oct 30 12:41:06 2015	(r400536)
@@ -86,6 +86,10 @@ post-patch:
 		${WRKSRC}/console/Subdir.mk \
 		${WRKSRC}/x11/Subdir.mk
 
+	@${REINPLACE_CMD} -e 's|\(@CFLAGS@.*\)\$$(LIB_FLAGS) |\$$(LIB_FLAGS) \1|g; \
+		s|-Llibng||g' \
+		${WRKSRC}/Makefile.in
+
 .for i in ${FILES_LIBJPEG}
 	@${REINPLACE_CMD} -e "s|-ljpeg|-L${LOCALBASE}/lib -ljpeg|g" ${WRKSRC}/$i
 .endfor



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510301241.t9UCf6B8015808>