From owner-svn-ports-all@FreeBSD.ORG  Sat Aug 16 23:40:01 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AA0E244A;
 Sat, 16 Aug 2014 23:40:01 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 96AE62957;
 Sat, 16 Aug 2014 23:40:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7GNe12o031796;
 Sat, 16 Aug 2014 23:40:01 GMT (envelope-from adamw@FreeBSD.org)
Received: (from adamw@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7GNe1Ne031793;
 Sat, 16 Aug 2014 23:40:01 GMT (envelope-from adamw@FreeBSD.org)
Message-Id: <201408162340.s7GNe1Ne031793@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: adamw set sender to
 adamw@FreeBSD.org using -f
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Sat, 16 Aug 2014 23:40:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r365143 - in head/net-p2p/shx: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 Aug 2014 23:40:01 -0000

Author: adamw
Date: Sat Aug 16 23:40:00 2014
New Revision: 365143
URL: http://svnweb.freebsd.org/changeset/ports/365143
QAT: https://qat.redports.org/buildarchive/r365143/

Log:
  Fix build on -current.

Added:
  head/net-p2p/shx/files/
  head/net-p2p/shx/files/patch-src__Makefile.in   (contents, props changed)
Modified:
  head/net-p2p/shx/Makefile

Modified: head/net-p2p/shx/Makefile
==============================================================================
--- head/net-p2p/shx/Makefile	Sat Aug 16 23:35:54 2014	(r365142)
+++ head/net-p2p/shx/Makefile	Sat Aug 16 23:40:00 2014	(r365143)
@@ -15,7 +15,7 @@ COMMENT=	Text based Hotline Communicatio
 LICENSE=	GPLv1
 
 OPTIONS_DEFINE=	WARNINGS HTXF_PTHREAD HFS HOPE CIPHER COMPRESS HAL XMMS NOIPV4
-OPTIONS_DEFAULT=	HTXF_PTHREAD HFS HOPE CIPHER COMPRESS XMMS
+OPTIONS_DEFAULT=HTXF_PTHREAD HFS HOPE CIPHER COMPRESS XMMS
 
 WARNINGS_DESC=		Show compiler warnings
 HTXF_PTHREAD_DESC=	Use pthread instead of fork or clone for htxf

Added: head/net-p2p/shx/files/patch-src__Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-p2p/shx/files/patch-src__Makefile.in	Sat Aug 16 23:40:00 2014	(r365143)
@@ -0,0 +1,11 @@
+--- ./src/Makefile.in.orig	2014-08-16 19:38:31.000000000 -0400
++++ ./src/Makefile.in	2014-08-16 19:38:57.000000000 -0400
+@@ -34,7 +34,7 @@
+ LDFLAGS         = @LDFLAGS@
+ SYS_INCLUDES    = @SYS_INCLUDES@
+ INCLUDE         = -I. -I./include -I$(top_include)
+-CFLAGS          = @CFLAGS@ $(INCLUDE) $(SYS_INCLUDES) $(DEFS)
++CFLAGS          = @CFLAGS@ $(INCLUDE) $(SYS_INCLUDES) @CPPFLAGS@ $(DEFS)
+ 
+ # Libraries
+