pcr/cc65: updated to 2.16

4 files changed, 24 insertions, 211 deletions

diff --git a/pcr/cc65/PKGBUILD b/pcr/cc65/PKGBUILD
index e06844017..a9787c859 100644
--- a/pcr/cc65/PKGBUILD
+++ b/pcr/cc65/PKGBUILD
@@ -1,32 +1,31 @@
-# Contributor (Arch): Jaroslaw Rosiek <philosoph@interia.pl>
+# Maintainer (AUR): Mike Swanson <mikeonthecomputer@gmail.com>
+
+# parabola changes and rationale:
+#  correct used license
+
 pkgname=cc65
-pkgver=2.13.3
-pkgrel=3
-pkgdesc="C compiler for 6502 family microprocessors"
+pkgver=2.16
+pkgrel=1
+pkgdesc='C compiler for 6502 family microprocessors'
 makedepends=('linuxdoc-tools')
-arch=('i686' 'x86_64')
-license=('custom')
-options=('!makeflags')    # Does not build with parallel jobs
-url="http://www.cc65.org/"
-source=("ftp://ftp.musoftware.de/pub/uz/cc65/cc65-sources-$pkgver.tar.bz2"
-        "patch-$pkgver.diff"
-        "license")
-sha256sums=('a98a1b69d3fa15551fe7d53d5bebfc5f9b2aafb9642ee14b735587a421e00468'
-            'b4bf9bba08ec3a8b6bad8e75be98b136556de72beaee3a99016bb20a1bed929c'
-            '4b1eb4cf61617a78256b5225784a73077c238aea02d6b949ef6f1ea06d9b40d3')
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -p1 -i "$srcdir/patch-$pkgver.diff"
-}
+arch=('i686' 'x86_64' 'armv7h')
+license=('zlib')
+url='https://cc65.github.io/cc65/'
+source=(https://github.com/cc65/cc65/archive/V${pkgver}.tar.gz cc65.sh)
+sha512sums=('89c61bd2655a466d619cf40f31f65d10e7cead24c04f548c969a79e0a946db239a4fee925708b0621dbdadf4ab1bdb67719c709edd8b989a218f7dc2270862f9'
+            'b6304fd3c14955ee14eb1d041f78c933fbd07760cf560f1c9018c0020c466fb754660404d3c59e903668a07c38001eac273a15a883f1fc0eec126cc9b40733b0')
 
 build() {
-  cd "$srcdir/cc65-$pkgver"
-  make -f make/gcc.mak
+  cd "$pkgname-$pkgver"
+
+  make
+  make doc
 }
 
 package() {
-  cd "$srcdir/cc65-$pkgver"
-  make -f make/gcc.mak DEST_DIR="$pkgdir/" install
-  install -Dm644 "$srcdir/license" "$pkgdir/usr/share/licenses/$pkgname/license"
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" prefix=/usr install
+  install -Dm644 "../cc65.sh" "$pkgdir/etc/profile.d/cc65.sh"
+  install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/license"
 }
diff --git a/pcr/cc65/cc65.sh b/pcr/cc65/cc65.sh
new file mode 100644
index 000000000..f4ba9490f
--- /dev/null
+++ b/pcr/cc65/cc65.sh
@@ -0,0 +1 @@
+export CC65_HOME=/usr/lib/cc65
diff --git a/pcr/cc65/license b/pcr/cc65/license
deleted file mode 100644
index 788142913..000000000
--- a/pcr/cc65/license
+++ /dev/null
@@ -1,60 +0,0 @@
-This is the original cc65 compiler copyright: 
-
-
-    This is the copyright notice for RA65, LINK65, LIBR65, and other
-  Atari 8-bit programs.  Said programs are Copyright 1989, by John R.
-  Dunning.  All rights reserved, with the following exceptions:
-
-      Anyone may copy or redistribute these programs, provided that:
-
-  1:  You don't charge anything for the copy.  It is permissable to
-      charge a nominal fee for media, etc.
-
-  2:  All source code and documentation for the programs is made
-      available as part of the distribution.
-
-  3:  This copyright notice is preserved verbatim, and included in
-      the distribution.
-
-      You are allowed to modify these programs, and redistribute the
-  modified versions, provided that the modifications are clearly noted.
-
-      There is NO WARRANTY with this software, it comes as is, and is
-  distributed in the hope that it may be useful.
-
-      This copyright notice applies to any program which contains
-  this text, or the refers to this file.
-
-      This copyright notice is based on the one published by the Free
-  Software Foundation, sometimes known as the GNU project.  The idea
-  is the same as theirs, ie the software is free, and is intended to
-  stay that way.  Everybody has the right to copy, modify, and re-
-  distribute this software.  Nobody has the right to prevent anyone
-  else from copying, modifying or redistributing it.
-
-
-
-In acknowledgment of this copyright, I will place my own changes to 
-the compiler under the same copyright. The library and the binary utils 
-are a complete rewrite done by me and covered by the following license:
-
-
-   This software is provided 'as-is', without any express or implied warranty. 
- In no event will the authors be held liable for any damages arising from the 
- use of this software.
-
-   Permission is granted to anyone to use this software for any purpose, 
- including commercial applications, and to alter it and redistribute it freely, 
- subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you must not claim 
-      that you wrote the original software. If you use this software in a product, 
-      an acknowledgment in the product documentation would be appreciated but is 
-      not required.
-
-   2. Altered source versions must be plainly marked as such, and must not be 
-      misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source distribution. 
-
-
diff --git a/pcr/cc65/patch-2.13.3.diff b/pcr/cc65/patch-2.13.3.diff
deleted file mode 100644
index 3e35a2a46..000000000
--- a/pcr/cc65/patch-2.13.3.diff
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -ur cc65-2.13.2-orig//make/gcc.mak cc65-2.13.2-new//make/gcc.mak
---- cc65-2.13.2-orig//make/gcc.mak	2010-04-06 21:05:59.659188896 +0200
-+++ cc65-2.13.2-new//make/gcc.mak	2010-04-06 21:26:31.323885004 +0200
-@@ -15,7 +15,8 @@
- # (That trick has been disabled.)
- 
- # The install prefix and directories
--prefix		= /usr/local
-+D=$(DEST_DIR)
-+prefix		= /usr
- exec_prefix	= $(prefix)
- 
- bindir		= $(exec_prefix)/bin
-@@ -34,7 +35,7 @@
- 
- # Programs
- 
--MKDIR		= mkdir -m 755
-+MKDIR		= mkdir -m 755 -p
- 
- # BSD-like install-script/-program
- INSTALL		= make/install-sh
-@@ -119,76 +120,76 @@
- 	  fi 2>/dev/null
- 
- .PHONY:	install-dirs
--install-dirs:	$(bindir) $(datadir) $(docdir) $(libdir) \
--		$(CC65_DOC) $(CC65_HOME) \
--		$(CA65_INC) $(CC65_INC) \
--		$(CC65_INC)/em $(CC65_INC)/geos $(CC65_INC)/joystick \
--		$(CC65_INC)/mouse $(CC65_INC)/sys $(CC65_INC)/tgi \
--		$(LD65_CFG) $(LD65_LIB) $(LD65_OBJ) \
--		$(CC65_HOME)/emd $(CC65_HOME)/joy $(CC65_HOME)/mou \
--		$(CC65_HOME)/ser $(CC65_HOME)/tgi
--
--$(bindir) $(datadir) $(docdir) $(libdir) \
--$(CC65_DOC) $(CC65_HOME) \
--$(CA65_INC) $(CC65_INC) \
--$(LD65_CFG) $(LD65_LIB) $(LD65_OBJ):
-+install-dirs:	$(D)/$(bindir) $(D)/$(datadir) $(D)/$(docdir) $(D)/$(libdir) \
-+		$(D)/$(CC65_DOC) $(D)/$(CC65_HOME) \
-+		$(D)/$(CA65_INC) $(D)/$(CC65_INC) \
-+		$(D)/$(CC65_INC)/em $(D)/$(CC65_INC)/geos $(D)/$(CC65_INC)/joystick \
-+		$(D)/$(CC65_INC)/mouse $(D)/$(CC65_INC)/sys $(D)/$(CC65_INC)/tgi \
-+		$(D)/$(LD65_CFG) $(D)/$(LD65_LIB) $(D)/$(LD65_OBJ) \
-+		$(D)/$(CC65_HOME)/emd $(D)/$(CC65_HOME)/joy $(D)/$(CC65_HOME)/mou \
-+		$(D)/$(CC65_HOME)/ser $(D)/$(CC65_HOME)/tgi
-+
-+$(D)/$(bindir) $(D)/$(datadir) $(D)/$(docdir) $(D)/$(libdir) \
-+$(D)/$(CC65_DOC) $(D)/$(CC65_HOME) \
-+$(D)/$(CA65_INC) $(D)/$(CC65_INC) \
-+$(D)/$(LD65_CFG) $(D)/$(LD65_LIB) $(D)/$(LD65_OBJ):
- 	$(MKDIR) $@
- 
--$(CC65_HOME)/% $(CC65_INC)/% $(CC65_DOC)/%:
-+$(D)/$(CC65_HOME)/% $(D)/$(CC65_INC)/% $(D)/$(CC65_DOC)/%:
- 	$(MKDIR) $@
- 
- install-bins:
- 	for f in ar65 ca65 cc65 cl65 co65 da65 ld65 od65 grc; \
--	  do $(INSTALL_STRIP) src/$$f/$$f${EXT} $(bindir) || exit $$?; \
-+	  do $(INSTALL_STRIP) src/$$f/$$f${EXT} $(D)/$(bindir) || exit $$?; \
- 	  done
--	$(INSTALL_PROG) src/ca65html/ca65html $(bindir)
-+	$(INSTALL_PROG) src/ca65html/ca65html $(D)/$(bindir)
- 
- install-libs:
- 	for f in asminc/*.inc; \
--	  do $(INSTALL_DATA) $$f $(CA65_INC) || exit $$?; \
-+	  do $(INSTALL_DATA) $$f $(D)/$(CA65_INC) || exit $$?; \
- 	  done
- 	for f in include/*.h; \
--	  do $(INSTALL_DATA) $$f $(CC65_INC) || exit $$?; \
-+	  do $(INSTALL_DATA) $$f $(D)/$(CC65_INC) || exit $$?; \
- 	  done
- 	for d in em geos joystick mouse sys tgi; \
- 	  do for f in include/$$d/*.h; \
--	    do $(INSTALL_DATA) $$f $(CC65_INC)/$$d || exit $$?; \
-+	    do $(INSTALL_DATA) $$f $(D)/$(CC65_INC)/$$d || exit $$?; \
- 	    done || exit $$?; \
- 	  done
- 	for f in libsrc/*.lib; \
--	  do $(INSTALL_DATA) $$f $(LD65_LIB) || exit $$?; \
-+	  do $(INSTALL_DATA) $$f $(D)/$(LD65_LIB) || exit $$?; \
- 	  done
- 	for f in libsrc/*-*.o; \
--	  do $(INSTALL_DATA) $$f $(LD65_OBJ) || exit $$?; \
-+	  do $(INSTALL_DATA) $$f $(D)/$(LD65_OBJ) || exit $$?; \
- 	  done
- 	for d in emd joy mou ser tgi; \
- 	  do for f in libsrc/*.$$d; \
--	    do $(INSTALL_DATA) $$f $(CC65_HOME)/$$d || exit $$?; \
-+	    do $(INSTALL_DATA) $$f $(D)/$(CC65_HOME)/$$d || exit $$?; \
- 	    done || exit $$?; \
- 	  done
- 	for f in src/ld65/cfg/*-*.cfg; \
--	  do $(INSTALL_DATA) $$f $(LD65_CFG) || exit $$?; \
-+	  do $(INSTALL_DATA) $$f $(D)/$(LD65_CFG) || exit $$?; \
- 	  done
- 
- install-docs:
- 	for f in src/ca65/macpack/*.mac; \
--	  do $(INSTALL_DATA) $$f $(CC65_DOC) || exit $$?; \
-+	  do $(INSTALL_DATA) $$f $(D)/$(CC65_DOC) || exit $$?; \
- 	  done
- 	for f in readme.1st compile.txt CREDITS BUGS internal.txt newvers.txt; \
--	  do $(INSTALL_DATA) doc/$$f $(CC65_DOC) || exit $$?; \
-+	  do $(INSTALL_DATA) doc/$$f $(D)/$(CC65_DOC) || exit $$?; \
- 	  done
- 	if [ -f doc/index.htm* ]; \
- 	  then for f in doc/*.htm*; \
--	    do $(INSTALL_DATA) $$f $(CC65_DOC) || exit $$?; \
-+	    do $(INSTALL_DATA) $$f $(D)/$(CC65_DOC) || exit $$?; \
- 	    done; \
- 	  fi
- 
--install-samps:	${addprefix $(CC65_DOC)/, $(shell find samples -type d)}
-+install-samps:	${addprefix $(D)/$(CC65_DOC)/, $(shell find samples -type d)}
- 	@$(MAKE) -C samples zap
- 	for d in `find samples -type d`; \
- 	  do for f in $$d/*; \
- 	    do if [ -f $$f ]; \
--	      then $(INSTALL_DATA) $$f $(CC65_DOC)/$$d || exit $$?; \
-+	      then $(INSTALL_DATA) $$f $(D)/$(CC65_DOC)/$$d || exit $$?; \
- 	      fi; \
- 	    done || exit $$?; \
- 	  done