[Midnightbsd-cvs] mports [24178] trunk/x11/xdm: fix build
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Sep 4 08:36:17 EDT 2018
Revision: 24178
http://svnweb.midnightbsd.org/mports/?rev=24178
Author: laffer1
Date: 2018-09-04 08:36:16 -0400 (Tue, 04 Sep 2018)
Log Message:
-----------
fix build
Modified Paths:
--------------
trunk/x11/xdm/Makefile
trunk/x11/xdm/files/patch-config-Makefile.in
trunk/x11/xdm/files/patch-config-Xresources.cpp
trunk/x11/xdm/files/patch-greeter-greet.c
trunk/x11/xdm/files/patch-xdm_session.c
trunk/x11/xdm/pkg-plist
Modified: trunk/x11/xdm/Makefile
===================================================================
--- trunk/x11/xdm/Makefile 2018-09-04 12:24:48 UTC (rev 24177)
+++ trunk/x11/xdm/Makefile 2018-09-04 12:36:16 UTC (rev 24178)
@@ -7,49 +7,46 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= X.Org X display manager
+
LICENSE= mit
XORG_CAT= app
-USE_XORG= xmu x11 xau xinerama xpm xdmcp xt xext xaw
-CONFIGURE_ARGS+= --with-xdmconfigdir=${EXAMPLESDIR} \
- --with-xdmscriptdir=${EXAMPLESDIR}
-CONFIGURE_TARGET= ${ARCH}-portbld-freebsd10.4
+USES= cpe libtool
+USE_LDCONFIG= yes
+USE_XORG= x11 xau xaw xdmcp xext xinerama xmu xpm xt
+CPE_PRODUCT= x_display_manager
+CPE_VENDOR= x
+CONFIGURE_ARGS+= --with-xdmconfigdir=${PREFIX}/etc/X11/xdm \
+ --with-xdmscriptdir=${PREFIX}/etc/X11/xdm \
+ --with-pixmapdir=${PREFIX}/share/pixmaps \
+ --with-authdir=/var/db/xdm
+
CFFILES= GiveConsole TakeConsole Xaccess Xreset Xresources \
Xservers Xsession Xsetup_0 Xstartup Xwilling xdm-config
-OPTIONS_DEFINE= XDMSHELL
+OPTIONS_SUB= yes
+
+OPTIONS_DEFINE= XDMSHELL XFT
+OPTIONS_DEFAULT= XFT
XDMSHELL_DESC= Install xdmshell
-.include <bsd.mport.options.mk>
+XDMSHELL_CONFIGURE_ENABLE= xdmshell
-.if ${PORT_OPTIONS:MXDMSHELL}
-CONFIGURE_ARGS+=--enable-xdmshell
-MAN1+= xdmshell.1
-PLIST_SUB+= XDMSHELL=""
-.else
-CONFIGURE_ARGS+=--disable-xdmshell
-PLIST_SUB+= XDMSHELL="@comment "
-.endif
+XFT_USE= xorg=xft
+XFT_CONFIGURE_WITH= xft
+INSTALL_TARGET= install-strip
+
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-configure:
- @${REINPLACE_CMD} -e "s|${EXAMPLESDIR}|${PREFIX}/lib/X11/xdm|" \
- ${WRKSRC}/config.h
-
post-install:
.for f in ${CFFILES}
- ${CP} -n ${EXAMPLESDIR}/$f ${PREFIX}/lib/X11/xdm/$f || ${TRUE}
+ @${MV} ${STAGEDIR}${PREFIX}/etc/X11/xdm/${f} ${STAGEDIR}${PREFIX}/etc/X11/xdm/${f}.sample
.endfor
- (cd ${PREFIX}/lib/X11/xdm && ${LN} -sf /var/lib/xdm/authdir authdir)
+ @${MKDIR} ${STAGEDIR}/var/db/xdm
.include <bsd.port.mk>
Modified: trunk/x11/xdm/files/patch-config-Makefile.in
===================================================================
--- trunk/x11/xdm/files/patch-config-Makefile.in 2018-09-04 12:24:48 UTC (rev 24177)
+++ trunk/x11/xdm/files/patch-config-Makefile.in 2018-09-04 12:36:16 UTC (rev 24178)
@@ -1,6 +1,6 @@
---- config/Makefile.in.orig 2012-09-27 10:37:59.000000000 +0200
-+++ config/Makefile.in 2012-09-27 10:38:41.000000000 +0200
-@@ -296,7 +296,7 @@
+--- config/Makefile.in.orig 2011-09-25 07:42:16 UTC
++++ config/Makefile.in
+@@ -296,7 +296,7 @@ WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
# output lines with trailing backslashes.
# Allow XHASH to always be substituted, even in cases where XCOMM isn't.
CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \
Modified: trunk/x11/xdm/files/patch-config-Xresources.cpp
===================================================================
--- trunk/x11/xdm/files/patch-config-Xresources.cpp 2018-09-04 12:24:48 UTC (rev 24177)
+++ trunk/x11/xdm/files/patch-config-Xresources.cpp 2018-09-04 12:36:16 UTC (rev 24178)
@@ -1,6 +1,6 @@
---- config/Xresources.cpp.orig 2012-09-27 10:41:28.000000000 +0200
-+++ config/Xresources.cpp 2012-09-27 10:41:56.000000000 +0200
-@@ -60,9 +60,9 @@
+--- config/Xresources.cpp.orig 2011-09-25 07:35:47 UTC
++++ config/Xresources.cpp
+@@ -60,9 +60,9 @@ xlogin*hiColor: black
XHASHendif
#ifdef XPM
XHASHif PLANES >= 8
Modified: trunk/x11/xdm/files/patch-greeter-greet.c
===================================================================
--- trunk/x11/xdm/files/patch-greeter-greet.c 2018-09-04 12:24:48 UTC (rev 24177)
+++ trunk/x11/xdm/files/patch-greeter-greet.c 2018-09-04 12:36:16 UTC (rev 24178)
@@ -1,6 +1,6 @@
---- greeter/greet.c.orig Sat Feb 3 01:25:25 2007
-+++ greeter/greet.c Wed Apr 4 14:03:31 2007
-@@ -612,6 +617,7 @@ greet_user_rtn GreetUser(
+--- greeter/greet.c.orig 2011-09-25 07:35:47 UTC
++++ greeter/greet.c
+@@ -639,6 +639,7 @@ greet_user_rtn GreetUser(
}
DeleteXloginResources (d, *dpy);
CloseGreet (d);
@@ -8,12 +8,3 @@
Debug ("Greet loop finished\n");
/*
* Run system-wide initialization file
-@@ -697,6 +704,8 @@ static int pamconv(int num_msg,
- m = *msg;
- r = *response;
-
-+ if (login == NULL) goto pam_error;
-+
- for (i = 0; i < num_msg; i++ , m++ , r++) {
- char *username;
- int promptId = 0;
Modified: trunk/x11/xdm/files/patch-xdm_session.c
===================================================================
--- trunk/x11/xdm/files/patch-xdm_session.c 2018-09-04 12:24:48 UTC (rev 24177)
+++ trunk/x11/xdm/files/patch-xdm_session.c 2018-09-04 12:36:16 UTC (rev 24178)
@@ -1,14 +1,14 @@
---- xdm/session.c.orig Sun Jun 3 22:49:51 2007
-+++ xdm/session.c Sun Jun 3 22:56:06 2007
-@@ -543,6 +543,7 @@
+--- xdm/session.c.orig 2011-09-25 07:35:47 UTC
++++ xdm/session.c
+@@ -575,6 +575,7 @@ StartClient (
pid_t pid;
- #ifdef HAS_SETUSERCONTEXT
+ #ifdef HAVE_SETUSERCONTEXT
struct passwd* pwd;
+ extern char **environ;
#endif
#ifdef USE_PAM
pam_handle_t *pamh = thepamh ();
-@@ -657,6 +660,8 @@
+@@ -695,6 +696,8 @@ StartClient (
* Set the user's credentials: uid, gid, groups,
* environment variables, resource limits, and umask.
*/
@@ -17,11 +17,11 @@
pwd = getpwnam(name);
if (pwd) {
if (setusercontext(NULL, pwd, pwd->pw_uid, LOGIN_SETALL) < 0) {
-@@ -664,6 +669,7 @@
- errno);
+@@ -702,6 +705,7 @@ StartClient (
+ name, _SysErrorMsg (errno));
return (0);
}
+ verify->userEnviron = environ;
endpwent();
} else {
- LogError ("getpwnam for \"%s\" failed, errno=%d\n", name, errno);
+ LogError ("getpwnam for \"%s\" failed: %s\n",
Modified: trunk/x11/xdm/pkg-plist
===================================================================
--- trunk/x11/xdm/pkg-plist 2018-09-04 12:24:48 UTC (rev 24177)
+++ trunk/x11/xdm/pkg-plist 2018-09-04 12:36:16 UTC (rev 24178)
@@ -1,53 +1,23 @@
bin/xdm
%%XDMSHELL%%bin/xdmshell
-lib/X11/xdm/authdir
+ at sample etc/X11/xdm/GiveConsole.sample
+ at sample etc/X11/xdm/TakeConsole.sample
+ at sample etc/X11/xdm/Xaccess.sample
+ at sample etc/X11/xdm/Xreset.sample
+ at sample etc/X11/xdm/Xresources.sample
+ at sample etc/X11/xdm/Xservers.sample
+ at sample etc/X11/xdm/Xsession.sample
+ at sample etc/X11/xdm/Xsetup_0.sample
+ at sample etc/X11/xdm/Xstartup.sample
+ at sample etc/X11/xdm/Xwilling.sample
+ at sample etc/X11/xdm/xdm-config.sample
lib/X11/xdm/chooser
-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/xdmshell.1.gz
share/X11/app-defaults/Chooser
- at unexec if cmp -s %D/%%EXAMPLESDIR%%/GiveConsole %D/lib/X11/xdm/GiveConsole; then rm -f %D/lib/X11/xdm/GiveConsole; fi
- at unexec if cmp -s %D/%%EXAMPLESDIR%%/TakeConsole %D/lib/X11/xdm/TakeConsole; then rm -f %D/lib/X11/xdm/TakeConsole; fi
- at unexec if cmp -s %D/%%EXAMPLESDIR%%/Xaccess %D/lib/X11/xdm/Xaccess; then rm -f %D/lib/X11/xdm/Xaccess; fi
- at unexec if cmp -s %D/%%EXAMPLESDIR%%/Xreset %D/lib/X11/xdm/Xreset; then rm -f %D/lib/X11/xdm/Xreset; fi
- at unexec if cmp -s %D/%%EXAMPLESDIR%%/Xresources %D/lib/X11/xdm/Xresources; then rm -f %D/lib/X11/xdm/Xresources; fi
- at unexec if cmp -s %D/%%EXAMPLESDIR%%/Xservers %D/lib/X11/xdm/Xservers; then rm -f %D/lib/X11/xdm/Xservers; fi
- at unexec if cmp -s %D/%%EXAMPLESDIR%%/Xsession %D/lib/X11/xdm/Xsession; then rm -f %D/lib/X11/xdm/Xsession; fi
- at unexec if cmp -s %D/%%EXAMPLESDIR%%/Xsetup_0 %D/lib/X11/xdm/Xsetup_0; then rm -f %D/lib/X11/xdm/Xsetup_0; fi
- at unexec if cmp -s %D/%%EXAMPLESDIR%%/Xstartup %D/lib/X11/xdm/Xstartup; then rm -f %D/lib/X11/xdm/Xstartup; fi
- at unexec if cmp -s %D/%%EXAMPLESDIR%%/Xwilling %D/lib/X11/xdm/Xwilling; then rm -f %D/lib/X11/xdm/Xwilling; fi
- at unexec if cmp -s %D/%%EXAMPLESDIR%%/xdm-config %D/lib/X11/xdm/xdm-config; then rm -f %D/lib/X11/xdm/xdm-config; fi
-%%EXAMPLESDIR%%/GiveConsole
-%%EXAMPLESDIR%%/TakeConsole
-%%EXAMPLESDIR%%/Xaccess
-%%EXAMPLESDIR%%/Xreset
-%%EXAMPLESDIR%%/Xresources
-%%EXAMPLESDIR%%/Xservers
-%%EXAMPLESDIR%%/Xsession
-%%EXAMPLESDIR%%/Xsetup_0
-%%EXAMPLESDIR%%/Xstartup
-%%EXAMPLESDIR%%/Xwilling
-%%EXAMPLESDIR%%/xdm-config
- at exec cp -n %D/%%EXAMPLESDIR%%/GiveConsole %D/lib/X11/xdm/GiveConsole
- at exec cp -n %D/%%EXAMPLESDIR%%/TakeConsole %D/lib/X11/xdm/TakeConsole
- at exec cp -n %D/%%EXAMPLESDIR%%/Xaccess %D/lib/X11/xdm/Xaccess
- at exec cp -n %D/%%EXAMPLESDIR%%/Xreset %D/lib/X11/xdm/Xreset
- at exec cp -n %D/%%EXAMPLESDIR%%/Xresources %D/lib/X11/xdm/Xresources
- at exec cp -n %D/%%EXAMPLESDIR%%/Xservers %D/lib/X11/xdm/Xservers
- at exec cp -n %D/%%EXAMPLESDIR%%/Xsession %D/lib/X11/xdm/Xsession
- at exec cp -n %D/%%EXAMPLESDIR%%/Xsetup_0 %D/lib/X11/xdm/Xsetup_0
- at exec cp -n %D/%%EXAMPLESDIR%%/Xstartup %D/lib/X11/xdm/Xstartup
- at exec cp -n %D/%%EXAMPLESDIR%%/Xwilling %D/lib/X11/xdm/Xwilling
- at exec cp -n %D/%%EXAMPLESDIR%%/xdm-config %D/lib/X11/xdm/xdm-config
- at exec mkdir -p /var/lib/xdm/authdir
- at dirrmtry share/X11/app-defaults
- at dirrmtry share/X11
- at unexec rm -f /var/lib/xdm/authdir/authfiles/* 2>/dev/null || true
- at unexec rmdir /var/lib/xdm/authdir/authfiles 2>/dev/null || true
- at unexec rmdir /var/lib/xdm/authdir 2>/dev/null
- at unexec rmdir /var/lib/xdm 2>/dev/null
- at dirrm lib/X11/xdm/pixmaps
- at dirrm lib/X11/xdm
- at dirrm %%EXAMPLESDIR%%
+share/pixmaps/xorg-bw.xpm
+share/pixmaps/xorg.xpm
+ at postunexec rm -rf /var/db/xdm/* 2>/dev/null || true
+ at dir /var/db/xdm
+ at dir /var/db
More information about the Midnightbsd-cvs
mailing list