openbsd-ports/x11/dmenu/patches/patch-config_mk

$OpenBSD: patch-config_mk,v 1.10 2012/05/01 04:40:03 gsoares Exp $
--- config.mk.orig	Sun Jan  8 10:18:43 2012
+++ config.mk	Tue Apr  3 12:08:37 2012
@@ -2,11 +2,11 @@
 VERSION = 4.5
 
 # paths
-PREFIX = /usr/local
-MANPREFIX = ${PREFIX}/share/man
+#PREFIX = /usr/local
+MANPREFIX = ${PREFIX}/man
 
-X11INC = /usr/X11R6/include
-X11LIB = /usr/X11R6/lib
+X11INC = ${X11BASE}/include
+X11LIB = ${X11BASE}/lib
 
 # Xinerama, comment if you don't want it
 XINERAMALIBS  = -lXinerama
@@ -17,10 +17,10 @@ INCS = -I${X11INC}
 LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS}
 
 # flags
-CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+CPPFLAGS += -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
 #CFLAGS   = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
-CFLAGS   = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS  = -s ${LIBS}
+CFLAGS += ${INCS} ${CPPFLAGS}
+LDFLAGS += ${LIBS}
 
 # compiler and linker
-CC = cc
+CC ?= cc
update to 4.5; (maintainer timeout) * Detects monitor based on input focus, not just pointer location. * Token matching instead of just substrings. * XIM composition support. * Paste from clipboard with C-S-y. * stest(1) replaces lsx(1). * M-[Gghjkl] restored for vi-like navigation. * And a couple of bug fixes. works for Daniel Bolgheroni <dbolgheroni at devio.us>, gonzalo@ (thanks!) OK sthen@ dcoppa@ 2012-05-01 00:40:03 -04:00			$OpenBSD: patch-config_mk,v 1.10 2012/05/01 04:40:03 gsoares Exp $
			`--- config.mk.orig Sun Jan 8 10:18:43 2012`
			`+++ config.mk Tue Apr 3 12:08:37 2012`
update x11/dmenu to 4.4 tweaks/OK sthen@ jim@(MAINTAINER) 2011-08-18 10:13:28 -04:00			`@@ -2,11 +2,11 @@`
update to 4.5; (maintainer timeout) * Detects monitor based on input focus, not just pointer location. * Token matching instead of just substrings. * XIM composition support. * Paste from clipboard with C-S-y. * stest(1) replaces lsx(1). * M-[Gghjkl] restored for vi-like navigation. * And a couple of bug fixes. works for Daniel Bolgheroni <dbolgheroni at devio.us>, gonzalo@ (thanks!) OK sthen@ dcoppa@ 2012-05-01 00:40:03 -04:00			`VERSION = 4.5`
import dmenu-2.1 Dynamic menu for X11. Displays items read from stdin and returns the selected item on stdout. from Tobias Ulmer, also tested by Will Maier 2007-01-19 16:38:40 -05:00
			`# paths`
			`-PREFIX = /usr/local`
			`-MANPREFIX = ${PREFIX}/share/man`
			`+#PREFIX = /usr/local`
			`+MANPREFIX = ${PREFIX}/man`

			`-X11INC = /usr/X11R6/include`
			`-X11LIB = /usr/X11R6/lib`
			`+X11INC = ${X11BASE}/include`
			`+X11LIB = ${X11BASE}/lib`

Update to 3.7 Jim Razmus takes maintainership (suggested by old MAINTAINER, Tobias Ulmer) ok sthen@ 2008-07-02 16:44:45 -04:00			`# Xinerama, comment if you don't want it`
update x11/dmenu to 4.4 tweaks/OK sthen@ jim@(MAINTAINER) 2011-08-18 10:13:28 -04:00			`XINERAMALIBS = -lXinerama`
update to 4.5; (maintainer timeout) * Detects monitor based on input focus, not just pointer location. * Token matching instead of just substrings. * XIM composition support. * Paste from clipboard with C-S-y. * stest(1) replaces lsx(1). * M-[Gghjkl] restored for vi-like navigation. * And a couple of bug fixes. works for Daniel Bolgheroni <dbolgheroni at devio.us>, gonzalo@ (thanks!) OK sthen@ dcoppa@ 2012-05-01 00:40:03 -04:00			`@@ -17,10 +17,10 @@ INCS = -I${X11INC}`
update x11/dmenu to 4.4 tweaks/OK sthen@ jim@(MAINTAINER) 2011-08-18 10:13:28 -04:00			`LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS}`
import dmenu-2.1 Dynamic menu for X11. Displays items read from stdin and returns the selected item on stdout. from Tobias Ulmer, also tested by Will Maier 2007-01-19 16:38:40 -05:00
			`# flags`
update to 4.5; (maintainer timeout) * Detects monitor based on input focus, not just pointer location. * Token matching instead of just substrings. * XIM composition support. * Paste from clipboard with C-S-y. * stest(1) replaces lsx(1). * M-[Gghjkl] restored for vi-like navigation. * And a couple of bug fixes. works for Daniel Bolgheroni <dbolgheroni at devio.us>, gonzalo@ (thanks!) OK sthen@ dcoppa@ 2012-05-01 00:40:03 -04:00			`-CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}`
Update to 3.7 Jim Razmus takes maintainership (suggested by old MAINTAINER, Tobias Ulmer) ok sthen@ 2008-07-02 16:44:45 -04:00			`+CPPFLAGS += -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}`
update to 4.5; (maintainer timeout) * Detects monitor based on input focus, not just pointer location. * Token matching instead of just substrings. * XIM composition support. * Paste from clipboard with C-S-y. * stest(1) replaces lsx(1). * M-[Gghjkl] restored for vi-like navigation. * And a couple of bug fixes. works for Daniel Bolgheroni <dbolgheroni at devio.us>, gonzalo@ (thanks!) OK sthen@ dcoppa@ 2012-05-01 00:40:03 -04:00			`#CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}`
			`-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}`
			`-LDFLAGS = -s ${LIBS}`
Update to 3.7 Jim Razmus takes maintainership (suggested by old MAINTAINER, Tobias Ulmer) ok sthen@ 2008-07-02 16:44:45 -04:00			`+CFLAGS += ${INCS} ${CPPFLAGS}`
			`+LDFLAGS += ${LIBS}`
import dmenu-2.1 Dynamic menu for X11. Displays items read from stdin and returns the selected item on stdout. from Tobias Ulmer, also tested by Will Maier 2007-01-19 16:38:40 -05:00
			`# compiler and linker`
			`-CC = cc`
update x11/dmenu to 4.4 tweaks/OK sthen@ jim@(MAINTAINER) 2011-08-18 10:13:28 -04:00			`+CC ?= cc`