Wed Mar 21 07:39:44 2012 UTC ()
raptor and raptor2 packages conflict with due to bin/rapper and its
man page.


(wiz)
diff -r1.31 -r1.32 pkgsrc/textproc/raptor/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/textproc/raptor2/Makefile
cvs diff -r1.31 -r1.32 pkgsrc/textproc/raptor/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/raptor/Attic/Makefile 2012/03/03 00:14:01 1.31
+++ pkgsrc/textproc/raptor/Attic/Makefile 2012/03/21 07:39:43 1.32
@@ -1,29 +1,31 @@ @@ -1,29 +1,31 @@
1# $NetBSD: Makefile,v 1.31 2012/03/03 00:14:01 wiz Exp $ 1# $NetBSD: Makefile,v 1.32 2012/03/21 07:39:43 wiz Exp $
2# 2#
3 3
4DISTNAME= raptor-1.4.21 4DISTNAME= raptor-1.4.21
5PKGREVISION= 4 5PKGREVISION= 4
6CATEGORIES= textproc 6CATEGORIES= textproc
7MASTER_SITES= http://download.librdf.org/source/ 7MASTER_SITES= http://download.librdf.org/source/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://librdf.org/raptor/ 10HOMEPAGE= http://librdf.org/raptor/
11COMMENT= RDF Parser Toolkit written in C 11COMMENT= RDF Parser Toolkit written in C
12LICENSE= gnu-lgpl-v2.1 OR apache-2.0 12LICENSE= gnu-lgpl-v2.1 OR apache-2.0
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16USE_LIBTOOL= YES 16USE_LIBTOOL= YES
17GNU_CONFIGURE= YES 17GNU_CONFIGURE= YES
18 18
 19CONFLICTS= raptor2-[0-9]*
 20
19PKGCONFIG_OVERRIDE+= raptor.pc.in 21PKGCONFIG_OVERRIDE+= raptor.pc.in
20CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc 22CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
21 23
22TEST_TARGET= check 24TEST_TARGET= check
23 25
24.include "../../devel/glib2/buildlink3.mk" 26.include "../../devel/glib2/buildlink3.mk"
25.include "../../textproc/libxml2/buildlink3.mk" 27.include "../../textproc/libxml2/buildlink3.mk"
26.include "../../textproc/libxslt/buildlink3.mk" 28.include "../../textproc/libxslt/buildlink3.mk"
27.include "../../www/curl/buildlink3.mk" 29.include "../../www/curl/buildlink3.mk"
28 30
29.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/textproc/raptor2/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/raptor2/Makefile 2012/03/19 09:12:26 1.1.1.1
+++ pkgsrc/textproc/raptor2/Makefile 2012/03/21 07:39:44 1.2
@@ -1,28 +1,30 @@ @@ -1,28 +1,30 @@
1# $NetBSD: Makefile,v 1.1.1.1 2012/03/19 09:12:26 markd Exp $ 1# $NetBSD: Makefile,v 1.2 2012/03/21 07:39:44 wiz Exp $
2# 2#
3 3
4DISTNAME= raptor2-2.0.6 4DISTNAME= raptor2-2.0.6
5CATEGORIES= textproc 5CATEGORIES= textproc
6MASTER_SITES= http://download.librdf.org/source/ 6MASTER_SITES= http://download.librdf.org/source/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://librdf.org/raptor/ 9HOMEPAGE= http://librdf.org/raptor/
10COMMENT= RDF Parser Toolkit written in C 10COMMENT= RDF Parser Toolkit written in C
11LICENSE= gnu-lgpl-v2.1 OR apache-2.0 11LICENSE= gnu-lgpl-v2.1 OR apache-2.0
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15USE_LIBTOOL= YES 15USE_LIBTOOL= YES
16GNU_CONFIGURE= YES 16GNU_CONFIGURE= YES
17 17
 18CONFLICTS= raptor-[0-9]*
 19
18PKGCONFIG_OVERRIDE+= raptor2.pc.in 20PKGCONFIG_OVERRIDE+= raptor2.pc.in
19CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc 21CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
20 22
21TEST_TARGET= check 23TEST_TARGET= check
22 24
23.include "../../devel/glib2/buildlink3.mk" 25.include "../../devel/glib2/buildlink3.mk"
24.include "../../textproc/libxml2/buildlink3.mk" 26.include "../../textproc/libxml2/buildlink3.mk"
25.include "../../textproc/libxslt/buildlink3.mk" 27.include "../../textproc/libxslt/buildlink3.mk"
26.include "../../www/curl/buildlink3.mk" 28.include "../../www/curl/buildlink3.mk"
27 29
28.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"