summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorhiramatsu <hiramatsu@pkgsrc.org>2011-12-17 13:11:09 +0000
committerhiramatsu <hiramatsu@pkgsrc.org>2011-12-17 13:11:09 +0000
commit23f7e0d2932d3a0ddcf28cbd1968df7f729d0bc9 (patch)
treeb2962a89fbfe8c7826bd245621fe133b190471ef /www
parent287fcede6f173d83e485b9a2b2644be5979fcfd1 (diff)
downloadpkgsrc-23f7e0d2932d3a0ddcf28cbd1968df7f729d0bc9.tar.gz
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.
Diffstat (limited to 'www')
-rw-r--r--www/emacs-w3m-snapshot/Makefile5
-rw-r--r--www/emacs-w3m/Makefile6
2 files changed, 6 insertions, 5 deletions
diff --git a/www/emacs-w3m-snapshot/Makefile b/www/emacs-w3m-snapshot/Makefile
index 69918b6dc3d..c77eb9f2d18 100644
--- a/www/emacs-w3m-snapshot/Makefile
+++ b/www/emacs-w3m-snapshot/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2011/12/01 17:53:58 minskim Exp $
+# $NetBSD: Makefile,v 1.7 2011/12/17 13:11:09 hiramatsu Exp $
DISTNAME= w3m-el-snapshot_1.4.442+0.20110729.orig
+PKGREVISION= 1
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/w3m-el-snapshot_/emacs-w3m-/:S/+0//:S/.orig//}
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/w/w3m-el-snapshot/}
@@ -14,7 +15,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= makeinfo gzip autoconf
INFO_FILES= yes
-DEPENDS+= w3m>=0.5.2nb3:../../www/w3m
+DEPENDS+= w3m{,-img}>=0.5.2nb3:../../www/w3m
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --srcdir=${WRKSRC}
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index 8400e00b3a8..7dc1d752849 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2009/08/09 19:35:12 tonnerre Exp $
+# $NetBSD: Makefile,v 1.28 2011/12/17 13:11:09 hiramatsu Exp $
DISTNAME= emacs-w3m-1.4.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www
MASTER_SITES= ${HOMEPAGE}
@@ -15,7 +15,7 @@ INSTALLATION_DIRS= ${ETCDIR}
USE_TOOLS+= makeinfo
INFO_FILES= YES
-DEPENDS+= w3m>=0.5.1nb2:../../www/w3m
+DEPENDS+= w3m{,-img}>=0.5.1nb2:../../www/w3m
HAS_CONFIGURE= yes
CONFIGURE_ARGS+=--with-emacs=${EMACS_BIN:Q}