CVS commit: pkgsrc/devel

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sat Mar 11 23:26:32 UTC 2017

Modified Files:
        pkgsrc/devel/rt-mysql: Makefile.common
        pkgsrc/devel/rt3: Makefile

Log Message:
More tree unbreaking after rename of p5-libapreq.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/rt-mysql/Makefile.common
cvs rdiff -u -r1.60 -r1.61 pkgsrc/devel/rt3/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/rt-mysql/Makefile.common
diff -u pkgsrc/devel/rt-mysql/Makefile.common:1.21 pkgsrc/devel/rt-mysql/Makefile.common:1.22
--- pkgsrc/devel/rt-mysql/Makefile.common:1.21  Sun Jul 12 18:56:21 2015
+++ pkgsrc/devel/rt-mysql/Makefile.common       Sat Mar 11 23:26:32 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2015/07/12 18:56:21 wiz Exp $
+# $NetBSD: Makefile.common,v 1.22 2017/03/11 23:26:32 maya Exp $
 # used by devel/rt-mysql/Makefile
 # used by devel/rt-pgsql/Makefile
 
@@ -85,7 +85,7 @@ DEPENDS+=     p5-MLDBM-[0-9]*:../../database
 DEPENDS+=      p5-Params-Validate>=0.02:../../devel/p5-Params-Validate
 DEPENDS+=      p5-HTML-Mason>=1.02:../../www/p5-HTML-Mason
 #DEPENDS+=     {perl>=5.004,p5-CGI-[0-9]*}:../../www/p5-CGI
-DEPENDS+=      p5-libapreq2-[0-9]*:../../www/p5-libapreq2
+DEPENDS+=      p5-${APACHE_PKG_PREFIX}-libapreq2-[0-9]*:../../www/p5-libapreq2
 DEPENDS+=      p5-Apache-Session>=1.53:../../www/p5-Apache-Session
 DEPENDS+=      p5-TimeDate-[0-9]*:../../time/p5-TimeDate
 DEPENDS+=      p5-MIME-tools>=5.108:../../mail/p5-MIME-tools
@@ -127,4 +127,5 @@ pre-build:
        ${ECHO} '#define DATABASE_LIBRARY_PATH "${RT_DB_PATH}"' >> config.h; \
        ${ECHO} '#define RT_GROUP "${RT_GROUP}"' >> config.h )
 
+.include "../../mk/apache.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/rt3/Makefile
diff -u pkgsrc/devel/rt3/Makefile:1.60 pkgsrc/devel/rt3/Makefile:1.61
--- pkgsrc/devel/rt3/Makefile:1.60      Wed Jun  8 19:23:48 2016
+++ pkgsrc/devel/rt3/Makefile   Sat Mar 11 23:26:32 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2016/06/08 19:23:48 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2017/03/11 23:26:32 maya Exp $
 
 DISTNAME=              rt-3.8.17
 PKGREVISION=           7
@@ -82,7 +82,7 @@ DEPENDS+=     p5-GnuPG-Interface-[0-9]*:../.
 
 # Front-end dependencies:
 .if !empty(PKG_OPTIONS:Mmodperl1)
-DEPENDS+=      p5-libapreq>=1.2:../../www/p5-libapreq
+DEPENDS+=      p5-${APACHE_PKG_PREFIX}-libapreq>=1.2:../../www/p5-libapreq
 DEPENDS+=      p5-Apache-DBI>=0.92:../../databases/p5-Apache-DBI
 .elif !empty(PKG_OPTIONS:Mmodperl2)
 DEPENDS+=      p5-Apache-DBI>=0.92:../../databases/p5-Apache-DBI
@@ -148,4 +148,5 @@ post-extract:
 .include "Makefile.install"
 
 .include "../../databases/p5-DBI/buildlink3.mk"
+.include "../../mk/apache.mk"
 .include "../../mk/bsd.pkg.mk"