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

package/gettext-tiny/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		gettext-tiny
-PKG_VERSION:=		0.0.3
+PKG_VERSION:=		0.0.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		3af6fd8a9042603b61f634b1c6f49e7e
+PKG_MD5SUM:=		09f6a74945df5961080234f7851f352c
 PKG_DESCR:=		Gettext stub and replacement
 PKG_SECTION:=		libs
 PKG_BUILDDEP:=		gettext-tiny-host

package/ruby-ldap/Makefile

@@ -14,6 +14,8 @@ PKG_BUILDDEP:=		ruby openldap
 PKG_URL:=		http://ruby-ldap.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=ruby-ldap/0.9.8/}
 
+PKG_CFLINE_RUBY_LDAP:=	depends on ADK_BROKEN
+
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include $(TOPDIR)/mk/package.mk

package/upower/Makefile

@@ -1,43 +0,0 @@
-# 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:=		upower
-PKG_VERSION:=		0.99.0
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		14f43bc13353e23e7280863f33ac50d2
-PKG_DESCR:=		powermanagement
-PKG_SECTION:=		misc
-PKG_BUILDDEP:=		glib dbus-glib polkit eudev
-PKG_DEPENDS:=		glib dbus-glib polkit libgudev
-PKG_URL:=		http://upower.freedesktop.org/
-PKG_SITES:=		http://upower.freedesktop.org/releases/
-
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,UPOWER,upower,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIGURE_ARGS+=	--without-systemdutildir \
-			--disable-rpath
-
-upower-install:
-	$(INSTALL_DIR) $(IDIR_UPOWER)/etc
-	$(CP) $(WRKINST)/etc/* \
-		$(IDIR_UPOWER)/etc
-	$(INSTALL_DIR) $(IDIR_UPOWER)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libupower*.so* \
-		$(IDIR_UPOWER)/usr/lib
-	$(INSTALL_DIR) $(IDIR_UPOWER)/usr/sbin
-	$(INSTALL_BIN) $(WRKINST)/usr/libexec/upowerd \
-		$(IDIR_UPOWER)/usr/sbin
-	$(INSTALL_DIR) $(IDIR_UPOWER)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/upower \
-		$(IDIR_UPOWER)/usr/bin
-	$(INSTALL_DIR) $(IDIR_UPOWER)/usr/share/dbus-1
-	$(CP) $(WRKINST)/usr/share/dbus-1/* \
-		$(IDIR_UPOWER)/usr/share/dbus-1
-
-include ${TOPDIR}/mk/pkg-bottom.mk

package/upower/patches/patch-Makefile_in

@@ -1,20 +0,0 @@
---- upower-0.99.0.orig/Makefile.in	2013-10-29 11:39:06.000000000 +0100
-+++ upower-0.99.0/Makefile.in	2014-01-10 17:09:06.000000000 +0100
-@@ -199,7 +199,7 @@ am__define_uniq_tagged_files = \
- ETAGS = etags
- CTAGS = ctags
- CSCOPE = cscope
--DIST_SUBDIRS = etc libupower-glib src doc tools po rules
-+DIST_SUBDIRS = etc libupower-glib src tools po rules
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
-@@ -439,7 +439,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- udevrulesdir = @udevrulesdir@
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
--SUBDIRS = etc libupower-glib src doc tools po $(am__append_1)
-+SUBDIRS = etc libupower-glib src tools po $(am__append_1)
- EXTRA_DIST = \
- 	HACKING 			\
- 	ChangeLog

scripts/scan-tools.sh

@@ -37,8 +37,9 @@ if [[ -e foo ]]; then
 		Darwin*)
 			echo "Building OpenADK on $os needs a case-sensitive disk partition."
 			echo "For Snow Leopard and above you can use diskutil to resize your existing disk."
-			echo "For older versions you might consider to use a disk image."
 			echo "Example: sudo diskutil resizeVolume disk0s2 90G 1 jhfsx adk 30G"
+			echo "For older versions you might consider to use a disk image:"
+			echo "hdiutil create -type SPARSE -fs 'Case-sensitive Journaled HFS+' -size 30g ~/openadk.dmg"
 			;;
 	esac
 	exit 1

tools/mksh/Makefile

@@ -18,7 +18,6 @@ install: ${STAGING_HOST_DIR}/usr/bin/mksh
 
 $(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
 	cd ${WRKBUILD} && CC='${CC_FOR_BUILD}' CFLAGS='${CFLAGS_FOR_BUILD}' \
-	    CPPFLAGS='${CPPFLAGS_FOR_BUILD}' LDFLAGS='${LDFLAGS_FOR_BUILD}' \
 	    HAVE_CAN_FSTACKPROTECTORALL=0 \
 	    TARGET_OS=Linux ${BASH} ${WRKSRC}/Build.sh -Q -r -c lto
 	touch $@