diff options
| author | wiz <wiz@pkgsrc.org> | 2006-02-22 20:35:59 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2006-02-22 20:35:59 +0000 |
| commit | 5249601b77d643d1f41b7124d4ece2c43909074e (patch) | |
| tree | 3b6a9a2cb606c21a5a199baf7afd63cad066e005 /www/emacs-w3m | |
| parent | 9145fd08f32efdbe51147709923570c9f6565c7b (diff) | |
| download | pkgsrc-5249601b77d643d1f41b7124d4ece2c43909074e.tar.gz | |
Fix PLIST. Remove BROKEN_IN. Bump PKGREVISION.
Diffstat (limited to 'www/emacs-w3m')
| -rw-r--r-- | www/emacs-w3m/Makefile | 11 | ||||
| -rw-r--r-- | www/emacs-w3m/PLIST | 8 |
2 files changed, 9 insertions, 10 deletions
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile index 7010820a593..119cfecfe04 100644 --- a/www/emacs-w3m/Makefile +++ b/www/emacs-w3m/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2006/02/05 23:11:20 joerg Exp $ +# $NetBSD: Makefile,v 1.17 2006/02/22 20:35:59 wiz Exp $ DISTNAME= emacs-w3m-1.3.3 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= www MASTER_SITES= ${HOMEPAGE} @@ -10,8 +10,6 @@ MAINTAINER= uebayasi@NetBSD.org HOMEPAGE= http://emacs-w3m.namazu.org/ COMMENT= Simple w3m interface for Emacs -BROKEN_IN= pkgsrc-2005Q4 - DEPENDS+= {w3m,w3m-img}>=0.3.1:../../www/w3m BUILD_DEPENDS+= ${EMACS_PKGNAME_PREFIX}semi-[0-9]*:../../devel/semi @@ -24,7 +22,7 @@ EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20 xemacs214 xemacs215 DEPENDS+= ${EMACS_PKGNAME_PREFIX}apel>=10.3:../../devel/apel .endif -EMACS_MAJOR_VERSION= ${EMACS_VERSION:C/\..*//} +EMACS_MAJOR_VERSION= ${_EMACS_VERSION:C/\..*//} .if ${EMACS_FLAVOR} == "emacs" && ${EMACS_MAJOR_VERSION} == 21 BUILD_DEPENDS+= ${EMACS_PKGNAME_PREFIX}Mule-UCS>=0.84:../../editors/mule-ucs .endif @@ -43,11 +41,12 @@ DOCUMENTS= COPYING ChangeLog ChangeLog.1 FAQ FAQ.ja README README.ja README.nama ETCDIR= lib/xemacs/site-packages/etc ICONDIR= ${ETCDIR}/w3m .else -ETCDIR= share/emacs/${EMACS_VERSION:C/[^0-9]*$//}/etc +ETCDIR= share/emacs/${_EMACS_VERSION:C/(^[0-9.]*).*$/\1/}/etc ICONDIR= ${ETCDIR}/w3m/icons .endif DOCDIR= ${ETCDIR}/w3m/doc PLIST_SUBST+= DOCDIR=${DOCDIR:Q} +PLIST_SUBST+= ETCDIR=${ETCDIR:Q} PLIST_SUBST+= ICONDIR=${ICONDIR:Q} post-install: diff --git a/www/emacs-w3m/PLIST b/www/emacs-w3m/PLIST index 157598a658f..128e1446968 100644 --- a/www/emacs-w3m/PLIST +++ b/www/emacs-w3m/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.6 2004/12/07 03:59:49 uebayasi Exp $ +@comment $NetBSD: PLIST,v 1.7 2006/02/22 20:35:59 wiz Exp $ ${EMACS_LISPPREFIX}/w3m/ChangeLog ${EMACS_LISPPREFIX}/w3m/ChangeLog.1 ${EMACS_LISPPREFIX}/w3m/mew-w3m.el -${EMACS_LISPPREFIX}/w3m/mew-w3m.elc +@comment not created: ${EMACS_LISPPREFIX}/w3m/mew-w3m.elc ${EMACS_LISPPREFIX}/w3m/mime-w3m.el ${EMACS_LISPPREFIX}/w3m/mime-w3m.elc ${EMACS_LISPPREFIX}/w3m/octet.el @@ -262,5 +262,5 @@ ${FOR_xemacs215}${ICONDIR}/weather-up.xpm ${FOR_emacs21}@dirrm ${ICONDIR} ${FOR_xemacs214}@dirrm ${ICONDIR} ${FOR_xemacs215}@dirrm ${ICONDIR} -${FOR_emacs20}@dirrm share/emacs/${EMACS_VERSION}/etc/w3m -${FOR_emacs21}@dirrm share/emacs/${EMACS_VERSION}/etc/w3m +${FOR_emacs20}@dirrm ${ETCDIR}/w3m +${FOR_emacs21}@dirrm ${ETCDIR}/w3m |