head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.4 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.2 pkgsrc-2012Q4-base:1.2; locks; strict; comment @# @; 1.2 date 2012.03.10.14.57.32; author ryoon; state dead; branches; next 1.1; 1.1 date 2012.03.10.03.26.05; author ryoon; state Exp; branches; next ; desc @@ 1.2 log @Remove necessary backups of the patches. @ text @$NetBSD: patch-directory_c-sdk_ldap_include_portable.h.orig,v 1.1 2012/03/10 03:26:05 ryoon Exp $ --- ldap/sdks/c-sdk/ldap/include/portable.h.orig 2011-07-06 08:51:23.000000000 +0000 +++ ldap/sdks/c-sdk/ldap/include/portable.h @@@@ -122,8 +122,11 @@@@ * some systems don't have the BSD re_comp and re_exec routines */ #ifndef NEED_BSDREGEX -#if ( defined( SYSV ) || defined( NETBSD ) || defined( FREEBSD ) || defined(__OpenBSD__) || defined( linux ) || defined( DARWIN )) && !defined(sgi) +#if ( defined( SYSV ) || defined( NETBSD ) || defined(DRAGONFLY) || defined( FREEBSD ) || defined(__OpenBSD__) || defined( linux ) || defined( DARWIN )) && !defined(sgi) #define NEED_BSDREGEX +/* there are conflicting prototypes in unistd.h on DragonFly */ +#define re_comp ldap_compat_re_comp +#define re_exec ldap_compat_re_exec #endif #endif @ 1.1 log @Update to 2.7.2 * Many new features. * Security bugfixes. * See http://www.seamonkey-project.org/releases/seamonkey2.7/ @ text @d1 1 a1 1 $NetBSD$ @