From owner-svn-ports-all@FreeBSD.ORG Sun Nov 10 16:22:48 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9CBAFA3E; Sun, 10 Nov 2013 16:22:48 +0000 (UTC) (envelope-from marino@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8837C234D; Sun, 10 Nov 2013 16:22:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAAGMmbu041729; Sun, 10 Nov 2013 16:22:48 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAAGMm7E041727; Sun, 10 Nov 2013 16:22:48 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201311101622.rAAGMm7E041727@svn.freebsd.org> From: John Marino Date: Sun, 10 Nov 2013 16:22:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333409 - in head/www: aws aws-demos X-SVN-Group: ports-head 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.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Nov 2013 16:22:48 -0000 Author: marino Date: Sun Nov 10 16:22:47 2013 New Revision: 333409 URL: http://svnweb.freebsd.org/changeset/ports/333409 Log: www/aws(-demos): Convert to staging * Convert USE_GMAKE to USES Modified: head/www/aws-demos/Makefile head/www/aws/Makefile Modified: head/www/aws-demos/Makefile ============================================================================== --- head/www/aws-demos/Makefile Sun Nov 10 16:05:53 2013 (r333408) +++ head/www/aws-demos/Makefile Sun Nov 10 16:22:47 2013 (r333409) @@ -15,8 +15,7 @@ BUILD_DEPENDS+= gprbuild>=20120510:${POR aws>=3.1:${PORTSDIR}/www/aws USE_BZIP2= yes -USE_GMAKE= yes -USES= ada +USES= ada gmake CONF_ARGS= PROCESSORS=1 CONF_ARGS+= GCC=ada @@ -58,7 +57,6 @@ DEMO_DIRS+= zdemo #DEMO_DIRS+= hello_wsdl #DEMO_DIRS+= interoplab -NO_STAGE= yes .include .if ${PORT_OPTIONS:MSSL} @@ -96,10 +94,10 @@ do-build: .endfor do-install: - @${MKDIR} ${PREFIX}/share/examples/aws-demos + @${MKDIR} ${STAGEDIR}${PREFIX}/share/examples/aws-demos .for dd in ${DEMO_DIRS} ${FIND} ${WRKSRC}/demos/${dd} -type f -perm -0001 \ - -exec ${INSTALL} {} ${PREFIX}/share/examples/aws-demos/ \; + -exec ${INSTALL} {} ${STAGEDIR}${PREFIX}/share/examples/aws-demos/ \; .endfor .include Modified: head/www/aws/Makefile ============================================================================== --- head/www/aws/Makefile Sun Nov 10 16:05:53 2013 (r333408) +++ head/www/aws/Makefile Sun Nov 10 16:22:47 2013 (r333409) @@ -16,8 +16,8 @@ BUILD_DEPENDS= gprbuild>=20120510:${PORT USE_PYTHON= yes USE_BZIP2= yes GNU_CONFIGURE= yes -USE_GMAKE= yes -USES= ada +NO_MTREE= yes +USES= ada gmake DOTBUILD= release ADDL_RPATH= ${LOCALBASE}/lib:${LOCALBASE}/lib/aws/native/relocatable @@ -32,8 +32,7 @@ DSRT_DESC= Disable shared runtime RELOC_DESC= Build shared libraries (default is static) IP6_DESC= Support IPv6 instead of IPv4 -DESTINY= ${WRKDIR}/destino -MAKE_ENV+= DESTDIR=${DESTINY} AWK=${AWK} +MAKE_ENV+= AWK=${AWK} MAKEFILE= makefile CONF_ARGS= PROCESSORS=${MAKE_JOBS_NUMBER} @@ -45,7 +44,6 @@ CONF_ARGS+= prefix=${PREFIX} CONF_ARGS+= LPATH=${PREFIX}/lib CONF_ARGS+= ZPATH=/usr/lib -NO_STAGE= yes .include ################### @@ -116,30 +114,28 @@ do-configure: ${GMAKE} setup ${CONF_ARGS} do-build: - # We cannot use a redefined ALL_TARGET because MAKE_JOBS_SAFE is set - # for PROCESSORS, but that also sets -j for gmake which breaks build +# We cannot use a redefined ALL_TARGET because MAKE_JOBS_SAFE is set +# for PROCESSORS, but that also sets -j for gmake which breaks build cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${GMAKE} build build_doc + ${GMAKE} ${MAKE_ARGS} build build_doc test: install @cd ${WRKSRC}/regtests && ${SETENV} ${MAKE_ENV} \ python${PYTHON_VER} testsuite.py post-install: - # AWS plist changes due to options are complex, and are not simply - # additive. Trying to capture every permutation is error prone and - # tedious, so a generated PLIST is the way to go. - @${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 | \ +# AWS plist changes due to options are complex, and are not simply +# additive. Trying to capture every permutation is error prone and +# tedious, so a generated PLIST is the way to go. + @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 's/^/@dirrm /g' >> ${WRKDIR}/PLIST.all - @echo "@unexec rmdir %D/lib/gnat 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/doc 2>/dev/null || true" >> ${WRKDIR}/PLIST.all - @echo "@unexec rmdir %D/share/examples 2>/dev/null || true" >> ${WRKDIR}/PLIST.all - @${CAT} ${WRKDIR}/PLIST.all >> ${TMPPLIST} + -e '/share\/examples$$/d' -e 's/^/@dirrm /g' >> ${TMPPLIST} + @echo "@unexec rmdir %D/lib/gnat 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/doc 2>/dev/null || true" >> ${TMPPLIST} + @echo "@unexec rmdir %D/share/examples 2>/dev/null || true" >> ${TMPPLIST} .include