Merge branch 'master' of git+ssh://openadk.org/git/openadk

5 files changed, 53 insertions, 49 deletions

diff --git a/makefile b/makefile
deleted file mode 100644
index 760d123d6..000000000
--- a/makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-ADKVERSION=	0.1.0
-TOPDIR=		${.CURDIR}
-PWD=		${.CURDIR}
-
-.include "${.CURDIR}/Makefile.inc"
-
-GMAKE_ENV+=	ADKVERSION=${ADKVERSION:Q}
-
-.if defined(package) && !empty(package)
-subdir:=	package/${package}
-.  if !make(clean)
-_subdir_dep:=	${TOPDIR}/.ADK_HAVE_DOT_CONFIG
-.  endif
-.endif
-
-.if defined(subdir) && !empty(subdir)
-_subdir:=	${.TARGETS}
-${.TARGETS}: _subdir
-
-_subdir: ${_subdir_dep}
-	@if test x"$$(umask 2>/dev/null | sed 's/00*22/OK/')" != x"OK"; then \
-		echo >&2 Error: you must build with “umask 022”, sorry.; \
-		exit 1; \
-	fi
-	cd ${.CURDIR}/${subdir} && TOPDIR=${.CURDIR} DEVELOPER=1 \
-	    ${GMAKE} VERBOSE=1 ${.MFLAGS} ${_subdir}
-
-.  include "${.CURDIR}/prereq.mk"
-.  include "${.CURDIR}/mk/split-cfg.mk"
-.else
-.  include "${.CURDIR}/Makefile"
-.endif
diff --git a/package/lvm/patches/patch-libdm_Makefile_in b/package/lvm/patches/patch-libdm_Makefile_in
index 259f0f9d3..52a52a0fd 100644
--- a/package/lvm/patches/patch-libdm_Makefile_in
+++ b/package/lvm/patches/patch-libdm_Makefile_in
@@ -1,6 +1,27 @@
 --- LVM2.2.02.61.orig/libdm/Makefile.in	2009-10-02 21:10:36.000000000 +0200
-+++ LVM2.2.02.61/libdm/Makefile.in	2010-03-03 19:48:02.316248648 +0100
-@@ -73,26 +73,32 @@ install: $(INSTALL_TYPE) install_include
++++ LVM2.2.02.61/libdm/Makefile.in	2010-03-08 06:27:03.000000000 +0100
+@@ -35,9 +35,7 @@ SOURCES =\
+ 
+ INCLUDES = -I$(srcdir)/$(interface) -I$(srcdir)
+ 
+-ifeq ("@STATIC_LINK@", "yes")
+ LIB_STATIC = $(interface)/libdevmapper.a
+-endif
+ 
+ ifeq ("@LIB_SUFFIX@","dylib")
+   LIB_SHARED = $(interface)/libdevmapper.dylib
+@@ -60,9 +58,7 @@ device-mapper: all
+ 
+ INSTALL_TYPE = install_dynamic
+ 
+-ifeq ("@STATIC_LINK@", "yes")
+-  INSTALL_TYPE += install_static
+-endif
++INSTALL_TYPE += install_static
+ 
+ ifeq ("@PKGCONFIG@", "yes")
+   INSTALL_TYPE += install_pkgconfig
+@@ -73,26 +69,32 @@ install: $(INSTALL_TYPE) install_include
  install_device-mapper: install
  
  install_include:
diff --git a/package/pkgmaker b/package/pkgmaker
index ccd619ac5..ea89424e7 100644
--- a/package/pkgmaker
+++ b/package/pkgmaker
@@ -43,7 +43,7 @@ done
 for dn in */Makefile; do
 	dn=${dn%/*}
 	# skip if we take care of this one manually
-	[[ -s $dn/Config.in.manual ]] && continue
+	[[ $dn != "base-files" ]] && [[ -s $dn/Config.in.manual ]] && continue
 	pbar="Pass 2: $dn ..."
 	print -nu2 "$pbar\r"
 	cd $dn
diff --git a/package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h b/package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h
new file mode 100644
index 000000000..91c04f1ec
--- /dev/null
+++ b/package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h
@@ -0,0 +1,11 @@
+--- xorg-server-1.7.5.orig/hw/xfree86/dri/sarea.h	2009-02-10 08:23:28.000000000 +0100
++++ xorg-server-1.7.5/hw/xfree86/dri/sarea.h	2010-03-08 19:21:40.000000000 +0100
+@@ -42,6 +42,8 @@
+ /* SAREA area needs to be at least a page */
+ #if defined(__alpha__)
+ #define SAREA_MAX 			0x2000
++#elif defined(__mips__)
++#define SAREA_MAX			0x4000
+ #elif defined(__ia64__)
+ #define SAREA_MAX			0x10000		/* 64kB */
+ #else
diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
index d28b1e4e4..8c93131b1 100644
--- a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
+++ b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
@@ -1,5 +1,5 @@
 --- xorg-server-1.7.5.orig/hw/xfree86/os-support/linux/lnx_video.c	2010-02-16 01:24:23.000000000 +0100
-+++ xorg-server-1.7.5/hw/xfree86/os-support/linux/lnx_video.c	2010-03-07 16:38:06.000000000 +0100
++++ xorg-server-1.7.5/hw/xfree86/os-support/linux/lnx_video.c	2010-03-08 21:31:20.000000000 +0100
 @@ -497,7 +497,7 @@ volatile unsigned char *ioBase = NULL;
  Bool
  xf86EnableIO(void)
@@ -9,17 +9,24 @@
  	int fd;
  	unsigned int ioBase_phys;
  #endif
-@@ -537,6 +537,13 @@ xf86EnableIO(void)
- 	ioperm(0x40,4,0); /* trap access to the timer chip */
- 	ioperm(0x60,4,0); /* trap access to the keyboard controller */
- # endif
-+#else
+@@ -524,6 +524,20 @@ xf86EnableIO(void)
+ #endif
+ 	}
+ 	close(fd);
++#elif defined(__mips__)
 +	fd = open("/dev/mem", O_RDWR);
-+	if (IOPortBase == NULL) {
-+		IOPortBase = (volatile unsigned char *)mmap(0, 0x20000,
++	IOPortBase = (volatile unsigned char *)mmap(0, 0x20000,
 +			PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0x1fd00000);
++	if (IOPortBase == MAP_FAILED) {
++		xf86Msg(X_WARNING,
++			"xf86EnableIOPorts: Failed to map iobase (%s)\n",
++			strerror(errno));
++		return FALSE;
 +	}
 +	close(fd);
- #endif
- 	ExtendedEnabled = TRUE;
- 
++	xf86Msg(X_WARNING,
++		"xf86EnableIOPorts: map iobase (%x)\n",
++		IOPortBase);
+ #elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__)
+         if (ioperm(0, 1024, 1) || iopl(3)) {
+                 if (errno == ENODEV)