Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 10 Nov 2013 20:45:06 +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: r333446 - head/devel/gps
Message-ID:  <201311102045.rAAKj6gL031337@svn.freebsd.org>

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

Log:
  devel/gps: Convert to staging

Modified:
  head/devel/gps/Makefile

Modified: head/devel/gps/Makefile
==============================================================================
--- head/devel/gps/Makefile	Sun Nov 10 20:43:30 2013	(r333445)
+++ head/devel/gps/Makefile	Sun Nov 10 20:45:06 2013	(r333446)
@@ -22,20 +22,18 @@ GNU_CONFIGURE=		yes
 USE_BZIP2=		yes
 USE_PERL5=		build
 ALL_TARGET=		default
+NO_MTREE=		yes
 USES=			ada gmake perl5 pkgconfig
 WRKSRC=			${WRKDIR}/gps-release-ide-${PORTVERSION}-src
 
 CONFIGURE_ENV+=		AWK=/usr/bin/awk
-DESTINY=		${WRKDIR}/destino
-MAKE_ENV+=		DESTDIR=${DESTINY} \
-			PROCESSORS=${MAKE_JOBS_NUMBER}
+MAKE_ENV+=		PROCESSORS=${MAKE_JOBS_NUMBER}
 
 OPTIONS_DEFINE=		SYSLOG SQLITE PGSQL PYTHON READLINE
 OPTIONS_DEFAULT=	SYSLOG SQLITE PYTHON READLINE
 
 PYTHON_DESC=		Enable Python console
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD
@@ -102,7 +100,7 @@ post-patch:
 	    ${WRKSRC}/gnatlib/src/gnatcoll_readline.gpr.in
 
 do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} default
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} default
 
 pre-install:
 .if ${PORT_OPTIONS:MPYTHON}
@@ -111,20 +109,18 @@ pre-install:
 .endif
 
 post-install:
-	${RM} -rf ${DESTINY}${PREFIX}/share/doc/gps/html/users_guide/_sources
-	${RM} -rf ${DESTINY}${PREFIX}/share/doc/gps/html/tutorial/_sources
-	cd ${DESTINY}${PREFIX}; ${FIND} * -type d -empty -print | ${XARGS} ${RMDIR}
-	${CP} -pR ${DESTINY}${PREFIX}/ ${PREFIX}/
-	@cd ${DESTINY}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \
-	   ${SORT} > ${WRKDIR}/PLIST.all
-	@cd ${DESTINY}${PREFIX}; ${FIND} * -type d | ${AWK} '/\//' | ${SORT} -r | \
+	${RM} -rf ${STAGEDIR}${PREFIX}/share/doc/gps/html/users_guide/_sources
+	${RM} -rf ${STAGEDIR}${PREFIX}/share/doc/gps/html/tutorial/_sources
+	@cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d -empty -print | ${XARGS} ${RMDIR}
+	@cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \
+	   ${SORT} > ${TMPPLIST}
+	@cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d | ${AWK} '/\//' | ${SORT} -r | \
 	   ${SED} -e '/share\/doc$$/d' -e '/share\/gps$$/d' \
 	   -e '/share\/gps\/plug-ins$$/d' -e '/share\/examples$$/d' \
-	   -e 's/^/@dirrm /g' >> ${WRKDIR}/PLIST.all
-	@echo "@unexec rmdir %D/share/gps/plug-ins 2>/dev/null || true" >> ${WRKDIR}/PLIST.all
-	@echo "@unexec rmdir %D/share/gps 2>/dev/null || true" >> ${WRKDIR}/PLIST.all
-	@echo "@unexec rmdir %D/share/examples 2>/dev/null || true" >> ${WRKDIR}/PLIST.all
-	@echo "@unexec rmdir %D/share/doc 2>/dev/null || true" >> ${WRKDIR}/PLIST.all
-	@${CAT} ${WRKDIR}/PLIST.all >> ${TMPPLIST}
+	   -e 's/^/@dirrm /g' >> ${TMPPLIST}
+	@echo "@unexec rmdir %D/share/gps/plug-ins 2>/dev/null || true" >> ${TMPPLIST}
+	@echo "@unexec rmdir %D/share/gps 2>/dev/null || true" >> ${TMPPLIST}
+	@echo "@unexec rmdir %D/share/examples 2>/dev/null || true" >> ${TMPPLIST}
+	@echo "@unexec rmdir %D/share/doc 2>/dev/null || true" >> ${TMPPLIST}
 
 .include <bsd.port.mk>



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