upgrade irchat -> 2.5.6, pure -> 0.6

PR:		30891
Submitted by:	MAINTAINER

3 files changed, 49 insertions, 41 deletions

diff --git a/irc/pure-emacs20/Makefile b/irc/pure-emacs20/Makefile
index f4eb5011921d..c0b4f63d2335 100644
--- a/irc/pure-emacs20/Makefile
+++ b/irc/pure-emacs20/Makefile
@@ -6,22 +6,29 @@
 #
 
 PORTNAME=	pure
-PORTVERSION=	0.5
-PORTREVISION=	1
+PORTVERSION=	0.6
 CATEGORIES=	irc elisp
-MASTER_SITES=	ftp://ftp.fan.gr.jp/pub/elisp/irchat-pj/2.5/
+MASTER_SITES=	ftp://ftp.fan.gr.jp/pub/elisp/irchat-pj/2.5/%SUBDIR%/
+MASTER_SITE_SUBDIR=	. OLD
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 DISTNAME=	pure-${PORTVERSION}p
 
+PATCH_SITES=	${MASTER_SITES}
+PATCHFILES=	pure-0.6pl1.diff.gz
+PATCH_DIST_STRIP=	-p1
+
 MAINTAINER=	yoichi@eken.phys.nagoya-u.ac.jp
 
 EMACS_PORT_NAME?=	emacs20
-LISPDIR?=	${EMACS_LIBDIR}/site-lisp/${PORTNAME}
+LISPDIR?=	${EMACS_SITE_LISPDIR}
 EMACS_ONLY?=	""
 XEMACS_ONLY?=	"@comment "
 PUREBIN?=	bin
+MAKE_ENV+=	LISPDIR=${PREFIX}/${EMACS_SITE_LISPDIR} \
+		PACKDIR=${PREFIX}/${EMACS_LIBDIR}/site-packages \
+		BINDIR=${PREFIX}/${PUREBIN}
 
-PLIST_SUB=	LISPDIR=${LISPDIR} \
+PLIST_SUB=	PURELISP=${LISPDIR}/${PORTNAME} \
 		EMACS_ONLY=${EMACS_ONLY} \
 		XEMACS_ONLY=${XEMACS_ONLY} \
 		PUREBIN=${PUREBIN}
diff --git a/irc/pure-emacs20/distinfo b/irc/pure-emacs20/distinfo
index d813d5919662..3b3e879bcc76 100644
--- a/irc/pure-emacs20/distinfo
+++ b/irc/pure-emacs20/distinfo
@@ -1 +1,2 @@
-MD5 (pure-0.5p.tar.gz) = f4f674d2c743f0df2b191fec27c079fe
+MD5 (pure-0.6p.tar.gz) = 857ecee3bfad8af86673740094a8ed88
+MD5 (pure-0.6pl1.diff.gz) = 12c89fdc16c9c2213dd3ddd0ee1fea96
diff --git a/irc/pure-emacs20/pkg-plist b/irc/pure-emacs20/pkg-plist
index aadda06883c8..e547f9fe3339 100644
--- a/irc/pure-emacs20/pkg-plist
+++ b/irc/pure-emacs20/pkg-plist
@@ -1,39 +1,39 @@
-%%LISPDIR%%/pure-bl.el
-%%LISPDIR%%/pure-bl.elc
-%%EMACS_ONLY%%%%LISPDIR%%/pure-cs-e20.el
-%%EMACS_ONLY%%%%LISPDIR%%/pure-cs-e20.elc
-%%XEMACS_ONLY%%%%LISPDIR%%/pure-cs-xmas.el
-%%XEMACS_ONLY%%%%LISPDIR%%/pure-cs-xmas.elc
-%%LISPDIR%%/pure-cs-japanese.el
-%%LISPDIR%%/pure-cs-japanese.elc
-%%LISPDIR%%/pure-cs.el
-%%LISPDIR%%/pure-cs.elc
-%%LISPDIR%%/pure-ds.el
-%%LISPDIR%%/pure-ds.elc
-%%LISPDIR%%/pure-generic.el
-%%LISPDIR%%/pure-generic.elc
-%%LISPDIR%%/pure-irc-dcc-info.el
-%%LISPDIR%%/pure-irc-dcc-info.elc
-%%LISPDIR%%/pure-irc-dcc.el
-%%LISPDIR%%/pure-irc-dcc.elc
-%%LISPDIR%%/pure-irc-send.el
-%%LISPDIR%%/pure-irc-send.elc
-%%LISPDIR%%/pure-make.el
-%%LISPDIR%%/pure-make.elc
-%%LISPDIR%%/pure-pr-dcc-irchat.el
-%%LISPDIR%%/pure-pr-dcc-irchat.elc
-%%LISPDIR%%/pure-pr-dcc-pure.el
-%%LISPDIR%%/pure-pr-dcc-pure.elc
-%%LISPDIR%%/pure-pr-filter.el
-%%LISPDIR%%/pure-pr-filter.elc
-%%LISPDIR%%/pure-pr-ipaddr.el
-%%LISPDIR%%/pure-pr-ipaddr.elc
-%%LISPDIR%%/pure-pr-server.el
-%%LISPDIR%%/pure-pr-server.elc
-%%LISPDIR%%/pure-vs.el
-%%LISPDIR%%/pure-vs.elc
+%%PURELISP%%/pure-bl.el
+%%PURELISP%%/pure-bl.elc
+%%EMACS_ONLY%%%%PURELISP%%/pure-cs-e20.el
+%%EMACS_ONLY%%%%PURELISP%%/pure-cs-e20.elc
+%%XEMACS_ONLY%%%%PURELISP%%/pure-cs-xmas.el
+%%XEMACS_ONLY%%%%PURELISP%%/pure-cs-xmas.elc
+%%PURELISP%%/pure-cs-japanese.el
+%%PURELISP%%/pure-cs-japanese.elc
+%%PURELISP%%/pure-cs.el
+%%PURELISP%%/pure-cs.elc
+%%PURELISP%%/pure-ds.el
+%%PURELISP%%/pure-ds.elc
+%%PURELISP%%/pure-generic.el
+%%PURELISP%%/pure-generic.elc
+%%PURELISP%%/pure-irc-dcc-info.el
+%%PURELISP%%/pure-irc-dcc-info.elc
+%%PURELISP%%/pure-irc-dcc.el
+%%PURELISP%%/pure-irc-dcc.elc
+%%PURELISP%%/pure-irc-send.el
+%%PURELISP%%/pure-irc-send.elc
+%%PURELISP%%/pure-make.el
+%%PURELISP%%/pure-make.elc
+%%PURELISP%%/pure-pr-dcc-irchat.el
+%%PURELISP%%/pure-pr-dcc-irchat.elc
+%%PURELISP%%/pure-pr-dcc-pure.el
+%%PURELISP%%/pure-pr-dcc-pure.elc
+%%PURELISP%%/pure-pr-filter.el
+%%PURELISP%%/pure-pr-filter.elc
+%%PURELISP%%/pure-pr-ipaddr.el
+%%PURELISP%%/pure-pr-ipaddr.elc
+%%PURELISP%%/pure-pr-server.el
+%%PURELISP%%/pure-pr-server.elc
+%%PURELISP%%/pure-vs.el
+%%PURELISP%%/pure-vs.elc
 %%PUREBIN%%/dccput
 %%PUREBIN%%/dccget
 %%PUREBIN%%/puresv
 %%XEMACS_ONLY%%@dirrm %%PUREBIN%%
-@dirrm %%LISPDIR%%
+@dirrm %%PURELISP%%