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 9448C7A3DC for ; Sat, 9 Jul 2016 09:47:13 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 113E285EE7; Sat, 9 Jul 2016 09:47:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 944D585E47 for ; Sat, 9 Jul 2016 09:47:12 +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 dloCRzk_hEtD for ; Sat, 9 Jul 2016 09:47:12 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 207E984C8B for ; Sat, 9 Jul 2016 09:47:12 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1772DFBB5; Sat, 9 Jul 2016 09:47:12 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1468057632228480" MIME-Version: 1.0 Date: Sat, 9 Jul 2016 09:47:12 +0000 From: "Roland Illig" Subject: CVS commit: pkgsrc/devel/p5-Curses To: pkgsrc-changes@NetBSD.org Reply-To: rillig@netbsd.org X-Mailer: log_accum Message-Id: <20160709094712.1772DFBB5@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1468057632228480 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rillig Date: Sat Jul 9 09:47:12 UTC 2016 Modified Files: pkgsrc/devel/p5-Curses: Makefile Log Message: Fixed pkglint warnings. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 pkgsrc/devel/p5-Curses/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1468057632228480 Content-Disposition: inline Content-Length: 1774 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/p5-Curses/Makefile diff -u pkgsrc/devel/p5-Curses/Makefile:1.54 pkgsrc/devel/p5-Curses/Makefile:1.55 --- pkgsrc/devel/p5-Curses/Makefile:1.54 Wed Jun 8 19:22:44 2016 +++ pkgsrc/devel/p5-Curses/Makefile Sat Jul 9 09:47:11 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2016/06/08 19:22:44 wiz Exp $ +# $NetBSD: Makefile,v 1.55 2016/07/09 09:47:11 rillig Exp $ DISTNAME= Curses-1.34 PKGNAME= p5-${DISTNAME} @@ -14,11 +14,6 @@ LICENSE= ${PERL5_LICENSE} PERL5_PACKLIST= auto/Curses/.packlist -# We should really work out the location of the system forms.h -SUBST_STAGE.h_form = post-configure -SUBST_MESSAGE.h_form = Hard wiring form.h -SUBST_FILES.h_form = c-config.h -SUBST_SED.h_form = -e 's,,"/usr/include/form.h",g' MAKE_PARAMS+= FORMS MENUS @@ -26,7 +21,13 @@ MAKE_PARAMS+= FORMS MENUS .include "../../mk/curses.buildlink3.mk" .if ${CURSES_TYPE} == "curses" +# We should really work out the location of the system forms.h SUBST_CLASSES+= h_form +SUBST_STAGE.h_form= post-configure +SUBST_MESSAGE.h_form= Hard wiring form.h +SUBST_FILES.h_form= c-config.h +SUBST_SED.h_form= -e 's,,"/usr/include/form.h",g' + .elif ${CURSES_TYPE} == "ncurses" || ${CURSES_TYPE} == "ncursesw" MAKE_PARAMS+= PANELS # Don't link to system termcap as we're using ncurses @@ -52,8 +53,8 @@ CURSES_LIBTYPE= ncursesw .if defined(CURSES_LIBTYPE) MAKE_ENV+= CURSES_LIBTYPE=${CURSES_LIBTYPE} -MAKE_ENV+= CURSES_CFLAGS=${BUILDLINK_INCDIRS.${CURSES_TYPE}:S/^/-I/} -MAKE_ENV+= CURSES_LDFLAGS=${BUILDLINK_LDADD.${CURSES_TYPE}} +MAKE_ENV+= CURSES_CFLAGS=${BUILDLINK_INCDIRS.${CURSES_TYPE}:@dir@-I${dir}@:Q} +MAKE_ENV+= CURSES_LDFLAGS=${BUILDLINK_LDADD.${CURSES_TYPE}:Q} .endif .include "../../mk/bsd.pkg.mk" --_----------=_1468057632228480--