Wed May 23 03:02:26 2012 UTC ()
After the move of expat in base, this finds it and installs an additional
library. Since expat is relatively harmless, just add an unconditional
dependence on expat and update the PLIST. PKGREVISION -> 4.


(dholland)
diff -r1.15 -r1.16 pkgsrc/lang/spl/Makefile
diff -r1.6 -r1.7 pkgsrc/lang/spl/PLIST
cvs diff -r1.15 -r1.16 pkgsrc/lang/spl/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/spl/Makefile 2012/04/27 12:31:51 1.15
+++ pkgsrc/lang/spl/Makefile 2012/05/23 03:02:26 1.16
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.15 2012/04/27 12:31:51 obache Exp $ 1# $NetBSD: Makefile,v 1.16 2012/05/23 03:02:26 dholland Exp $
2# 2#
3 3
4DISTNAME= spl-1.0pre3 4DISTNAME= spl-1.0pre3
5PKGREVISION= 3 5PKGREVISION= 4
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= http://www.clifford.at/spl/releases/ \ 7MASTER_SITES= http://www.clifford.at/spl/releases/ \
8 http://www.clifford.at/spl/releases/OLD/ 8 http://www.clifford.at/spl/releases/OLD/
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.clifford.at/spl/ 11HOMEPAGE= http://www.clifford.at/spl/
12COMMENT= The SPL Programming Language 12COMMENT= The SPL Programming Language
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
18USE_TOOLS+= bash gmake gawk pax 18USE_TOOLS+= bash gmake gawk pax
@@ -36,16 +36,17 @@ DOCDIR= ${PREFIX}/share/doc/spl @@ -36,16 +36,17 @@ DOCDIR= ${PREFIX}/share/doc/spl
36.include "options.mk" 36.include "options.mk"
37 37
38INSTALLATION_DIRS+= libexec/cgi-bin/webspl_cache 38INSTALLATION_DIRS+= libexec/cgi-bin/webspl_cache
39 39
40post-install: 40post-install:
41 ${CHMOD} a+rwx ${DESTDIR}${PREFIX}/libexec/cgi-bin/webspl_cache 41 ${CHMOD} a+rwx ${DESTDIR}${PREFIX}/libexec/cgi-bin/webspl_cache
42 ${LN} -sf ${PREFIX}/lib/spl_modules ${DESTDIR}${PREFIX}/libexec/cgi-bin/spl_modules 42 ${LN} -sf ${PREFIX}/lib/spl_modules ${DESTDIR}${PREFIX}/libexec/cgi-bin/spl_modules
43 ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR} 43 ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
44 cd ${WRKSRC} && pax -rw -p am README* manual.tex spldoc webspl_demo webspltut qtdemo ${DESTDIR}${DOCDIR} 44 cd ${WRKSRC} && pax -rw -p am README* manual.tex spldoc webspl_demo webspltut qtdemo ${DESTDIR}${DOCDIR}
45 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} 45 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
46 cd ${WRKSRC}/examples && ${INSTALL_DATA} example* ${DESTDIR}${EGDIR} 46 cd ${WRKSRC}/examples && ${INSTALL_DATA} example* ${DESTDIR}${EGDIR}
47 47
48.include "../../devel/ncurses/buildlink3.mk" 48.include "../../devel/ncurses/buildlink3.mk"
 49.include "../../textproc/expat/buildlink3.mk"
49.include "../../devel/pcre/buildlink3.mk" 50.include "../../devel/pcre/buildlink3.mk"
50.include "../../devel/readline/buildlink3.mk" 51.include "../../devel/readline/buildlink3.mk"
51.include "../../mk/bsd.pkg.mk" 52.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/lang/spl/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/spl/PLIST 2011/12/18 16:57:22 1.6
+++ pkgsrc/lang/spl/PLIST 2012/05/23 03:02:26 1.7
@@ -1,32 +1,33 @@ @@ -1,32 +1,33 @@
1@comment $NetBSD: PLIST,v 1.6 2011/12/18 16:57:22 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.7 2012/05/23 03:02:26 dholland Exp $
2bin/spl-config 2bin/spl-config
3bin/splrun 3bin/splrun
4bin/webspld 4bin/webspld
5include/spl.h 5include/spl.h
6lib/libspl.a 6lib/libspl.a
7lib/spl_modules/moddir.list 7lib/spl_modules/moddir.list
8lib/spl_modules/mod_array.so 8lib/spl_modules/mod_array.so
9lib/spl_modules/mod_bits.so 9lib/spl_modules/mod_bits.so
10lib/spl_modules/mod_cgi.so 10lib/spl_modules/mod_cgi.so
11lib/spl_modules/mod_crypt.so 11lib/spl_modules/mod_crypt.so
12lib/spl_modules/mod_encode_int.splb 12lib/spl_modules/mod_encode_int.splb
13lib/spl_modules/mod_encode_js.splb 13lib/spl_modules/mod_encode_js.splb
14lib/spl_modules/mod_encode_regex.splb 14lib/spl_modules/mod_encode_regex.splb
15lib/spl_modules/mod_encode_url.splb 15lib/spl_modules/mod_encode_url.splb
16lib/spl_modules/mod_encode_xml.so 16lib/spl_modules/mod_encode_xml.so
17lib/spl_modules/mod_environ.so 17lib/spl_modules/mod_environ.so
18lib/spl_modules/mod_file.so 18lib/spl_modules/mod_file.so
19lib/spl_modules/mod_format_ini.splb 19lib/spl_modules/mod_format_ini.splb
 20lib/spl_modules/mod_format_xml.so
20@comment lib/spl_modules/mod_gl.so 21@comment lib/spl_modules/mod_gl.so
21lib/spl_modules/mod_prime.so 22lib/spl_modules/mod_prime.so
22lib/spl_modules/mod_sql.so 23lib/spl_modules/mod_sql.so
23${PLIST.sqlite}lib/spl_modules/mod_sql_sqlite.so 24${PLIST.sqlite}lib/spl_modules/mod_sql_sqlite.so
24lib/spl_modules/mod_sql_utils.splb 25lib/spl_modules/mod_sql_utils.splb
25lib/spl_modules/mod_system.so 26lib/spl_modules/mod_system.so
26lib/spl_modules/mod_task.so 27lib/spl_modules/mod_task.so
27lib/spl_modules/mod_termio.so 28lib/spl_modules/mod_termio.so
28lib/spl_modules/mod_time.so 29lib/spl_modules/mod_time.so
29lib/spl_modules/mod_uuidgen.so 30lib/spl_modules/mod_uuidgen.so
30lib/spl_modules/mod_w2t.splb 31lib/spl_modules/mod_w2t.splb
31lib/spl_modules/mod_webdebug.so 32lib/spl_modules/mod_webdebug.so
32lib/spl_modules/mod_wsf.splb 33lib/spl_modules/mod_wsf.splb