CVS commit: pkgsrc/devel/SOPE

["Emmanuel Dreyfus" <manu%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   manu
Date:           Sat Jan 14 01:44:43 UTC 2023

Modified Files:
        pkgsrc/devel/SOPE: Makefile distinfo
        pkgsrc/devel/SOPE/patches:
            patch-sope-core_NGStreams_NGInternetSocketAddress.m
Added Files:
        pkgsrc/devel/SOPE/patches: patch-sope-mime_NGMime_NGMimeType.m

Log Message:
Fix build with newer gnustep-base 1.29.0


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/devel/SOPE/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/SOPE/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/devel/SOPE/patches/patch-sope-core_NGStreams_NGInternetSocketAddress.m
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/SOPE/patches/patch-sope-mime_NGMime_NGMimeType.m

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

Modified files:

Index: pkgsrc/devel/SOPE/Makefile
diff -u pkgsrc/devel/SOPE/Makefile:1.58 pkgsrc/devel/SOPE/Makefile:1.59
--- pkgsrc/devel/SOPE/Makefile:1.58     Wed Nov 23 16:19:45 2022
+++ pkgsrc/devel/SOPE/Makefile  Sat Jan 14 01:44:42 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.58 2022/11/23 16:19:45 adam Exp $
+# $NetBSD: Makefile,v 1.59 2023/01/14 01:44:42 manu Exp $
 #
 
 DISTNAME=      SOPE-2.3.23
-PKGREVISION=   14
+PKGREVISION=   15
 CATEGORIES=    devel
 MASTER_SITES=  http://www.sogo.nu/files/downloads/SOGo/Sources/
 

Index: pkgsrc/devel/SOPE/distinfo
diff -u pkgsrc/devel/SOPE/distinfo:1.25 pkgsrc/devel/SOPE/distinfo:1.26
--- pkgsrc/devel/SOPE/distinfo:1.25     Tue Oct 26 10:14:11 2021
+++ pkgsrc/devel/SOPE/distinfo  Sat Jan 14 01:44:42 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2021/10/26 10:14:11 nia Exp $
+$NetBSD: distinfo,v 1.26 2023/01/14 01:44:42 manu Exp $
 
 BLAKE2s (SOPE-2.3.23.tar.gz) = c8a474a5c9be277de5fe33613c391d96488ced0cdee246c2ce47c4eec6fd1c72
 SHA512 (SOPE-2.3.23.tar.gz) = d10d3ac530f31dfe5a18ce0bdd89efe0545714a9a52bb0ff07b0566025e90438035e2363390ab7e5daae55a77bf3a7ba766f1ebc96dc764af28dbe756398516d
@@ -6,7 +6,8 @@ Size (SOPE-2.3.23.tar.gz) = 2283214 byte
 SHA1 (patch-general.make) = 080d097aca56c4aae59beadd0c0829c6b1798aa3
 SHA1 (patch-sope-core_NGStreams_NGActiveSocket.m) = c06a04b009f894eee0161eb8bd3f9c7011b6de3e
 SHA1 (patch-sope-core_NGStreams_NGDescriptorFunctions.m) = e3045db3205cd859d78c3953e0f1565626c69d04
-SHA1 (patch-sope-core_NGStreams_NGInternetSocketAddress.m) = e0262b32d6ac3766b06a797d19a976180078a780
+SHA1 (patch-sope-core_NGStreams_NGInternetSocketAddress.m) = 8e0da0d372189c3c63e0c4004ef50364c3c5a392
 SHA1 (patch-sope-core_NGStreams_NGLocalSocketAddress.m) = 26288c147ef39ef3a63bc03cc83be123b364d206
 SHA1 (patch-sope-core_NGStreams_NGLocalSocketDomain.m) = 2b8d2e842e6de346bf908bf38bbf4c5de4d93e89
+SHA1 (patch-sope-mime_NGMime_NGMimeType.m) = afc67e53b32b7de5098058c8bbe76ed08bae8eb7
 SHA1 (patch-sope-xml_libxmlSAXDriver_libxmlHTMLSAXDriver.m) = 20b00937973c64f36324c9670ba08374bccec13b

Index: pkgsrc/devel/SOPE/patches/patch-sope-core_NGStreams_NGInternetSocketAddress.m
diff -u pkgsrc/devel/SOPE/patches/patch-sope-core_NGStreams_NGInternetSocketAddress.m:1.3 pkgsrc/devel/SOPE/patches/patch-sope-core_NGStreams_NGInternetSocketAddress.m:1.4
--- pkgsrc/devel/SOPE/patches/patch-sope-core_NGStreams_NGInternetSocketAddress.m:1.3   Thu Mar 13 14:02:44 2014
+++ pkgsrc/devel/SOPE/patches/patch-sope-core_NGStreams_NGInternetSocketAddress.m       Sat Jan 14 01:44:42 2023
@@ -1,16 +1,16 @@
-$NetBSD: patch-sope-core_NGStreams_NGInternetSocketAddress.m,v 1.3 2014/03/13 14:02:44 taca Exp $
+$NetBSD: patch-sope-core_NGStreams_NGInternetSocketAddress.m,v 1.4 2023/01/14 01:44:42 manu Exp $
 
-Add support for DragonFly.
+NetBSD and DragonflyBSD do not have gethostaddr_r()
 
---- sope-core/NGStreams/NGInternetSocketAddress.m.orig 2012-11-15 18:51:03.000000000 +0100
-+++ sope-core/NGStreams/NGInternetSocketAddress.m      2012-11-22 18:39:01.000000000 +0100
+--- sope-core/NGStreams/NGInternetSocketAddress.m.orig 2023-01-12 16:36:29.711686829 +0100
++++ sope-core/NGStreams/NGInternetSocketAddress.m      2023-01-12 16:36:47.732046372 +0100
 @@ -47,9 +47,9 @@
  #include "NGInternetSocketAddress.h"
  #include "NGInternetSocketDomain.h"
  #include "common.h"
  
 -#if defined(HAVE_GETHOSTBYNAME_R) && !defined(linux) && !defined(__FreeBSD__) && !defined(__GLIBC__)
-+#if defined(HAVE_GETHOSTBYNAME_R) && !defined(linux) && !defined(__FreeBSD__) && !defined(__GLIBC__) && !defined(__DragonFly__)
++#if defined(HAVE_GETHOSTBYNAME_R) && !defined(linux) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__GLIBC__) && !defined(__DragonFly__)
  #define USE_GETHOSTBYNAME_R 1
  #endif
  

Added files:

Index: pkgsrc/devel/SOPE/patches/patch-sope-mime_NGMime_NGMimeType.m
diff -u /dev/null pkgsrc/devel/SOPE/patches/patch-sope-mime_NGMime_NGMimeType.m:1.1
--- /dev/null   Sat Jan 14 01:44:43 2023
+++ pkgsrc/devel/SOPE/patches/patch-sope-mime_NGMime_NGMimeType.m       Sat Jan 14 01:44:43 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-sope-mime_NGMime_NGMimeType.m,v 1.1 2023/01/14 01:44:43 manu Exp $
+
+Fix encoding names that changed in recent gnustep-base 
+
+--- sope-mime/NGMime/NGMimeType.m.orig 2023-01-12 16:39:17.664895627 +0100
++++ sope-mime/NGMime/NGMimeType.m      2023-01-12 16:44:48.022243406 +0100
+@@ -120,15 +120,15 @@
+   else if ([charset isEqualToString:@"euc-kr"]) {
+     encoding = NSKoreanEUCStringEncoding;
+   }
+   else if ([charset isEqualToString:@"big5"]) {
+-    encoding = NSBIG5StringEncoding;
++    encoding = NSBig5StringEncoding;
+   }
+   else if ([charset isEqualToString:@"iso-2022-jp"]) {
+     encoding = NSISO2022JPStringEncoding;
+   }
+   else if ([charset isEqualToString:@"gb2312"]) {
+-    encoding = NSGB2312StringEncoding;
++    encoding = NSGB_2312_80StringEncoding;
+   }
+   else if ([charset isEqualToString:@"koi8-r"]) {
+     encoding = NSKOI8RStringEncoding;
+   }