aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--x11-wm/pawm/Makefile11
-rw-r--r--x11-wm/pawm/distinfo6
2 files changed, 11 insertions, 6 deletions
diff --git a/x11-wm/pawm/Makefile b/x11-wm/pawm/Makefile
index 54c90129c60b..2ff13d105df1 100644
--- a/x11-wm/pawm/Makefile
+++ b/x11-wm/pawm/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= pawm
-PORTVERSION= 2.2.3
+PORTVERSION= 2.2.4
CATEGORIES= x11-wm
MASTER_SITES= http://www.pleyades.net/pawm/files/
@@ -21,7 +21,7 @@ MAKEFILE= Makefile.in
MAKE_ARGS= GCC="${CC}" MAKE.binary="${CC} ${LDFLAGS} -o"
CFLAGS+= -I. -I${X11BASE}/include -DNDEBUG
-LDFLAGS= -lm -L${X11BASE}/lib -lXpm -lXrandr
+LDFLAGS= -lm -L${X11BASE}/lib -lXpm
.include <bsd.port.pre.mk>
@@ -31,13 +31,18 @@ CFLAGS+= -Dintmax_t=u_int32_t -Duintmax_t=u_int32_t \
-DSIZE_MAX=UINT_MAX
.endif
-.if ${X_WINDOW_SYSTEM} == xfree86-3 || defined(WITHOUT_XFT)
+.if ${X_WINDOW_SYSTEM} == xfree86-3
+CFLAGS+= -DDISABLE_XFT -DDISABLE_XRANDR
+.else
+LDFLAGS+= -lXrandr
+.if defined(WITHOUT_XFT)
CFLAGS+= -DDISABLE_XFT
.else
LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft
CFLAGS+= `pkg-config --cflags xft`
LDFLAGS+= `pkg-config --libs xft`
.endif
+.endif
.if defined(WITH_SN)
LIB_DEPENDS+= startup-notification-1.0:${PORTSDIR}/x11/startup-notification
diff --git a/x11-wm/pawm/distinfo b/x11-wm/pawm/distinfo
index 10c97022329b..bed4fd2b61f5 100644
--- a/x11-wm/pawm/distinfo
+++ b/x11-wm/pawm/distinfo
@@ -1,3 +1,3 @@
-MD5 (pawm-2.2.3.tar.bz2) = a17fa2d85d7ca05b819b02be53ad72ff
-SHA256 (pawm-2.2.3.tar.bz2) = f1d5794533f462f355cf1fbd6c1cf9e923dd3bb5fac22675c760b4490cc6d189
-SIZE (pawm-2.2.3.tar.bz2) = 131832
+MD5 (pawm-2.2.4.tar.bz2) = 63d18f570ce86cd255b1038e3b61fdd4
+SHA256 (pawm-2.2.4.tar.bz2) = aee4e3d002a822e7e907552d8a646b543fd416d8aa814dd092ce70181857ce2c
+SIZE (pawm-2.2.4.tar.bz2) = 132044
class='insertions'>+2 * p2p/discv5: fixed bootnode connect issuesZsolt Felfoldi2016-11-144-67/+107 * discv5: fixed state machine lockup bugZsolt Felfoldi2016-11-111-0/+3 * all: update license informationFelix Lange2016-11-098-8/+8 * p2p/discv5: fix build with Go 1.5, delete package testimgFelix Lange2016-11-095-879/+18 * p2p/discv5: added new topic discovery packageZsolt Felfoldi2016-11-0926-0/+7906 * Merge pull request #2914 from fjl/node-coinhabitFelix Lange2016-09-291-5/+1 |\ | * p2p/nat: delay auto discovery until first useFelix Lange2016-09-161-5/+1 * | p2p/nat: fix parameter order for AddMappingken101001472016-09-281-2/+2 |/ * Merge pull request #2740 from Firescar96/removepeerFelix Lange2016-07-29