summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Sutter <phil@nwl.cc>2010-06-06 10:45:06 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-06-08 16:29:02 +0200
commit50329ba33d82bc4a38ef96824c60be2fd95c119b (patch)
treeb6dac5786d44b382d6f05be84fcda62800150f3a
parent680b86ab37f49665c5161350e0ad60d3df251f69 (diff)
port xinit and it's dependency mcookie
-rw-r--r--package/Config.in1
-rw-r--r--package/util-linux-ng/Makefile4
-rw-r--r--package/xinit/Makefile29
3 files changed, 34 insertions, 0 deletions
diff --git a/package/Config.in b/package/Config.in
index 141ffe2a4..d6553882e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -623,6 +623,7 @@ source "package/font-util/Config.in"
source "package/rxvt-unicode/Config.in"
source "package/twm/Config.in"
source "package/xauth/Config.in"
+source "package/xinit/Config.in"
source "package/xlsfonts/Config.in"
endmenu
diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile
index ef7b4766d..7e3c121ca 100644
--- a/package/util-linux-ng/Makefile
+++ b/package/util-linux-ng/Makefile
@@ -19,6 +19,7 @@ PKG_DESCR_SWAP:= Swap space management utilities
PKG_DEPENDS_SWAP:= libblkid
PKG_DESCR_LOOP:= Loop devices setup and control utility
PKG_DEPENDS_LOOP:= kmod-blk-dev-loop
+PKG_DESCR_MCOOKIE:= Generate magic cookies for xauth
include ${TOPDIR}/mk/package.mk
@@ -26,6 +27,7 @@ $(eval $(call PKG_template,FDISK,fdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN
$(eval $(call PKG_template,SFDISK,sfdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_SFDISK},${PKG_SECTION}))
$(eval $(call PKG_template,SWAP_UTILS,swap-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_SWAP},${PKG_DESCR_SWAP},${PKG_SECTION}))
$(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_LOOP},${PKG_DESCR_LOOP},${PKG_SECTION}))
+$(eval $(call PKG_template,MCOOKIE,mcookie,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_MCOOKIE},${PKG_SECTION}))
CONFIGURE_ARGS+= --disable-use-tty-group \
--disable-schedutils \
@@ -46,5 +48,7 @@ post-install:
${INSTALL_DIR} ${IDIR_SWAP_UTILS}/usr/sbin
${CP} ${WRKINST}/sbin/mkswap ${IDIR_SWAP_UTILS}/usr/sbin/
${CP} ${WRKINST}/sbin/swap{on,off} ${IDIR_SWAP_UTILS}/usr/sbin/
+ ${INSTALL_DIR} ${IDIR_MCOOKIE}/usr/bin
+ ${INSTALL_BIN} ${WRKINST}/usr/bin/mcookie ${IDIR_MCOOKIE}/usr/bin/
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xinit/Makefile b/package/xinit/Makefile
new file mode 100644
index 000000000..a5180511a
--- /dev/null
+++ b/package/xinit/Makefile
@@ -0,0 +1,29 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= xinit
+PKG_VERSION:= 1.2.1
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 7ad82221ebd6600a8d33712ec3b62efb
+PKG_DESCR:= X Window System initializer
+PKG_SECTION:= x11
+PKG_DEPENDS:= xorg-server mcookie
+PKG_BUILDDEP+= xorg-server
+PKG_URL:= http://xorg.freedesktop.org
+PKG_SITES:= http://xorg.freedesktop.org/archive/individual/app/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XINIT,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+ $(INSTALL_DIR) $(IDIR_XINIT)/usr/bin
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/{xinit,startx} \
+ $(IDIR_XINIT)/usr/bin/
+ ${INSTALL_DIR} ${IDIR_XINIT}/usr/lib/X11/xinit
+ ${INSTALL_DATA} ${WRKINST}/usr/lib/X11/xinit/xinitrc \
+ ${IDIR_XINIT}/usr/lib/X11/xinit/
+
+include ${TOPDIR}/mk/pkg-bottom.mk