Tue Jan 3 17:41:16 2023 UTC ()
gnustep-objc: revert unintended commit


(wiz)
diff -r1.17 -r1.18 pkgsrc/devel/gnustep-objc/distinfo
diff -r1.3 -r1.4 pkgsrc/devel/gnustep-objc/patches/patch-GNUmakefile
cvs diff -r1.17 -r1.18 pkgsrc/devel/gnustep-objc/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/gnustep-objc/distinfo 2022/01/26 15:57:54 1.17
+++ pkgsrc/devel/gnustep-objc/distinfo 2023/01/03 17:41:16 1.18
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.17 2022/01/26 15:57:54 tm Exp $ 1$NetBSD: distinfo,v 1.18 2023/01/03 17:41:16 wiz Exp $
2 2
3BLAKE2s (libobjc2-1.8.1.tar.gz) = 2a19ab2491baa156f7cef635053080dc4bf3eae356f1156a79edb98ebd3c0434 3BLAKE2s (libobjc2-1.8.1.tar.gz) = 2a19ab2491baa156f7cef635053080dc4bf3eae356f1156a79edb98ebd3c0434
4SHA512 (libobjc2-1.8.1.tar.gz) = 518f36e96a82a076fc67fe384226bd97310cd10a53c7b0951db9f3658aa534582b245d5cb97956fe91c38338c3fc8f1e569dd8af36f6d12e32bf1460251d02eb 4SHA512 (libobjc2-1.8.1.tar.gz) = 518f36e96a82a076fc67fe384226bd97310cd10a53c7b0951db9f3658aa534582b245d5cb97956fe91c38338c3fc8f1e569dd8af36f6d12e32bf1460251d02eb
5Size (libobjc2-1.8.1.tar.gz) = 173635 bytes 5Size (libobjc2-1.8.1.tar.gz) = 173635 bytes
6SHA1 (patch-GNUmakefile) = 7e6b8f09599c2b568346b392cd5d7654b1c747a4 6SHA1 (patch-GNUmakefile) = d9ba0c41e06122326cc6d2579af1db3d3323151d
7SHA1 (patch-objc_runtime.h) = cc8aaeb1352a403abb918aaf5a12d86fdcea383f 7SHA1 (patch-objc_runtime.h) = cc8aaeb1352a403abb918aaf5a12d86fdcea383f
8SHA1 (patch-objcxx_eh.cc) = 8804d075cb46380165e40af5f4abd5d8d413b92a 8SHA1 (patch-objcxx_eh.cc) = 8804d075cb46380165e40af5f4abd5d8d413b92a
9SHA1 (patch-objcxx_eh.h) = 68a3709ed9d029e6ae4c7a6cc375678ee7c21b1e 9SHA1 (patch-objcxx_eh.h) = 68a3709ed9d029e6ae4c7a6cc375678ee7c21b1e
cvs diff -r1.3 -r1.4 pkgsrc/devel/gnustep-objc/patches/Attic/patch-GNUmakefile (expand / switch to unified diff)

--- pkgsrc/devel/gnustep-objc/patches/Attic/patch-GNUmakefile 2020/11/04 08:36:53 1.3
+++ pkgsrc/devel/gnustep-objc/patches/Attic/patch-GNUmakefile 2023/01/03 17:41:16 1.4
@@ -1,30 +1,28 @@ @@ -1,30 +1,28 @@
1$NetBSD: patch-GNUmakefile,v 1.3 2020/11/04 08:36:53 triaxx Exp $ 1$NetBSD: patch-GNUmakefile,v 1.4 2023/01/03 17:41:16 wiz Exp $
2 2
3* Replace absolute paths by DESTDIR 3* Replace absolute paths by DESTDIR
4* Replace install by pkgsrc's INSTALL_* 4* Replace install by pkgsrc's INSTALL_*
5* Add conditionnal test for installation of LIBOBJCXX on FreeBSD 5* Add conditionnal test for installation of LIBOBJCXX on FreeBSD
6 6
7--- GNUmakefile.orig 2015-08-07 11:33:41.000000000 +0000 7--- GNUmakefile.orig 2015-08-07 11:33:41.000000000 +0000
8+++ GNUmakefile 8+++ GNUmakefile
9@@ -78,21 +78,25 @@ endif 9@@ -79,20 +79,24 @@ endif
10  
11 install: all 10 install: all
12 $(SILENT)echo Installing libraries... 11 $(SILENT)echo Installing libraries...
13- $(SILENT)install -d $(LIB_DIR) 12 $(SILENT)install -d $(LIB_DIR)
14- $(SILENT)install -m 444 $(STRIP) $(LIBOBJC).so.$(VERSION) $(LIB_DIR) 13- $(SILENT)install -m 444 $(STRIP) $(LIBOBJC).so.$(VERSION) $(LIB_DIR)
15- $(SILENT)install -m 444 $(STRIP) $(LIBOBJCXX).so.$(VERSION) $(LIB_DIR) 14- $(SILENT)install -m 444 $(STRIP) $(LIBOBJCXX).so.$(VERSION) $(LIB_DIR)
16- $(SILENT)install -m 444 $(STRIP) $(LIBOBJC).a $(LIB_DIR) 15- $(SILENT)install -m 444 $(STRIP) $(LIBOBJC).a $(LIB_DIR)
17+ $(SILENT)install -d $(LIB_DIR) 
18+ $(SILENT)install -m 444 $(STRIP) $(LIBOBJC).so.$(VERSION) $(DESTDIR)/$(LIB_DIR) 16+ $(SILENT)install -m 444 $(STRIP) $(LIBOBJC).so.$(VERSION) $(DESTDIR)/$(LIB_DIR)
19+ifneq ($(findstring freebsd, $(shell $(CC) -dumpmachine)), freebsd) 17+ifneq ($(findstring freebsd, $(shell $(CC) -dumpmachine)), freebsd)
20+ $(SILENT)install -m 444 $(STRIP) $(LIBOBJCXX).so.$(VERSION) $(DESTDIR)/$(LIB_DIR) 18+ $(SILENT)install -m 444 $(STRIP) $(LIBOBJCXX).so.$(VERSION) $(DESTDIR)/$(LIB_DIR)
21+endif 19+endif
22+ #$(SILENT)install -m 444 $(STRIP) $(LIBOBJC).a $(LIB_DIR) 20+ #$(SILENT)install -m 444 $(STRIP) $(LIBOBJC).a $(LIB_DIR)
23 $(SILENT)echo Creating symbolic links... 21 $(SILENT)echo Creating symbolic links...
24- $(SILENT)ln -sf $(LIBOBJC).so.$(VERSION) $(LIB_DIR)/$(LIBOBJC).so 22- $(SILENT)ln -sf $(LIBOBJC).so.$(VERSION) $(LIB_DIR)/$(LIBOBJC).so
25- $(SILENT)ln -sf $(LIBOBJC).so.$(VERSION) $(LIB_DIR)/$(LIBOBJC).so.$(MAJOR_VERSION) 23- $(SILENT)ln -sf $(LIBOBJC).so.$(VERSION) $(LIB_DIR)/$(LIBOBJC).so.$(MAJOR_VERSION)
26- $(SILENT)ln -sf $(LIBOBJC).so.$(VERSION) $(LIB_DIR)/$(LIBOBJC).so.$(MAJOR_VERSION).$(MINOR_VERSION) 24- $(SILENT)ln -sf $(LIBOBJC).so.$(VERSION) $(LIB_DIR)/$(LIBOBJC).so.$(MAJOR_VERSION).$(MINOR_VERSION)
27- $(SILENT)ln -sf $(LIBOBJCXX).so.$(VERSION) $(LIB_DIR)/$(LIBOBJCXX).so 25- $(SILENT)ln -sf $(LIBOBJCXX).so.$(VERSION) $(LIB_DIR)/$(LIBOBJCXX).so
28- $(SILENT)ln -sf $(LIBOBJCXX).so.$(VERSION) $(LIB_DIR)/$(LIBOBJCXX).so.$(MAJOR_VERSION) 26- $(SILENT)ln -sf $(LIBOBJCXX).so.$(VERSION) $(LIB_DIR)/$(LIBOBJCXX).so.$(MAJOR_VERSION)
29- $(SILENT)ln -sf $(LIBOBJCXX).so.$(VERSION) $(LIB_DIR)/$(LIBOBJCXX).so.$(MAJOR_VERSION).$(MINOR_VERSION) 27- $(SILENT)ln -sf $(LIBOBJCXX).so.$(VERSION) $(LIB_DIR)/$(LIBOBJCXX).so.$(MAJOR_VERSION).$(MINOR_VERSION)
30+ $(SILENT)ln -sf $(LIBOBJC).so.$(VERSION) $(DESTDIR)$(LIB_DIR)/$(LIBOBJC).so 28+ $(SILENT)ln -sf $(LIBOBJC).so.$(VERSION) $(DESTDIR)$(LIB_DIR)/$(LIBOBJC).so