Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 17 Dec 2013 21:24:18 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r336770 - head/biology/ortep3
Message-ID:  <201312172124.rBHLOIq7053053@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312172124.rBHLOIq7053053>