cwc-1.0.2 (rebuild with gcc-12.4.0)

cwc/README

@@ -4,30 +4,30 @@ cwc is a very useful crossword compiler program written by Lars Christensen
 which is based on the algorithms described in Sik Cambon Jensen's thesis
 'Design and Implementation of Crossword Compilation Programs Using Serial
 Approaches'. I have not been able to contact Lars to ask whether he is still
-maintaining cwc, since the email address ([email protected]) on the two
-webpages I've found for the program no longer works and Lars Chistensen is a
-very common name. However, I wanted to release a version with a few changes,
-hence this page. If you would like to contribute changes to this version, or
-have any other feedback please email me.
+maintaining cwc, since the email address ([email protected]) on the two webpages
+I've found for the program no longer works and Lars Chistensen is a very common
+name. However, I wanted to release a version with a few changes, hence this
+page. If you would like to contribute changes to this version, or have any
+other feedback please email me.
 
 Runtime requirements:
-  cygwin-2.4.1-1
-  libgcc1-5.3.0-3
-  libstdc++6-5.3.0-3
+  cygwin-3.5.4-1
+  libgcc1-12.4.0-3
+  libstdc++6-12.4.0-3
 
 Build requirements:
 (besides corresponding -devel packages)
-  binutils-2.25-4
-  cygport-0.20.2-1
-  gcc-core-5.3.0-3
-  gcc-g++-5.3.0-3
-  make-4.1-1
+  binutils-2.43.1-1
+  cygport-0.36.9-1
+  gcc-core-12.4.0-3
+  gcc-g++-12.4.0-3
+  make-4.4.1-2
 
 Canonical website:
-  http://mythic-beasts.com/~mark/software/cwc/
+  https://longair.net/mark/software/cwc/
 
 Canonical download:
-  http://mythic-beasts.com/~mark/software/cwc/cwc-1.0.2.tar.gz
+  https://longair.net/mark/software/cwc/cwc-1.0.2.tar.gz
 
 -------------------------------------------
 
@@ -146,6 +146,9 @@ Files included in the binary package:
 
 Port Notes:
 
+----- version 1.0.2-1bl3 -----
+Rebuild with gcc-12.4.0
+
 ----- version 1.0.2-1bl2 -----
 Rebuild on x86_64
 

cwc/cwc-1.0.2-1bl2.cygport → cwc/cwc-1.0.2-1bl3.cygport

@@ -1,5 +1,5 @@
-HOMEPAGE="http://mythic-beasts.com/~mark/software/${PN}/"
-SRC_URI="http://mythic-beasts.com/~mark/software/${PN}/${P}.tar.gz"
+HOMEPAGE="https://longair.net/mark/software/${PN}/"
+SRC_URI="https://longair.net/mark/software/${PN}/${P}.tar.gz"
 
 CATEGORY="Utils"
 SUMMARY="Crossword Compiler"
@@ -13,6 +13,10 @@ very common name. However, I wanted to release a version with a few changes,
 hence this page. If you would like to contribute changes to this version, or
 have any other feedback please email me."
 
+LICENSE="GPL-2.0-or-later"
+LICENSE_SPDX="SPDX-License-Identifier: GPL-2.0-or-later"
+LICENSE_URI="COPYING"
+
 src_compile()
 {
 	cd ${B}

cwc/cwc-1.0.2-1bl3.src.patch

@@ -0,0 +1,50 @@
+--- origsrc/cwc-1.0.2/src/Makefile	2008-06-18 01:52:59.000000000 +0900
++++ src/cwc-1.0.2/src/Makefile	2024-12-18 09:06:09.146203900 +0900
+@@ -10,7 +10,7 @@ OPTIMIZE=-O3
+ #PROFILE=-pg
+ #DEBUG=-ggdb
+
+-CPPFLAGS=-Wall $(OPTIMIZE) $(PROFILE) $(DEBUG)
++CPPFLAGS?=-Wall $(OPTIMIZE) $(PROFILE) $(DEBUG)
+
+ OBJS=timer.o letterdict.o symbol.o dict.o grid.o cwc.o wordlist.o
+ HEADER_FILES=\
+@@ -33,7 +33,7 @@ SOURCE_FILES=\
+ 	wordlist.cc
+
+ cwc: $(OBJS) $(HEADER_FILES) $(SOURCE_FILES)
+-	g++ -o cwc $(OBJS) $(CPPFLAGS)
++	g++ -o cwc $(OBJS) $(LDFLAGS)
+
+ remake: clean cwc
+
+@@ -43,7 +43,7 @@ depend:
+ 	g++ -MM *.cc > depend
+
+ $(OBJS): %.o: %.cc %.hh
+-	$(CPP) $(CPPFLAGS) -c $< -o $@
++	$(CPP) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
+
+ clean:
+ 	rm -f *~ *.o cwc depend
+--- origsrc/cwc-1.0.2/src/cwc.cc	2008-06-18 02:43:28.000000000 +0900
++++ src/cwc-1.0.2/src/cwc.cc	2024-12-18 09:07:32.055545700 +0900
+@@ -463,7 +463,7 @@ int parseparameters(int argc, char *argv
+         case 's': setup.showsteps = true; break;
+         case 'S': setup.showallsteps = true; break;
+         case '?':
+-        case 'h': printf(usage); return -1;
++        case 'h': printf("%s", usage); return -1;
+         }
+     }
+     return 0;
+--- origsrc/cwc-1.0.2/src/dict.cc	2008-06-18 02:43:28.000000000 +0900
++++ src/cwc-1.0.2/src/dict.cc	2024-12-18 09:07:04.723053400 +0900
+@@ -22,6 +22,7 @@
+ #include <string>
+ #include <fstream>
+ #include <iostream>
++#include <cstring>
+
+ #include "symbol.hh"
+ #include "dict.hh"