[pkgsrc/pkgsrc-2017Q1]: pkgsrc/www/cgit Pullup ticket #5346 - requested by sevan

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2b4427cea3b8
branches:  pkgsrc-2017Q1
changeset: 360330:2b4427cea3b8
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Mon May 01 08:56:41 2017 +0000

description:
Pullup ticket #5346 - requested by sevan
www/cgit: build fix

Revisions pulled up:
- www/cgit/Makefile                                             1.8
- www/cgit/distinfo                                             1.5
- www/cgit/patches/patch-git-Makefile                           1.2

---
   Module Name:    pkgsrc
   Committed By:   jperkin
   Date:           Fri Apr 21 15:05:52 UTC 2017

   Modified Files:
           pkgsrc/www/cgit: Makefile distinfo
           pkgsrc/www/cgit/patches: patch-git-Makefile

   Log Message:
   Don't overwrite CFLAGS/LDFLAGS.  Needs libiconv.

diffstat:

 www/cgit/Makefile                   |   5 ++++-
 www/cgit/distinfo                   |   4 ++--
 www/cgit/patches/patch-git-Makefile |  22 +++++++++++++++++++---
 3 files changed, 25 insertions(+), 6 deletions(-)

diffs (74 lines):

diff -r 8a838a8575a1 -r 2b4427cea3b8 www/cgit/Makefile
--- a/www/cgit/Makefile Mon May 01 08:52:47 2017 +0000
+++ b/www/cgit/Makefile Mon May 01 08:56:41 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/02/10 20:10:15 roy Exp $
+# $NetBSD: Makefile,v 1.7.2.1 2017/05/01 08:56:41 bsiegert Exp $
 
 DISTNAME=      cgit-1.1
 CATEGORIES=    www
@@ -21,6 +21,8 @@
 MAKE_FLAGS+=           GIT_VER=${GIT_VER}
 BUILD_MAKE_FLAGS+=     CGIT_CONFIG=${PKG_SYSCONFDIR}/cgitrc
 
+MAKE_ENV.SunOS+=       NEEDS_LIBICONV=YesPlease
+
 CGIT_CONFIG=   ${PKG_SYSCONFDIR}/cgitrc
 CGIT_CGIBIN=   ${PREFIX}/libexec/cgi-bin
 CGIT_FILTERS=  ${PREFIX}/libexec/cgit/filters
@@ -45,6 +47,7 @@
        ${INSTALL_SCRIPT} ${WRKSRC}/filters/syntax-highlighting.sh \
                ${DESTDIR}${CGIT_FILTERS}/syntax-highlighting.sh
 
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff -r 8a838a8575a1 -r 2b4427cea3b8 www/cgit/distinfo
--- a/www/cgit/distinfo Mon May 01 08:52:47 2017 +0000
+++ b/www/cgit/distinfo Mon May 01 08:56:41 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2017/02/10 20:10:15 roy Exp $
+$NetBSD: distinfo,v 1.4.2.1 2017/05/01 08:56:41 bsiegert Exp $
 
 SHA1 (cgit-1.1.tar.xz) = 3ffb325a6c6a3f5c3e4f1d5fd0a10f6c91f61e6b
 RMD160 (cgit-1.1.tar.xz) = 9ad96a56d17ae060b73e8d576d0c065aa590fcfb
@@ -9,4 +9,4 @@
 SHA512 (git-2.10.2.tar.xz) = 0ab09de481dbb31c3304382afaa5d3fc9f861115c9954c65b11a8a1c34b939118c7ed3ff60ac329145888596388e3e4d2b2fb677fe109d33a57206d531b5ee6a
 Size (git-2.10.2.tar.xz) = 4106108 bytes
 SHA1 (patch-cgitrc) = a363a2b22f237c507cab7d164e91389d02734372
-SHA1 (patch-git-Makefile) = 1479063537dd98d6da8af396680d179e24960ed8
+SHA1 (patch-git-Makefile) = 83ba1b173713ab9d0e664aaa36e4bc858b2f1037
diff -r 8a838a8575a1 -r 2b4427cea3b8 www/cgit/patches/patch-git-Makefile
--- a/www/cgit/patches/patch-git-Makefile       Mon May 01 08:52:47 2017 +0000
+++ b/www/cgit/patches/patch-git-Makefile       Mon May 01 08:56:41 2017 +0000
@@ -1,10 +1,26 @@
-$NetBSD: patch-git-Makefile,v 1.1 2014/12/01 12:32:27 wiz Exp $
+$NetBSD: patch-git-Makefile,v 1.1.20.1 2017/05/01 08:56:41 bsiegert Exp $
 
 Don't put HOME into binaries.
 
---- git/Makefile.orig  2014-06-25 19:21:11.000000000 +0000
+--- git/Makefile.orig  2016-10-28 19:34:16.000000000 +0000
 +++ git/Makefile
-@@ -365,7 +365,7 @@ STRIP ?= strip
+@@ -391,7 +391,6 @@ GIT-VERSION-FILE: FORCE
+ 
+ # CFLAGS and LDFLAGS are for the users to override from the command line.
+ 
+-CFLAGS = -g -O2 -Wall
+ DEVELOPER_CFLAGS = -Werror \
+       -Wdeclaration-after-statement \
+       -Wno-format-zero-length \
+@@ -401,7 +400,6 @@ DEVELOPER_CFLAGS = -Werror \
+       -Wstrict-prototypes \
+       -Wunused \
+       -Wvla
+-LDFLAGS =
+ ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
+ ALL_LDFLAGS = $(LDFLAGS)
+ STRIP ?= strip
+@@ -423,7 +421,7 @@ ARFLAGS = rcs
  #   htmldir
  # This can help installing the suite in a relocatable way.