svn commit: r356360 - head/devel/frama-c

[John Marino]

Author: marino
Date: Tue Jun  3 13:37:05 2014
New Revision: 356360
URL: http://svnweb.freebsd.org/changeset/ports/356360
QAT: https://qat.redports.org/buildarchive/r356360/

Log:
  devel/frama-c: Re-stage to correct -print-libpath
  
  The approach to staging had a bug.  frama-c -print-libpath returned
  a path to /wrkdirs (the standard work directory in poudriere).  Improve
  staging so frama-c knows where its installed.

Modified:
  head/devel/frama-c/Makefile

Modified: head/devel/frama-c/Makefile
==============================================================================
--- head/devel/frama-c/Makefile	Tue Jun  3 13:27:39 2014	(r356359)
+++ head/devel/frama-c/Makefile	Tue Jun  3 13:37:05 2014	(r356360)
@@ -4,6 +4,7 @@
 PORTNAME=		frama-c
 DISTVERSIONPREFIX=	Neon-
 DISTVERSION=		20140301
+PORTREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		http://frama-c.com/download/ LOCAL/bf
 
@@ -18,8 +19,8 @@ RUN_DEPENDS=	${LOCALBASE}/lib/ocaml/ocam
 USES=		gmake
 USE_OCAML=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-cpp="${FRAMAC_DEFAULT_CPP}"
-MAKE_ENV+=	FRAMAC_LIBDIR="${STAGEDIR}${PREFIX}/lib/frama-c"
+CONFIGURE_ARGS+=--with-cpp="${FRAMAC_DEFAULT_CPP}"
+MAKE_ENV+=	FRAMAC_LIBDIR="${PREFIX}/lib/frama-c"
 
 OPTIONS_DEFINE=	ALTERGO COQ GUI PLUGINS
 OPTIONS_DEFAULT=ALTERGO GUI PLUGINS
@@ -86,6 +87,8 @@ post-patch:
 		-e '\|$$(CP) frama-c|s|$$(CP)|${INSTALL_SCRIPT}|' \
 			${WRKSRC}/share/Makefile.dynamic
 	@${REINPLACE_CMD} -e '\|^# Installation|,\|^# File headers|{ \
+		\|_LIBDIR|s|(FRAMAC_LIBDIR)|(DESTDIR)$$(FRAMAC_LIBDIR)|; \
+		\|_PLUGINDIR|s|(FRAMAC_PLUGINDIR)|(DESTDIR)$$(FRAMAC_PLUGINDIR)|; \
 		\|$$(CP).*bin|s|$$(CP)|${INSTALL_SCRIPT}|; \
 		\|$$(CP).*man/|s|$$(CP)|${INSTALL_MAN}|; \
 		s|$$(CP)|${INSTALL_DATA}|; }' \