Update distfiles

  from emacs-19.34b.tar.gz + mule-23-1934-alpha01.diff.gz
  to mule-2.3-19.34.tar.gz

Notice: the current distfile was modified slightly
        (in src/indent.c)

3 files changed, 11 insertions, 25 deletions

diff --git a/editors/mule-common/Makefile b/editors/mule-common/Makefile
index 6012ba2..72e58c5 100644
--- a/editors/mule-common/Makefile
+++ b/editors/mule-common/Makefile
@@ -7,19 +7,14 @@
 
 PORTNAME=	mule-common
 PORTVERSION=	${MULE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors japanese
-MASTER_SITES=	ftp://etlport.etl.go.jp/pub/mule/ \
-		ftp://ftp.mei.co.jp/archive/free/gnu/emacs/Mule/ \
-		ftp://ftp.iij.ad.jp/pub/misc/mule/ \
+MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/ \
+		ftp://ftp.jaist.ac.jp/pub/GNU/mule/ \
 		http://www.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/mule/
-DISTFILES=	emacs-${EMACS_VERSION}b${EXTRACT_SUFX} \
+DISTFILES=	mule-${MULE_VERSION}-${EMACS_VERSION}.tar.gz \
 		mule-${MULE_VERSION}-${EMACS_VERSION}.patch-981002.tar.gz
 
-PATCH_SITES=	ftp://etlport.etl.go.jp/pub/mule/
-PATCHFILES=	mule-${MULE_VERSION:S/.//}-${EMACS_VERSION:S/.//}-alpha01.diff.gz
-PATCH_DIST_STRIP= -p1
-
 MAINTAINER=	taoka@FreeBSD.org
 
 MULE_VERSION=	2.3
@@ -52,7 +47,7 @@ WRKDIR?=	${WRKDIRBASE}/${dir}/work
 MULEPKG?=	${dir:S,editors/,,:S,chinese/,zh-,:S,japanese/,ja-,:S,korean/,ko-,}-${PORTVERSION}${_SUF1}${_SUF2}
 .endif
 .endfor
-WRKSRC=		${WRKDIR}/emacs-${EMACS_VERSION}
+WRKSRC=		${WRKDIR}/mule-${MULE_VERSION}-${EMACS_VERSION}
 STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/mule.sh
 
 .if !defined(WRKDIR)
@@ -96,7 +91,6 @@ ELC_DIR=	../lisp
 #   MEW_ORG_PATCH: apply mew's patches to original mule (http://www.mew.org)
 #   MEW_PATCH: apply mew's patch after apply Mr. Katayama's patches
 post-extract:
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/mule-${MULE_VERSION}-${EMACS_VERSION}.patch-981002.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKDIR}
 	${CP} ${FILESDIR}/unexfreebsd.c ${WRKSRC}/src
 .if !defined(ORIGINAL) && !defined(MEW_ORG_PATCH)
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/takana-${EMACS_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKDIR}
diff --git a/editors/mule-common/distinfo b/editors/mule-common/distinfo
index cf39d87..7a8c785 100644
--- a/editors/mule-common/distinfo
+++ b/editors/mule-common/distinfo
@@ -1,3 +1,2 @@
-MD5 (emacs-19.34b.tar.gz) = 9bd3c694a9019c2a2ebd703a9a0394e0
+MD5 (mule-2.3-19.34.tar.gz) = 2765407b4b202e29940867a3f5dfceae
 MD5 (mule-2.3-19.34.patch-981002.tar.gz) = cadf0c5e4ec4d74b921ffa96a7cca96e
-MD5 (mule-23-1934-alpha01.diff.gz) = 09b0fbf4871b701eb6371e56388db9e0
diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index 395d9b8..ccd1e75 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -8,19 +8,14 @@
 PORTNAME=	mule
 PORTVERSION=	${MULE_VERSION}
 PKGNAMESUFFIX=	${INPUT_METHOD}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	editors
-MASTER_SITES=	ftp://etlport.etl.go.jp/pub/mule/ \
-		ftp://ftp.mei.co.jp/archive/free/gnu/emacs/Mule/ \
-		ftp://ftp.iij.ad.jp/pub/misc/mule/ \
+MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/ \
+		ftp://ftp.jaist.ac.jp/pub/GNU/mule/ \
 		http://www.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/mule/
-DISTFILES=	emacs-${EMACS_VERSION}b${EXTRACT_SUFX} \
+DISTFILES=	mule-${MULE_VERSION}-${EMACS_VERSION}.tar.gz \
 		mule-${MULE_VERSION}-${EMACS_VERSION}.patch-981002.tar.gz
 
-PATCH_SITES=	ftp://etlport.etl.go.jp/pub/mule/
-PATCHFILES=	mule-${MULE_VERSION:S/.//}-${EMACS_VERSION:S/.//}-alpha01.diff.gz
-PATCH_DIST_STRIP=	-p1
-
 MAINTAINER?=	taoka@FreeBSD.org
 
 RUN_DEPENDS=	${PREFIX}/share/${EMACS_PREFIX}/${EMACS_VERSION}/lisp/mule.el:${PORTSDIR}/editors/mule-common
@@ -33,8 +28,7 @@ EMACS_VERSION=	19.34
 SLAVEDIRS=	chinese/mule-freewnn
 
 USE_XLIB=	yes
-EXTRACT_ONLY=	emacs-${EMACS_VERSION}b${EXTRACT_SUFX}
-WRKSRC=		${WRKDIR}/emacs-${EMACS_VERSION}
+WRKSRC=		${WRKDIR}/mule-${MULE_VERSION}-${EMACS_VERSION}
 PATCHDIR=	${.CURDIR}/../../editors/mule-common/files
 FILESDIR=	${.CURDIR}/../../editors/mule-common/files
 MD5_FILE=	${.CURDIR}/../../editors/mule-common/distinfo
@@ -114,7 +108,6 @@ SITE_START=${PREFIX}/share/${EMACS_PREFIX}/${EMACS_VERSION}/site-lisp/site-start
 #   MEW_ORG_PATCH: apply mew's patches to original mule (http://www.mew.org)
 #   MEW_PATCH: apply mew's patch after apply Mr. Katayama's patches
 post-extract:
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/mule-${MULE_VERSION}-${EMACS_VERSION}.patch-981002.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKDIR}
 	${CP} ${FILESDIR}/unexfreebsd.c ${WRKSRC}/src
 .if !defined(ORIGINAL) && !defined(MEW_ORG_PATCH)
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/takana-${EMACS_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKDIR}