From owner-svn-ports-head@FreeBSD.ORG Thu Mar 27 09:47:26 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 32B9EF4C; Thu, 27 Mar 2014 09:47:26 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0567B885; Thu, 27 Mar 2014 09:47:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2R9lPCW003245; Thu, 27 Mar 2014 09:47:25 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2R9lPJd003244; Thu, 27 Mar 2014 09:47:25 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201403270947.s2R9lPJd003244@svn.freebsd.org> From: Pawel Pekala Date: Thu, 27 Mar 2014 09:47:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349323 - head/devel/cc65 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Mar 2014 09:47:26 -0000 Author: pawel Date: Thu Mar 27 09:47:25 2014 New Revision: 349323 URL: http://svnweb.freebsd.org/changeset/ports/349323 QAT: https://qat.redports.org/buildarchive/r349323/ Log: - Add staging support - Convert USE_GMAKE, USE_BZIP2 to USES Modified: head/devel/cc65/Makefile Modified: head/devel/cc65/Makefile ============================================================================== --- head/devel/cc65/Makefile Thu Mar 27 09:41:44 2014 (r349322) +++ head/devel/cc65/Makefile Thu Mar 27 09:47:25 2014 (r349323) @@ -15,10 +15,8 @@ COMMENT= Cross-compiler for 6502-based s WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USES= shebangfix perl5 -USE_BZIP2= yes +USES= gmake perl5 shebangfix tar:bzip2 USE_PERL5= build -USE_GMAKE= yes MAKEFILE= ${WRKSRC}/make/gcc.mak MAKE_JOBS_UNSAFE=yes SHEBANG_FILES= src/ca65html/ca65html \ @@ -27,8 +25,6 @@ SHEBANG_FILES= src/ca65html/ca65html \ SUB_FILES= pkg-message -NO_STAGE= yes - OPTIONS_DEFINE= DOCS EXAMPLES .include @@ -37,32 +33,28 @@ post-patch: @${FIND} ${WRKSRC} -name "gcc.mak" | ${XARGS} ${REINPLACE_CMD} -e \ '/gcc/s|^CC|#CC| ; \ /-O2/s|^CFLAGS|#CFLAGS|' - @${REINPLACE_CMD} -e \ - '/^prefix/s|=.*|= $${PREFIX}| ; \ - /^docdir/s|=.*|=| ; \ - /^CC65_DOC/s|=.*|=| ; \ + @${REINPLACE_CMD} -E -e '/^prefix/s|=.*|= $${PREFIX}| ; \ + /^(docdir|CC65_DOC)/ s|=.*|=| ; \ /^INSTALL_DATA/s|=.*|= $${BSD_INSTALL_DATA}| ; \ /^INSTALL_PROG/s|=.*|= $${BSD_INSTALL_SCRIPT}| ; \ /^INSTALL_STRIP/s|=.*|= $${BSD_INSTALL_PROGRAM}| ; \ - /^all:/s|docs|| ; \ - /^install:/s|install-docs||' ${WRKSRC}/make/gcc.mak + /^all:/s|docs|| ; /^install:/s|install-docs|| ; \ + s|MKDIR) |&-p $$(DESTDIR)|g ; \ + /INSTALL_(PROG|STRIP)/ s,bindir),DESTDIR)$$(&,g ; \ + /INSTALL_DATA/ s,(CA|CC|LD)65_(CFG|INC|HOME|LIB|OBJ),DESTDIR)$$(&,g' \ + ${WRKSRC}/make/gcc.mak # XXX: gmake>=3.82 hack: beats the hell out of me. Quick fix. pre-install: - @${MKDIR} ${PREFIX}/lib/cc65/tgi + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/cc65/tgi post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in BUGS CREDITS compile.txt internal.txt newvers.txt readme.1st - ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR} .endfor - ${INSTALL_DATA} ${WRKSRC}/src/ca65/macpack/*.mac ${DOCSDIR} -.endif -.if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} - @(cd ${WRKSRC}/samples && ${COPYTREE_SHARE} . ${EXAMPLESDIR}) -.endif - @${CAT} ${PKGMESSAGE} + ${INSTALL_DATA} ${WRKSRC}/src/ca65/macpack/*.mac ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + (cd ${WRKSRC}/samples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) .include