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

8 files changed, 76 insertions, 3 deletions

diff --git a/package/ConsoleKit/Makefile b/package/ConsoleKit/Makefile
index 178be1447..ebe58ff9f 100644
--- a/package/ConsoleKit/Makefile
+++ b/package/ConsoleKit/Makefile
@@ -13,15 +13,26 @@ PKG_BUILDDEP:=		dbus-glib
 PKG_URL:=		http://www.freedesktop.org/wiki/Software/ConsoleKit
 PKG_SITES:=		http://www.freedesktop.org/software/ConsoleKit/dist/
 
+PKG_SUBPKGS:=		CONSOLEKIT CONSOLEKIT_DEV
+
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,CONSOLEKIT,consolekit,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CONSOLEKIT_DEV,consolekit-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 consolekit-install:
 	$(INSTALL_DIR) $(IDIR_CONSOLEKIT)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libck-connector.so* \
 		$(IDIR_CONSOLEKIT)/usr/lib
 
+consolekit-dev-install:
+	$(INSTALL_DIR) $(IDIR_CONSOLEKIT_DEV)/usr/include
+	$(CP) $(WRKINST)/usr/include/* \
+		$(IDIR_CONSOLEKIT_DEV)/usr/include
+	$(INSTALL_DIR) $(IDIR_CONSOLEKIT_DEV)/usr/lib/pkgconfig
+	$(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc \
+		$(IDIR_CONSOLEKIT_DEV)/usr/lib/pkgconfig
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gdk-pixbuf/Makefile b/package/gdk-pixbuf/Makefile
index 5b747b23c..ece881729 100644
--- a/package/gdk-pixbuf/Makefile
+++ b/package/gdk-pixbuf/Makefile
@@ -16,10 +16,11 @@ PKG_NEED_CXX:=		1
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GDK_PIXBUF,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GDK_PIXBUF_DEV,gdk-pixbuf-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ENV+=		gio_can_sniff=no
 
-post-install:
+gdk-pixbuf-install:
 	$(INSTALL_DIR) $(IDIR_GDK_PIXBUF)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/
 	$(CP) $(WRKINST)/usr/lib/libgdk_pixbuf*so* \
 		$(IDIR_GDK_PIXBUF)/usr/lib
@@ -28,4 +29,13 @@ post-install:
 	$(CP) ./files/loaders.cache \
 		 $(IDIR_GDK_PIXBUF)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
 
+gdk-pixbuf-dev-install:
+	$(INSTALL_DIR) $(IDIR_GDK_PIXBUF_DEV)/usr/lib/pkgconfig
+	$(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc \
+		$(IDIR_GDK_PIXBUF_DEV)/usr/lib/pkgconfig
+	$(INSTALL_DIR) $(IDIR_GDK_PIXBUF_DEV)/usr/include
+	$(CP) $(WRKINST)/usr/include/* \
+		$(IDIR_GDK_PIXBUF_DEV)/usr/include
+	
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXft/Makefile b/package/libXft/Makefile
index 0dff7364b..b412fa882 100644
--- a/package/libXft/Makefile
+++ b/package/libXft/Makefile
@@ -22,8 +22,6 @@ $(eval $(call PKG_template,LIBXFT,libxft,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP
 $(eval $(call PKG_template,LIBXFT_DEV,libxft-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXFT_DEV},${PKGSC_LIBXFT_DEV}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
-CONFIGURE_ARGS+=	--disable-malloc0returnsnull \
-			--disable-install-makestrs
 
 libxft-install:
 	${INSTALL_DIR} ${IDIR_LIBXFT}/usr/lib
@@ -32,5 +30,8 @@ libxft-install:
 libxft-dev-install:
 	${INSTALL_DIR} ${IDIR_LIBXFT_DEV}/usr/include
 	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXFT_DEV}/usr/include
+	${INSTALL_DIR} ${IDIR_LIBXFT_DEV}/usr/lib/pkgconfig
+	$(CP) ${WRKINST}/usr/lib/pkgconfig/*.pc \
+		${IDIR_LIBXFT_DEV}/usr/lib/pkgconfig
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/lxappearance/Makefile b/package/lxappearance/Makefile
index 7dea43fe5..b3f86a3a0 100644
--- a/package/lxappearance/Makefile
+++ b/package/lxappearance/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		7eabab6f4a358dbc6a84e260a0e7f6c2
 PKG_DESCR:=		LXDE ...
 PKG_SECTION:=		x11/lxde
+PKG_BUILDDEP:=		gtk+
 PKG_URL:=		http://lxde.org/
 PKG_SITES:=		http://netcologne.dl.sourceforge.net/project/lxde/LXAppearance/
 
diff --git a/package/openbox/Makefile b/package/openbox/Makefile
new file mode 100644
index 000000000..9ed04df18
--- /dev/null
+++ b/package/openbox/Makefile
@@ -0,0 +1,38 @@
+# 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:=		openbox
+PKG_VERSION:=		3.4.11.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		30e669134fa81df810fe7d1dc59cd931
+PKG_DESCR:=		fast x11 window managaer
+PKG_SECTION:=		x11/apps
+PKG_BUILDDEP:=		glib libxml2 libX11 libXext pango
+PKG_URL:=		http://openbox.org/
+PKG_SITES:=		http://openbox.org/dist/openbox/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,OPENBOX,openbox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+openbox-install:
+	$(INSTALL_DIR) $(IDIR_OPENBOX)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/openbox \
+		$(IDIR_OPENBOX)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/obxprop \
+		$(IDIR_OPENBOX)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/openbox-session \
+		$(IDIR_OPENBOX)/usr/bin
+	$(INSTALL_DIR) $(IDIR_OPENBOX)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libobrender.so* \
+		$(IDIR_OPENBOX)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libobparser.so* \
+		$(IDIR_OPENBOX)/usr/lib
+	$(INSTALL_DIR) $(IDIR_OPENBOX)/usr/share/themes
+	$(CP) $(WRKINST)/usr/share/themes/* \
+		$(IDIR_OPENBOX)/usr/share/themes
+
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/pango/Makefile b/package/pango/Makefile
index e60684cc8..993bd7cd3 100644
--- a/package/pango/Makefile
+++ b/package/pango/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		22ad1c8d3fda7e73b0798035f3dd96bc
 PKG_DESCR:=		pango library
 PKG_SECTION:=		libs
+PKG_BUILDDEP:=		libXft
 PKG_URL:=		http://www.pango.org/
 PKG_SITES:=		${MASTER_SITE_GNOME:=pango/1.28/}
 PKG_NEED_CXX:=		1
diff --git a/package/pixman/Makefile b/package/pixman/Makefile
index 2b136ec07..dfc2dd09e 100644
--- a/package/pixman/Makefile
+++ b/package/pixman/Makefile
@@ -26,6 +26,7 @@ $(eval $(call PKG_template,PIXMAN,pixman,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP
 $(eval $(call PKG_template,PIXMAN_DEV,pixman-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PIXMAN_DEV},${PKGSC_PIXMAN_DEV},${PKG_OPTS}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
+CONFIGURE_ARGS+=	--disable-gtk
 
 pixman-install:
 	${INSTALL_DIR} ${IDIR_PIXMAN}/usr/lib
diff --git a/package/vte/Makefile b/package/vte/Makefile
index 931fc5344..aeccbd900 100644
--- a/package/vte/Makefile
+++ b/package/vte/Makefile
@@ -14,9 +14,12 @@ PKG_BUILDDEP:=		ncurses
 PKG_URL:=		http://www.gnome.org/
 PKG_SITES:=		http://ftp.gnome.org/pub/GNOME/sources/vte/$(PKG_EXTRAVER)/
 
+PKG_SUBPKGS:=		VTE VTE_DEV
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,VTE,vte,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,VTE_DEV,vte-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 vte-install:
 	$(INSTALL_DIR) $(IDIR_VTE)/usr/lib
@@ -24,4 +27,11 @@ vte-install:
 	$(INSTALL_DIR) $(IDIR_VTE)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/vte $(IDIR_VTE)/usr/bin
 
+vte-dev-install:
+	$(INSTALL_DIR) $(IDIR_VTE)/usr/include
+	$(CP) $(WRKINST)/usr/include/* $(IDIR_VTE)/usr/include
+	$(INSTALL_DIR) $(IDIR_VTE)/usr/lib/pkgconfig
+	$(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc \
+		$(IDIR_VTE)/usr/lib/pkgconfig
+
 include ${TOPDIR}/mk/pkg-bottom.mk