From owner-freebsd-ports  Mon Jun 19 12:30:28 2000
Delivered-To: freebsd-ports@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id 5E6D037BD66
	for <freebsd-ports@FreeBSD.org>; Mon, 19 Jun 2000 12:30:02 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id MAA32009;
	Mon, 19 Jun 2000 12:30:02 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B225437B84C; Mon, 19 Jun 2000 12:24:21 -0700 (PDT)
Message-Id: <20000619192421.B225437B84C@hub.freebsd.org>
Date: Mon, 19 Jun 2000 12:24:21 -0700 (PDT)
From: tkato@prontomail.ne.jp
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: ports/19382: Update port: x11/wdm
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         19382
>Category:       ports
>Synopsis:       Update port: x11/wdm
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 19 12:30:02 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.0-RELEASE i386
>Organization:
>Environment:
>Description:
- Use USE_AUTOMAKE
- Revert several useless modifications

Remove file:
patches/patch-am  files/xdm-3.3.2-auth.patch

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/x11/wdm/Makefile x11/wdm/Makefile
--- /usr/ports/x11/wdm/Makefile	Mon May  1 21:53:51 2000
+++ x11/wdm/Makefile	Sat Jun 17 04:09:59 2000
@@ -11,16 +11,16 @@
 MASTER_SITES=	http://www.tcscs.com/wdm/wdm/ \
 		http://www.de.freebsd.org/de/gif/bsd/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DAEMONPIC}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	wraster.3:${PORTSDIR}/x11-wm/windowmaker
-BUILD_DEPENDS=	automake:${PORTSDIR}/devel/automake
 
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=	wdm
 USE_X_PREFIX=	yes
-USE_AUTOCONF=	yes
+USE_AUTOMAKE=	yes
+AUTOMAKE=	automake -a -i
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
 			-DCSRG_BASED -DHAS_SETUSERCONTEXT" \
 		LIBS="-L${LOCALBASE}/lib ${LIBPAM}"
@@ -46,14 +46,8 @@
 	@${ECHO_MSG} "To build this port with PAM support, define \"WITH_PAM\"."
 .endif
 
-post-extract:
-	@${CP} ${FILESDIR}/*.patch ${WRKSRC}/patches
-
 post-patch:
 	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/*.man
-
-pre-configure:
-	@(cd ${WRKSRC}; automake -a --include-deps)
 
 post-install:
 	${INSTALL_DATA} ${_DISTDIR}/${DAEMONPIC} ${PREFIX}/lib/X11/wdm/pixmaps
diff -urN /usr/ports/x11/wdm/files/xdm-3.3.2-auth.patch x11/wdm/files/xdm-3.3.2-auth.patch
--- /usr/ports/x11/wdm/files/xdm-3.3.2-auth.patch	Thu Mar  9 02:12:25 2000
+++ x11/wdm/files/xdm-3.3.2-auth.patch	Thu Jan  1 09:00:00 1970
@@ -1,20 +0,0 @@
---- xdm/auth.c	Sat Jan 18 16:02:18 1997
-+++ src/auth.c	Tue Mar  7 23:21:07 2000
-@@ -365,7 +365,7 @@
- 	}
-     	sprintf (d->authFile, "%s/%s/%s/A%s-XXXXXX",
- 		 authDir, authdir1, authdir2, cleanname);
--    	(void) mktemp (d->authFile);
-+    	(void) mkstemp (d->authFile);
-     }
-     return TRUE;
- }
-@@ -1187,7 +1187,7 @@
- 	}
- 	if (lockStatus != LOCK_SUCCESS) {
- 	    sprintf (backup_name, "%s/.XauthXXXXXX", d->userAuthDir);
--	    (void) mktemp (backup_name);
-+	    (void) mkstemp (backup_name);
- 	    lockStatus = XauLockAuth (backup_name, 1, 2, 10);
- 	    Debug ("backup lock is %d\n", lockStatus);
- 	    if (lockStatus == LOCK_SUCCESS) {
diff -urN /usr/ports/x11/wdm/patches/patch-ak x11/wdm/patches/patch-ak
--- /usr/ports/x11/wdm/patches/patch-ak	Thu Mar  9 02:12:29 2000
+++ x11/wdm/patches/patch-ak	Thu Jan  1 09:00:00 1970
@@ -1,10 +0,0 @@
---- src/Makefile.am.orig	Wed Sep  8 23:24:03 1999
-+++ src/Makefile.am	Tue Mar  7 23:20:07 2000
-@@ -268,6 +268,7 @@
- 	patch -p1 <../patches/xdm-3.3.2-resource2.patch
- 	cp -pf ../xdm/greeter/verify.c verify.c
- 	patch -p2 <../patches/xdm-3.3.2-pamwdm.patch
-+	patch -p1 <../patches/xdm-3.3.2-auth.patch
- 	touch LinksDone
- 
- 


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message