svn commit: r403655 - in head/x11/dmenu: . files
Jan Beich
jbeich at FreeBSD.org
Sun Dec 13 06:04:17 UTC 2015
Author: jbeich
Date: Sun Dec 13 06:04:15 2015
New Revision: 403655
URL: https://svnweb.freebsd.org/changeset/ports/403655
Log:
x11/dmenu: simplify patching (like r403180)
Override variables instead of trying to fix them, sometimes incorrectly.
PR: 205236
Approved by: portmgr blanket
Deleted:
head/x11/dmenu/files/patch-Makefile
Modified:
head/x11/dmenu/Makefile (contents, props changed)
head/x11/dmenu/files/patch-config.mk (contents, props changed)
Modified: head/x11/dmenu/Makefile
==============================================================================
--- head/x11/dmenu/Makefile Sun Dec 13 06:03:51 2015 (r403654)
+++ head/x11/dmenu/Makefile Sun Dec 13 06:04:15 2015 (r403655)
@@ -23,21 +23,14 @@ OPTIONS_DEFINE= XINERAMA
OPTIONS_DEFAULT= XINERAMA
USE_XORG= x11 xft
+MAKE_ARGS= CC="${CC}" PREFIX="${PREFIX}" MANPREFIX="${MANPREFIX}/man" \
+ X11INC="${LOCALBASE}/include" X11LIB="${LOCALBASE}/lib"
PLIST_FILES= bin/dmenu bin/dmenu_path bin/dmenu_run bin/stest \
man/man1/dmenu.1.gz man/man1/stest.1.gz
XINERAMA_USE= XORG=xinerama
-
-post-patch:
- @${GREP} -Rl '%%[[:alpha:]]\+%%' ${WRKSRC}|${XARGS} ${REINPLACE_CMD} \
- -e "s,%%PREFIX%%,${PREFIX},g" \
- -e "s,%%LOCALBASE%%,${LOCALBASE},g" \
- -e "s,%%MANPREFIX%%,${MANPREFIX},g"
-
-post-patch-XINERAMA-off:
- @${REINPLACE_CMD} -e 's,$${XINERAMALIBS},,g' \
- -e 's,$${XINERAMAFLAGS},,g' ${WRKSRC}/config.mk
+XINERAMA_MAKE_ARGS_OFF= XINERAMAFLAGS= XINERAMALIBS=
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/dmenu \
Modified: head/x11/dmenu/files/patch-config.mk
==============================================================================
--- head/x11/dmenu/files/patch-config.mk Sun Dec 13 06:03:51 2015 (r403654)
+++ head/x11/dmenu/files/patch-config.mk Sun Dec 13 06:04:15 2015 (r403655)
@@ -1,21 +1,5 @@
--- config.mk.orig 2015-11-08 22:42:21 UTC
+++ config.mk
-@@ -2,11 +2,11 @@
- VERSION = 4.6
-
- # paths
--PREFIX = /usr/local
--MANPREFIX = ${PREFIX}/share/man
-+PREFIX = %%PREFIX%%
-+MANPREFIX = %%MANPREFIX%%
-
--X11INC = /usr/X11R6/include
--X11LIB = /usr/X11R6/lib
-+X11INC = %%LOCALBASE%%/include
-+X11LIB = %%LOCALBASE%%/lib
-
- # Xinerama, comment if you don't want it
- XINERAMALIBS = -lXinerama
@@ -23,9 +23,9 @@ INCS = -I${X11INC} -I${FREETYPEINC}
LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
@@ -28,5 +12,4 @@
+LDFLAGS += ${LIBS}
# compiler and linker
--CC = cc
-+CC?= cc
+ CC = cc
More information about the svn-ports-head
mailing list