diff options
| -rw-r--r-- | x11/pmenu/Makefile | 11 | ||||
| -rw-r--r-- | x11/pmenu/distinfo | 6 | ||||
| -rw-r--r-- | x11/pmenu/files/patch-config.mk | 36 |
3 files changed, 19 insertions, 34 deletions
diff --git a/x11/pmenu/Makefile b/x11/pmenu/Makefile index 9efbff2b8642..4165d2b7ec67 100644 --- a/x11/pmenu/Makefile +++ b/x11/pmenu/Makefile @@ -1,6 +1,6 @@ PORTNAME= pmenu DISTVERSIONPREFIX= v -DISTVERSION= 2.3.0 +DISTVERSION= 2.4.2 CATEGORIES= x11 MAINTAINER= 0mp@FreeBSD.org @@ -17,8 +17,13 @@ USE_GITHUB= yes GH_ACCOUNT= phillbush USE_XORG= x11 xext xft xinerama xrender -MAKE_ARGS= FREETYPEINC="${LOCALBASE}/include/freetype2" \ - PREFIX="${PREFIX}" +MAKE_ARGS= CC="${CC}" \ + FREETYPEINC="${LOCALBASE}/include/freetype2" \ + LOCALINC="${LOCALBASE}/include" \ + LOCALLIB="${LOCALBASE}/lib" \ + PREFIX="${PREFIX}" \ + X11INC="${LOCALBASE}/include/xorg" \ + X11LIB="${LOCALBASE}/lib/xorg" PLIST_FILES= bin/${PORTNAME} \ share/man/man1/${PORTNAME}.1.gz diff --git a/x11/pmenu/distinfo b/x11/pmenu/distinfo index 604331c4a4a6..c2e7ac1223cd 100644 --- a/x11/pmenu/distinfo +++ b/x11/pmenu/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1620724769 -SHA256 (phillbush-pmenu-v2.3.0_GH0.tar.gz) = 957c669f31f3a54fe98c7cca1ef6fb4d3b7f400139f1ebad5832b0964cdcaccf -SIZE (phillbush-pmenu-v2.3.0_GH0.tar.gz) = 16575 +TIMESTAMP = 1634135559 +SHA256 (phillbush-pmenu-v2.4.2_GH0.tar.gz) = 28c42bcefef63997578b56190ed442bdf248c60723e51b933c25c427b38394f5 +SIZE (phillbush-pmenu-v2.4.2_GH0.tar.gz) = 18404 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 |