summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/firefox/Makefile10
-rwxr-xr-xpackage/firefox/files/firefox.init31
-rw-r--r--package/firefox/files/firefox.postinst6
-rw-r--r--package/firefox/files/xinitrc1
-rw-r--r--package/xinit/Makefile20
-rw-r--r--package/xinit/patches/patch-startx_cpp32
6 files changed, 82 insertions, 18 deletions
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 1a9aabb77..1b998951c 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= firefox
PKG_VERSION:= 35.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_HASH:= bedeb5bbd8b49e5b286497ef7732542c6e7441088fd8cd577d7ca8af4c871e81
PKG_DESCR:= graphical webbrowser
PKG_SECTION:= x11/apps
@@ -119,15 +119,15 @@ endif
XAKE_FLAGS+= OS_RELEASE="2.6" HOST_CC=$(HOST_CC) HOST_LDFLAGS=$(HOST_LDFLAGS)
XAKE_FLAGS+= ARCHFLAG="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) -lnss3 -lnssutil3 -lsmime3 -lssl3 -fPIC"
-pre-build:
- -mkdir $(WRKBUILD)/js/src/.deps
-
firefox-install:
+ $(INSTALL_DIR) $(IDIR_FIREFOX)/etc
$(INSTALL_DIR) $(IDIR_FIREFOX)/usr/bin
$(INSTALL_DIR) $(IDIR_FIREFOX)/usr/lib
$(CP) $(WRKINST)/usr/lib/firefox-$(PKG_VERSION) \
$(IDIR_FIREFOX)/usr/lib
- $(CP) ./files/firefox \
+ $(CP) ./files/xinitrc \
+ $(IDIR_FIREFOX)/etc
+ $(INSTALL_BIN) ./files/firefox \
$(IDIR_FIREFOX)/usr/bin
include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/firefox/files/firefox.init b/package/firefox/files/firefox.init
new file mode 100755
index 000000000..9fec2b5df
--- /dev/null
+++ b/package/firefox/files/firefox.init
@@ -0,0 +1,31 @@
+#!/bin/sh
+#PKG firefox
+#INIT 98
+. /etc/rc.conf
+
+case $1 in
+autostop) ;;
+autostart)
+ test x"${firefox:-NO}" = x"NO" && exit 0
+ test x"$firefox" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start
+ exec sh $0 start
+ ;;
+start)
+ if [ ! -d /data/firefox ];then
+ mkdir /data/firefox
+ chown firefox /data/firefox
+ fi
+ su - firefox -c startx
+ ;;
+stop)
+ ;;
+restart)
+ sh $0 stop
+ sh $0 start
+ ;;
+*)
+ echo "Usage: $0 {start | stop | restart}"
+ exit 1
+ ;;
+esac
+exit $?
diff --git a/package/firefox/files/firefox.postinst b/package/firefox/files/firefox.postinst
new file mode 100644
index 000000000..a9be54701
--- /dev/null
+++ b/package/firefox/files/firefox.postinst
@@ -0,0 +1,6 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf firefox NO
+gid=$(get_next_gid)
+add_group firefox $gid
+add_user firefox $(get_next_uid) $gid /data/firefox /bin/sh
diff --git a/package/firefox/files/xinitrc b/package/firefox/files/xinitrc
new file mode 100644
index 000000000..cdc71236c
--- /dev/null
+++ b/package/firefox/files/xinitrc
@@ -0,0 +1 @@
+exec firefox
diff --git a/package/xinit/Makefile b/package/xinit/Makefile
index 0c80a6379..a352a9495 100644
--- a/package/xinit/Makefile
+++ b/package/xinit/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= xinit
PKG_VERSION:= 1.2.1
-PKG_RELEASE:= 5
+PKG_RELEASE:= 6
PKG_HASH:= 3079d3fb86af99f4c2c2907b5725e5820fdb2144d3be6002ec367bfcebc5c480
PKG_DESCR:= x window system initializer
PKG_SECTION:= x11/utils
@@ -14,13 +14,11 @@ PKG_BUILDDEP:= xorg-server
PKG_URL:= http://xorg.freedesktop.org/
PKG_SITES:= http://xorg.freedesktop.org/archive/individual/app/
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-
-PKG_ARCH_DEPENDS:= !m68k
+DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XINIT,xinit,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XINIT,xinit,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
TARGET_CPPFLAGS+= -D_POSIX_SOURCE
CONFIGURE_ARGS:= --without-launchd
@@ -28,10 +26,12 @@ XAKE_FLAGS+= RAWCPP="$(TARGET_CROSS)cpp"
xinit-install:
$(INSTALL_DIR) $(IDIR_XINIT)/usr/bin
- $(INSTALL_BIN) $(WRKINST)/usr/bin/{xinit,startx} \
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/startx \
+ $(IDIR_XINIT)/usr/bin/
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/xinit \
$(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/
+ $(INSTALL_DIR) $(IDIR_XINIT)/usr/lib/X11/xinit
+ $(INSTALL_DATA) $(WRKINST)/usr/lib/X11/xinit/xinitrc \
+ $(IDIR_XINIT)/usr/lib/X11/xinit/
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/xinit/patches/patch-startx_cpp b/package/xinit/patches/patch-startx_cpp
index 2b3ee6aea..e80ee0ea8 100644
--- a/package/xinit/patches/patch-startx_cpp
+++ b/package/xinit/patches/patch-startx_cpp
@@ -1,6 +1,32 @@
---- xinit-1.2.1.orig/startx.cpp 2010-03-15 23:35:56.000000000 +0100
-+++ xinit-1.2.1/startx.cpp 2010-12-13 17:44:35.000000000 +0100
-@@ -242,18 +242,7 @@ if [ x"$enable_xauth" = x1 ] ; then
+--- xinit-1.2.1.orig/startx.cpp 2010-03-15 17:35:56.000000000 -0500
++++ xinit-1.2.1/startx.cpp 2015-02-14 12:26:05.423804908 -0600
+@@ -51,24 +51,8 @@ XCOMM so export the new PATH just in cas
+ export PATH
+ #endif
+
+-#if defined(__SCO__) || defined(__UNIXWARE__)
+-XCOMM Set up the XMERGE env var so that dos merge is happy under X
+-
+-if [ -f /usr/lib/merge/xmergeset.sh ]; then
+- . /usr/lib/merge/xmergeset.sh
+-elif [ -f /usr/lib/merge/console.disp ]; then
+- XMERGE=`cat /usr/lib/merge/console.disp`
+- export XMERGE
+-fi
+-
+-userclientrc=$HOME/.startxrc
+-sysclientrc=LIBDIR/sys.startxrc
+-scouserclientrc=$HOME/.xinitrc
+-scosysclientrc=XINITDIR/xinitrc
+-#else
+ userclientrc=$HOME/.xinitrc
+-sysclientrc=XINITDIR/xinitrc
+-#endif
++sysclientrc=/etc/xinitrc
+
+ userserverrc=$HOME/.xserverrc
+ sysserverrc=XINITDIR/xserverrc
+@@ -242,18 +226,7 @@ if [ x"$enable_xauth" = x1 ] ; then
removelist=
XCOMM set up default Xauth info for this machine