diff options
| author | cheusov <cheusov@pkgsrc.org> | 2012-10-21 11:39:12 +0000 |
|---|---|---|
| committer | cheusov <cheusov@pkgsrc.org> | 2012-10-21 11:39:12 +0000 |
| commit | 3e54a1aba4cfca25bda956f38636090d1e92b04b (patch) | |
| tree | 98269991649fe3c66de6a798795a829a7fe4d39f | |
| parent | 0014e5f5206231f077c8b8b68f19df4cec1d112b (diff) | |
| download | pkgsrc-3e54a1aba4cfca25bda956f38636090d1e92b04b.tar.gz | |
CONFLICTS between siag and siod packages
| -rw-r--r-- | lang/siod/Makefile | 6 | ||||
| -rw-r--r-- | misc/siag/Makefile | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lang/siod/Makefile b/lang/siod/Makefile index 5ab5f3ac4e2..78a3d97f115 100644 --- a/lang/siod/Makefile +++ b/lang/siod/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.21 2012/10/02 20:11:53 asau Exp $ +# $NetBSD: Makefile,v 1.22 2012/10/21 11:39:12 cheusov Exp $ DISTNAME= siod PKGNAME= siod-3.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang MASTER_SITES= # ftp://ftp.std.com/pub/gjc/ EXTRACT_SUFX= .tgz @@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://people.delphi.com/gjc/siod.html COMMENT= Small-footprint implementation of the Scheme programming language +CONFLICTS= siag-[0-9]* + WRKSRC= ${WRKDIR} MAKE_FILE= makefile MAKE_JOBS_SAFE= no diff --git a/misc/siag/Makefile b/misc/siag/Makefile index 8fb1a30d70c..eeb31c369e5 100644 --- a/misc/siag/Makefile +++ b/misc/siag/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.59 2012/10/21 11:35:51 cheusov Exp $ +# $NetBSD: Makefile,v 1.60 2012/10/21 11:39:12 cheusov Exp $ # DISTNAME= siag-3.6.1 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= misc editors math textproc MASTER_SITES= http://siag.nu/pub/siag/ @@ -11,6 +11,8 @@ HOMEPAGE= http://siag.nu/ COMMENT= Poor man's office suite with spreadsheet, word processor, etc LICENSE= gnu-gpl-v2 +CONFLICTS= siod-[0-9]* + #DEPENDS+= gv>=3.5.8nb1:../../print/gv #DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot |