Mon Jul 11 07:47:02 2011 UTC ()
Pullup ticket #3469 - requested by bsiegert
devel/gmake: portability fix

Revisions pulled up:
- devel/gmake/Makefile                                          1.78

---
   Module Name:    pkgsrc
   Committed By:   bsiegert
   Date:           Sat Jul  9 16:25:35 UTC 2011

   Modified Files:
          pkgsrc/devel/gmake: Makefile

   Log Message:
   Do not use strndup on MirBSD, it used to be broken. Fixes lots of
   "mysterious" build failures on MirBSD.

   Reviewed by agc and joerg.


(tron)
diff -r1.77 -r1.77.2.1 pkgsrc/devel/gmake/Makefile
cvs diff -r1.77 -r1.77.2.1 pkgsrc/devel/gmake/Makefile (switch to unified diff)

--- pkgsrc/devel/gmake/Makefile 2011/04/22 13:43:19 1.77
+++ pkgsrc/devel/gmake/Makefile 2011/07/11 07:47:02 1.77.2.1
@@ -1,63 +1,68 @@ @@ -1,63 +1,68 @@
1# $NetBSD: Makefile,v 1.77 2011/04/22 13:43:19 obache Exp $ 1# $NetBSD: Makefile,v 1.77.2.1 2011/07/11 07:47:02 tron Exp $
2 2
3DISTNAME= make-3.82 3DISTNAME= make-3.82
4PKGNAME= g${DISTNAME} 4PKGNAME= g${DISTNAME}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= ${MASTER_SITE_GNU:=make/} 7MASTER_SITES= ${MASTER_SITE_GNU:=make/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.gnu.org/software/make/make.html 11HOMEPAGE= http://www.gnu.org/software/make/make.html
12COMMENT= GNU version of 'make' utility 12COMMENT= GNU version of 'make' utility
13LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
14 14
15PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
16PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
17 17
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19TEXINFO_REQD+= 4.0 19TEXINFO_REQD+= 4.0
20INFO_FILES= yes 20INFO_FILES= yes
21 21
22# NOTE: the 'test' target requires perl, but since gmake does 22# NOTE: the 'test' target requires perl, but since gmake does
23# not otherwise require it, perl is not listed as an explicit 23# not otherwise require it, perl is not listed as an explicit
24# dependency 24# dependency
25TEST_TARGET= check 25TEST_TARGET= check
26 26
27.include "../../mk/bsd.prefs.mk" 27.include "../../mk/bsd.prefs.mk"
28 28
29.if defined(GNU_PROGRAM_PREFIX) 29.if defined(GNU_PROGRAM_PREFIX)
30CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX:Q} 30CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX:Q}
31.endif 31.endif
32PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q} 32PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
33BUILD_DEFS+= GNU_PROGRAM_PREFIX 33BUILD_DEFS+= GNU_PROGRAM_PREFIX
34 34
35PLIST_VARS+= gmake 35PLIST_VARS+= gmake
36 36
37.if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g" 37.if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g"
38PLIST.gmake= yes 38PLIST.gmake= yes
39.endif 39.endif
40 40
41PLIST_SRC= ${PKGDIR}/PLIST 41PLIST_SRC= ${PKGDIR}/PLIST
42 42
43GMAKE_LOCALE?= yes 43GMAKE_LOCALE?= yes
44BUILD_DEFS+= GMAKE_LOCALE 44BUILD_DEFS+= GMAKE_LOCALE
45MAKEFLAGS+= GMAKE_LOCALE=${GMAKE_LOCALE:Q} 45MAKEFLAGS+= GMAKE_LOCALE=${GMAKE_LOCALE:Q}
46.if !empty(GMAKE_LOCALE:M[yY][eE][sS]) 46.if !empty(GMAKE_LOCALE:M[yY][eE][sS])
47USE_PKGLOCALEDIR= yes 47USE_PKGLOCALEDIR= yes
48PLIST_SRC+= ${PKGDIR}/PLIST.locale 48PLIST_SRC+= ${PKGDIR}/PLIST.locale
49USE_TOOLS+= msgfmt 49USE_TOOLS+= msgfmt
50. include "../../devel/gettext-lib/buildlink3.mk" 50. include "../../devel/gettext-lib/buildlink3.mk"
51.else 51.else
52CONFIGURE_ARGS+= --without-libintl 52CONFIGURE_ARGS+= --without-libintl
53CONFIGURE_ARGS+= --without-libiconv 53CONFIGURE_ARGS+= --without-libiconv
54.endif 54.endif
55 55
 56.if ${OPSYS} == "MirBSD"
 57# workaround for broken strndup
 58CONFIGURE_ARGS+= ac_cv_func_strndup=no
 59.endif
 60
56post-install: 61post-install:
57 ${CHMOD} g-s ${DESTDIR}${PREFIX}/bin/${GNU_PROGRAM_PREFIX}make 62 ${CHMOD} g-s ${DESTDIR}${PREFIX}/bin/${GNU_PROGRAM_PREFIX}make
58 ${CHGRP} ${BINGRP} ${DESTDIR}${PREFIX}/bin/${GNU_PROGRAM_PREFIX}make 63 ${CHGRP} ${BINGRP} ${DESTDIR}${PREFIX}/bin/${GNU_PROGRAM_PREFIX}make
59.if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g" 64.if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g"
60 ${LN} -sf ${GNU_PROGRAM_PREFIX}make ${DESTDIR}${PREFIX}/bin/gmake 65 ${LN} -sf ${GNU_PROGRAM_PREFIX}make ${DESTDIR}${PREFIX}/bin/gmake
61.endif 66.endif
62 67
63.include "../../mk/bsd.pkg.mk" 68.include "../../mk/bsd.pkg.mk"