4 files changed, 73 insertions, 82 deletions

diff --git a/biology/mopac/Makefile b/biology/mopac/Makefile
index b17fa95f626d..ebab5793fa9c 100644
--- a/biology/mopac/Makefile
+++ b/biology/mopac/Makefile
@@ -1,6 +1,6 @@
-# New ports collection makefile for:  mopac
-# Date created:  1997-04-23
-# Whom:	 Ryo MIYAMOTO <rmiya@cc.hirosaki-u.ac.jp>
+# New ports collection makefile for:	mopac
+# Date created:				1997-04-23
+# Whom:					Ryo MIYAMOTO <rmiya@cc.hirosaki-u.ac.jp>
 #
 # $FreeBSD$
 #
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.ccl.net/pub/chemistry/software/SOURCES/FORTRAN/mopac7_so
 DISTNAME=	mopac7
 DISTFILES=	mopac7.tar.Z  mopac7-man.tar.Z
 
-PATCH_SITES=   ftp://ftp.ccl.net/pub/chemistry/software/LINUX/mopac7/old-version-95.06.21/
+PATCH_SITES=	ftp://ftp.ccl.net/pub/chemistry/software/LINUX/mopac7/old-version-95.06.21/
 PATCHFILES=	mopac7-linux.diff.Z
 PATCH_DIST_STRIP=	-p1
 
@@ -21,27 +21,34 @@ MAINTAINER=	rmiya@cc.hirosaki-u.ac.jp
 USE_GMAKE=	yes
 
 .include <bsd.port.pre.mk>
+
 .if ${OSVERSION} >= 400005
-MAKE_ENV+=	HAVE_G2C=yes
+BUILD_DEPENDS=	fc:${PORTSDIR}/lang/f77
+MAKE_ARGS+=	FC=fc
+.else
+MAKE_ARGS+=	FC=f77
+.endif
+.if ${MACHINE_ARCH} == "i386"
+FFLAGS+=	-malign-double
 .endif
 
 post-patch:
 	${CP}  ${WRKDIR}/${DISTNAME}/esp.rof  ${WRKDIR}/${DISTNAME}/esp.f
 
-pre-install:
-	${CP} ${FILESDIR}/rmopac  ${WRKDIR}/${DISTNAME}/rmopac
-	${RM} -rf ${PREFIX}/share/doc/mopac
-	${MKDIR} ${PREFIX}/share/doc/mopac
-
 do-install:
-	strip ${WRKDIR}/${DISTNAME}/MOPAC7
 	${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/MOPAC7 ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME}/rmopac ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${FILESDIR}/rmopac ${PREFIX}/bin
 
 post-install:
-	${INSTALL_DATA} ${FILESDIR}/h2o.dat  ${PREFIX}/share/doc/mopac
-	${INSTALL_DATA} ${WRKDIR}/mopac7/test_* ${PREFIX}/share/doc/mopac
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/doc/mopac
+	${MKDIR} ${PREFIX}/share/examples/mopac
+	${MKDIR} ${PREFIX}/share/mopac/test
+	${INSTALL_DATA} ${FILESDIR}/h2o.dat  ${PREFIX}/share/examples/mopac
+	${INSTALL_SCRIPT} ${WRKDIR}/mopac7/test.csh ${PREFIX}/share/mopac/test
+	${INSTALL_DATA} ${WRKDIR}/mopac7/test_* ${PREFIX}/share/mopac/test
 	${INSTALL_DATA} ${WRKDIR}/mopac7-man/mopac.tex ${PREFIX}/share/doc/mopac
 	${INSTALL_DATA} ${WRKDIR}/mopac7-man/mopac.dvi ${PREFIX}/share/doc/mopac
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/biology/mopac/files/patch-ad b/biology/mopac/files/patch-ad
index 5fb91c238546..430ba6ebe820 100644
--- a/biology/mopac/files/patch-ad
+++ b/biology/mopac/files/patch-ad
@@ -1,58 +1,32 @@
-*** Makefile.orig	Sat May 22 13:51:28 1999
---- Makefile	Sat May 22 13:56:17 1999
-***************
-*** 7,13 ****
-  #	make		Makes the MOPAC file
-  #	make clean	Clean up disk to minimum config
-  #
-! 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) 
-***************
-*** 15,28 ****
-  SIZEDEPSRC	:= $(shell grep -l -i '      INCLUDE ' *.f; true)
-  SIZEDEPEND	= $(SIZEDEPSRC:.f=.o)
-  MOPAC		= MOPAC7
-! MOPACSHELL	= mopac
-! BINDIR		= /usr/local/bin
-  OWNER		= root.bin
-  
-  $(MOPAC):     	SIZES $(OBJS) 
-  		@echo -n "Loading $@ ... "
-! 		f77 -O $(OBJS) -o $@
-  		@echo "done"
-  
-  clean:
-  	 	$(RM) $(OBJS) *.trace core
---- 21,36 ----
-  SIZEDEPSRC	:= $(shell grep -l -i '      INCLUDE ' *.f; true)
-  SIZEDEPEND	= $(SIZEDEPSRC:.f=.o)
-  MOPAC		= MOPAC7
-! MOPACSHELL	= rmopac
-! BINDIR		= $(PREFIX)/bin
-  OWNER		= root.bin
-  
-  $(MOPAC):     	SIZES $(OBJS) 
-  		@echo -n "Loading $@ ... "
-! 		$(FC) -O $(OBJS) $(LFLAGS) -o $@
-  		@echo "done"
-+ 
-+ all:          $(MOPAC)
-  
-  clean:
-  	 	$(RM) $(OBJS) *.trace core
+--- Makefile.orig	Wed Jun  7 19:24:45 2000
++++ Makefile	Wed Jun  7 19:27:38 2000
+@@ -7,7 +7,8 @@
+ #	make		Makes the MOPAC file
+ #	make clean	Clean up disk to minimum config
+ #
+-FFLAGS	        = -O2 -w
++FFLAGS	        = -O -Wall
++CFLAGS		= -I$(PREFIX)/include -Wall
+ HDRS		= SIZES
+ SRCS		:= $(shell ls *.f)
+ CSRCS           := $(shell ls *.c) 
+@@ -15,14 +16,16 @@
+ SIZEDEPSRC	:= $(shell grep -l -i '      INCLUDE ' *.f; true)
+ SIZEDEPEND	= $(SIZEDEPSRC:.f=.o)
+ MOPAC		= MOPAC7
+-MOPACSHELL	= mopac
+-BINDIR		= /usr/local/bin
++MOPACSHELL	= rmopac
++BINDIR		= $(PREFIX)/bin
+ OWNER		= root.bin
+ 
+ $(MOPAC):     	SIZES $(OBJS) 
+ 		@echo -n "Loading $@ ... "
+-		f77 -O $(OBJS) -o $@
++		$(FC) $(OBJS) $(LFLAGS) -o $@
+ 		@echo "done"
++
++all:          $(MOPAC)
+ 
+ clean:
+ 	 	$(RM) $(OBJS) *.trace core
diff --git a/biology/mopac/pkg-descr b/biology/mopac/pkg-descr
index b133a08bc459..f9a0ba8c1454 100644
--- a/biology/mopac/pkg-descr
+++ b/biology/mopac/pkg-descr
@@ -6,5 +6,11 @@ This port uses Linux patch.
 
 Minematsu makes FreeBSD patchs, and Miyamoto is porting them.
 And enlarging max atoms as  MAXHEV=50 & MAXLIT=50.
+
+Potring to 4.0-CURRENT (__FreeBSD_version == 400005) and later versions 
+have been assisted greatly by Glenn Johnson <gjohnson@nola.srrc.usda.gov>, 
+thanks a lot !
+He found that an unusable binary was produced using g77 at FreeBSD 4,
+then it is recommended to use f2c/cc.
 --
 rmiya
diff --git a/biology/mopac/pkg-plist b/biology/mopac/pkg-plist
index a1d645f52dc9..c5b16ce925c0 100644
--- a/biology/mopac/pkg-plist
+++ b/biology/mopac/pkg-plist
@@ -2,14 +2,18 @@ bin/MOPAC7
 bin/rmopac
 share/doc/mopac/mopac.tex
 share/doc/mopac/mopac.dvi
-share/doc/mopac/h2o.dat
-share/doc/mopac/test_cos.dat
-share/doc/mopac/test_cos.out
-share/doc/mopac/test_ef_.dat
-share/doc/mopac/test_ef_.out
-share/doc/mopac/test_gre.dat
-share/doc/mopac/test_gre.end
-share/doc/mopac/test_gre.out
-share/doc/mopac/test_pol.dat
-share/doc/mopac/test_pol.out
+share/examples/mopac/h2o.dat
+share/mopac/test/test_cos.dat
+share/mopac/test/test_cos.out
+share/mopac/test/test_ef_.dat
+share/mopac/test/test_ef_.out
+share/mopac/test/test_gre.dat
+share/mopac/test/test_gre.end
+share/mopac/test/test_gre.out
+share/mopac/test/test_pol.dat
+share/mopac/test/test_pol.out
+share/mopac/test/test.csh
+@dirrm share/examples/mopac
 @dirrm share/doc/mopac
+@dirrm share/mopac/test
+@dirrm share/mopac