Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 10 Nov 2013 18:59:47 +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: r333425 - head/x11-toolkits/gtkada
Message-ID:  <201311101859.rAAIxlWM093196@svn.freebsd.org>

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

Log:
  x11-toolkits/gtkada: Convert to staging
  
  * Don't install license anymore as it messes up auto-plist
  * Bump portrevision because of this plist change

Modified:
  head/x11-toolkits/gtkada/Makefile

Modified: head/x11-toolkits/gtkada/Makefile
==============================================================================
--- head/x11-toolkits/gtkada/Makefile	Sun Nov 10 18:56:03 2013	(r333424)
+++ head/x11-toolkits/gtkada/Makefile	Sun Nov 10 18:59:47 2013	(r333425)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gtkada
 PORTVERSION=	2.24.4.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -17,15 +18,15 @@ GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_PERL5=	build
 USE_GNOME=	gtk20
+NO_MTREE=	yes
 USES=		ada gmake perl5 pkgconfig
 
-DESTINY=	${WRKDIR}/destino
-MAKE_ENV+=	DESTDIR=${DESTINY} \
-		PROCESSORS=${MAKE_JOBS_NUMBER}
+MAKE_ENV+=	PROCESSORS=${MAKE_JOBS_NUMBER}
+
+NO_LICENSES_INSTALL= yes
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
@@ -46,27 +47,25 @@ post-patch:
 .endif
 
 do-build:
-	# This target is recreated because -j cannot be set, but
-	# MAKE_JOBS_SAFE=yes is needed for PROCESSORS value
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gmake all
+#	This target is recreated because -j cannot be set, but
+#	MAKE_JOBS_SAFE=yes is needed for PROCESSORS value
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all
 
 post-install:
-	@${MKDIR} ${DESTINY}${PREFIX}/libdata
-	@${MV} ${DESTINY}${PREFIX}/lib/pkgconfig ${DESTINY}${PREFIX}/libdata/
-	${RM} -rf ${DESTINY}${PREFIX}/share/doc/gtkada/gtkada_ug/_sources
-	${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 | \
+	@${MKDIR} ${STAGEDIR}${PREFIX}/libdata
+	@${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig ${STAGEDIR}${PREFIX}/libdata/
+	${RM} -rf ${STAGEDIR}${PREFIX}/share/doc/gtkada/gtkada_ug/_sources
+	@cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \
+	   ${SORT} > ${TMPPLIST}
+	@cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d | ${AWK} '/\//' | ${SORT} -r | \
 	   ${SED} -e '/lib\/gnat$$/d' -e '/share\/doc$$/d' -e '/share\/gps/d' \
 	   -e '/share\/examples$$/d' -e '/libdata\/pkgconfig/d' \
-	   -e 's/^/@dirrm /g' >> ${WRKDIR}/PLIST.all
-	@echo "@unexec rmdir %D/lib/gnat 2>/dev/null || true" >> ${WRKDIR}/PLIST.all
-	@echo "@unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true" >> ${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/lib/gnat 2>/dev/null || true" >> ${TMPPLIST}
+	@echo "@unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true" >> ${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?201311101859.rAAIxlWM093196>