Attachment #88085 for bug #124832

View | Details | Raw Unified | Return to bug 124832
Collapse All | Expand All




#

PORTNAME=	dwm
PORTVERSION=	5.0.1
CATEGORIES=	x11-wm
MASTER_SITES=	http://www.suckless.org/download/ \
		http://schot.a-eskwadraat.nl/files/


RUN_DEPENDS=	dmenu:${PORTSDIR}/x11/dmenu

USE_XORG=	x11 xinerama

MAN1=		dwm.1
PLIST_FILES=	bin/dwm

pre-everything::
	@${ECHO_MSG} "You can build dwm with your own config.h using the DWM_CONF knob:"
	@${ECHO_MSG} "make DWM_CONF=/path/to/dwm/config.h install clean"
	@${ECHO_MSG} "Note: Pre-5.0 config.h-files no longer work."

post-extract:
.if defined(DWM_CONF)

Lines 1-3 Link Here

(-)dwm/distinfo (-3 / +3 lines)
1	MD5 (dwm-4.9.tar.gz) = cf72c6a72e6c35c132b5db4faf3fb358	1	MD5 (dwm-5.0.1.tar.gz) = 27d91d886c9ba1aad4b09178e2653ee0
2	SHA256 (dwm-4.9.tar.gz) = 3f4f595e7845cedce1696668adf0a8ade2fc8a72d4c32d53de35a7c5d900790d	2	SHA256 (dwm-5.0.1.tar.gz) = f39e2b62d75b79489c535dc3cfcd6ea2b9c412857448519f29a4eed7af2f33a3
3	SIZE (dwm-4.9.tar.gz) = 18132	3	SIZE (dwm-5.0.1.tar.gz) = 17954




--- config.mk.orig	2008-06-18 23:08:29.000000000 +0200
+++ config.mk	2008-06-20 10:39:37.000000000 +0200
@@ -4,11 +4,11 @@
 # Customize below to fit your system
 
 # paths

+X11INC = $(LOCALBASE)/include
+X11LIB = $(LOCALBASE)/lib
 
 # Xinerama, comment if you don't want it
 XINERAMALIBS = -L${X11LIB} -lXinerama
@@ -19,9 +19,9 @@
 LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS}
 
 # flags
-CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS = -s ${LIBS}
+CPPFLAGS+= -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+CFLAGS+= ${INCS} ${CPPFLAGS}
+LDFLAGS+= ${LIBS}
 #CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
 #LDFLAGS = -g ${LIBS}
 
 # Solaris
 #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
 
 # compiler and linker
-CC = cc
+CC?= cc

Return to bug 124832

Lines 6-12 Link Here

(-)dwm/Makefile (-3 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= dwm	8	PORTNAME= dwm
9	PORTVERSION= 4.9	9	PORTVERSION= 5.0.1
10	CATEGORIES= x11-wm	10	CATEGORIES= x11-wm
11	MASTER_SITES= http://www.suckless.org/download/ \	11	MASTER_SITES= http://www.suckless.org/download/ \
12	http://schot.a-eskwadraat.nl/files/	12	http://schot.a-eskwadraat.nl/files/
Lines 16-22 Link Here
16		16
17	RUN_DEPENDS= dmenu:${PORTSDIR}/x11/dmenu	17	RUN_DEPENDS= dmenu:${PORTSDIR}/x11/dmenu
18		18
19	USE_XORG= x11	19	USE_XORG= x11 xinerama
20		20
21	MAN1= dwm.1	21	MAN1= dwm.1
22	PLIST_FILES= bin/dwm	22	PLIST_FILES= bin/dwm
Lines 25-31 Link Here
25	pre-everything::	25	pre-everything::
26	@${ECHO_MSG} "You can build dwm with your own config.h using the DWM_CONF knob:"	26	@${ECHO_MSG} "You can build dwm with your own config.h using the DWM_CONF knob:"
27	@${ECHO_MSG} "make DWM_CONF=/path/to/dwm/config.h install clean"	27	@${ECHO_MSG} "make DWM_CONF=/path/to/dwm/config.h install clean"
28	@${ECHO_MSG} "Note: Pre-4.9 config.h-files no longer work."	28	@${ECHO_MSG} "Note: Pre-5.0 config.h-files no longer work."
29		29
30	post-extract:	30	post-extract:
31	.if defined(DWM_CONF)	31	.if defined(DWM_CONF)

Lines 1-6 Link Here

(-)dwm/files/patch-config.mk (-16 / +13 lines)
1	--- config.mk.orig 2008-04-03 22:57:01.000000000 +0200	1	--- config.mk.orig 2008-06-18 23:08:29.000000000 +0200
2	+++ config.mk 2008-04-04 12:05:19.000000000 +0200	2	+++ config.mk 2008-06-20 10:39:37.000000000 +0200
3	@@ -4,19 +4,19 @@	3	@@ -4,11 +4,11 @@
4	# Customize below to fit your system	4	# Customize below to fit your system
5		5
6	# paths	6	# paths
Lines 14-34 Link Here
14	+X11INC = $(LOCALBASE)/include	14	+X11INC = $(LOCALBASE)/include
15	+X11LIB = $(LOCALBASE)/lib	15	+X11LIB = $(LOCALBASE)/lib
16		16
17	# includes and libs	17	# Xinerama, comment if you don't want it
18	INCS = -I. -I/usr/include -I${X11INC}	18	XINERAMALIBS = -L${X11LIB} -lXinerama
19	LIBS = -L/usr/lib -lc -L${X11LIB} -lX11	19	@@ -19,9 +19,9 @@
		20	LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS}
20		21
21	# flags	22	# flags
22	-CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"	23	-CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
		24	-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
23	-LDFLAGS = -s ${LIBS}	25	-LDFLAGS = -s ${LIBS}
24	+CFLAGS+= ${INCS} -DVERSION=\"${VERSION}\"	26	+CPPFLAGS+= -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
		27	+CFLAGS+= ${INCS} ${CPPFLAGS}
25	+LDFLAGS+= ${LIBS}	28	+LDFLAGS+= ${LIBS}
26	#CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
27	#LDFLAGS = -g ${LIBS}
28		29
29	@@ -25,4 +25,4 @@	30	# Solaris
30	#LDFLAGS = ${LIBS}	31	#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
31
32	# compiler and linker
33	-CC = cc
34	+CC?= cc