Bug 189727 - [STAGE] [patch] cad/feappv
Summary: [STAGE] [patch] cad/feappv
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Alex Kozlov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-05-12 18:50 UTC by Anton Shterenlikht
Modified: 2014-05-20 13:10 UTC (History)
0 users

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Anton Shterenlikht 2014-05-12 18:50:01 UTC 
support staging, checked on redports and ia64.
svn patch:

Index: cad/feappv/Makefile
===================================================================
--- cad/feappv/Makefile (revision 353817)
+++ cad/feappv/Makefile (working copy)
@@ -29,12 +29,11 @@
 
 OPTIONS_DEFINE=        DOCS
 
-NO_STAGE=      yes
 .include <bsd.port.options.mk>
 
 post-patch:
        @${REINPLACE_CMD} -e \
-               's| make | $$(MAKE) |' ${WRKSRC}/makefile
+               's| make | $${MAKE} |' ${WRKSRC}/makefile
        @${REINPLACE_CMD} -e \
                '/^FF /s|=.*|= ${FC}| ; \
                 /^CC /s|=.*|= ${CC}| ; \
@@ -44,11 +43,11 @@
                 s|Feappv.a|libfeappv.a|' ${WRKSRC}/makefile.in
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/main/feappv ${PREFIX}/bin
-       ${INSTALL_DATA} ${WRKSRC}/libfeappv.a ${PREFIX}/lib
+       ${INSTALL_PROGRAM} ${WRKSRC}/main/feappv ${STAGEDIR}${PREFIX}/bin
+       ${INSTALL_DATA} ${WRKSRC}/libfeappv.a ${STAGEDIR}${PREFIX}/lib
 .if ${PORT_OPTIONS:MDOCS}
-       @${MKDIR} ${DOCSDIR}
-       ${INSTALL_DATA} ${_DISTDIR}/${PORTDOCS} ${DOCSDIR}
+       @${MKDIR} ${STAGEDIR}${DOCSDIR}
+       ${INSTALL_DATA} ${_DISTDIR}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
Comment 1 Alex Kozlov freebsd_committer freebsd_triage 2014-05-20 12:47:40 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->ak

I'll take it.
Comment 2 Alex Kozlov freebsd_committer freebsd_triage 2014-05-20 13:01:04 UTC 
State Changed
From-To: open->closed

Committed. Thanks!
Comment 3 dfilter service freebsd_committer freebsd_triage 2014-05-20 13:02:39 UTC 
Author: ak
Date: Tue May 20 12:02:32 2014
New Revision: 354629
URL: http://svnweb.freebsd.org/changeset/ports/354629
QAT: https://qat.redports.org/buildarchive/r354629/

Log:
  - Support STAGEDIR
  
  PR:	ports/189727
  Submitted by:	Anton Shterenlikht <mexas@bris.ac.uk> (maintainer)

Modified:
  head/cad/feappv/Makefile

Modified: head/cad/feappv/Makefile
==============================================================================
--- head/cad/feappv/Makefile	Tue May 20 11:49:46 2014	(r354628)
+++ head/cad/feappv/Makefile	Tue May 20 12:02:32 2014	(r354629)
@@ -29,7 +29,6 @@ PORTDOCS=	manual.pdf
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
@@ -44,11 +43,9 @@ post-patch:
 		 s|Feappv.a|libfeappv.a|' ${WRKSRC}/makefile.in
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/main/feappv ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/libfeappv.a ${PREFIX}/lib
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${_DISTDIR}/${PORTDOCS} ${DOCSDIR}
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/main/feappv ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/libfeappv.a ${STAGEDIR}${PREFIX}/lib
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${_DISTDIR}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"