Attachment #88084 for bug #124831

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

Lines 6-12 Link Here

(-)dmenu/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= dmenu	8	PORTNAME= dmenu
9	PORTVERSION= 3.6	9	PORTVERSION= 3.7
10	CATEGORIES= x11	10	CATEGORIES= x11
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 14-20 Link Here
14	MAINTAINER= schot@a-eskwadraat.nl	14	MAINTAINER= schot@a-eskwadraat.nl
15	COMMENT= X11 menu application (not only) for the dwm window manager	15	COMMENT= X11 menu application (not only) for the dwm window manager
16		16
17	USE_XORG= x11	17	USE_XORG= x11 xinerama
18		18
19	MAN1= dmenu.1	19	MAN1= dmenu.1
20	PLIST_FILES= bin/dmenu bin/dmenu_path bin/dmenu_run	20	PLIST_FILES= bin/dmenu bin/dmenu_path bin/dmenu_run

Lines 1-3 Link Here

(-)dmenu/distinfo (-3 / +3 lines)
1	MD5 (dmenu-3.6.tar.gz) = e39d8e0a77a929a2b80baf44d3dc6019	1	MD5 (dmenu-3.7.tar.gz) = dbb6c20e1454c414a893fe4361b846b2
2	SHA256 (dmenu-3.6.tar.gz) = c0183c4e1afa769cdf6a2c98cd354be23674412b6b483e71b22b9bd5e4f07bb7	2	SHA256 (dmenu-3.7.tar.gz) = 60cebbae5f1fc1dbd930c4b43f000cab9b0a64554fa69cedc6dd5d8fc768aaee
3	SIZE (dmenu-3.6.tar.gz) = 8508	3	SIZE (dmenu-3.7.tar.gz) = 8478




--- config.mk.orig	2008-06-18 19:20:41.000000000 +0200
+++ config.mk	2008-06-21 14:57:31.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,13 +19,13 @@
 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}\"
 #LDFLAGS = ${LIBS}
 
 # compiler and linker
-CC = cc

Return to bug 124831

Lines 1-6 Link Here

(-)dmenu/files/patch-config.mk (-12 / +14 lines)
1	--- config.mk.orig 2007-10-25 20:26:14.000000000 +0200	1	--- config.mk.orig 2008-06-18 19:20:41.000000000 +0200
2	+++ config.mk 2007-10-27 00:36:35.000000000 +0200	2	+++ config.mk 2008-06-21 14:57:31.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-33 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,13 +19,13 @@
		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	@@ -26,4 +26,4 @@	30	# Solaris
30	#CFLAGS += -xtarget=ultra	31	#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
		32	#LDFLAGS = ${LIBS}
31		33
32	# compiler and linker	34	# compiler and linker
33	-CC = cc	35	-CC = cc