From owner-svn-ports-head@freebsd.org  Sun Oct 28 14:20:44 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A5E6710D31A8;
 Sun, 28 Oct 2018 14:20:44 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 5C4D5868E0;
 Sun, 28 Oct 2018 14:20:44 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3C55820770;
 Sun, 28 Oct 2018 14:20:44 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9SEKi5h086394;
 Sun, 28 Oct 2018 14:20:44 GMT (envelope-from linimon@FreeBSD.org)
Received: (from linimon@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9SEKiMY086393;
 Sun, 28 Oct 2018 14:20:44 GMT (envelope-from linimon@FreeBSD.org)
Message-Id: <201810281420.w9SEKiMY086393@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: linimon set sender to
 linimon@FreeBSD.org using -f
From: Mark Linimon <linimon@FreeBSD.org>
Date: Sun, 28 Oct 2018 14:20:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r483299 - head/devel/objecthash
X-SVN-Group: ports-head
X-SVN-Commit-Author: linimon
X-SVN-Commit-Paths: head/devel/objecthash
X-SVN-Commit-Revision: 483299
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Oct 2018 14:20:44 -0000

Author: linimon
Date: Sun Oct 28 14:20:43 2018
New Revision: 483299
URL: https://svnweb.freebsd.org/changeset/ports/483299

Log:
  Fix mismerge.
  
  Pointy hat to:	linimon

Modified:
  head/devel/objecthash/Makefile

Modified: head/devel/objecthash/Makefile
==============================================================================
--- head/devel/objecthash/Makefile	Sun Oct 28 14:17:19 2018	(r483298)
+++ head/devel/objecthash/Makefile	Sun Oct 28 14:20:43 2018	(r483299)
@@ -11,13 +11,10 @@ COMMENT=	Cross-language way to cryptographically hash 
 
 LICENSE=	APACHE20
 
-BROKEN_powerpc64=	Does not build: error: variably modified hash at file scope
-
 LIB_DEPENDS=	libicudata.so:devel/icu \
 		libjson-c.so:devel/json-c
 
 USES=		pkgconfig ssl
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	benlaurie
 GH_PROJECT=	objecthash