[pkgsrc/trunk]: pkgsrc/devel/p5-glib2 Don't conditionally generate BSD bmake ...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8e9ce9451b30
branches:  trunk
changeset: 527988:8e9ce9451b30
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Apr 17 21:34:14 2007 +0000

description:
Don't conditionally generate BSD bmake or GNU make syntax. Just use
a simple and portable (POSIX only!) trick. Bump revision.

diffstat:

 devel/p5-glib2/Makefile         |   5 +++--
 devel/p5-glib2/distinfo         |   3 ++-
 devel/p5-glib2/patches/patch-aa |  31 +++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 3 deletions(-)

diffs (69 lines):

diff -r 68fc8d021ee1 -r 8e9ce9451b30 devel/p5-glib2/Makefile
--- a/devel/p5-glib2/Makefile   Tue Apr 17 21:32:06 2007 +0000
+++ b/devel/p5-glib2/Makefile   Tue Apr 17 21:34:14 2007 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2007/04/15 19:40:41 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2007/04/17 21:34:14 joerg Exp $
 #
 
 DISTNAME=      Glib-${DIST_VERSION}
 PKGNAME=       p5-glib2-${DIST_VERSION}
+PKGREVISION=   1
 CATEGORIES=    devel perl5
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gtk2-perl/}
 
@@ -15,7 +16,7 @@
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
-USE_TOOLS+=    pkg-config gmake
+USE_TOOLS+=    pkg-config
 
 DIST_VERSION=  1.144
 
diff -r 68fc8d021ee1 -r 8e9ce9451b30 devel/p5-glib2/distinfo
--- a/devel/p5-glib2/distinfo   Tue Apr 17 21:32:06 2007 +0000
+++ b/devel/p5-glib2/distinfo   Tue Apr 17 21:34:14 2007 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2007/04/13 23:24:44 xtraeme Exp $
+$NetBSD: distinfo,v 1.6 2007/04/17 21:34:14 joerg Exp $
 
 SHA1 (Glib-1.144.tar.gz) = 38a7870501b49dee6676e055343ce6a13cfe2422
 RMD160 (Glib-1.144.tar.gz) = 1cd1c7d7863bbac8327c9e3594453d1109ce018a
 Size (Glib-1.144.tar.gz) = 242230 bytes
+SHA1 (patch-aa) = 230ca0448b73bb75264e1d7e2be9beddcac811a3
diff -r 68fc8d021ee1 -r 8e9ce9451b30 devel/p5-glib2/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/p5-glib2/patches/patch-aa   Tue Apr 17 21:34:14 2007 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-aa,v 1.1 2007/04/17 21:34:14 joerg Exp $
+
+--- MakeHelper.pm.orig 2007-02-24 14:14:35.000000000 +0000
++++ MakeHelper.pm
+@@ -389,23 +389,11 @@ BLIB_DONE=\$(INST_DYNAMIC)
+ BLIB_DONE=\$(INST_STATIC)
+ !ENDIF
+ ";
+-      } elsif ($^O =~ m{^(freebsd|netbsd|openbsd)$}i && !$ENV{FORCE_GMAKE}) {
+-              warn "Defaulting to BSD make; set FORCE_GMAKE if you want GNU make\n";
+-              $blib_done = "
+-.if \$(LINKTYPE) == dynamic
+-BLIB_DONE=\$(INST_DYNAMIC)
+-.else
+-BLIB_DONE=\$(INST_STATIC)
+-.endif
+-";
+       } else {
+-              # assuming GNU Make
+               $blib_done = "
+-ifeq (\$(LINKTYPE), dynamic)
+-      BLIB_DONE=\$(INST_DYNAMIC)
+-else
+-      BLIB_DONE=\$(INST_STATIC)
+-endif
++BLIB_DONE_dynamic=\$(INST_DYNAMIC)
++BLIB_DONE_static=\$(INST_STATIC)
++BLIB_DONE=\$(BLIB_DONE_\$(LINKTYP))
+ ";
+       }
+