diff options
| -rw-r--r-- | chat/navi2ch/Makefile | 35 | ||||
| -rw-r--r-- | chat/navi2ch/PLIST | 3 | ||||
| -rw-r--r-- | chat/riece/Makefile | 20 | ||||
| -rw-r--r-- | chat/riece/PLIST | 8 | ||||
| -rw-r--r-- | devel/elib/Makefile | 11 | ||||
| -rw-r--r-- | devel/elib/PLIST | 3 | ||||
| -rw-r--r-- | devel/flim/Makefile | 32 | ||||
| -rw-r--r-- | devel/flim/PLIST | 4 |
8 files changed, 59 insertions, 57 deletions
diff --git a/chat/navi2ch/Makefile b/chat/navi2ch/Makefile index 60f8cc7f985..9c02e457423 100644 --- a/chat/navi2ch/Makefile +++ b/chat/navi2ch/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:25 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2006/03/30 03:31:13 jlam Exp $ DISTNAME= navi2ch-1.7.5 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= chat MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=navi2ch/} @@ -10,29 +10,20 @@ MAINTAINER= uebayasi@NetBSD.org HOMEPAGE= http://navi2ch.sourceforge.net/ COMMENT= 2ch BBS browser for Emacs -.include "../../mk/emacs.mk" - GNU_CONFIGURE= yes USE_TOOLS+= gmake -.if ${EMACS_FLAVOR} == "emacs" -CONFIGURE_ARGS+=--with-emacs -CONFIGURE_ARGS+=--with-lispdir=${EMACS_LISPPREFIX}/navi2ch -.else -CONFIGURE_ARGS+=--with-xemacs -CONFIGURE_ARGS+=--with-packagedir=${EMACS_LISPPREFIX:C|/lisp$||} -.endif -CONFIGURE_ARGS+=--with-icondir=${PREFIX}/share/navi2ch/icons +INFO_FILES= # PLIST +EMACS_MODULES= base -# XXX Don't overwrite infodir when XEmacs is used. In this case infodir -# must be set by --with-infodir (or --infodir?). This should be -# fixed in the original distribution. -SUBST_CLASSES+= infodir -SUBST_STAGE.infodir= post-patch -SUBST_MESSAGE.infodir= Avoid default infodir is overwritten when XEmacs is used -SUBST_FILES.infodir= configure configure.in -SUBST_SED.infodir= -e '/infodir=.*packagedir/d' -CONFIGURE_ARGS+=--with-infodir=${PREFIX}/info +.include "../../mk/emacs.mk" -INFO_FILES= navi2ch.info +.if ${EMACS_FLAVOR} == "emacs" +CONFIGURE_ARGS+= --with-emacs +CONFIGURE_ARGS+= --with-lispdir=${EMACS_LISPPREFIX}/navi2ch +.elif ${EMACS_FLAVOR} == "xemacs" +CONFIGURE_ARGS+= --with-xemacs +CONFIGURE_ARGS+= --with-packagedir=${EMACS_LISPPREFIX:C|/lisp$||} +.endif +CONFIGURE_ARGS+= --with-icondir=${PREFIX}/share/navi2ch/icons .include "../../mk/bsd.pkg.mk" diff --git a/chat/navi2ch/PLIST b/chat/navi2ch/PLIST index e3f7b353986..450634d7af5 100644 --- a/chat/navi2ch/PLIST +++ b/chat/navi2ch/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.5 2004/01/12 11:58:24 seb Exp $ +@comment $NetBSD: PLIST,v 1.6 2006/03/30 03:31:13 jlam Exp $ +${EMACS_INFOPREFIX}/navi2ch.info ${EMACS_LISPPREFIX}/navi2ch/navi2ch-article.el ${EMACS_LISPPREFIX}/navi2ch/navi2ch-article.elc ${EMACS_LISPPREFIX}/navi2ch/navi2ch-articles.el diff --git a/chat/riece/Makefile b/chat/riece/Makefile index 43722ee92fd..5c8b04d141f 100644 --- a/chat/riece/Makefile +++ b/chat/riece/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/02/16 18:08:06 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2006/03/30 03:31:13 jlam Exp $ # DISTNAME= riece-2.0.2 @@ -14,21 +14,21 @@ COMMENT= IRC client for Emacs EMACS_VERSIONS_ACCEPTED= \ emacs21 emacs21nox xemacs214 -.include "../../mk/emacs.mk" - WRKSRC= ${WRKDIR}/${DISTNAME:C|[^0-9]$||} GNU_CONFIGURE= YES +INFO_FILES= # PLIST +EMACS_MODULES= base + +.include "../../mk/emacs.mk" + .if ${EMACS_FLAVOR} == "emacs" -CONFIGURE_ARGS+=--with-emacs=${EMACS_BIN:Q} -.elif ${EMACS_FLAVOR} == "xemacs" -CONFIGURE_ARGS+=--with-xemacs=${EMACS_BIN:Q} -CONFIGURE_ARGS+=--with-packagedir=${EMACS_LISPPREFIX:C|/lisp\$||} +CONFIGURE_ARGS+= --with-emacs=${EMACS_BIN:Q} .elif ${EMACS_FLAVOR} == "xemacs" +CONFIGURE_ARGS+= --with-xemacs=${EMACS_BIN:Q} +CONFIGURE_ARGS+= --with-packagedir=${EMACS_LISPPREFIX:C|/lisp\$||} .endif # Riece digs sub directory. -CONFIGURE_ARGS+=--with-lispdir=${EMACS_LISPPREFIX:Q} - -INFO_FILES= riece-en.info riece-ja.info +CONFIGURE_ARGS+= --with-lispdir=${EMACS_LISPPREFIX:Q} .include "../../mk/bsd.pkg.mk" diff --git a/chat/riece/PLIST b/chat/riece/PLIST index 64ef735554d..b070787f9c0 100644 --- a/chat/riece/PLIST +++ b/chat/riece/PLIST @@ -1,4 +1,6 @@ -@comment $NetBSD: PLIST,v 1.3 2005/12/08 06:51:22 uebayasi Exp $ +@comment $NetBSD: PLIST,v 1.4 2006/03/30 03:31:13 jlam Exp $ +${EMACS_INFOPREFIX}/riece-en.info +${EMACS_INFOPREFIX}/riece-ja.info ${EMACS_LISPPREFIX}/riece/aproxy.rb ${EMACS_LISPPREFIX}/riece/riece-000.el ${EMACS_LISPPREFIX}/riece/riece-000.elc @@ -46,8 +48,8 @@ ${EMACS_LISPPREFIX}/riece/riece-display.el ${EMACS_LISPPREFIX}/riece/riece-display.elc ${EMACS_LISPPREFIX}/riece/riece-doctor.el ${EMACS_LISPPREFIX}/riece/riece-doctor.elc -${EMACS_LISPPREFIX}/riece/riece-emacs.el -${EMACS_LISPPREFIX}/riece/riece-emacs.elc +${EMACS_LISPPREFIX}/riece/riece-${EMACS_FLAVOR}.el +${EMACS_LISPPREFIX}/riece/riece-${EMACS_FLAVOR}.elc ${EMACS_LISPPREFIX}/riece/riece-eval-ruby.el ${EMACS_LISPPREFIX}/riece/riece-eval-ruby.elc ${EMACS_LISPPREFIX}/riece/riece-eval.el diff --git a/devel/elib/Makefile b/devel/elib/Makefile index 2ad4d1075a6..847fda44e48 100644 --- a/devel/elib/Makefile +++ b/devel/elib/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.16 2006/03/05 16:27:24 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2006/03/30 03:31:13 jlam Exp $ # DISTNAME= elib-1.0 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= devel MASTER_SITES= http://jde.sunsite.dk/ @@ -15,13 +15,14 @@ CONFLICTS+= emacs20-elib-[0-9]* .include "../../mk/emacs.mk" BUILD_ENV+= EMACS=${EMACS_FLAVOR} - MAKEFLAGS+= EMACS=${EMACS_FLAVOR:Q} NO_CONFIGURE= yes USE_TOOLS+= gmake makeinfo -INFO_FILES= elib.info +INFO_FILES= # PLIST + +INSTALLATION_DIRS= ${EMACS_LISPPREFIX}/elib ${EMACS_INFOPREFIX} SRCS= stack-f.el stack-m.el queue-f.el queue-m.el elib-node.el \ bintree.el avltree.el string.el read.el cookie.el dll.el \ @@ -31,6 +32,6 @@ do-install: ${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/elib cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} \ ${EMACS_LISPPREFIX}/elib - cd ${WRKSRC} && ${INSTALL_DATA} elib.info* ${PREFIX}/info + cd ${WRKSRC} && ${INSTALL_DATA} elib.info* ${EMACS_INFOPREFIX} .include "../../mk/bsd.pkg.mk" diff --git a/devel/elib/PLIST b/devel/elib/PLIST index aaf0edd47f5..ec053422779 100644 --- a/devel/elib/PLIST +++ b/devel/elib/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.5 2004/02/13 08:26:04 seb Exp $ +@comment $NetBSD: PLIST,v 1.6 2006/03/30 03:31:13 jlam Exp $ +${EMACS_INFOPREFIX}/elib.info ${EMACS_LISPPREFIX}/elib/stack-f.el ${EMACS_LISPPREFIX}/elib/stack-f.elc ${EMACS_LISPPREFIX}/elib/stack-m.el diff --git a/devel/flim/Makefile b/devel/flim/Makefile index 091612d0321..666b10c67eb 100644 --- a/devel/flim/Makefile +++ b/devel/flim/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.21 2006/03/05 16:27:24 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2006/03/30 03:31:13 jlam Exp $ DISTNAME= flim-1.14.7 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel MASTER_SITES= ftp://ftp.m17n.org/pub/mule/flim/flim-1.14/ @@ -11,35 +11,39 @@ HOMEPAGE= http://www.m17n.org/FLIM/ COMMENT= Emacs lisp library for message representation/encoding EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20 xemacs214 xemacs215 +EMACS_MODULES= base + .include "../../mk/emacs.mk" -BUILD_DEPENDS+= qkc-*:../../converters/qkc +BUILD_DEPENDS+= qkc-[0-9]*:../../converters/qkc .if ${EMACS_FLAVOR} == "emacs" DEPENDS+= ${EMACS_PKGNAME_PREFIX}apel>=9.22:../../devel/apel BUILD_TARGET= elc INSTALL_TARGET= install .else # ${EMACS_FLAVOR} == "xemacs" -DEPENDS+= xemacs-packages-[0-9]*:../../editors/xemacs-packages BUILD_TARGET= package INSTALL_TARGET= install-package MAKEFLAGS+= PACKAGEDIR=${EMACS_LISPPREFIX:C|/lisp$||} .endif +EVAL_PREFIX+= QKC_PREFIX=qkc USE_TOOLS+= makeinfo -INFO_FILES= mime-en.info mime-ja.info +INFO_FILES= # PLIST TEXINFO_REQD= 4.5 -pre-build: - @cd ${WRKSRC}; \ - for i in mime-en mime-ja; do \ - ${RM} -f $${i}.info; \ - ${CP} $${i}.texi $${i}.texi.orig; \ - ${LOCALBASE}/bin/qkc -Oeu $${i}.texi.orig >$${i}.texi; \ - ${MAKEINFO} --force --no-validate --no-split $${i}.texi; \ +post-build: + @cd ${WRKSRC}; for i in mime-en mime-ja; do \ + ${RM} -f $${i}.info*; \ + ${CP} $${i}.texi $${i}.texi.orig; \ + ${QKC_PREFIX}/bin/qkc -Oeu $${i}.texi.orig >$${i}.texi; \ + makeinfo --force --no-validate $${i}.texi; \ done -pre-install: - ${INSTALL_DATA} ${WRKSRC}/mime-*.info ${PREFIX}/info +post-install: + cd ${WRKSRC}; for f in mime-*.info mime-*.info-[0-9]*; do \ + ${TEST} ! -f "$$f" || \ + ${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR}; \ + done .include "../../mk/bsd.pkg.mk" diff --git a/devel/flim/PLIST b/devel/flim/PLIST index fae2cc8f90c..e2bc9f0cc2e 100644 --- a/devel/flim/PLIST +++ b/devel/flim/PLIST @@ -1,4 +1,6 @@ -@comment $NetBSD: PLIST,v 1.7 2004/09/12 19:03:15 kristerw Exp $ +@comment $NetBSD: PLIST,v 1.8 2006/03/30 03:31:13 jlam Exp $ +${EMACS_INFOPREFIX}/mime-en.info +${EMACS_INFOPREFIX}/mime-ja.info ${FOR_xemacs214}${EMACS_LISPPREFIX}/flim/auto-autoloads.el ${FOR_xemacs214}${EMACS_LISPPREFIX}/flim/auto-autoloads.elc ${FOR_xemacs214}${EMACS_LISPPREFIX}/flim/custom-load.el |