CVS commit: pkgsrc/parallel/sge

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Apr  2 11:48:20 UTC 2022

Modified Files:
        pkgsrc/parallel/sge: Makefile distinfo
        pkgsrc/parallel/sge/patches: patch-source_libs_uti_sge__loadmem.c

Log Message:
sge: get slightly further building, still BROKEN


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 pkgsrc/parallel/sge/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/parallel/sge/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/parallel/sge/patches/patch-source_libs_uti_sge__loadmem.c

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

Modified files:

Index: pkgsrc/parallel/sge/Makefile
diff -u pkgsrc/parallel/sge/Makefile:1.72 pkgsrc/parallel/sge/Makefile:1.73
--- pkgsrc/parallel/sge/Makefile:1.72   Mon May 24 19:53:41 2021
+++ pkgsrc/parallel/sge/Makefile        Sat Apr  2 11:48:19 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2021/05/24 19:53:41 wiz Exp $
+# $NetBSD: Makefile,v 1.73 2022/04/02 11:48:19 nia Exp $
 
 DISTNAME=              sge-8.1.6
 PKGREVISION=           10
@@ -10,6 +10,8 @@ HOMEPAGE=             https://arc.liv.ac.uk/trac/SG
 COMMENT=               Son of Grid Engine distributed resource management system
 LICENSE=               sissl-1.1 AND 2-clause-bsd AND gnu-gpl-v2 AND gnu-lgpl-v2
 
+BROKEN+=               "Incompatible with recent OpenSSL releases"
+
 GNU_CONFIGURE=         YES
 USE_TOOLS+=            gmake csh perl:run
 

Index: pkgsrc/parallel/sge/distinfo
diff -u pkgsrc/parallel/sge/distinfo:1.23 pkgsrc/parallel/sge/distinfo:1.24
--- pkgsrc/parallel/sge/distinfo:1.23   Tue Oct 26 11:10:38 2021
+++ pkgsrc/parallel/sge/distinfo        Sat Apr  2 11:48:19 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2021/10/26 11:10:38 nia Exp $
+$NetBSD: distinfo,v 1.24 2022/04/02 11:48:19 nia Exp $
 
 BLAKE2s (sge-8.1.6.tar.gz) = 0fb07789c3a66f1792f46f538f152d56bc3c34cc391ed153eb6e071e35c01315
 SHA512 (sge-8.1.6.tar.gz) = 5044acf4b3f37a785a383c6341b51fb026456ffd7e6f9c8bb7d115068f67e15a833fe2b504fa3652710fd54946ae36eabd872f0263f13d558ae4187b824a0aa6
@@ -14,5 +14,5 @@ SHA1 (patch-source-utilbin_Makefile) = 0
 SHA1 (patch-source_3rdparty_sge_depend_def.h) = 92ad1ef5d0cf237fa083a262d38c67828593f679
 SHA1 (patch-source_libs_comm_cl_ssl_framework.c) = 230c2a510b52516d9eea934b8c797141167a0b6d
 SHA1 (patch-source_libs_spool_berkeleydb_Makefile) = 9418b67308c96cda40d2d70026cb31ef6c937693
-SHA1 (patch-source_libs_uti_sge__loadmem.c) = d781009ee8efbfa210a698c885f0aab51ae96818
+SHA1 (patch-source_libs_uti_sge__loadmem.c) = a0beb90df3f9ec927f3e2570aced53c36875adea
 SHA1 (patch-source_util_arch) = c544eca206d2b260ed881f5112bedde68ac5029a

Index: pkgsrc/parallel/sge/patches/patch-source_libs_uti_sge__loadmem.c
diff -u pkgsrc/parallel/sge/patches/patch-source_libs_uti_sge__loadmem.c:1.2 pkgsrc/parallel/sge/patches/patch-source_libs_uti_sge__loadmem.c:1.3
--- pkgsrc/parallel/sge/patches/patch-source_libs_uti_sge__loadmem.c:1.2        Tue Jan 14 10:21:39 2014
+++ pkgsrc/parallel/sge/patches/patch-source_libs_uti_sge__loadmem.c    Sat Apr  2 11:48:20 2022
@@ -1,8 +1,21 @@
-$NetBSD: patch-source_libs_uti_sge__loadmem.c,v 1.2 2014/01/14 10:21:39 markd Exp $
+$NetBSD: patch-source_libs_uti_sge__loadmem.c,v 1.3 2022/04/02 11:48:20 nia Exp $
+
+_KMEMUSER is defined too late which causes vaddr_t to be undefined
+by the time machine/types.h is included.
 
 --- source/libs/uti/sge_loadmem.c.orig 2013-10-28 16:22:54.000000000 +0000
 +++ source/libs/uti/sge_loadmem.c
-@@ -45,6 +45,10 @@
+@@ -29,6 +29,9 @@
+  * 
+  ************************************************************************/
+ /*___INFO__MARK_END__*/
++#ifdef __NetBSD__
++#define _KMEMUSER
++#endif
+ #include <stdio.h>
+ #include <string.h>
+ #include <locale.h>
+@@ -45,6 +48,10 @@
  #include "uti/sge_log.h"
  #include "uti/msg_utilib.h"
  
@@ -13,3 +26,12 @@ $NetBSD: patch-source_libs_uti_sge__load
  #if !defined(__linux__) && !defined(DARWIN) && !defined(FREEBSD) && !defined(NETBSD)
  
  #include <unistd.h>
+@@ -620,7 +627,7 @@ int sge_loadmem(sge_mem_info_t *mem_info
+ 
+ #if defined(NETBSD)
+ 
+-#define _KMEMUSER                                                              
++#include <machine/types.h>
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
+