Hi,
This diff updates the x11/awesome port to 3.4.7.
I've also added a build dependency on luadoc, since
now we have it in our ports tree.
Ok?
Cheers,
David
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/awesome/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile 29 Jul 2010 06:40:02 -0000 1.17
+++ Makefile 10 Sep 2010 13:09:25 -0000
@@ -2,7 +2,7 @@
COMMENT= fast, small, dynamic and awesome window manager
-DISTNAME= awesome-3.4.6
+DISTNAME= awesome-3.4.7
EXTRACT_SUFX= .tar.bz2
CATEGORIES= x11
@@ -39,6 +39,7 @@ LIB_DEPENDS= ::devel/libexecinfo \
::x11/libxdg-basedir
BUILD_DEPENDS= ::devel/gperf \
+ ::devel/luadoc \
::textproc/asciidoc \
::textproc/xmlto \
::graphics/ImageMagick \
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/awesome/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo 28 Jul 2010 21:27:28 -0000 1.10
+++ distinfo 10 Sep 2010 13:09:25 -0000
@@ -1,5 +1,5 @@
-MD5 (awesome-3.4.6.tar.bz2) = D2RXUb/OBFGLGS+kHR/NVw==
-RMD160 (awesome-3.4.6.tar.bz2) = rjhxanVjcrOaKwtdWi0cFPIdbnQ=
-SHA1 (awesome-3.4.6.tar.bz2) = SLQOI7Vt56fVH4FTU6pOsu5dqwg=
-SHA256 (awesome-3.4.6.tar.bz2) = 7bvzPXlPdyxZ+a/gSUWw7/uxFl0IHhG1R2F2f2p7XRI=
-SIZE (awesome-3.4.6.tar.bz2) = 736156
+MD5 (awesome-3.4.7.tar.bz2) = qjNQsQug4c24G5cUizHKGQ==
+RMD160 (awesome-3.4.7.tar.bz2) = 3JKXeIjDctY7v9xykZ1iY3M+O9E=
+SHA1 (awesome-3.4.7.tar.bz2) = yOITI9Qzi+mxbhSJD1TK8roXKaw=
+SHA256 (awesome-3.4.7.tar.bz2) = koTdGf5rjSxtvxuqrvZjmYU08H7pWLf1IyiXM1h3GkU=
+SIZE (awesome-3.4.7.tar.bz2) = 740612
Index: patches/patch-awesomeConfig_cmake
===================================================================
RCS file: /cvs/ports/x11/awesome/patches/patch-awesomeConfig_cmake,v
retrieving revision 1.2
diff -u -p -r1.2 patch-awesomeConfig_cmake
--- patches/patch-awesomeConfig_cmake 28 Jul 2010 21:27:28 -0000 1.2
+++ patches/patch-awesomeConfig_cmake 10 Sep 2010 13:09:25 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-awesomeConfig_cmake,v 1.2 2010/07/28 21:27:28 dcoppa Exp $
---- awesomeConfig.cmake.orig Wed Jul 14 08:30:09 2010
-+++ awesomeConfig.cmake Wed Jul 28 22:57:53 2010
+--- awesomeConfig.cmake.orig Wed Aug 25 10:50:48 2010
++++ awesomeConfig.cmake Fri Sep 10 13:47:47 2010
@@ -18,11 +18,11 @@ option(GENERATE_LUADOC "generate luadoc" ON)
link_directories(/usr/local/lib)
@@ -18,7 +18,7 @@ $OpenBSD: patch-awesomeConfig_cmake,v 1.
-Wstrict-prototypes)
# }}}
-@@ -168,6 +168,9 @@ endmacro()
+@@ -166,6 +166,9 @@ endmacro()
# Check for libev
a_find_library(LIB_EV ev)
@@ -28,7 +28,7 @@ $OpenBSD: patch-awesomeConfig_cmake,v 1.
# Error check
if(NOT LUA51_FOUND AND NOT LUA50_FOUND) # This is a workaround to a cmake bug
message(FATAL_ERROR "lua library not found")
-@@ -177,6 +180,7 @@ set(AWESOME_REQUIRED_LIBRARIES
+@@ -175,6 +178,7 @@ set(AWESOME_REQUIRED_LIBRARIES
${AWESOME_COMMON_REQUIRED_LDFLAGS}
${AWESOME_REQUIRED_LIBRARIES}
${LIB_EV}
@@ -36,7 +36,7 @@ $OpenBSD: patch-awesomeConfig_cmake,v 1.
${LUA_LIBRARIES})
set(AWESOME_REQUIRED_INCLUDE_DIRS
-@@ -216,7 +220,7 @@ endif()
+@@ -214,7 +218,7 @@ endif()
if(DEFINED SYSCONFDIR)
set(SYSCONFDIR ${SYSCONFDIR} CACHE PATH "config directory")
else()
@@ -45,7 +45,7 @@ $OpenBSD: patch-awesomeConfig_cmake,v 1.
endif()
#If an XDG Config Dir is specificed, use it instead
-@@ -245,7 +249,7 @@ endif()
+@@ -243,7 +247,7 @@ endif()
if(DEFINED AWESOME_MAN_PATH)
set(AWESOME_MAN_PATH ${AWESOME_MAN_PATH} CACHE PATH "awesome manpage
directory")
else()
Index: patches/patch-globalconf_h
===================================================================
RCS file: /cvs/ports/x11/awesome/patches/patch-globalconf_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-globalconf_h
--- patches/patch-globalconf_h 2 Jun 2010 15:07:50 -0000 1.1
+++ patches/patch-globalconf_h 10 Sep 2010 13:09:25 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-globalconf_h,v 1.1 2010/06/02 15:07:50 dcoppa Exp $
---- globalconf.h.orig Tue Mar 2 16:54:05 2010
-+++ globalconf.h Mon May 10 10:46:57 2010
-@@ -139,5 +139,27 @@ typedef struct
+--- globalconf.h.orig Wed Aug 25 10:50:48 2010
++++ globalconf.h Fri Sep 10 13:47:48 2010
+@@ -137,5 +137,27 @@ typedef struct
extern awesome_t globalconf;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/awesome/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 7 Jun 2010 06:13:56 -0000 1.9
+++ pkg/PLIST 10 Sep 2010 13:09:25 -0000
@@ -182,6 +182,89 @@ share/doc/awesome/AUTHORS
share/doc/awesome/BUGS
share/doc/awesome/LICENSE
share/doc/awesome/README
+share/doc/awesome/luadoc/
+share/doc/awesome/luadoc/awesome.lua
+share/doc/awesome/luadoc/button.lua
+share/doc/awesome/luadoc/client.lua
+share/doc/awesome/luadoc/dbus.lua
+share/doc/awesome/luadoc/image.lua
+share/doc/awesome/luadoc/index.html
+share/doc/awesome/luadoc/key.lua
+share/doc/awesome/luadoc/keygrabber.lua
+share/doc/awesome/luadoc/luadoc.css
+share/doc/awesome/luadoc/modules/
+share/doc/awesome/luadoc/modules/awesome.html
+share/doc/awesome/luadoc/modules/awful.autofocus.html
+share/doc/awesome/luadoc/modules/awful.button.html
+share/doc/awesome/luadoc/modules/awful.client.html
+share/doc/awesome/luadoc/modules/awful.completion.html
+share/doc/awesome/luadoc/modules/awful.dbus.html
+share/doc/awesome/luadoc/modules/awful.hooks.html
+share/doc/awesome/luadoc/modules/awful.html
+share/doc/awesome/luadoc/modules/awful.key.html
+share/doc/awesome/luadoc/modules/awful.layout.html
+share/doc/awesome/luadoc/modules/awful.layout.suit.fair.html
+share/doc/awesome/luadoc/modules/awful.layout.suit.floating.html
+share/doc/awesome/luadoc/modules/awful.layout.suit.html
+share/doc/awesome/luadoc/modules/awful.layout.suit.magnifier.html
+share/doc/awesome/luadoc/modules/awful.layout.suit.max.html
+share/doc/awesome/luadoc/modules/awful.layout.suit.spiral.html
+share/doc/awesome/luadoc/modules/awful.layout.suit.tile.html
+share/doc/awesome/luadoc/modules/awful.menu.html
+share/doc/awesome/luadoc/modules/awful.mouse.finder.html
+share/doc/awesome/luadoc/modules/awful.mouse.html
+share/doc/awesome/luadoc/modules/awful.placement.html
+share/doc/awesome/luadoc/modules/awful.prompt.html
+share/doc/awesome/luadoc/modules/awful.remote.html
+share/doc/awesome/luadoc/modules/awful.rules.html
+share/doc/awesome/luadoc/modules/awful.screen.html
+share/doc/awesome/luadoc/modules/awful.startup_notification.html
+share/doc/awesome/luadoc/modules/awful.tag.html
+share/doc/awesome/luadoc/modules/awful.titlebar.html
+share/doc/awesome/luadoc/modules/awful.tooltip.html
+share/doc/awesome/luadoc/modules/awful.util.html
+share/doc/awesome/luadoc/modules/awful.wibox.html
+share/doc/awesome/luadoc/modules/awful.widget.button.html
+share/doc/awesome/luadoc/modules/awful.widget.common.html
+share/doc/awesome/luadoc/modules/awful.widget.graph.html
+share/doc/awesome/luadoc/modules/awful.widget.html
+share/doc/awesome/luadoc/modules/awful.widget.launcher.html
+share/doc/awesome/luadoc/modules/awful.widget.layout.default.html
+share/doc/awesome/luadoc/modules/awful.widget.layout.horizontal.html
+share/doc/awesome/luadoc/modules/awful.widget.layout.html
+share/doc/awesome/luadoc/modules/awful.widget.layout.vertical.html
+share/doc/awesome/luadoc/modules/awful.widget.layoutbox.html
+share/doc/awesome/luadoc/modules/awful.widget.progressbar.html
+share/doc/awesome/luadoc/modules/awful.widget.prompt.html
+share/doc/awesome/luadoc/modules/awful.widget.taglist.html
+share/doc/awesome/luadoc/modules/awful.widget.tasklist.html
+share/doc/awesome/luadoc/modules/awful.widget.textclock.html
+share/doc/awesome/luadoc/modules/beautiful.html
+share/doc/awesome/luadoc/modules/button.html
+share/doc/awesome/luadoc/modules/client.html
+share/doc/awesome/luadoc/modules/dbus.html
+share/doc/awesome/luadoc/modules/image.html
+share/doc/awesome/luadoc/modules/key.html
+share/doc/awesome/luadoc/modules/keygrabber.html
+share/doc/awesome/luadoc/modules/mouse.html
+share/doc/awesome/luadoc/modules/mousegrabber.html
+share/doc/awesome/luadoc/modules/naughty.html
+share/doc/awesome/luadoc/modules/root.html
+share/doc/awesome/luadoc/modules/screen.html
+share/doc/awesome/luadoc/modules/selection.html
+share/doc/awesome/luadoc/modules/tag.html
+share/doc/awesome/luadoc/modules/timer.html
+share/doc/awesome/luadoc/modules/wibox.html
+share/doc/awesome/luadoc/modules/widget.html
+share/doc/awesome/luadoc/mouse.lua
+share/doc/awesome/luadoc/mousegrabber.lua
+share/doc/awesome/luadoc/root.lua
+share/doc/awesome/luadoc/screen.lua
+share/doc/awesome/luadoc/selection.lua
+share/doc/awesome/luadoc/tag.lua
+share/doc/awesome/luadoc/timer.lua
+share/doc/awesome/luadoc/wibox.lua
+share/doc/awesome/luadoc/widget.lua
share/examples/awesome/
share/examples/awesome/rc.lua
@sample ${SYSCONFDIR}/xdg/
