aboutsummaryrefslogtreecommitdiffstats
path: root/x11/xdm
diff options
context:
space:
mode:
authorzeising <zeising@FreeBSD.org>2013-12-16 19:11:09 +0800
committerzeising <zeising@FreeBSD.org>2013-12-16 19:11:09 +0800
commit30e10e1d3c1d2aba115571f87754d3a229fa9391 (patch)
tree2df88f8b6e2af92b78ac24eb382268b7c290efab /x11/xdm
parentda7a4c20a4d3dae187b71915971ffc8f2332f201 (diff)
downloadfreebsd-ports-gnome-30e10e1d3c1d2aba115571f87754d3a229fa9391.tar.gz
freebsd-ports-gnome-30e10e1d3c1d2aba115571f87754d3a229fa9391.tar.zst
freebsd-ports-gnome-30e10e1d3c1d2aba115571f87754d3a229fa9391.zip
Switch FreeBSD CURRENT to use the new xorg stack (WITH_NEW_XORG=) [0]
If the old xorg stack is still needed, it is possible to add WITHOUT_NEW_XORG= to /etc/make.conf to get the old version. Update several xorg related ports, including: x11/libxcb 1.9.1 -> 1.9.3 graphics/libdrm 2.4.46 -> 2.4.50 x11/pixman 0.30.2 -> 0.32.4 x11/xkeyboard-config 2.9 -> 2.10.1 x11-drivers/xf86-input-keyboard 1.7.0 -> 1.8.0 Fix dissapearing cursor in xf86-video-vmware [2] Stagify all x11@-owned ports Bump portrevisions for xf86-* ports due to xserver version change. Fix fallout from updates where needed. Thanks to: all testersi, bdrewery and the FreeBSD x11@ team exp-run by: bdrewery [1] PR: ports/184684 [1], ports/181385 [2] Submitted by: Douglas Carmichael <dcarmich@dcarmichael.net> [2] Approved by: portmgr (bdrewery), core (jhb) [0]
Diffstat (limited to 'x11/xdm')
-rw-r--r--x11/xdm/Makefile8
-rw-r--r--x11/xdm/pkg-plist2
2 files changed, 4 insertions, 6 deletions
diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile
index 8e8de415b1c1..938efb90a030 100644
--- a/x11/xdm/Makefile
+++ b/x11/xdm/Makefile
@@ -14,20 +14,16 @@ USE_XORG= xmu x11 xau xinerama xpm xdmcp xt xext xaw
CONFIGURE_ARGS+= --with-xdmconfigdir=${EXAMPLESDIR} \
--with-xdmscriptdir=${EXAMPLESDIR}
-MAN1= xdm.1
-
CFFILES= GiveConsole TakeConsole Xaccess Xreset Xresources \
Xservers Xsession Xsetup_0 Xstartup Xwilling xdm-config
OPTIONS_DEFINE= XDMSHELL
XDMSHELL_DESC= Install xdmshell
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MXDMSHELL}
CONFIGURE_ARGS+=--enable-xdmshell
-MAN1+= xdmshell.1
PLIST_SUB+= XDMSHELL=""
.else
CONFIGURE_ARGS+=--disable-xdmshell
@@ -50,9 +46,9 @@ post-configure:
post-install:
.for f in ${CFFILES}
- ${CP} -n ${EXAMPLESDIR}/$f ${PREFIX}/lib/X11/xdm/$f || ${TRUE}
+ ${CP} -n ${EXAMPLESDIR}/$f ${STAGEDIR}${PREFIX}/lib/X11/xdm/$f || ${TRUE}
.endfor
${MKDIR} /var/lib/xdm/authdir
- ${LN} -sf /var/lib/xdm/authdir ${PREFIX}/lib/X11/xdm/authdir
+ ${LN} -sf /var/lib/xdm/authdir ${STAGEDIR}${PREFIX}/lib/X11/xdm/authdir
.include <bsd.port.mk>
diff --git a/x11/xdm/pkg-plist b/x11/xdm/pkg-plist
index 5dcf7e385441..a360f42e8af7 100644
--- a/x11/xdm/pkg-plist
+++ b/x11/xdm/pkg-plist
@@ -6,6 +6,8 @@ lib/X11/xdm/libXdmGreet.la
lib/X11/xdm/libXdmGreet.so
lib/X11/xdm/pixmaps/xorg-bw.xpm
lib/X11/xdm/pixmaps/xorg.xpm
+man/man1/xdm.1.gz
+%%XDMSHELL%%man/man1/xmdshell.1.gz
share/X11/app-defaults/Chooser
@unexec if cmp -s %D/%%EXAMPLESDIR%%/GiveConsole %D/lib/X11/xdm/GiveConsole; then rm -f %D/lib/X11/xdm/GiveConsole; fi
@unexec if cmp -s %D/%%EXAMPLESDIR%%/TakeConsole %D/lib/X11/xdm/TakeConsole; then rm -f %D/lib/X11/xdm/TakeConsole; fi