Date: Tue, 23 Dec 2014 04:51:09 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1796 - in trunk: mail/thunderbird/files www/seamonkey www/seamonkey/files Message-ID: <201412230451.sBN4p9oS083901@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Tue Dec 23 04:51:08 2014
New Revision: 1796
Log:
replace LDAP hacks with upstream fix
Added:
trunk/mail/thunderbird/files/patch-bug1112904
trunk/www/seamonkey/files/patch-bug1112904
Deleted:
trunk/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in
trunk/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in
trunk/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in
trunk/mail/thunderbird/files/patch-ldap-xpcom-src-Makefile.in
trunk/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in
trunk/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in
trunk/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in
Modified:
trunk/www/seamonkey/Makefile
Added: trunk/mail/thunderbird/files/patch-bug1112904
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird/files/patch-bug1112904 Tue Dec 23 04:51:08 2014 (r1796)
@@ -0,0 +1,161 @@
+diff --git a/c-sdk/config/FreeBSD.mk b/c-sdk/config/FreeBSD.mk
+--- ldap/sdks/c-sdk/config/FreeBSD.mk
++++ ldap/sdks/c-sdk/config/FreeBSD.mk
+@@ -79,8 +79,8 @@ DLL_SUFFIX = so.1.0
+ endif
+
+ DSO_CFLAGS = -fPIC
+-DSO_LDOPTS = -Bshareable
++DSO_LDOPTS = -shared -Wl,-soname,$(notdir $@)
+
+-MKSHLIB = $(LD) $(DSO_LDOPTS)
++MKSHLIB = $(CC) $(DSO_LDOPTS)
+
+ G++INCLUDES = -I/usr/include/g++
+diff --git a/c-sdk/configure b/c-sdk/configure
+--- ldap/sdks/c-sdk/configure
++++ ldap/sdks/c-sdk/configure
+@@ -4241,8 +4241,10 @@ EOF
+ #define DRAGONFLY 1
+ EOF
+
++ LD='$(CC)'
++ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+ DSO_CFLAGS=-fPIC
+- DSO_LDOPTS='-shared'
++ DSO_LDOPTS='-shared -Wl,-soname,$(notdir $@)'
+ ;;
+
+ *-freebsd*)
+@@ -4261,6 +4263,7 @@ EOF
+ #define HAVE_BSD_FLOCK 1
+ EOF
+
++ LD='$(CC)'
+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
+ MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
+ if test "$MOZ_OBJFORMAT" = "elf"; then
+@@ -4268,8 +4271,9 @@ EOF
+ else
+ DLL_SUFFIX=so.1.0
+ fi
++ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+ DSO_CFLAGS=-fPIC
+- DSO_LDOPTS=-Bshareable
++ DSO_LDOPTS='-shared -Wl,-soname,$(notdir $@)'
+ ;;
+
+ *-hpux*)
+@@ -6512,8 +6516,15 @@ echo "configure:6510: checking whether $
+ if test $? -eq 0; then
+ if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
+ ac_cv_have_dash_pthread=yes
+- CFLAGS="$CFLAGS -pthread"
+- CXXFLAGS="$CXXFLAGS -pthread"
++ case "$target_os" in
++ dragonfly*|freebsd*)
++# Freebsd doesn't use -pthread for compiles, it uses them for linking
++ ;;
++ *)
++ CFLAGS="$CFLAGS -pthread"
++ CXXFLAGS="$CXXFLAGS -pthread"
++ ;;
++ esac
+ fi
+ fi
+ rm -f conftest*
+@@ -6542,7 +6553,22 @@ echo "configure:6526: checking whether $
+ _PTHREAD_LDFLAGS=
+ fi
+ ;;
+- *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*)
++ *-dragonfly*|*-freebsd*)
++ cat >> confdefs.h <<\EOF
++#define _REENTRANT 1
++EOF
++
++ cat >> confdefs.h <<\EOF
++#define _THREAD_SAFE 1
++EOF
++
++ if test "$ac_cv_have_dash_pthread" = "yes"; then
++ _PTHREAD_LDFLAGS="-pthread"
++ else
++ _PTHREAD_LDFLAGS="-lc_r"
++ fi
++ ;;
++ *-openbsd*|*-bsdi*|*-netbsd*)
+ cat >> confdefs.h <<\EOF
+ #define _THREAD_SAFE 1
+ EOF
+diff --git a/c-sdk/configure.in b/c-sdk/configure.in
+--- ldap/sdks/c-sdk/configure.in
++++ ldap/sdks/c-sdk/configure.in
+@@ -1225,8 +1225,10 @@ tools are selected during the Xcode/Deve
+ fi
+ AC_DEFINE(XP_UNIX)
+ AC_DEFINE(DRAGONFLY)
++ LD='$(CC)'
++ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+ DSO_CFLAGS=-fPIC
+- DSO_LDOPTS='-shared'
++ DSO_LDOPTS='-shared -Wl,-soname,$(notdir $@)'
+ ;;
+
+ *-freebsd*)
+@@ -1236,6 +1238,7 @@ tools are selected during the Xcode/Deve
+ AC_DEFINE(XP_UNIX)
+ AC_DEFINE(FREEBSD)
+ AC_DEFINE(HAVE_BSD_FLOCK)
++ LD='$(CC)'
+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
+ MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
+ if test "$MOZ_OBJFORMAT" = "elf"; then
+@@ -1243,8 +1246,9 @@ tools are selected during the Xcode/Deve
+ else
+ DLL_SUFFIX=so.1.0
+ fi
++ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+ DSO_CFLAGS=-fPIC
+- DSO_LDOPTS=-Bshareable
++ DSO_LDOPTS='-shared -Wl,-soname,$(notdir $@)'
+ ;;
+
+ *-hpux*)
+@@ -2329,8 +2333,15 @@ if test -n "$USE_PTHREADS"; then
+ if test $? -eq 0; then
+ if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
+ ac_cv_have_dash_pthread=yes
+- CFLAGS="$CFLAGS -pthread"
+- CXXFLAGS="$CXXFLAGS -pthread"
++ case "$target_os" in
++ dragonfly*|freebsd*)
++# Freebsd doesn't use -pthread for compiles, it uses them for linking
++ ;;
++ *)
++ CFLAGS="$CFLAGS -pthread"
++ CXXFLAGS="$CXXFLAGS -pthread"
++ ;;
++ esac
+ fi
+ fi
+ rm -f conftest*
+@@ -2361,7 +2372,17 @@ if test -n "$USE_PTHREADS"; then
+ _PTHREAD_LDFLAGS=
+ fi
+ ;;
+- *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*)
++ *-dragonfly*|*-freebsd*)
++ AC_DEFINE(_REENTRANT)
++ AC_DEFINE(_THREAD_SAFE)
++ dnl -pthread links in -lc_r, so don't specify it explicitly.
++ if test "$ac_cv_have_dash_pthread" = "yes"; then
++ _PTHREAD_LDFLAGS="-pthread"
++ else
++ _PTHREAD_LDFLAGS="-lc_r"
++ fi
++ ;;
++ *-openbsd*|*-bsdi*|*-netbsd*)
+ AC_DEFINE(_THREAD_SAFE)
+ dnl -pthread links in -lc_r, so don't specify it explicitly.
+ if test "$ac_cv_have_dash_pthread" = "yes"; then
Deleted: trunk/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in
==============================================================================
--- trunk/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in Tue Dec 23 04:51:08 2014 (r1795)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,13 +0,0 @@
---- ldap/sdks/c-sdk/ldap/libraries/libldap/Makefile.in.orig 2009-11-10 09:56:42.000000000 +0100
-+++ ldap/sdks/c-sdk/ldap/libraries/libldap/Makefile.in 2009-11-10 09:58:15.000000000 +0100
-@@ -254,6 +254,10 @@
- EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe
- endif
-
-+ifeq ($(OS_ARCH), FreeBSD)
-+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread
-+endif
-+
- ifeq ($(OS_ARCH), NetBSD)
- EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
- endif
Deleted: trunk/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in
==============================================================================
--- trunk/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in Tue Dec 23 04:51:08 2014 (r1795)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,15 +0,0 @@
---- ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in.orig 2008-09-11 16:38:35.000000000 +0200
-+++ ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in 2009-12-01 10:18:43.000000000 +0100
-@@ -147,6 +147,12 @@
- CUSTOM_LIBS=1
- endif
-
-+ifneq (,$(filter DragonFly FreeBSD,$(OS_ARCH)))
-+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread
-+EXTRA_LIBS+= $(filter -L% -l%,${NSPRLINK})
-+CUSTOM_LIBS=1
-+endif
-+
- # no extra libs on HP-UX
- ifeq ($(OS_ARCH), HP-UX)
- CUSTOM_LIBS=1
Deleted: trunk/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in
==============================================================================
--- trunk/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in Tue Dec 23 04:51:08 2014 (r1795)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,13 +0,0 @@
---- ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in.orig 2009-09-10 17:36:39.000000000 +0200
-+++ ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in 2009-09-10 17:37:28.000000000 +0200
-@@ -180,6 +180,10 @@
- CUSTOM_LIBS=1
- endif
-
-+ifeq ($(OS_ARCH), FreeBSD)
-+CUSTOM_LIBS=1
-+endif
-+
- ifndef CUSTOM_LIBS
- EXTRA_LIBS = -L$(dist_libdir) -l$(LDAP_LIBNAME) -l$(PRLDAP_LIBNAME)
- EXTRA_LIBS += $(NSSLINK)
Deleted: trunk/mail/thunderbird/files/patch-ldap-xpcom-src-Makefile.in
==============================================================================
--- trunk/mail/thunderbird/files/patch-ldap-xpcom-src-Makefile.in Tue Dec 23 04:51:08 2014 (r1795)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,13 +0,0 @@
---- ldap/xpcom/src/Makefile.in.orig 2012-03-12 10:25:35.000000000 +0100
-+++ ldap/xpcom/src/Makefile.in 2012-03-12 10:26:09.000000000 +0100
-@@ -89,6 +89,10 @@
- $(NULL)
- endif
-
-+ifeq ($(OS_ARCH), FreeBSD)
-+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread
-+endif
-+
- EXTRA_DSO_LDOPTS += $(LDAP_LIBS)
- ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
- EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile Thu Dec 18 14:37:55 2014 (r1795)
+++ trunk/www/seamonkey/Makefile Tue Dec 23 04:51:08 2014 (r1796)
@@ -53,7 +53,7 @@
NOT_FOR_ARCHS= ia64
OPTIONS_DEFINE= CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS
-OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL LIGHTNING MAILNEWS
+OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS
CHATZILLA_DESC?=Chatzilla IRC module
COMPOSER_DESC?= HTML Composer module
@@ -89,8 +89,6 @@
.if ! ${PORT_OPTIONS:MLDAP}
MOZ_OPTIONS+= --disable-ldap --enable-mailnews
.else
-BROKEN= XPCOMGlueLoad error for file ${LOCALBASE}/lib/${MOZILLA}/libxul.so: \
- Cannot open "../../ldap/sdks/c-sdk/ldap/libraries/libldap/libldap60.so"
MOZ_OPTIONS+= --enable-ldap --enable-mailnews
.endif
.if ${PORT_OPTIONS:MENIGMAIL}
Added: trunk/www/seamonkey/files/patch-bug1112904
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-bug1112904 Tue Dec 23 04:51:08 2014 (r1796)
@@ -0,0 +1,161 @@
+diff --git a/c-sdk/config/FreeBSD.mk b/c-sdk/config/FreeBSD.mk
+--- ldap/sdks/c-sdk/config/FreeBSD.mk
++++ ldap/sdks/c-sdk/config/FreeBSD.mk
+@@ -79,8 +79,8 @@ DLL_SUFFIX = so.1.0
+ endif
+
+ DSO_CFLAGS = -fPIC
+-DSO_LDOPTS = -Bshareable
++DSO_LDOPTS = -shared -Wl,-soname,$(notdir $@)
+
+-MKSHLIB = $(LD) $(DSO_LDOPTS)
++MKSHLIB = $(CC) $(DSO_LDOPTS)
+
+ G++INCLUDES = -I/usr/include/g++
+diff --git a/c-sdk/configure b/c-sdk/configure
+--- ldap/sdks/c-sdk/configure
++++ ldap/sdks/c-sdk/configure
+@@ -4241,8 +4241,10 @@ EOF
+ #define DRAGONFLY 1
+ EOF
+
++ LD='$(CC)'
++ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+ DSO_CFLAGS=-fPIC
+- DSO_LDOPTS='-shared'
++ DSO_LDOPTS='-shared -Wl,-soname,$(notdir $@)'
+ ;;
+
+ *-freebsd*)
+@@ -4261,6 +4263,7 @@ EOF
+ #define HAVE_BSD_FLOCK 1
+ EOF
+
++ LD='$(CC)'
+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
+ MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
+ if test "$MOZ_OBJFORMAT" = "elf"; then
+@@ -4268,8 +4271,9 @@ EOF
+ else
+ DLL_SUFFIX=so.1.0
+ fi
++ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+ DSO_CFLAGS=-fPIC
+- DSO_LDOPTS=-Bshareable
++ DSO_LDOPTS='-shared -Wl,-soname,$(notdir $@)'
+ ;;
+
+ *-hpux*)
+@@ -6512,8 +6516,15 @@ echo "configure:6510: checking whether $
+ if test $? -eq 0; then
+ if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
+ ac_cv_have_dash_pthread=yes
+- CFLAGS="$CFLAGS -pthread"
+- CXXFLAGS="$CXXFLAGS -pthread"
++ case "$target_os" in
++ dragonfly*|freebsd*)
++# Freebsd doesn't use -pthread for compiles, it uses them for linking
++ ;;
++ *)
++ CFLAGS="$CFLAGS -pthread"
++ CXXFLAGS="$CXXFLAGS -pthread"
++ ;;
++ esac
+ fi
+ fi
+ rm -f conftest*
+@@ -6542,7 +6553,22 @@ echo "configure:6526: checking whether $
+ _PTHREAD_LDFLAGS=
+ fi
+ ;;
+- *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*)
++ *-dragonfly*|*-freebsd*)
++ cat >> confdefs.h <<\EOF
++#define _REENTRANT 1
++EOF
++
++ cat >> confdefs.h <<\EOF
++#define _THREAD_SAFE 1
++EOF
++
++ if test "$ac_cv_have_dash_pthread" = "yes"; then
++ _PTHREAD_LDFLAGS="-pthread"
++ else
++ _PTHREAD_LDFLAGS="-lc_r"
++ fi
++ ;;
++ *-openbsd*|*-bsdi*|*-netbsd*)
+ cat >> confdefs.h <<\EOF
+ #define _THREAD_SAFE 1
+ EOF
+diff --git a/c-sdk/configure.in b/c-sdk/configure.in
+--- ldap/sdks/c-sdk/configure.in
++++ ldap/sdks/c-sdk/configure.in
+@@ -1225,8 +1225,10 @@ tools are selected during the Xcode/Deve
+ fi
+ AC_DEFINE(XP_UNIX)
+ AC_DEFINE(DRAGONFLY)
++ LD='$(CC)'
++ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+ DSO_CFLAGS=-fPIC
+- DSO_LDOPTS='-shared'
++ DSO_LDOPTS='-shared -Wl,-soname,$(notdir $@)'
+ ;;
+
+ *-freebsd*)
+@@ -1236,6 +1238,7 @@ tools are selected during the Xcode/Deve
+ AC_DEFINE(XP_UNIX)
+ AC_DEFINE(FREEBSD)
+ AC_DEFINE(HAVE_BSD_FLOCK)
++ LD='$(CC)'
+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
+ MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
+ if test "$MOZ_OBJFORMAT" = "elf"; then
+@@ -1243,8 +1246,9 @@ tools are selected during the Xcode/Deve
+ else
+ DLL_SUFFIX=so.1.0
+ fi
++ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+ DSO_CFLAGS=-fPIC
+- DSO_LDOPTS=-Bshareable
++ DSO_LDOPTS='-shared -Wl,-soname,$(notdir $@)'
+ ;;
+
+ *-hpux*)
+@@ -2329,8 +2333,15 @@ if test -n "$USE_PTHREADS"; then
+ if test $? -eq 0; then
+ if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
+ ac_cv_have_dash_pthread=yes
+- CFLAGS="$CFLAGS -pthread"
+- CXXFLAGS="$CXXFLAGS -pthread"
++ case "$target_os" in
++ dragonfly*|freebsd*)
++# Freebsd doesn't use -pthread for compiles, it uses them for linking
++ ;;
++ *)
++ CFLAGS="$CFLAGS -pthread"
++ CXXFLAGS="$CXXFLAGS -pthread"
++ ;;
++ esac
+ fi
+ fi
+ rm -f conftest*
+@@ -2361,7 +2372,17 @@ if test -n "$USE_PTHREADS"; then
+ _PTHREAD_LDFLAGS=
+ fi
+ ;;
+- *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*)
++ *-dragonfly*|*-freebsd*)
++ AC_DEFINE(_REENTRANT)
++ AC_DEFINE(_THREAD_SAFE)
++ dnl -pthread links in -lc_r, so don't specify it explicitly.
++ if test "$ac_cv_have_dash_pthread" = "yes"; then
++ _PTHREAD_LDFLAGS="-pthread"
++ else
++ _PTHREAD_LDFLAGS="-lc_r"
++ fi
++ ;;
++ *-openbsd*|*-bsdi*|*-netbsd*)
+ AC_DEFINE(_THREAD_SAFE)
+ dnl -pthread links in -lc_r, so don't specify it explicitly.
+ if test "$ac_cv_have_dash_pthread" = "yes"; then
Deleted: trunk/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in
==============================================================================
--- trunk/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in Tue Dec 23 04:51:08 2014 (r1795)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,13 +0,0 @@
---- ldap/sdks/c-sdk/ldap/libraries/libldap/Makefile.in.orig 2009-11-10 09:56:42.000000000 +0100
-+++ ldap/sdks/c-sdk/ldap/libraries/libldap/Makefile.in 2009-11-10 09:58:15.000000000 +0100
-@@ -254,6 +254,10 @@
- EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe
- endif
-
-+ifeq ($(OS_ARCH), FreeBSD)
-+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread
-+endif
-+
- ifeq ($(OS_ARCH), NetBSD)
- EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
- endif
Deleted: trunk/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in
==============================================================================
--- trunk/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in Tue Dec 23 04:51:08 2014 (r1795)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,15 +0,0 @@
---- ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in.orig 2008-09-11 16:38:35.000000000 +0200
-+++ ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in 2009-12-01 10:18:43.000000000 +0100
-@@ -147,6 +147,12 @@
- CUSTOM_LIBS=1
- endif
-
-+ifneq (,$(filter DragonFly FreeBSD,$(OS_ARCH)))
-+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread
-+EXTRA_LIBS+= $(filter -L% -l%,${NSPRLINK})
-+CUSTOM_LIBS=1
-+endif
-+
- # no extra libs on HP-UX
- ifeq ($(OS_ARCH), HP-UX)
- CUSTOM_LIBS=1
Deleted: trunk/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in
==============================================================================
--- trunk/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in Tue Dec 23 04:51:08 2014 (r1795)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,13 +0,0 @@
---- ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in.orig 2009-09-10 17:36:39.000000000 +0200
-+++ ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in 2009-09-10 17:37:28.000000000 +0200
-@@ -180,6 +180,10 @@
- CUSTOM_LIBS=1
- endif
-
-+ifeq ($(OS_ARCH), FreeBSD)
-+CUSTOM_LIBS=1
-+endif
-+
- ifndef CUSTOM_LIBS
- EXTRA_LIBS = -L$(dist_libdir) -l$(LDAP_LIBNAME) -l$(PRLDAP_LIBNAME)
- EXTRA_LIBS += $(NSSLINK)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412230451.sBN4p9oS083901>