Add DragonFly support. Make the pre-install script a bit more likely

to work on NetBSD platforms by not hard-coding NetBSD.
Use BSD_INSTALL_LIB for shared libraries, better file mods.

7 files changed, 72 insertions, 6 deletions

diff --git a/devel/ldapsdk/Makefile b/devel/ldapsdk/Makefile
index 059a251d96f..43990db8d1c 100644
--- a/devel/ldapsdk/Makefile
+++ b/devel/ldapsdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/07/16 01:19:09 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/15 18:10:23 joerg Exp $
 
 DISTNAME=	ldapsdk_12311998
 PKGNAME=	${DISTNAME:S/_/-/}
@@ -22,6 +22,9 @@ SCRIPTS_ENV+=	EGDIR=${EGDIR}
 SCRIPTS_ENV+=	GMAKE=${GMAKE}
 SCRIPTS_ENV+=	LN=${LN}
 
+post-extract:
+	${LN} -s FreeBSD.mk ${WRKSRC}/config/DragonFly.mk
+
 do-configure:
 	${ECHO} "PKG_SYSCONFDIR=${PKG_SYSCONFDIR}" >> ${WRKSRC}/config/rules.mk
 	${ECHO} "EGDIR=${EGDIR}" >> ${WRKSRC}/config/rules.mk
diff --git a/devel/ldapsdk/distinfo b/devel/ldapsdk/distinfo
index b6742e4e4c2..883a868195d 100644
--- a/devel/ldapsdk/distinfo
+++ b/devel/ldapsdk/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 22:24:17 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/01/15 18:10:23 joerg Exp $
 
 SHA1 (ldapsdk_12311998.tar.gz) = fc132cf2d7bef6f3b93486fabd73c1f7f202d04e
 RMD160 (ldapsdk_12311998.tar.gz) = d0ede32efd1e33874d5fc74c97d9d4a053709543
 Size (ldapsdk_12311998.tar.gz) = 1375703 bytes
 SHA1 (patch-aa) = 19be7abc39dabd593766a0f0f8131f394afd0a67
 SHA1 (patch-ab) = 270317f69022e63a9fca314b39c31297d381e8de
+SHA1 (patch-ac) = 52f14184a37f23b29e39b509eba894a588e395c0
+SHA1 (patch-ad) = 023fb7d066a3b0e9fde391e37ce14751c7816e7d
+SHA1 (patch-ae) = fe40aa1668206bd63861844fc34574c749aa22f0
+SHA1 (patch-af) = 20869b8cbc7becee026adece14b9b9a250531d8a
diff --git a/devel/ldapsdk/patches/patch-ac b/devel/ldapsdk/patches/patch-ac
new file mode 100644
index 00000000000..10621564270
--- /dev/null
+++ b/devel/ldapsdk/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2006/01/15 18:10:23 joerg Exp $
+
+--- config/config.mk.orig	2006-01-15 17:52:43.000000000 +0000
++++ config/config.mk
+@@ -106,7 +106,7 @@ endif
+ # but save the version to allow multiple versions of the same base
+ # platform to be built in the same tree.
+ #
+-ifneq (,$(filter FreeBSD HP-UX IRIX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH)))
++ifneq (,$(filter DragonFly FreeBSD HP-UX IRIX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH)))
+ OS_VERS		:= $(suffix $(OS_RELEASE))
+ OS_RELEASE	:= $(basename $(OS_RELEASE))
+ 
diff --git a/devel/ldapsdk/patches/patch-ad b/devel/ldapsdk/patches/patch-ad
new file mode 100644
index 00000000000..4c0eb5dbdf3
--- /dev/null
+++ b/devel/ldapsdk/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2006/01/15 18:10:23 joerg Exp $
+
+--- config/rules.mk.orig	2006-01-15 17:53:12.000000000 +0000
++++ config/rules.mk
+@@ -112,7 +112,7 @@ else
+ ifeq ($(OS_ARCH),HP-UX)
+ SHARED_LIBRARY		:= $(LIBRARY:.a=.sl)
+ else
+-ifneq (,$(filter FreeBSD NetBSD OpenBSD,$(OS_ARCH)))
++ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH)))
+ SHARED_LIBRARY		:= $(LIBRARY:.a=.so.1.0)
+ else
+ ifeq ($(OS_ARCH)$(OS_RELEASE),SunOS4.1)
diff --git a/devel/ldapsdk/patches/patch-ae b/devel/ldapsdk/patches/patch-ae
new file mode 100644
index 00000000000..d52a92c0b2b
--- /dev/null
+++ b/devel/ldapsdk/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1 2006/01/15 18:10:23 joerg Exp $
+
+--- nsprpub/pr/include/md/Makefile.orig	2006-01-15 17:53:51.000000000 +0000
++++ nsprpub/pr/include/md/Makefile
+@@ -59,6 +59,10 @@ ifeq ($(OS_ARCH),FreeBSD)
+ MDCPUCFG_H = _freebsd.cfg
+ endif
+ 
++ifeq ($(OS_ARCH),DragonFly)
++MDCPUCFG_H = _freebsd.cfg
++endif
++
+ ifeq ($(OS_ARCH),OpenBSD)
+ MDCPUCFG_H = _openbsd.cfg
+ endif
diff --git a/devel/ldapsdk/patches/patch-af b/devel/ldapsdk/patches/patch-af
new file mode 100644
index 00000000000..ccdd9d97267
--- /dev/null
+++ b/devel/ldapsdk/patches/patch-af
@@ -0,0 +1,18 @@
+$NetBSD: patch-af,v 1.1 2006/01/15 18:10:23 joerg Exp $
+
+--- nsprpub/pr/tests/Makefile.orig	2006-01-15 17:55:06.000000000 +0000
++++ nsprpub/pr/tests/Makefile
+@@ -331,6 +331,13 @@ endif
+ LDOPTS += -Xlinker -R $(PWD)/$(DIST)/lib
+ endif
+ 
++ifeq ($(OS_ARCH),DragonFly)
++ifeq ($(USE_PTHREADS),1)
++EXTRA_LIBS = -pthread
++endif
++LDOPTS += -Xlinker -R $(PWD)/$(DIST)/lib
++endif
++
+ ifeq ($(OS_ARCH),BSD_OS)
+ EXTRA_LIBS = -ldl
+ endif
diff --git a/devel/ldapsdk/scripts/pre-install b/devel/ldapsdk/scripts/pre-install
index 5117f91fd66..8fb7fe58e6c 100755
--- a/devel/ldapsdk/scripts/pre-install
+++ b/devel/ldapsdk/scripts/pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: pre-install,v 1.5 2003/05/01 09:40:01 jmmv Exp $
+# $NetBSD: pre-install,v 1.6 2006/01/15 18:10:23 joerg Exp $
 
 cd ${WRKSRC}
 cd dist
@@ -10,13 +10,13 @@ done
 #
 # XXX kludge
 #
-cd NetB*
+cd ${OPSYS}*
 ${BSD_INSTALL_DATA} lib/libldap.a ${PREFIX}/lib/libldap.a
 ${BSD_INSTALL_DATA} lib/liblber.a ${PREFIX}/lib/liblber.a
-${BSD_INSTALL_DATA} bin/libldap.so.1.0 ${PREFIX}/lib/libldap.so.1.0
+${BSD_INSTALL_LIB} bin/libldap.so.1.0 ${PREFIX}/lib/libldap.so.1.0
 ${LN} -sf libldap.so.1.0 ${PREFIX}/lib/libldap.so.1
 ${LN} -sf libldap.so.1.0 ${PREFIX}/lib/libldap.so
-${BSD_INSTALL_DATA} bin/liblber.so.1.0 ${PREFIX}/lib/liblber.so.1.0
+${BSD_INSTALL_LIB} bin/liblber.so.1.0 ${PREFIX}/lib/liblber.so.1.0
 ${LN} -sf liblber.so.1.0 ${PREFIX}/lib/liblber.so.1
 ${LN} -sf liblber.so.1.0 ${PREFIX}/lib/liblber.so
 ${BSD_INSTALL_DATA_DIR} ${EGDIR}