cvs commit: ports/x11/wdm Makefile distinfo pkg-plist ports/x11/wdm/files patch-Login.c patch-ab patch-ad patch-ag patch-ai patch-al patch-am patch-an patch-configs::wdm-config.in patch-src::wdm::loghelpers.c

[Norikatsu Shigemura]

On Fri, 11 Jul 2003 15:30:48 -0700
Kris Kennaway <kris at obsecurity.org> wrote:
> > 	Yes. I don't have, too.  wdm must fall back to twm&xterm.
> > 	I confirmed following stream:
> > 		wdm
> > 		/usr/X11R6/lib/X11/wdm/Xsession
> > 		~/.xsession			if you have
> > 		~/.Xclients			if you have
> > 		/usr/X11R6/lib/X11/wdm/Xclients	if system has
> > 		xsm				fall back
> I'll try it again when I get the chance..

	Humm.. Sorry, I noticed that wdm didn't depend on twm/xterm.
	Maybe I hope to fix....
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11/wdm/Makefile,v
retrieving revision 1.57
diff -u -r1.57 Makefile
--- Makefile	11 Jul 2003 18:33:56 -0000	1.57
+++ Makefile	11 Jul 2003 22:37:20 -0000
@@ -19,6 +19,12 @@
 MAINTAINER=	kris at FreeBSD.org
 COMMENT=	WINGs Display Manager; an xdm replacement
 
+.include <bsd.port.pre.mk>
+.if defined(XFREE86_VERSION) && ${XFREE86_VERSION} == 3
+RUN_DEPENDS=	twm:${PORTSDIR}/x11/XFree86
+.else
+RUN_DEPENDS=	twm:${PORTSDIR}/x11/XFree86-4-clients
+.endif
 LIB_DEPENDS=	wraster.4:${PORTSDIR}/x11-wm/windowmaker
 
 USE_BZIP2=	yes
@@ -50,8 +56,6 @@
 WDMDIR=		${PREFIX}/lib/X11/wdm
 
 DAEMONPICS=	beastie.xpm daemon1-HQ-1280x960.jpg
-
-.include <bsd.port.pre.mk>
 
 .if ( ${OSVERSION} >= 500028 ) && !defined(WITHOUT_PAM)
 WITH_PAM=	yes
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -