aboutsummaryrefslogtreecommitdiff
path: root/x11-wm/wmii
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm/wmii')
-rw-r--r--x11-wm/wmii/Makefile31
-rw-r--r--x11-wm/wmii/distinfo6
-rw-r--r--x11-wm/wmii/pkg-plist8
3 files changed, 25 insertions, 20 deletions
diff --git a/x11-wm/wmii/Makefile b/x11-wm/wmii/Makefile
index bf27f07cebee..427e5a38d049 100644
--- a/x11-wm/wmii/Makefile
+++ b/x11-wm/wmii/Makefile
@@ -6,33 +6,36 @@
#
PORTNAME= wmii
-DISTVERSION= 3.5.1
+DISTVERSION= 3.6
CATEGORIES= x11-wm
-MASTER_SITES= http://www.suckless.org/download/ CENKES
+MASTER_SITES= http://www.suckless.org/download/
MAINTAINER= danfe@FreeBSD.org
COMMENT= A dynamic, minimalist window manager for X11
-LIB_DEPENDS= ixp.0:${PORTSDIR}/devel/libixp
+LIB_DEPENDS= ixp.1:${PORTSDIR}/devel/libixp
RUN_DEPENDS= dmenu:${PORTSDIR}/x11/dmenu \
${LOCALBASE}/9/bin/rc:${PORTSDIR}/devel/9base
-CONFLICTS= wmii-3.5.[2-9]*
+CONFLICTS= wmii-3.5.*
+USE_ICONV= yes
USE_XLIB= yes
-MAKE_ARGS= PREFIX="${PREFIX}" X11LIB="${X11BASE}/lib" \
- X11INC="${X11BASE}/include" CC="${CC}" \
- MANPREFIX="${MANPREFIX}/man"
+MAKE_ARGS= PREFIX="${PREFIX}" INCLUDE="${LOCALBASE}/include" \
+ INCX11="-I${X11BASE}/include" LIBX11="-L${X11BASE}/lib" \
+ CC="${CC} -c" LD="${CC}" LIBIXP="-lixp" STATIC="" \
+ LIBICONV="-liconv" MAN="${MANPREFIX}/man"
-MAN1= wmii.1 wmiir.1 wmiiwm.1
+MAN1= wmii.1 wmiiloop.1 wmiir.1
post-patch: .SILENT
- ${REINPLACE_CMD} -E 's|-Os|${CFLAGS}|; \
- s|(-[LI])\$${PREFIX}|\1${LOCALBASE}|' \
- ${WRKSRC}/config.mk
- # Catch up with recent libixp
- ${REINPLACE_CMD} -E 's|\.data\.[[:alpha:]]+||g' \
- ${WRKSRC}/fs.c
+ ${REINPLACE_CMD} -e 's|-lfmt -lutf|$${LIBX11} & -lX11|' \
+ ${WRKSRC}/cmd/Makefile
+# Strip debug build options
+ ${REINPLACE_CMD} -E 's| -g( -O0)?||' ${WRKSRC}/config.mk
+# Make actual compile/link command appear in the build log
+ ${REINPLACE_CMD} -e 's|^COMPILE=|& noisycc=yes | ; \
+ s|^LINK=|& noisycc=yes |' ${WRKSRC}/mk/hdr.mk
.include <bsd.port.mk>
diff --git a/x11-wm/wmii/distinfo b/x11-wm/wmii/distinfo
index 56a2a03714de..407d8d8992af 100644
--- a/x11-wm/wmii/distinfo
+++ b/x11-wm/wmii/distinfo
@@ -1,3 +1,3 @@
-MD5 (wmii-3.5.1.tar.gz) = 26705a7b59945b7d269921b45ac15cdf
-SHA256 (wmii-3.5.1.tar.gz) = 6ce10c0805c2ff05952f7566b9af134ae76fdeb518dc7d9c413f0dd58635e6d1
-SIZE (wmii-3.5.1.tar.gz) = 41658
+MD5 (wmii-3.6.tar.gz) = 9d17a09871fada998b4d989d9318bbf5
+SHA256 (wmii-3.6.tar.gz) = 46f39b788c5ef4695040b36cc7d9c539db0306bafc4d8cefdc5980ed4331b216
+SIZE (wmii-3.6.tar.gz) = 208249
diff --git a/x11-wm/wmii/pkg-plist b/x11-wm/wmii/pkg-plist
index cb3da8002778..266899b8e5a5 100644
--- a/x11-wm/wmii/pkg-plist
+++ b/x11-wm/wmii/pkg-plist
@@ -1,8 +1,10 @@
bin/wmii
+bin/wmii9menu
+bin/wmii9rc
+bin/wmiiloop
bin/wmiir
-bin/wmiiwm
-etc/wmii-3.5/quit
-etc/wmii-3.5/status
+bin/wmiistartrc
+etc/wmii-3.5/rc.wmii
etc/wmii-3.5/welcome
etc/wmii-3.5/wmiirc
@dirrm etc/wmii-3.5