From 1426871b66e8e2dac63a0ad193787e1c7138e0f8 Mon Sep 17 00:00:00 2001 From: Stanislav Sedov Date: Thu, 15 May 2008 10:12:03 +0000 Subject: [PATCH] - Update to 2.12.0. --- devel/cc65/Makefile | 11 ++++++----- devel/cc65/distinfo | 6 +++--- devel/cc65/files/patch-make_gcc.mak | 28 ++++++++++------------------ devel/cc65/pkg-plist | 13 ++++++++++--- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/devel/cc65/Makefile b/devel/cc65/Makefile index 7eaccd82cd49..c5897ccbaba9 100644 --- a/devel/cc65/Makefile +++ b/devel/cc65/Makefile @@ -6,7 +6,7 @@ # PORTNAME= cc65 -PORTVERSION= 2.11.0 +PORTVERSION= 2.12.0 CATEGORIES= devel MASTER_SITES= ftp://ftp.musoftware.de/pub/uz/cc65/ \ http://www.funet.fi/pub/cbm/programming/cc65/ \ @@ -29,10 +29,11 @@ post-patch: # # CFLAGS safety # - @(${FIND} ${WRKSRC}/ -name gcc.mak -type f|${XARGS} ${REINPLACE_CMD} -E\ - -e "s,=[[:space:]]*-g -O2 -Wall -W(.*),+=\1,"\ - -e "s,=[[:space:]]*-g -O2 -Wall(.*),+=\1,"\ - -e "s,=[[:space:]]*-O2 -g -Wall -W(.*),+=\1,"\ + @(${FIND} ${WRKSRC}/ -name gcc.mak -type f|${XARGS} ${REINPLACE_CMD} -E \ + -e "s,=[[:space:]]*-g -O2 -Wall -W(.*),+=\1," \ + -e "s,=[[:space:]]*-g -O2 -Wall(.*),+=\1," \ + -e "s,=[[:space:]]*-O2 -g -Wall -W(.*),+=\1," \ + -e "s,-std=c89,-std=c99,g" \ -e "s,CC[[:space:]]*=.*,#&,") .if defined(NOPORTDOCS) @${REINPLACE_CMD} -E -e "s,(install:.*)install-docs(.*)$,\1\2," \ diff --git a/devel/cc65/distinfo b/devel/cc65/distinfo index 361f80bc8af9..67ef1fcadb2b 100644 --- a/devel/cc65/distinfo +++ b/devel/cc65/distinfo @@ -1,3 +1,3 @@ -MD5 (cc65-sources-2.11.0.tar.bz2) = 0f69e04abb640a5d644d912bcdbcf52d -SHA256 (cc65-sources-2.11.0.tar.bz2) = a430a3d221a2364ff55282b169bf5ae78e00bf9dfc8babea9922ff8a8e16a600 -SIZE (cc65-sources-2.11.0.tar.bz2) = 1004878 +MD5 (cc65-sources-2.12.0.tar.bz2) = bd6d194a489334164a0fc383d1e12acc +SHA256 (cc65-sources-2.12.0.tar.bz2) = ea74a374ccc8a711667b207e4b1792ea738138aa1875feca23cf162a5b4e3965 +SIZE (cc65-sources-2.12.0.tar.bz2) = 1051755 diff --git a/devel/cc65/files/patch-make_gcc.mak b/devel/cc65/files/patch-make_gcc.mak index da4f6b4e78f5..03cd982adb6c 100644 --- a/devel/cc65/files/patch-make_gcc.mak +++ b/devel/cc65/files/patch-make_gcc.mak @@ -1,17 +1,17 @@ ---- make/gcc.mak.orig Sat Sep 10 16:45:50 2005 -+++ make/gcc.mak Thu Sep 7 20:39:52 2006 +--- make/gcc.mak.orig 2007-06-22 00:40:27.000000000 +0400 ++++ make/gcc.mak 2008-05-15 12:55:04.000000000 +0400 @@ -14,7 +14,7 @@ MAKEOVERRIDES= # The install prefix and directories --prefix = /usr +-prefix = /usr/local +prefix = ${PREFIX} exec_prefix = $(prefix) bindir = $(exec_prefix)/bin -@@ -37,9 +37,9 @@ - INSTALL = install - #INSTALL = install-sh +@@ -36,9 +36,9 @@ + # BSD-like install-script/-program + INSTALL = make/install-sh -INSTALL_DATA = $(INSTALL) -c -m 644 -INSTALL_PROG = $(INSTALL) -c -m 755 @@ -20,9 +20,9 @@ +INSTALL_PROG = ${BSD_INSTALL_SCRIPT} +INSTALL_STRIP = ${BSD_INSTALL_PROGRAM} - # Rules - -@@ -48,7 +48,7 @@ + # This file-name extension is needed on DOS/Windows systems. + ifdef COMSPEC +@@ -52,7 +52,7 @@ # a system on the command-line. (A user can do those rules with their # defaults by putting "all samples tests" on the command-line.) # @@ -30,12 +30,4 @@ +all: bins libs $(SYS:%=samples tests) bins: - @$(MAKE) -C src -f make/gcc.mak -@@ -139,7 +139,4 @@ - done - for f in readme.1st compile.txt CREDITS BUGS internal.txt newvers.txt; \ - do $(INSTALL_DATA) doc/$$f $(CC65DOC) || exit 1; \ -- done -- -for f in doc/*.html; \ -- do $(INSTALL_DATA) $$f $(CC65DOC) || exit 1; \ - done + @$(MAKE) -C src -f make/gcc.mak CC65_INC=\\\"${CC65INC}/\\\" CC65_LIB=\\\"${CC65LIB}/\\\" diff --git a/devel/cc65/pkg-plist b/devel/cc65/pkg-plist index 6f04962ddebf..d5428d092d09 100644 --- a/devel/cc65/pkg-plist +++ b/devel/cc65/pkg-plist @@ -33,8 +33,8 @@ lib/cc65/asminc/tgi-kernel.inc lib/cc65/asminc/tgi-mode.inc lib/cc65/asminc/utsname.inc lib/cc65/asminc/zeropage.inc -lib/cc65/emd/a2.lc.emd -lib/cc65/emd/a2e.lc.emd +lib/cc65/emd/a2.auxmem.emd +lib/cc65/emd/a2e.auxmem.emd lib/cc65/emd/c128-georam.emd lib/cc65/emd/c128-ram.emd lib/cc65/emd/c128-ramcart.emd @@ -48,6 +48,7 @@ lib/cc65/emd/c64-reu.emd lib/cc65/emd/c64-vdc.emd lib/cc65/emd/cbm510-ram.emd lib/cc65/emd/cbm610-ram.emd +lib/cc65/emd/dtv-himem.emd lib/cc65/emd/geos-vdc.emd lib/cc65/include/6502.h lib/cc65/include/_6522.h @@ -187,6 +188,8 @@ lib/cc65/lib/supervision.lib lib/cc65/lib/supervision.o lib/cc65/lib/vic20.lib lib/cc65/lib/vic20.o +lib/cc65/mou/a2.stdmou.mou +lib/cc65/mou/a2e.stdmou.mou lib/cc65/mou/c128-1351.mou lib/cc65/mou/c128-joy.mou lib/cc65/mou/c64-1351.mou @@ -210,19 +213,23 @@ lib/cc65/tgi/geos-tgi.tgi lib/cc65/tgi/lynx-160-102-16.tgi %%PORTDOCS%%%%DOCSDIR%%/BUGS %%PORTDOCS%%%%DOCSDIR%%/CREDITS -%%PORTDOCS%%%%DOCSDIR%%/apple2-tgi.cfg %%PORTDOCS%%%%DOCSDIR%%/apple2.cfg %%PORTDOCS%%%%DOCSDIR%%/atari.cfg +%%PORTDOCS%%%%DOCSDIR%%/atari.mac %%PORTDOCS%%%%DOCSDIR%%/atmos.cfg %%PORTDOCS%%%%DOCSDIR%%/bbc.cfg %%PORTDOCS%%%%DOCSDIR%%/c128.cfg %%PORTDOCS%%%%DOCSDIR%%/c16.cfg %%PORTDOCS%%%%DOCSDIR%%/c64.cfg +%%PORTDOCS%%%%DOCSDIR%%/cbm.mac %%PORTDOCS%%%%DOCSDIR%%/cbm510.cfg %%PORTDOCS%%%%DOCSDIR%%/cbm610.cfg %%PORTDOCS%%%%DOCSDIR%%/compile.txt +%%PORTDOCS%%%%DOCSDIR%%/cpu.mac +%%PORTDOCS%%%%DOCSDIR%%/generic.mac %%PORTDOCS%%%%DOCSDIR%%/geos.cfg %%PORTDOCS%%%%DOCSDIR%%/internal.txt +%%PORTDOCS%%%%DOCSDIR%%/longbranch.mac %%PORTDOCS%%%%DOCSDIR%%/lunix.cfg %%PORTDOCS%%%%DOCSDIR%%/lynx.cfg %%PORTDOCS%%%%DOCSDIR%%/module.cfg