Index: head/x11/pmenu/Makefile =================================================================== --- head/x11/pmenu/Makefile (revision 564110) +++ head/x11/pmenu/Makefile (revision 564111) @@ -1,39 +1,39 @@ # $FreeBSD$ PORTNAME= pmenu DISTVERSIONPREFIX= v -DISTVERSION= 2.1.3 +DISTVERSION= 2.2.0 CATEGORIES= x11 MAINTAINER= 0mp@FreeBSD.org COMMENT= Pie menu for X LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libImlib2.so:graphics/imlib2 USES= localbase xorg USE_GITHUB= yes GH_ACCOUNT= phillbush -USE_XORG= x11 xext xft xinerama +USE_XORG= x11 xext xft xinerama xrender MAKE_ARGS= FREETYPEINC="${LOCALBASE}/include/freetype2" \ PREFIX="${PREFIX}" PLIST_FILES= bin/${PORTNAME} \ share/man/man1/${PORTNAME}.1.gz PORTEXAMPLES= ${PORTNAME}.sh OPTIONS_DEFINE= EXAMPLES post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_SCRIPT} ${WRKSRC}/${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR} .include Index: head/x11/pmenu/distinfo =================================================================== --- head/x11/pmenu/distinfo (revision 564110) +++ head/x11/pmenu/distinfo (revision 564111) @@ -1,3 +1,3 @@ -TIMESTAMP = 1602017542 -SHA256 (phillbush-pmenu-v2.1.3_GH0.tar.gz) = 3f0c211e182876092f7f247623a61a598ac5a6466446d44a1bfba15aa7f09418 -SIZE (phillbush-pmenu-v2.1.3_GH0.tar.gz) = 14291 +TIMESTAMP = 1612523051 +SHA256 (phillbush-pmenu-v2.2.0_GH0.tar.gz) = 2aebc5f857f1c956fa5b8aa7a5c94dddc322398fa252f4728b2d8a08394c388c +SIZE (phillbush-pmenu-v2.2.0_GH0.tar.gz) = 15264 Index: head/x11/pmenu/files/patch-config.mk =================================================================== --- head/x11/pmenu/files/patch-config.mk (revision 564110) +++ head/x11/pmenu/files/patch-config.mk (revision 564111) @@ -1,20 +1,39 @@ ---- config.mk.orig 2020-10-06 11:12:09 UTC +--- config.mk.orig 2021-02-05 04:34:38 UTC +++ config.mk -@@ -17,12 +17,12 @@ FREETYPEINC = /usr/include/freetype2 +@@ -2,16 +2,16 @@ + PROG = pmenu - # includes and libs - INCS = -I${LOCALINC} -I${X11INC} -I${FREETYPEINC} --LIBS = -L${LOCALLIB} -L${X11LIB} -lm -lfontconfig -lXft -lX11 -lXinerama -lXext -lImlib2 -+LIBS += -L${LOCALLIB} -L${X11LIB} -lm -lfontconfig -lXft -lX11 -lXinerama -lXext -lImlib2 + # 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) + #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 # flags -CPPFLAGS = -CFLAGS = -Wall -Wextra ${INCS} ${CPPFLAGS} -LDFLAGS = ${LIBS} +CPPFLAGS += +CFLAGS += -Wall -Wextra ${INCS} ${CPPFLAGS} +LDFLAGS += ${LIBS} # compiler and linker -CC = cc +CC ?= cc