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

Simplify ; no bump needed

Browse Source
This commit is contained in:
dcoppa 2012-12-31 19:21:45 +00:00
parent 92120f86f5
commit c87bab31e3
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x11/awesome/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.56 2012/12/31 17:41:43 dcoppa Exp $
# $OpenBSD: Makefile,v 1.57 2012/12/31 19:21:45 dcoppa Exp $
COMMENT= highly configurable framework window manager
@ -54,8 +54,8 @@ MODULES= devel/cmake \
devel/gettext \
lang/lua
CONFIGURE_ARGS= -DCOMPRESS_MANPAGES=off
CONFIGURE_ENV= SYSCONFDIR="${SYSCONFDIR}"
CONFIGURE_ARGS= -DCOMPRESS_MANPAGES=off \
-DSYSCONFDIR=${SYSCONFDIR}
SEPARATE_BUILD= No

14
x11/awesome/patches/patch-awesomeConfig_cmake
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-awesomeConfig_cmake,v 1.9 2012/12/31 17:41:44 dcoppa Exp $
$OpenBSD: patch-awesomeConfig_cmake,v 1.10 2012/12/31 19:21:45 dcoppa Exp $
--- awesomeConfig.cmake.orig Mon Dec 24 15:36:05 2012
+++ awesomeConfig.cmake Mon Dec 31 17:18:32 2012
+++ awesomeConfig.cmake Mon Dec 31 19:57:06 2012
@@ -16,12 +16,11 @@ option(COMPRESS_MANPAGES "compress manpages" ON)
option(GENERATE_LUADOC "generate luadoc" ON)
@ -60,15 +60,7 @@ $OpenBSD: patch-awesomeConfig_cmake,v 1.9 2012/12/31 17:41:44 dcoppa Exp $
message(FATAL_ERROR "lua library not found")
endif()
@@ -231,6 +230,7 @@ endif()
# {{{ Install path and configuration variables
#If a sysconfdir is specified, use it instead
#of the default configuration dir.
+set(SYSCONFDIR $ENV{SYSCONFDIR})
if(DEFINED SYSCONFDIR)
set(SYSCONFDIR ${SYSCONFDIR} CACHE PATH "config directory")
else()
@@ -263,7 +263,7 @@ endif()
@@ -263,7 +262,7 @@ endif()
if(DEFINED AWESOME_MAN_PATH)
set(AWESOME_MAN_PATH ${AWESOME_MAN_PATH} CACHE PATH "awesome manpage directory")
else()