Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 6C1807A272 for ; Mon, 1 May 2017 08:56:43 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 19BDF8557A; Mon, 1 May 2017 08:56:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9E87984E0A for ; Mon, 1 May 2017 08:56:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id i-GvyIBi8o8e for ; Mon, 1 May 2017 08:56:42 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 0DAD484DC7 for ; Mon, 1 May 2017 08:56:42 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 04610FBE4; Mon, 1 May 2017 08:56:42 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1493629001241740" MIME-Version: 1.0 Date: Mon, 1 May 2017 08:56:41 +0000 From: "Benny Siegert" Subject: CVS commit: [pkgsrc-2017Q1] pkgsrc/www/cgit To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20170501085642.04610FBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1493629001241740 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Mon May 1 08:56:41 UTC 2017 Modified Files: pkgsrc/www/cgit [pkgsrc-2017Q1]: Makefile distinfo pkgsrc/www/cgit/patches [pkgsrc-2017Q1]: patch-git-Makefile Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.2.1 pkgsrc/www/cgit/Makefile cvs rdiff -u -r1.4 -r1.4.2.1 pkgsrc/www/cgit/distinfo cvs rdiff -u -r1.1 -r1.1.20.1 pkgsrc/www/cgit/patches/patch-git-Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1493629001241740 Content-Disposition: inline Content-Length: 3222 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/cgit/Makefile diff -u pkgsrc/www/cgit/Makefile:1.7 pkgsrc/www/cgit/Makefile:1.7.2.1 --- pkgsrc/www/cgit/Makefile:1.7 Fri Feb 10 20:10:15 2017 +++ pkgsrc/www/cgit/Makefile Mon May 1 08:56:41 2017 @@ -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 @@ USE_TOOLS+= gmake 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 @@ do-install: ${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" Index: pkgsrc/www/cgit/distinfo diff -u pkgsrc/www/cgit/distinfo:1.4 pkgsrc/www/cgit/distinfo:1.4.2.1 --- pkgsrc/www/cgit/distinfo:1.4 Fri Feb 10 20:10:15 2017 +++ pkgsrc/www/cgit/distinfo Mon May 1 08:56:41 2017 @@ -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 @@ RMD160 (git-2.10.2.tar.xz) = d4330857a79 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 Index: pkgsrc/www/cgit/patches/patch-git-Makefile diff -u pkgsrc/www/cgit/patches/patch-git-Makefile:1.1 pkgsrc/www/cgit/patches/patch-git-Makefile:1.1.20.1 --- pkgsrc/www/cgit/patches/patch-git-Makefile:1.1 Mon Dec 1 12:32:27 2014 +++ pkgsrc/www/cgit/patches/patch-git-Makefile Mon May 1 08:56:41 2017 @@ -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. --_----------=_1493629001241740--