CVS commit: pkgsrc/devel/xa65

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Apr 15 08:22:07 UTC 2020

Modified Files:
        pkgsrc/devel/xa65: Makefile distinfo
        pkgsrc/devel/xa65/patches: patch-Makefile
Added Files:
        pkgsrc/devel/xa65/patches: patch-misc_Makefile

Log Message:
xa65: honor CFLAGS and LDFLAGS.

Fixes RELRO build.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/xa65/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/xa65/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/xa65/patches/patch-Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/xa65/patches/patch-misc_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/xa65/Makefile
diff -u pkgsrc/devel/xa65/Makefile:1.3 pkgsrc/devel/xa65/Makefile:1.4
--- pkgsrc/devel/xa65/Makefile:1.3      Wed Feb  5 09:12:19 2020
+++ pkgsrc/devel/xa65/Makefile  Wed Apr 15 08:22:07 2020
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2020/02/05 09:12:19 fcambus Exp $
+# $NetBSD: Makefile,v 1.4 2020/04/15 08:22:07 wiz Exp $
 
 DISTNAME=              xa-2.3.10
-PKGNAME=               ${DISTNAME:S/xa/&65/}
+PKGNAME=               ${DISTNAME:S/xa/xa65/}
+PKGREVISION=           1
 CATEGORIES=            devel
 MASTER_SITES=          https://www.floodgap.com/retrotech/xa/dists/
 

Index: pkgsrc/devel/xa65/distinfo
diff -u pkgsrc/devel/xa65/distinfo:1.4 pkgsrc/devel/xa65/distinfo:1.5
--- pkgsrc/devel/xa65/distinfo:1.4      Wed Feb  5 09:12:19 2020
+++ pkgsrc/devel/xa65/distinfo  Wed Apr 15 08:22:07 2020
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2020/02/05 09:12:19 fcambus Exp $
+$NetBSD: distinfo,v 1.5 2020/04/15 08:22:07 wiz Exp $
 
 SHA1 (xa-2.3.10.tar.gz) = b3e37b7660995bfc22fc635516472710cdbc38d5
 RMD160 (xa-2.3.10.tar.gz) = 7d6d54be9a31d39220a9bdc0cfcaeb25ad880867
 SHA512 (xa-2.3.10.tar.gz) = 08b9994e295495744d5252fa983b111f41d0447cdb32d0c065f8fbd942ffa0899476d6cfebe1162e4aa08b1d0a2d8df74c2a60987d2509b8bca45da670f4a67f
 Size (xa-2.3.10.tar.gz) = 152433 bytes
-SHA1 (patch-Makefile) = 6450d6c40cd05e7a2bd09d4ec9f75f4b6aba77be
+SHA1 (patch-Makefile) = 823e5019ad799938926d79e03a2cab732272ecb9
+SHA1 (patch-misc_Makefile) = 488705f516aec448fb51db6ab788b788bfbd31bc

Index: pkgsrc/devel/xa65/patches/patch-Makefile
diff -u pkgsrc/devel/xa65/patches/patch-Makefile:1.3 pkgsrc/devel/xa65/patches/patch-Makefile:1.4
--- pkgsrc/devel/xa65/patches/patch-Makefile:1.3        Wed Feb  5 09:12:19 2020
+++ pkgsrc/devel/xa65/patches/patch-Makefile    Wed Apr 15 08:22:07 2020
@@ -1,10 +1,23 @@
-$NetBSD: patch-Makefile,v 1.3 2020/02/05 09:12:19 fcambus Exp $
+$NetBSD: patch-Makefile,v 1.4 2020/04/15 08:22:07 wiz Exp $
 
 Install documentation, fix Makefile variables
 
---- Makefile.orig      2009-02-08 06:49:30.000000000 +0000
+Honor LDFLAGS and CFLAGS.
+
+--- Makefile.orig      2019-11-09 01:11:00.000000000 +0000
 +++ Makefile
-@@ -15,11 +15,11 @@ LDFLAGS = -lc
+@@ -4,8 +4,8 @@ CC = gcc
+ LD = gcc
+ # for testing. not to be used; build failures in misc/.
+ #CFLAGS = -O2 -W -Wall -pedantic -ansi
+-CFLAGS = -O2
+-LDFLAGS = -lc
++CFLAGS += -O2
++LDFLAGS += -lc
+ 
+ # for DOS?
+ # CC = gcc-go32
+@@ -17,11 +17,11 @@ LDFLAGS = -lc
  #CFLAGS =
  #LD = ld
  
@@ -20,7 +33,7 @@ Install documentation, fix Makefile vari
  
  MKDIR = mkdir -p
  INSTALL = install
-@@ -51,11 +51,29 @@ clean:
+@@ -56,11 +56,29 @@ clean:
        rm -f xa *.exe *.o65
  
  install: xa uncpk

Added files:

Index: pkgsrc/devel/xa65/patches/patch-misc_Makefile
diff -u /dev/null pkgsrc/devel/xa65/patches/patch-misc_Makefile:1.1
--- /dev/null   Wed Apr 15 08:22:07 2020
+++ pkgsrc/devel/xa65/patches/patch-misc_Makefile       Wed Apr 15 08:22:07 2020
@@ -0,0 +1,40 @@
+$NetBSD: patch-misc_Makefile,v 1.1 2020/04/15 08:22:07 wiz Exp $
+
+Honor LDFLAGS and CFLAGS.
+
+--- misc/Makefile.orig 2019-11-09 00:11:32.000000000 +0000
++++ misc/Makefile
+@@ -2,7 +2,7 @@
+ XCBMLIB = ..
+ 
+ # -Wall -ansi et al. cause compile problems.
+-CFLAGS =  -O2
++CFLAGS +=  -O2
+ 
+ LIBS = #-lncurses -ltermcap -lm
+ 
+@@ -10,19 +10,19 @@ LIBS = #-lncurses -ltermcap -lm
+ all: ../mkrom.sh ../uncpk ../printcbm ../file65 ../reloc65 ../ldo65
+ 
+ ../uncpk: uncpk.c
+-      ${CC} ${CFLAGS} uncpk.c -o $(XCBMLIB)/uncpk
++      ${CC} ${CFLAGS} ${LDFLAGS} uncpk.c -o $(XCBMLIB)/uncpk
+ 
+ ../printcbm: printcbm.c
+-      ${CC} ${CFLAGS} printcbm.c -o $(XCBMLIB)/printcbm
++      ${CC} ${CFLAGS} ${LDFLAGS} printcbm.c -o $(XCBMLIB)/printcbm
+ 
+ ../file65: file65.c
+-      ${CC} ${CFLAGS} file65.c -o $(XCBMLIB)/file65
++      ${CC} ${CFLAGS} ${LDFLAGS} file65.c -o $(XCBMLIB)/file65
+ 
+ ../ldo65: ldo65.c
+-      ${CC} ${CFLAGS} ldo65.c -o $(XCBMLIB)/ldo65
++      ${CC} ${CFLAGS} ${LDFLAGS} ldo65.c -o $(XCBMLIB)/ldo65
+ 
+ ../reloc65: reloc65.c
+-      ${CC} ${CFLAGS} reloc65.c -o $(XCBMLIB)/reloc65
++      ${CC} ${CFLAGS} ${LDFLAGS} reloc65.c -o $(XCBMLIB)/reloc65
+ 
+ ../mkrom.sh: mkrom.sh
+       cp mkrom.sh ../mkrom.sh