head 1.3; access; symbols OPENPKG_2_STABLE_MP:1.3 OPENPKG_E1_MP_HEAD:1.3 OPENPKG_E1_MP:1.3 OPENPKG_E1_MP_2_STABLE:1.3 OPENPKG_E1_FP:1.3 OPENPKG_2_STABLE_20061018:1.3 OPENPKG_2_STABLE:1.3.0.2 OPENPKG_2_STABLE_BP:1.3 OPENPKG_2_5_RELEASE:1.2 OPENPKG_2_5_SOLID:1.2.0.4 OPENPKG_2_5_SOLID_BP:1.2 OPENPKG_2_4_RELEASE:1.2 OPENPKG_2_4_SOLID:1.2.0.2 OPENPKG_2_4_SOLID_BP:1.2 OPENPKG_CW_FP:1.1 OPENPKG_2_3_RELEASE:1.1 OPENPKG_2_3_SOLID:1.1.0.2 OPENPKG_2_3_SOLID_BP:1.1; locks; strict; comment @# @; 1.3 date 2006.04.21.06.56.46; author rse; state dead; branches; next 1.2; commitid 7MNRk7TDzl9770ur; 1.2 date 2005.05.12.18.17.29; author rse; state Exp; branches; next 1.1; 1.1 date 2005.02.16.21.28.49; author rse; state Exp; branches; next ; desc @@ 1.3 log @upgrading package: global 4.8.7 -> 5.0 @ text @Index: gnusort/memcoll.c --- gnusort/memcoll.c.orig 2005-05-12 03:43:38 +0200 +++ gnusort/memcoll.c 2005-05-12 20:15:54 +0200 @@@@ -21,7 +21,7 @@@@ # include #endif -/* #ifndef __GNUC__ */ +#ifndef __GNUC__ # ifdef HAVE_ALLOCA_H # include # else @@@@ -38,7 +38,7 @@@@ # endif # endif # endif -/* #endif */ +#endif #if HAVE_STRING_H # include Index: gnusort/sort.c --- gnusort/sort.c.orig 2005-05-12 03:43:38 +0200 +++ gnusort/sort.c 2005-05-12 20:07:36 +0200 @@@@ -27,6 +27,7 @@@@ #include #include #include +#include #include "system.h" #include "long-options.h" #include "error.h" @ 1.2 log @upgrading package: global 4.8.5 -> 4.8.6 @ text @@ 1.1 log @port to Solaris @ text @d1 21 d23 2 a24 2 --- gnusort/sort.c.orig 2004-11-11 06:32:19.000000000 +0100 +++ gnusort/sort.c 2005-02-16 22:25:51.863316831 +0100 @