Mon Oct 4 15:02:24 2021 UTC ()
Put the '--tag=CC' where it belongs. It didn't help that the package
only breaks when built from pkg_rolling-replace, but not with a 'make
package'.


(hauke)
diff -r1.24 -r1.25 pkgsrc/graphics/libimagequant/Makefile
diff -r1.25 -r1.26 pkgsrc/graphics/libimagequant/distinfo
diff -r1.5 -r1.6 pkgsrc/graphics/libimagequant/patches/patch-Makefile
cvs diff -r1.24 -r1.25 pkgsrc/graphics/libimagequant/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/libimagequant/Makefile 2021/10/04 12:05:58 1.24
+++ pkgsrc/graphics/libimagequant/Makefile 2021/10/04 15:02:24 1.25
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.24 2021/10/04 12:05:58 hauke Exp $ 1# $NetBSD: Makefile,v 1.25 2021/10/04 15:02:24 hauke Exp $
2 2
3DISTNAME= libimagequant-2.16.0 3DISTNAME= libimagequant-2.16.0
4CATEGORIES= graphics 4CATEGORIES= graphics
5MASTER_SITES+= ${MASTER_SITE_GITHUB:=ImageOptim/} 5MASTER_SITES+= ${MASTER_SITE_GITHUB:=ImageOptim/}
6GITHUB_TAG= ${PKGVERSION_NOREV} 6GITHUB_TAG= ${PKGVERSION_NOREV}
7 7
8MAINTAINER= adam@NetBSD.org 8MAINTAINER= adam@NetBSD.org
9HOMEPAGE= https://pngquant.org/lib/ 9HOMEPAGE= https://pngquant.org/lib/
10COMMENT= High-quality conversion of RGBA images to 8-bit indexed-color 10COMMENT= High-quality conversion of RGBA images to 8-bit indexed-color
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13USE_LIBTOOL= yes 13USE_LIBTOOL= yes
14USE_TOOLS+= bash gmake 14USE_TOOLS+= bash gmake
@@ -21,17 +21,17 @@ INSTALLATION_DIRS= include lib @@ -21,17 +21,17 @@ INSTALLATION_DIRS= include lib
21REPLACE_BASH= configure 21REPLACE_BASH= configure
22 22
23.include "../../mk/bsd.prefs.mk" 23.include "../../mk/bsd.prefs.mk"
24 24
25.if ${MACHINE_ARCH} == "x86_64" 25.if ${MACHINE_ARCH} == "x86_64"
26CONFIGURE_ARGS+= --enable-sse 26CONFIGURE_ARGS+= --enable-sse
27.else 27.else
28CONFIGURE_ARGS+= --disable-sse 28CONFIGURE_ARGS+= --disable-sse
29.endif 29.endif
30 30
31do-install: 31do-install:
32 ${INSTALL_DATA} ${WRKSRC}/libimagequant.h \ 32 ${INSTALL_DATA} ${WRKSRC}/libimagequant.h \
33 ${DESTDIR}${PREFIX}/include/libimagequant.h 33 ${DESTDIR}${PREFIX}/include/libimagequant.h
34 ${LIBTOOL} --mode=install --tag=CC ${INSTALL_LIB} \ 34 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
35 ${WRKSRC}/libimagequant.la ${DESTDIR}${PREFIX}/lib 35 ${WRKSRC}/libimagequant.la ${DESTDIR}${PREFIX}/lib
36 36
37.include "../../mk/bsd.pkg.mk" 37.include "../../mk/bsd.pkg.mk"
cvs diff -r1.25 -r1.26 pkgsrc/graphics/libimagequant/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/libimagequant/distinfo 2021/10/01 09:00:36 1.25
+++ pkgsrc/graphics/libimagequant/distinfo 2021/10/04 15:02:24 1.26
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.25 2021/10/01 09:00:36 adam Exp $ 1$NetBSD: distinfo,v 1.26 2021/10/04 15:02:24 hauke Exp $
2 2
3SHA1 (libimagequant-2.16.0.tar.gz) = a86af0bb351e0fabbd48c4246448e43d9c4b4939 3SHA1 (libimagequant-2.16.0.tar.gz) = a86af0bb351e0fabbd48c4246448e43d9c4b4939
4RMD160 (libimagequant-2.16.0.tar.gz) = 7ff32d6d7b7bd3c377c51f33649c1299b54a3d45 4RMD160 (libimagequant-2.16.0.tar.gz) = 7ff32d6d7b7bd3c377c51f33649c1299b54a3d45
5SHA512 (libimagequant-2.16.0.tar.gz) = aada80a77ba57da6db0c713f2001582a233d8418630eeceb6253bc4ea58ab631fcf38d3e41a2ff3595fd258c12a81bee83c6fe985cbd309fa8ddc286b9bd4d65 5SHA512 (libimagequant-2.16.0.tar.gz) = aada80a77ba57da6db0c713f2001582a233d8418630eeceb6253bc4ea58ab631fcf38d3e41a2ff3595fd258c12a81bee83c6fe985cbd309fa8ddc286b9bd4d65
6Size (libimagequant-2.16.0.tar.gz) = 99275 bytes 6Size (libimagequant-2.16.0.tar.gz) = 99275 bytes
7SHA1 (patch-Makefile) = e75e9fea798efed44e25b840d5d433f16e18522a 7SHA1 (patch-Makefile) = 979f07975806619b8bff6a7868c948903f8697db
8SHA1 (patch-configure) = 89e4a07015ba59e6688eeee35e30289d24ac5307 8SHA1 (patch-configure) = 89e4a07015ba59e6688eeee35e30289d24ac5307
cvs diff -r1.5 -r1.6 pkgsrc/graphics/libimagequant/patches/Attic/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/libimagequant/patches/Attic/patch-Makefile 2018/06/12 10:15:03 1.5
+++ pkgsrc/graphics/libimagequant/patches/Attic/patch-Makefile 2021/10/04 15:02:24 1.6
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1$NetBSD: patch-Makefile,v 1.5 2018/06/12 10:15:03 adam Exp $ 1$NetBSD: patch-Makefile,v 1.6 2021/10/04 15:02:24 hauke Exp $
2 2
3Libtoolize. 3Libtoolize.
4 4
5--- Makefile.orig 2018-06-03 19:46:28.000000000 +0000 5--- Makefile.orig 2018-06-03 19:46:28.000000000 +0000
6+++ Makefile 6+++ Makefile
7@@ -1,7 +1,7 @@ 7@@ -1,7 +1,7 @@
8 -include config.mk 8 -include config.mk
9  9
10 STATICLIB=libimagequant.a 10 STATICLIB=libimagequant.a
11-SHAREDLIB=libimagequant.$(SOLIBSUFFIX) 11-SHAREDLIB=libimagequant.$(SOLIBSUFFIX)
12+SHAREDLIB=libimagequant.la 12+SHAREDLIB=libimagequant.la
13 SOVER=0 13 SOVER=0
14 ifeq ($(SOLIBSUFFIX),dylib) 14 ifeq ($(SOLIBSUFFIX),dylib)
15 SHAREDLIBVER=libimagequant.$(SOVER).$(SOLIBSUFFIX) 15 SHAREDLIBVER=libimagequant.$(SOVER).$(SOLIBSUFFIX)
16@@ -52,15 +52,11 @@ $(STATICLIB): $(OBJS) 16@@ -52,15 +52,11 @@ $(STATICLIB): $(OBJS)
17 $(AR) $(ARFLAGS) $@ $^ 17 $(AR) $(ARFLAGS) $@ $^
18  18
19 $(SHAREDOBJS): 19 $(SHAREDOBJS):
20- $(CC) -fPIC $(CFLAGS) -c $(@:.lo=.c) -o $@ 20- $(CC) -fPIC $(CFLAGS) -c $(@:.lo=.c) -o $@
21+ ${LIBTOOL} --mode=compile $(CC) -fPIC $(CFLAGS) -c $(@:.lo=.c) -o $@ 21+ ${LIBTOOL} --mode=compile --tag=CC $(CC) -fPIC $(CFLAGS) -c $(@:.lo=.c) -o $@
22  22
23-libimagequant.so: $(SHAREDOBJS) 23-libimagequant.so: $(SHAREDOBJS)
24- $(CC) -shared -Wl,-soname,$(SHAREDLIBVER) -o $(SHAREDLIBVER) $^ $(LDFLAGS) 24- $(CC) -shared -Wl,-soname,$(SHAREDLIBVER) -o $(SHAREDLIBVER) $^ $(LDFLAGS)
25- ln -fs $(SHAREDLIBVER) $(SHAREDLIB) 25- ln -fs $(SHAREDLIBVER) $(SHAREDLIB)
26- 26-
27-libimagequant.dylib: $(SHAREDOBJS) 27-libimagequant.dylib: $(SHAREDOBJS)
28- $(CC) -shared -o $(SHAREDLIBVER) $^ $(LDFLAGS) 28- $(CC) -shared -o $(SHAREDLIBVER) $^ $(LDFLAGS)
29- ln -fs $(SHAREDLIBVER) $(SHAREDLIB) 29- ln -fs $(SHAREDLIBVER) $(SHAREDLIB)
30+$(SHAREDLIB): $(SHAREDOBJS) 30+$(SHAREDLIB): $(SHAREDOBJS)
31+ ${LIBTOOL} --mode=link $(CC) -o $(SHAREDLIB) $^ $(LDFLAGS) \ 31+ ${LIBTOOL} --mode=link --tag=CC $(CC) -o $(SHAREDLIB) $^ $(LDFLAGS) \
32+ -rpath ${PREFIX}/lib -version-info $(subst .,:,$(basename $(VERSION))) 32+ -rpath ${PREFIX}/lib -version-info $(subst .,:,$(basename $(VERSION)))
33  33
34 $(OBJS): $(wildcard *.h) config.mk 34 $(OBJS): $(wildcard *.h) config.mk
35  35