Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 10 Nov 2013 15:10:03 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r333403 - head/lang/adacontrol
Message-ID:  <201311101510.rAAFA3HU014486@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Sun Nov 10 15:10:03 2013
New Revision: 333403
URL: http://svnweb.freebsd.org/changeset/ports/333403

Log:
  lang/adacontrol: Convert to staging

Modified:
  head/lang/adacontrol/Makefile

Modified: head/lang/adacontrol/Makefile
==============================================================================
--- head/lang/adacontrol/Makefile	Sun Nov 10 15:06:17 2013	(r333402)
+++ head/lang/adacontrol/Makefile	Sun Nov 10 15:10:03 2013	(r333403)
@@ -16,29 +16,24 @@ BUILD_DEPENDS=	asis>=2011:${PORTSDIR}/la
 
 USES=		ada gmake
 WRKSRC=		${WRKDIR}/adactl-${PORTVERSION}
-DESTINY=	${WRKDIR}/destino
 BUILD_WRKSRC=	${WRKSRC}/src
 ALL_TARGET=	build
 
-NO_STAGE=	yes
 do-install:
-	# To support DESTDIR in the future, install twice
-	${MKDIR} ${DESTINY}${PREFIX}/bin
-	${MKDIR} ${DESTINY}${PREFIX}/share/gps/plug-ins
-	${MKDIR} ${DESTINY}${PREFIX}/share/doc/gps/html
-	${MKDIR} ${DESTINY}${PREFIX}/share/doc/adacontrol
-	${MKDIR} ${DESTINY}${PREFIX}/share/gprconfig
+	${MKDIR} ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/gps/plug-ins
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/gps/html
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/adacontrol
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/gprconfig
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/adactl ${BUILD_WRKSRC}/pfni \
-		${BUILD_WRKSRC}/ptree ${DESTINY}/${PREFIX}/bin
+		${BUILD_WRKSRC}/ptree ${STAGEDIR}/${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/GPS/adacontrol.xml \
-		${DESTINY}${PREFIX}/share/gprconfig
+		${STAGEDIR}${PREFIX}/share/gprconfig
 	${INSTALL_DATA} ${WRKSRC}/GPS/*adactl* ${WRKSRC}/GPS/pfni.* \
-		${DESTINY}${PREFIX}/share/gps/plug-ins
+		${STAGEDIR}${PREFIX}/share/gps/plug-ins
 	${INSTALL_MAN} ${WRKSRC}/doc/*.html \
-		${DESTINY}${PREFIX}/share/doc/gps/html
+		${STAGEDIR}${PREFIX}/share/doc/gps/html
 	${INSTALL_MAN} ${WRKSRC}/doc/*.pdf ${WRKSRC}/doc/*.html \
-		${DESTINY}${PREFIX}/share/doc/adacontrol
-	# Now install from DESTDIR
-	${CP} -pR ${DESTINY}${PREFIX}/ ${PREFIX}/
+		${STAGEDIR}${PREFIX}/share/doc/adacontrol
 
 .include <bsd.port.mk>



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