From owner-svn-ports-all@freebsd.org Mon Dec 7 05:00:59 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 341529A0B9E; Mon, 7 Dec 2015 05:00:59 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D7F1C1572; Mon, 7 Dec 2015 05:00:58 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB750v5c097741; Mon, 7 Dec 2015 05:00:57 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB750vXT097739; Mon, 7 Dec 2015 05:00:57 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201512070500.tB750vXT097739@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 7 Dec 2015 05:00:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403180 - in head/x11-wm/dwm: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Dec 2015 05:00:59 -0000 Author: jbeich Date: Mon Dec 7 05:00:57 2015 New Revision: 403180 URL: https://svnweb.freebsd.org/changeset/ports/403180 Log: x11-wm/dwm: simplify patching Override variables instead of trying to fix them, sometimes incorrectly. PR: 204658 Approved by: portmgr blanket Deleted: head/x11-wm/dwm/files/patch-Makefile Modified: head/x11-wm/dwm/Makefile (contents, props changed) head/x11-wm/dwm/files/patch-config.mk (contents, props changed) Modified: head/x11-wm/dwm/Makefile ============================================================================== --- head/x11-wm/dwm/Makefile Mon Dec 7 04:59:36 2015 (r403179) +++ head/x11-wm/dwm/Makefile Mon Dec 7 05:00:57 2015 (r403180) @@ -20,8 +20,11 @@ OPTIONS_DEFINE= XINERAMA DOCS OPTIONS_DEFAULT=XINERAMA XINERAMA_USE= XORG=xinerama +XINERAMA_MAKE_ARGS_OFF= XINERAMAFLAGS= XINERAMALIBS= USE_XORG= x11 xft +MAKE_ARGS= CC="${CC}" PREFIX="${PREFIX}" MANPREFIX="${MANPREFIX}/man" \ + X11INC="${LOCALBASE}/include" X11LIB="${LOCALBASE}/lib" PLIST_FILES= bin/dwm \ man/man1/dwm.1.gz @@ -38,16 +41,6 @@ post-extract: ${CP} "${DWM_CONF}" ${WRKSRC}/config.h; \ fi -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 - post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} Modified: head/x11-wm/dwm/files/patch-config.mk ============================================================================== --- head/x11-wm/dwm/files/patch-config.mk Mon Dec 7 04:59:36 2015 (r403179) +++ head/x11-wm/dwm/files/patch-config.mk Mon Dec 7 05:00:57 2015 (r403180) @@ -1,22 +1,6 @@ --- config.mk.orig 2015-11-08 22:39:37 UTC +++ config.mk -@@ -4,11 +4,11 @@ VERSION = 6.1 - # Customize below to fit your system - - # 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 -@@ -25,14 +25,14 @@ INCS = -I${X11INC} -I${FREETYPEINC} +@@ -25,10 +25,10 @@ INCS = -I${X11INC} -I${FREETYPEINC} LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} # flags @@ -31,8 +15,3 @@ # Solaris #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" - #LDFLAGS = ${LIBS} - - # compiler and linker --CC = cc -+CC?= cc