From owner-svn-ports-all@FreeBSD.ORG Mon Dec 17 09:55:50 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EAC91D52; Mon, 17 Dec 2012 09:55:50 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D17308FC13; Mon, 17 Dec 2012 09:55:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBH9toCK062089; Mon, 17 Dec 2012 09:55:50 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBH9torA062087; Mon, 17 Dec 2012 09:55:50 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201212170955.qBH9torA062087@svn.freebsd.org> From: Alexey Dokuchaev Date: Mon, 17 Dec 2012 09:55:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309076 - head/x11-wm/jwm X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Dec 2012 09:55:51 -0000 Author: danfe Date: Mon Dec 17 09:55:50 2012 New Revision: 309076 URL: http://svnweb.freebsd.org/changeset/ports/309076 Log: - Convert to the new OPTIONS framework - Use USE_XORG syntax instead of LIB_DEPENDS for Xft and Xinerama - Trim the header per new rules, define LICENSE (GPLv2) - Fix whitespace bugs and provide better port description while here Nota bene: version 2.1.0 is available Approved by: maintainer timeout Modified: head/x11-wm/jwm/Makefile head/x11-wm/jwm/pkg-descr Modified: head/x11-wm/jwm/Makefile ============================================================================== --- head/x11-wm/jwm/Makefile Mon Dec 17 09:54:03 2012 (r309075) +++ head/x11-wm/jwm/Makefile Mon Dec 17 09:55:50 2012 (r309076) @@ -1,20 +1,17 @@ -# New ports collection makefile for: jwm -# Date created: 26 DEC 2005 -# Whom: babak@farrokhi.net -# +# Created by: Babak Farrokhi # $FreeBSD$ -# PORTNAME= jwm PORTVERSION= 2.0.1 PORTREVISION= 4 CATEGORIES= x11-wm -MASTER_SITES= SF \ - http://joewing.net/programs/jwm/releases/ +MASTER_SITES= SF http://joewing.net/programs/jwm/releases/ MAINTAINER= admin@mjbrune.org COMMENT= Joe's Window Manager +LICENSE= GPLv2 + LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USE_XORG= xpm @@ -26,37 +23,32 @@ LDFLAGS+= -L${LOCALBASE}/lib MAN1= jwm.1 -OPTIONS= FRIBIDI "Fribidi support" on \ - XFT "Xft support " on \ - XINERAMA "XINERAMA support" on \ - JPEG "JPEG support" on \ - DEBUG "Enable Debugging" off +OPTIONS_DEFINE= FRIBIDI XFT XINERAMA JPEG DEBUG +OPTIONS_DEFAULT= FRIBIDI XFT XINERAMA JPEG +DEBUG_DESC= Enable debugging .include -.if defined(WITH_FRIBIDI) -BUILD_DEPENDS+= fribidi:${PORTSDIR}/converters/fribidi +.if ${PORT_OPTIONS:MFRIBIDI} +BUILD_DEPENDS+= fribidi:${PORTSDIR}/converters/fribidi .endif -.if defined(WITH_XFT) -LIB_DEPENDS+= Xft:${PORTSDIR}/x11-fonts/libXft +.if ${PORT_OPTIONS:MXFT} +USE_XORG+= xft .endif -.if defined(WITH_XINERAMA) -LIB_DEPENDS+= Xinerama:${PORTSDIR}/x11/libXinerama - +.if ${PORT_OPTIONS:MXINERAMA} +USE_XORG+= xinerama .endif -.if defined(WITH_JPEG) -LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg +.if ${PORT_OPTIONS:MJPEG} +LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg .endif -.if defined(WITH_DEBUG) -CONFIGURE_ARGS+= --enable-debug +.if ${PORT_OPTIONS:MDEBUG} +CONFIGURE_ARGS+= --enable-debug .endif -.include - post-patch: @${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/example.jwmrc @@ -68,6 +60,6 @@ do-install: if ! [ -f ${PREFIX}/etc/system.jwmrc ]; then \ ${INSTALL_DATA} ${WRKSRC}/example.jwmrc ${PREFIX}/etc/system.jwmrc; \ fi - ${INSTALL_MAN} ${WRKSRC}/jwm.1 ${MANPREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/jwm.1 ${MANPREFIX}/man/man1 -.include +.include Modified: head/x11-wm/jwm/pkg-descr ============================================================================== --- head/x11-wm/jwm/pkg-descr Mon Dec 17 09:54:03 2012 (r309075) +++ head/x11-wm/jwm/pkg-descr Mon Dec 17 09:55:50 2012 (r309076) @@ -1,4 +1,6 @@ -WM is a window manager for the X11 Window System. -JWM is written in C and uses only Xlib at a minimum. +JWM is a window manager for the X11 Window System. JWM is written in C and +uses only Xlib at a minimum, though additional libraries are supported for +extended functionality and features. JWM supports MWM and Extended Window +Manager Hints (EWMH). -WWW: http://joewing.net/programs/jwm/index.shtml +WWW: http://joewing.net/programs/jwm/