Attachment 184929 Details for Bug 221160 – xdm-1.1.11_8.patch

[patch] xdm-1.1.11_8.patch

xdm-1.1.11_8.patch (text/plain), 2.87 KB, created by Andrew Romanenko on 2017-08-01 22:06:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Romanenko

Created: 2017-08-01 22:06:19 UTC

Size: 2.87 KB

patch

obsolete

>Index: x11/xdm/Makefile
>===================================================================
>--- x11/xdm/Makefile	(revision 447074)
>+++ x11/xdm/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	xdm
> PORTVERSION=	1.1.11
>-PORTREVISION=	7
>+PORTREVISION=	8
> CATEGORIES=	x11
> 
> MAINTAINER=	x11@FreeBSD.org
>@@ -11,12 +11,15 @@
> 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 \
>+CONFIGURE_ARGS+=	--with-xdmconfigdir=${PREFIX}/etc/X11/xdm \
>+			--with-xdmscriptdir=${PREFIX}/etc/X11/xdm \
>+			--with-xdmlibdir=${PREFIX}/lib/X11/xdm \
>+			--with-pixmapdir=${PREFIX}/share/pixmaps \
> 			--with-authdir=/var/db/xdm
> 
> USES=		cpe libtool
>+USE_XORG=	xmu x11 xau xinerama xpm xdmcp xt xext xaw
>+USE_LDCONFIG=	yes
> CPE_PRODUCT=	x_display_manager
> CPE_VENDOR=	x
> 
>@@ -39,16 +42,11 @@
> post-patch:
> 	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
> 		${WRKSRC}/configure
>-	@${REINPLACE_CMD} -e "s|XDMCONFIGDIR/|${PREFIX}/lib/X11/xdm/|" \
>-		-e "s|XDMSCRIPTDIR/|${PREFIX}/lib/X11/xdm/|" \
>-			${WRKSRC}/config/xdm-config.cpp \
>-			${WRKSRC}/config/Xstartup.cpp \
>-			${WRKSRC}/config/Xreset.cpp
> 	@${REINPLACE_CMD} -e "s|@DESTDIR@||" ${WRKSRC}/Makefile.in
> 
> post-install:
> .for f in ${CFFILES}
>-	@${MV} ${STAGEDIR}${PREFIX}/lib/X11/xdm/${f} ${STAGEDIR}${PREFIX}/lib/X11/xdm/${f}.sample
>+	@${CP} ${STAGEDIR}${PREFIX}/etc/X11/xdm/${f} ${STAGEDIR}${PREFIX}/etc/X11/xdm/${f}.sample
> .endfor
> 	@${MKDIR} ${STAGEDIR}/var/db/xdm
> 
>Index: x11/xdm/pkg-plist
>===================================================================
>--- x11/xdm/pkg-plist	(revision 447074)
>+++ x11/xdm/pkg-plist	(working copy)
>@@ -2,22 +2,22 @@
> %%XDMSHELL%%bin/xdmshell
> lib/X11/xdm/chooser
> lib/X11/xdm/libXdmGreet.so
>-lib/X11/xdm/pixmaps/xorg-bw.xpm
>-lib/X11/xdm/pixmaps/xorg.xpm
>+share/pixmaps/xorg-bw.xpm
>+share/pixmaps/xorg.xpm
> man/man1/xdm.1.gz
> %%XDMSHELL%%man/man1/xdmshell.1.gz
> share/X11/app-defaults/Chooser
>-@sample lib/X11/xdm/GiveConsole.sample
>-@sample lib/X11/xdm/TakeConsole.sample
>-@sample lib/X11/xdm/Xaccess.sample
>-@sample lib/X11/xdm/Xreset.sample
>-@sample lib/X11/xdm/Xresources.sample
>-@sample lib/X11/xdm/Xservers.sample
>-@sample lib/X11/xdm/Xsession.sample
>-@sample lib/X11/xdm/Xsetup_0.sample
>-@sample lib/X11/xdm/Xstartup.sample
>-@sample lib/X11/xdm/Xwilling.sample
>-@sample lib/X11/xdm/xdm-config.sample
>+@sample etc/X11/xdm/GiveConsole.sample
>+@sample etc/X11/xdm/TakeConsole.sample
>+@sample etc/X11/xdm/Xaccess.sample
>+@sample etc/X11/xdm/Xreset.sample
>+@sample etc/X11/xdm/Xresources.sample
>+@sample etc/X11/xdm/Xservers.sample
>+@sample etc/X11/xdm/Xsession.sample
>+@sample etc/X11/xdm/Xsetup_0.sample
>+@sample etc/X11/xdm/Xstartup.sample
>+@sample etc/X11/xdm/Xwilling.sample
>+@sample etc/X11/xdm/xdm-config.sample
> @postunexec rm -rf /var/db/xdm/* 2>/dev/null || true
> @dir /var/db/xdm
> @dir /var/db

Actions: View | Diff

Attachments on bug 221160: 184929