diff options
| author | joerg <joerg@pkgsrc.org> | 2007-04-17 21:34:14 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-04-17 21:34:14 +0000 |
| commit | e85cf7bfdc0b3cb07c1ccaa1d9a141d089eaf2f9 (patch) | |
| tree | ca8ae3483e8b9beea47ef8fa5b3fb60ffc58acea /devel | |
| parent | 8d34b95c95734ff9ec637f9f1bf2b0ebd168833f (diff) | |
| download | pkgsrc-e85cf7bfdc0b3cb07c1ccaa1d9a141d089eaf2f9.tar.gz | |
Don't conditionally generate BSD bmake or GNU make syntax. Just use
a simple and portable (POSIX only!) trick. Bump revision.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/p5-glib2/Makefile | 5 | ||||
| -rw-r--r-- | devel/p5-glib2/distinfo | 3 | ||||
| -rw-r--r-- | devel/p5-glib2/patches/patch-aa | 31 |
3 files changed, 36 insertions, 3 deletions
diff --git a/devel/p5-glib2/Makefile b/devel/p5-glib2/Makefile index a3d4c2c8c49..ade15f155c6 100644 --- a/devel/p5-glib2/Makefile +++ b/devel/p5-glib2/Makefile @@ -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 @@ DEPENDS+= p5-ExtUtils-PkgConfig>=1.03:../../devel/p5-ExtUtils-PkgConfig PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_TOOLS+= pkg-config gmake +USE_TOOLS+= pkg-config DIST_VERSION= 1.144 diff --git a/devel/p5-glib2/distinfo b/devel/p5-glib2/distinfo index 42d23017f05..086c7c466d5 100644 --- a/devel/p5-glib2/distinfo +++ b/devel/p5-glib2/distinfo @@ -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 --git a/devel/p5-glib2/patches/patch-aa b/devel/p5-glib2/patches/patch-aa new file mode 100644 index 00000000000..c65c1c9cb53 --- /dev/null +++ b/devel/p5-glib2/patches/patch-aa @@ -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)) + "; + } + |