Sun May 15 02:19:36 2022 UTC ()
Make a first attempt at a MacOS config for devel/ldapsdk.

Step towards PR 42040. (Next step is to actually make it work.)


(dholland)
diff -r1.43 -r1.44 pkgsrc/devel/ldapsdk/Makefile
diff -r1.10 -r1.11 pkgsrc/devel/ldapsdk/distinfo
diff -r0 -r1.1 pkgsrc/devel/ldapsdk/patches/patch-config_darwin.mk
cvs diff -r1.43 -r1.44 pkgsrc/devel/ldapsdk/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ldapsdk/Makefile 2021/05/24 19:49:59 1.43
+++ pkgsrc/devel/ldapsdk/Makefile 2022/05/15 02:19:36 1.44
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.43 2021/05/24 19:49:59 wiz Exp $ 1# $NetBSD: Makefile,v 1.44 2022/05/15 02:19:36 dholland Exp $
2 2
3DISTNAME= ldapsdk_12311998 3DISTNAME= ldapsdk_12311998
4PKGNAME= ${DISTNAME:S/_/-/} 4PKGNAME= ${DISTNAME:S/_/-/}
5PKGREVISION= 11 5PKGREVISION= 11
6CATEGORIES= devel databases 6CATEGORIES= devel databases
7MASTER_SITES= ${MASTER_SITE_MOZILLA_ALL:=directory/c-sdk/ancient/} 7MASTER_SITES= ${MASTER_SITE_MOZILLA_ALL:=directory/c-sdk/ancient/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10#HOMEPAGE= http://www.mozilla.org/directory/ 10#HOMEPAGE= http://www.mozilla.org/directory/
11COMMENT= LDAP C-SDK from the Mozilla project 11COMMENT= LDAP C-SDK from the Mozilla project
12 12
13CONFLICTS+= openldap-client-[0-9]* 13CONFLICTS+= openldap-client-[0-9]*
14 14
@@ -23,26 +23,28 @@ PKG_SYSCONFSUBDIR= ldapsdk @@ -23,26 +23,28 @@ PKG_SYSCONFSUBDIR= ldapsdk
23EGDIR= ${PREFIX}/share/examples/ldapsdk 23EGDIR= ${PREFIX}/share/examples/ldapsdk
24 24
25MAKE_ENV+= MOZILLA_CLIENT=1 25MAKE_ENV+= MOZILLA_CLIENT=1
26MAKE_ENV+= NO_MDUPDATE=1 26MAKE_ENV+= NO_MDUPDATE=1
27MAKE_ENV+= MOZ_LDAP_SDK=1 27MAKE_ENV+= MOZ_LDAP_SDK=1
28MAKE_FILE= ${WRKSRC}/directory/ldapsdk.mk 28MAKE_FILE= ${WRKSRC}/directory/ldapsdk.mk
29BUILD_TARGET= build 29BUILD_TARGET= build
30BUILD_DIRS= config . 30BUILD_DIRS= config .
31 31
32AUTO_MKDIRS= yes 32AUTO_MKDIRS= yes
33 33
34post-extract: 34post-extract:
35 ${LN} -s FreeBSD.mk ${WRKSRC}/config/DragonFly.mk 35 ${LN} -s FreeBSD.mk ${WRKSRC}/config/DragonFly.mk
 36 # copy rather than link this as it'll need to be patched
 37 cp ${WRKSRC}/config/Rhapsody.mk ${WRKSRC}/config/Darwin.mk
36 38
37do-configure: 39do-configure:
38 ${ECHO} "PKG_SYSCONFDIR=${PKG_SYSCONFDIR}" >> ${WRKSRC}/config/rules.mk 40 ${ECHO} "PKG_SYSCONFDIR=${PKG_SYSCONFDIR}" >> ${WRKSRC}/config/rules.mk
39 ${ECHO} "EGDIR=${EGDIR}" >> ${WRKSRC}/config/rules.mk 41 ${ECHO} "EGDIR=${EGDIR}" >> ${WRKSRC}/config/rules.mk
40 42
41do-install: 43do-install:
42 cd ${WRKSRC}/dist/public/ldap \ 44 cd ${WRKSRC}/dist/public/ldap \
43 && ${INSTALL_DATA} disptmpl.h lber.h ldap.h srchpref.h ${DESTDIR}${PREFIX}/include 45 && ${INSTALL_DATA} disptmpl.h lber.h ldap.h srchpref.h ${DESTDIR}${PREFIX}/include
44 # 46 #
45 # XXX kludge 47 # XXX kludge
46 # 48 #
47 ${INSTALL_DATA} ${WRKSRC}/dist/${OPSYS}*/lib/libldap.a ${DESTDIR}${PREFIX}/lib/libldap.a 49 ${INSTALL_DATA} ${WRKSRC}/dist/${OPSYS}*/lib/libldap.a ${DESTDIR}${PREFIX}/lib/libldap.a
48 ${INSTALL_DATA} ${WRKSRC}/dist/${OPSYS}*/lib/liblber.a ${DESTDIR}${PREFIX}/lib/liblber.a 50 ${INSTALL_DATA} ${WRKSRC}/dist/${OPSYS}*/lib/liblber.a ${DESTDIR}${PREFIX}/lib/liblber.a
cvs diff -r1.10 -r1.11 pkgsrc/devel/ldapsdk/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/ldapsdk/distinfo 2021/10/26 10:15:13 1.10
+++ pkgsrc/devel/ldapsdk/distinfo 2022/05/15 02:19:36 1.11
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: distinfo,v 1.10 2021/10/26 10:15:13 nia Exp $ 1$NetBSD: distinfo,v 1.11 2022/05/15 02:19:36 dholland Exp $
2 2
3BLAKE2s (ldapsdk_12311998.tar.gz) = eb99121e1a286a42be4f46cc1d818aebc38156e5b9be0caad45773ec979291cb 3BLAKE2s (ldapsdk_12311998.tar.gz) = eb99121e1a286a42be4f46cc1d818aebc38156e5b9be0caad45773ec979291cb
4SHA512 (ldapsdk_12311998.tar.gz) = 0e6a1fc33d4d70bba2a376336a0cf93fe7aa1e2147256ba6bc5de323c62139824ac0df66b2ebef6edcda457ba6437ca251112370c9e154bc09960c40429416b4 4SHA512 (ldapsdk_12311998.tar.gz) = 0e6a1fc33d4d70bba2a376336a0cf93fe7aa1e2147256ba6bc5de323c62139824ac0df66b2ebef6edcda457ba6437ca251112370c9e154bc09960c40429416b4
5Size (ldapsdk_12311998.tar.gz) = 1375703 bytes 5Size (ldapsdk_12311998.tar.gz) = 1375703 bytes
6SHA1 (patch-aa) = 19be7abc39dabd593766a0f0f8131f394afd0a67 6SHA1 (patch-aa) = 19be7abc39dabd593766a0f0f8131f394afd0a67
7SHA1 (patch-ab) = 270317f69022e63a9fca314b39c31297d381e8de 7SHA1 (patch-ab) = 270317f69022e63a9fca314b39c31297d381e8de
8SHA1 (patch-ac) = 52f14184a37f23b29e39b509eba894a588e395c0 8SHA1 (patch-ac) = 52f14184a37f23b29e39b509eba894a588e395c0
9SHA1 (patch-ad) = 023fb7d066a3b0e9fde391e37ce14751c7816e7d 9SHA1 (patch-ad) = 023fb7d066a3b0e9fde391e37ce14751c7816e7d
10SHA1 (patch-ae) = fe40aa1668206bd63861844fc34574c749aa22f0 10SHA1 (patch-ae) = fe40aa1668206bd63861844fc34574c749aa22f0
11SHA1 (patch-af) = 20869b8cbc7becee026adece14b9b9a250531d8a 11SHA1 (patch-af) = 20869b8cbc7becee026adece14b9b9a250531d8a
12SHA1 (patch-config-bsdecho.c) = a5f916c44c55a812793c25760771bff5a1400ed0 12SHA1 (patch-config-bsdecho.c) = a5f916c44c55a812793c25760771bff5a1400ed0
 13SHA1 (patch-config_darwin.mk) = d713cd4d018825a1ad8c7631e25f3a070de3f9c2
13SHA1 (patch-config_rules_mk) = 6ddd1ee99f4058eeddd3f34f6921c1573abcd125 14SHA1 (patch-config_rules_mk) = 6ddd1ee99f4058eeddd3f34f6921c1573abcd125
File Added: pkgsrc/devel/ldapsdk/patches/patch-config_darwin.mk
$NetBSD: patch-config_darwin.mk,v 1.1 2022/05/15 02:19:36 dholland Exp $

Halfassed attempt at a config for MacOS based on the existing one for
Rhapsody (aka prelease MacOS from 25 years ago) -- probably won't
work, but will work better than the prior state of not having one at
all.

--- config/Darwin.mk.orig	2022-05-15 02:08:50.742530570 +0000
+++ config/Darwin.mk
@@ -23,11 +23,11 @@
 # Version-independent
 ######################################################################
 
-ARCH			:= rhapsody
+ARCH			:= darwin
 ifeq (86,$(findstring 86,$(OS_TEST)))
 CPU_ARCH		:= i386
 else
-CPU_ARCH		:= ppc
+CPU_ARCH		:= $(OS_TEST)
 endif
 GFX_ARCH		:=
 
@@ -92,14 +92,12 @@ endif
 CC			= cc
 AR			= libtool -static -o $@
 
-EMACS			= /usr/bin/emacs
-PERL			= /usr/bin/perl
+EMACS			= /usr/bin/true
 RANLIB			= ranlib
 
 LDFLAGS			= 
 
-# -nostdlib gets around the missing -lm problem.
-DSO_LDFLAGS		= -arch $(CPU_ARCH) -dynamiclib -nostdlib -lstdc++ -lcc_dynamic -compatibility_version 1 -current_version 1 -all_load -undefined suppress
+DSO_LDFLAGS		=
 
 # Comment out MKSHLIB to build only static libraries.
 MKSHLIB			= $(CC) $(DSO_LDFLAGS)