cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add an xft flavor to dzen2

Browse Source 
ok maintainer
This commit is contained in:
jcs 2016-08-12 02:44:36 +00:00
parent 8fd2a79b6b
commit 5c9c8a0cc0
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.572 2016/05/26 17:53:12 jung Exp $
# $OpenBSD: Makefile,v 1.573 2016/08/12 02:44:36 jcs Exp $
SUBDIR =
SUBDIR += Xaw3d
@ -48,6 +48,7 @@
SUBDIR += dunst
SUBDIR += dwm
SUBDIR += dzen2
SUBDIR += dzen2,xft
SUBDIR += e16keyedit
SUBDIR += e17
SUBDIR += echinus

17
x11/dzen2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2014/10/23 07:26:55 jasper Exp $
# $OpenBSD: Makefile,v 1.7 2016/08/12 02:44:36 jcs Exp $
COMMENT-main= general purpose messaging, notification and menu program
COMMENT-gadgets=gadgets and scripts for dzen2
@ -7,7 +7,7 @@ V= 0.9.5
DISTNAME= dzen2-$V
PKGNAME-main= ${DISTNAME}
PKGNAME-gadgets= dzen2-gadgets-$V
REVISION= 0
REVISION= 1
CATEGORIES= x11
HOMEPAGE= https://github.com/robm/dzen
@ -26,10 +26,21 @@ GH_PROJECT= dzen
RUN_DEPENDS-gadgets= x11/dzen2
FLAVORS= xft
FLAVOR?=
.if ${FLAVOR:Mxft}
WANTLIB-main+= Xft
XFT_CFLAGS= -DDZEN_XFT `pkg-config --cflags xft`
XFT_LDFLAGS= `pkg-config --libs xft`
.endif
MAKE_FLAGS= CC=${CC} \
CFLAGS="${CFLAGS} -I${X11BASE}/include \
-DVERSION=\\\"$V\\\" -DDZEN_XINERAMA \
-DDZEN_XPM" \
-DDZEN_XPM ${XFT_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lX11 \
-lXinerama -lXpm ${XFT_LDFLAGS}" \
X11LIB=${X11BASE}/lib
GADGETS= dbar gdbar gcpubar textwidth

10
x11/dzen2/patches/patch-config_mk
View File

@ -1,14 +1,14 @@
$OpenBSD: patch-config_mk,v 1.1 2014/07/09 14:34:54 robert Exp $
--- config.mk.orig Mon Sep 23 11:57:39 2013
+++ config.mk Sun Jul 6 11:23:19 2014
$OpenBSD: patch-config_mk,v 1.2 2016/08/12 02:44:36 jcs Exp $
--- config.mk.orig Mon Sep 23 04:57:39 2013
+++ config.mk Thu Aug 11 13:12:07 2016
@@ -34,13 +34,13 @@ INCS = -I. -I/usr/include -I${X11INC}
## Option 4: With Xinerama and XPM
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm
-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM
+LIBS = -L${X11LIB} -lX11 -lXinerama -lXpm
+CFLAGS = -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM
+#LIBS = -L${X11LIB} -lX11 -lXinerama -lXpm
+#CFLAGS = -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM
## Option 5: With XFT