diff options
| -rw-r--r-- | x11/xdm/Makefile | 15 | ||||
| -rw-r--r-- | x11/xdm/pkg-plist | 8 |
2 files changed, 13 insertions, 10 deletions
diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile index 3fdaa15cc4f9..10e1af586d91 100644 --- a/x11/xdm/Makefile +++ b/x11/xdm/Makefile @@ -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 Xreset Xresources \ 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> diff --git a/x11/xdm/pkg-plist b/x11/xdm/pkg-plist index ed92767ffc69..cb83a950d196 100644 --- a/x11/xdm/pkg-plist +++ b/x11/xdm/pkg-plist @@ -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 |