Tue Nov 1 06:57:58 2011 UTC ()
Recursive bump for textproc/rasqal buildlink addition.


(sbd)
diff -r1.7 -r1.8 pkgsrc/textproc/rasqal/buildlink3.mk
diff -r1.14 -r1.15 pkgsrc/textproc/redland/Makefile
diff -r1.5 -r1.6 pkgsrc/textproc/redland/buildlink3.mk
diff -r1.20 -r1.21 pkgsrc/textproc/soprano/Makefile
diff -r1.67 -r1.68 pkgsrc/www/amaya/Makefile

cvs diff -r1.7 -r1.8 pkgsrc/textproc/rasqal/buildlink3.mk (switch to unified diff)

--- pkgsrc/textproc/rasqal/buildlink3.mk 2011/11/01 06:56:34 1.7
+++ pkgsrc/textproc/rasqal/buildlink3.mk 2011/11/01 06:57:57 1.8
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: buildlink3.mk,v 1.7 2011/11/01 06:56:34 sbd Exp $ 1# $NetBSD: buildlink3.mk,v 1.8 2011/11/01 06:57:57 sbd Exp $
2 2
3BUILDLINK_TREE+= rasqal 3BUILDLINK_TREE+= rasqal
4 4
5.if !defined(RASQAL_BUILDLINK3_MK) 5.if !defined(RASQAL_BUILDLINK3_MK)
6RASQAL_BUILDLINK3_MK:= 6RASQAL_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.rasqal+= rasqal>=0.9.17 8BUILDLINK_API_DEPENDS.rasqal+= rasqal>=0.9.17
9BUILDLINK_ABI_DEPENDS.rasqal?= rasqal>=0.9.21nb1 9BUILDLINK_ABI_DEPENDS.rasqal?= rasqal>=0.9.21nb3
10BUILDLINK_PKGSRCDIR.rasqal?= ../../textproc/rasqal 10BUILDLINK_PKGSRCDIR.rasqal?= ../../textproc/rasqal
11 11
12.include "../../devel/gmp/buildlink3.mk" 12.include "../../devel/gmp/buildlink3.mk"
13.include "../../math/mpfr/buildlink3.mk" 13.include "../../math/mpfr/buildlink3.mk"
14.include "../../textproc/raptor/buildlink3.mk" 14.include "../../textproc/raptor/buildlink3.mk"
15.include "../../devel/pcre/buildlink3.mk" 15.include "../../devel/pcre/buildlink3.mk"
16.include "../../textproc/libxml2/buildlink3.mk" 16.include "../../textproc/libxml2/buildlink3.mk"
17.endif # RASQAL_BUILDLINK3_MK 17.endif # RASQAL_BUILDLINK3_MK
18 18
19BUILDLINK_TREE+= -rasqal 19BUILDLINK_TREE+= -rasqal

cvs diff -r1.14 -r1.15 pkgsrc/textproc/redland/Makefile (switch to unified diff)

--- pkgsrc/textproc/redland/Makefile 2011/05/17 02:42:35 1.14
+++ pkgsrc/textproc/redland/Makefile 2011/11/01 06:57:58 1.15
@@ -1,48 +1,48 @@ @@ -1,48 +1,48 @@
1# $NetBSD: Makefile,v 1.14 2011/05/17 02:42:35 obache Exp $ 1# $NetBSD: Makefile,v 1.15 2011/11/01 06:57:58 sbd Exp $
2 2
3DISTNAME= redland-1.0.12 3DISTNAME= redland-1.0.12
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= textproc 5CATEGORIES= textproc
6MASTER_SITES= http://download.librdf.org/source/ 6MASTER_SITES= http://download.librdf.org/source/
7 7
8MAINTAINER= markd@NetBSD.org 8MAINTAINER= markd@NetBSD.org
9HOMEPAGE= http://librdf.org/ 9HOMEPAGE= http://librdf.org/
10COMMENT= Libraries supporting the Resource Description Framework (RDF) 10COMMENT= Libraries supporting the Resource Description Framework (RDF)
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_TOOLS+= gmake perl pkg-config 15USE_TOOLS+= gmake perl pkg-config
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18 18
19.include "../../mk/bdb.buildlink3.mk" 19.include "../../mk/bdb.buildlink3.mk"
20 20
21.if empty(BDB_LIBS) 21.if empty(BDB_LIBS)
22CONFIGURE_ARGS+= --with-bdb-dbname=c 22CONFIGURE_ARGS+= --with-bdb-dbname=c
23.else 23.else
24CONFIGURE_ARGS+= --with-bdb-dbname=${BDB_TYPE} 24CONFIGURE_ARGS+= --with-bdb-dbname=${BDB_TYPE}
25.endif 25.endif
26CONFIGURE_ARGS+= --with-bdb-lib=${BDBBASE}/lib 26CONFIGURE_ARGS+= --with-bdb-lib=${BDBBASE}/lib
27CONFIGURE_ARGS+= --with-bdb-include=${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}} 27CONFIGURE_ARGS+= --with-bdb-include=${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}}
28CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include 28CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
29CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib 29CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib
30CONFIGURE_ARGS+= --with-mysql=no 30CONFIGURE_ARGS+= --with-mysql=no
31CONFIGURE_ARGS+= --with-postgresql=no 31CONFIGURE_ARGS+= --with-postgresql=no
32CONFIGURE_ARGS+= --with-sqlite=no 32CONFIGURE_ARGS+= --with-sqlite=no
33CONFIGURE_ARGS+= --with-threestore=no 33CONFIGURE_ARGS+= --with-threestore=no
34CONFIGURE_ARGS+= --with-raptop=system 34CONFIGURE_ARGS+= --with-raptop=system
35CONFIGURE_ARGS+= --with-rasqal=system 35CONFIGURE_ARGS+= --with-rasqal=system
36CONFIGURE_ARGS+= --with-virtuoso=no 36CONFIGURE_ARGS+= --with-virtuoso=no
37CONFIGURE_ENV+= ac_cv_path_IODBC_CONFIG=no 37CONFIGURE_ENV+= ac_cv_path_IODBC_CONFIG=no
38 38
39PKGCONFIG_OVERRIDE+= redland.pc.in 39PKGCONFIG_OVERRIDE+= redland.pc.in
40 40
41post-install: 41post-install:
42 ${RMDIR} ${DESTDIR}${PREFIX}/lib/redland 42 ${RMDIR} ${DESTDIR}${PREFIX}/lib/redland
43 43
44.include "../../devel/libltdl/buildlink3.mk" 44.include "../../devel/libltdl/buildlink3.mk"
45.include "../../security/openssl/buildlink3.mk" 45.include "../../security/openssl/buildlink3.mk"
46.include "../../textproc/raptor/buildlink3.mk" 46.include "../../textproc/raptor/buildlink3.mk"
47.include "../../textproc/rasqal/buildlink3.mk" 47.include "../../textproc/rasqal/buildlink3.mk"
48.include "../../mk/bsd.pkg.mk" 48.include "../../mk/bsd.pkg.mk"

cvs diff -r1.5 -r1.6 pkgsrc/textproc/redland/buildlink3.mk (switch to unified diff)

--- pkgsrc/textproc/redland/buildlink3.mk 2011/04/22 13:42:11 1.5
+++ pkgsrc/textproc/redland/buildlink3.mk 2011/11/01 06:57:58 1.6
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: buildlink3.mk,v 1.5 2011/04/22 13:42:11 obache Exp $ 1# $NetBSD: buildlink3.mk,v 1.6 2011/11/01 06:57:58 sbd Exp $
2 2
3BUILDLINK_TREE+= redland 3BUILDLINK_TREE+= redland
4 4
5.if !defined(REDLAND_BUILDLINK3_MK) 5.if !defined(REDLAND_BUILDLINK3_MK)
6REDLAND_BUILDLINK3_MK:= 6REDLAND_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.redland+= redland>=1.0.7 8BUILDLINK_API_DEPENDS.redland+= redland>=1.0.7
9BUILDLINK_ABI_DEPENDS.redland?= redland>=1.0.12nb1 9BUILDLINK_ABI_DEPENDS.redland?= redland>=1.0.12nb2
10BUILDLINK_PKGSRCDIR.redland?= ../../textproc/redland 10BUILDLINK_PKGSRCDIR.redland?= ../../textproc/redland
11 11
12.include "../../security/openssl/buildlink3.mk" 12.include "../../security/openssl/buildlink3.mk"
13.include "../../textproc/raptor/buildlink3.mk" 13.include "../../textproc/raptor/buildlink3.mk"
14.include "../../textproc/rasqal/buildlink3.mk" 14.include "../../textproc/rasqal/buildlink3.mk"
15.include "../../mk/bdb.buildlink3.mk" 15.include "../../mk/bdb.buildlink3.mk"
16.endif # REDLAND_BUILDLINK3_MK 16.endif # REDLAND_BUILDLINK3_MK
17 17
18BUILDLINK_TREE+= -redland 18BUILDLINK_TREE+= -redland

cvs diff -r1.20 -r1.21 pkgsrc/textproc/soprano/Makefile (switch to unified diff)

--- pkgsrc/textproc/soprano/Makefile 2011/11/01 06:02:38 1.20
+++ pkgsrc/textproc/soprano/Makefile 2011/11/01 06:57:58 1.21
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: Makefile,v 1.20 2011/11/01 06:02:38 sbd Exp $ 1# $NetBSD: Makefile,v 1.21 2011/11/01 06:57:58 sbd Exp $
2 2
3DISTNAME= soprano-2.5.2 3DISTNAME= soprano-2.5.2
4PKGREVISION= 4 4PKGREVISION= 5
5CATEGORIES= textproc 5CATEGORIES= textproc
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=soprano/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=soprano/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= markd@NetBSD.org 9MAINTAINER= markd@NetBSD.org
10HOMEPAGE= http://soprano.sourceforge.net/ 10HOMEPAGE= http://soprano.sourceforge.net/
11COMMENT= QT based RDF framework 11COMMENT= QT based RDF framework
12LICENSE= gnu-lgpl-v2 12LICENSE= gnu-lgpl-v2
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
17USE_CMAKE= yes 17USE_CMAKE= yes
18USE_TOOLS+= pkg-config 18USE_TOOLS+= pkg-config
19 19
20CMAKE_ARGS+= -DSOPRANO_DISABLE_SESAME2_BACKEND:BOOL=ON 20CMAKE_ARGS+= -DSOPRANO_DISABLE_SESAME2_BACKEND:BOOL=ON
21 21
22PKGCONFIG_OVERRIDE+= soprano.pc.cmake 22PKGCONFIG_OVERRIDE+= soprano.pc.cmake
23 23
24pre-configure: 24pre-configure:
25 ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/ 25 ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
26 26
27.include "../../databases/iodbc/buildlink3.mk" 27.include "../../databases/iodbc/buildlink3.mk"
28.include "../../textproc/libclucene/buildlink3.mk" 28.include "../../textproc/libclucene/buildlink3.mk"
29.include "../../textproc/redland/buildlink3.mk" 29.include "../../textproc/redland/buildlink3.mk"
30.include "../../x11/qt4-libs/buildlink3.mk" 30.include "../../x11/qt4-libs/buildlink3.mk"
31.include "../../x11/qt4-tools/buildlink3.mk" 31.include "../../x11/qt4-tools/buildlink3.mk"
32.include "../../x11/qt4-qdbus/buildlink3.mk" 32.include "../../x11/qt4-qdbus/buildlink3.mk"
33.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"

cvs diff -r1.67 -r1.68 pkgsrc/www/amaya/Attic/Makefile (switch to unified diff)

--- pkgsrc/www/amaya/Attic/Makefile 2011/11/01 06:02:45 1.67
+++ pkgsrc/www/amaya/Attic/Makefile 2011/11/01 06:57:58 1.68
@@ -1,143 +1,143 @@ @@ -1,143 +1,143 @@
1# $NetBSD: Makefile,v 1.67 2011/11/01 06:02:45 sbd Exp $ 1# $NetBSD: Makefile,v 1.68 2011/11/01 06:57:58 sbd Exp $
2 2
3DISTNAME= amaya-fullsrc-11.3.1 3DISTNAME= amaya-fullsrc-11.3.1
4PKGNAME= ${DISTNAME:S/-fullsrc//} 4PKGNAME= ${DISTNAME:S/-fullsrc//}
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= http://www.w3.org/Amaya/Distribution/ \ 7MASTER_SITES= http://www.w3.org/Amaya/Distribution/ \
8 ftp://ftp.w3.org/pub/amaya/ \ 8 ftp://ftp.w3.org/pub/amaya/ \
9 ftp://mirror.aarnet.edu.au/pub/amaya/ 9 ftp://mirror.aarnet.edu.au/pub/amaya/
10EXTRACT_SUFX= .tgz 10EXTRACT_SUFX= .tgz
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://www.w3.org/Amaya/ 13HOMEPAGE= http://www.w3.org/Amaya/
14COMMENT= Web browser/editor from the World Wide Web Consortium (W3C) 14COMMENT= Web browser/editor from the World Wide Web Consortium (W3C)
15LICENSE= amaya-license 15LICENSE= amaya-license
16 16
17PKG_DESTDIR_SUPPORT= user-destdir 17PKG_DESTDIR_SUPPORT= user-destdir
18 18
19USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
20USE_TOOLS+= gmake perl pkg-config 20USE_TOOLS+= gmake perl pkg-config
21GNU_CONFIGURE= yes 21GNU_CONFIGURE= yes
22 22
23# builds receive SIGSEGV (go figure) 23# builds receive SIGSEGV (go figure)
24MAKE_JOBS_SAFE= no 24MAKE_JOBS_SAFE= no
25 25
26BUILDDIR= ${WRKDIR}/Amaya/work 26BUILDDIR= ${WRKDIR}/Amaya/work
27WRKSRC= ${WRKDIR} 27WRKSRC= ${WRKDIR}
28CONFIGURE_DIRS= Amaya/work # also sets BUILD_DIRS 28CONFIGURE_DIRS= Amaya/work # also sets BUILD_DIRS
29CONFIGURE_SCRIPT= ../configure 29CONFIGURE_SCRIPT= ../configure
30BUILD_TARGET= all 30BUILD_TARGET= all
31 31
32CFLAGS+= -Dunix 32CFLAGS+= -Dunix
33 33
34FONTS_DIRS.ttf+= ${PREFIX}/share/Amaya/fonts 34FONTS_DIRS.ttf+= ${PREFIX}/share/Amaya/fonts
35REQD_DIRS+= ${PREFIX}/share/Amaya ${PREFIX}/share/Amaya/fonts 35REQD_DIRS+= ${PREFIX}/share/Amaya ${PREFIX}/share/Amaya/fonts
36 36
37.include "../../mk/bsd.prefs.mk" 37.include "../../mk/bsd.prefs.mk"
38 38
39.if !empty(PKGSRC_COMPILER:Mgcc*) 39.if !empty(PKGSRC_COMPILER:Mgcc*)
40CFLAGS+= -fno-strict-aliasing 40CFLAGS+= -fno-strict-aliasing
41.endif 41.endif
42 42
43# 43#
44# Some notes on the build issues, for the benefit of the next person 44# Some notes on the build issues, for the benefit of the next person
45# hacking this package: 45# hacking this package:
46# 46#
47# - The build directory must be a subdir of the Amaya dir of the 47# - The build directory must be a subdir of the Amaya dir of the
48# distribution. If it isn't, the build breaks. This is why the 48# distribution. If it isn't, the build breaks. This is why the
49# build dir is put where it is and not directly under ${WRKDIR}. 49# build dir is put where it is and not directly under ${WRKDIR}.
50# (This was true in 10.x; it might not be true any longer.) 50# (This was true in 10.x; it might not be true any longer.)
51# 51#
52# - The distfile currently includes copies of Mesa, freetype, libwww, 52# - The distfile currently includes copies of Mesa, freetype, libwww,
53# redland, and wxWidgets as well as Amaya itself. In 10.x it used to 53# redland, and wxWidgets as well as Amaya itself. In 10.x it used to
54# also contain a pile of graphics libraries; these have thankfully 54# also contain a pile of graphics libraries; these have thankfully
55# been pruned. 55# been pruned.
56# 56#
57# - There is no reason I can see to use or care about the included 57# - There is no reason I can see to use or care about the included
58# Mesa, freetype, or redland. 58# Mesa, freetype, or redland.
59# 59#
60# - The pkgsrc package used to use the included wxWidgets because at 60# - The pkgsrc package used to use the included wxWidgets because at
61# the time it was put together pkgsrc didn't have wxGTK28, only 61# the time it was put together pkgsrc didn't have wxGTK28, only
62# 26. This is no longer true and it should be safe to ignore the 62# 26. This is no longer true and it should be safe to ignore the
63# included wxWidgets. However, if it needs to come back, beware of 63# included wxWidgets. However, if it needs to come back, beware of
64# copies of other libs included in it that Amaya may forcibly build 64# copies of other libs included in it that Amaya may forcibly build
65# and use; in 10.x the only way to get the included wxWidgets to not 65# and use; in 10.x the only way to get the included wxWidgets to not
66# use its own copies of png, jpeg, tiff, and xpm was to patch the 66# use its own copies of png, jpeg, tiff, and xpm was to patch the
67# Amaya build logic. I've left this patch in place for future 67# Amaya build logic. I've left this patch in place for future
68# reference, although it's only about 50% likely it'll have any effect 68# reference, although it's only about 50% likely it'll have any effect
69# next time. Do not believe the build docs or the configure script 69# next time. Do not believe the build docs or the configure script
70# when it claims to allow you to disable builtin copies of libs; it 70# when it claims to allow you to disable builtin copies of libs; it
71# lies. 71# lies.
72# 72#
73# - The included libwww, however, appears to be necessary. In 10.x it 73# - The included libwww, however, appears to be necessary. In 10.x it
74# was a custom-patched version; now it appears not to be but it is 74# was a custom-patched version; now it appears not to be but it is
75# also a newer version than found in pkgsrc. As I don't think a newer 75# also a newer version than found in pkgsrc. As I don't think a newer
76# libwww than the one in pkgsrc has actually been released, it may as 76# libwww than the one in pkgsrc has actually been released, it may as
77# well be a custom-patched version. Given the history it is unlikely 77# well be a custom-patched version. Given the history it is unlikely
78# that Amaya will work with the older libwww in pkgsrc... assuming it 78# that Amaya will work with the older libwww in pkgsrc... assuming it
79# works at all of course... so it is probably best to use the included 79# works at all of course... so it is probably best to use the included
80# libwww until such time as this becoems clearer. 80# libwww until such time as this becoems clearer.
81# 81#
82# - The included libwww includes in turn its own copy of expat. In 82# - The included libwww includes in turn its own copy of expat. In
83# 10.x this was also a custom-patched version. This may or may not be 83# 10.x this was also a custom-patched version. This may or may not be
84# true now. Regardless, Amaya shold be made to use pkgsrc expat, 84# true now. Regardless, Amaya shold be made to use pkgsrc expat,
85# because as things stand it is likely to end up with multiple expats 85# because as things stand it is likely to end up with multiple expats
86# linked into it at once, and that's unlikely to work. I have not done 86# linked into it at once, and that's unlikely to work. I have not done
87# this yet though. (XXX) 87# this yet though. (XXX)
88# 88#
89# - As of 10.x the code using redland did not work, even using the 89# - As of 10.x the code using redland did not work, even using the
90# copy of redland included in the distfile. The schemas it tries to 90# copy of redland included in the distfile. The schemas it tries to
91# build are syntactically invalid. It *might* be a simple problem, I 91# build are syntactically invalid. It *might* be a simple problem, I
92# don't know enough about that stuff to fix it. Maybe someone else 92# don't know enough about that stuff to fix it. Maybe someone else
93# does. I haven't tried this in 11.x yet. (XXX) 93# does. I haven't tried this in 11.x yet. (XXX)
94# 94#
95# - The build target is "all". This is not the default. The default 95# - The build target is "all". This is not the default. The default
96# build target (if you just run make) also sort of builds the package 96# build target (if you just run make) also sort of builds the package
97# but doesn't actually work. 97# but doesn't actually work.
98# 98#
99# - The makefiles link some of the internal portions of the program 99# - The makefiles link some of the internal portions of the program
100# using -l/-L, and some by explicitly listing .a files. The pkgsrc 100# using -l/-L, and some by explicitly listing .a files. The pkgsrc
101# wrappers reorder these and break the build. I patched the makefiles 101# wrappers reorder these and break the build. I patched the makefiles
102# to always explicitly name .a files for internal program pieces. 102# to always explicitly name .a files for internal program pieces.
103# 103#
104# - The DAV code does not build by default. It requires generated 104# - The DAV code does not build by default. It requires generated
105# files from a later part of the build to already exist when it's 105# files from a later part of the build to already exist when it's
106# compiled. (That is, davlib/ doesn't build until part of amaya/ is 106# compiled. (That is, davlib/ doesn't build until part of amaya/ is
107# built, but you can't successfully build amaya/ without davlib/ 107# built, but you can't successfully build amaya/ without davlib/
108# because it needs to link with it. It turns out that this can be 108# because it needs to link with it. It turns out that this can be
109# hacked around by forcibly disabling the davlib/ directory in the 109# hacked around by forcibly disabling the davlib/ directory in the
110# top-level makefile; if davlib is nonetheless enabled, the amaya/ 110# top-level makefile; if davlib is nonetheless enabled, the amaya/
111# makefile recurses back to it to build it after generating the file 111# makefile recurses back to it to build it after generating the file
112# it needs. Sheesh. Between this and other issues it's clear that 112# it needs. Sheesh. Between this and other issues it's clear that
113# whoever develops this thing never tries building a clean tree, and 113# whoever develops this thing never tries building a clean tree, and
114# sometimes I wonder if they compile it at all before releasing it. 114# sometimes I wonder if they compile it at all before releasing it.
115# 115#
116 116
117post-extract: 117post-extract:
118 ${MKDIR} ${BUILDDIR} 118 ${MKDIR} ${BUILDDIR}
119 119
120post-configure: 120post-configure:
121 ${CP} ${BUILDDIR}/Options.orig ${BUILDDIR}/Options 121 ${CP} ${BUILDDIR}/Options.orig ${BUILDDIR}/Options
122 ${TOUCH} ${BUILDDIR}/Makefile 122 ${TOUCH} ${BUILDDIR}/Makefile
123 123
124# The davlib code doesn't build, so disable it. (no longer necessary) 124# The davlib code doesn't build, so disable it. (no longer necessary)
125#CONFIGURE_ARGS+= --without-dav 125#CONFIGURE_ARGS+= --without-dav
126 126
127# 127#
128# Use the supplied (prerelease?) libwww; use pkgsrc for everything else. 128# Use the supplied (prerelease?) libwww; use pkgsrc for everything else.
129# See notes above, and check the cvs history for tips if trying to reenable 129# See notes above, and check the cvs history for tips if trying to reenable
130# the builtin wxWidgets. 130# the builtin wxWidgets.
131# 131#
132EXTRACT_ELEMENTS= Amaya libwww 132EXTRACT_ELEMENTS= Amaya libwww
133CONFIGURE_ARGS+= --enable-system-redland 133CONFIGURE_ARGS+= --enable-system-redland
134CONFIGURE_ARGS+= --enable-system-wx 134CONFIGURE_ARGS+= --enable-system-wx
135 135
136#.include "../../www/libwww/buildlink3.mk" 136#.include "../../www/libwww/buildlink3.mk"
137.include "../../textproc/redland/buildlink3.mk" 137.include "../../textproc/redland/buildlink3.mk"
138.include "../../graphics/glu/buildlink3.mk" 138.include "../../graphics/glu/buildlink3.mk"
139.include "../../x11/wxGTK28/buildlink3.mk" 139.include "../../x11/wxGTK28/buildlink3.mk"
140.include "../../devel/glib2/buildlink3.mk" 140.include "../../devel/glib2/buildlink3.mk"
141.include "../../textproc/expat/buildlink3.mk" 141.include "../../textproc/expat/buildlink3.mk"
142 142
143.include "../../mk/bsd.pkg.mk" 143.include "../../mk/bsd.pkg.mk"