summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--irc/dcc/Makefile9
-rw-r--r--irc/dcc/distinfo3
-rw-r--r--irc/irchat-pj-emacs20/Makefile21
-rw-r--r--irc/irchat-pj-emacs20/distinfo3
-rw-r--r--irc/irchat-pj-emacs20/pkg-plist2
-rw-r--r--irc/irchat-pj-xemacs21-mule/Makefile5
-rw-r--r--irc/pure-emacs20/Makefile17
-rw-r--r--irc/pure-emacs20/distinfo3
-rw-r--r--irc/pure-emacs20/pkg-plist70
-rw-r--r--irc/pure-xemacs21-mule/Makefile2
10 files changed, 76 insertions, 59 deletions
diff --git a/irc/dcc/Makefile b/irc/dcc/Makefile
index 2cc18d1dccbc..4318303540d2 100644
--- a/irc/dcc/Makefile
+++ b/irc/dcc/Makefile
@@ -6,11 +6,16 @@
#
PORTNAME= dcc
-PORTVERSION= 2.5.5
+PORTVERSION= 2.5.6
CATEGORIES= irc
-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
DISTNAME= irchat-pj-${PORTVERSION}p
+PATCH_SITES= ${MASTER_SITES}
+PATCHFILES= irchat-pj-2.5.6pl1.diff.gz
+PATCH_DIST_STRIP= -p1
+
MAINTAINER= yoichi@eken.phys.nagoya-u.ac.jp
ALL_TARGET= dcc
diff --git a/irc/dcc/distinfo b/irc/dcc/distinfo
index 552e43b71586..9c7f0a5dffbb 100644
--- a/irc/dcc/distinfo
+++ b/irc/dcc/distinfo
@@ -1 +1,2 @@
-MD5 (irchat-pj-2.5.5p.tar.gz) = 08b4612c0751526677257f4a7b1bfa65
+MD5 (irchat-pj-2.5.6p.tar.gz) = 8136b29d63894f832afde1567ddec837
+MD5 (irchat-pj-2.5.6pl1.diff.gz) = 64c3d113265ce66daeb565c2579c78ea
diff --git a/irc/irchat-pj-emacs20/Makefile b/irc/irchat-pj-emacs20/Makefile
index e49beba5ce49..e659c319d36a 100644
--- a/irc/irchat-pj-emacs20/Makefile
+++ b/irc/irchat-pj-emacs20/Makefile
@@ -6,12 +6,17 @@
#
PORTNAME= irchat-pj
-PORTVERSION= 2.5.5
+PORTVERSION= 2.5.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= irchat-pj-${PORTVERSION}p
+PATCH_SITES= ${MASTER_SITES}
+PATCHFILES= irchat-pj-2.5.6pl1.diff.gz
+PATCH_DIST_STRIP= -p1
+
MAINTAINER= yoichi@eken.phys.nagoya-u.ac.jp
BUILD_DEPENDS= ${LOCALBASE}/${LISPDIR:S,/${PORTNAME}$,/pure,}/pure-make.el:${PORTSDIR}/irc/pure-${EMACS_PORT_NAME}
@@ -19,12 +24,12 @@ RUN_DEPENDS= ${LOCALBASE}/${LISPDIR:S,/${PORTNAME}$,/pure,}/pure-make.el:${PORTS
${LOCALBASE}/bin/dcc:${PORTSDIR}/irc/dcc
EMACS_PORT_NAME?= emacs20
+XEMACS_ONLY?= "@comment "
LISPDIR?= ${EMACS_LIBDIR}/site-lisp/${PORTNAME}
ETCDIR= share/doc/${PORTNAME}
-LDFLAGS= ${PTHREAD_LIBS}
-CFLAGS+= ${PTHREAD_CFLAGS} -DUSE_PTHREAD -DENABLE_PTHREAD_ATTR
-MAKE_ENV+= LDFLAGS="${LDFLAGS}"
+MAKE_ENV+= LISPDIR=${PREFIX}/${EMACS_SITE_LISPDIR} \
+ PACKDIR=${PREFIX}/${EMACS_LIBDIR}/site-packages
DOCS= README.25 doc24/CHANGELOG doc24/FAQ-about-jp24.txt\
doc24/FAQ-irchat-PJ.txt doc24/INSTALL.irchat-pj\
@@ -32,7 +37,8 @@ DOCS= README.25 doc24/CHANGELOG doc24/FAQ-about-jp24.txt\
doc24/browse-url-plus-init.el doc24/dot.irchat_vars.el
PLIST_SUB= LISPDIR=${LISPDIR} \
- ETCDIR=${ETCDIR}
+ ETCDIR=${ETCDIR} \
+ XEMACS_ONLY=${XEMACS_ONLY}
post-install:
.if !defined(NOPORTDOCS)
@@ -41,8 +47,5 @@ post-install:
${INSTALL_MAN} ${WRKSRC}/${f} ${PREFIX}/${ETCDIR}
.endfor
.endif
-.if (${EMACS_PORT_NAME} == "xemacs21-mule")
- ${RMDIR} ${PREFIX}/${EMACS_LIBDIR}/site-packages/etc/irchat-pj
-.endif
.include <bsd.port.mk>
diff --git a/irc/irchat-pj-emacs20/distinfo b/irc/irchat-pj-emacs20/distinfo
index 552e43b71586..9c7f0a5dffbb 100644
--- a/irc/irchat-pj-emacs20/distinfo
+++ b/irc/irchat-pj-emacs20/distinfo
@@ -1 +1,2 @@
-MD5 (irchat-pj-2.5.5p.tar.gz) = 08b4612c0751526677257f4a7b1bfa65
+MD5 (irchat-pj-2.5.6p.tar.gz) = 8136b29d63894f832afde1567ddec837
+MD5 (irchat-pj-2.5.6pl1.diff.gz) = 64c3d113265ce66daeb565c2579c78ea
diff --git a/irc/irchat-pj-emacs20/pkg-plist b/irc/irchat-pj-emacs20/pkg-plist
index 3fe5fd211c16..a568235daf8a 100644
--- a/irc/irchat-pj-emacs20/pkg-plist
+++ b/irc/irchat-pj-emacs20/pkg-plist
@@ -23,3 +23,5 @@
%%ETCDIR%%/browse-url-plus-init.el
%%ETCDIR%%/dot.irchat_vars.el
@dirrm %%ETCDIR%%
+%%XEMACS_ONLY%%lib/xemacs/site-packages/pkginfo/MANIFEST.irchat-pj
+
diff --git a/irc/irchat-pj-xemacs21-mule/Makefile b/irc/irchat-pj-xemacs21-mule/Makefile
index 6ceb95713eb5..9d2329d5a00e 100644
--- a/irc/irchat-pj-xemacs21-mule/Makefile
+++ b/irc/irchat-pj-xemacs21-mule/Makefile
@@ -8,12 +8,9 @@
MASTERDIR= ${.CURDIR}/../irchat-pj-emacs20
EMACS_PORT_NAME= xemacs21-mule
+XEMACS_ONLY= ""
LISPDIR= lib/xemacs/site-packages/lisp/${PORTNAME}
ALL_TARGET= package
INSTALL_TARGET= install-package
-.if defined(PARALLEL_PACKAGE_BUILD)
-FORBIDDEN= hang
-.endif
-
.include <${MASTERDIR}/Makefile>
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%%
diff --git a/irc/pure-xemacs21-mule/Makefile b/irc/pure-xemacs21-mule/Makefile
index e2876ff6ce0b..0ca393bf4613 100644
--- a/irc/pure-xemacs21-mule/Makefile
+++ b/irc/pure-xemacs21-mule/Makefile
@@ -8,7 +8,7 @@
MASTERDIR= ${.CURDIR}/../pure-emacs20
EMACS_PORT_NAME= xemacs21-mule
-LISPDIR= lib/xemacs/site-packages/lisp/${PORTNAME}
+LISPDIR= ${EMACS_LIBDIR}/site-packages/lisp
EMACS_ONLY= "@comment "
XEMACS_ONLY= ""
ALL_TARGET= package c