diff options
author | Florent Thoumie <flz@FreeBSD.org> | 2007-09-13 19:45:08 +0000 |
---|---|---|
committer | Florent Thoumie <flz@FreeBSD.org> | 2007-09-13 19:45:08 +0000 |
commit | 62df320cc3d1faf415675ee470a2b6338548e00b (patch) | |
tree | 6eb76e71941e2aad2fb558ec0436f85cf000c6f5 /x11/xdm | |
parent | Take over maintainership. (diff) |
- Update X.org ports to 7.3.
- Mark XFree86-4 as DEPRECATED with EXPIRATION_DATE set to 2007-12-25.
I hope that nobody will be bored enough on Christmas to remove them on
that day.
Tested by: vehemens, Rene Ladan, Beech Rintoul, sarek on x11@
Notes
Notes:
svn path=/head/; revision=199427
Diffstat (limited to 'x11/xdm')
-rw-r--r-- | x11/xdm/Makefile | 9 | ||||
-rw-r--r-- | x11/xdm/distinfo | 6 | ||||
-rw-r--r-- | x11/xdm/files/patch-config_Makefile.in | 68 | ||||
-rw-r--r-- | x11/xdm/files/patch-session.c | 43 |
4 files changed, 6 insertions, 120 deletions
diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile index 67578d1a322a..41d073fdf8f9 100644 --- a/x11/xdm/Makefile +++ b/x11/xdm/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xdm -PORTVERSION= 1.1.4 -PORTREVISION= 3 +PORTVERSION= 1.1.6 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -15,16 +14,14 @@ COMMENT= X.Org X display manager XORG_CAT= app USE_XORG= xmu x11 xau xinerama xpm xdmcp xt xext xaw -MAKE_ENV= EXAMPLESDIR=${EXAMPLESDIR} +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 -post-patch: - ${REINPLACE_CMD} -e "s,XDMCONFIGDIR,${PREFIX}/lib/X11/xdm,g" ${WRKSRC}/config/Xreset.cpp ${WRKSRC}/config/Xstartup.cpp - post-install: .for f in ${CFFILES} ${CP} -n ${EXAMPLESDIR}/$f ${PREFIX}/lib/X11/xdm/$f diff --git a/x11/xdm/distinfo b/x11/xdm/distinfo index 422010e75603..e689ef94eb86 100644 --- a/x11/xdm/distinfo +++ b/x11/xdm/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xdm-1.1.4.tar.bz2) = a2b4c280f3e324d081a0d9ed76a8a123 -SHA256 (xorg/app/xdm-1.1.4.tar.bz2) = 928238ea20e074372659b2902de0e0d754083196911319319795fdbfd1ca6073 -SIZE (xorg/app/xdm-1.1.4.tar.bz2) = 386272 +MD5 (xorg/app/xdm-1.1.6.tar.bz2) = c89f8bc74fda4d19e5f374f59c88810f +SHA256 (xorg/app/xdm-1.1.6.tar.bz2) = c41ac89d9da5c3f5424e9c4871d363ff17acf0fd2a46830931c447ba0b5a8bcd +SIZE (xorg/app/xdm-1.1.6.tar.bz2) = 394175 diff --git a/x11/xdm/files/patch-config_Makefile.in b/x11/xdm/files/patch-config_Makefile.in deleted file mode 100644 index 1a27563f4d7b..000000000000 --- a/x11/xdm/files/patch-config_Makefile.in +++ /dev/null @@ -1,68 +0,0 @@ ---- config/Makefile.in.orig Tue Feb 6 20:47:18 2007 -+++ config/Makefile.in Thu Jun 21 15:08:28 2007 -@@ -370,13 +370,13 @@ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - install-dist_xdmscriptSCRIPTS: $(dist_xdmscript_SCRIPTS) - @$(NORMAL_INSTALL) -- test -z "$(xdmscriptdir)" || $(mkdir_p) "$(DESTDIR)$(xdmscriptdir)" -+ test -z "$(EXAMPLESDIR)" || $(mkdir_p) "$(DESTDIR)$(EXAMPLESDIR)" - @list='$(dist_xdmscript_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ -- echo " $(dist_xdmscriptSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(xdmscriptdir)/$$f'"; \ -- $(dist_xdmscriptSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(xdmscriptdir)/$$f"; \ -+ echo " $(dist_xdmscriptSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(EXAMPLESDIR)/$$f'"; \ -+ $(dist_xdmscriptSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(EXAMPLESDIR)/$$f"; \ - else :; fi; \ - done - -@@ -389,13 +389,13 @@ - done - install-xdmscriptSCRIPTS: $(xdmscript_SCRIPTS) - @$(NORMAL_INSTALL) -- test -z "$(xdmscriptdir)" || $(mkdir_p) "$(DESTDIR)$(xdmscriptdir)" -+ test -z "$(EXAMPLESDIR)" || $(mkdir_p) "$(DESTDIR)$(EXAMPLESDIR)" - @list='$(xdmscript_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ -- echo " $(xdmscriptSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(xdmscriptdir)/$$f'"; \ -- $(xdmscriptSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(xdmscriptdir)/$$f"; \ -+ echo " $(xdmscriptSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(EXAMPLESDIR)/$$f'"; \ -+ $(xdmscriptSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(EXAMPLESDIR)/$$f"; \ - else :; fi; \ - done - -@@ -435,12 +435,12 @@ - done - install-dist_xdmconfigDATA: $(dist_xdmconfig_DATA) - @$(NORMAL_INSTALL) -- test -z "$(xdmconfigdir)" || $(mkdir_p) "$(DESTDIR)$(xdmconfigdir)" -+ test -z "$(EXAMPLESDIR)" || $(mkdir_p) "$(DESTDIR)$(EXAMPLESDIR)" - @list='$(dist_xdmconfig_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ -- echo " $(dist_xdmconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xdmconfigdir)/$$f'"; \ -- $(dist_xdmconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xdmconfigdir)/$$f"; \ -+ echo " $(dist_xdmconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(EXAMPLESDIR)/$$f'"; \ -+ $(dist_xdmconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(EXAMPLESDIR)/$$f"; \ - done - - uninstall-dist_xdmconfigDATA: -@@ -452,12 +452,12 @@ - done - install-xdmconfigDATA: $(xdmconfig_DATA) - @$(NORMAL_INSTALL) -- test -z "$(xdmconfigdir)" || $(mkdir_p) "$(DESTDIR)$(xdmconfigdir)" -+ test -z "$(EXAMPLESDIR)" || $(mkdir_p) "$(DESTDIR)$(EXAMPLESDIR)" - @list='$(xdmconfig_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ -- echo " $(xdmconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xdmconfigdir)/$$f'"; \ -- $(xdmconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xdmconfigdir)/$$f"; \ -+ echo " $(xdmconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(EXAMPLESDIR)/$$f'"; \ -+ $(xdmconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(EXAMPLESDIR)/$$f"; \ - done - - uninstall-xdmconfigDATA: diff --git a/x11/xdm/files/patch-session.c b/x11/xdm/files/patch-session.c deleted file mode 100644 index a657f9cdcc44..000000000000 --- a/x11/xdm/files/patch-session.c +++ /dev/null @@ -1,43 +0,0 @@ ---- session.c.orig Sun Jun 3 22:49:51 2007 -+++ session.c Sun Jun 3 22:56:06 2007 -@@ -543,6 +543,7 @@ - pid_t pid; - #ifdef HAS_SETUSERCONTEXT - struct passwd* pwd; -+ extern char **environ; - #endif - #ifdef USE_PAM - pam_handle_t *pamh = thepamh (); -@@ -627,6 +628,7 @@ - return (0); - } - #endif /* QNX4 doesn't support multi-groups, no initgroups() */ -+#endif /* !HAS_SETUSERCONTEXT */ - #ifdef USE_PAM - if (pamh) { - long i; -@@ -647,6 +649,7 @@ - - } - #endif -+#ifndef HAS_SETUSERCONTEXT - if (setuid(verify->uid) < 0) { - LogError ("setuid %d (user \"%s\") failed, errno=%d\n", - verify->uid, name, errno); -@@ -657,6 +660,8 @@ - * Set the user's credentials: uid, gid, groups, - * environment variables, resource limits, and umask. - */ -+ /* destroy user environment before calling setusercontext */ -+ environ = verify->userEnviron; - pwd = getpwnam(name); - if (pwd) { - if (setusercontext(NULL, pwd, pwd->pw_uid, LOGIN_SETALL) < 0) { -@@ -664,6 +669,7 @@ - errno); - return (0); - } -+ verify->userEnviron = environ; - endpwent(); - } else { - LogError ("getpwnam for \"%s\" failed, errno=%d\n", name, errno); |