4 files changed, 97 insertions, 129 deletions

diff --git a/devel/cc65/Makefile b/devel/cc65/Makefile
index 0cf41f6c5347..c1eee14ab0fd 100644
--- a/devel/cc65/Makefile
+++ b/devel/cc65/Makefile
@@ -2,52 +2,56 @@
 
 PORTNAME=	cc65
 PORTVERSION=	2.13.3
+DISTVERSIONPREFIX=	sources-
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.musoftware.de/pub/uz/cc65/ \
-		http://www.funet.fi/pub/cbm/programming/cc65/ \
-		http://www.acc.umu.se/~arvid/cc65_mirror/ \
-		http://bj.spline.de/cc65/
-DISTNAME=	${PORTNAME}-sources-${PORTVERSION}
+MASTER_SITES=	http://bj.spline.de/cc65/ \
+		http://cc65.oldos.net/ \
+		ftp://ftp.musoftware.de/pub/uz/cc65/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cross-compiler for 6502-based systems, includes 65816 assembler
 
-USE_SUBMAKE=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
 USE_BZIP2=	yes
+USE_PERL5_BUILD=yes
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/cc65-${PORTVERSION}
 MAKEFILE=	${WRKSRC}/make/gcc.mak
-USE_PERL5_BUILD=yes
-MAKE_JOBS_UNSAFE=	yes
+MAKE_JOBS_UNSAFE=yes
 
 SUB_FILES=	pkg-message
 
+.include <bsd.port.options.mk>
+
 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," \
-		-e "s,-std=c89,-std=c99,g" \
-		-e "s,CC[[:space:]]*=.*,#&,")
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -E -e "s,(install:.*)install-docs(.*)$$,\1\2," \
-		-e '/\(MKDIR\)[[:space:]]+\$$\(CC65DOC\)/d' \
-		${WRKSRC}/make/gcc.mak
-	@${REINPLACE_CMD} -E -e "s,^(docdir[[:space:]]*=).*,\1," \
-		-e "s,^(CC65_DOC[[:space:]]*=).*,\1," ${WRKSRC}/make/gcc.mak
-.endif
+	@${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|=.*|=| ;  \
+		 /^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
 
 # XXX: gmake>=3.82 hack:  beats the hell out of me.  Quick fix.
 pre-install:
-	@${MKDIR} -p ${PREFIX}/lib/cc65/tgi
+	@${MKDIR} ${PREFIX}/lib/cc65/tgi
 
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${EXAMPLESDIR}
-	@(cd ${WRKSRC}/samples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+.for i in BUGS CREDITS compile.txt internal.txt newvers.txt readme.1st
+	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${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}
 
diff --git a/devel/cc65/files/patch-make_gcc.mak b/devel/cc65/files/patch-make_gcc.mak
deleted file mode 100644
index 03cd982adb6c..000000000000
--- a/devel/cc65/files/patch-make_gcc.mak
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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/local
-+prefix		= ${PREFIX}
- exec_prefix	= $(prefix)
- 
- bindir		= $(exec_prefix)/bin
-@@ -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
--INSTALL_STRIP	= $(INSTALL_PROG) -s
-+INSTALL_DATA	= ${BSD_INSTALL_DATA}
-+INSTALL_PROG	= ${BSD_INSTALL_SCRIPT}
-+INSTALL_STRIP	= ${BSD_INSTALL_PROGRAM}
- 
- # 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.)
- #
--all:	bins libs docs $(SYS:%=samples tests)
-+all:	bins libs $(SYS:%=samples tests)
- 
- bins:
- 	@$(MAKE) -C src -f make/gcc.mak CC65_INC=\\\"${CC65INC}/\\\" CC65_LIB=\\\"${CC65LIB}/\\\"
diff --git a/devel/cc65/pkg-descr b/devel/cc65/pkg-descr
index 3e856eec4bba..c6c05d245527 100644
--- a/devel/cc65/pkg-descr
+++ b/devel/cc65/pkg-descr
@@ -1,24 +1,21 @@
-CC65 is a C cross-compiler for 6502 and 65C02 systems.  CC65 includes
-a powerful macro assembler, a debugger, an archiver, and a highly
-configurable linker.  The linker supports overlays, ROMable code, and
-split output, among other features.  The compiler supports a large
-subset of ISO C (as per the ISO 9899 specification) and can compile
-the uIP TCP stack.  A 6502 simulator is available in the distribution
-but is not currently installed by the FreeBSD port/package.
+cc65 is a complete cross development package for 65(C)02 systems,
+including a powerful macro assembler, a C compiler, linker, librarian
+and several other tools.
 
-It is easy to write code for standalone 6502 boards (target none).  In
-addition, particular support for the following targets is included:
+Direct library support (that is, startup/initialization code) and
+support libraries for other features are available for...
 
-        - C64 and C128
-        - the GEOS operating system for the C64 and C128
-        - Commodore C16, C116, Plus/4
-        - Commodore VIC20
-        - CBM 600/700 family (programs run in bank 1)
-        - Newer PET machines (not 2001)
-        - The Apple ][
-        - Atari 8bit machines
-        - The Oric Atmos (beta)
-
-The assembler and linker also support 65816 as a target.
+ - the Commodore C64
+ - the GEOS operating system for the Commodore C64
+ - the Commodore C128
+ - the Commodore C16, C116 and Plus/4
+ - the Commodore P500
+ - the Commodore 600/700 family of computers
+ - the Apple ][
+ - the Atari 8bit machines
+ - the Oric Atmos
+ - the Nintendo Entertainment System (NES)
+ - the Supervision Game Console
+ - the Atari Lynx Console
 
 WWW: http://www.cc65.org/
diff --git a/devel/cc65/pkg-plist b/devel/cc65/pkg-plist
index d4ab31fb6993..f2515d4d36b3 100644
--- a/devel/cc65/pkg-plist
+++ b/devel/cc65/pkg-plist
@@ -238,53 +238,53 @@ lib/cc65/tgi/lynx-160-102-16.tgi
 %%PORTDOCS%%%%DOCSDIR%%/longbranch.mac
 %%PORTDOCS%%%%DOCSDIR%%/newvers.txt
 %%PORTDOCS%%%%DOCSDIR%%/readme.1st
-%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/ascii.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/diodemo.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/fire.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/geos/appfile.grc
-%%PORTDOCS%%%%EXAMPLESDIR%%/geos/apphello1.grc
-%%PORTDOCS%%%%EXAMPLESDIR%%/geos/apphello2.grc
-%%PORTDOCS%%%%EXAMPLESDIR%%/geos/apprmvprot.grc
-%%PORTDOCS%%%%EXAMPLESDIR%%/geos/appvector-demo.grc
-%%PORTDOCS%%%%EXAMPLESDIR%%/geos/appyesno.grc
-%%PORTDOCS%%%%EXAMPLESDIR%%/geos/ca65-vlir/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/geos/ca65-vlir/cvthead.grc
-%%PORTDOCS%%%%EXAMPLESDIR%%/geos/ca65-vlir/vlir0.s
-%%PORTDOCS%%%%EXAMPLESDIR%%/geos/ca65-vlir/vlir1.s
-%%PORTDOCS%%%%EXAMPLESDIR%%/geos/ca65-vlir/vlir2.s
-%%PORTDOCS%%%%EXAMPLESDIR%%/geos/dialog.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/geos/filesel.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/geos/geosconio.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/geos/geosconiores.res
-%%PORTDOCS%%%%EXAMPLESDIR%%/geos/getid.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/geos/getidres.grc
-%%PORTDOCS%%%%EXAMPLESDIR%%/geos/grphstr.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/geos/hello1.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/geos/hello2.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/geos/inittab.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/geos/menu.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/geos/rmvprot.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/geos/vector-demo.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/geos/yesno.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/gunzip65.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/hello.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/mandelbrot.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/mousedemo.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/nachtm.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/overlaydemo-apple2enh.cfg
-%%PORTDOCS%%%%EXAMPLESDIR%%/overlaydemo-c64.cfg
-%%PORTDOCS%%%%EXAMPLESDIR%%/overlaydemo.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/plasma.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/sieve.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgidemo.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/hello.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/text.s
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tutorial
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/geos/ca65-vlir
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/geos
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ascii.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/diodemo.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fire.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geos/appfile.grc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geos/apphello1.grc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geos/apphello2.grc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geos/apprmvprot.grc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geos/appvector-demo.grc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geos/appyesno.grc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geos/ca65-vlir/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geos/ca65-vlir/cvthead.grc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geos/ca65-vlir/vlir0.s
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geos/ca65-vlir/vlir1.s
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geos/ca65-vlir/vlir2.s
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geos/dialog.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geos/filesel.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geos/geosconio.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geos/geosconiores.res
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geos/getid.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geos/getidres.grc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geos/grphstr.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geos/hello1.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geos/hello2.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geos/inittab.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geos/menu.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geos/rmvprot.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geos/vector-demo.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geos/yesno.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gunzip65.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mandelbrot.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mousedemo.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nachtm.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/overlaydemo-apple2enh.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/overlaydemo-c64.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/overlaydemo.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plasma.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sieve.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgidemo.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/hello.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/text.s
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tutorial
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/geos/ca65-vlir
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/geos
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/cc65/tgi
 @dirrm lib/cc65/ser