From owner-svn-ports-all@freebsd.org Fri Jan 13 22:24:45 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 37604CAEA9B; Fri, 13 Jan 2017 22:24:45 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E46E11B6A; Fri, 13 Jan 2017 22:24:44 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0DMOiAs000200; Fri, 13 Jan 2017 22:24:44 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0DMOiim000197; Fri, 13 Jan 2017 22:24:44 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201701132224.v0DMOiim000197@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Fri, 13 Jan 2017 22:24:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431428 - head/x11/xdm 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.23 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: Fri, 13 Jan 2017 22:24:45 -0000 Author: bapt Date: Fri Jan 13 22:24:43 2017 New Revision: 431428 URL: https://svnweb.freebsd.org/changeset/ports/431428 Log: Add support for xft (on by default) [1] Move the authdir to were is belong: /var/db/xdm and set it via the configure script instead of a ugly symlink Use @postunexec PR: 196462 Reported by: Michael Danilov (mike.d.ft402@gmail.com) Modified: head/x11/xdm/Makefile head/x11/xdm/pkg-plist Modified: head/x11/xdm/Makefile ============================================================================== --- head/x11/xdm/Makefile Fri Jan 13 21:41:25 2017 (r431427) +++ head/x11/xdm/Makefile Fri Jan 13 22:24:43 2017 (r431428) @@ -2,7 +2,7 @@ PORTNAME= xdm PORTVERSION= 1.1.11 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -13,7 +13,9 @@ LICENSE= MIT XORG_CAT= app USE_XORG= xmu x11 xau xinerama xpm xdmcp xt xext xaw CONFIGURE_ARGS+= --with-xdmconfigdir=${PREFIX}/lib/X11/xdm \ - --with-xdmscriptdir=${PREFIX}/lib/X11/xdm + --with-xdmscriptdir=${PREFIX}/lib/X11/xdm \ + --with-authdir=/var/db/xdm + USES= cpe libtool CPE_PRODUCT= x_display_manager CPE_VENDOR= x @@ -23,11 +25,15 @@ CFFILES= GiveConsole TakeConsole Xaccess OPTIONS_SUB= yes -OPTIONS_DEFINE= XDMSHELL +OPTIONS_DEFINE= XDMSHELL XFT +OPTIONS_DEFAULT= XFT XDMSHELL_DESC= Install xdmshell XDMSHELL_CONFIGURE_ENABLE= xdmshell +XFT_USE= xorg=xft +XFT_CONFIGURE_WITH= xft + INSTALL_TARGET= install-strip post-patch: @@ -44,7 +50,6 @@ post-install: .for f in ${CFFILES} @${MV} ${STAGEDIR}${PREFIX}/lib/X11/xdm/${f} ${STAGEDIR}${PREFIX}/lib/X11/xdm/${f}.sample .endfor - @${MKDIR} ${STAGEDIR}/var/lib/xdm/authdir - @${LN} -sf /var/lib/xdm/authdir ${STAGEDIR}${PREFIX}/lib/X11/xdm/authdir + @${MKDIR} ${STAGEDIR}/var/db/xdm .include Modified: head/x11/xdm/pkg-plist ============================================================================== --- head/x11/xdm/pkg-plist Fri Jan 13 21:41:25 2017 (r431427) +++ head/x11/xdm/pkg-plist Fri Jan 13 22:24:43 2017 (r431428) @@ -1,6 +1,5 @@ bin/xdm %%XDMSHELL%%bin/xdmshell -lib/X11/xdm/authdir lib/X11/xdm/chooser lib/X11/xdm/libXdmGreet.so lib/X11/xdm/pixmaps/xorg-bw.xpm @@ -19,7 +18,6 @@ share/X11/app-defaults/Chooser @sample lib/X11/xdm/Xstartup.sample @sample lib/X11/xdm/Xwilling.sample @sample lib/X11/xdm/xdm-config.sample -@unexec rm -rf /var/lib/xdm/authdir/* 2>/dev/null || true -@dir /var/lib/xdm/authdir -@dir /var/lib/xdm -@dir /var/lib +@postunexec rm -rf /var/db/xdm/* 2>/dev/null || true +@dir /var/db/xdm +@dir /var/db