cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Again, do not install foreign language man pages: too many mandoc

Browse Source 
errors with letters containing diacritics.

Zap USE_GROFF.
This commit is contained in:
dcoppa 2011-05-17 14:03:30 +00:00
parent 3cc007d382
commit 75daded68d
3 changed files with 130 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/awesome/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.34 2011/05/17 11:30:54 dcoppa Exp $
# $OpenBSD: Makefile,v 1.35 2011/05/17 14:03:30 dcoppa Exp $
COMMENT= fast, small, dynamic and awesome window manager
DISTNAME= awesome-3.4.10
REVISION= 0
EXTRACT_SUFX= .tar.bz2
CATEGORIES= x11
@ -56,8 +57,6 @@ CONFIGURE_STYLE= cmake
CONFIGURE_ARGS= -DCOMPRESS_MANPAGES=off
USE_GROFF = Yes
NO_REGRESS= Yes
pre-install:

137
x11/awesome/patches/patch-CMakeLists_txt
View File

@ -1,12 +1,129 @@
$OpenBSD: patch-CMakeLists_txt,v 1.8 2011/05/17 11:30:54 dcoppa Exp $
--- CMakeLists.txt.orig Tue May 17 12:21:10 2011
+++ CMakeLists.txt Tue May 17 12:22:03 2011
@@ -215,7 +215,7 @@ if(GENERATE_MANPAGES)
DEPENDS ${txtfile}
VERBATIM)
$OpenBSD: patch-CMakeLists_txt,v 1.9 2011/05/17 14:03:30 dcoppa Exp $
--- CMakeLists.txt.orig Mon May 16 16:35:17 2011
+++ CMakeLists.txt Tue May 17 14:22:25 2011
@@ -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})
- 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}
+ COMMAND ${XMLTO_EXECUTABLE} --skip-validation man ${xmlfile}
OUTPUT ${manfile}
WORKING_DIRECTORY ${BUILD_DIR}/${relpath2}
DEPENDS ${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})
@@ -331,13 +307,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|txt|[0-9])$")
- else()
- set(regex "\\.(xml|txt|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}

23
x11/awesome/pkg/PLIST
View File

@ -1,28 +1,7 @@
@comment $OpenBSD: PLIST,v 1.11 2011/01/15 22:20:32 dcoppa Exp $
@comment $OpenBSD: PLIST,v 1.12 2011/05/17 14:03:30 dcoppa Exp $
@bin bin/awesome
bin/awesome-client
bin/awsetbg
man/de/
man/de/man1/
@man man/de/man1/awesome-client.1
@man man/de/man1/awesome.1
@man man/de/man1/awsetbg.1
man/de/man5/
@man man/de/man5/awesomerc.5
man/es/
man/es/man1/
@man man/es/man1/awesome-client.1
@man man/es/man1/awesome.1
@man man/es/man1/awsetbg.1
man/es/man5/
@man man/es/man5/awesomerc.5
man/fr/
man/fr/man1/
@man man/fr/man1/awesome-client.1
@man man/fr/man1/awesome.1
@man man/fr/man1/awsetbg.1
man/fr/man5/
@man man/fr/man5/awesomerc.5
@man man/man1/awesome-client.1
@man man/man1/awesome.1
@man man/man1/awsetbg.1