summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkei <kei>2003-02-24 15:30:54 +0000
committerkei <kei>2003-02-24 15:30:54 +0000
commit12d7dc9b7299b49df7e11adc1e46e2b22cda57a0 (patch)
treea1c9817d1308c59f7bff7a13f73f32e200eea38b
parent0817223900e28494b72e0f954972a2deabeef7dd (diff)
downloadpkgsrc-12d7dc9b7299b49df7e11adc1e46e2b22cda57a0.tar.gz
make these packages conflict with dvipdfmx.
-rw-r--r--print/dvipdfm/Makefile5
-rw-r--r--print/ja-dvipdfm/Makefile5
2 files changed, 6 insertions, 4 deletions
diff --git a/print/dvipdfm/Makefile b/print/dvipdfm/Makefile
index 2c9dc9a749c..e00f0328f60 100644
--- a/print/dvipdfm/Makefile
+++ b/print/dvipdfm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/10/09 13:31:20 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/02/24 15:30:54 kei Exp $
DISTNAME= dvipdfm-0.13.2c
CATEGORIES= print converters
@@ -8,7 +8,8 @@ MAINTAINER= markd@netbsd.org
HOMEPAGE= http://gaspra.kettering.edu/dvipdfm
COMMENT= DVI to PDF translator
-CONFLICTS= ja-dvipdfm-[0-9]*
+CONFLICTS+= dvipdfmx-[0-9]*
+CONFLICTS+= ja-dvipdfm-[0-9]*
WRKSRC= ${WRKDIR}/dvipdfm
USE_BUILDLINK2= # defined
diff --git a/print/ja-dvipdfm/Makefile b/print/ja-dvipdfm/Makefile
index e792eaa1b77..02375be5768 100644
--- a/print/ja-dvipdfm/Makefile
+++ b/print/ja-dvipdfm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/10/09 13:32:11 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/02/24 15:30:54 kei Exp $
DISTNAME= dvipdfm-0.13.2c
PKGNAME= ja-${DISTNAME}
@@ -13,7 +13,8 @@ MAINTAINER= tech-pkg-ja@jp.netbsd.org
HOMEPAGE= http://gaspra.kettering.edu/dvipdfm
COMMENT= DVI to PDF translator with Japanese patch
-CONFLICTS= dvipdfm-*
+CONFLICTS+= dvipdfm-[0-9]*
+CONFLICTS+= dvipdfmx-[0-9]*
WRKSRC= ${WRKDIR}/dvipdfm
USE_BUILDLINK2= # defined