Sat Dec 17 13:11:10 2011 UTC ()
Modify DEPENDS so that not to install w3m when w3m-img is installed.
This fix is provided in PR pkg/38459 by Hiroyuki Bessho.

Increment PKGREVISION for each emacs-w3m and emacs-w3m-snapshot.


(hiramatsu)
diff -r1.27 -r1.28 pkgsrc/www/emacs-w3m/Makefile
diff -r1.6 -r1.7 pkgsrc/www/emacs-w3m-snapshot/Makefile
cvs diff -r1.27 -r1.28 pkgsrc/www/emacs-w3m/Makefile (expand / switch to unified diff)

--- pkgsrc/www/emacs-w3m/Makefile 2009/08/09 19:35:12 1.27
+++ pkgsrc/www/emacs-w3m/Makefile 2011/12/17 13:11:09 1.28
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1# $NetBSD: Makefile,v 1.27 2009/08/09 19:35:12 tonnerre Exp $ 1# $NetBSD: Makefile,v 1.28 2011/12/17 13:11:09 hiramatsu Exp $
2 2
3DISTNAME= emacs-w3m-1.4.4 3DISTNAME= emacs-w3m-1.4.4
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= ${HOMEPAGE} 6MASTER_SITES= ${HOMEPAGE}
7 7
8MAINTAINER= uebayasi@NetBSD.org 8MAINTAINER= uebayasi@NetBSD.org
9HOMEPAGE= http://emacs-w3m.namazu.org/ 9HOMEPAGE= http://emacs-w3m.namazu.org/
10COMMENT= Simple w3m interface for Emacs 10COMMENT= Simple w3m interface for Emacs
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13INSTALLATION_DIRS= ${ETCDIR} 13INSTALLATION_DIRS= ${ETCDIR}
14 14
15USE_TOOLS+= makeinfo 15USE_TOOLS+= makeinfo
16INFO_FILES= YES 16INFO_FILES= YES
17 17
18DEPENDS+= w3m>=0.5.1nb2:../../www/w3m 18DEPENDS+= w3m{,-img}>=0.5.1nb2:../../www/w3m
19 19
20HAS_CONFIGURE= yes 20HAS_CONFIGURE= yes
21CONFIGURE_ARGS+=--with-emacs=${EMACS_BIN:Q} 21CONFIGURE_ARGS+=--with-emacs=${EMACS_BIN:Q}
22CONFIGURE_ARGS+=--with-icondir=${ICONDIR} 22CONFIGURE_ARGS+=--with-icondir=${ICONDIR}
23BUILD_TARGET= default 23BUILD_TARGET= default
24INSTALL_TARGET= ${INSTALL_TARGET.${EMACS_FLAVOR}} 24INSTALL_TARGET= ${INSTALL_TARGET.${EMACS_FLAVOR}}
25MAKE_FLAGS= prefix=${DESTDIR}${PREFIX} ICONDIR=${DESTDIR}${ICONDIR} 25MAKE_FLAGS= prefix=${DESTDIR}${PREFIX} ICONDIR=${DESTDIR}${ICONDIR}
26PLIST_SUBST+= ETCDIR=${ETCDIR:Q} 26PLIST_SUBST+= ETCDIR=${ETCDIR:Q}
27 27
28SUBST_CLASSES+= fix-icondir 28SUBST_CLASSES+= fix-icondir
29SUBST_STAGE.fix-icondir= pre-configure 29SUBST_STAGE.fix-icondir= pre-configure
30SUBST_FILES.fix-icondir= Makefile.in w3m.el w3mhack.el 30SUBST_FILES.fix-icondir= Makefile.in w3m.el w3mhack.el
31SUBST_SED.fix-icondir= -e 's|etc/images/w3m|etc/w3m|g' \ 31SUBST_SED.fix-icondir= -e 's|etc/images/w3m|etc/w3m|g' \
cvs diff -r1.6 -r1.7 pkgsrc/www/emacs-w3m-snapshot/Makefile (expand / switch to unified diff)

--- pkgsrc/www/emacs-w3m-snapshot/Makefile 2011/12/01 17:53:58 1.6
+++ pkgsrc/www/emacs-w3m-snapshot/Makefile 2011/12/17 13:11:09 1.7
@@ -1,30 +1,31 @@ @@ -1,30 +1,31 @@
1# $NetBSD: Makefile,v 1.6 2011/12/01 17:53:58 minskim Exp $ 1# $NetBSD: Makefile,v 1.7 2011/12/17 13:11:09 hiramatsu Exp $
2 2
3DISTNAME= w3m-el-snapshot_1.4.442+0.20110729.orig 3DISTNAME= w3m-el-snapshot_1.4.442+0.20110729.orig
 4PKGREVISION= 1
4PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/w3m-el-snapshot_/emacs-w3m-/:S/+0//:S/.orig//} 5PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/w3m-el-snapshot_/emacs-w3m-/:S/+0//:S/.orig//}
5CATEGORIES= www 6CATEGORIES= www
6MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/w/w3m-el-snapshot/} 7MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/w/w3m-el-snapshot/}
7 8
8MAINTAINER= makoto@ki.nu 9MAINTAINER= makoto@ki.nu
9HOMEPAGE= http://emacs-w3m.namazu.org/ 10HOMEPAGE= http://emacs-w3m.namazu.org/
10COMMENT= Emacs frontend for w3m browser 11COMMENT= Emacs frontend for w3m browser
11 12
12PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
13 14
14USE_TOOLS+= makeinfo gzip autoconf 15USE_TOOLS+= makeinfo gzip autoconf
15INFO_FILES= yes 16INFO_FILES= yes
16 17
17DEPENDS+= w3m>=0.5.2nb3:../../www/w3m 18DEPENDS+= w3m{,-img}>=0.5.2nb3:../../www/w3m
18 19
19GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
20CONFIGURE_ARGS+= --srcdir=${WRKSRC} 21CONFIGURE_ARGS+= --srcdir=${WRKSRC}
21CONFIGURE_ARGS+= --localstatedir=${VARBASE} 22CONFIGURE_ARGS+= --localstatedir=${VARBASE}
22CONFIGURE_ENV+= GAMEOWN=${GAMEOWN} 23CONFIGURE_ENV+= GAMEOWN=${GAMEOWN}
23BUILD_TARGET= 24BUILD_TARGET=
24WRKSRC= ${WRKDIR}/emacs-w3m 25WRKSRC= ${WRKDIR}/emacs-w3m
25 26
26EVAL_PREFIX+= W3M_PREFIX=w3m 27EVAL_PREFIX+= W3M_PREFIX=w3m
27 28
28SUBST_CLASSES+= paths 29SUBST_CLASSES+= paths
29SUBST_MESSAGE.paths= Fixing paths. 30SUBST_MESSAGE.paths= Fixing paths.
30SUBST_STAGE.paths= pre-configure 31SUBST_STAGE.paths= pre-configure