Updated fort77 to 1.18. No ChangeLog available.

5 files changed, 30 insertions, 63 deletions

diff --git a/lang/fort77/Makefile b/lang/fort77/Makefile
index c40c7a05b61..578d6c810f1 100644
--- a/lang/fort77/Makefile
+++ b/lang/fort77/Makefile
@@ -1,40 +1,25 @@
-# $NetBSD: Makefile,v 1.18 2007/11/02 08:52:38 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2007/11/02 09:17:33 rillig Exp $
 #
 
-DISTNAME=		fort77-1.14a
+DISTNAME=		fort77-1.18
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_SUNSITE:=devel/lang/fortran/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		The driver for f2c, a fortran to C translator
 
-DEPENDS+=		f2c-[0-9]*:../../lang/f2c
-
-# on 1.3.X systems there is not shared libf2c, thus use libf2c.a
-# from the f2c package.
-.if !exists(/usr/bin/f77)
-F2CPKGHASNOSHAREDLIB=	-e 's:-lf2c:'${PREFIX}'/lib/libf2c.a:g'
-.else
-F2CPKGHASNOSHAREDLIB=
-.endif
-
-.if exists(/usr/bin/fort77)
-PKG_SKIP_REASON+=	"${PKGNAME} is part of your ${OPSYS} distribution"
-.endif
-
 BUILD_TARGET=		test
 USE_TOOLS+=		perl:run
 
-post-patch:
-	for f in `${FIND} ${WRKDIR}/* -type f -print | ${XARGS} ${GREP} -l '/usr'`; \
-	do \
-	  ${SED} -e 's:/usr:'${PREFIX}':g' <$$f >$$f.pdone && \
-	  ${MV} $$f.pdone $$f; \
-	done
-	${SED} -e 's:/lib/cpp:/usr/bin/cpp:g' ${F2CPKGHASNOSHAREDLIB} \
-		< ${WRKSRC}/fort77  > ${WRKSRC}/fort77.new
-	${MV} ${WRKSRC}/fort77.new ${WRKSRC}/fort77
-	${CHMOD} +x ${WRKSRC}/fort77
-	${CHMOD} +x ${WRKSRC}/tests/test.pl
+REPLACE_PERL=		fort77 tests/test.pl
+
+SUBST_CLASSES+=		perl
+SUBST_STAGE.perl=	pre-configure
+SUBST_FILES.perl=	fort77 tests/test.pl
+SUBST_SED.perl=		-e 's,/usr/bin/perl,${PERL5},'
+
+INSTALL_MAKE_FLAGS+=	PREFIX=${DESTDIR}${PREFIX} MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+INSTALLATION_DIRS_FROM_PLIST=	yes
 
+.include "../../lang/f2c/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/fort77/distinfo b/lang/fort77/distinfo
index 1a114f21952..2ac02432fbf 100644
--- a/lang/fort77/distinfo
+++ b/lang/fort77/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/05/25 12:37:37 wiz Exp $
+$NetBSD: distinfo,v 1.4 2007/11/02 09:17:33 rillig Exp $
 
-SHA1 (fort77-1.14a.tar.gz) = 2c786587992bfe6458d6d8a7767391f555f05cc8
-RMD160 (fort77-1.14a.tar.gz) = 35c3aadbc2a194d93b3bde5dc7e097d0ed618cc9
-Size (fort77-1.14a.tar.gz) = 6057 bytes
-SHA1 (patch-aa) = 6ba6f313cb553eb2160ae3d198fd05b67e52ff9a
-SHA1 (patch-ab) = 8e0a9ce6b1fd31f4fd6400eb955281b4aed60294
+SHA1 (fort77-1.18.tar.gz) = 0f8ba5a1106182a15e5ab87c615569b8911bc3a7
+RMD160 (fort77-1.18.tar.gz) = 9748f9e068b8071a5b89009bfdb533ee2a9b0c11
+Size (fort77-1.18.tar.gz) = 6562 bytes
+SHA1 (patch-fort77) = 0dccaff05defa1b0f57d94ede31e6b6b5c8cf78d
diff --git a/lang/fort77/patches/patch-aa b/lang/fort77/patches/patch-aa
deleted file mode 100644
index 7b5d18a898a..00000000000
--- a/lang/fort77/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/01/14 15:48:29 frueauf Exp $
-
---- fort77.orig	Sun Sep 27 17:05:10 1998
-+++ fort77	Sun Sep 27 17:07:36 1998
-@@ -12,6 +12,8 @@
- $debug = 0;
- $debugcmd = "";
- 
-+push(@includes, "-I/usr/include");
-+
- # Loop over all options; pull all options from @ARGV and put all
- # arguments into @argv.	 This is needed because, apparently, UNIX
- # compilers acceppt options anywhere on the command line.
diff --git a/lang/fort77/patches/patch-ab b/lang/fort77/patches/patch-ab
deleted file mode 100644
index 37eac239f6e..00000000000
--- a/lang/fort77/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/01/14 15:48:29 frueauf Exp $
-
---- Makefile.orig	Sun Sep 27 17:32:07 1998
-+++ Makefile	Sun Sep 27 17:32:47 1998
-@@ -6,9 +6,9 @@
- test:
- 	(cd tests; ./test.pl -v)
- 
--install: test
--	install -m 755 fort77 $(BINDIR)
--	install -m 644 fort77.1 $(MANDIR)
-+install:
-+	install -c -m 755 fort77 $(BINDIR)
-+	install -c -m 644 fort77.1 $(MANDIR)
- 
- clean:
- 	rm -f *.bak *.o core */*.bak */*.o */core
diff --git a/lang/fort77/patches/patch-fort77 b/lang/fort77/patches/patch-fort77
new file mode 100644
index 00000000000..b38e21dd867
--- /dev/null
+++ b/lang/fort77/patches/patch-fort77
@@ -0,0 +1,13 @@
+$NetBSD: patch-fort77,v 1.1 2007/11/02 09:17:33 rillig Exp $
+
+--- fort77.orig	2007-11-02 10:05:39.000000000 +0100
++++ fort77	2007-11-02 10:12:03.000000000 +0100
+@@ -364,7 +364,7 @@ exit if $compile_only;
+ 
+ push (@output, "-o", $output) if $output;
+ 
+-$retcode = &mysystem($cc, @output, @lfiles, @lopts, "-lf2c", "-lm" );
++$retcode = &mysystem($cc, @output, @lfiles, @lopts, "-lI77 -lF77", "-lm" );
+ if (@gener_lfiles) {
+     print STDERR "$0: unlinking ",join(',',@gener_lfiles),"\n" if $verbose;
+     unlink (@gener_lfiles);