svn commit: r380631 - head/devel/libzrtpcpp

[Mikhail Teterin]

Author: mi
Date: Fri Mar  6 22:30:42 2015
New Revision: 380631
URL: https://svnweb.freebsd.org/changeset/ports/380631
QAT: https://qat.redports.org/buildarchive/r380631/

Log:
  Register a build-time conflict with libzrtpcppcore -- libzrtpcpp will not
  build, if libzrtpcppcore's headers are present...
  
  Rephrase the post-patch target to not require as many passes through the
  source tree and remove a solution for the long-gone problem from it.

Modified:
  head/devel/libzrtpcpp/Makefile

Modified: head/devel/libzrtpcpp/Makefile
==============================================================================
--- head/devel/libzrtpcpp/Makefile	Fri Mar  6 22:17:59 2015	(r380630)
+++ head/devel/libzrtpcpp/Makefile	Fri Mar  6 22:30:42 2015	(r380631)
@@ -21,12 +21,11 @@ CMAKE_ARGS+=	-DBUILD_SHARED_LIBS:BOOL=ON
 CXXFLAGS+=	-I${LOCALBASE}/include -I${OPENSSLINC}
 LDFLAGS+=	-L${LOCALBASE}/lib -L${OPENSSLLIB}
 USE_LDCONFIG=	yes
+CONFLICTS_BUILD=libzrtpcppcore
 
 post-patch:
-	@cd ${WRKSRC}/src && \
-		${FIND} * -type f -exec ${REINPLACE_CMD} -i "" -e "s|<malloc.h>|<stdlib.h>|g" "{}" \; && \
-			${FIND} * -type f -exec ${REINPLACE_CMD} -i "" -e "s|<stdint.h>|<inttypes.h>|g" "{}" \;
-	@${REINPLACE_CMD} -e "s|int32_t dataLength);|int32_t dataLength)|g" \
-		${WRKSRC}/src/libzrtpcpp/crypto/gcrypt/gcryptAesCFB.cpp
+	@${FIND} ${WRKSRC}/src -type f | ${XARGS} ${REINPLACE_CMD} -i "" \
+		-e "s|<malloc.h>|<stdlib.h>|"	\
+		-e "s|<stdint.h>|<inttypes.h>|"
 
 .include <bsd.port.mk>