Don't enforce linking in MAIN__. Bump package revision.

No changes in libraries.
No fallout expected, none found so far.

5 files changed, 18 insertions, 31 deletions

diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile
index 0f9647164b3..911c5f464e5 100644
--- a/lang/f2c/Makefile
+++ b/lang/f2c/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2009/01/05 03:45:17 dbj Exp $
+# $NetBSD: Makefile,v 1.46 2009/10/31 19:15:44 asau Exp $
 
 DISTNAME=	f2c-20001205
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
@@ -35,8 +35,6 @@ MAKE_ENV+=	F2CMAJOR=${F2CMAJOR:Q} F2CMINOR=${F2CMINOR:Q}
 MAKE_ENV+=	LIBOWN=${LIBOWN:Q} LIBGRP=${LIBGRP:Q}
 MAKE_ENV+=	AWK=${AWK:Q}
 MAKE_ENV+=	ECHO=${ECHO:Q}
-MAKE_ENV+=	F2C_F77_IN=${FILESDIR:Q}/f2c-f77.in
-MAKE_ENV+=	SCRIPT_SHELL=${TOOLS_PLATFORM.sh:Q}
 WRKSRC=		${WRKDIR}/f2c
 USE_LIBTOOL=	yes
 USE_TOOLS+=	gunzip
@@ -68,6 +66,16 @@ do-configure:
 	@${CP} -f ${WRKSRC}/f2c.h ${WRKSRC}/libF77/f2c.h
 	@${CP} -f ${WRKSRC}/f2c.h ${WRKSRC}/libI77/f2c.h
 
+# Handle f2c-f77 script:
+post-build:
+	${SED} -e 's;@PREFIX@;${PREFIX};g' \
+	  -e 's;@CC@;${CC};g' -e 's;@CPP@;${CPP};g' \
+	  -e "s;@SHELL@;${TOOLS_PLATFORM.sh:Q};g" \
+	 ${FILESDIR}/f2c-f77.in > ${WRKSRC}/f2c-f77
+
+post-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/f2c-f77 ${DESTDIR}${PREFIX}/bin
+
 .include "../../mk/bsd.prefs.mk"
 MAKE_ENV+=	MACHINE_ARCH=${MACHINE_ARCH:Q}
 
diff --git a/lang/f2c/distinfo b/lang/f2c/distinfo
index bcce11a0011..aae5a6ce586 100644
--- a/lang/f2c/distinfo
+++ b/lang/f2c/distinfo
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.19 2009/06/25 14:22:08 dmcmahill Exp $
+$NetBSD: distinfo,v 1.20 2009/10/31 19:15:44 asau Exp $
 
 SHA1 (f2c-20001205.tar.gz) = f3cc1653eb962fee45d850df50890fc53448a17f
 RMD160 (f2c-20001205.tar.gz) = b376105c33ca53df46cab458082b26dbc9a53762
 Size (f2c-20001205.tar.gz) = 988607 bytes
-SHA1 (patch-aa) = f9598998d662f74225a64fb019ddaf1e08bb16aa
+SHA1 (patch-aa) = 075f40a648a25ed42625a1868a9baa3f93411009
 SHA1 (patch-ab) = 97c676fa452daa674e11348412ccb26d38a7baa4
 SHA1 (patch-ad) = 7f204a45891e3632589ea8fb0e4e379a0a792dea
 SHA1 (patch-ae) = f17254cab1449273ca44e652ed2f1a586a9a3e19
 SHA1 (patch-af) = fe24139c21862e85c576118166b7deab8e421572
 SHA1 (patch-ag) = 08d145e598ea5d376cee34ec42c7a98cae80668d
-SHA1 (patch-ah) = 54e4679e33cf3adc3b0d2b8b5b4e98cf26370319
 SHA1 (patch-ai) = d8c1f731c18394e0953b6128d0bd597986ab910f
 SHA1 (patch-aj) = c58361fbbfc06e033b2a47e1d1e370716c4b185c
 SHA1 (patch-ak) = 5d95d88cb7118ee7b1047db24880cbd49a782807
diff --git a/lang/f2c/files/f2c-f77.in b/lang/f2c/files/f2c-f77.in
index 2aa8b10fe2b..b251d3425e5 100644
--- a/lang/f2c/files/f2c-f77.in
+++ b/lang/f2c/files/f2c-f77.in
@@ -459,7 +459,7 @@ done
 
 case $cOPT 
 in 
-  2) eval "\$CC $CFLAGS -o \$OUTF @MAIN@ $OFILES $LIBS $FLIBS"
+  2) eval "\$CC $CFLAGS -o \$OUTF $OFILES $LIBS $FLIBS"
      ;; 
 esac
 
diff --git a/lang/f2c/patches/patch-aa b/lang/f2c/patches/patch-aa
index 981c4148223..d5240ad80fa 100644
--- a/lang/f2c/patches/patch-aa
+++ b/lang/f2c/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.17 2007/08/16 00:31:22 joerg Exp $
+$NetBSD: patch-aa,v 1.18 2009/10/31 19:15:44 asau Exp $
 
 --- Makefile.orig	Tue Sep 14 16:47:52 2004
 +++ Makefile
-@@ -0,0 +1,47 @@
+@@ -0,0 +1,39 @@
 +# Top level Makefile for f2c, libF77, and libI77
 +
-+all: f2c libF77/libF77.la libI77/libI77.la  f2c-f77 man
++all: f2c libF77/libF77.la libI77/libI77.la man
 +
 +
 +f2c:
@@ -32,7 +32,6 @@ $NetBSD: patch-aa,v 1.17 2007/08/16 00:31:22 joerg Exp $
 +install::
 +	-@mkdir -p ${DESTDIR}${PREFIX}/bin
 +	${BSD_INSTALL_PROGRAM} ./src/f2c ${DESTDIR}${PREFIX}/bin
-+	${BSD_INSTALL_SCRIPT} ./f2c-f77 ${DESTDIR}${PREFIX}/bin
 +	-@mkdir -p ${DESTDIR}${PREFIX}/lib
 +	@cd libI77 && ${MAKE} install LIBDIR=${DESTDIR}${PREFIX}/lib
 +	@cd libF77 && ${MAKE} install LIBDIR=${DESTDIR}${PREFIX}/lib
@@ -43,10 +42,3 @@ $NetBSD: patch-aa,v 1.17 2007/08/16 00:31:22 joerg Exp $
 +	${BSD_INSTALL_DATA} ./changes ${DESTDIR}${PREFIX}/share/doc/f2c
 +	${BSD_INSTALL_MAN} ./f2c.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 +	${BSD_INSTALL_MAN} ./f2c.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1
-+
-+f2c-f77: ${F2C_F77_IN}  f2c hello.f
-+	./src/f2c -Aw8 -Nn802 -Nx400 hello.f
-+	$(CC) $(CFLAGS) -c hello.c
-+	main=`$(NM) hello.o | ${AWK} 'BEGIN{x=""} {gsub(/\|/,""); for(i=1; i<=NF; i=i+1){if($$i ~ /MAIN/){x="-u " $$i}}} END{print x}'` ; \
-+	${ECHO} "Adding $$main to f2c-f77 script" ; \
-+	sed -e 's;@PREFIX@;${PREFIX};g' -e 's;@CC@;${CC};g' -e 's;@CPP@;${CPP};g' -e "s;@MAIN@;$$main;g" -e "s;@SHELL@;${SCRIPT_SHELL};g" ${F2C_F77_IN} > f2c-f77
diff --git a/lang/f2c/patches/patch-ah b/lang/f2c/patches/patch-ah
deleted file mode 100644
index c14276c6147..00000000000
--- a/lang/f2c/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.5 2004/09/15 20:56:31 dmcmahill Exp $
-
-Used in checks for _MAIN__ vs MAIN__
-
---- /dev/null	Wed Sep 15 12:50:48 2004
-+++ hello.f	Wed Sep 15 13:48:00 2004
-@@ -0,0 +1,5 @@
-+
-+      PROGRAM hello
-+      print*, 'hello world'
-+      END
-+