mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-28 05:29:48 +00:00
Code Issues Releases Activity

x11/pmenu: Update to 2.4.2

Browse Source 
Changes:	https://github.com/phillbush/pmenu/blob/v2.4.2/CHANGELOG
This commit is contained in:
Mateusz Piotrowski 2021-10-14 00:43:38 +02:00
parent e409be37a8
commit e3374257bc
3 changed files with 19 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
x11/pmenu/Makefile
View File

@ -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

6
x11/pmenu/distinfo
View File

@ -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

36
x11/pmenu/files/patch-config.mk
View File

@ -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