Attachment #163289 for bug #204658

View | Details | Raw Unified | Return to bug 204658 | Differences between
Collapse All | Expand All




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

		${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}




--- 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




--- config.mk.orig	2015-11-08 22:39:37 UTC
+++ config.mk
@@ -25,10 +25,10 @@ INCS = -I${X11INC} -I${FREETYPEINC}
 # 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}
 LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
 
 # flags

 
 # Solaris
 #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
 #LDFLAGS = ${LIBS}
 
 # compiler and linker
-CC = cc
+CC?= cc

Return to bug 204658

Lines 20-27 OPTIONS_DEFINE= XINERAMA DOCS Link Here

(-)b/x11-wm/dwm/Makefile (-10 / +3 lines)
20	OPTIONS_DEFAULT=XINERAMA	20	OPTIONS_DEFAULT=XINERAMA
21		21
22	XINERAMA_USE= XORG=xinerama	22	XINERAMA_USE= XORG=xinerama
		23	XINERAMA_MAKE_ARGS_OFF= XINERAMAFLAGS= XINERAMALIBS=
23		24
24	USE_XORG= x11 xft	25	USE_XORG= x11 xft
		26	MAKE_ARGS= CC="${CC}" PREFIX="${PREFIX}" MANPREFIX="${MANPREFIX}/man" \
		27	X11INC="${LOCALBASE}/include" X11LIB="${LOCALBASE}/lib"
25		28
26	PLIST_FILES= bin/dwm \	29	PLIST_FILES= bin/dwm \
27	man/man1/dwm.1.gz	30	man/man1/dwm.1.gz
Lines 38-53 post-extract: Link Here
38	${CP} "${DWM_CONF}" ${WRKSRC}/config.h; \	41	${CP} "${DWM_CONF}" ${WRKSRC}/config.h; \
39	fi	42	fi
40		43
41	post-patch:
42	@${GREP} -Rl '%%[[:alpha:]]\+%%' ${WRKSRC}\|${XARGS} ${REINPLACE_CMD} \
43	-e "s,%%PREFIX%%,${PREFIX},g" \
44	-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
45	-e "s,%%MANPREFIX%%,${MANPREFIX},g"
46
47	post-patch-XINERAMA-off:
48	@${REINPLACE_CMD} -e 's,$${XINERAMALIBS},,g' \
49	-e 's,$${XINERAMAFLAGS},,g' ${WRKSRC}/config.mk
50
51	post-install:	44	post-install:
52	@${MKDIR} ${STAGEDIR}${DOCSDIR}	45	@${MKDIR} ${STAGEDIR}${DOCSDIR}
53	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}	46	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}

Removed Link Here

(-)a/x11-wm/dwm/files/patch-Makefile (-24 lines)
1	--- Makefile.orig 2011-03-25 12:53:10.000000000 +0100
2	+++ Makefile 2011-03-25 12:53:19.000000000 +0100
3	@@ -46,15 +46,15 @@
4	@mkdir -p ${DESTDIR}${PREFIX}/bin
5	@cp -f dwm ${DESTDIR}${PREFIX}/bin
6	@chmod 755 ${DESTDIR}${PREFIX}/bin/dwm
7	- @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
8	- @mkdir -p ${DESTDIR}${MANPREFIX}/man1
9	- @sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1
10	- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1
11	+ @echo installing manual page to ${DESTDIR}${MANPREFIX}/man/man1
12	+ @mkdir -p ${DESTDIR}${MANPREFIX}/man/man1
13	+ @sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man/man1/dwm.1
14	+ @chmod 644 ${DESTDIR}${MANPREFIX}/man/man1/dwm.1
15
16	uninstall:
17	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
18	@rm -f ${DESTDIR}${PREFIX}/bin/dwm
19	- @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
20	- @rm -f ${DESTDIR}${MANPREFIX}/man1/dwm.1
21	+ @echo removing manual page from ${DESTDIR}${MANPREFIX}/man/man1
22	+ @rm -f ${DESTDIR}${MANPREFIX}/man/man1/dwm.1
23
24	.PHONY: all options clean dist install uninstall

Lines 1-22 Link Here

(-)b/x11-wm/dwm/files/patch-config.mk (-22 / +1 lines)
1	--- config.mk.orig 2015-11-08 22:39:37 UTC	1	--- config.mk.orig 2015-11-08 22:39:37 UTC
2	+++ config.mk	2	+++ config.mk
3	@@ -4,11 +4,11 @@ VERSION = 6.1	3	@@ -25,10 +25,10 @@ INCS = -I${X11INC} -I${FREETYPEINC}
4	# Customize below to fit your system
5
6	# paths
7	-PREFIX = /usr/local
8	-MANPREFIX = ${PREFIX}/share/man
9	+PREFIX = %%PREFIX%%
10	+MANPREFIX = %%MANPREFIX%%
11
12	-X11INC = /usr/X11R6/include
13	-X11LIB = /usr/X11R6/lib
14	+X11INC = %%LOCALBASE%%/include
15	+X11LIB = %%LOCALBASE%%/lib
16
17	# Xinerama, comment if you don't want it
18	XINERAMALIBS = -lXinerama
19	@@ -25,14 +25,14 @@ INCS = -I${X11INC} -I${FREETYPEINC}
20	LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}	4	LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
21		5
22	# flags	6	# flags
Lines 31-38 Link Here
31		15
32	# Solaris	16	# Solaris
33	#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"	17	#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
34	#LDFLAGS = ${LIBS}
35
36	# compiler and linker
37	-CC = cc
38	+CC?= cc