ports/134889: [patch] www/p5-libapreq2: pass down MAKE=${GMAKE} to let MakeMAker generate proper makefiles

[Eygene Ryabinkin]

>Number:         134889
>Category:       ports
>Synopsis:       [patch] www/p5-libapreq2: pass down MAKE=${GMAKE} to let MakeMAker generate proper makefiles
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 24 05:20:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Eygene Ryabinkin
>Release:        FreeBSD 7.1-STABLE amd64
>Organization:
Code Labs
>Environment:

System: FreeBSD 7.1-STABLE amd64

>Description:

Port build for 2.12 chokes at the time of processing of Makefile
generated by Makefile.PL:
-----
gmake[2]: Entering directory
`/usr/ports/www/p5-libapreq2/work/libapreq2-2.12/glue/perl'
cp lib/Apache2/Cookie.pm blib/lib/Apache2/Cookie.pm
cp lib/Apache2/Upload.pm blib/lib/Apache2/Upload.pm
cp lib/Apache2/Request.pm blib/lib/Apache2/Request.pm
cp lib/APR/DummyVersions.pm blib/lib/APR/DummyVersions.pm
make: don't know how to make w. Stop
gmake[2]: *** [subdirs] Error 2
gmake[2]: Leaving directory
`/usr/ports/www/p5-libapreq2/work/libapreq2-2.12/glue/perl'
gmake[1]: *** [perl_glue] Error 2
gmake[1]: Leaving directory
`/usr/ports/www/p5-libapreq2/work/libapreq2-2.12/glue'
gmake: *** [all-recursive] Error 1
*** Error code 1

Stop in /usr/ports/www/p5-libapreq2.
-----

The problem is that MakeMaker defines
-----
MAKE=make
----
and that's wrong -- we should invoke gmake for the subdirectories.

>How-To-Repeat:

Just try to build www/p2-libapreq2.

>Fix:

The following patch adds make variable MAKE that is set to ${GMAKE}.
This fixes the issue for me.  Tinderbox builds on 6.x, 7.x and 8.x
are also fine for the patched port.
--- 2.12-pass-down-MAKE-equal-to-gmake.diff begins here ---
>From 5c3686e8a59007a6c15fcc8eaa4b320902317162 Mon Sep 17 00:00:00 2001
From: Eygene Ryabinkin <rea-fbsd at codelabs.ru>
Date: Sun, 24 May 2009 00:18:47 +0400

Without this, Perl's MakeMaker generates Makefiles with 'MAKE=make' and
this is bad for subdirectory targets where $(MAKE) is used: pmake is
invoked instead of GNU Make, so make process chokes at this point,
-----
gmake[2]: Entering directory
`/usr/ports/www/p5-libapreq2/work/libapreq2-2.12/glue/perl'
cp lib/Apache2/Cookie.pm blib/lib/Apache2/Cookie.pm
cp lib/Apache2/Upload.pm blib/lib/Apache2/Upload.pm
cp lib/Apache2/Request.pm blib/lib/Apache2/Request.pm
cp lib/APR/DummyVersions.pm blib/lib/APR/DummyVersions.pm
make: don't know how to make w. Stop
gmake[2]: *** [subdirs] Error 2
gmake[2]: Leaving directory
`/usr/ports/www/p5-libapreq2/work/libapreq2-2.12/glue/perl'
gmake[1]: *** [perl_glue] Error 2
gmake[1]: Leaving directory
`/usr/ports/www/p5-libapreq2/work/libapreq2-2.12/glue'
gmake: *** [all-recursive] Error 1
*** Error code 1

Stop in /usr/ports/www/p5-libapreq2.
-----

Signed-off-by: Eygene Ryabinkin <rea-fbsd at codelabs.ru>
---
 www/p5-libapreq2/Makefile |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/www/p5-libapreq2/Makefile b/www/p5-libapreq2/Makefile
index 15e6485..b93ae27 100644
--- a/www/p5-libapreq2/Makefile
+++ b/www/p5-libapreq2/Makefile
@@ -10,8 +10,11 @@ CATEGORIES=	www perl5 devel
 MAINTAINER=	skv at FreeBSD.org
 COMMENT=	Generic Apache2 Request Library with perl binding
 
+PORTREVISION=	1
+
 MASTERDIR=	${.CURDIR}/../libapreq2
 
 WITH_MODPERL2=	yes
+MAKE_ENV+=	MAKE=${GMAKE}
 
 .include "${MASTERDIR}/Makefile"
-- 
1.6.3.1
--- 2.12-pass-down-MAKE-equal-to-gmake.diff ends here ---

And this patch fixes pkg-plist.
--- 2.12-fix-plist.diff begins here ---
>From 7abb5b715c2173fb133d0ea264dc2439fe3746e9 Mon Sep 17 00:00:00 2001
From: Eygene Ryabinkin <rea-fbsd at codelabs.ru>
Date: Sun, 24 May 2009 09:03:26 +0400
Subject: [PATCH] www/p5-libapreq: fix pkg-plist

Signed-off-by: Eygene Ryabinkin <rea-fbsd at codelabs.ru>
---
 www/libapreq2/pkg-plist |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/www/libapreq2/pkg-plist b/www/libapreq2/pkg-plist
index 58a26de..2ca70c0 100644
--- a/www/libapreq2/pkg-plist
+++ b/www/libapreq2/pkg-plist
@@ -15,6 +15,7 @@ lib/libapreq2.so.%%SHLIB_MAJOR%%
 %%APACHEMODDIR%%/mod_apreq2.a
 %%APACHEMODDIR%%/mod_apreq2.la
 %%APACHEMODDIR%%/mod_apreq2.so
+%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/DummyVersions.pm
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request.pm
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request.pod
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Apache2.pm
-- 
1.6.3.1
--- 2.12-fix-plist.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: