resolve conflicts

26 files changed, 36 insertions, 20 deletions

diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index 3fb1142c5..7483bb7e2 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -17,6 +17,8 @@ PKG_URL:=		http://cairographics.org/
 PKG_SITES:=		http://cairographics.org/releases/
 PKG_OPTS:=		dev
 
+PKG_ARCH_DEPENDS:=      !m68k
+
 #DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 
 ifeq ($(ADK_STATIC),y)
diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index 3670f731e..62bf91c38 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -10,7 +10,7 @@ PKG_DEPENDS:=		libthread-db libncurses libiconv libexpat libgcc
 PKG_BUILDDEP:=		ncurses readline libiconv expat
 PKG_NOPARALLEL:=	1
 
-PKG_ARCH_DEPENDS:=	!cris !avr32
+PKG_ARCH_DEPENDS:=	!cris !avr32 !m68k
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile
index 8cabcef12..de762c40b 100644
--- a/package/gdbserver/Makefile
+++ b/package/gdbserver/Makefile
@@ -9,7 +9,7 @@ PKG_SECTION:=		debug
 PKG_DEPENDS:=		libthread-db
 PKG_SUBPKGS:=		GDBSERVER
 
-PKG_ARCH_DEPENDS:=	!avr32
+PKG_ARCH_DEPENDS:=	!avr32 !m68k
 
 WRKSRC=                 ${WRKDIST}/gdb/gdbserver
 
diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile
index 028b765c6..24d7ce1d0 100644
--- a/package/gtk+/Makefile
+++ b/package/gtk+/Makefile
@@ -19,6 +19,8 @@ PKG_NEED_CXX:=		1
 PKG_LIBNAME:=		libgtk
 PKG_OPTS:=		dev
 
+PKG_ARCH_DEPENDS:=	!m68k
+
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.xz
 
 ifeq ($(ADK_STATIC),y)
diff --git a/package/harfbuzz/Makefile b/package/harfbuzz/Makefile
index a491fef14..4444bbcf4 100644
--- a/package/harfbuzz/Makefile
+++ b/package/harfbuzz/Makefile
@@ -13,6 +13,8 @@ PKG_SITES:=		http://www.freedesktop.org/software/harfbuzz/release/
 PKG_DEPENDS:=		libstdcxx cairo
 PKG_BUILDDEP:=		libstdcxx cairo
 
+PKG_ARCH_DEPENDS:=	!m68k
+
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile
index da0b141af..44d160ee1 100644
--- a/package/jamvm/Makefile
+++ b/package/jamvm/Makefile
@@ -14,11 +14,11 @@ PKG_BUILDDEP:=		libffi zlib
 PKG_URL:=		http://jamvm.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jamvm/}
 
-PKG_ARCH_DEPENDS:=	!cris !avr32
+PKG_ARCH_DEPENDS:=	!cris !avr32 !m68k
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,JAMVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,JAMVM,jamvm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
diff --git a/package/libdrm/Makefile b/package/libdrm/Makefile
index 4b81c7baf..6782956a3 100644
--- a/package/libdrm/Makefile
+++ b/package/libdrm/Makefile
@@ -14,6 +14,8 @@ PKG_URL:=		http://dri.freedesktop.org/wiki/
 PKG_SITES:=		http://dri.freedesktop.org/libdrm/
 PKG_OPTS:=		dev
 
+PKG_ARCH_DEPENDS:=	!m68k
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBDRM,libdrm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/libpng/Makefile b/package/libpng/Makefile
index 1d43a4998..af067f4d2 100644
--- a/package/libpng/Makefile
+++ b/package/libpng/Makefile
@@ -15,6 +15,8 @@ PKG_URL:=		http://www.libpng.org/pub/png/libpng.html
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libpng/}
 PKG_OPTS:=		dev
 
+PKG_ARCH_DEPENDS:=	!m68k
+
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libonly
 endif
diff --git a/package/lighttpd/files/lighttpd.conf b/package/lighttpd/files/lighttpd.conf
index ba28d2ab7..00e7aa699 100644
--- a/package/lighttpd/files/lighttpd.conf
+++ b/package/lighttpd/files/lighttpd.conf
@@ -138,13 +138,13 @@ server.pid-file = state_dir + "/lighttpd.pid"
 ##
 ## Path to the error log file
 ##
-server.errorlog             = log_root + "/error.log"
+#server.errorlog             = log_root + "/error.log"
 
 ##
 ## If you want to log to syslog you have to unset the 
 ## server.errorlog setting and uncomment the next line.
 ##
-#server.errorlog-use-syslog = "enable"
+server.errorlog-use-syslog = "enable"
 
 ##
 ## Access log config
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index b489a8434..284036ece 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		7b2d9dd75b5cf267ea1737ec75500316
 PKG_DESCR:=		OpenSSH
 PKG_SECTION:=		net/security
 PKG_BUILDDEP:=		zlib openssl
-PKG_DEPENDS:=		zlib libopenssl libpthread
+PKG_DEPENDS:=		zlib libopenssl libpthread libgcc
 PKG_URL:=		http://www.openssh.com/
 PKG_SITES:=		ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/
 PKG_MULTI:=		1
diff --git a/package/openssl/patches/patch-Configure b/package/openssl/patches/patch-Configure
index 2f1213e0e..5d9f9329f 100644
--- a/package/openssl/patches/patch-Configure
+++ b/package/openssl/patches/patch-Configure
@@ -5,7 +5,7 @@
  "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
  "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
 +"linux-embedded","gcc:-DTERMIOS \$(OPTIMIZATION_FLAGS) -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-embedded-x86_64",	"gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
++"linux-embedded-x86_64",	"gcc:-m64 -DL_ENDIAN -DTERMIOS \$(OPTIMIZATION_FLAGS) -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
  
  # Android: linux-* but without -DTERMIO and pointers to headers and libs.
  "android","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
diff --git a/package/pango/Makefile b/package/pango/Makefile
index e84d667d9..b89fc7f18 100644
--- a/package/pango/Makefile
+++ b/package/pango/Makefile
@@ -15,6 +15,8 @@ PKG_SITES:=		${MASTER_SITE_GNOME:=pango/1.28/}
 PKG_NEED_CXX:=		1
 PKG_OPTS:=		dev
 
+PKG_ARCH_DEPENDS:=	!m68k
+
 #DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 
 ifeq ($(ADK_STATIC),y)
diff --git a/package/pixman/Makefile b/package/pixman/Makefile
index 5cb1821d9..9ed31b20a 100644
--- a/package/pixman/Makefile
+++ b/package/pixman/Makefile
@@ -13,6 +13,8 @@ PKG_BUILDDEP:=		libpng
 PKG_SITES:=		http://www.cairographics.org/releases/
 PKG_OPTS:=		dev
 
+PKG_ARCH_DEPENDS:=	!m68k
+
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libonly
 endif
diff --git a/package/rrdtool/Makefile b/package/rrdtool/Makefile
index 49b7e97bc..0368cef44 100644
--- a/package/rrdtool/Makefile
+++ b/package/rrdtool/Makefile
@@ -16,6 +16,8 @@ PKG_BUILDDEP+=		glib cairo pango
 PKG_URL:=		http://oss.oetiker.ch/
 PKG_SITES:=		http://oss.oetiker.ch/rrdtool/pub/
 
+PKG_ARCH_DEPENDS:=	!m68k
+
 PKG_SUBPKGS:=		LIBRRD RRDCGI RRDTOOL
 PKGSC_RRDCGI:=		misc
 PKGSD_RRDCGI:=		RRD CGI
diff --git a/package/twm/Makefile b/package/twm/Makefile
index bfdc1899a..92456c672 100644
--- a/package/twm/Makefile
+++ b/package/twm/Makefile
@@ -15,7 +15,7 @@ PKG_URL:=		http://xorg.freedesktop.org/
 PKG_SITES:=		http://xorg.freedesktop.org/archive/individual/app/
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=	!cris !avr32
+PKG_ARCH_DEPENDS:=	!cris !avr32 !m68k
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/xf86-input-evdev/Makefile b/package/xf86-input-evdev/Makefile
index 9faa87aff..a2004d387 100644
--- a/package/xf86-input-evdev/Makefile
+++ b/package/xf86-input-evdev/Makefile
@@ -13,7 +13,7 @@ PKG_DEPENDS:=		xorg-server kmod-input-evdev
 PKG_BUILDDEP:=		xorg-server
 PKG_SITES:=		${MASTER_SITE_XORG}
 
-PKG_ARCH_DEPENDS:=	!arm !avr32
+PKG_ARCH_DEPENDS:=	!arm !avr32 !m68k
 
 PKG_CFLINE_XF86_INPUT_EVDEV:= depends on ADK_TARGET_WITH_INPUT
 
diff --git a/package/xf86-input-evtouch/Makefile b/package/xf86-input-evtouch/Makefile
index 9068cfe0b..13cfa6d8d 100644
--- a/package/xf86-input-evtouch/Makefile
+++ b/package/xf86-input-evtouch/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		xorg-server
 PKG_SITES:=		http://www.conan.de/touchscreen/
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=      !arm !avr32
+PKG_ARCH_DEPENDS:=      !arm !avr32 !m68k
 PKG_CFLINE_XF86_INPUT_EVTOUCH:=	depends on ADK_TARGET_WITH_INPUT
 
 DISTFILES:= 		${PKG_NAME}-${PKG_VERSION}.tar.bz2
diff --git a/package/xf86-input-keyboard/Makefile b/package/xf86-input-keyboard/Makefile
index de7ae75c4..20371d21b 100644
--- a/package/xf86-input-keyboard/Makefile
+++ b/package/xf86-input-keyboard/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		xorg-server
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=      !avr32
+PKG_ARCH_DEPENDS:=      !avr32 !m68k
 PKG_CFLINE_XF86_INPUT_KEYBOARD:=	depends on ADK_TARGET_WITH_INPUT
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/xf86-input-mouse/Makefile b/package/xf86-input-mouse/Makefile
index 8df9db15d..b2ad6b428 100644
--- a/package/xf86-input-mouse/Makefile
+++ b/package/xf86-input-mouse/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		xorg-server
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=      !avr32
+PKG_ARCH_DEPENDS:=      !avr32 !m68k
 PKG_CFLINE_XF86_INPUT_MOUSE:=	depends on ADK_TARGET_WITH_INPUT
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/xf86-video-ati/Makefile b/package/xf86-video-ati/Makefile
index b00f72b81..d73772a4a 100644
--- a/package/xf86-video-ati/Makefile
+++ b/package/xf86-video-ati/Makefile
@@ -14,7 +14,7 @@ PKG_DEPENDS:=		xorg-server libdrm mesalib udev
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=      !avr32 !arm
+PKG_ARCH_DEPENDS:=      !avr32 !arm !m68k
 PKG_CFLINE_XF86_VIDEO_ATI:=depends on ADK_TARGET_WITH_VGA
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/xf86-video-cirrus/Makefile b/package/xf86-video-cirrus/Makefile
index 3993e168c..4a0fd7c3f 100644
--- a/package/xf86-video-cirrus/Makefile
+++ b/package/xf86-video-cirrus/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		xorg-server
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=	!arm !avr32
+PKG_ARCH_DEPENDS:=	!arm !avr32 !m68k
 PKG_CFLINE_XF86_VIDEO_CIRRUS:=depends on ADK_TARGET_WITH_VGA
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/xf86-video-fbdev/Makefile b/package/xf86-video-fbdev/Makefile
index 5d996a5c3..f7786112c 100644
--- a/package/xf86-video-fbdev/Makefile
+++ b/package/xf86-video-fbdev/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		xorg-server
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=      !avr32
+PKG_ARCH_DEPENDS:=      !avr32 !m68k
 PKG_CFLINE_XF86_VIDEO_FBDEV:=	depends on ADK_TARGET_WITH_VGA
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/xf86-video-intel/Makefile b/package/xf86-video-intel/Makefile
index cc9fcecd6..cf5e34215 100644
--- a/package/xf86-video-intel/Makefile
+++ b/package/xf86-video-intel/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		xorg-server libdrm xf86driproto MesaLib
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=	!arm !avr32
+PKG_ARCH_DEPENDS:=	!arm !avr32 !m68k
 PKG_CFLINE_XF86_VIDEO_INTEL:=depends on ADK_TARGET_WITH_VGA
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/xf86-video-siliconmotion/Makefile b/package/xf86-video-siliconmotion/Makefile
index 5eba159d0..79f8ac7ba 100644
--- a/package/xf86-video-siliconmotion/Makefile
+++ b/package/xf86-video-siliconmotion/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		xorg-server
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=	!arm !avr32
+PKG_ARCH_DEPENDS:=	!arm !avr32 !m68k
 PKG_CFLINE_XF86_VIDEO_SILICONMOTION:=depends on ADK_TARGET_WITH_VGA
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/xinit/Makefile b/package/xinit/Makefile
index e01318710..0d054a18b 100644
--- a/package/xinit/Makefile
+++ b/package/xinit/Makefile
@@ -15,7 +15,7 @@ PKG_URL:=		http://xorg.freedesktop.org/
 PKG_SITES:=		http://xorg.freedesktop.org/archive/individual/app/
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=	!cris !avr32
+PKG_ARCH_DEPENDS:=	!cris !avr32 !m68k
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 348a14447..df2ebc314 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -23,7 +23,7 @@ PKG_NEED_CXX:=		1
 PKG_OPTS:=		dev
 
 PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA
-PKG_ARCH_DEPENDS:=	!cris !avr32
+PKG_ARCH_DEPENDS:=	!cris !avr32 !m68k
 
 PKG_FLAVOURS_XORG_SERVER:=	WITH_DRI WITH_KDRIVE
 PKGFS_WITH_DRI:=		mesalib