From 9379567ca25f5cf3c231848522d52d4e948253c8 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Wed, 30 Nov 2022 08:46:08 +0000
Subject: [PATCH] update to libstemmer-2.2.0

---
 textproc/libstemmer/Makefile                  |  2 +-
 textproc/libstemmer/distinfo                  |  4 ++--
 textproc/libstemmer/patches/patch-GNUmakefile | 24 ++++++++-----------
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/textproc/libstemmer/Makefile b/textproc/libstemmer/Makefile
index daf01b6315e..4ff5277d558 100644
--- a/textproc/libstemmer/Makefile
+++ b/textproc/libstemmer/Makefile
@@ -3,7 +3,7 @@ COMMENT=	stemming algorithms for text processing
 # distfile at https://snowballstem.org/dist/ doesn't have mkalgorithms.pl
 GH_ACCOUNT=	snowballstem
 GH_PROJECT=	snowball
-GH_TAGNAME=	v2.1.0
+GH_TAGNAME=	v2.2.0
 PKGNAME=	${DISTNAME:S/snowball/libstemmer/}
 
 SHARED_LIBS=	stemmer	0.0
diff --git a/textproc/libstemmer/distinfo b/textproc/libstemmer/distinfo
index 8dd9f9fb6f2..8138ff6bf18 100644
--- a/textproc/libstemmer/distinfo
+++ b/textproc/libstemmer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (snowball-2.1.0.tar.gz) = JK4LKNZTEZDCzZYNUV7JN006PZQgxKCszfibfwL8nKo=
-SIZE (snowball-2.1.0.tar.gz) = 220324
+SHA256 (snowball-2.2.0.tar.gz) = QlzbX7oToB21mhcTeA8GYumEIE9ALT2uFSW9qebTDxo=
+SIZE (snowball-2.2.0.tar.gz) = 223846
diff --git a/textproc/libstemmer/patches/patch-GNUmakefile b/textproc/libstemmer/patches/patch-GNUmakefile
index 7cb6da50bad..342b26bf62b 100644
--- a/textproc/libstemmer/patches/patch-GNUmakefile
+++ b/textproc/libstemmer/patches/patch-GNUmakefile
@@ -1,26 +1,22 @@
 Index: GNUmakefile
 --- GNUmakefile.orig
 +++ GNUmakefile
-@@ -162,10 +162,10 @@ C_OTHER_OBJECTS = $(C_OTHER_SOURCES:.c=.o)
- JAVA_CLASSES = $(JAVA_SOURCES:.java=.class)
- JAVA_RUNTIME_CLASSES=$(JAVARUNTIME_SOURCES:.java=.class)
+@@ -175,7 +175,7 @@ CPPFLAGS=
  
--CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
-+CFLAGS=${COPTS} -fPIC -W -Wall -Wmissing-prototypes -Wmissing-declarations
- CPPFLAGS=-Iinclude
+ INCLUDES=-Iinclude
  
--all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
-+all: snowball libstemmer.o libstemmer.so stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
+-all: snowball$(EXEEXT) libstemmer.a stemwords$(EXEEXT) $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
++all: snowball$(EXEEXT) libstemmer.a libstemmer.so stemwords$(EXEEXT) $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
  
- clean:
- 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
-@@ -211,6 +211,9 @@ libstemmer/libstemmer.o: libstemmer/modules.h $(C_LIB_
+ algorithms.mk: libstemmer/mkalgorithms.pl libstemmer/modules.txt
+ 	libstemmer/mkalgorithms.pl algorithms.mk libstemmer/modules.txt
+@@ -224,6 +224,9 @@ libstemmer/libstemmer.o: libstemmer/modules.h $(C_LIB_
  
- libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
+ libstemmer.a: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
  	$(AR) -cru $@ $^
 +
 +libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
 +	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-version-script,libstemmer/symbol.map -o $@.${LIBstemmer_VERSION} $^
  
- stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ examples/%.o: examples/%.c
+ 	$(CC) $(CFLAGS) $(INCLUDES) $(CPPFLAGS) -c -o $@ $<