head 1.13; access; symbols OPENPKG_E1_MP_HEAD:1.11 OPENPKG_E1_MP:1.11 OPENPKG_E1_MP_2_STABLE:1.11 OPENPKG_E1_FP:1.11 OPENPKG_2_STABLE_MP:1.11 OPENPKG_2_STABLE_20061018:1.11 OPENPKG_2_STABLE_20060622:1.11 OPENPKG_2_STABLE:1.11.0.2 OPENPKG_2_STABLE_BP:1.11 OPENPKG_2_5_RELEASE:1.9 OPENPKG_2_5_SOLID:1.9.0.2 OPENPKG_2_5_SOLID_BP:1.9 OPENPKG_2_4_RELEASE:1.7 OPENPKG_2_4_SOLID:1.7.0.2 OPENPKG_2_4_SOLID_BP:1.7 OPENPKG_CW_FP:1.5 OPENPKG_2_3_RELEASE:1.5 OPENPKG_2_3_SOLID:1.5.0.6 OPENPKG_2_3_SOLID_BP:1.5 OPENPKG_2_2_RELEASE:1.5 OPENPKG_2_2_SOLID:1.5.0.4 OPENPKG_2_2_SOLID_BP:1.5 OPENPKG_2_1_RELEASE:1.5 OPENPKG_2_1_SOLID:1.5.0.2 OPENPKG_2_1_SOLID_BP:1.5 OPENPKG_2_0_RELEASE:1.3 OPENPKG_2_0_SOLID:1.3.0.2 OPENPKG_2_0_SOLID_BP:1.3 OPENPKG_1_3_RELEASE:1.1.2.1 OPENPKG_1_3_SOLID:1.1.2.1.0.2 OPENPKG_1_3_SOLID_BP:1.1.2.1 OPENPKG_1_2_RELEASE:1.1 OPENPKG_1_2_SOLID:1.1.0.4 OPENPKG_1_2_SOLID_BP:1.1 OPENPKG_1_STABLE:1.1.0.2 OPENPKG_1_STABLE_BP:1.1; locks; strict; comment @# @; 1.13 date 2009.06.08.08.33.19; author rse; state dead; branches; next 1.12; commitid qTYcaOIEX78mS1Rt; 1.12 date 2009.03.27.09.39.11; author rse; state Exp; branches; next 1.11; commitid w3SCA4YT47xrAEHt; 1.11 date 2006.06.14.19.33.29; author rse; state Exp; branches; next 1.10; commitid t683yRBLFx06z0Br; 1.10 date 2006.03.10.09.07.09; author rse; state Exp; branches; next 1.9; commitid p9y7PCKw8TrxbCor; 1.9 date 2005.07.09.20.20.45; author rse; state Exp; branches; next 1.8; 1.8 date 2005.06.25.09.39.03; author rse; state Exp; branches; next 1.7; 1.7 date 2005.06.15.15.04.08; author rse; state Exp; branches; next 1.6; 1.6 date 2005.06.13.17.40.19; author rse; state Exp; branches; next 1.5; 1.5 date 2004.06.09.15.01.33; author tho; state Exp; branches; next 1.4; 1.4 date 2004.06.03.14.00.48; author tho; state Exp; branches; next 1.3; 1.3 date 2004.01.27.11.49.00; author ms; state Exp; branches; next 1.2; 1.2 date 2003.01.22.11.16.07; author ps; state dead; branches; next 1.1; 1.1 date 2003.01.15.12.44.01; author ps; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2003.07.24.20.49.10; author rse; state dead; branches; next ; desc @@ 1.13 log @OpenPKG primarily is about server-computing, so remove some of the dedicated GUI applications @ text @Index: Makefile.in --- Makefile.in.orig 2008-06-01 18:48:13 +0200 +++ Makefile.in 2009-03-27 10:23:04 +0100 @@@@ -102,7 +102,7 @@@@ X_LIBS = @@X_LIBS@@ X_PRE_LIBS = @@X_PRE_LIBS@@ XPM_LIB = @@XPM_LIB@@ -GUI_LINK_OPTS_X = $(X_LIBS) $(X_PRE_LIBS) -lX11 $(XPM_LIB) +GUI_LINK_OPTS_X = $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 GUI_LINK_OPTS_SDL = `sdl-config --cflags --libs` GUI_LINK_OPTS_SVGA = -lvga -lvgagl GUI_LINK_OPTS_BEOS = -lbe Index: iodev/eth_vde.cc --- iodev/eth_vde.cc.orig 2008-02-15 23:05:42 +0100 +++ iodev/eth_vde.cc 2009-03-27 10:23:04 +0100 @@@@ -117,6 +117,9 @@@@ //if (strncmp (netif, "vde", 3) != 0) { // BX_PANIC (("eth_vde: interface name (%s) must be vde", netif)); //} +#ifndef IFNAMSIZ +#define IFNAMSIZ 1024 +#endif char intname[IFNAMSIZ]; if (netif == NULL || strcmp(netif,"") == 0) strcpy(intname,"/tmp/vde.ctl"); @ 1.12 log @upgrading package: bochs 2.2.6 -> 2.3.7 @ text @@ 1.11 log @fix building under stricter C++ of GCC 4.1 @ text @d2 3 a4 3 --- Makefile.in.orig 2005-07-06 22:28:23 +0200 +++ Makefile.in 2005-07-09 22:18:29 +0200 @@@@ -101,7 +101,7 @@@@ d14 3 a16 21 --- iodev/eth_vde.cc.orig 2005-12-10 19:37:35 +0100 +++ iodev/eth_vde.cc 2006-03-10 10:04:14 +0100 @@@@ -41,13 +41,17 @@@@ #include #include #include +#if defined(__linux__) #include +#endif #include #include #include #include +#if defined(__linux__) #include #include +#endif #include #include #include @@@@ -111,6 +115,9 @@@@ d24 1 a24 1 if (netif == NULL || strcmp(netif,"") == 0) a25 18 Index: iodev/hdimage.h --- iodev/hdimage.h.orig 2005-11-06 12:07:01 +0100 +++ iodev/hdimage.h 2006-06-14 21:29:22 +0200 @@@@ -273,14 +273,8 @@@@ void panic(const char * message); off_t -#ifndef PARANOID - sparse_image_t:: -#endif get_physical_offset(); void -#ifndef PARANOID - sparse_image_t:: -#endif set_virtual_page(Bit32u new_virtual_page); void read_header(); ssize_t read_page_fragment(Bit32u read_virtual_page, Bit32u read_page_offset, size_t read_size, void * buf); @ 1.10 log @upgrading package: bochs 2.2.1 -> 2.2.6 @ text @d44 18 @ 1.9 log @upgrading package: bochs 2.2 -> 2.2.1 @ text @d13 31 @ 1.8 log @upgrading package: bochs 2.1.1 -> 2.2 @ text @a0 11 --- iodev/eth_tap.cc.orig 2004-01-27 12:00:49.921496528 +0100 +++ iodev/eth_tap.cc 2004-01-27 12:02:00.181584599 +0100 @@@@ -100,7 +100,7 @@@@ #include #include #include -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) // Should be fixed for other *BSD +#if !defined(__LINUX__) // Should be more carefully written #include #else #include d2 3 a4 3 --- Makefile.in.orig 2004-06-09 15:52:12.955255102 +0200 +++ Makefile.in 2004-06-09 15:52:37.847987737 +0200 @@@@ -100,7 +100,7 @@@@ @ 1.7 log @temporarily downgrade from Boch 2.2 to 2.1.1 in preparation of OpenPKG 2.4 branching @ text @d7 1 a7 1 -#if defined(__FreeBSD__) || defined(__APPLE__) // Should be fixed for other *BSD a11 12 Index: reg_ld_str.c --- fpu/reg_ld_str.c.orig 2004-06-03 14:34:47.000000000 +0200 +++ fpu/reg_ld_str.c 2004-06-03 14:34:53.000000000 +0200 @@@@ -315,7 +315,7 @@@@ /* Get a short from user memory */ -int BX_CPP_AttrRegparmN(1) +int BX_CPP_AttrRegparmN(2) FPU_load_int16(bx_address _s, FPU_REG *loaded_data) { s16 s, negative; @ 1.6 log @upgrading package: bochs 2.1.1 -> 2.2 @ text @d7 1 a7 1 -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) // Should be fixed for other *BSD d12 12 @ 1.5 log @correct order of libraries still important on some systems @ text @d7 1 a7 1 -#if defined(__FreeBSD__) || defined(__APPLE__) // Should be fixed for other *BSD a11 12 Index: reg_ld_str.c --- fpu/reg_ld_str.c.orig 2004-06-03 14:34:47.000000000 +0200 +++ fpu/reg_ld_str.c 2004-06-03 14:34:53.000000000 +0200 @@@@ -315,7 +315,7 @@@@ /* Get a short from user memory */ -int BX_CPP_AttrRegparmN(1) +int BX_CPP_AttrRegparmN(2) FPU_load_int16(bx_address _s, FPU_REG *loaded_data) { s16 s, negative; @ 1.4 log @fixed declaration incompatibility @ text @d24 12 @ 1.3 log @this world has more than just OSX and Linux so patch to aknowlege that @ text @d12 12 @ 1.2 log @Removed unnecessary bochs.patch from repository @ text @d1 11 a11 10 --- iodev/cdrom.cc.orig Wed Jan 15 13:20:58 2003 +++ iodev/cdrom.cc Wed Jan 15 13:21:28 2003 @@@@ -101,6 +101,7 @@@@ #include #include #include +#include // XXX #define BX_CD_FRAMESIZE 2048 @ 1.1 log @Appending bochs patches for FreeBSD5.0 @ text @@ 1.1.2.1 log @mass Merge-From-CURRENT (MFC) in preparation for OpenPKG 1.3 [class PLUS only] @ text @@