6 files changed, 17 insertions, 41 deletions

diff --git a/biology/mopac/Makefile b/biology/mopac/Makefile
index 5353c55c318f..874ec12fb655 100644
--- a/biology/mopac/Makefile
+++ b/biology/mopac/Makefile
@@ -3,35 +3,32 @@
 
 PORTNAME=	mopac
 PORTVERSION=	7.${MOPAC_SUBVERSION}
-PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	biology
-MASTER_SITES=	SF/${PORTNAME}7/${PORTNAME}7/${PORTNAME}7-1.00
-DISTNAME=	${PORTNAME}7-${MOPAC_SUBVERSION}
+MASTER_SITES=	http://bioinformatics.org/ghemical/download/%SUBDIR%/
+MASTER_SITE_SUBDIR=	release20111012 current
+DISTNAME=	mopac7-${MOPAC_SUBVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Semi-empirical (MNDO, etc.) molecular orbital calculation
 
-LIB_DEPENDS=	libf2c.so:${PORTSDIR}/lang/f2c
+LICENSE=	GPLv2 # (or later)
 
-USES=		gmake libtool
-USE_AUTOTOOLS=	aclocal automake autoconf libtoolize
-ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
-AUTOMAKE_ARGS=	--add-missing --copy
+USES=		fortran gmake libtool pathfix
+GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MOPAC_SUBVERSION=	1.11
-
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	EXAMPLES
 
+MOPAC_SUBVERSION=	1.15
+
 post-patch:
-	@${REINPLACE_CMD} -e '/pkgconfig/s|$$(libdir)|$$(prefix)/libdata|g' \
-		${WRKSRC}/Makefile.am
 	@${REINPLACE_CMD} -e '/usage/s|run_||g' \
 		-e 's|./src/mopac7|${PREFIX}/libexec/mopac7|g' \
 		${WRKSRC}/run_${PORTNAME}7
@@ -39,10 +36,9 @@ post-patch:
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/run_${PORTNAME}7 \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}7
-	${INSTALL_PROGRAM} ${WRKSRC}/src/.libs/${PORTNAME}7 \
+	${INSTALL_PROGRAM} ${WRKSRC}/fortran/.libs/${PORTNAME}7 \
 		${STAGEDIR}${PREFIX}/libexec/${PORTNAME}7
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/test
 	${INSTALL_DATA} ${WRKSRC}/tests/*.dat ${STAGEDIR}${EXAMPLESDIR}/test
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmopac7.so.0
 
 .include <bsd.port.mk>
diff --git a/biology/mopac/distinfo b/biology/mopac/distinfo
index 9bbb21d1a394..c602dce61834 100644
--- a/biology/mopac/distinfo
+++ b/biology/mopac/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mopac7-1.11.tar.gz) = 56dd55fc7e00e74095200b67aed1e9f0d06daa5b71dccdf944b5de5830d31921
-SIZE (mopac7-1.11.tar.gz) = 1157353
+SHA256 (mopac7-1.15.tar.gz) = 6d7ac5d78522db70f7794fd816cea32829cfa9e93774202fe80ba5a54375fbaa
+SIZE (mopac7-1.15.tar.gz) = 764547
diff --git a/biology/mopac/files/patch-libmopac7.pc.in b/biology/mopac/files/patch-libmopac7.pc.in
deleted file mode 100644
index e2b84132222c..000000000000
--- a/biology/mopac/files/patch-libmopac7.pc.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- libmopac7.pc.in~	2003-12-19 22:14:28.000000000 +0900
-+++ libmopac7.pc.in	2008-08-23 07:09:51.000000000 +0900
-@@ -4,4 +4,4 @@
- Name: libmopac7
- Description: A library for semi-empirical QM calculations.
- Version: @VERSION@
--Libs: -L${libdir} -lmopac7
-+Libs: -L${libdir} -lmopac7 -lf2c
diff --git a/biology/mopac/files/patch-src__Makefile.am b/biology/mopac/files/patch-src__Makefile.am
deleted file mode 100644
index 04d54e8406d3..000000000000
--- a/biology/mopac/files/patch-src__Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/Makefile.am.orig	2005-08-22 20:06:45.000000000 +0900
-+++ src/Makefile.am	2009-12-17 03:23:46.000000000 +0900
-@@ -42,7 +42,8 @@
- if HAVE_F2C
- noinst_PROGRAMS = mopac7
- mopac7_SOURCES = mopac7app.c
--mopac7_LDFLAGS = -lmopac7 -lf2c -lm
-+mopac7_LDADD = libmopac7.la
-+mopac7_LDFLAGS = -lf2c -lm
- else
- # the executable is not built!
- # so nothing here...
diff --git a/biology/mopac/pkg-descr b/biology/mopac/pkg-descr
index 77a5813124e7..ebe8b3e0d5c5 100644
--- a/biology/mopac/pkg-descr
+++ b/biology/mopac/pkg-descr
@@ -1,4 +1,4 @@
-MOPAC7, semi-empirical (MNDO, AM1, PM3, MINDO/3)
-quantum-chemical calculation written by James J. P. Stewart and co-workers.
+MOPAC7, semi-empirical (MNDO, AM1, PM3, MINDO/3) quantum-chemical
+calculation written by James J. P. Stewart and co-workers.
 
-WWW: http://sourceforge.net/projects/mopac7/
+WWW: http://bioinformatics.org/ghemical/
diff --git a/biology/mopac/pkg-plist b/biology/mopac/pkg-plist
index baebca125ddf..662c639fbc56 100644
--- a/biology/mopac/pkg-plist
+++ b/biology/mopac/pkg-plist
@@ -2,7 +2,7 @@ bin/mopac7
 include/mopac7/libmopac7.h
 lib/libmopac7.a
 lib/libmopac7.so
-lib/libmopac7.so.0
-lib/libmopac7.so.0.0.0
+lib/libmopac7.so.1
+lib/libmopac7.so.1.0.13
 libdata/pkgconfig/libmopac7.pc
 libexec/mopac7