summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2014-04-06 05:46:14 +0000
committerobache <obache@pkgsrc.org>2014-04-06 05:46:14 +0000
commitd35d8d17c469b28bd8fa05dff85fe6731677b40d (patch)
tree6d9b567e2ec9ab50df17cb0fcf060e218b7e5fa3 /wm
parentbcb62209698ea8068a3e7c0eff8d8ebfb1cfb5af (diff)
downloadpkgsrc-d35d8d17c469b28bd8fa05dff85fe6731677b40d.tar.gz
Some clean up of packaging:
* prevent to buildlink with pango, it will be loaded vir lua-gi. * add buildlink with libexecinfo, it is installed as a dependency of cmake now and found by cmake. PR pkg/48717. * set prefix of libev more closely. Bump PKGREVISION from dependency update.
Diffstat (limited to 'wm')
-rw-r--r--wm/awesome/Makefile9
-rw-r--r--wm/awesome/distinfo4
-rw-r--r--wm/awesome/patches/patch-awesomeConfig.cmake4
3 files changed, 9 insertions, 8 deletions
diff --git a/wm/awesome/Makefile b/wm/awesome/Makefile
index 61c58fab80c..5b1bbe31bda 100644
--- a/wm/awesome/Makefile
+++ b/wm/awesome/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2014/01/13 02:19:47 dholland Exp $
+# $NetBSD: Makefile,v 1.48 2014/04/06 05:46:14 obache Exp $
#
DISTNAME= awesome-3.5.1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11 wm
MASTER_SITES= http://awesome.naquadah.org/download/
EXTRACT_SUFX= .tar.xz
@@ -38,7 +38,7 @@ SUBST_CLASSES+= ev
SUBST_MESSAGE.ev= Fixing pathnames for libev
SUBST_STAGE.ev= pre-configure
SUBST_FILES.ev= awesomeConfig.cmake
-SUBST_SED.ev= -e "s,PKGPREFIX,${PREFIX},"
+SUBST_SED.ev= -e "s,@LIBEV_PREFIX@,${BUILDLINK_PREFIX.libev},"
BUILD_DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick
BUILD_DEPENDS+= asciidoc>=8.3.0:../../textproc/asciidoc
@@ -46,13 +46,14 @@ BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
BUILD_DEPENDS+= docbook-xml-[0-9]*:../../textproc/docbook-xml
DEPENDS+= ${LUA_PKGPREFIX}-gi-[0-9]*:../../devel/lua-gi
+DEPENDS+= pango>=1.29.4nb2:../../devel/pango
LDFLAGS.SunOS+= -liconv
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libev/buildlink3.mk"
-.include "../../devel/pango/buildlink3.mk"
+.include "../../devel/libexecinfo/buildlink3.mk"
.include "../../graphics/cairo/buildlink3.mk"
.include "../../graphics/cairo-gobject/buildlink3.mk"
.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
diff --git a/wm/awesome/distinfo b/wm/awesome/distinfo
index 04635aafc23..b625d38f85c 100644
--- a/wm/awesome/distinfo
+++ b/wm/awesome/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.13 2013/12/08 00:18:21 dholland Exp $
+$NetBSD: distinfo,v 1.14 2014/04/06 05:46:14 obache Exp $
SHA1 (awesome-3.5.1.tar.xz) = 8bca01550298905b975ccaadcc8de5a5c333b271
RMD160 (awesome-3.5.1.tar.xz) = 480f6d56a192d5ea6e72d6576d47f5805182c725
Size (awesome-3.5.1.tar.xz) = 714320 bytes
-SHA1 (patch-awesomeConfig.cmake) = fed6a47e127b6a2d688deadaabb7805730e08ed8
+SHA1 (patch-awesomeConfig.cmake) = 5893bf757770cc2574c7e8c3c30a593854ff90de
SHA1 (patch-build-utils_lgi-check.sh) = a3562f570e58d9596feb632ed5313a23d709ef8c
diff --git a/wm/awesome/patches/patch-awesomeConfig.cmake b/wm/awesome/patches/patch-awesomeConfig.cmake
index 7fb86913c5c..122c2efaf0b 100644
--- a/wm/awesome/patches/patch-awesomeConfig.cmake
+++ b/wm/awesome/patches/patch-awesomeConfig.cmake
@@ -1,4 +1,4 @@
-$NetBSD: patch-awesomeConfig.cmake,v 1.2 2013/07/22 19:47:18 degroote Exp $
+$NetBSD: patch-awesomeConfig.cmake,v 1.3 2014/04/06 05:46:14 obache Exp $
--- awesomeConfig.cmake.orig 2013-04-01 11:44:46.000000000 +0000
+++ awesomeConfig.cmake 2013-07-21 21:05:57.000000000 +0000
@@ -16,7 +16,7 @@ $NetBSD: patch-awesomeConfig.cmake,v 1.2 2013/07/22 19:47:18 degroote Exp $
macro(a_find_library variable library)
- find_library(${variable} ${library})
-+ find_library(${variable} ${library} PKGPREFIX/lib/ev)
++ find_library(${variable} ${library} @LIBEV_PREFIX@/lib/ev)
if(NOT ${variable})
message(FATAL_ERROR ${library} " library not found.")
endif()