summaryrefslogtreecommitdiff
path: root/package/xbitmaps
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-05-02 11:45:18 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2013-05-02 11:45:18 +0200
commite85fa91ec6655da593c0b8b31832045da5ad9ad4 (patch)
tree2e3ea23d1697b2b9e11ed00023783f9722dcf276 /package/xbitmaps
parent5782397d77cd243c1174c98051158febe3a21641 (diff)
update Xorg to 7.7
Diffstat (limited to 'package/xbitmaps')
-rw-r--r--package/xbitmaps/Makefile17
-rw-r--r--package/xbitmaps/patches/patch-Makefile_in11
2 files changed, 24 insertions, 4 deletions
diff --git a/package/xbitmaps/Makefile b/package/xbitmaps/Makefile
index cce8a1b69..2027eb5bf 100644
--- a/package/xbitmaps/Makefile
+++ b/package/xbitmaps/Makefile
@@ -4,13 +4,22 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= xbitmaps
-PKG_VERSION:= 1.1.0
+PKG_VERSION:= 1.1.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= e9ab0ddd7dba49b448643768547a275d
+PKG_MD5SUM:= 288bbe310db67280a9e2e5ebc5602595
PKG_DESCR:= prerequiste for xsetroot
PKG_SECTION:= x11/libs
-PKG_SITES:= http://xorg.freedesktop.org/archive/individual/app/
-PKG_SUBPKGS:=
+PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XBITMAPS,xbitmaps,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_XBITMAPS}/usr/include
+ ${CP} ${WRKINST}/usr/include/X11 ${IDIR_XBITMAPS}/usr/include
+ ${INSTALL_DIR} ${IDIR_XBITMAPS}/usr/lib/pkgconfig
+ ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xbitmaps.pc \
+ ${IDIR_XBITMAPS}/usr/lib/pkgconfig
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xbitmaps/patches/patch-Makefile_in b/package/xbitmaps/patches/patch-Makefile_in
new file mode 100644
index 000000000..acfd06c53
--- /dev/null
+++ b/package/xbitmaps/patches/patch-Makefile_in
@@ -0,0 +1,11 @@
+--- xbitmaps-1.1.1.orig/Makefile.in 2010-12-09 07:26:17.000000000 +0100
++++ xbitmaps-1.1.1/Makefile.in 2013-04-30 14:18:50.000000000 +0200
+@@ -207,7 +207,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-pkgconfigdir = $(datadir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = xbitmaps.pc
+ MAINTAINERCLEANFILES = ChangeLog INSTALL
+ bitmapdir = $(includedir)/X11/bitmaps