head 1.7; access; symbols OPENPKG_E1_MP_HEAD:1.6 OPENPKG_E1_MP:1.6 OPENPKG_E1_MP_2_STABLE:1.6 OPENPKG_E1_FP:1.6 OPENPKG_2_STABLE_MP:1.6 OPENPKG_2_STABLE_20061018:1.6 OPENPKG_2_STABLE_20060622:1.6 OPENPKG_2_STABLE:1.6.0.2 OPENPKG_2_STABLE_BP:1.6 OPENPKG_2_5_RELEASE:1.5.4.1 OPENPKG_2_5_SOLID:1.5.0.4 OPENPKG_2_5_SOLID_BP:1.5 OPENPKG_2_4_RELEASE:1.5 OPENPKG_2_4_SOLID:1.5.0.2 OPENPKG_2_4_SOLID_BP:1.5 OPENPKG_CW_FP:1.5 OPENPKG_1_STABLE_MP:1.4; locks; strict; comment @# @; 1.7 date 2007.12.17.09.58.26; author rse; state Exp; branches; next 1.6; commitid Dx3f7s6KrTuJFLJs; 1.6 date 2005.10.16.08.23.59; author rse; state Exp; branches; next 1.5; 1.5 date 2004.09.17.09.58.53; author tho; state Exp; branches 1.5.4.1; next 1.4; 1.4 date 2003.07.02.18.03.33; author rse; state Exp; branches; next 1.3; 1.3 date 2003.06.25.08.09.24; author thl; state Exp; branches; next 1.2; 1.2 date 2003.05.19.09.31.24; author mlelstv; state Exp; branches; next 1.1; 1.1 date 2003.01.15.09.04.46; author mlelstv; state Exp; branches; next ; 1.5.4.1 date 2005.10.16.08.24.35; author rse; state Exp; branches; next ; desc @@ 1.7 log @upgrading package: magicpoint 20071210 -> 20071217 @ text @Index: image/new.c --- image/new.c.orig 2004-09-01 05:50:32 +0200 +++ image/new.c 2007-12-17 10:56:09 +0100 @@@@ -11,11 +11,7 @@@@ #include "copyright.h" #include "image.h" -#ifdef __APPLE__ #include -#else -#include -#endif extern int _Xdebug; extern void memoryExhausted(void); Index: image/path.c --- image/path.c.orig 2004-07-28 17:47:31 +0200 +++ image/path.c 2007-12-17 10:56:09 +0100 @@@@ -8,8 +8,6 @@@@ * See included file "copyright.h" for complete copyright information. */ -#include "copyright.h" -#include "xloadimage.h" #include #include #include @@@@ -24,6 +22,9 @@@@ #include #endif +#include "copyright.h" +#include "xloadimage.h" + /* SUPPRESS 530 */ /* SUPPRESS 560 */ Index: mgp.h --- mgp.h.orig 2007-02-16 14:50:04 +0100 +++ mgp.h 2007-12-17 10:56:09 +0100 @@@@ -814,17 +814,6 @@@@ extern void embed_file __P((FILE *, struct ctrl *, int *)); extern void cleandir __P((void)); -/* missing/ *.c */ -#ifndef HAVE_STRDUP -extern char *strdup __P((const char *)); -#endif -#ifndef HAVE_STRSEP -extern char *strsep __P((char **, const char *)); -#endif -#ifndef HAVE_USLEEP -extern void usleep __P((u_int)); -#endif - #ifdef FREETYPE #define RASTERLIB #endif Index: scanner.l --- scanner.l.orig 2007-11-24 18:47:28 +0100 +++ scanner.l 2007-12-17 10:56:25 +0100 @@@@ -104,10 +104,6 @@@@ JSTR {JISIN}([\041-\176][\041-\176])*{ASCIIIN} XSTR [\240-\377]* -%a 6000 -%p 4000 -%o 8000 - %% (NOOP|noop) return KW_NOOP; (DEFAULT|default) return KW_DEFAULT; @ 1.6 log @try to fix building by removing some useless declarations (which at least conflict with system under latest Linux platforms) @ text @d2 2 a3 2 --- image/new.c.orig 2004-09-01 03:50:32.000000000 +0000 +++ image/new.c 2005-10-16 08:19:40.000000000 +0000 d17 2 a18 2 --- image/path.c.orig 2004-07-28 15:47:31.000000000 +0000 +++ image/path.c 2005-10-16 08:19:40.000000000 +0000 d39 3 a41 3 --- mgp.h.orig 2004-09-07 16:57:42.000000000 +0000 +++ mgp.h 2005-10-16 08:21:55.000000000 +0000 @@@@ -805,17 +805,6 @@@@ d59 14 @ 1.5 log @order is important if linking static libraries @ text @d1 18 a18 2 --- image/path.c.dist Wed Jan 15 09:49:05 2003 +++ image/path.c Wed Jan 15 09:49:14 2003 d28 2 a29 3 @@@@ -20,6 +18,9 @@@@ #if 1 /* SYSV */ #include d31 1 a31 1 + d34 1 a34 1 a36 6 Index: image/new.c --- image/new.c.orig 2004-09-01 05:50:32 +0200 +++ image/new.c 2004-09-16 11:10:05 +0200 @@@@ -11,11 +11,7 @@@@ #include "copyright.h" #include "image.h" d38 16 a53 4 -#ifdef __APPLE__ #include -#else -#include d55 4 a58 3 extern int _Xdebug; extern void memoryExhausted(void); @ 1.5.4.1 log @MFC: try to fix building by removing some useless declarations (which at least conflict with system under latest Linux platforms) @ text @d1 2 a2 18 Index: image/new.c --- image/new.c.orig 2004-09-01 03:50:32.000000000 +0000 +++ image/new.c 2005-10-16 08:19:40.000000000 +0000 @@@@ -11,11 +11,7 @@@@ #include "copyright.h" #include "image.h" -#ifdef __APPLE__ #include -#else -#include -#endif extern int _Xdebug; extern void memoryExhausted(void); Index: image/path.c --- image/path.c.orig 2004-07-28 15:47:31.000000000 +0000 +++ image/path.c 2005-10-16 08:19:40.000000000 +0000 d12 3 a14 2 @@@@ -24,6 +22,9 @@@@ #include d16 1 a16 1 d19 1 a19 1 + d22 6 d29 5 a33 6 Index: mgp.h --- mgp.h.orig 2004-09-07 16:57:42.000000000 +0000 +++ mgp.h 2005-10-16 08:21:55.000000000 +0000 @@@@ -805,17 +805,6 @@@@ extern void embed_file __P((FILE *, struct ctrl *, int *)); extern void cleandir __P((void)); d35 2 a36 14 -/* missing/ *.c */ -#ifndef HAVE_STRDUP -extern char *strdup __P((const char *)); -#endif -#ifndef HAVE_STRSEP -extern char *strsep __P((char **, const char *)); -#endif -#ifndef HAVE_USLEEP -extern void usleep __P((u_int)); -#endif - #ifdef FREETYPE #define RASTERLIB #endif @ 1.4 log @replace obsolete malloc.h reference which breaks building und stricter FreeBSD 5 @ text @d22 4 a25 3 --- image/new.c.orig Mon Dec 28 09:23:13 1998 +++ image/new.c Wed Jul 2 20:02:06 2003 @@@@ -11,7 +11,7 @@@@ d29 3 d33 1 a33 1 +#include @ 1.3 log @upgrading package: magicpoint 1.09a -> 1.10a @ text @d22 11 @ 1.2 log @drop inclusion of varargs header for gcc3.3 compatibility, it's not used in the source anyway @ text @a21 10 --- image/rlelib.c.dist 2003-05-19 11:25:42.000000000 +0200 +++ image/rlelib.c 2003-05-19 11:27:59.000000000 +0200 @@@@ -12,7 +12,6 @@@@ #include #include -#include #include #include "image.h" /* need ZFILE definition */ @ 1.1 log @fix imake build, fix system header conflict @ text @d22 10 @