From owner-svn-ports-head@FreeBSD.ORG  Tue Dec 17 21:24:18 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 62F22EA6;
 Tue, 17 Dec 2013 21:24:18 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4E9391E65;
 Tue, 17 Dec 2013 21:24:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHLOITx053054;
 Tue, 17 Dec 2013 21:24:18 GMT (envelope-from tijl@svn.freebsd.org)
Received: (from tijl@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHLOIq7053053;
 Tue, 17 Dec 2013 21:24:18 GMT (envelope-from tijl@svn.freebsd.org)
Message-Id: <201312172124.rBHLOIq7053053@svn.freebsd.org>
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Tue, 17 Dec 2013 21:24:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r336770 - head/biology/ortep3
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Dec 2013 21:24:18 -0000

Author: tijl
Date: Tue Dec 17 21:24:17 2013
New Revision: 336770
URL: http://svnweb.freebsd.org/changeset/ports/336770

Log:
  USES=fortran, fix LDFLAGS, staging.

Modified:
  head/biology/ortep3/Makefile

Modified: head/biology/ortep3/Makefile
==============================================================================
--- head/biology/ortep3/Makefile	Tue Dec 17 20:57:25 2013	(r336769)
+++ head/biology/ortep3/Makefile	Tue Dec 17 21:24:17 2013	(r336770)
@@ -15,11 +15,11 @@ COMMENT=	Oak Ridge Thermal Ellipsoid Plo
 
 PGPLOT_LIB_DEPENDS=	libpgplot.so:${PORTSDIR}/graphics/pgplot
 
-USE_FORTRAN=	yes
+USES=		fortran
 WRKSRC=		${WRKDIR}/ortep/src
-MAKE_ARGS=	LFLAGS="${LFLAGS}"
+MAKE_ARGS=	LFLAGS="${LDFLAGS}"
 
-PGPLOT_LFLAGS=	-L${LOCALBASE}/lib -lpgplot -lX11
+PGPLOT_LDFLAGS=	-L${LOCALBASE}/lib -lpgplot -lX11
 
 PLIST_FILES+=	bin/ortep3
 PORTDOCS=	*
@@ -28,7 +28,6 @@ PORTEXAMPLES=	*
 OPTIONS_DEFINE=	DOCS EXAMPLES PGPLOT
 PGPLOT_DESC=	Fortran subroutine package for drawing graphs
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPGPLOT}
@@ -43,16 +42,16 @@ pre-build:
 	${CP} ${FILESDIR}/Makefile.ortep3 ${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ortep3 ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/ortep3 ${STAGEDIR}${PREFIX}/bin
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}/src
-	${INSTALL_DATA} ${WRKSRC}/../README.1st ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/../man/* ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/000readme.txt ${DOCSDIR}/src
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/src
+	${INSTALL_DATA} ${WRKSRC}/../README.1st ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/../man/* ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/000readme.txt ${STAGEDIR}${DOCSDIR}/src
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/../examples/* ${EXAMPLESDIR}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/../examples/* ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>