[Midnightbsd-cvs] mports [24442] trunk/x11-wm/wmii: update to 3.6
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Oct 8 20:24:17 EDT 2018
Revision: 24442
http://svnweb.midnightbsd.org/mports/?rev=24442
Author: laffer1
Date: 2018-10-08 20:24:16 -0400 (Mon, 08 Oct 2018)
Log Message:
-----------
update to 3.6
Modified Paths:
--------------
trunk/x11-wm/wmii/Makefile
trunk/x11-wm/wmii/files/patch-no-utf8
trunk/x11-wm/wmii/pkg-plist
Added Paths:
-----------
trunk/x11-wm/wmii/files/patch-mk-common.mk
trunk/x11-wm/wmii/files/patch-mk-hdr.mk
Modified: trunk/x11-wm/wmii/Makefile
===================================================================
--- trunk/x11-wm/wmii/Makefile 2018-10-09 00:21:08 UTC (rev 24441)
+++ trunk/x11-wm/wmii/Makefile 2018-10-09 00:24:16 UTC (rev 24442)
@@ -1,47 +1,40 @@
# $MidnightBSD$
PORTNAME= wmii
-DISTVERSION= 3.6
-PORTREVISION= 2
+DISTVERSION= 3.6 # this is stable version; for 3.9.x, use -devel port
CATEGORIES= x11-wm
MASTER_SITES= http://dl.suckless.org/wmii/
MAINTAINER= ports at MidnightBSD.org
-COMMENT= A dynamic, minimalist window manager for X11
+COMMENT= Dynamic, minimalist window manager for X11
LICENSE= mit
+LICENSE_FILE= ${WRKSRC}/LICENSE
-LIB_DEPENDS= ixp:${PORTSDIR}/devel/libixp
-RUN_DEPENDS= dmenu:${PORTSDIR}/x11/dmenu
+LIB_DEPENDS= libixp.so:devel/libixp
+RUN_DEPENDS= dmenu:x11/dmenu
+CONFLICTS= wmii-devel-[0-9]*
+
USE_XORG= x11 xextproto xt xext
-MAKE_ARGS= PREFIX="${PREFIX}" INCLUDE="${LOCALBASE}/include" \
- INCX11="-I${LOCALBASE}/include" LIBX11="-L${LOCALBASE}/lib" \
- CC="${CC} -c" LD="${CC}" LIBIXP="-lixp" STATIC="" \
- MAN="${FAKE_DESTDIR}${MANPREFIX}/man"
+MAKE_ARGS= PREFIX="${PREFIX}" MAN="${FAKE_DESTDIR}${MANPREFIX}/man" \
+ INCLUDE="${LOCALBASE}/include" \
+ INCX11="-I${LOCALBASE}/include" \
+ LIBX11="-L${LOCALBASE}/lib -lX11 -lixp" \
+ CC="${CC} -c" LD="${CC}" LIBIXP="" STATIC=""
-MAN1= wmii.1 wmiiloop.1 wmiir.1
+FAKE_MAKEARGS+= ${MAKE_ARGS} PREFIX="${FAKE_DESTDIR}${PREFIX}"
-FAKE_MAKEARGS+= ${MAKE_ARGS} PREFIX="${FAKE_DESTDIR}${PREFIX}"
-
OPTIONS_DEFINE= SLIM_LAYOUT_BOX UTF8
-
SLIM_LAYOUT_BOX_DESC= Build with slim layout boxes
-.include <bsd.mport.options.mk>
+UTF8_USES= iconv
+UTF8_MAKE_ARGS= LIBICONV="${ICONV_LIB}"
+UTF8_MAKE_ARGS_OFF= -DNO_UTF8
-.if ${PORT_OPTIONS:MUTF8}
-USES+= iconv
-MAKE_ARGS+= LIBICONV="-liconv"
-.else
-MAKE_ARGS+= -DNO_UTF8
-.endif
+SLIM_LAYOUT_BOX_EXTRA_PATCHES= ${FILESDIR}/extra-patch-slim-layout-boxes
-.if ${PORT_OPTIONS:MSLIM_LAYOUT_BOX}
-EXTRA_PATCHES= ${FILESDIR}/extra-patch-slim-layout-boxes
-.endif
-
post-patch: .SILENT
${REINPLACE_CMD} -e 's|-lfmt -lutf|$${LIBX11} & -lX11|' \
${WRKSRC}/cmd/Makefile
@@ -50,9 +43,6 @@
${REINPLACE_CMD} -E 's| -g( -O0)?||' ${WRKSRC}/config.mk
${REINPLACE_CMD} -e 's|CFLAGS += -DIXPlint|& -DIXP_NEEDAPI=89|' \
${WRKSRC}/config.mk
-# Make actual compile/link commands appear in the build log
- ${REINPLACE_CMD} -e 's|^COMPILE=|& noisycc=yes| ; \
- s|^LINK=|& noisycc=yes|' ${WRKSRC}/mk/hdr.mk
# Fix brain-damaged piece of code which breaks on arches where `size_t'
# is not 32-bit unsigned integer (e.g. amd64, sparc64)
${REINPLACE_CMD} -e '/wmii_strlcat/d' ${WRKSRC}/include/util.h
@@ -59,4 +49,9 @@
${REINPLACE_CMD} -e 's|strlcat|wmii_&|' ${WRKSRC}/include/util.h \
${WRKSRC}/cmd/util.c ${WRKSRC}/cmd/wmii/client.c
+post-install:
+.for f in wmii wmii9menu wmiir
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
+.endfor
+
.include <bsd.port.mk>
Added: trunk/x11-wm/wmii/files/patch-mk-common.mk
===================================================================
--- trunk/x11-wm/wmii/files/patch-mk-common.mk (rev 0)
+++ trunk/x11-wm/wmii/files/patch-mk-common.mk 2018-10-09 00:24:16 UTC (rev 24442)
@@ -0,0 +1,15 @@
+--- mk/common.mk.orig 2007-11-16 13:59:15 UTC
++++ mk/common.mk
+@@ -4,9 +4,9 @@ install: all
+
+ MANDIRS=${MAN}/man1
+ mkdirs:
+- for i in ${BIN} ${ETC} ${LIBDIR} ${MANDIRS} ${INCLUDE} ${DIRS}; do \
+- test -d $$i || echo MKDIR $$i; \
+- mkdir -pm 0755 $$i; \
++ for i in ${BIN} ${ETC} ${LIBDIR} ${MANDIRS} ${INCLUDE}; do \
++ test -d ${DESTDIR}$$i || echo MKDIR ${DESTDIR}$$i; \
++ mkdir -pm 0755 ${DESTDIR}$$i; \
+ done
+
+ cleandep:
Property changes on: trunk/x11-wm/wmii/files/patch-mk-common.mk
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-wm/wmii/files/patch-mk-hdr.mk
===================================================================
--- trunk/x11-wm/wmii/files/patch-mk-hdr.mk (rev 0)
+++ trunk/x11-wm/wmii/files/patch-mk-hdr.mk 2018-10-09 00:24:16 UTC (rev 24442)
@@ -0,0 +1,54 @@
+--- mk/hdr.mk.orig 2007-11-16 13:59:15 UTC
++++ mk/hdr.mk
+@@ -26,32 +26,32 @@ all:
+
+ .O.install:
+ echo INSTALL ${BASE}$*
+- cp -f $< ${BIN}/$*
+- chmod 0755 ${BIN}/$*
++ cp -f $< ${DESTDIR}${BIN}/$*
++ chmod 0755 ${DESTDIR}${BIN}/$*
+ .O.uninstall:
+ echo UNINSTALL ${BASE}$*
+ rm -f ${BIN}/$*
+
+ .a.install:
+ echo INSTALL ${BASE}$<
+- cp -f $< ${LIBDIR}/$<
+- chmod 0644 ${LIBDIR}/$<
++ cp -f $< ${DESTDIR}${LIBDIR}/$<
++ chmod 0644 ${DESTDIR}${LIBDIR}/$<
+ .a.uninstall:
+ echo UNINSTALL ${BASE}$<
+ rm -f ${LIBDIR}/$<
+
+ .h.install:
+ echo INSTALL ${BASE}$<
+- cp -f $< ${INCLUDE}/$<
+- chmod 0644 ${INCLUDE}/$<
++ cp -f $< ${DESTDIR}${INCLUDE}/$<
++ chmod 0644 ${DESTDIR}${INCLUDE}/$<
+ .h.uninstall:
+ echo UNINSTALL ${BASE}$<
+ rm -f ${INCLUDE}/$<
+
+ .1.install:
+ echo INSTALL man $*'(1)'
+- ${FILTER} $< >${MAN}/man1/$<
+- chmod 0644 ${MAN}/man1/$<
++ ${FILTER} $< >${DESTDIR}${MAN}/man1/$<
++ chmod 0644 ${DESTDIR}${MAN}/man1/$<
+ .1.uninstall:
+ echo UNINSTALL man $*'(1)'
+ rm -f ${MAN}/man1/$<
+@@ -69,8 +69,8 @@ install: printinstall mkdirs
+ depend: cleandep
+
+ FILTER = cat
+-COMPILE= CC="${CC}" CFLAGS="${CFLAGS}" ${ROOT}/util/compile
+-LINK= LD="${LD}" LDFLAGS="${LDFLAGS}" ${ROOT}/util/link
++COMPILE= noisycc=yes CC="${CC}" CFLAGS="${CFLAGS}" ${ROOT}/util/compile
++LINK= noisycc=yes LD="${LD}" LDFLAGS="${LDFLAGS}" ${ROOT}/util/link
+
+ include ${ROOT}/config.mk
+ CFLAGS += -I$$(echo ${INCPATH}|sed 's/:/ -I/g')
Property changes on: trunk/x11-wm/wmii/files/patch-mk-hdr.mk
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/x11-wm/wmii/files/patch-no-utf8
===================================================================
--- trunk/x11-wm/wmii/files/patch-no-utf8 2018-10-09 00:21:08 UTC (rev 24441)
+++ trunk/x11-wm/wmii/files/patch-no-utf8 2018-10-09 00:24:16 UTC (rev 24442)
@@ -1,6 +1,6 @@
---- cmd/wmii/Makefile.orig
+--- cmd/wmii/Makefile.orig 2007-11-16 13:59:15 UTC
+++ cmd/wmii/Makefile
-@@ -8,8 +8,16 @@
+@@ -8,8 +8,16 @@ TARG = wmii
HFILES= dat.h fns.h x11.h
LIB = ${LIBIXP}
@@ -19,7 +19,7 @@
OBJ = area \
bar \
client \
---- cmd/wmii/utf.c.orig
+--- cmd/wmii/utf.c.orig 2007-11-16 13:59:15 UTC
+++ cmd/wmii/utf.c
@@ -1,12 +1,17 @@
/* Public Domain --Kris Maglione */
@@ -39,7 +39,7 @@
static iconv_t cd;
char *buf, *pos;
size_t nbuf, bsize;
-@@ -30,6 +35,7 @@
+@@ -30,6 +35,7 @@ toutf8n(char *str, size_t nstr) {
break;
*pos = '\0';
return buf;
@@ -47,9 +47,9 @@
}
char*
---- cmd/wmii/x11.c.orig
+--- cmd/wmii/x11.c.orig 2007-11-16 13:59:15 UTC
+++ cmd/wmii/x11.c
-@@ -18,6 +18,12 @@
+@@ -18,6 +18,12 @@ static Map wmap, amap;
static MapEnt *wbucket[137];
static MapEnt *abucket[137];
@@ -62,7 +62,7 @@
XRectangle
XRect(Rectangle r) {
XRectangle xr;
-@@ -444,7 +450,7 @@
+@@ -444,7 +450,7 @@ drawstring(Image *dst, Font *font,
setgccol(dst, col);
if(font->set)
@@ -71,7 +71,7 @@
font->set, dst->gc,
x, y,
buf, len);
-@@ -552,7 +558,7 @@
+@@ -552,7 +558,7 @@ textwidth_l(Font *font, char *text, uint
XRectangle r;
if(font->set) {
@@ -80,7 +80,7 @@
return r.width;
}
return XTextWidth(font->xfont, text, len);
-@@ -638,7 +644,7 @@
+@@ -638,7 +644,7 @@ gettextlistproperty(Window *w, char *nam
XGetTextProperty(display, w->w, &prop, xatom(name));
if(prop.nitems > 0) {
@@ -89,7 +89,7 @@
*ret = list;
XFree(prop.value);
}
-@@ -653,9 +659,10 @@
+@@ -653,9 +659,10 @@ gettextproperty(Window *w, char *name) {
str = nil;
n = gettextlistproperty(w, name, &list);
Modified: trunk/x11-wm/wmii/pkg-plist
===================================================================
--- trunk/x11-wm/wmii/pkg-plist 2018-10-09 00:21:08 UTC (rev 24441)
+++ trunk/x11-wm/wmii/pkg-plist 2018-10-09 00:24:16 UTC (rev 24442)
@@ -7,4 +7,6 @@
etc/wmii-3.5/rc.wmii
etc/wmii-3.5/welcome
etc/wmii-3.5/wmiirc
- at dirrm etc/wmii-3.5
+man/man1/wmii.1.gz
+man/man1/wmiiloop.1.gz
+man/man1/wmiir.1.gz
More information about the Midnightbsd-cvs
mailing list