Date: Mon, 17 Dec 2012 09:25:42 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309072 - in head/x11-wm: wmii wmii-devel Message-ID: <201212170925.qBH9PgrN058087@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Mon Dec 17 09:25:41 2012 New Revision: 309072 URL: http://svnweb.freebsd.org/changeset/ports/309072 Log: - Trim the headers per new rules - Drop article from COMMENT, shlib versions - Convert to the new OPTIONS framework - Relinquish maintainership Modified: head/x11-wm/wmii-devel/Makefile head/x11-wm/wmii/Makefile Modified: head/x11-wm/wmii-devel/Makefile ============================================================================== --- head/x11-wm/wmii-devel/Makefile Mon Dec 17 08:50:54 2012 (r309071) +++ head/x11-wm/wmii-devel/Makefile Mon Dec 17 09:25:41 2012 (r309072) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Window Manager Improved 2 (beta) -# Date created: 02 Jun 2005 -# Whom: Alexey Dokuchaev <danfe@FreeBSD.org> -# +# Created by: Alexey Dokuchaev <danfe@FreeBSD.org> # $FreeBSD$ -# PORTNAME= wmii DISTVERSION= 3.9.2 @@ -12,10 +8,10 @@ MASTER_SITES= http://dl.suckless.org/wmi DISTNAME= wmii+ixp-${DISTVERSION} EXTRACT_SUFX= .tbz -MAINTAINER= danfe@FreeBSD.org -COMMENT= A dynamic, minimalist window manager for X11 +MAINTAINER= ports@FreeBSD.org +COMMENT= Dynamic, minimalist window manager for X11 -LIB_DEPENDS= ixp.1:${PORTSDIR}/devel/libixp +LIB_DEPENDS= ixp:${PORTSDIR}/devel/libixp CONFLICTS= wmii-3.6* LATEST_LINK= ${PORTNAME}-devel @@ -30,12 +26,16 @@ MAKE_ENV= noisycc=1 # unmute build comma MAN1= wimenu.1 wmii9menu.1 wmii.1 wmiir.1 +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + post-patch: .SILENT # Link against `devel/libixp' from ports and drop extraneous build options ${REINPLACE_CMD} -e '/libixp/d' ${WRKSRC}/Makefile ${REINPLACE_CMD} -e 's,/usr/lib,${LOCALBASE}/lib, ; /^CFLAGS +=/d' \ ${WRKSRC}/config.mk -.if defined(NOPORTDOCS) +.if ! ${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} -e '/doc/d' ${WRKSRC}/Makefile ${REINPLACE_CMD} -e '/DOCDIR/s,$$(INSTALL),:,' ${WRKSRC}/mk/common.mk .endif Modified: head/x11-wm/wmii/Makefile ============================================================================== --- head/x11-wm/wmii/Makefile Mon Dec 17 08:50:54 2012 (r309071) +++ head/x11-wm/wmii/Makefile Mon Dec 17 09:25:41 2012 (r309072) @@ -1,20 +1,16 @@ -# New ports collection makefile for: Window Manager Improved 2 -# Date created: 02 Jun 2005 -# Whom: Alexey Dokuchaev <danfe@FreeBSD.org> -# +# Created by: Alexey Dokuchaev <danfe@FreeBSD.org> # $FreeBSD$ -# PORTNAME= wmii -DISTVERSION= 3.6 +DISTVERSION= 3.6 # this is stable version; for 3.9.x, use -devel port PORTREVISION= 3 CATEGORIES= x11-wm MASTER_SITES= http://dl.suckless.org/wmii/ -MAINTAINER= danfe@FreeBSD.org -COMMENT= A dynamic, minimalist window manager for X11 +MAINTAINER= ports@FreeBSD.org +COMMENT= Dynamic, minimalist window manager for X11 -LIB_DEPENDS= ixp.1:${PORTSDIR}/devel/libixp +LIB_DEPENDS= ixp:${PORTSDIR}/devel/libixp RUN_DEPENDS= dmenu:${PORTSDIR}/x11/dmenu CONFLICTS= wmii-3.9* @@ -28,19 +24,20 @@ MAKE_ARGS= PREFIX="${PREFIX}" INCLUDE="$ MAN1= wmii.1 wmiiloop.1 wmiir.1 -OPTIONS= SLIM_LAYOUT_BOX "Build with slim layout boxes" off \ - UTF8_TEXT "Work with UTF-8 instead of user locale" on +OPTIONS_DEFINE= SLIM_LAYOUT_BOX UTF8 + +SLIM_LAYOUT_BOX_DESC= Build with slim layout boxes .include <bsd.port.options.mk> -.if defined(WITH_UTF8_TEXT) +.if ${PORT_OPTIONS:MUTF8} USE_ICONV= yes MAKE_ARGS+= LIBICONV="-liconv" .else MAKE_ARGS+= -DNO_UTF8 .endif -.if defined(WITH_SLIM_LAYOUT_BOX) +.if ${PORT_OPTIONS:MSLIM_LAYOUT_BOX} EXTRA_PATCHES= ${FILESDIR}/extra-patch-slim-layout-boxes .endif @@ -55,8 +52,8 @@ post-patch: .SILENT # 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; otherwise it breaks on archs where -# `size_t' is not 32-bit unsigned integer (e.g. amd64, sparc64) +# 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 ${REINPLACE_CMD} -e 's|strlcat|wmii_&|' ${WRKSRC}/include/util.h \ ${WRKSRC}/cmd/util.c ${WRKSRC}/cmd/wmii/client.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212170925.qBH9PgrN058087>