Re: CVS commit: pkgsrc/lang/f2c

[Matthias Scheler <tron%NetBSD.org@localhost>]

On Mon, Nov 23, 2009 at 11:51:58AM +0000, Matthias Scheler wrote:
> On Mon, Nov 23, 2009 at 01:10:28PM +0300, Aleksej Saushev wrote:
> > Matthias Scheler <tron%NetBSD.org@localhost> writes:
> > 
> > > On Sun, Nov 22, 2009 at 12:52:54PM +0000, Aleksej Saushev wrote:
> > >
> > > This breaks the build under Mac OS X and probably a lot of other 
> > > platforms:
> > >
> > > There is no "bsd.init.mk" in the "bootstrap-mk-files" package.
> > 
> > This has been reported already, could you test this (no access to
> > "other" platforms today):
> 
> That fixes "half the problem". "libF77/Makefile" still references
> "bsd.init.mk".
> 
> What about putting a copy of "bsd.init.mk" into the "files" directory?

The attached patch works around the "bsd.init.mk" issue (in not
particular nice way ... :-( ). However the package still
doesn't build under Mac OS X:

===> src (all)
Warning: Object directory not changed from original 
/Users/tron/obj/lang/f2c/work.excalibur/f2c/src
yacc -d -o gram.c gram.y
gram.y:911.11-15: warning: type clash on default action: <expval> != <>
gram.y:911.17: syntax error, unexpected =
*** Error code 1

        Kind regards

-- 
Matthias Scheler                                  http://zhadum.org.uk/

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/f2c/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- Makefile    22 Nov 2009 12:52:53 -0000      1.47
+++ Makefile    23 Nov 2009 12:04:48 -0000
@@ -31,10 +31,13 @@
 
 USE_BSD_MAKEFILE=      yes
 MAKE_FLAGS=    LIBF2CSRCDIR='$$(.CURDIR)/libf2c' MKLTARCHIVE=yes
+MAKE_FLAGS+=   -m /usr/share/mk -m ${PREFIX}/share/mk -m ${FILESDIR}
 
 INSTALLATION_DIRS=     bin lib include share/doc/f2c ${PKGMANDIR}/man1 
${PKGMANDIR}/cat1
 INSTALL_MAKE_FLAGS=    BINDIR=$(PREFIX)/bin LIBDIR=$(PREFIX)/lib
 
+.include "../../mk/bsd.prefs.mk"
+
 post-extract:
        @${RM} ${WRKSRC}/index.html
        @cd ${WRKSRC}; ${RM} -f libf77 libi77           # subsumed by libf2c...
Index: files/bsd.init.mk
===================================================================
RCS file: files/bsd.init.mk
diff -N files/bsd.init.mk
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ files/bsd.init.mk   23 Nov 2009 12:04:48 -0000
@@ -0,0 +1,13 @@
+#      $NetBSD: bsd.init.mk,v 1.2 2003/07/28 02:38:33 lukem Exp $
+
+# <bsd.init.mk> includes Makefile.inc and <bsd.own.mk>; this is used at the
+# top of all <bsd.*.mk> files which actually "build something".
+
+.if !defined(_BSD_INIT_MK_)
+_BSD_INIT_MK_=1
+
+.-include "${.CURDIR}/../Makefile.inc"
+.include <bsd.own.mk>
+.MAIN:         all
+
+.endif # !defined(_BSD_INIT_MK_)