pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/misc/dvorakng
Module Name: pkgsrc
Committed By: he
Date: Sun Aug 30 09:14:25 UTC 2026
Modified Files:
pkgsrc/misc/dvorakng: Makefile distinfo
Added Files:
pkgsrc/misc/dvorakng/patches: patch-Makefile patch-dvorakng.cpp
patch-lessons.cpp patch-lessons.h
Removed Files:
pkgsrc/misc/dvorakng/patches: patch-aa
Log Message:
misc/dvorakng: fix build where char != signed char, as on powerpc.
Also sprinkle "const" to get rid of warnings related to string handling.
Bump PKGREVISION.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/misc/dvorakng/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/misc/dvorakng/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/misc/dvorakng/patches/patch-Makefile \
pkgsrc/misc/dvorakng/patches/patch-dvorakng.cpp \
pkgsrc/misc/dvorakng/patches/patch-lessons.cpp \
pkgsrc/misc/dvorakng/patches/patch-lessons.h
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/misc/dvorakng/patches/patch-aa
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/misc/dvorakng/Makefile
diff -u pkgsrc/misc/dvorakng/Makefile:1.13 pkgsrc/misc/dvorakng/Makefile:1.14
--- pkgsrc/misc/dvorakng/Makefile:1.13 Mon May 6 08:40:29 2024
+++ pkgsrc/misc/dvorakng/Makefile Sun Aug 30 09:14:25 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2024/05/06 08:40:29 jperkin Exp $
+# $NetBSD: Makefile,v 1.14 2026/08/30 09:14:25 he Exp $
#
DISTNAME= dvorakng-0.6.0rc1
-PKGREVISION= 4
+PKGREVISION= 5
WRKSRC= ${WRKDIR}/dvorakng
CATEGORIES= misc
MASTER_SITES= http://www.free.of.pl/n/nopik/
Index: pkgsrc/misc/dvorakng/distinfo
diff -u pkgsrc/misc/dvorakng/distinfo:1.5 pkgsrc/misc/dvorakng/distinfo:1.6
--- pkgsrc/misc/dvorakng/distinfo:1.5 Tue Oct 26 10:59:01 2021
+++ pkgsrc/misc/dvorakng/distinfo Sun Aug 30 09:14:25 2026
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:59:01 nia Exp $
+$NetBSD: distinfo,v 1.6 2026/08/30 09:14:25 he Exp $
BLAKE2s (dvorakng-0.6.0rc1.tar.bz2) = 5d7be109d9870da28b9f40fa120e990354821ce6eb643dd709cb03ec3145e7f7
SHA512 (dvorakng-0.6.0rc1.tar.bz2) = 87f0bb2199188093ea4223d7dc47232f53b266aa9498170b643c25e724f547fa1ce5d0e1d4e7f275c712f6ec4850d825827b66f84407f186eb80b73ac973ded7
Size (dvorakng-0.6.0rc1.tar.bz2) = 28994 bytes
-SHA1 (patch-aa) = 059d13035ff9a86225c414592c1094a7d4071a8e
+SHA1 (patch-Makefile) = 85d3d3af5d4d3196685d3180b18e907565066c0c
+SHA1 (patch-dvorakng.cpp) = d022c0f8852f8eb3381463ced9ce79a1c5f75bc0
+SHA1 (patch-lessons.cpp) = e0e65db38a733c89eb42cad26a9942f0d7648eb4
+SHA1 (patch-lessons.h) = 1d4208bf78bbe2f6da334da2207f615904593598
Added files:
Index: pkgsrc/misc/dvorakng/patches/patch-Makefile
diff -u /dev/null pkgsrc/misc/dvorakng/patches/patch-Makefile:1.1
--- /dev/null Sun Aug 30 09:14:25 2026
+++ pkgsrc/misc/dvorakng/patches/patch-Makefile Sun Aug 30 09:14:25 2026
@@ -0,0 +1,20 @@
+$NetBSD: patch-Makefile,v 1.1 2026/08/30 09:14:25 he Exp $
+
+Remove compiler settings handled by pkgsrc.
+
+--- Makefile.orig 2003-04-25 15:52:48.000000000 -0600
++++ Makefile
+@@ -8,13 +8,6 @@ INSTALL = /usr/local/games/
+
+ ### That's all ###
+
+-CC = gcc
+-CXX = g++
+-#PROF = -ggdb3
+-PROF = -g0 -O2
+-CFLAGS = $(PROF) -fmessage-length=0 -Wall $(LIMIT_LENGTH)
+-CXXFLAGS = $(CFLAGS)
+-LDFLAGS = $(PROF)
+ LIBS = -lncurses
+
+ OBJECTS = dvorakng.o lessons.o
Index: pkgsrc/misc/dvorakng/patches/patch-dvorakng.cpp
diff -u /dev/null pkgsrc/misc/dvorakng/patches/patch-dvorakng.cpp:1.1
--- /dev/null Sun Aug 30 09:14:25 2026
+++ pkgsrc/misc/dvorakng/patches/patch-dvorakng.cpp Sun Aug 30 09:14:25 2026
@@ -0,0 +1,47 @@
+$NetBSD: patch-dvorakng.cpp,v 1.1 2026/08/30 09:14:25 he Exp $
+
+Do not implicitly assume that "char" is signed.
+Sprinkle "const" to deal with string constants and get rid of warnings.
+
+--- dvorakng.cpp.orig 2026-08-30 08:59:25.654701733 +0000
++++ dvorakng.cpp
+@@ -117,7 +117,7 @@ char keymap[] = //{{{
+@@ -117,7 +117,7 @@ char keymap[] = //{{{
+ 0
+ }; //}}}
+
+-char colormap[] = //{{{
++signed char colormap[] = //{{{
+ {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, -5, -5, -4, -4, -3, -3, -2, -2, 2, 2, 3, 4, 5,
+ 0, 0, 0, 0, 0, 5, -5, -4, -3, -2, -2, 2, 2, 3, 4, 5, 0, 0, 0, 0, 0, 2, 0, /*0,*/ 5, /*-5,*/ -4, -3, -2, -2, 2, 2, 3, 4, 5, 0, 0
+@@ -139,7 +139,7 @@ class THSEntry //{{{
+ THSEntry( UINT32 hits, UINT32 misses, UINT32 timev, UINT32 lesson );
+ ~THSEntry();
+
+- void Print( UINT32 row, UINT32 column, UINT32 color, char *msg ) const;
++ void Print( UINT32 row, UINT32 column, UINT32 color, const char *msg ) const;
+ void PrintHistory( UINT32 row ) const;
+ float GetSpeed() const;
+
+@@ -253,9 +253,9 @@ class TLessonManager //{{{
+ THSManager HSManager( (string)( getpwuid( getuid() )->pw_dir ) + "/.dvorakng/history" );
+ TLessonManager LessonManager;
+
+-char *OnOffFrom01( bool par ) //{{{
++const char *OnOffFrom01( bool par ) //{{{
+ {
+- char *res = "";
++ const char *res = "";
+
+ if( par == true )
+ {
+@@ -2233,7 +2233,7 @@ THSEntry::THSEntry( UINT32 hits, UINT32
+ THSEntry::~THSEntry() //{{{
+ {
+ } //}}}
+-void THSEntry::Print( UINT32 row, UINT32 column, UINT32 color, char *msg ) const //{{{
++void THSEntry::Print( UINT32 row, UINT32 column, UINT32 color, const char *msg ) const //{{{
+ {
+ float ratio = CalcRatio( FHits, FMisses );
+ float speed = GetSpeed();
Index: pkgsrc/misc/dvorakng/patches/patch-lessons.cpp
diff -u /dev/null pkgsrc/misc/dvorakng/patches/patch-lessons.cpp:1.1
--- /dev/null Sun Aug 30 09:14:25 2026
+++ pkgsrc/misc/dvorakng/patches/patch-lessons.cpp Sun Aug 30 09:14:25 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-lessons.cpp,v 1.1 2026/08/30 09:14:25 he Exp $
+
+Sprinkle "const" to deal with string constants and get rid of warnings.
+
+--- lessons.cpp.orig 2026-08-30 09:05:20.511041785 +0000
++++ lessons.cpp
+@@ -30,7 +30,7 @@
+ * note that as of version 1.2 using ASCII files is possible too.
+ */
+
+-char *lessons[] =
++const char *lessons[] =
+ {
+ "UH: home row, index fingers",
+ "\x2"
Index: pkgsrc/misc/dvorakng/patches/patch-lessons.h
diff -u /dev/null pkgsrc/misc/dvorakng/patches/patch-lessons.h:1.1
--- /dev/null Sun Aug 30 09:14:25 2026
+++ pkgsrc/misc/dvorakng/patches/patch-lessons.h Sun Aug 30 09:14:25 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-lessons.h,v 1.1 2026/08/30 09:14:25 he Exp $
+
+Sprinkle "const" to deal with string constants and get rid of warnings.
+
+--- lessons.h.orig 2026-08-30 09:09:56.970093490 +0000
++++ lessons.h
+@@ -22,6 +22,6 @@
+ #ifndef LESSONS_H
+ #define LESSONS_H
+
+-extern char *lessons[];
++extern const char *lessons[];
+
+ #endif
Home |
Main Index |
Thread Index |
Old Index