diff --git a/textproc/snowballstemmer/Makefile b/textproc/snowballstemmer/Makefile index bac448feb436..b3e707b85703 100644 --- a/textproc/snowballstemmer/Makefile +++ b/textproc/snowballstemmer/Makefile @@ -1,36 +1,36 @@ PORTNAME= snowballstemmer -PORTVERSION= 2.1.0 +PORTVERSION= 2.2.0 DISTVERSIONPREFIX= v CATEGORIES= textproc MAINTAINER= madpilot@FreeBSD.org COMMENT= Snowball stemmer library for C LICENSE= BSD3CLAUSE USES= gmake perl5 USE_PERL5= build USE_LDCONFIG= yes MAKEFILE= GNUmakefile USE_GITHUB= yes GH_ACCOUNT= snowballstem GH_PROJECT= snowball PLIST_FILES= bin/stemwords \ include/libstemmer.h \ lib/libstemmer.so \ lib/libstemmer.so.0 \ lib/libstemmer.so.0.0.0 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/stemwords ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/include/libstemmer.h ${STAGEDIR}${PREFIX}/include ${INSTALL_LIB} ${WRKSRC}/libstemmer.so.0.0.0 ${STAGEDIR}${PREFIX}/lib ${RLN} ${STAGEDIR}${PREFIX}/lib/libstemmer.so.0.0.0 \ ${STAGEDIR}${PREFIX}/lib/libstemmer.so.0 ${RLN} ${STAGEDIR}${PREFIX}/lib/libstemmer.so.0.0.0 \ ${STAGEDIR}${PREFIX}/lib/libstemmer.so .include diff --git a/textproc/snowballstemmer/distinfo b/textproc/snowballstemmer/distinfo index e855d881d73f..1e1563842b1f 100644 --- a/textproc/snowballstemmer/distinfo +++ b/textproc/snowballstemmer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1624638772 -SHA256 (snowballstem-snowball-v2.1.0_GH0.tar.gz) = 24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa -SIZE (snowballstem-snowball-v2.1.0_GH0.tar.gz) = 220324 +TIMESTAMP = 1636647222 +SHA256 (snowballstem-snowball-v2.2.0_GH0.tar.gz) = 425cdb5fba13a01db59a1713780f0662e984204f402d3dae1525bda9e6d30f1a +SIZE (snowballstem-snowball-v2.2.0_GH0.tar.gz) = 223846 diff --git a/textproc/snowballstemmer/files/patch-GNUmakefile b/textproc/snowballstemmer/files/patch-GNUmakefile index 0e24e6627d92..9dfc0acdd5c4 100644 --- a/textproc/snowballstemmer/files/patch-GNUmakefile +++ b/textproc/snowballstemmer/files/patch-GNUmakefile @@ -1,26 +1,28 @@ ---- GNUmakefile.orig 2021-01-21 04:50:09 UTC +--- GNUmakefile.orig 2021-11-10 02:42:18 UTC +++ GNUmakefile -@@ -162,10 +162,10 @@ C_OTHER_OBJECTS = $(C_OTHER_SOURCES:.c=.o) +@@ -170,12 +170,12 @@ C_OTHER_OBJECTS = $(C_OTHER_SOURCES:.c=.o) JAVA_CLASSES = $(JAVA_SOURCES:.java=.class) JAVA_RUNTIME_CLASSES=$(JAVARUNTIME_SOURCES:.java=.class) -CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations --CPPFLAGS=-Iinclude +-CPPFLAGS= +CFLAGS+=-fPIC -O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations -+CPPFLAGS+=-Iinclude ++CPPFLAGS+= --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) + INCLUDES=-Iinclude - clean: - rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \ -@@ -211,6 +211,9 @@ libstemmer/libstemmer.o: libstemmer/modules.h $(C_LIB_ +-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) - libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) + algorithms.mk: libstemmer/mkalgorithms.pl libstemmer/modules.txt + libstemmer/mkalgorithms.pl algorithms.mk libstemmer/modules.txt +@@ -225,6 +225,9 @@ libstemmer/libstemmer.o: libstemmer/modules.h $(C_LIB_ + 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,-soname,libstemmer.so.0,-version-script,libstemmer/symbol.map -o $@.0.0.0 $^ ++ + examples/%.o: examples/%.c + $(CC) $(CFLAGS) $(INCLUDES) $(CPPFLAGS) -c -o $@ $< - stemwords: $(STEMWORDS_OBJECTS) libstemmer.o - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^