From b285b7b5d8fb9ace3a3308e556cd89ac729840a7 Mon Sep 17 00:00:00 2001 From: Steve Price Date: Mon, 24 May 1999 02:20:21 +0000 Subject: Fix build for -current boxes with egcs' f77 compiler. --- biology/mopac/Makefile | 9 +++++++-- biology/mopac/files/patch-ad | 31 ++++++++++++++++++++++--------- 2 files changed, 29 insertions(+), 11 deletions(-) (limited to 'biology/mopac') diff --git a/biology/mopac/Makefile b/biology/mopac/Makefile index e6483fea10aa..0365ac65bd6b 100644 --- a/biology/mopac/Makefile +++ b/biology/mopac/Makefile @@ -3,7 +3,7 @@ # Date created: 1997-04-23 # Whom: Ryo MIYAMOTO # -# $Id: Makefile,v 1.2 1999/05/07 05:12:13 taoka Exp $ +# $Id: Makefile,v 1.3 1999/05/08 08:06:43 taoka Exp $ # DISTNAME= mopac7 @@ -20,6 +20,11 @@ MAINTAINER= rmiya@cc.hirosaki-u.ac.jp USE_GMAKE= yes +.include +.if ${OSVERSION} >= 400005 +MAKE_ENV+= HAVE_G2C=yes +.endif + post-patch: ${CP} ${WRKDIR}/${DISTNAME}/esp.rof ${WRKDIR}/${DISTNAME}/esp.f @@ -39,4 +44,4 @@ post-install: ${INSTALL_DATA} ${WRKDIR}/mopac7-man/mopac.tex ${PREFIX}/share/doc/mopac ${INSTALL_DATA} ${WRKDIR}/mopac7-man/mopac.dvi ${PREFIX}/share/doc/mopac -.include +.include diff --git a/biology/mopac/files/patch-ad b/biology/mopac/files/patch-ad index 82335302788e..5fb91c238546 100644 --- a/biology/mopac/files/patch-ad +++ b/biology/mopac/files/patch-ad @@ -1,12 +1,25 @@ -*** Makefile.orig Sun Apr 18 22:38:02 1999 ---- Makefile Sun Apr 18 22:49:30 1999 +*** Makefile.orig Sat May 22 13:51:28 1999 +--- Makefile Sat May 22 13:56:17 1999 *************** -*** 8,13 **** ---- 8,14 ---- +*** 7,13 **** + # make Makes the MOPAC file # make clean Clean up disk to minimum config # - FFLAGS = -O2 -w -+ LFLAGS = -lf2c +! FFLAGS = -O2 -w + HDRS = SIZES + SRCS := $(shell ls *.f) + CSRCS := $(shell ls *.c) +--- 7,19 ---- + # make Makes the MOPAC file + # make clean Clean up disk to minimum config + # +! FFLAGS ?= -O2 -w +! ifdef HAVE_G2C +! LFLAGS = -lg2c +! CFLAGS += -DHAVE_G2C +! else +! LFLAGS = -lf2c +! endif HDRS = SIZES SRCS := $(shell ls *.f) CSRCS := $(shell ls *.c) @@ -16,7 +29,7 @@ SIZEDEPEND = $(SIZEDEPSRC:.f=.o) MOPAC = MOPAC7 ! MOPACSHELL = mopac - BINDIR = /usr/local/bin +! BINDIR = /usr/local/bin OWNER = root.bin $(MOPAC): SIZES $(OBJS) @@ -26,12 +39,12 @@ clean: $(RM) $(OBJS) *.trace core ---- 16,31 ---- +--- 21,36 ---- SIZEDEPSRC := $(shell grep -l -i ' INCLUDE ' *.f; true) SIZEDEPEND = $(SIZEDEPSRC:.f=.o) MOPAC = MOPAC7 ! MOPACSHELL = rmopac - BINDIR = /usr/local/bin +! BINDIR = $(PREFIX)/bin OWNER = root.bin $(MOPAC): SIZES $(OBJS) -- cgit v1.2.3