From kiri@pis.toba-cmt.ac.jp  Sat Jan  9 22:17:41 1999
Received: from pis.toba-cmt.ac.jp (pis.toba-cmt.ac.jp [202.26.248.77])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id WAA05691
          for <FreeBSD-gnats-submit@freebsd.org>; Sat, 9 Jan 1999 22:17:40 -0800 (PST)
          (envelope-from kiri@pis.toba-cmt.ac.jp)
Received: (from kiri@localhost)
	by pis.toba-cmt.ac.jp (8.9.1/8.8.8) id PAA16413;
	Sun, 10 Jan 1999 15:30:20 +0900 (JST)
	(envelope-from kiri)
Message-Id: <199901100630.PAA16413@pis.toba-cmt.ac.jp>
Date: Sun, 10 Jan 1999 15:30:20 +0900 (JST)
From: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
Reply-To: kiri@pis.toba-cmt.ac.jp
To: FreeBSD-gnats-submit@freebsd.org
Subject: Update ports: XEmacs-20.4
X-Send-Pr-Version: 3.2

>Number:         9419
>Category:       ports
>Synopsis:       Update ports: XEmacs-20.4
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan  9 22:20:01 PST 1999
>Closed-Date:    Sun Jan 17 19:04:31 PST 1999
>Last-Modified:  Sun Jan 17 19:05:40 PST 1999
>Originator:     KIRIYAMA Kazuhiko
>Release:        FreeBSD 3.0-CURRENT i386
>Organization:
Toba National College of Maritime Technology.
	Department of Electronic Mechanical Engineering
>Environment:
>Description:
Updated the port XEmacs-20.4. 

Current modifications are :

(1) Change RUN_DEPENDS so as to correct to create INSTALL_COOKIEs. 
(2) WRKDIRPREFIX inserted for safe.
(3) Change creation for PACKAGE_COOKIEs.

I put the diff from ports-current in "Fix:".
>How-To-Repeat:
>Fix:
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/editors/xemacs-mule/Makefile editors/xemacs-mule/Makefile
--- /usr/ports/current/editors/xemacs-mule/Makefile	Sat Dec 26 19:33:10 1998
+++ editors/xemacs-mule/Makefile	Fri Jan  8 19:28:57 1999
@@ -26,7 +26,7 @@
 		png.2:${PORTSDIR}/graphics/png \
 		compface.1:${PORTSDIR}/mail/faces \
 		${LIB_INPUT_METHOD}
-RUN_DEPENDS=	${PREFIX}/lib/${XEMACS_DIR}/etc/BABYL:${PORTSDIR}/editors/xemacs-mule-common
+RUN_DEPENDS=	${PREFIX}/lib/${XEMACS_DIR}/lisp/x11/x-win-xfree86.elc:${PORTSDIR}/editors/xemacs-mule-common
 
 EXTRACT_ONLY=	xemacs-20.4.tar.gz xemacs-20.4-elc.tar.gz \
 		xemacs-20.4-info.tar.gz xemacs-20.4-mule.tar.gz
@@ -101,6 +101,12 @@
 		${RM} -f ${WRKSRC}/lisp/packages/ps-print.elc; \
 	fi
 	@${GZCAT} ${DISTDIR}/ps-print-jp.el.gz > ${WRKSRC}/lisp/packages/ps-print.el
+.endif
+
+# for xemacs-mule-common in defining ${WRKDIRPREFIX}
+.if !exists(${WRKDIRPREFIX}${.CURDIR}/../../editors/xemacs-mule-common)
+post-build:
+	@${MKDIR} ${WRKDIRPREFIX}${.CURDIR}/../../editors/xemacs-mule-common
 .endif
 
 post-install::
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/editors/xemacs-mule-common/Makefile editors/xemacs-mule-common/Makefile
--- /usr/ports/current/editors/xemacs-mule-common/Makefile	Sat Dec 26 19:33:11 1998
+++ editors/xemacs-mule-common/Makefile	Fri Jan  8 19:27:59 1999
@@ -40,13 +40,10 @@
 	japanese/xemacs-canna+wnn6 \
 	japanese/xemacs-wnn4 \
 	japanese/xemacs-wnn6
-.if exists(${WRKDIRPREFIX}${PORTSDIR}/${dir}/work/.install_done)
-WRKDIR=		${WRKDIRPREFIX}${PORTSDIR}/${dir}/work
-.if !exists(${WRKDIR}/.install_done-${PKGNAME})
-rvalue_touch!=	${TOUCH} ${WRKDIR}/.install_done-${PKGNAME}
-.endif
-.elif exists(${WRKDIRPREFIX}${PORTSDIR}/${dir}/work/.build_done)
-WRKDIR?=	${WRKDIRPREFIX}${PORTSDIR}/${dir}/work
+.if exists(${WRKDIRPREFIX}${.CURDIR}/../../${dir}/work/.install_done)
+WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/../../${dir}/work
+.elif exists(${WRKDIRPREFIX}${.CURDIR}/../../${dir}/work/.build_done)
+WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/../../${dir}/work
 .endif
 .endfor
 WRKSRC= ${WRKDIR}/xemacs-20.4
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: steve 
State-Changed-When: Sun Jan 17 19:04:31 PST 1999 
State-Changed-Why:  
Commited, thanks! 
>Unformatted:
