diff options
| -rw-r--r-- | x11-wm/wmii-devel/Makefile | 18 | ||||
| -rw-r--r-- | x11-wm/wmii/Makefile | 27 |
2 files changed, 21 insertions, 24 deletions
diff --git a/x11-wm/wmii-devel/Makefile b/x11-wm/wmii-devel/Makefile index 27d2a92ea08f..3484973a790a 100644 --- a/x11-wm/wmii-devel/Makefile +++ b/x11-wm/wmii-devel/Makefile @@ -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/wmii/ 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 commands, useful for logs 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 diff --git a/x11-wm/wmii/Makefile b/x11-wm/wmii/Makefile index b3c301cf08c8..432fc91ed5bd 100644 --- a/x11-wm/wmii/Makefile +++ b/x11-wm/wmii/Makefile @@ -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="${LOCALBASE}/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 |