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

9 files changed, 46 insertions, 12 deletions

diff --git a/package/libfm/Makefile b/package/libfm/Makefile
index 6e48a6784..bc2b5a9b9 100644
--- a/package/libfm/Makefile
+++ b/package/libfm/Makefile
@@ -22,7 +22,7 @@ $(eval $(call PKG_template,LIBFM,libfm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPEN
 $(eval $(call PKG_template,LIBFM_DEV,libfm-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CPPFLAGS_FOR_BUILD+=	$(shell pkg-config --cflags glib-2.0)
-LDFLAGS_FOR_BUILD+=	$(shell pkg-config --libs glib-2.0)
+LDFLAGS_FOR_BUILD+=	$(shell pkg-config --libs glib-2.0) -L/usr/lib
 CONFIGURE_ARGS+=	--disable-gtk-doc
 
 libfm-install:
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index 01d4ba466..8bfe1bb20 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libxml2
-PKG_VERSION:=		2.7.6
+PKG_VERSION:=		2.7.8
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		7740a8ec23878a2f50120e1faa2730f2
+PKG_MD5SUM:=		8127a65e8c3b08856093099b52599c86
 PKG_DESCR:=		XML C parser and toolkit
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		zlib
diff --git a/package/libxml2/patches/patch-ltmain_sh b/package/libxml2/patches/patch-ltmain_sh
index e6279239d..e5746506c 100644
--- a/package/libxml2/patches/patch-ltmain_sh
+++ b/package/libxml2/patches/patch-ltmain_sh
@@ -1,11 +1,11 @@
---- libxml2-2.7.6.orig/ltmain.sh	2009-10-06 18:39:54.000000000 +0200
-+++ libxml2-2.7.6/ltmain.sh	2011-01-14 00:34:35.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
+--- libxml2-2.7.8.orig/ltmain.sh	2010-11-04 18:28:10.000000000 +0100
++++ libxml2-2.7.8/ltmain.sh	2011-04-25 06:55:46.857662605 +0200
+@@ -5091,7 +5091,7 @@ func_mode_link ()
+       # @file                GCC response files
+       # -tp=*                Portland pgcc target processor selection
        -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto*)
          func_quote_for_eval "$arg"
  	arg="$func_quote_for_eval_result"
          func_append compile_command " $arg"
diff --git a/package/lxdm/Makefile b/package/lxdm/Makefile
index 555194a3d..4f0036360 100644
--- a/package/lxdm/Makefile
+++ b/package/lxdm/Makefile
@@ -30,5 +30,8 @@ lxdm-install:
 	$(INSTALL_DIR) $(IDIR_LXDM)/usr/share/lxdm/themes
 	$(CP) $(WRKINST)/usr/share/lxdm/themes/* \
 		$(IDIR_LXDM)/usr/share/lxdm/themes
+	$(INSTALL_DIR) $(IDIR_LXDM)/usr/share/backgrounds
+	$(CP) ./files/openadk.png \
+		$(IDIR_LXDM)/usr/share/backgrounds/default.png
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/lxdm/files/lxdm.init b/package/lxdm/files/lxdm.init
new file mode 100644
index 000000000..40ece255b
--- /dev/null
+++ b/package/lxdm/files/lxdm.init
@@ -0,0 +1,28 @@
+#!/bin/sh
+#PKG lxdm
+#INIT 95
+
+. /etc/rc.conf
+
+case $1 in
+autostop) ;;
+autostart)
+	test x"${lxdm:-NO}" = x"NO" && exit 0
+	exec sh $0 start
+	;;
+start)
+	/usr/sbin/lxdm
+	;;
+stop)
+	kill $(pgrep -f /usr/sbin/lxdm)
+	;;
+restart)
+	sh $0 stop
+	sh $0 start
+	;;
+*)
+	echo "Usage: $0 {start | stop | restart}"
+	exit 1
+	;;
+esac
+exit $?
diff --git a/package/lxdm/files/lxdm.postinst b/package/lxdm/files/lxdm.postinst
new file mode 100644
index 000000000..4a038c74d
--- /dev/null
+++ b/package/lxdm/files/lxdm.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf lxdm lxdm YES
diff --git a/package/lxdm/files/openadk.png b/package/lxdm/files/openadk.png
new file mode 100644
index 000000000..70f9c3bcd
--- /dev/null
+++ b/package/lxdm/files/openadk.png
diff --git a/package/pcmanfm/Makefile b/package/pcmanfm/Makefile
index 187c4da2a..500f4c41b 100644
--- a/package/pcmanfm/Makefile
+++ b/package/pcmanfm/Makefile
@@ -22,7 +22,7 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,PCMANFM,pcmanfm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CPPFLAGS_FOR_BUILD+=	$(shell pkg-config --cflags glib-2.0)
-LDFLAGS_FOR_BUILD+=	$(shell pkg-config --libs glib-2.0)
+LDFLAGS_FOR_BUILD+=	$(shell pkg-config --libs glib-2.0) -L/usr/lib
 CONFIGURE_ARGS+=	--disable-gtk-doc
 
 pcmanfm-install:
diff --git a/package/trafshow/Makefile b/package/trafshow/Makefile
index 17d9879db..5cdc7c739 100644
--- a/package/trafshow/Makefile
+++ b/package/trafshow/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:=		traffic analyzing tool
 PKG_SECTION:=		net
 PKG_BUILDDEP:=		libpcap ncurses
 PKG_DEPENDS:=		libpcap libncurses libpthread
-PKG_SITES:=		http://www.sfr-fresh.com/linux/misc/
+PKG_SITES:=		http://openadk.org/distfiles
 PKG_NOPARALLEL:=	1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz