Mon Oct 31 23:41:21 2011 UTC ()
Move the NOGCCERROR.  When using '+=' on a make variable it  must come
_after_ '?=' is used on that variable.

Bump PKGREVISION


(sbd)
diff -r1.25 -r1.26 pkgsrc/pkgtools/bootstrap-mk-files/Makefile
diff -r1.2 -r1.3 pkgsrc/pkgtools/bootstrap-mk-files/files/mods/Linux.sys.mk
cvs diff -r1.25 -r1.26 pkgsrc/pkgtools/bootstrap-mk-files/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/bootstrap-mk-files/Makefile 2010/05/12 20:57:46 1.25
+++ pkgsrc/pkgtools/bootstrap-mk-files/Makefile 2011/10/31 23:41:21 1.26
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.25 2010/05/12 20:57:46 tez Exp $ 1# $NetBSD: Makefile,v 1.26 2011/10/31 23:41:21 sbd Exp $
2 2
3DISTNAME= bootstrap-mk-files-20090807 3DISTNAME= bootstrap-mk-files-20090807
4PKGREVISION= 2 4PKGREVISION= 3
5CATEGORIES= pkgtools 5CATEGORIES= pkgtools
6MASTER_SITES= # empty 6MASTER_SITES= # empty
7DISTFILES= # empty 7DISTFILES= # empty
8 8
9CONFLICTS+= mk-files-[0-9]* 9CONFLICTS+= mk-files-[0-9]*
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.pkgsrc.org/ 12HOMEPAGE= http://www.pkgsrc.org/
13COMMENT= *.mk files for the bootstrap bmake utility 13COMMENT= *.mk files for the bootstrap bmake utility
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17NO_PKGTOOLS_REQD_CHECK= # defined 17NO_PKGTOOLS_REQD_CHECK= # defined
cvs diff -r1.2 -r1.3 pkgsrc/pkgtools/bootstrap-mk-files/files/mods/Linux.sys.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/bootstrap-mk-files/files/mods/Linux.sys.mk 2009/02/19 00:51:12 1.2
+++ pkgsrc/pkgtools/bootstrap-mk-files/files/mods/Linux.sys.mk 2011/10/31 23:41:21 1.3
@@ -1,26 +1,20 @@ @@ -1,26 +1,20 @@
1# $NetBSD: Linux.sys.mk,v 1.2 2009/02/19 00:51:12 abs Exp $ 1# $NetBSD: Linux.sys.mk,v 1.3 2011/10/31 23:41:21 sbd Exp $
2# NetBSD: sys.mk,v 1.58 2000/08/22 17:38:49 bjh21 Exp  2# NetBSD: sys.mk,v 1.58 2000/08/22 17:38:49 bjh21 Exp
3# @(#)sys.mk 8.2 (Berkeley) 3/21/94 3# @(#)sys.mk 8.2 (Berkeley) 3/21/94
4 4
5unix?= We run Unix. 5unix?= We run Unix.
6OS?= Linux 6OS?= Linux
7 7
8# At least Ubuntu 8.1 sets __attribute__((warn_unused_result)) on fwrite() 
9# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25509 
10.if !defined(NOGCCERROR) 
11CFLAGS+= -Wno-error 
12.endif 
13 
14.SUFFIXES: .out .a .ln .o .s .S .c .cc .cpp .cxx .C .F .f .r .y .l .cl .p .h 8.SUFFIXES: .out .a .ln .o .s .S .c .cc .cpp .cxx .C .F .f .r .y .l .cl .p .h
15.SUFFIXES: .sh .m4 9.SUFFIXES: .sh .m4
16  10
17.LIBS: .a 11.LIBS: .a
18 12
19AR?= ar 13AR?= ar
20ARFLAGS?= rl 14ARFLAGS?= rl
21RANLIB?= ranlib 15RANLIB?= ranlib
22 16
23AS?= as 17AS?= as
24AFLAGS?= 18AFLAGS?=
25COMPILE.s?= ${CC} ${AFLAGS} -c 19COMPILE.s?= ${CC} ${AFLAGS} -c
26LINK.s?= ${CC} ${AFLAGS} ${LDFLAGS} 20LINK.s?= ${CC} ${AFLAGS} ${LDFLAGS}
@@ -80,26 +74,32 @@ PFLAGS?= @@ -80,26 +74,32 @@ PFLAGS?=
80COMPILE.p?= ${PC} ${PFLAGS} ${CPPFLAGS} -c 74COMPILE.p?= ${PC} ${PFLAGS} ${CPPFLAGS} -c
81LINK.p?= ${PC} ${PFLAGS} ${CPPFLAGS} ${LDFLAGS} 75LINK.p?= ${PC} ${PFLAGS} ${CPPFLAGS} ${LDFLAGS}
82 76
83SHELL?= sh 77SHELL?= sh
84 78
85SIZE?= size 79SIZE?= size
86 80
87TSORT?= tsort 81TSORT?= tsort
88 82
89YACC?= yacc 83YACC?= yacc
90YFLAGS?= 84YFLAGS?=
91YACC.y?= ${YACC} ${YFLAGS} 85YACC.y?= ${YACC} ${YFLAGS}
92 86
 87# At least Ubuntu 8.1 sets __attribute__((warn_unused_result)) on fwrite()
 88# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25509
 89.if !defined(NOGCCERROR)
 90CFLAGS+= -Wno-error
 91.endif
 92
93# C 93# C
94.c: 94.c:
95 ${LINK.c} -o ${.TARGET} ${.IMPSRC} ${LDLIBS} 95 ${LINK.c} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
96.c.o: 96.c.o:
97 ${COMPILE.c} ${.IMPSRC} 97 ${COMPILE.c} ${.IMPSRC}
98.c.a: 98.c.a:
99 ${COMPILE.c} ${.IMPSRC} 99 ${COMPILE.c} ${.IMPSRC}
100 ${AR} ${ARFLAGS} $@ $*.o 100 ${AR} ${ARFLAGS} $@ $*.o
101 rm -f $*.o 101 rm -f $*.o
102.c.ln: 102.c.ln:
103 ${LINT} ${LINTFLAGS} ${CPPFLAGS:M-[IDU]*} -i ${.IMPSRC} 103 ${LINT} ${LINTFLAGS} ${CPPFLAGS:M-[IDU]*} -i ${.IMPSRC}
104 104
105# C++ 105# C++