From owner-svn-ports-all@FreeBSD.ORG  Sun Jun  1 10:31:46 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4B80EC39;
 Sun,  1 Jun 2014 10:31:46 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 205872DCB;
 Sun,  1 Jun 2014 10:31:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s51AVjSh087417;
 Sun, 1 Jun 2014 10:31:45 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s51AVjEH087416;
 Sun, 1 Jun 2014 10:31:45 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201406011031.s51AVjEH087416@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Sun, 1 Jun 2014 10:31:45 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r356091 - branches/2014Q2/lang/execline
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Jun 2014 10:31:46 -0000

Author: pawel
Date: Sun Jun  1 10:31:45 2014
New Revision: 356091
URL: http://svnweb.freebsd.org/changeset/ports/356091
QAT: https://qat.redports.org/buildarchive/r356091/

Log:
  MFH: r356067
  
  - Fix build on 10+ by respecting CC, CFLAGS
  - Add staging support
  - Convert to new options framework
  
  Approved by:	portmgr (miwi)

Modified:
  branches/2014Q2/lang/execline/Makefile
Directory Properties:
  branches/2014Q2/   (props changed)

Modified: branches/2014Q2/lang/execline/Makefile
==============================================================================
--- branches/2014Q2/lang/execline/Makefile	Sun Jun  1 10:28:07 2014	(r356090)
+++ branches/2014Q2/lang/execline/Makefile	Sun Jun  1 10:31:45 2014	(r356091)
@@ -16,7 +16,8 @@ WRKSRC=		${WRKDIR}/admin/${DISTNAME}
 DOCS=		package/CHANGES package/README package/THANKS package/TODO \
 		doc/*.html
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
 do-configure:
 	${ECHO_CMD} "FreeBSD"	> ${WRKSRC}/src/sys/systype
 	${ECHO_CMD} "${LOCALBASE}/include/skalibs" \
@@ -25,20 +26,22 @@ do-configure:
 		>> ${WRKSRC}/conf-compile/import
 	${REINPLACE_CMD} -e 's|superstrip1|#superstrip1|g' \
 		${WRKSRC}/conf-compile/conf-stripbins
+	@${REINPLACE_CMD} 's|gcc|${CC}|; s|-O2.*|${CFLAGS}|' \
+		${WRKSRC}/conf-compile/conf-cc \
+		${WRKSRC}/conf-compile/conf-ld
 
 do-build:
 	cd ${WRKSRC} && package/compile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/command/* ${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/include/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/library/* ${PREFIX}/lib
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/etc/* ${EXAMPLESDIR}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/command/* ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/include/* \
+		${STAGEDIR}${PREFIX}/include/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/library/* ${STAGEDIR}${PREFIX}/lib
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/etc/* ${STAGEDIR}${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>