CVS commit: pkgsrc/devel/uno

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Jul  9 15:21:38 UTC 2023

Modified Files:
        pkgsrc/devel/uno: Makefile distinfo
Added Files:
        pkgsrc/devel/uno/patches: patch-makefile

Log Message:
uno: Honour CFLAGS/LDFLAGS. Should help the build on various platforms.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/uno/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/uno/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/uno/patches/patch-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/uno/Makefile
diff -u pkgsrc/devel/uno/Makefile:1.22 pkgsrc/devel/uno/Makefile:1.23
--- pkgsrc/devel/uno/Makefile:1.22      Wed Jul 21 04:47:41 2021
+++ pkgsrc/devel/uno/Makefile   Sun Jul  9 15:21:38 2023
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2021/07/21 04:47:41 fcambus Exp $
+# $NetBSD: Makefile,v 1.23 2023/07/09 15:21:38 nia Exp $
 #
 
 DISTNAME=              uno_v213
 PKGNAME=               uno-2.13
+PKGREVISION=           1
 CATEGORIES=            devel
 MASTER_SITES=          https://spinroot.com/uno/
 

Index: pkgsrc/devel/uno/distinfo
diff -u pkgsrc/devel/uno/distinfo:1.8 pkgsrc/devel/uno/distinfo:1.9
--- pkgsrc/devel/uno/distinfo:1.8       Tue Oct 26 10:20:07 2021
+++ pkgsrc/devel/uno/distinfo   Sun Jul  9 15:21:38 2023
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 10:20:07 nia Exp $
+$NetBSD: distinfo,v 1.9 2023/07/09 15:21:38 nia Exp $
 
 BLAKE2s (uno_v213.tar.gz) = f58e9550eb72dfccace7a662dcf03aee73e1869d4f21271a43ea4e83326a5fee
 SHA512 (uno_v213.tar.gz) = 07335bd4110034a2067c1958ce04de31af792ae86d78bae0d615b0ec90e9146340f7953bb5e4d22be10352c669712eac90d4164bbf2bc839b1af7c4e7adbd35a
 Size (uno_v213.tar.gz) = 239127 bytes
 SHA1 (patch-aa) = 1585fa0e6fa1c3229fbb705c046996314391c5a2
 SHA1 (patch-ab) = 01fe0a5fdc85e8d6103d2a9bbd8556661a84a7c8
+SHA1 (patch-makefile) = fb60e51412844aa3bebf968e01fe8505e023bd2f

Added files:

Index: pkgsrc/devel/uno/patches/patch-makefile
diff -u /dev/null pkgsrc/devel/uno/patches/patch-makefile:1.1
--- /dev/null   Sun Jul  9 15:21:38 2023
+++ pkgsrc/devel/uno/patches/patch-makefile     Sun Jul  9 15:21:38 2023
@@ -0,0 +1,32 @@
+$NetBSD: patch-makefile,v 1.1 2023/07/09 15:21:38 nia Exp $
+
+Honour CFLAGS/LDFLAGS.
+
+--- makefile.orig      2007-10-27 00:33:12.000000000 +0000
++++ makefile
+@@ -26,7 +26,7 @@
+ BINDIR=/usr/bin/
+ # note the terminal / in the above line is needed
+ CC=gcc
+-CFLAGS=-ansi -Wall -m32 -ggdb -DBINDIR=\"$(BINDIR)\"
++CFLAGS+=-Wall -m32 -ggdb -DBINDIR=\"$(BINDIR)\"
+ 
+ # on PC add:
+ #     -DPC
+@@ -66,13 +66,13 @@ sharing:
+               uno_generic.c uno_intervals.c uno_lts.c
+ 
+ uno:  uno.c
+-      $(CC) $(CFLAGS) -o uno uno.c
++      $(CC) $(CFLAGS) $(LDFLAGS) -o uno uno.c
+ 
+ uno_local:    c_gram.h $(OFILES) 
+-      $(CC) $(CFLAGS) -o uno_local $(OFILES)
++      $(CC) $(CFLAGS) $(LDFLAGS) -o uno_local $(OFILES)
+ 
+ uno_global:   uno_global.o uno_fcts.o
+-      $(CC) $(CFLAGS) -o uno_global uno_global.o uno_fcts.o
++      $(CC) $(CFLAGS) $(LDFLAGS) -o uno_global uno_global.o uno_fcts.o
+ 
+ c_gram.c c_gram.h:    c_gram.y tree.h symtab.h globals.h
+       bison -v -d -o c_gram.c c_gram.y        # expect 6 shift/reduce 23 reduce/reduce conflicts