diff options
| author | Mateusz Piotrowski <0mp@FreeBSD.org> | 2021-10-13 22:43:38 +0000 |
|---|---|---|
| committer | Mateusz Piotrowski <0mp@FreeBSD.org> | 2021-10-14 11:32:26 +0000 |
| commit | e3374257bcf301e5407932e4dfeb010e1cc2673c (patch) | |
| tree | 8b0c8eba6caa95a0a92daf11b214cb580933177d /x11/pmenu/files/patch-config.mk | |
| parent | e409be37a880805890a6a3ba0be4aed22042f25b (diff) | |
| download | ports-e3374257bcf301e5407932e4dfeb010e1cc2673c.tar.gz ports-e3374257bcf301e5407932e4dfeb010e1cc2673c.zip | |
x11/pmenu: Update to 2.4.2
Diffstat (limited to 'x11/pmenu/files/patch-config.mk')
| -rw-r--r-- | x11/pmenu/files/patch-config.mk | 36 |
1 files changed, 8 insertions, 28 deletions
diff --git a/x11/pmenu/files/patch-config.mk b/x11/pmenu/files/patch-config.mk index 32179e87b82e..338ff92e9d99 100644 --- a/x11/pmenu/files/patch-config.mk +++ b/x11/pmenu/files/patch-config.mk @@ -1,39 +1,19 @@ ---- config.mk.orig 2021-02-05 04:34:38 UTC +--- config.mk.orig 2021-10-13 18:48:49 UTC +++ config.mk -@@ -2,16 +2,16 @@ - PROG = pmenu - - # paths --PREFIX = /usr/local -+PREFIX ?= /usr/local - MANPREFIX = ${PREFIX}/share/man - --LOCALINC = /usr/local/include --LOCALLIB = /usr/local/lib -+LOCALINC = ${LOCALBASE}/include -+LOCALLIB = ${LOCALBASE}/lib - --X11INC = /usr/X11R6/include --X11LIB = /usr/X11R6/lib -+X11INC = ${LOCALBASE}/include/xorg -+X11LIB = ${LOCALBASE}/lib/xorg - --FREETYPEINC = /usr/include/freetype2 -+FREETYPEINC = ${LOCALBASE}/include/freetype2 - # OpenBSD (uncomment) +@@ -16,12 +16,12 @@ FREETYPEINC = /usr/include/freetype2 #FREETYPEINC = ${X11INC}/freetype2 -@@ -20,9 +20,9 @@ INCS = -I${LOCALINC} -I${X11INC} -I${FREETYPEINC} - LIBS = -L${LOCALLIB} -L${X11LIB} -lm -lfontconfig -lXft -lX11 -lXinerama -lXrender -lXext -lImlib2 + # includes and libs +-INCS = -I${LOCALINC} -I${X11INC} -I${FREETYPEINC} +-LIBS = -L${LOCALLIB} -L${X11LIB} -lm -lfontconfig -lXft -lX11 -lXinerama -lXrender -lXext -lImlib2 ++INCS += -I${LOCALINC} -I${X11INC} -I${FREETYPEINC} ++LIBS += -L${LOCALLIB} -L${X11LIB} -lm -lfontconfig -lXft -lX11 -lXinerama -lXrender -lXext -lImlib2 # flags --CPPFLAGS = -CFLAGS = -Wall -Wextra ${INCS} ${CPPFLAGS} -LDFLAGS = ${LIBS} -+CPPFLAGS += +CFLAGS += -Wall -Wextra ${INCS} ${CPPFLAGS} +LDFLAGS += ${LIBS} # compiler and linker --CC = cc -+CC ?= cc + CC = cc |