From kiri@pis.toba-cmt.ac.jp  Mon Nov 23 19:15:21 1998
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 TAA25324
          for <FreeBSD-gnats-submit@freebsd.org>; Mon, 23 Nov 1998 19:15:19 -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 MAA02763;
	Tue, 24 Nov 1998 12:26:03 +0900 (JST)
	(envelope-from kiri)
Message-Id: <199811240326.MAA02763@pis.toba-cmt.ac.jp>
Date: Tue, 24 Nov 1998 12:26:03 +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-mule-common-20.4(editors/xemacs-mule-common)
X-Send-Pr-Version: 3.2

>Number:         8827
>Category:       ports
>Synopsis:       Update ports: xemacs-mule-common-20.4(editors/xemacs-mule-common)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    kuriyama
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 23 19:20:01 PST 1998
>Closed-Date:    Fri Dec 25 19:47:32 PST 1998
>Last-Modified:  Fri Dec 25 19:48:05 PST 1998
>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-mule.

Current modifications are :

(1) remove ELF restriction because of japanese/Wnn6-lib available
(2) fetch site corrected
(3) package-cockie correct reasonably

Update files are respecively :

[Add] :
(NONE)
[Delete] :
(NONE)
[Update] :
-rw-r--r--  1    kiri   staff    2613 Nov 24 12:12 editors/xemacs-mule-common/Makefile
-rw-r--r--  1    kiri   staff    3799 Nov 24 12:14 editors/xemacs-mule/Makefile
-rw-r--r--  1    kiri   staff     347 Nov 24 12:16 japanese/xemacs-canna+wnn6/tmp/Makefile
-rw-r--r--  1    kiri   staff     324 Nov 24 12:16 japanese/xemacs-wnn6/Makefile
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-common/Makefile ./Makefile
--- /usr/ports/current/editors/xemacs-mule-common/Makefile	Mon Oct 12 13:31:49 1998
+++ editors/xemacs-mule-common/Makefile	Sun Nov 22 16:30:40 1998
@@ -13,7 +13,7 @@
 		ftp://ftp.lab.kdd.co.jp/xemacs/xemacs-20.4/ \
 		ftp://ftp.xemacs.org/pub/xemacs-20.4/ \
 		ftp://ftp2.xemacs.org/pub/xemacs/xemacs-20.4/ \
-		ftp://ftp.jpl.org/pub/elisp/alpha/
+		ftp://ftp.jpl.org/pub/elisp/
 DISTFILES=	xemacs-20.4.tar.gz xemacs-20.4-elc.tar.gz \
 		xemacs-20.4-info.tar.gz xemacs-20.4-mule.tar.gz \
 		ps-print-jp.el.gz
@@ -22,6 +22,7 @@
 
 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 
+
 .for dir in \
 	editors/xemacs-mule \
 	japanese/xemacs \
@@ -32,6 +33,9 @@
 	japanese/xemacs-wnn6
 .if exists(${.CURDIR}/../../${dir}/work/.install_done)
 WRKDIR=		${.CURDIR}/../../${dir}/work
+.if !exists(${WRKDIR}/.install_done-${PKGNAME})
+rvalue_touch!=	touch ${WRKDIR}/.install_done-${PKGNAME}
+.endif
 .elif exists(${.CURDIR}/../../${dir}/work/.build_done)
 WRKDIR?=	${.CURDIR}/../../${dir}/work
 .endif
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/editors/xemacs-mule/Makefile ./Makefile
--- /usr/ports/current/editors/xemacs-mule/Makefile	Thu Nov 12 02:30:44 1998
+++ editors/xemacs-mule/Makefile	Sun Nov 22 16:31:10 1998
@@ -13,7 +13,7 @@
 		ftp://ftp.lab.kdd.co.jp/xemacs/xemacs-20.4/ \
 		ftp://ftp.xemacs.org/pub/xemacs-20.4/ \
 		ftp://ftp2.xemacs.org/pub/xemacs/xemacs-20.4/ \
-		ftp://ftp.jpl.org/pub/elisp/alpha/
+		ftp://ftp.jpl.org/pub/elisp/
 DISTFILES=	xemacs-20.4.tar.gz xemacs-20.4-elc.tar.gz \
 		xemacs-20.4-info.tar.gz xemacs-20.4-mule.tar.gz \
 		ps-print-jp.el.gz
@@ -26,7 +26,7 @@
 		png.2:${PORTSDIR}/graphics/png \
 		compface.1:${PORTSDIR}/mail/faces \
 		${LIB_INPUT_METHOD}
-RUN_DEPENDS=	${PREFIX}/lib/xemacs-20.4/etc/BABYL:${PORTSDIR}/editors/xemacs-mule-common
+RUN_DEPENDS=	${PREFIX}/lib/${XEMACS_DIR}/etc/BABYL:${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 
@@ -47,7 +47,7 @@
 		--x-libraries=${X11BASE}/lib \
 		--site-libraries='${SITE_LIBRARIES}' \
 		--site-includes='${SITE_INCLUDES}' \
-		--sitelispdir=${PREFIX}/lib/xemacs-20.4/lisp:${PREFIX}/lib/xemacs-20.4/site-lisp:${PREFIX}/lib/xemacs/site-lisp:${PREFIX}/share/emacs/site-lisp \
+		--sitelispdir=${PREFIX}/lib/${XEMACS_DIR}/lisp:${PREFIX}/lib/${XEMACS_DIR}/site-lisp:${PREFIX}/lib/xemacs/site-lisp:${PREFIX}/share/emacs/site-lisp \
 		--infopath=${PREFIX}/lib/xemacs/info:${PREFIX}/info:${X11BASE}/info:/usr/info:${PREFIX}/lib/texmf/doc/info:/usr/lib/texmf/doc:/usr/share/info \
 		${MISC_OPTIONS} ${WITH_INPUT_METHOD} ${WITH_WIDGETS}
 
@@ -55,9 +55,10 @@
 
 INSTALL_TARGET=	install-arch-dep
 
-PLIST_SUB=	XEMACS_DIR=xemacs-20.4
+PLIST_SUB=	XEMACS_DIR=${XEMACS_DIR}
 
 PKGLDIR=	${.CURDIR}/../../editors/xemacs-mule/pkg
+XEMACS_DIR=	xemacs-20.4
 
 .if defined(WNN4)
 SITE_INCLUDES=		${X11BASE}/include
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/japanese/xemacs-canna+wnn6/Makefile ./Makefile
--- /usr/ports/current/japanese/xemacs-canna+wnn6/Makefile	Mon Oct 12 13:32:34 1998
+++ japanese/xemacs-canna+wnn6/Makefile	Thu Nov 19 19:35:50 1998
@@ -7,8 +7,6 @@
 #
 
 PKGNAME=	ja-xemacs-canna+wnn6-20.4
-
-BROKEN_ELF=	Wnn6 has not yet corresponded to ELF
 
 CANNA=		yes
 WNN6=		yes
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/japanese/xemacs-wnn6/Makefile ./Makefile
--- /usr/ports/current/japanese/xemacs-wnn6/Makefile	Mon Oct 12 13:32:34 1998
+++ japanese/xemacs-wnn6/Makefile	Thu Nov 19 19:35:52 1998
@@ -7,8 +7,6 @@
 #
 
 PKGNAME=	ja-xemacs-wnn6-20.4
-
-BROKEN_ELF=	Wnn6 has not yet corresponded to ELF
 
 WNN6=		yes
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->analyzed 
State-Changed-By: kuriyama 
State-Changed-When: Thu Dec 24 03:15:40 PST 1998 
State-Changed-Why:  
I'll handle this. 


Responsible-Changed-From-To: freebsd-ports->kuriyama 
Responsible-Changed-By: kuriyama 
Responsible-Changed-When: Thu Dec 24 03:15:40 PST 1998 
Responsible-Changed-Why:  

From: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
To: freebsd-gnats-submit@freebsd.org, kiri@pis.toba-cmt.ac.jp
Cc:  Subject: Re:ports/8827:Updateports:xemacs-mule-common-20.4(editors/xemacs-mule-common)
Date: 24 Dec 1998 20:40:21 +0900

 Above patches have been obsoleted. Please apply following patches.
 
 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	Thu Nov 12 02:30:44 1998
 +++ editors/xemacs-mule/Makefile	Sun Dec  6 21:03:26 1998
 @@ -13,7 +13,7 @@
  		ftp://ftp.lab.kdd.co.jp/xemacs/xemacs-20.4/ \
  		ftp://ftp.xemacs.org/pub/xemacs-20.4/ \
  		ftp://ftp2.xemacs.org/pub/xemacs/xemacs-20.4/ \
 -		ftp://ftp.jpl.org/pub/elisp/alpha/
 +		ftp://ftp.jpl.org/pub/elisp/
  DISTFILES=	xemacs-20.4.tar.gz xemacs-20.4-elc.tar.gz \
  		xemacs-20.4-info.tar.gz xemacs-20.4-mule.tar.gz \
  		ps-print-jp.el.gz
 @@ -26,7 +26,7 @@
  		png.2:${PORTSDIR}/graphics/png \
  		compface.1:${PORTSDIR}/mail/faces \
  		${LIB_INPUT_METHOD}
 -RUN_DEPENDS=	${PREFIX}/lib/xemacs-20.4/etc/BABYL:${PORTSDIR}/editors/xemacs-mule-common
 +RUN_DEPENDS=	${PREFIX}/lib/${XEMACS_DIR}/etc/BABYL:${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 
 @@ -47,7 +47,7 @@
  		--x-libraries=${X11BASE}/lib \
  		--site-libraries='${SITE_LIBRARIES}' \
  		--site-includes='${SITE_INCLUDES}' \
 -		--sitelispdir=${PREFIX}/lib/xemacs-20.4/lisp:${PREFIX}/lib/xemacs-20.4/site-lisp:${PREFIX}/lib/xemacs/site-lisp:${PREFIX}/share/emacs/site-lisp \
 +		--sitelispdir=${PREFIX}/lib/${XEMACS_DIR}/lisp:${PREFIX}/lib/${XEMACS_DIR}/site-lisp:${PREFIX}/lib/xemacs/site-lisp:${PREFIX}/share/emacs/site-lisp \
  		--infopath=${PREFIX}/lib/xemacs/info:${PREFIX}/info:${X11BASE}/info:/usr/info:${PREFIX}/lib/texmf/doc/info:/usr/lib/texmf/doc:/usr/share/info \
  		${MISC_OPTIONS} ${WITH_INPUT_METHOD} ${WITH_WIDGETS}
  
 @@ -55,9 +55,10 @@
  
  INSTALL_TARGET=	install-arch-dep
  
 -PLIST_SUB=	XEMACS_DIR=xemacs-20.4
 +PLIST_SUB=	XEMACS_DIR=${XEMACS_DIR}
  
  PKGLDIR=	${.CURDIR}/../../editors/xemacs-mule/pkg
 +XEMACS_DIR=	xemacs-20.4
  
  .if defined(WNN4)
  SITE_INCLUDES=		${X11BASE}/include
 @@ -96,6 +97,9 @@
  	@find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
  	@${RM} -f ${WRKSRC}/lib-src/DOC* ${WRKSRC}/src/xemacs
  .if (${LANGUAGE} == "Japanese")
 +	@if [ -e ${WRKSRC}/lisp/packages/ps-print.elc ]; then \
 +		${RM} -f ${WRKSRC}/lisp/packages/ps-print.elc; \
 +	fi
  	@${GZCAT} ${DISTDIR}/ps-print-jp.el.gz > ${WRKSRC}/lisp/packages/ps-print.el
  .endif
  
 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	Thu Dec  3 02:30:46 1998
 +++ editors/xemacs-mule-common/Makefile	Thu Dec 24 17:08:06 1998
 @@ -13,7 +13,7 @@
  		ftp://ftp.lab.kdd.co.jp/xemacs/xemacs-20.4/ \
  		ftp://ftp.xemacs.org/pub/xemacs-20.4/ \
  		ftp://ftp2.xemacs.org/pub/xemacs/xemacs-20.4/ \
 -		ftp://ftp.jpl.org/pub/elisp/alpha/
 +		ftp://ftp.jpl.org/pub/elisp/
  DISTFILES=	xemacs-20.4.tar.gz xemacs-20.4-elc.tar.gz \
  		xemacs-20.4-info.tar.gz xemacs-20.4-mule.tar.gz \
  		ps-print-jp.el.gz
 @@ -29,6 +29,7 @@
  
  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 
 +
  .for dir in \
  	editors/xemacs-mule \
  	japanese/xemacs \
 @@ -39,6 +40,9 @@
  	japanese/xemacs-wnn6
  .if exists(${.CURDIR}/../../${dir}/work/.install_done)
  WRKDIR=		${.CURDIR}/../../${dir}/work
 +.if !exists(${WRKDIR}/.install_done-${PKGNAME})
 +rvalue_touch!=	touch ${WRKDIR}/.install_done-${PKGNAME}
 +.endif
  .elif exists(${.CURDIR}/../../${dir}/work/.build_done)
  WRKDIR?=	${.CURDIR}/../../${dir}/work
  .endif
 diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/editors/xemacs-mule-common/files/md5 editors/xemacs-mule-common/files/md5
 --- /usr/ports/current/editors/xemacs-mule-common/files/md5	Mon Oct 12 13:31:50 1998
 +++ editors/xemacs-mule-common/files/md5	Sat Dec  5 20:48:30 1998
 @@ -2,4 +2,4 @@
  MD5 (xemacs-20.4-elc.tar.gz) = 766bbd8741dbfaf0ad63f6bec1747846
  MD5 (xemacs-20.4-info.tar.gz) = 26fef33778c714e7e9d32111d11f013e
  MD5 (xemacs-20.4-mule.tar.gz) = 25ad2761b0fc98dbed45be44ad03665c
 -MD5 (ps-print-jp.el.gz) = 0995a70f9b077b1e76ef8af9eab7ef4f
 +MD5 (ps-print-jp.el.gz) = 40ed0019ccf64a917a90cf16959eee81
State-Changed-From-To: analyzed->closed 
State-Changed-By: kuriyama 
State-Changed-When: Fri Dec 25 19:47:32 PST 1998 
State-Changed-Why:  
Committed with using WRKDIRPREFIX modification.  Thanks! 
>Unformatted:
