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 58CF67A1BE for ; Sat, 11 Mar 2017 23:21:18 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id C3C278561E; Sat, 11 Mar 2017 23:21:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5246485610 for ; Sat, 11 Mar 2017 23:21:17 +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 SykT6hGphdle for ; Sat, 11 Mar 2017 23:21:16 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id B9F808557D for ; Sat, 11 Mar 2017 23:21:16 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1A852FBE4; Sat, 11 Mar 2017 23:21:12 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_148927447285910" MIME-Version: 1.0 Date: Sat, 11 Mar 2017 23:21:12 +0000 From: "Maya Rashish" Subject: CVS commit: pkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: maya@netbsd.org X-Mailer: log_accum Message-Id: <20170311232112.1A852FBE4@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. --_----------=_148927447285910 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: maya Date: Sat Mar 11 23:21:12 UTC 2017 Modified Files: pkgsrc/net/netdisco: Makefile pkgsrc/www/p5-Apache-Gallery: Makefile pkgsrc/www/p5-HTML-Mason: Makefile options.mk Log Message: Unbreak the tree after adding ap{22,24} to p5-libapreq some, sorry. XXX some package can do either libapreq{,2} and so it should embed a version as well, but seems to have issues To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 pkgsrc/net/netdisco/Makefile cvs rdiff -u -r1.66 -r1.67 pkgsrc/www/p5-Apache-Gallery/Makefile cvs rdiff -u -r1.51 -r1.52 pkgsrc/www/p5-HTML-Mason/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/p5-HTML-Mason/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_148927447285910 Content-Disposition: inline Content-Length: 3515 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/netdisco/Makefile diff -u pkgsrc/net/netdisco/Makefile:1.39 pkgsrc/net/netdisco/Makefile:1.40 --- pkgsrc/net/netdisco/Makefile:1.39 Sat Jul 9 06:38:44 2016 +++ pkgsrc/net/netdisco/Makefile Sat Mar 11 23:21:11 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2016/07/09 06:38:44 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2017/03/11 23:21:11 maya Exp $ DISTNAME= netdisco-${PKGVERSION}_with_mibs PKGNAME= netdisco-${PKGVERSION} @@ -26,7 +26,7 @@ DEPENDS+= p5-Graph-[0-9]*:../../devel/p DEPENDS+= p5-GraphViz-[0-9]*:../../graphics/p5-GraphViz #DEPENDS+= {perl>=5.9.3,p5-IO-Compress-[0-9]*}:../../devel/p5-IO-Compress # Compress::Zlib DEPENDS+= p5-Net-NBName-[0-9]*:../../net/p5-Net-NBName -DEPENDS+= p5-libapreq2-[0-9]*:../../www/p5-libapreq2 +DEPENDS+= p5-${APACHE_PKG_PREFIX}-libapreq2-[0-9]*:../../www/p5-libapreq2 DEPENDS+= p5-Parallel-ForkManager-[0-9]*:../../devel/p5-Parallel-ForkManager WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} Index: pkgsrc/www/p5-Apache-Gallery/Makefile diff -u pkgsrc/www/p5-Apache-Gallery/Makefile:1.66 pkgsrc/www/p5-Apache-Gallery/Makefile:1.67 --- pkgsrc/www/p5-Apache-Gallery/Makefile:1.66 Wed Jun 8 19:24:54 2016 +++ pkgsrc/www/p5-Apache-Gallery/Makefile Sat Mar 11 23:21:11 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2016/06/08 19:24:54 wiz Exp $ +# $NetBSD: Makefile,v 1.67 2017/03/11 23:21:11 maya Exp $ DISTNAME= Apache-Gallery-0.9.1 PKGNAME= p5-${DISTNAME} @@ -17,7 +17,7 @@ DEPENDS+= p5-Image-Imlib2-[0-9]*:../../g DEPENDS+= p5-Image-Info>=1.15:../../graphics/p5-Image-Info DEPENDS+= p5-Image-Size-[0-9]*:../../graphics/p5-Image-Size DEPENDS+= p5-Text-Template-[0-9]*:../../textproc/p5-Text-Template -DEPENDS+= p5-libapreq{,2}-[0-9]*:../../www/${LIBAPREQ} +DEPENDS+= p5-${APACHE_PKG_PREFIX}-libapreq{,2}-[0-9]*:../../www/${LIBAPREQ} PERL5_PACKLIST= auto/Apache/Gallery/.packlist @@ -95,5 +95,5 @@ post-install: .include "../../graphics/imlib2/buildlink3.mk" .include "../../lang/perl5/module.mk" - +.include "../../mk/apache.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/www/p5-HTML-Mason/Makefile diff -u pkgsrc/www/p5-HTML-Mason/Makefile:1.51 pkgsrc/www/p5-HTML-Mason/Makefile:1.52 --- pkgsrc/www/p5-HTML-Mason/Makefile:1.51 Wed Jun 8 19:25:03 2016 +++ pkgsrc/www/p5-HTML-Mason/Makefile Sat Mar 11 23:21:11 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2016/06/08 19:25:03 wiz Exp $ +# $NetBSD: Makefile,v 1.52 2017/03/11 23:21:11 maya Exp $ DISTNAME= HTML-Mason-1.56 PKGNAME= p5-${DISTNAME} @@ -37,4 +37,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/eg/MyApp/* ${DESTDIR:Q}${EGDIR:Q}/MyApp .include "../../lang/perl5/module.mk" +.include "../../mk/apache.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/www/p5-HTML-Mason/options.mk diff -u pkgsrc/www/p5-HTML-Mason/options.mk:1.4 pkgsrc/www/p5-HTML-Mason/options.mk:1.5 --- pkgsrc/www/p5-HTML-Mason/options.mk:1.4 Tue Jun 10 15:22:18 2014 +++ pkgsrc/www/p5-HTML-Mason/options.mk Sat Mar 11 23:21:11 2017 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2014/06/10 15:22:18 joerg Exp $ +# $NetBSD: options.mk,v 1.5 2017/03/11 23:21:11 maya Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.p5-HTML-Mason PKG_SUPPORTED_OPTIONS= fastcgi modperl @@ -11,7 +11,7 @@ PKG_SUGGESTED_OPTIONS= # empty ### .if !empty(PKG_OPTIONS:Mmodperl) . include "../../mk/apache.mk" -DEPENDS+= p5-libapreq2-[0-9]*:../../www/p5-libapreq2 +DEPENDS+= p5-${APACHE_PKG_PREFIX}-libapreq2-[0-9]*:../../www/p5-libapreq2 .include "../../www/ap2-perl/buildlink3.mk" .endif --_----------=_148927447285910--