head	1.1;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.1
	OPENPKG_E1_MP:1.1
	OPENPKG_E1_MP_2_STABLE:1.1.2.2
	OPENPKG_E1_FP:1.1.2.2
	OPENPKG_2_STABLE_MP:1.1
	OPENPKG_2_STABLE_20061018:1.1.2.2
	OPENPKG_2_STABLE:1.1.0.2
	OPENPKG_CW_FP:1.1
	OPENPKG_1_STABLE_MP:1.1;
locks; strict;
comment	@# @;


1.1
date	2002.07.17.12.39.41;	author rse;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2002.07.17.12.39.41;	author rse;	state dead;
branches;
next	1.1.2.2;
commitid	iZxwRSmmWscPXUQr;

1.1.2.2
date	2006.10.16.14.56.53;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.1
log
@add patch to CVS, too
@
text
@--- inc/sysbase1.h.orig	Tue Apr 17 00:55:58 2001
+++ inc/sysbase1.h	Tue Apr 17 00:57:17 2001
@@@@ -178,7 +178,7 @@@@
 
 #define DL_LOAD_LAZY    0
 
-#if !defined(STYX_CONFIG_OSMS) && (!defined(HAVE_CONFIG_H) || (defined(HAVE_LIBDL) && defined(HAVE_DLFCN_H)))
+#if defined(__FreeBSD__) || (!defined(STYX_CONFIG_OSMS) && (!defined(HAVE_CONFIG_H) || (defined(HAVE_LIBDL) && defined(HAVE_DLFCN_H))))
 #define DL_LAZY         RTLD_LAZY
 #define DL_NOW          RTLD_NOW
 #define DL_BINDING_MASK RTLD_BINDING_MASK
--- libbase/gstream.c.orig	Tue Apr 17 01:04:58 2001
+++ libbase/gstream.c	Tue Apr 17 01:05:13 2001
@@@@ -485,7 +485,7 @@@@
 
 
 #else
-#if !defined(MSDOS) && ( !defined(HAVE_CONFIG_H) || defined(HAVE_ICONV_H) )
+#if defined(__FreeBSD__) || (!defined(MSDOS) && ( !defined(HAVE_CONFIG_H) || defined(HAVE_ICONV_H) ) )
 
 ConcreteType(CDIConv_T) // ICONV conversion description type
 {
--- libbase/sysbase1.c.orig	Sun Feb 25 22:36:20 2001
+++ libbase/sysbase1.c	Tue Apr 17 01:25:49 2001
@@@@ -526,7 +526,7 @@@@
 #define DL_LOAD_LAZY    0
 
 /*DOC_INTERFACE*/
-#if !defined(STYX_CONFIG_OSMS) && (!defined(HAVE_CONFIG_H) || (defined(HAVE_LIBDL) && defined(HAVE_DLFCN_H)))
+#if defined(__FreeBSD__) || (!defined(STYX_CONFIG_OSMS) && (!defined(HAVE_CONFIG_H) || (defined(HAVE_LIBDL) && defined(HAVE_DLFCN_H))))
 #define DL_LAZY         RTLD_LAZY
 #define DL_NOW          RTLD_NOW
 #define DL_BINDING_MASK RTLD_BINDING_MASK
@@@@ -570,7 +570,7 @@@@
   }
 
 #else
-#if !defined(MSDOS) && ( !defined(HAVE_CONFIG_H) || ( defined(HAVE_LIBDL) && defined(HAVE_DLFCN_H) ) )
+#if defined(__FreeBSD__) || (!defined(MSDOS) && ( !defined(HAVE_CONFIG_H) || ( defined(HAVE_LIBDL) && defined(HAVE_DLFCN_H) ) ) )
 
 DL_Hdl DL_open(string dlname, int flag)
 /* loads dll 'dlname' in mode 'flag' ( ERROR: NULL )
@


1.1.2.1
log
@file styx.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:56:53 +0000
@
text
@d1 42
@


1.1.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 42
--- inc/sysbase1.h.orig	Tue Apr 17 00:55:58 2001
+++ inc/sysbase1.h	Tue Apr 17 00:57:17 2001
@@@@ -178,7 +178,7 @@@@
 
 #define DL_LOAD_LAZY    0
 
-#if !defined(STYX_CONFIG_OSMS) && (!defined(HAVE_CONFIG_H) || (defined(HAVE_LIBDL) && defined(HAVE_DLFCN_H)))
+#if defined(__FreeBSD__) || (!defined(STYX_CONFIG_OSMS) && (!defined(HAVE_CONFIG_H) || (defined(HAVE_LIBDL) && defined(HAVE_DLFCN_H))))
 #define DL_LAZY         RTLD_LAZY
 #define DL_NOW          RTLD_NOW
 #define DL_BINDING_MASK RTLD_BINDING_MASK
--- libbase/gstream.c.orig	Tue Apr 17 01:04:58 2001
+++ libbase/gstream.c	Tue Apr 17 01:05:13 2001
@@@@ -485,7 +485,7 @@@@
 
 
 #else
-#if !defined(MSDOS) && ( !defined(HAVE_CONFIG_H) || defined(HAVE_ICONV_H) )
+#if defined(__FreeBSD__) || (!defined(MSDOS) && ( !defined(HAVE_CONFIG_H) || defined(HAVE_ICONV_H) ) )
 
 ConcreteType(CDIConv_T) // ICONV conversion description type
 {
--- libbase/sysbase1.c.orig	Sun Feb 25 22:36:20 2001
+++ libbase/sysbase1.c	Tue Apr 17 01:25:49 2001
@@@@ -526,7 +526,7 @@@@
 #define DL_LOAD_LAZY    0
 
 /*DOC_INTERFACE*/
-#if !defined(STYX_CONFIG_OSMS) && (!defined(HAVE_CONFIG_H) || (defined(HAVE_LIBDL) && defined(HAVE_DLFCN_H)))
+#if defined(__FreeBSD__) || (!defined(STYX_CONFIG_OSMS) && (!defined(HAVE_CONFIG_H) || (defined(HAVE_LIBDL) && defined(HAVE_DLFCN_H))))
 #define DL_LAZY         RTLD_LAZY
 #define DL_NOW          RTLD_NOW
 #define DL_BINDING_MASK RTLD_BINDING_MASK
@@@@ -570,7 +570,7 @@@@
   }
 
 #else
-#if !defined(MSDOS) && ( !defined(HAVE_CONFIG_H) || ( defined(HAVE_LIBDL) && defined(HAVE_DLFCN_H) ) )
+#if defined(__FreeBSD__) || (!defined(MSDOS) && ( !defined(HAVE_CONFIG_H) || ( defined(HAVE_LIBDL) && defined(HAVE_DLFCN_H) ) ) )
 
 DL_Hdl DL_open(string dlname, int flag)
 /* loads dll 'dlname' in mode 'flag' ( ERROR: NULL )
@