Date: Fri, 13 Jan 2017 22:24:44 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431428 - head/x11/xdm Message-ID: <201701132224.v0DMOiim000197@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701132224.v0DMOiim000197>