CVS commit: pkgsrc/textproc/libstemmer

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/textproc/libstemmer
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Thu, 13 Jul 2023 06:21:47 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Jul 13 06:21:47 UTC 2023

Modified Files:
        pkgsrc/textproc/libstemmer: Makefile PLIST distinfo
        pkgsrc/textproc/libstemmer/patches: patch-GNUmakefile
Removed Files:
        pkgsrc/textproc/libstemmer/patches: patch-libstemmer_symbol.map

Log Message:
libstemmer: Libtoolize. Should help the build on various platforms.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/libstemmer/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/libstemmer/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/libstemmer/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/libstemmer/patches/patch-GNUmakefile
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/textproc/libstemmer/patches/patch-libstemmer_symbol.map

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/libstemmer/Makefile
diff -u pkgsrc/textproc/libstemmer/Makefile:1.7 pkgsrc/textproc/libstemmer/Makefile:1.8
--- pkgsrc/textproc/libstemmer/Makefile:1.7     Thu Apr 27 08:12:44 2023
+++ pkgsrc/textproc/libstemmer/Makefile Thu Jul 13 06:21:47 2023
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2023/04/27 08:12:44 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2023/07/13 06:21:47 nia Exp $
 
 DISTNAME=      snowball-2.2.0
 PKGNAME=       ${DISTNAME:S/snowball/libstemmer/}
+PKGREVISION=   1
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=snowballstem/}
 GITHUB_PROJECT=        snowball
@@ -13,20 +14,17 @@ COMMENT=    Snowball compiler and the stemm
 LICENSE=       modified-bsd
 
 USE_TOOLS+=    gmake perl
+USE_LIBTOOL=   yes
 MAKE_FILE=     GNUmakefile
 
-INSTALLATION_DIRS+=    bin include lib
+BUILD_TARGET=  libstemmer.la
 
-BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,--version-script=libstemmer/symbol.map
+INSTALLATION_DIRS+=    include lib
 
 do-install:
        ${INSTALL_DATA} ${WRKSRC}/include/libstemmer.h \
                ${DESTDIR}${PREFIX}/include
-       ${INSTALL_LIB} ${WRKSRC}/libstemmer.so.0.0.0 \
-               ${DESTDIR}${PREFIX}/lib
-       ${LN} -sf libstemmer.so.0.0.0 \
-               ${DESTDIR}${PREFIX}/lib/libstemmer.so.0
-       ${LN} -sf libstemmer.so.0.0.0 \
-               ${DESTDIR}${PREFIX}/lib/libstemmer.so
+       ${LIBTOOL} --quiet --tag=CC --mode=install \
+           ${INSTALL_LIB} ${WRKSRC}/libstemmer.la ${DESTDIR}${PREFIX}/lib
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/libstemmer/PLIST
diff -u pkgsrc/textproc/libstemmer/PLIST:1.1 pkgsrc/textproc/libstemmer/PLIST:1.2
--- pkgsrc/textproc/libstemmer/PLIST:1.1        Tue Apr 14 14:07:50 2020
+++ pkgsrc/textproc/libstemmer/PLIST    Thu Jul 13 06:21:47 2023
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2020/04/14 14:07:50 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2023/07/13 06:21:47 nia Exp $
 include/libstemmer.h
-lib/libstemmer.so
-lib/libstemmer.so.0
-lib/libstemmer.so.0.0.0
+lib/libstemmer.la
 @pkgdir bin

Index: pkgsrc/textproc/libstemmer/distinfo
diff -u pkgsrc/textproc/libstemmer/distinfo:1.6 pkgsrc/textproc/libstemmer/distinfo:1.7
--- pkgsrc/textproc/libstemmer/distinfo:1.6     Thu Apr 27 08:12:44 2023
+++ pkgsrc/textproc/libstemmer/distinfo Thu Jul 13 06:21:47 2023
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.6 2023/04/27 08:12:44 wiz Exp $
+$NetBSD: distinfo,v 1.7 2023/07/13 06:21:47 nia Exp $
 
 BLAKE2s (snowball-2.2.0.tar.gz) = a342a1f35f5acd0c8bc7c2013cd9d4adac8db5e378a0874c3136e2adc2229f10
 SHA512 (snowball-2.2.0.tar.gz) = 02c43313de9de2518ea51cfb11f1c29145fc046c7838329bfdefd70b604009ad44b6db8175c25b0db31f03db30a6aec5857aa35775a9c204ec976df9cae62957
 Size (snowball-2.2.0.tar.gz) = 223846 bytes
-SHA1 (patch-GNUmakefile) = a4f2a2cf5409994302402433a6e1837ed82c5b08
-SHA1 (patch-libstemmer_symbol.map) = 0122f03d0ac54dae908ffd873f1ae4a6e502a56f
+SHA1 (patch-GNUmakefile) = 5972aec4956fa26a47491493d6a5bd9960c9c68d

Index: pkgsrc/textproc/libstemmer/patches/patch-GNUmakefile
diff -u pkgsrc/textproc/libstemmer/patches/patch-GNUmakefile:1.4 pkgsrc/textproc/libstemmer/patches/patch-GNUmakefile:1.5
--- pkgsrc/textproc/libstemmer/patches/patch-GNUmakefile:1.4    Thu Apr 27 08:12:44 2023
+++ pkgsrc/textproc/libstemmer/patches/patch-GNUmakefile        Thu Jul 13 06:21:47 2023
@@ -1,32 +1,105 @@
-$NetBSD: patch-GNUmakefile,v 1.4 2023/04/27 08:12:44 wiz Exp $
+$NetBSD: patch-GNUmakefile,v 1.5 2023/07/13 06:21:47 nia Exp $
 
-* Build dynamic library, from archlinux.
+* Libtoolize.
 
 --- GNUmakefile.orig   2021-11-10 02:42:18.000000000 +0000
 +++ GNUmakefile
-@@ -170,12 +170,12 @@ C_OTHER_OBJECTS = $(C_OTHER_SOURCES:.c=.
+@@ -159,23 +159,23 @@ ADA_SOURCES = $(libstemmer_algorithms:%=
+         $(libstemmer_algorithms:%=$(ada_src_dir)/stemmer-%.adb) \
+         $(ada_src_dir)/stemmer-factory.ads $(ada_src_dir)/stemmer-factory.adb
+ 
+-COMPILER_OBJECTS=$(COMPILER_SOURCES:.c=.o)
+-RUNTIME_OBJECTS=$(RUNTIME_SOURCES:.c=.o)
+-LIBSTEMMER_OBJECTS=$(LIBSTEMMER_SOURCES:.c=.o)
+-LIBSTEMMER_UTF8_OBJECTS=$(LIBSTEMMER_UTF8_SOURCES:.c=.o)
+-STEMWORDS_OBJECTS=$(STEMWORDS_SOURCES:.c=.o)
+-STEMTEST_OBJECTS=$(STEMTEST_SOURCES:.c=.o)
+-C_LIB_OBJECTS = $(C_LIB_SOURCES:.c=.o)
+-C_OTHER_OBJECTS = $(C_OTHER_SOURCES:.c=.o)
++COMPILER_OBJECTS=$(COMPILER_SOURCES:.c=.lo)
++RUNTIME_OBJECTS=$(RUNTIME_SOURCES:.c=.lo)
++LIBSTEMMER_OBJECTS=$(LIBSTEMMER_SOURCES:.c=.lo)
++LIBSTEMMER_UTF8_OBJECTS=$(LIBSTEMMER_UTF8_SOURCES:.c=.lo)
++STEMWORDS_OBJECTS=$(STEMWORDS_SOURCES:.c=.lo)
++STEMTEST_OBJECTS=$(STEMTEST_SOURCES:.c=.lo)
++C_LIB_OBJECTS = $(C_LIB_SOURCES:.c=.lo)
++C_OTHER_OBJECTS = $(C_OTHER_SOURCES:.c=.lo)
  JAVA_CLASSES = $(JAVA_SOURCES:.java=.class)
  JAVA_RUNTIME_CLASSES=$(JAVARUNTIME_SOURCES:.java=.class)
  
 -CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
 -CPPFLAGS=
-+CFLAGS+=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
++CFLAGS+=-fPIC -W -Wall -Wmissing-prototypes -Wmissing-declarations
 +CPPFLAGS+=
  
  INCLUDES=-Iinclude
  
 -all: snowball$(EXEEXT) libstemmer.a stemwords$(EXEEXT) $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
-+all: snowball$(EXEEXT) libstemmer.so stemwords$(EXEEXT) $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
++all: snowball$(EXEEXT) libstemmer.la stemwords$(EXEEXT) $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
  
  algorithms.mk: libstemmer/mkalgorithms.pl libstemmer/modules.txt
        libstemmer/mkalgorithms.pl algorithms.mk libstemmer/modules.txt
-@@ -214,6 +214,9 @@ libstemmer/libstemmer.c: libstemmer/libs
+@@ -204,7 +204,12 @@ clean:
+       -rmdir $(js_output_dir)
+ 
+ snowball$(EXEEXT): $(COMPILER_OBJECTS)
+-      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
++      $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) $(LDFLAGS) -o $@ $^
++
++.SUFFIXES: .lo
++
++.c.lo:
++      $(LIBTOOL) --quiet --tag=CC --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(CPPFLAGS) -o $@ -c $<
+ 
+ $(COMPILER_OBJECTS): $(COMPILER_HEADERS)
+ 
+@@ -214,28 +219,28 @@ libstemmer/libstemmer.c: libstemmer/libs
  libstemmer/libstemmer_utf8.c: libstemmer/libstemmer_c.in
        sed 's/@MODULES_H@/modules_utf8.h/' $^ >$@
  
-+libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
-+      $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,libstemmer.so.0 -Wl,--version-script=libstemmer/symbol.map -o $@.0.0.0 $^
++libstemmer.la: libstemmer/libstemmer.lo $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
++      $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) $(LDFLAGS) -version-info 0:0 -rpath $(PREFIX)/lib -o $@ $^
 +
  libstemmer/modules.h libstemmer/mkinc.mak: libstemmer/mkmodules.pl libstemmer/modules.txt
        libstemmer/mkmodules.pl $@ $(c_src_dir) libstemmer/modules.txt libstemmer/mkinc.mak
  
+ libstemmer/modules_utf8.h libstemmer/mkinc_utf8.mak: libstemmer/mkmodules.pl libstemmer/modules.txt
+       libstemmer/mkmodules.pl $@ $(c_src_dir) libstemmer/modules.txt libstemmer/mkinc_utf8.mak utf8
+ 
+-libstemmer/libstemmer.o: libstemmer/modules.h $(C_LIB_HEADERS)
+-
+-libstemmer.a: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
+-      $(AR) -cru $@ $^
++libstemmer/libstemmer.lo: libstemmer/modules.h $(C_LIB_HEADERS)
+ 
+-examples/%.o: examples/%.c
+-      $(CC) $(CFLAGS) $(INCLUDES) $(CPPFLAGS) -c -o $@ $<
++examples/%.lo: examples/%.c
++      $(LIBTOOL) --quiet --tag=CC --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(CPPFLAGS) -c -o $@ $<
+ 
+ stemwords$(EXEEXT): $(STEMWORDS_OBJECTS) libstemmer.a
+-      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
++      $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) $(LDFLAGS) -o $@ $^
+ 
+-tests/%.o: tests/%.c
+-      $(CC) $(CFLAGS) $(INCLUDES) $(CPPFLAGS) -c -o $@ $<
++tests/%.lo: tests/%.c
++      $(LIBTOOL) --quiet --tag=CC --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(CPPFLAGS) -c -o $@ $<
+ 
+ stemtest$(EXEEXT): $(STEMTEST_OBJECTS) libstemmer.a
+-      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
++      $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) $(LDFLAGS) -o $@ $^
+ 
+ csharp_stemwords$(EXEEXT): $(CSHARP_STEMWORDS_SOURCES) $(CSHARP_RUNTIME_SOURCES) $(CSHARP_SOURCES)
+       $(MCS) -unsafe -target:exe -out:$@ $(CSHARP_STEMWORDS_SOURCES) $(CSHARP_RUNTIME_SOURCES) $(CSHARP_SOURCES)
+@@ -274,8 +279,8 @@ $(c_src_dir)/stem_ISO_8859_2_%.c $(c_src
+       echo "./snowball charsets/ISO-8859-2.sbl $< -o $${o} -eprefix $${l}_ISO_8859_2_ -r ../runtime"; \
+       ./snowball charsets/ISO-8859-2.sbl $< -o $${o} -eprefix $${l}_ISO_8859_2_ -r ../runtime
+ 
+-$(c_src_dir)/stem_%.o: $(c_src_dir)/stem_%.c $(c_src_dir)/stem_%.h
+-      $(CC) $(CFLAGS) $(INCLUDES) $(CPPFLAGS) -c -o $@ $<
++$(c_src_dir)/stem_%.lo: $(c_src_dir)/stem_%.c $(c_src_dir)/stem_%.h
++      $(LIBTOOL) --quiet --tag=CC --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(CPPFLAGS) -c -o $@ $<
+ 
+ $(java_src_dir)/%Stemmer.java: algorithms/%.sbl snowball$(EXEEXT)
+       @mkdir -p $(java_src_dir)

Prev by Date: CVS commit: pkgsrc/security/putty
Next by Date: CVS commit: pkgsrc/textproc/DWB
Previous by Thread: CVS commit: pkgsrc/security/putty
Next by Thread: CVS commit: pkgsrc/textproc/DWB
Indexes:

Home | Main Index | Thread Index | Old Index