head	1.3;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.3
	OPENPKG_E1_MP:1.3
	OPENPKG_E1_MP_2_STABLE:1.3.2.2
	OPENPKG_E1_FP:1.3.2.2
	OPENPKG_2_STABLE_MP:1.3
	OPENPKG_2_STABLE_20061018:1.3.2.2
	OPENPKG_2_STABLE:1.3.0.2
	OPENPKG_CW_FP:1.2
	OPENPKG_1_STABLE_MP:1.1;
locks; strict;
comment	@# @;


1.3
date	2006.08.25.09.28.25;	author rse;	state Exp;
branches
	1.3.2.1;
next	1.2;
commitid	3sPWay418y12UcKr;

1.2
date	2005.01.15.17.08.12;	author rse;	state Exp;
branches;
next	1.1;

1.1
date	2003.01.03.13.21.28;	author rse;	state Exp;
branches;
next	;

1.3.2.1
date	2006.08.25.09.28.25;	author rse;	state dead;
branches;
next	1.3.2.2;
commitid	iZxwRSmmWscPXUQr;

1.3.2.2
date	2006.10.16.14.56.00;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.3
log
@upgrading package: sam2p 0.44b -> 0.45
@
text
@Index: gensio.cpp
--- gensio.cpp.orig	2006-08-10 13:09:51 +0200
+++ gensio.cpp	2006-08-25 11:26:59 +0200
@@@@ -7,6 +7,9 @@@@
 #pragma implementation
 #endif
 
+#include <sys/types.h>
+#include <sys/stat.h>
+
 #if 0
 extern "C" int errno;
 /* OK: autodetect with autoconf */
@@@@ -16,7 +19,7 @@@@
 #else
 #undef __STRICT_ANSI__ /* for __MINGW32__ */
 #define _BSD_SOURCE 1 /* vsnprintf(); may be emulated with fixup_vsnprintf() */
-#ifndef __APPLE__ /* SUXX: Max OS X has #ifndef _POSIX_SOURCE around lstat() :-( */
+#if !defined(__APPLE__) and !defined(__FreeBSD__) /* SUXX: Max OS X has #ifndef _POSIX_SOURCE around lstat() :-( */
 #define _POSIX_SOURCE 1 /* also popen() */
 #endif
 #define _POSIX_C_SOURCE 2 /* also popen() */
@@@@ -24,9 +27,11 @@@@
 #ifndef _XPG4_2
 #define _XPG4_2 1 /* SunOS 5.7 lstat() */
 #endif
+#if !defined(__FreeBSD__)
 #undef  _XOPEN_SOURCE /* pacify gcc-3.1 */
 #define _XOPEN_SOURCE 1 /* popen() on Digital UNIX */
 #endif
+#endif
 
 #include "gensio.hpp"
 #include "error.hpp"
@


1.3.2.1
log
@file sam2p.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:56:00 +0000
@
text
@d1 34
@


1.3.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 34
Index: gensio.cpp
--- gensio.cpp.orig	2006-08-10 13:09:51 +0200
+++ gensio.cpp	2006-08-25 11:26:59 +0200
@@@@ -7,6 +7,9 @@@@
 #pragma implementation
 #endif
 
+#include <sys/types.h>
+#include <sys/stat.h>
+
 #if 0
 extern "C" int errno;
 /* OK: autodetect with autoconf */
@@@@ -16,7 +19,7 @@@@
 #else
 #undef __STRICT_ANSI__ /* for __MINGW32__ */
 #define _BSD_SOURCE 1 /* vsnprintf(); may be emulated with fixup_vsnprintf() */
-#ifndef __APPLE__ /* SUXX: Max OS X has #ifndef _POSIX_SOURCE around lstat() :-( */
+#if !defined(__APPLE__) and !defined(__FreeBSD__) /* SUXX: Max OS X has #ifndef _POSIX_SOURCE around lstat() :-( */
 #define _POSIX_SOURCE 1 /* also popen() */
 #endif
 #define _POSIX_C_SOURCE 2 /* also popen() */
@@@@ -24,9 +27,11 @@@@
 #ifndef _XPG4_2
 #define _XPG4_2 1 /* SunOS 5.7 lstat() */
 #endif
+#if !defined(__FreeBSD__)
 #undef  _XOPEN_SOURCE /* pacify gcc-3.1 */
 #define _XOPEN_SOURCE 1 /* popen() on Digital UNIX */
 #endif
+#endif
 
 #include "gensio.hpp"
 #include "error.hpp"
@


1.2
log
@upgrading package: sam2p 0.43 -> 0.44
@
text
@d2 2
a3 2
--- gensio.cpp.orig	2005-01-06 10:59:39 +0100
+++ gensio.cpp	2005-01-15 18:02:14 +0100
d14 1
a14 1
@@@@ -16,13 +19,17 @@@@
d18 2
a19 1
+#ifndef __FreeBSD__
d21 1
a21 1
+#endif
d23 2
a24 1
 #define _XOPEN_SOURCE_EXTENDED 1 /* Digital UNIX lstat */
d26 2
a27 1
+#ifndef __FreeBSD__
@


1.1
log
@new package: sam2p 0.41 (Bitmap Image to PDF/PS Conversion)
@
text
@d1 14
a14 3
--- gensio.cpp.orig	Thu Dec 12 19:13:08 2002
+++ gensio.cpp	Fri Jan  3 14:08:27 2003
@@@@ -16,12 +16,16 @@@@
d27 1
a28 1
 #endif
d31 1
@