Thu Mar 19 23:58:34 2020 UTC ()
Fix soname of libgifutils.so. Bump revision.


(joerg)
diff -r1.52 -r1.53 pkgsrc/graphics/giflib/Makefile
diff -r1.21 -r1.22 pkgsrc/graphics/giflib/distinfo
diff -r1.3 -r1.4 pkgsrc/graphics/giflib/patches/patch-Makefile
cvs diff -r1.52 -r1.53 pkgsrc/graphics/giflib/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/giflib/Makefile 2020/01/13 07:20:17 1.52
+++ pkgsrc/graphics/giflib/Makefile 2020/03/19 23:58:33 1.53
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.52 2020/01/13 07:20:17 minskim Exp $ 1# $NetBSD: Makefile,v 1.53 2020/03/19 23:58:33 joerg Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4PKGREVISION= 1 4PKGREVISION= 2
5 5
6COMMENT= GIF image format library 6COMMENT= GIF image format library
7 7
8CONFLICTS+= libungif-[0-9]* 8CONFLICTS+= libungif-[0-9]*
9 9
10INSTALL_TARGET= install-include 10INSTALL_TARGET= install-include
11INSTALL_TARGET+= install-lib 11INSTALL_TARGET+= install-lib
12 12
13.include "../../mk/bsd.prefs.mk" 13.include "../../mk/bsd.prefs.mk"
14 14
15.if ${OPSYS} == "Darwin" 15.if ${OPSYS} == "Darwin"
16.PHONY: fix-darwin-install-name 16.PHONY: fix-darwin-install-name
17post-install: fix-darwin-install-name 17post-install: fix-darwin-install-name
cvs diff -r1.21 -r1.22 pkgsrc/graphics/giflib/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/giflib/distinfo 2020/01/22 20:46:49 1.21
+++ pkgsrc/graphics/giflib/distinfo 2020/03/19 23:58:33 1.22
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.21 2020/01/22 20:46:49 sevan Exp $ 1$NetBSD: distinfo,v 1.22 2020/03/19 23:58:33 joerg Exp $
2 2
3SHA1 (giflib-5.2.1.tar.gz) = c3f774dcbdf26afded7788979c8081d33c6426dc 3SHA1 (giflib-5.2.1.tar.gz) = c3f774dcbdf26afded7788979c8081d33c6426dc
4RMD160 (giflib-5.2.1.tar.gz) = bc4be3ddaef877e4fd546b1240fe94dec8ef3e27 4RMD160 (giflib-5.2.1.tar.gz) = bc4be3ddaef877e4fd546b1240fe94dec8ef3e27
5SHA512 (giflib-5.2.1.tar.gz) = 4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736 5SHA512 (giflib-5.2.1.tar.gz) = 4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736
6Size (giflib-5.2.1.tar.gz) = 444187 bytes 6Size (giflib-5.2.1.tar.gz) = 444187 bytes
7SHA1 (patch-Makefile) = 9a65622d3ac2cfffef06c743b917693513f1cd7c 7SHA1 (patch-Makefile) = 056d12c235600ea3e3f29c1707ecac904dc0e049
cvs diff -r1.3 -r1.4 pkgsrc/graphics/giflib/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/giflib/patches/patch-Makefile 2020/01/22 20:46:49 1.3
+++ pkgsrc/graphics/giflib/patches/patch-Makefile 2020/03/19 23:58:34 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-Makefile,v 1.3 2020/01/22 20:46:49 sevan Exp $ 1$NetBSD: patch-Makefile,v 1.4 2020/03/19 23:58:34 joerg Exp $
2 2
3- Inherit the PREFIX rather than hard-coding it. 3- Inherit the PREFIX rather than hard-coding it.
4- Adjust location where manuals are installed. 4- Adjust location where manuals are installed.
5- Apply <https://sourceforge.net/p/giflib/bugs/_discuss/thread/4e811ad29b/> 5- Apply <https://sourceforge.net/p/giflib/bugs/_discuss/thread/4e811ad29b/>
6 to fix Darwin build 6 to fix Darwin build
7 7
8--- Makefile.orig 2019-06-24 16:08:57.000000000 +0000 8--- Makefile.orig 2019-06-24 16:08:57.000000000 +0000
9+++ Makefile 9+++ Makefile
10@@ -14,11 +14,11 @@ SHELL = /bin/sh 10@@ -14,11 +14,11 @@ SHELL = /bin/sh
11 TAR = tar 11 TAR = tar
12 INSTALL = install 12 INSTALL = install
13  13
14-PREFIX = /usr/local 14-PREFIX = /usr/local
@@ -62,27 +62,27 @@ $NetBSD: patch-Makefile,v 1.3 2020/01/22 @@ -62,27 +62,27 @@ $NetBSD: patch-Makefile,v 1.3 2020/01/22
62+else 62+else
63+ $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBGIFSOMAJOR) -o $(LIBGIFSO) $(OBJECTS) 63+ $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBGIFSOMAJOR) -o $(LIBGIFSO) $(OBJECTS)
64+endif 64+endif
65  65
66 libgif.a: $(OBJECTS) $(HEADERS) 66 libgif.a: $(OBJECTS) $(HEADERS)
67 $(AR) rcs libgif.a $(OBJECTS) 67 $(AR) rcs libgif.a $(OBJECTS)
68  68
69-libutil.so: $(UOBJECTS) $(UHEADERS) 69-libutil.so: $(UOBJECTS) $(UHEADERS)
70- $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libutil.so.$(LIBMAJOR) -o libutil.so $(UOBJECTS) 70- $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libutil.so.$(LIBMAJOR) -o libutil.so $(UOBJECTS)
71+$(LIBUTILSO): $(UOBJECTS) $(UHEADERS) 71+$(LIBUTILSO): $(UOBJECTS) $(UHEADERS)
72+ifeq ($(UNAME), Darwin) 72+ifeq ($(UNAME), Darwin)
73+ $(CC) $(CFLAGS) -dynamiclib -current_version $(LIBVER) $(OBJECTS) -o $(LIBUTILSO) 73+ $(CC) $(CFLAGS) -dynamiclib -current_version $(LIBVER) $(OBJECTS) -o $(LIBUTILSO)
74+else 74+else
75+ $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBUTILMAJOR) -o $(LIBUTILSO) $(UOBJECTS) 75+ $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBUTILSOMAJOR) -o $(LIBUTILSO) $(UOBJECTS)
76+endif 76+endif
77  77
78 libutil.a: $(UOBJECTS) $(UHEADERS) 78 libutil.a: $(UOBJECTS) $(UHEADERS)
79 $(AR) rcs libutil.a $(UOBJECTS) 79 $(AR) rcs libutil.a $(UOBJECTS)
80  80
81 clean: 81 clean:
82- rm -f $(UTILS) $(TARGET) libgetarg.a libgif.a libgif.so libutil.a libutil.so *.o 82- rm -f $(UTILS) $(TARGET) libgetarg.a libgif.a libgif.so libutil.a libutil.so *.o
83- rm -f libgif.so.$(LIBMAJOR).$(LIBMINOR).$(LIBPOINT) 83- rm -f libgif.so.$(LIBMAJOR).$(LIBMINOR).$(LIBPOINT)
84- rm -f libgif.so.$(LIBMAJOR) 84- rm -f libgif.so.$(LIBMAJOR)
85+ rm -f $(UTILS) $(TARGET) libgetarg.a libgif.a $(LIBGIFSO) libutil.a $(LIBUTILSO) *.o 85+ rm -f $(UTILS) $(TARGET) libgetarg.a libgif.a $(LIBGIFSO) libutil.a $(LIBUTILSO) *.o
86+ rm -f $(LIBGIFSOVER) 86+ rm -f $(LIBGIFSOVER)
87+ rm -f $(LIBGIFSOMAJOR) 87+ rm -f $(LIBGIFSOMAJOR)
88 rm -fr doc/*.1 *.html doc/staging 88 rm -fr doc/*.1 *.html doc/staging