4 files changed, 49 insertions, 41 deletions

diff --git a/biology/mopac/Makefile b/biology/mopac/Makefile
index 9c3158e7f7b1..a629f71d76b2 100644
--- a/biology/mopac/Makefile
+++ b/biology/mopac/Makefile
@@ -7,40 +7,40 @@
 
 PORTNAME=	mopac
 PORTVERSION=	7.${MOPAC_SUBVERSION}
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	biology
-MASTER_SITES=	SF/${PORTNAME}7/${PORTNAME}7/${PORTNAME}7-1.10
-DISTNAME=	mopac7-${MOPAC_SUBVERSION}
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	SF/${PORTNAME}7/${PORTNAME}7/${PORTNAME}7-1.00
+DISTNAME=	${PORTNAME}7-${MOPAC_SUBVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Semi-empirical (MNDO, etc.) molecular orbital calculation
 
-BUILD_DEPENDS=	f2c:${PORTSDIR}/lang/f2c
 LIB_DEPENDS=	f2c:${PORTSDIR}/lang/f2c
 
-MOPAC_SUBVERSION=	1.10
-WRKSRC=		${WRKDIR}/mopac7-${MOPAC_SUBVERSION}
-GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV+=	CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
-MAKE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
-MAKE_JOBS_UNSAFE=	yes
-CFLAGS+=	-I${LOCALBASE}/include
+USE_AUTOTOOLS=	aclocal:110 automake:110 autoconf:262 libtool:22
+ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
+AUTOMAKE_ARGS=	--add-missing --copy
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+MAKE_JOBS_SAFE=	yes
+USE_LDCONFIG=	yes
+
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
+
+MOPAC_SUBVERSION=	1.11
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		"s,pkgconfigdir = .*,pkgconfigdir = $$\{exec_prefix\}/libdata/pkgconfig," \
-		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e '/pkgconfig/s|$$(libdir)|$$(prefix)/libdata|g' \
+		${WRKSRC}/Makefile.am
+	@${REINPLACE_CMD} -e '/usage/s|run_||g' \
+		${WRKSRC}/run_${PORTNAME}7
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/run_mopac7  ${PREFIX}/bin/mopac7
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/run_${PORTNAME}7 ${PREFIX}/bin/${PORTNAME}7
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}/test
-	${INSTALL_DATA} ${WRKSRC}/tests/*dat ${EXAMPLESDIR}/test
-	${INSTALL_DATA} ${WRKSRC}/tests/*OUT ${EXAMPLESDIR}/test
+	${INSTALL_DATA} ${WRKSRC}/tests/*.dat ${EXAMPLESDIR}/test
 .endif
 
 .include <bsd.port.mk>
diff --git a/biology/mopac/distinfo b/biology/mopac/distinfo
index 4b6b5c8b6d56..02575452f359 100644
--- a/biology/mopac/distinfo
+++ b/biology/mopac/distinfo
@@ -1,3 +1,3 @@
-MD5 (mopac7-1.10.tgz) = d5352a3cf349b9ac4df943bb7992cfa9
-SHA256 (mopac7-1.10.tgz) = 993ace860c77345d1c8629f416bfc765610b9f264e9885b3777f44b745817ab5
-SIZE (mopac7-1.10.tgz) = 1596446
+MD5 (mopac7-1.11.tar.gz) = 501c34ad4995d127dca8461a05ceb66a
+SHA256 (mopac7-1.11.tar.gz) = 56dd55fc7e00e74095200b67aed1e9f0d06daa5b71dccdf944b5de5830d31921
+SIZE (mopac7-1.11.tar.gz) = 1157353
diff --git a/biology/mopac/files/patch-src__Makefile.am b/biology/mopac/files/patch-src__Makefile.am
new file mode 100644
index 000000000000..04d54e8406d3
--- /dev/null
+++ b/biology/mopac/files/patch-src__Makefile.am
@@ -0,0 +1,12 @@
+--- 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-plist b/biology/mopac/pkg-plist
index 43e463b4fd1c..047335d5b77e 100644
--- a/biology/mopac/pkg-plist
+++ b/biology/mopac/pkg-plist
@@ -5,22 +5,18 @@ lib/libmopac7.la
 lib/libmopac7.so
 lib/libmopac7.so.0
 libdata/pkgconfig/libmopac7.pc
-%%PORTDOCS%%%%EXAMPLESDIR%%/test/1scf.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/test/elements.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/test/force.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/test/geometry.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/test/keys.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/test/nch34+.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/test/oldgeo.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/test/paras.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_cos.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_ef_.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_gre.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_pol.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_cos.OUT
-%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_ef_.OUT
-%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_gre.OUT
-%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_pol.OUT
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/test
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/1scf.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/elements.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/force.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/geometry.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/keys.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/nch34+.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/oldgeo.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/paras.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/test_cos.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/test_ef_.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/test_gre.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/test_pol.dat
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/test
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm include/mopac7