ports/99383: Update port: x11-wm/pawm to 2.2.4

[KATO Tsuguru]

>Number:         99383
>Category:       ports
>Synopsis:       Update port: x11-wm/pawm to 2.2.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 23 16:10:26 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.11-RELEASE-p18 i386
>Organization:
>Environment:
>Description:
- Update to version 2.2.4

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/x11-wm/pawm/Makefile x11-wm/pawm/Makefile
--- /usr/ports/x11-wm/pawm/Makefile	Sat May 20 02:03:59 2006
+++ x11-wm/pawm/Makefile	Wed Jun 21 13:15:32 2006
@@ -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 @@
 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,12 +31,17 @@
 		-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)
diff -urN /usr/ports/x11-wm/pawm/distinfo x11-wm/pawm/distinfo
--- /usr/ports/x11-wm/pawm/distinfo	Sat May 20 02:03:59 2006
+++ x11-wm/pawm/distinfo	Wed Jun 21 13:12:04 2006
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted: