Attachment 163289 Details for Bug 204658 – cleanup part2 (simplify patching)

[patch] cleanup part2 (simplify patching)

simplify-patching.diff (text/plain), 3.71 KB, created by Jan Beich on 2015-11-18 12:22:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2015-11-18 12:22:02 UTC

Size: 3.71 KB

patch

obsolete

>commit 2b94fe7
>Author: Jan Beich <jbeich@FreeBSD.org>
>Date:   Wed Nov 18 09:59:55 2015 +0000
>
>    x11-wm/dwm: simplify patching
>    
>    Override variables instead of trying to fix them, sometimes incorrectly.
>---
> x11-wm/dwm/Makefile              | 13 +++----------
> x11-wm/dwm/files/patch-Makefile  | 24 ------------------------
> x11-wm/dwm/files/patch-config.mk | 23 +----------------------
> 3 files changed, 4 insertions(+), 56 deletions(-)
>
>diff --git a/x11-wm/dwm/Makefile b/x11-wm/dwm/Makefile
>index 996e753..3c9a6c9 100644
>--- a/x11-wm/dwm/Makefile
>+++ b/x11-wm/dwm/Makefile
>@@ -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}
>diff --git a/x11-wm/dwm/files/patch-Makefile b/x11-wm/dwm/files/patch-Makefile
>deleted file mode 100644
>index 3c86095..0000000
>--- a/x11-wm/dwm/files/patch-Makefile
>+++ /dev/null
>@@ -1,24 +0,0 @@
>---- Makefile.orig	2011-03-25 12:53:10.000000000 +0100
>-+++ Makefile	2011-03-25 12:53:19.000000000 +0100
>-@@ -46,15 +46,15 @@
>- 	@mkdir -p ${DESTDIR}${PREFIX}/bin
>- 	@cp -f dwm ${DESTDIR}${PREFIX}/bin
>- 	@chmod 755 ${DESTDIR}${PREFIX}/bin/dwm
>--	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
>--	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
>--	@sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1
>--	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1
>-+	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man/man1
>-+	@mkdir -p ${DESTDIR}${MANPREFIX}/man/man1
>-+	@sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man/man1/dwm.1
>-+	@chmod 644 ${DESTDIR}${MANPREFIX}/man/man1/dwm.1
>- 
>- uninstall:
>- 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
>- 	@rm -f ${DESTDIR}${PREFIX}/bin/dwm
>--	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
>--	@rm -f ${DESTDIR}${MANPREFIX}/man1/dwm.1
>-+	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man/man1
>-+	@rm -f ${DESTDIR}${MANPREFIX}/man/man1/dwm.1
>- 
>- .PHONY: all options clean dist install uninstall
>diff --git a/x11-wm/dwm/files/patch-config.mk b/x11-wm/dwm/files/patch-config.mk
>index 3bb35d4..ef1fe21 100644
>--- a/x11-wm/dwm/files/patch-config.mk
>+++ b/x11-wm/dwm/files/patch-config.mk
>@@ -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

Actions: View | Diff

Attachments on bug 204658: 163287 | 163288 | 163289 | 163290