Hi,
awesome 3.4.5 was released on 10th May 2010.
Among other things, they added manual pages in german, spanish and
french.
Don't know why, but asciidoc fails with these, with the following
error:
[ 61%] Generating manpages/es/man1/awesome.1.xml
cd /usr/ports/pobj/awesome-3.4.5/awesome-3.4.5/manpages/es/man1 &&
/usr/local/bin/asciidoc -d manpage -b docbook -o
/usr/ports/pobj/awesome-3.4.5/awesome-3.4.5/manpages/es/man1/awesome.1.xml - <
/usr/ports/pobj/awesome-3.4.5/awesome-3.4.5/manpages/awesome.1.es.txt
ERROR: <stdin>: line 5: first section must be named NAME
ERROR: <stdin>: line 10: second section must be named SYNOPSIS
*** Error code 1
Stop in /usr/ports/pobj/awesome-3.4.5/awesome-3.4.5 (line 243 of
CMakeFiles/man.dir/build.make).
*** Error code 1
Can anyone with more experience shred me some light?
Btw, this is the diff with non-english manpages removed:
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/awesome/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile 2 Jun 2010 15:07:50 -0000 1.13
+++ Makefile 2 Jun 2010 20:49:57 -0000
@@ -2,7 +2,7 @@
COMMENT= fast, small, dynamic and awesome window manager
-DISTNAME= awesome-3.4.4
+DISTNAME= awesome-3.4.5
EXTRACT_SUFX= .tar.bz2
CATEGORIES= x11
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/awesome/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 2 Jun 2010 15:07:50 -0000 1.8
+++ distinfo 2 Jun 2010 20:49:57 -0000
@@ -1,5 +1,5 @@
-MD5 (awesome-3.4.4.tar.bz2) = jCU3rYmNf1ig87qS5qVhoQ==
-RMD160 (awesome-3.4.4.tar.bz2) = f/V6J+9ps1EE3Sx1Oq9lFm4Qh6A=
-SHA1 (awesome-3.4.4.tar.bz2) = kjNVsuNDIMQmX7pJBqW5I4abiKY=
-SHA256 (awesome-3.4.4.tar.bz2) = H+Q0bZHrYGRWKT9b1yOc5muMXCIyhIYA//ryZPO2mfM=
-SIZE (awesome-3.4.4.tar.bz2) = 271404
+MD5 (awesome-3.4.5.tar.bz2) = ffXOyC1pv3LTjIr4EWUS6Q==
+RMD160 (awesome-3.4.5.tar.bz2) = DRgFQkmXP56vJDwmYfMA+I1FQps=
+SHA1 (awesome-3.4.5.tar.bz2) = sGm8HLhl2hQEmZwPOqT8b/nheeQ=
+SHA256 (awesome-3.4.5.tar.bz2) = 1XeoGJvVoHyBHwX5tawD2VtQFuRO2rxBtkJFt2qwIl4=
+SIZE (awesome-3.4.5.tar.bz2) = 738222
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/x11/awesome/patches/patch-CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -r1.1 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 2 Jun 2010 15:07:50 -0000 1.1
+++ patches/patch-CMakeLists_txt 2 Jun 2010 20:49:57 -0000
@@ -1,12 +1,129 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1 2010/06/02 15:07:50 dcoppa Exp $
---- CMakeLists.txt.orig Mon May 10 10:46:04 2010
-+++ CMakeLists.txt Mon May 10 10:46:23 2010
-@@ -185,7 +185,7 @@ if(GENERATE_MANPAGES)
- DEPENDS ${txtfile}
- VERBATIM)
- add_custom_command(
-- COMMAND ${XMLTO_EXECUTABLE} man ${xmlfile}
+--- CMakeLists.txt.orig Mon May 10 14:39:57 2010
++++ CMakeLists.txt Wed Jun 2 22:40:50 2010
+@@ -88,7 +88,6 @@ set(AWE_MAN_SRCS
+ ${SOURCE_DIR}/manpages/awsetbg.1.txt
+ ${SOURCE_DIR}/manpages/awesome-client.1.txt
+ ${SOURCE_DIR}/manpages/awesomerc.5.txt)
+-set(AWE_MAN_LANGS es fr de)
+
+ add_executable(${PROJECT_AWE_NAME}
+ ${AWE_SRCS}
+@@ -172,68 +171,45 @@ if(GENERATE_MANPAGES)
+ if(NOT BUILD_DIR STREQUAL SOURCE_DIR)
+ file(MAKE_DIRECTORY ${BUILD_DIR}/manpages)
+ endif()
++ foreach(txtfile ${AWE_MAN_SRCS})
++ string(REGEX REPLACE ".txt\$" ".xml" xmlfile ${txtfile})
++ string(REPLACE ${SOURCE_DIR}
++ ${BUILD_DIR} xmlfile ${xmlfile})
++ string(REGEX REPLACE ".xml\$" ".gz" gzfile ${xmlfile})
++ string(REGEX REPLACE ".gz\$" "" manfile ${gzfile})
+
+- # add the default translation to the list of languages
+- set(AWE_MAN_LANGS default ${AWE_MAN_LANGS})
++ add_custom_command(
++ COMMAND ${ASCIIDOC_EXECUTABLE} -d manpage -b docbook -o
${xmlfile} - < ${txtfile}
++ WORKING_DIRECTORY ${BUILD_DIR}/manpages
++ OUTPUT ${xmlfile}
++ DEPENDS ${txtfile}
++ VERBATIM)
++ add_custom_command(
+ COMMAND ${XMLTO_EXECUTABLE} --skip-validation man ${xmlfile}
- OUTPUT ${manfile}
- WORKING_DIRECTORY ${BUILD_DIR}/manpages
- DEPENDS ${xmlfile})
++ OUTPUT ${manfile}
++ WORKING_DIRECTORY ${BUILD_DIR}/manpages
++ DEPENDS ${xmlfile})
+
+- foreach(lang ${AWE_MAN_LANGS})
+-
+- foreach(txtfile ${AWE_MAN_SRCS})
+- # figure the base name of the file (ie "awesome.1")
+- GET_FILENAME_COMPONENT(tmpname ${txtfile} NAME)
+- string(REGEX REPLACE ".txt\$" "" basename ${tmpname})
+-
+- # figure the relative path of the file
+- GET_FILENAME_COMPONENT(tmppath ${txtfile} PATH)
+- string(REPLACE ${SOURCE_DIR}/ "" relpath ${tmppath})
+-
+- # figure the manpage section to install to from filename
+- string(REGEX REPLACE "^.*\\.([0-9])$" "\\1" section ${basename})
+-
+- # construct the language specific versions of the basename and
path
+- if (lang STREQUAL default)
+- set(basename2 ${basename})
+- set(relpath2 ${relpath}/man${section})
+- else()
+- set(basename2 ${basename}.${lang})
+- set(relpath2 ${relpath}/${lang}/man${section})
+- endif()
+-
+- # create the build directory (if it does not exist)
+- file(MAKE_DIRECTORY ${BUILD_DIR}/${relpath2})
+-
+- # set the final filenames
+- set(txtfile ${SOURCE_DIR}/${relpath}/${basename2}.txt)
+- set(xmlfile ${BUILD_DIR}/${relpath2}/${basename}.xml)
+- set(gzfile ${BUILD_DIR}/${relpath2}/${basename}.gz)
+- set(manfile ${BUILD_DIR}/${relpath2}/${basename})
+-
++ if(COMPRESS_MANPAGES)
+ add_custom_command(
+- COMMAND ${ASCIIDOC_EXECUTABLE} -d manpage -b docbook -o
${xmlfile} - < ${txtfile}
+- WORKING_DIRECTORY ${BUILD_DIR}/${relpath2}
+- OUTPUT ${xmlfile}
+- DEPENDS ${txtfile}
++ COMMAND ${GZIP_EXECUTABLE} < ${manfile} > ${gzfile}
++ OUTPUT ${gzfile}
++ WORKING_DIRECTORY ${BUILD_DIR}/manpages
++ DEPENDS ${manfile}
+ VERBATIM)
+- add_custom_command(
+- COMMAND ${XMLTO_EXECUTABLE} man ${xmlfile}
+- OUTPUT ${manfile}
+- WORKING_DIRECTORY ${BUILD_DIR}/${relpath2}
+- DEPENDS ${xmlfile})
+
+- if(COMPRESS_MANPAGES)
+- add_custom_command(
+- COMMAND ${GZIP_EXECUTABLE} < ${manfile} > ${gzfile}
+- OUTPUT ${gzfile}
+- WORKING_DIRECTORY ${BUILD_DIR}/${relpath2}
+- DEPENDS ${manfile}
+- VERBATIM)
++ set(MAN_FILES ${MAN_FILES} ${gzfile})
++ else()
++ set(MAN_FILES ${MAN_FILES} ${manfile})
++ endif()
+
+- set(MAN_FILES ${MAN_FILES} ${gzfile})
+- else()
+- set(MAN_FILES ${MAN_FILES} ${manfile})
+- endif()
+- endforeach()
+-
++ # figure out in what section to install to from filename
++ string(REGEX REPLACE "^.*\\.([0-9])\\.gz\$" "\\1" section ${gzfile})
++ if(COMPRESS_MANPAGES)
++ set(AWE_MAN${section}_FILES ${AWE_MAN${section}_FILES} ${gzfile})
++ else()
++ set(AWE_MAN${section}_FILES ${AWE_MAN${section}_FILES} ${manfile})
++ endif()
+ endforeach()
+
+ add_custom_target(man ALL DEPENDS ${MAN_FILES})
+@@ -329,13 +305,8 @@ install(DIRECTORY ${BUILD_DIR}/lib DESTINATION ${AWESO
+ install(FILES ${AWE_CONF_FILE_DEFAULT} DESTINATION ${AWESOME_SYSCONFDIR}
+ RENAME ${AWE_CONF_FILE})
+ if(GENERATE_MANPAGES)
+- if(COMPRESS_MANPAGES)
+- set(regex "\\.(xml|[0-9])$")
+- else()
+- set(regex "\\.(xml|gz)$")
+- endif()
+- install(DIRECTORY ${BUILD_DIR}/${relpath}/ DESTINATION ${AWESOME_MAN_PATH}
+- REGEX ${regex} EXCLUDE )
++ install(FILES ${AWE_MAN1_FILES} DESTINATION ${AWESOME_MAN_PATH}/man1)
++ install(FILES ${AWE_MAN5_FILES} DESTINATION ${AWESOME_MAN_PATH}/man5)
+ endif()
+ install(DIRECTORY ${AWE_ICON_DIR} DESTINATION ${AWESOME_DATA_PATH})
+ install(DIRECTORY ${BUILD_DIR}/themes DESTINATION ${AWESOME_DATA_PATH}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/awesome/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 2 Jun 2010 15:07:50 -0000 1.7
+++ pkg/PLIST 2 Jun 2010 20:49:57 -0000
@@ -68,7 +68,9 @@ share/awesome/lib/beautiful.lua
share/awesome/lib/naughty.lua
share/awesome/themes/
share/awesome/themes/default/
+share/awesome/themes/default/README
share/awesome/themes/default/background.png
+share/awesome/themes/default/background_white.png
share/awesome/themes/default/layouts/
share/awesome/themes/default/layouts/dwindle.png
share/awesome/themes/default/layouts/dwindlew.png
