From 9653419cc7f01ab8c2b1818226ad659a0f007186 Mon Sep 17 00:00:00 2001
From: gdt <gdt@pkgsrc.org>
Date: Sun, 27 Sep 2015 16:41:12 +0000
Subject: Revert previous.

This warning isn't supposed to fire on macro code, so this is either
something subtly odd in pkgin or broken in OS X's clang.  This still
needs fixing, but in a way that's more limited to the problematic
platform.
---
 pkgtools/pkgin/Makefile                  |  3 +--
 pkgtools/pkgin/distinfo                  |  3 +--
 pkgtools/pkgin/patches/patch-Makefile.in | 20 --------------------
 3 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 pkgtools/pkgin/patches/patch-Makefile.in

(limited to 'pkgtools')

diff --git a/pkgtools/pkgin/Makefile b/pkgtools/pkgin/Makefile
index 4b543b60984..e5e5586061a 100644
--- a/pkgtools/pkgin/Makefile
+++ b/pkgtools/pkgin/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.61 2015/09/26 12:15:28 gdt Exp $
+# $NetBSD: Makefile,v 1.62 2015/09/27 16:41:12 gdt Exp $
 
 GHCOMMIT=		b08581b094980b6fc32beb304b8d3dda0689cc82
 DISTNAME=		${GHCOMMIT}
 PKGNAME=		pkgin-0.9.3
-PKGREVISION=		1
 CATEGORIES=		pkgtools
 MASTER_SITES=		${MASTER_SITE_GITHUB:=NetBSDfr/pkgin/archive/}
 
diff --git a/pkgtools/pkgin/distinfo b/pkgtools/pkgin/distinfo
index 120c37ad69d..0188137f29c 100644
--- a/pkgtools/pkgin/distinfo
+++ b/pkgtools/pkgin/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.41 2015/09/26 12:15:28 gdt Exp $
+$NetBSD: distinfo,v 1.42 2015/09/27 16:41:12 gdt Exp $
 
 SHA1 (b08581b094980b6fc32beb304b8d3dda0689cc82.tar.gz) = f9bdb53a6e404b83a8c5d4f7e54ceb3d1de8c786
 RMD160 (b08581b094980b6fc32beb304b8d3dda0689cc82.tar.gz) = 42f2903fd180cb6ef43f331cdbaf530ba8f479b9
 Size (b08581b094980b6fc32beb304b8d3dda0689cc82.tar.gz) = 198425 bytes
-SHA1 (patch-Makefile.in) = cdc5eaae5b2b441500c6cad2953589515132dcfb
diff --git a/pkgtools/pkgin/patches/patch-Makefile.in b/pkgtools/pkgin/patches/patch-Makefile.in
deleted file mode 100644
index 3079e722c71..00000000000
--- a/pkgtools/pkgin/patches/patch-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.5 2015/09/26 12:15:28 gdt Exp $
-
-pkgin has code with spurious parens, which leads clang to fail when
-given -Werror.   Because the code is not warning-clean, disable -Werror
-for now.
-
-Filed upstream as https://github.com/NetBSDfr/pkgin/issues/64.
-
---- Makefile.in.orig	2015-08-18 19:19:55.000000000 +0000
-+++ Makefile.in
-@@ -19,6 +19,9 @@ DPSRCS=	pkgindb_create.h
- CC=		@CC@
- INSTALL=	@INSTALL@
- 
-+# pkgin sources have extra parens on equality, which breaks under clang on OSX
-+NOGCCERROR=	true
-+
- OPSYS!=		uname
- OS_VER!=	uname -r
- OS_ARCH!=	uname -p
-- 
cgit v1.2.3