summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorsalo <salo@pkgsrc.org>2003-01-26 22:48:36 +0000
committersalo <salo@pkgsrc.org>2003-01-26 22:48:36 +0000
commit6bdb4110b2eeaf038c61307b1f709f62c9ebec5d (patch)
tree31f87470f0a657aab9fdbe29743b3fe503b70b2b /www
parentbb3fda0c35bb06fcb010ff4c0867c101ad69e6bb (diff)
downloadpkgsrc-6bdb4110b2eeaf038c61307b1f709f62c9ebec5d.tar.gz
CONFLICTS only with older elinks. Remove duplicate include. Bump PKGREVISION.
Diffstat (limited to 'www')
-rw-r--r--www/links-gui/Makefile8
-rw-r--r--www/links/Makefile5
2 files changed, 6 insertions, 7 deletions
diff --git a/www/links-gui/Makefile b/www/links-gui/Makefile
index 631048a5663..4c48b9558d0 100644
--- a/www/links-gui/Makefile
+++ b/www/links-gui/Makefile
@@ -1,18 +1,16 @@
-# $NetBSD: Makefile,v 1.17 2003/01/15 16:15:13 is Exp $
+# $NetBSD: Makefile,v 1.18 2003/01/26 22:48:37 salo Exp $
#
PKGNAME= links-gui-2.1.0.7
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= Lynx-like text and graphics WWW browser
-CONFLICTS+= links-[0-9]* elinks-[0-9]*
+CONFLICTS+= links-[0-9]* elinks-0.3*
USE_BUILDLINK2= YES
USE_X11= YES
-.include "../../www/links/Makefile.common"
-
CONFIGURE_ARGS+= --enable-graphics
.include "../../graphics/png/buildlink2.mk"
diff --git a/www/links/Makefile b/www/links/Makefile
index a367af4ab86..6a18240b928 100644
--- a/www/links/Makefile
+++ b/www/links/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2002/11/11 12:19:47 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2003/01/26 22:48:36 salo Exp $
#
PKGNAME= links-2.1.0.7
+PKGREVISION= 1
COMMENT= Lynx-like text WWW browser
-CONFLICTS+= links-gui-[0-9]* elinks-[0-9]*
+CONFLICTS+= links-gui-[0-9]* elinks-0.3*
USE_BUILDLINK2= YES