From 05011ebda49c7e03331d4096c192f33c3c7a5cfd Mon Sep 17 00:00:00 2001
From: Shigeyuki Fukushima <shige@FreeBSD.org>
Date: Wed, 9 May 2001 16:18:26 +0000
Subject: Apply XIM patch(PORTREVISION bump). Add post-install target for
 printing pkg-message.

---
 editors/emacs20-dl/Makefile  | 22 ++++++++++++++++++----
 editors/emacs20-dl/distinfo  |  1 +
 editors/emacs20-dl/pkg-descr |  3 ++-
 3 files changed, 21 insertions(+), 5 deletions(-)

(limited to 'editors/emacs20-dl')

diff --git a/editors/emacs20-dl/Makefile b/editors/emacs20-dl/Makefile
index 0917975323ac..ae6d4447c33a 100644
--- a/editors/emacs20-dl/Makefile
+++ b/editors/emacs20-dl/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	GNU emacs with dl
+# New ports collection makefile for:	GNU emacs with dynamic loading function
 # Date created:		10 October 1998
 # Whom:			shige
 #
@@ -6,11 +6,15 @@
 #
 
 PORTNAME=	emacs-dl
-PORTVERSION=	20.7
+PORTVERSION=	${EMACS_VER}
+PORTREVISION=	1
 CATEGORIES=	editors ipv6
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_GNU} \
+		http://www.ainet.or.jp/~inoue/software/emacs-xim/
 MASTER_SITE_SUBDIR=	emacs
-DISTNAME=	emacs-${PORTVERSION}
+DISTNAME=	emacs-${EMACS_VER}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${XIM_PATCH}${EXTRACT_SUFX}
 
 PATCH_SITES=	ftp://ftp.m17n.org/pub/mule/dynamic-loading/ \
 		http://www.etl.go.jp/~tomo/comp/emacsen/
@@ -35,6 +39,8 @@ USE_XLIB=	yes
 CONFIGURE_ARGS=	--with-x=no --with-pop
 .endif
 
+# for XIM extension
+XIM_PATCH=	emacs20-xim-20000713
 .if defined(WITHOUT_XIM) && (${WITHOUT_XIM} == "yes")
 MAKE_FLAGS=	MYCPPFLAG="-DX_I18N_INHIBITED"
 .endif
@@ -56,6 +62,11 @@ CONFIGURE_ARGS+=	--with-xpg4
 .endif
 .endif
 
+pre-patch:
+	@(cd ${WRKSRC} ; \
+	  ${PATCH} ${PATCH_ARGS} -p1 < ../${XIM_PATCH}/${XIM_PATCH}.diff ;\
+	)
+
 pre-build:
 	@${RM} -rf ${WRKSRC}/info/*
 	@${LN} -sf DOC ${WRKSRC}/etc/${DOC_FILE}
@@ -64,4 +75,7 @@ do-install:
 	@${INSTALL} -c -s -m 555 -o root -g wheel ${WRKSRC}/src/emacs ${PREFIX}/bin/emacs-dl-${EMACS_VER}
 	@${INSTALL_DATA} ${WRKSRC}/etc/DOC ${PREFIX}/share/emacs/${EMACS_VER}/etc/${DOC_FILE}
 
+post-install:
+	@${CAT} ${PKGMESSAGE}
+
 .include <bsd.port.post.mk>
diff --git a/editors/emacs20-dl/distinfo b/editors/emacs20-dl/distinfo
index c9314ceedc04..023e07d42d41 100644
--- a/editors/emacs20-dl/distinfo
+++ b/editors/emacs20-dl/distinfo
@@ -1,2 +1,3 @@
 MD5 (emacs-20.7.tar.gz) = c732cf5e668d4ac67d9418ecb103ecf5
+MD5 (emacs20-xim-20000713.tar.gz) = 3fec03adb19038afe25345b12962ec0f
 MD5 (emacs-20.4-dl3.diff.gz) = c7d5891607236066cd1a7f187d6100bc
diff --git a/editors/emacs20-dl/pkg-descr b/editors/emacs20-dl/pkg-descr
index 597e7ded3c86..24eecb6774c1 100644
--- a/editors/emacs20-dl/pkg-descr
+++ b/editors/emacs20-dl/pkg-descr
@@ -2,6 +2,7 @@ GNU Emacs is a self-documenting, customizable, extensible real-time
 display editor (emacs binary only).
 
 This package's emacs has a dynamic loading module function.
+And XIM function which emacs already has is fixed.
 
 Emacs binary is:
     ${PREFIX}/bin/emacs-dl-20.7
@@ -20,4 +21,4 @@ at the "${PORTSDIR}/editors/emacs20-dl" directory to re-make this package.
 
 WWW: http://www.m17n.org/mule/dynamic-loading/
 
---- Porting by shige@FreeBSD.ORG
+--- Ported by shige@FreeBSD.ORG
-- 
cgit v1.2.3