diff options
| author | agc <agc@pkgsrc.org> | 2010-07-04 07:06:23 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2010-07-04 07:06:23 +0000 |
| commit | c1785f908b64dc90b72c58306ff1e35f3bf44169 (patch) | |
| tree | 388af7db675f4eefbd61575c786172c35b8ef703 | |
| parent | d9dae677017c4ed34ca890920c4670d1688aa3ba (diff) | |
| download | pkgsrc-c1785f908b64dc90b72c58306ff1e35f3bf44169.tar.gz | |
Pullup previous changes on HEAD to pkgsrc-2010Q2 branch to fix branching
error, and to sync with reality.
32 files changed, 225 insertions, 425 deletions
diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile index e138f6640a0..574bf92046a 100644 --- a/archivers/gcpio/Makefile +++ b/archivers/gcpio/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.38 2010/03/23 22:42:17 tez Exp $ +# $NetBSD: Makefile,v 1.38.4.1 2010/07/04 07:06:23 agc Exp $ # DISTNAME= cpio-2.6 PKGNAME= g${DISTNAME} -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= archivers MASTER_SITES= ${MASTER_SITE_GNU:=cpio/} @@ -27,8 +27,6 @@ CONFIGURE_ENV+= gt_cv_func_gnugettext1_libintl=yes .include "../../mk/bsd.prefs.mk" -LIBS.NetBSD+= -lgnumalloc - .if defined(GNU_PROGRAM_PREFIX) && ${GNU_PROGRAM_PREFIX} == "" # pax installs a "cpio" also CONFLICTS+= pax-[0-9]* diff --git a/databases/Makefile b/databases/Makefile index d481c872676..217784cfe76 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.336 2010/06/11 23:42:02 tonnerre Exp $ +# $NetBSD: Makefile,v 1.336.2.1 2010/07/04 07:09:53 agc Exp $ # COMMENT= Databases @@ -195,7 +195,6 @@ SUBDIR+= php-mssql SUBDIR+= php-mysql SUBDIR+= php-mysqli SUBDIR+= php-oci8 -SUBDIR+= php-odbc SUBDIR+= php-pdo SUBDIR+= php-pdo_dblib SUBDIR+= php-pdo_mysql diff --git a/databases/apache-cassandra/Makefile b/databases/apache-cassandra/Makefile index 9d6cd3c0906..17f81d03f72 100644 --- a/databases/apache-cassandra/Makefile +++ b/databases/apache-cassandra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2010/06/11 02:01:43 tonnerre Exp $ +# $NetBSD: Makefile,v 1.2.2.1 2010/07/04 07:09:53 agc Exp $ # DISTNAME= apache-cassandra-${CASSANDRA_VER} @@ -29,6 +29,7 @@ DOCDIR= ${PREFIX}/share/doc/cassandra RCD_SCRIPTS= cassandra CASSANDRA_USER?= cassandra CASSANDRA_GROUP?= cassandra +USERGROUP_PHASE= pre-install PKG_GROUPS= ${CASSANDRA_GROUP} PKG_USERS= ${CASSANDRA_USER}:${CASSANDRA_GROUP} PKG_GROUPS_VARS+= CASSANDRA_GROUP diff --git a/databases/php-oci8/Makefile b/databases/php-oci8/Makefile index 316b807ca34..e01705d27a9 100644 --- a/databases/php-oci8/Makefile +++ b/databases/php-oci8/Makefile @@ -1,9 +1,11 @@ -# $NetBSD: Makefile,v 1.1.1.1 2007/12/04 00:31:41 grant Exp $ +# $NetBSD: Makefile,v 1.1.1.1.26.1 2010/07/04 07:09:53 agc Exp $ MODNAME= oci8 CATEGORIES+= databases COMMENT= PHP extension for Oracle 8 (and above) databases +PKG_DESTDIR_SUPPORT= user-destdir + USE_PHP_EXT_PATCHES= yes .include "../../mk/bsd.prefs.mk" diff --git a/databases/php-odbc/DESCR b/databases/php-odbc/DESCR deleted file mode 100644 index 3d9f8aac189..00000000000 --- a/databases/php-odbc/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -PHP is a programming language designed to be embedded into web pages. -This module provides access to ODBC data sources. diff --git a/databases/php-odbc/Makefile b/databases/php-odbc/Makefile deleted file mode 100644 index bc0d313516f..00000000000 --- a/databases/php-odbc/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.9 2006/10/20 21:53:33 jdolecek Exp $ - -MODNAME= odbc -CATEGORIES+= databases -COMMENT= PHP extension for ODBC access - -CONFLICTS= php-odbc-[0-9]* - -CONFIGURE_ARGS+= --with-unixODBC=shared,${BUILDLINK_PREFIX.unixodbc} - -BROKEN= module kills Apache1 or CLI PHP on startup due to threaded unixodbc - -.include "../../lang/php/ext.mk" -.include "../../databases/unixodbc/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/databases/py-cassa/Makefile b/databases/py-cassa/Makefile index 5c0219e2600..f7f026ccc74 100644 --- a/databases/py-cassa/Makefile +++ b/databases/py-cassa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2010/05/01 18:56:22 tonnerre Exp $ +# $NetBSD: Makefile,v 1.1.1.1.2.1 2010/07/04 07:09:53 agc Exp $ DISTNAME= pycassa-0.3.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^py//} @@ -12,6 +12,7 @@ COMMENT= Python client library for Cassandra PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_VERSIONS_ACCEPTED= 26 25 PYDISTUTILSPKG= yes .include "../../lang/python/extension.mk" diff --git a/devel/atf/Makefile b/devel/atf/Makefile index b7282ad7e93..1b55beeee21 100644 --- a/devel/atf/Makefile +++ b/devel/atf/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.12 2010/06/03 16:07:25 jmmv Exp $ +# $NetBSD: Makefile,v 1.12.2.1 2010/07/04 07:10:50 agc Exp $ # -DISTNAME= atf-0.9 +DISTNAME= atf-0.10 CATEGORIES= devel -MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/jmmv/atf/0.9/ +MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/jmmv/atf/0.10/ MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://www.NetBSD.org/~jmmv/atf/ diff --git a/devel/atf/PLIST b/devel/atf/PLIST index 9f7a1a12b7f..d1ddb89f7ca 100644 --- a/devel/atf/PLIST +++ b/devel/atf/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2010/06/03 16:07:25 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.11.2.1 2010/07/04 07:10:50 agc Exp $ bin/atf-check bin/atf-config bin/atf-report @@ -7,14 +7,12 @@ bin/atf-sh bin/atf-version include/atf-c++.hpp include/atf-c++/application.hpp -include/atf-c++/atffile.hpp include/atf-c++/build.hpp include/atf-c++/check.hpp include/atf-c++/config.hpp include/atf-c++/env.hpp include/atf-c++/exceptions.hpp include/atf-c++/expand.hpp -include/atf-c++/formats.hpp include/atf-c++/fs.hpp include/atf-c++/io.hpp include/atf-c++/macros.hpp @@ -37,28 +35,21 @@ include/atf-c/env.h include/atf-c/error.h include/atf-c/error_fwd.h include/atf-c/fs.h -include/atf-c/io.h include/atf-c/list.h include/atf-c/macros.h include/atf-c/map.h include/atf-c/process.h include/atf-c/sanity.h include/atf-c/tc.h -include/atf-c/tcr.h include/atf-c/text.h include/atf-c/tp.h -include/atf-c/ui.h include/atf-c/user.h lib/libatf-c++.la lib/libatf-c.la lib/pkgconfig/atf-c++.pc lib/pkgconfig/atf-c.pc -libexec/atf-cleanup -libexec/atf-format man/man1/atf-check.1 -man/man1/atf-cleanup.1 man/man1/atf-config.1 -man/man1/atf-format.1 man/man1/atf-report.1 man/man1/atf-run.1 man/man1/atf-sh.1 @@ -82,331 +73,88 @@ share/xml/atf/tests-results.dtd share/xsl/atf/tests-results.xsl tests/atf/Atffile tests/atf/atf-c++/Atffile -tests/atf/atf-c++/d_include_application_hpp.cpp -tests/atf/atf-c++/d_include_atf_c++_hpp.cpp -tests/atf/atf-c++/d_include_atffile_hpp.cpp -tests/atf/atf-c++/d_include_build_hpp.cpp -tests/atf/atf-c++/d_include_check_hpp.cpp -tests/atf/atf-c++/d_include_config_hpp.cpp -tests/atf/atf-c++/d_include_env_hpp.cpp -tests/atf/atf-c++/d_include_exceptions_hpp.cpp -tests/atf/atf-c++/d_include_expand_hpp.cpp -tests/atf/atf-c++/d_include_formats_hpp.cpp -tests/atf/atf-c++/d_include_fs_hpp.cpp -tests/atf/atf-c++/d_include_io_hpp.cpp -tests/atf/atf-c++/d_include_macros_hpp.cpp -tests/atf/atf-c++/d_include_parser_hpp.cpp -tests/atf/atf-c++/d_include_process_hpp.cpp -tests/atf/atf-c++/d_include_sanity_hpp.cpp -tests/atf/atf-c++/d_include_signals_hpp.cpp -tests/atf/atf-c++/d_include_tests_hpp.cpp -tests/atf/atf-c++/d_include_text_hpp.cpp -tests/atf/atf-c++/d_include_ui_hpp.cpp -tests/atf/atf-c++/d_include_user_hpp.cpp -tests/atf/atf-c++/d_include_utils_hpp.cpp -tests/atf/atf-c++/d_use_macros_hpp.cpp -tests/atf/atf-c++/t_application -tests/atf/atf-c++/t_atf_c++ -tests/atf/atf-c++/t_atffile -tests/atf/atf-c++/t_build -tests/atf/atf-c++/t_check -tests/atf/atf-c++/t_config -tests/atf/atf-c++/t_env -tests/atf/atf-c++/t_exceptions -tests/atf/atf-c++/t_expand -tests/atf/atf-c++/t_formats -tests/atf/atf-c++/t_fs -tests/atf/atf-c++/t_io -tests/atf/atf-c++/t_macros -tests/atf/atf-c++/t_parser -tests/atf/atf-c++/t_pkg_config -tests/atf/atf-c++/t_process -tests/atf/atf-c++/t_sanity -tests/atf/atf-c++/t_signals -tests/atf/atf-c++/t_tests -tests/atf/atf-c++/t_text -tests/atf/atf-c++/t_ui -tests/atf/atf-c++/t_user -tests/atf/atf-c++/t_utils +tests/atf/atf-c++/application_test +tests/atf/atf-c++/atf_c++_test +tests/atf/atf-c++/build_test +tests/atf/atf-c++/check_test +tests/atf/atf-c++/config_test +tests/atf/atf-c++/env_test +tests/atf/atf-c++/exceptions_test +tests/atf/atf-c++/expand_test +tests/atf/atf-c++/fs_test +tests/atf/atf-c++/io_test +tests/atf/atf-c++/macros_hpp_test.cpp +tests/atf/atf-c++/macros_test +tests/atf/atf-c++/parser_test +tests/atf/atf-c++/pkg_config_test +tests/atf/atf-c++/process_test +tests/atf/atf-c++/sanity_test +tests/atf/atf-c++/signals_test +tests/atf/atf-c++/tests_test +tests/atf/atf-c++/text_test +tests/atf/atf-c++/ui_test +tests/atf/atf-c++/user_test +tests/atf/atf-c++/utils_test tests/atf/atf-c/Atffile -tests/atf/atf-c/d_include_atf_c_h.c -tests/atf/atf-c/d_include_build_h.c -tests/atf/atf-c/d_include_check_h.c -tests/atf/atf-c/d_include_config_h.c -tests/atf/atf-c/d_include_dynstr_h.c -tests/atf/atf-c/d_include_env_h.c -tests/atf/atf-c/d_include_error_fwd_h.c -tests/atf/atf-c/d_include_error_h.c -tests/atf/atf-c/d_include_fs_h.c -tests/atf/atf-c/d_include_io_h.c -tests/atf/atf-c/d_include_list_h.c -tests/atf/atf-c/d_include_macros_h.c -tests/atf/atf-c/d_include_map_h.c -tests/atf/atf-c/d_include_process_h.c -tests/atf/atf-c/d_include_sanity_h.c -tests/atf/atf-c/d_include_tc_h.c -tests/atf/atf-c/d_include_tcr_h.c -tests/atf/atf-c/d_include_text_h.c -tests/atf/atf-c/d_include_tp_h.c -tests/atf/atf-c/d_include_ui_h.c -tests/atf/atf-c/d_include_user_h.c -tests/atf/atf-c/d_use_macros_h.c -tests/atf/atf-c/h_processes -tests/atf/atf-c/t_atf_c -tests/atf/atf-c/t_build -tests/atf/atf-c/t_check -tests/atf/atf-c/t_config -tests/atf/atf-c/t_dynstr -tests/atf/atf-c/t_env -tests/atf/atf-c/t_error -tests/atf/atf-c/t_fs -tests/atf/atf-c/t_h_lib -tests/atf/atf-c/t_io -tests/atf/atf-c/t_list -tests/atf/atf-c/t_macros -tests/atf/atf-c/t_map -tests/atf/atf-c/t_pkg_config -tests/atf/atf-c/t_process -tests/atf/atf-c/t_sanity -tests/atf/atf-c/t_tc -tests/atf/atf-c/t_tcr -tests/atf/atf-c/t_text -tests/atf/atf-c/t_tp -tests/atf/atf-c/t_ui -tests/atf/atf-c/t_user +tests/atf/atf-c/atf_c_test +tests/atf/atf-c/build_test +tests/atf/atf-c/check_test +tests/atf/atf-c/config_test +tests/atf/atf-c/dynstr_test +tests/atf/atf-c/env_test +tests/atf/atf-c/error_test +tests/atf/atf-c/fs_test +tests/atf/atf-c/list_test +tests/atf/atf-c/macros_h_test.c +tests/atf/atf-c/macros_test +tests/atf/atf-c/map_test +tests/atf/atf-c/pkg_config_test +tests/atf/atf-c/process_helpers +tests/atf/atf-c/process_test +tests/atf/atf-c/sanity_test +tests/atf/atf-c/tc_test +tests/atf/atf-c/test_helpers_test +tests/atf/atf-c/text_test +tests/atf/atf-c/tp_test +tests/atf/atf-c/user_test tests/atf/atf-check/Atffile -tests/atf/atf-check/t_integration -tests/atf/atf-cleanup/Atffile -tests/atf/atf-cleanup/t_integration +tests/atf/atf-check/integration_test tests/atf/atf-config/Atffile -tests/atf/atf-config/t_integration +tests/atf/atf-config/integration_test tests/atf/atf-report/Atffile -tests/atf/atf-report/h_fail -tests/atf/atf-report/h_misc -tests/atf/atf-report/h_pass -tests/atf/atf-report/t_integration +tests/atf/atf-report/fail_helper +tests/atf/atf-report/integration_test +tests/atf/atf-report/misc_helpers +tests/atf/atf-report/pass_helper +tests/atf/atf-report/reader_test tests/atf/atf-run/Atffile -tests/atf/atf-run/h_bad_metadata -tests/atf/atf-run/h_fail -tests/atf/atf-run/h_misc -tests/atf/atf-run/h_pass -tests/atf/atf-run/h_several_tcs -tests/atf/atf-run/h_zero_tcs -tests/atf/atf-run/t_config -tests/atf/atf-run/t_integration -tests/atf/atf-run/t_requirements -tests/atf/atf-run/t_test_program +tests/atf/atf-run/atffile_test +tests/atf/atf-run/bad_metadata_helper +tests/atf/atf-run/config_test +tests/atf/atf-run/expect_helpers +tests/atf/atf-run/fs_test +tests/atf/atf-run/integration_test +tests/atf/atf-run/misc_helpers +tests/atf/atf-run/pass_helper +tests/atf/atf-run/requirements_test +tests/atf/atf-run/several_tcs_helper +tests/atf/atf-run/test_program_test +tests/atf/atf-run/zero_tcs_helper tests/atf/atf-sh/Atffile -tests/atf/atf-sh/h_misc -tests/atf/atf-sh/t_atf_check -tests/atf/atf-sh/t_config -tests/atf/atf-sh/t_integration -tests/atf/atf-sh/t_normalize -tests/atf/atf-sh/t_tc -tests/atf/atf-sh/t_tp -tests/atf/formats/Atffile -tests/atf/formats/d_atffile_1 -tests/atf/formats/d_atffile_1.expout -tests/atf/formats/d_atffile_2 -tests/atf/formats/d_atffile_2.expout -tests/atf/formats/d_atffile_3 -tests/atf/formats/d_atffile_3.expout -tests/atf/formats/d_atffile_4 -tests/atf/formats/d_atffile_4.expout -tests/atf/formats/d_atffile_5 -tests/atf/formats/d_atffile_5.expout -tests/atf/formats/d_atffile_50 -tests/atf/formats/d_atffile_50.experr -tests/atf/formats/d_atffile_51 -tests/atf/formats/d_atffile_51.experr -tests/atf/formats/d_atffile_52 -tests/atf/formats/d_atffile_52.experr -tests/atf/formats/d_atffile_53 -tests/atf/formats/d_atffile_53.experr -tests/atf/formats/d_atffile_53.expout -tests/atf/formats/d_atffile_54 -tests/atf/formats/d_atffile_54.experr -tests/atf/formats/d_atffile_6 -tests/atf/formats/d_atffile_6.expout -tests/atf/formats/d_config_1 -tests/atf/formats/d_config_1.expout -tests/atf/formats/d_config_2 -tests/atf/formats/d_config_2.expout -tests/atf/formats/d_config_3 -tests/atf/formats/d_config_3.expout -tests/atf/formats/d_config_4 -tests/atf/formats/d_config_4.expout -tests/atf/formats/d_config_50 -tests/atf/formats/d_config_50.experr -tests/atf/formats/d_config_51 -tests/atf/formats/d_config_51.experr -tests/atf/formats/d_config_52 -tests/atf/formats/d_config_52.experr -tests/atf/formats/d_config_53 -tests/atf/formats/d_config_53.experr -tests/atf/formats/d_config_53.expout -tests/atf/formats/d_config_54 -tests/atf/formats/d_config_54.experr -tests/atf/formats/d_headers_1 -tests/atf/formats/d_headers_1.experr -tests/atf/formats/d_headers_10 -tests/atf/formats/d_headers_10.experr -tests/atf/formats/d_headers_11 -tests/atf/formats/d_headers_11.experr -tests/atf/formats/d_headers_12 -tests/atf/formats/d_headers_12.experr -tests/atf/formats/d_headers_2 -tests/atf/formats/d_headers_2.experr -tests/atf/formats/d_headers_3 -tests/atf/formats/d_headers_3.experr -tests/atf/formats/d_headers_4 -tests/atf/formats/d_headers_4.experr -tests/atf/formats/d_headers_5 -tests/atf/formats/d_headers_5.experr -tests/atf/formats/d_headers_6 -tests/atf/formats/d_headers_6.experr -tests/atf/formats/d_headers_7 -tests/atf/formats/d_headers_7.experr -tests/atf/formats/d_headers_8 -tests/atf/formats/d_headers_8.experr -tests/atf/formats/d_headers_9 -tests/atf/formats/d_headers_9.experr -tests/atf/formats/d_tcr_1 -tests/atf/formats/d_tcr_1.expout -tests/atf/formats/d_tcr_2 -tests/atf/formats/d_tcr_2.expout -tests/atf/formats/d_tcr_3 -tests/atf/formats/d_tcr_3.expout -tests/atf/formats/d_tcr_50 -tests/atf/formats/d_tcr_50.experr -tests/atf/formats/d_tcr_51 -tests/atf/formats/d_tcr_51.experr -tests/atf/formats/d_tcr_52 -tests/atf/formats/d_tcr_52.experr -tests/atf/formats/d_tcr_53 -tests/atf/formats/d_tcr_53.experr -tests/atf/formats/d_tcr_54 -tests/atf/formats/d_tcr_54.experr -tests/atf/formats/d_tcr_60 -tests/atf/formats/d_tcr_60.experr -tests/atf/formats/d_tcr_61 -tests/atf/formats/d_tcr_61.experr -tests/atf/formats/d_tcr_61.expout -tests/atf/formats/d_tcr_70 -tests/atf/formats/d_tcr_70.experr -tests/atf/formats/d_tcr_70.expout -tests/atf/formats/d_tcr_71 -tests/atf/formats/d_tcr_71.experr -tests/atf/formats/d_tcr_71.expout -tests/atf/formats/d_tcr_72 -tests/atf/formats/d_tcr_72.experr -tests/atf/formats/d_tcr_72.expout -tests/atf/formats/d_tcr_73 -tests/atf/formats/d_tcr_73.experr -tests/atf/formats/d_tcr_73.expout -tests/atf/formats/d_tcr_74 -tests/atf/formats/d_tcr_74.experr -tests/atf/formats/d_tcr_74.expout -tests/atf/formats/d_tcr_75 -tests/atf/formats/d_tcr_75.experr -tests/atf/formats/d_tcr_75.expout -tests/atf/formats/d_tcr_76 -tests/atf/formats/d_tcr_76.experr -tests/atf/formats/d_tcr_76.expout -tests/atf/formats/d_tcr_77 -tests/atf/formats/d_tcr_77.experr -tests/atf/formats/d_tp_1 -tests/atf/formats/d_tp_1.expout -tests/atf/formats/d_tp_2 -tests/atf/formats/d_tp_2.expout -tests/atf/formats/d_tp_3 -tests/atf/formats/d_tp_3.expout -tests/atf/formats/d_tp_4 -tests/atf/formats/d_tp_4.expout -tests/atf/formats/d_tp_50 -tests/atf/formats/d_tp_50.experr -tests/atf/formats/d_tp_51 -tests/atf/formats/d_tp_51.experr -tests/atf/formats/d_tp_52 -tests/atf/formats/d_tp_52.expout -tests/atf/formats/d_tp_53 -tests/atf/formats/d_tp_53.experr -tests/atf/formats/d_tp_54 -tests/atf/formats/d_tp_54.experr -tests/atf/formats/d_tp_55 -tests/atf/formats/d_tp_55.experr -tests/atf/formats/d_tp_56 -tests/atf/formats/d_tp_56.experr -tests/atf/formats/d_tp_57 -tests/atf/formats/d_tp_57.experr -tests/atf/formats/d_tp_58 -tests/atf/formats/d_tp_58.experr -tests/atf/formats/d_tp_59 -tests/atf/formats/d_tp_59.experr -tests/atf/formats/d_tps_1 -tests/atf/formats/d_tps_1.expout -tests/atf/formats/d_tps_2 -tests/atf/formats/d_tps_2.expout -tests/atf/formats/d_tps_3 -tests/atf/formats/d_tps_3.expout -tests/atf/formats/d_tps_4 -tests/atf/formats/d_tps_4.expout -tests/atf/formats/d_tps_5 -tests/atf/formats/d_tps_5.expout -tests/atf/formats/d_tps_50 -tests/atf/formats/d_tps_50.experr -tests/atf/formats/d_tps_51 -tests/atf/formats/d_tps_51.experr -tests/atf/formats/d_tps_52 -tests/atf/formats/d_tps_52.experr -tests/atf/formats/d_tps_53 -tests/atf/formats/d_tps_53.experr -tests/atf/formats/d_tps_53.expout -tests/atf/formats/d_tps_54 -tests/atf/formats/d_tps_54.experr -tests/atf/formats/d_tps_54.expout -tests/atf/formats/d_tps_55 -tests/atf/formats/d_tps_55.experr -tests/atf/formats/d_tps_55.expout -tests/atf/formats/d_tps_56 -tests/atf/formats/d_tps_56.experr -tests/atf/formats/d_tps_56.expout -tests/atf/formats/d_tps_57 -tests/atf/formats/d_tps_57.experr -tests/atf/formats/d_tps_57.expout -tests/atf/formats/d_tps_58 -tests/atf/formats/d_tps_58.experr -tests/atf/formats/d_tps_58.expout -tests/atf/formats/d_tps_59 -tests/atf/formats/d_tps_59.experr -tests/atf/formats/d_tps_60 -tests/atf/formats/d_tps_60.experr -tests/atf/formats/d_tps_61 -tests/atf/formats/d_tps_61.experr -tests/atf/formats/d_tps_62 -tests/atf/formats/d_tps_62.experr -tests/atf/formats/d_tps_62.expout -tests/atf/formats/d_tps_63 -tests/atf/formats/d_tps_63.experr -tests/atf/formats/d_tps_63.expout -tests/atf/formats/d_tps_64 -tests/atf/formats/d_tps_64.experr -tests/atf/formats/d_tps_64.expout -tests/atf/formats/d_tps_65 -tests/atf/formats/d_tps_65.experr -tests/atf/formats/d_tps_65.expout -tests/atf/formats/d_tps_66 -tests/atf/formats/d_tps_66.experr -tests/atf/formats/d_tps_66.expout -tests/atf/formats/h_parser -tests/atf/formats/t_parsers -tests/atf/formats/t_writers -tests/atf/test_programs/Atffile -tests/atf/test_programs/h_c -tests/atf/test_programs/h_cpp -tests/atf/test_programs/h_sh -tests/atf/test_programs/t_config -tests/atf/test_programs/t_fork -tests/atf/test_programs/t_meta_data -tests/atf/test_programs/t_srcdir -tests/atf/test_programs/t_status +tests/atf/atf-sh/atf_check_test +tests/atf/atf-sh/config_test +tests/atf/atf-sh/integration_test +tests/atf/atf-sh/misc_helpers +tests/atf/atf-sh/normalize_test +tests/atf/atf-sh/tc_test +tests/atf/atf-sh/tp_test +tests/atf/test-programs/Atffile +tests/atf/test-programs/c_helpers +tests/atf/test-programs/config_test +tests/atf/test-programs/cpp_helpers +tests/atf/test-programs/expect_test +tests/atf/test-programs/fork_test +tests/atf/test-programs/meta_data_test +tests/atf/test-programs/result_test +tests/atf/test-programs/sh_helpers +tests/atf/test-programs/srcdir_test diff --git a/devel/atf/distinfo b/devel/atf/distinfo index 0cb2cc623ef..3b95211dd97 100644 --- a/devel/atf/distinfo +++ b/devel/atf/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.9 2010/06/03 16:07:26 jmmv Exp $ +$NetBSD: distinfo,v 1.9.2.1 2010/07/04 07:10:50 agc Exp $ -SHA1 (atf-0.9.tar.gz) = 10a3dee3543ee9e8b5d2b67bcd3f4b2a8921f21f -RMD160 (atf-0.9.tar.gz) = e4868246512a815469f7b3cd35971795f23e5d0d -Size (atf-0.9.tar.gz) = 674458 bytes +SHA1 (atf-0.10.tar.gz) = f3d1a689204c69dc40211d2ecce0eb4f09f8ad75 +RMD160 (atf-0.10.tar.gz) = 2f0e2e499b87090f81a15f8f756cc48b1e8b9486 +Size (atf-0.10.tar.gz) = 599208 bytes diff --git a/devel/nbitools/patches/patch-aa b/devel/nbitools/patches/patch-aa index 2843ac9c9bc..5a043ee96b2 100644 --- a/devel/nbitools/patches/patch-aa +++ b/devel/nbitools/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/06/03 09:53:47 sakamoto Exp $ +$NetBSD: patch-aa,v 1.1.1.1.58.1 2010/07/04 07:10:50 agc Exp $ --- include/Imakefile.orig Thu May 29 22:59:31 1997 +++ include/Imakefile diff --git a/devel/nbitools/patches/patch-ab b/devel/nbitools/patches/patch-ab index 5880d7d5615..842dd407d6f 100644 --- a/devel/nbitools/patches/patch-ab +++ b/devel/nbitools/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/06/03 09:53:47 sakamoto Exp $ +$NetBSD: patch-ab,v 1.1.1.1.58.1 2010/07/04 07:10:50 agc Exp $ --- config/extras/extras.tmpl.orig Thu May 29 22:59:30 1997 +++ config/extras/extras.tmpl diff --git a/devel/nbitools/patches/patch-ae b/devel/nbitools/patches/patch-ae index 3a1af0929b6..f14c473f6a8 100644 --- a/devel/nbitools/patches/patch-ae +++ b/devel/nbitools/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/06/03 09:53:47 sakamoto Exp $ +$NetBSD: patch-ae,v 1.1.1.1.58.1 2010/07/04 07:10:50 agc Exp $ --- config/cf/X11.tmpl.orig Thu Jan 21 21:50:39 1999 +++ config/cf/X11.tmpl diff --git a/devel/ptlib/Makefile b/devel/ptlib/Makefile index 2fe9ca3ebeb..8c76ded35d9 100644 --- a/devel/ptlib/Makefile +++ b/devel/ptlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2010/01/17 12:02:14 wiz Exp $ +# $NetBSD: Makefile,v 1.12.4.1 2010/07/04 07:10:50 agc Exp $ DISTNAME= ptlib-2.6.5 PKGREVISION= 2 @@ -16,7 +16,7 @@ PKG_DESTDIR_SUPPORT= user-destdir CONFLICTS+= pwlib-[0-9]* -USE_TOOLS+= bison gmake pkg-config +USE_TOOLS+= bison flex gmake pkg-config BUILD_TARGET= optshared USE_LANGUAGES= c c++ USE_LIBTOOL= yes diff --git a/devel/py-sysctl/Makefile b/devel/py-sysctl/Makefile index 274d4ee3ae3..102a085ff4a 100644 --- a/devel/py-sysctl/Makefile +++ b/devel/py-sysctl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2010/04/11 06:48:41 cherry Exp $ +# $NetBSD: Makefile,v 1.1.1.1.2.1 2010/07/04 07:10:50 agc Exp $ DISTNAME= py-sysctl-0.1 PKGNAME= ${PYPKGPREFIX}-sysctl-0.1 @@ -13,6 +13,7 @@ COMMENT= Python interface to sysctl(3) PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_VERSIONS_ACCEPTED= 26 25 PYDISTUTILSPKG= # yes .include "../../lang/python/extension.mk" diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common index 623865e9f74..8ebc7b3f14c 100644 --- a/devel/subversion/Makefile.common +++ b/devel/subversion/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.34 2010/03/03 16:33:08 gdt Exp $ +# $NetBSD: Makefile.common,v 1.34.4.1 2010/07/04 07:10:51 agc Exp $ # used by devel/java-subversion/Makefile # used by devel/p5-subversion/Makefile # used by devel/py-subversion/Makefile @@ -11,7 +11,7 @@ DISTNAME= subversion-${SVNVER} CATEGORIES= devel scm MASTER_SITES= http://subversion.tigris.org/downloads/ -MAINTAINER= gdt@NetBSD.org +MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://subversion.tigris.org/ LICENSE= apache-1.1 diff --git a/devel/swt/Makefile b/devel/swt/Makefile index cf7d21735ce..c63d55dec07 100644 --- a/devel/swt/Makefile +++ b/devel/swt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:10 wiz Exp $ +# $NetBSD: Makefile,v 1.5.2.1 2010/07/04 07:10:51 agc Exp $ # SWTREL= 3.5.1 @@ -35,6 +35,13 @@ PLIST_SUBST+= SWTVER=${SWTVER} INSTALLATION_DIRS+= share/java INSTALLATION_DIRS+= lib/jni +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "NetBSD" && ${LOWER_ARCH} == "x86_64" +MY_LOWER_ARCH= amd64 +.endif +MY_LOWER_ARCH?= ${LOWER_ARCH} + post-extract: cd ${WRKSRC} && jar -xf ${WRKSRC}/src.zip cp ${FILESDIR}/make_pkgsrc.mak ${WRKSRC} @@ -44,6 +51,7 @@ do-build: cd ${WRKSRC} && ${GMAKE} \ JAVA_HOME=${PKG_JAVA_HOME} \ LOWER_OPSYS=${LOWER_OPSYS} \ + LOWER_ARCH=${MY_LOWER_ARCH} \ -f make_pkgsrc.mak ${target} .endfor ${TEST} -d ${WRKSRC}/bin || mkdir ${WRKSRC}/bin diff --git a/devel/swt/files/make_pkgsrc.mak b/devel/swt/files/make_pkgsrc.mak index 3334660b226..6eefc9733ec 100644 --- a/devel/swt/files/make_pkgsrc.mak +++ b/devel/swt/files/make_pkgsrc.mak @@ -1,4 +1,4 @@ -# $NetBSD: make_pkgsrc.mak,v 1.1.1.1 2010/02/03 13:51:29 jmcneill Exp $ +# $NetBSD: make_pkgsrc.mak,v 1.1.1.1.4.1 2010/07/04 07:10:51 agc Exp $ #******************************************************************************* # Copyright (c) 2000, 2009 IBM Corporation and others. # All rights reserved. This program and the accompanying materials @@ -51,7 +51,7 @@ GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` `pkg-config --libs-onl CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc -AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt -shared +AWT_LIBS = -L$(JAVA_HOME)/jre/lib/$(LOWER_ARCH) -R$(JAVA_HOME)/jre/lib/$(LOWER_ARCH) -ljawt -shared ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0` ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0` `pkg-config --libs-only-other atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0 diff --git a/doc/CHANGES-2010 b/doc/CHANGES-2010 index ec33074f984..dd7b1aa80a2 100644 --- a/doc/CHANGES-2010 +++ b/doc/CHANGES-2010 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2010,v 1.2306 2010/06/25 22:15:44 wiz Exp $ +$NetBSD: CHANGES-2010,v 1.2306.2.1 2010/07/04 07:11:21 agc Exp $ PKGSRC IS CURRENTLY FROZEN FOR NEW FUNCTIONALITY - PLEASE DO NOT ADD ANY NEW PACKAGES, AND PLEASE DO NOT MAKE INFRASTRUCTURE CHANGES, UNTIL @@ -2510,6 +2510,7 @@ Changes to the packages collection and infrastructure in 2010: Updated mail/cone to 0.83 [adam 2010-05-18] Updated audio/cmus to 2.3.2 [gls 2010-05-18] Updated chat/irssi-icb to 0.14nb16 [sketch 2010-05-18] + Added x11/qt4-creator version 1.3.1 [drochner 2010-05-18] Updated lang/gprolog to 1.3.1 [asau 2010-05-19] Updated lang/snobol to 1.3 [asau 2010-05-19] Added math/TinySVM version 0.09 [obache 2010-05-19] @@ -3062,3 +3063,21 @@ Changes to the packages collection and infrastructure in 2010: Updated www/seamonkey to 2.0.5 [tnn 2010-06-25] Removed www/pyblosxom successor www/py-blosxom [hauke 2010-06-25] Updated fonts/umefont-ttf to 0.416 [wiz 2010-06-25] + Updated graphics/png to 1.4.3 [wiz 2010-06-26] + Updated mail/getmail to 4.18.0 [schmonz 2010-06-27] + Updated inputmethod/scim-tomoe to 0.6.0nb3 [obache 2010-06-27] + Updated inputmethod/tomoe-gtk to 0.6.0nb5 [obache 2010-06-27] + Removed databases/php-odbc [joerg 2010-06-27] + Updated x11/gtkmm to 2.20.3nb2 [wiz 2010-06-28] + Updated sysutils/fabric to 0.9.1 [gls 2010-06-28] + Updated security/py-openid to 2.2.5 [roy 2010-06-28] + Updated lang/python26 to 2.6.5nb1 [tron 2010-06-29] + Updated mail/getmail to 4.19.0 [schmonz 2010-06-29] + Updated graphics/rabbit to 0.6.4nb2 [obache 2010-06-30] + Updated print/ghostscript to 8.71nb4 [tron 2010-06-30] + Updated mail/getmail to 4.20.0 [schmonz 2010-06-30] + Updated www/w3m to 0.5.2nb5 [tron 2010-07-01] + Updated www/w3m-img to 0.5.2nb5 [tron 2010-07-01] + Updated net/mydns-pgsql to 1.1.0nb9 [ghen 2010-07-01] + Updated net/mydns-mysql to 1.1.0nb4 [ghen 2010-07-01] + Updated devel/atf to 0.10 [jmmv 2010-07-02] @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.9430 2010/06/25 22:15:44 wiz Exp $ +$NetBSD: TODO,v 1.9430.2.1 2010/07/04 07:11:21 agc Exp $ Suggested new packages ====================== @@ -345,7 +345,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o GMT-4.2.1 o GUIlib-1.1.2 o GutenMark-20090216 - o ImageMagick-6.6.2.7 + o ImageMagick-6.6.2.9 o MAMEDiff-2.30 o Mesa-7.8.2 o MesaLib-7.8.0 @@ -354,7 +354,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o ROMBuild-2.14 o RTx-Shredder-0.05 o RealPlayer-11 - o Sigil-0.2.1 + o Sigil-0.2.3 o SmartEiffel-2.3 o TeXmacs-1.0.7.4 o TiffIO-130e @@ -412,7 +412,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o aqsis-1.6.0 o aranym-0.9.9 o argtable-2.9 - o aria2-1.9.4 + o aria2-1.9.4 [pkg/43511] o arla-0.90 o arnold-20040104 o arping-2.09 @@ -423,12 +423,12 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o ast-ksh-20080624 [pkg/37854] o asterisk16-1.6.2.6 o astyle-1.15.3 - o asymptote-1.99 + o asymptote-2.00 o aterm-1.0.1 o auctex-11.86 o audacious-plugins-2.3 o autoconvert-0.3.16 - o autogen-5.10.1 + o autogen-5.10.2 o avcheck-0.91 o avl-2.0.2a o awesome-3.4.5 @@ -528,7 +528,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o dmenu-4.1.1 o dnsmasq-2.55 o dnstracer-1.9 - o doxygen-1.7.0 + o doxygen-1.7.1 o dpkg-1.14.25 o drivel-3.0.0 o drscheme-4.0.2 @@ -561,7 +561,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o enlightenment-1.0.0 o enscript-1.6.5.2 o eog-2.30.2 [GNOME 2.30] - o eog-plugins-2.30.1 [GNOME 2.30] + o eog-plugins-2.30.2 [GNOME 2.30] o epic4-2.6 o epiphany-2.30.2 [GNOME 2.30] o epiphany-extensions-2.30.1 [GNOME 2.30] @@ -572,7 +572,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o espeak-1.40 o et-2.60 o etach-1.4.1 - o etm-623 + o etm-630 o eukleides-1.5.4 o evince-2.30.3 [GNOME 2.30] o evolution-2.30.2 [GNOME 2.30] @@ -593,7 +593,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o fbreader-0.12.10 o fcitx-3.6.2 o fd-3.00d - o feh-1.7 + o feh-1.8 o festival-1.96 o felt-3.07 o fetchyahoo-2.13.8 @@ -731,6 +731,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o gnu-crypto-2.1.0 o gnumeric110-1.10.6 o gnupg2-2.0.15 + o gnutls-2.10.0 o gob2-2.0.17 o goffice0.8-0.8.6 o gogo-3.11p1 @@ -765,6 +766,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o gtranslator-1.9.6 o gucharmap-2.30.2 [GNOME 2.30] o guile-gtk-2.0 + o guile-www-2.26 o gupnp-0.13.4 o gutenprint-5.2.5 o gv-3.7.1 @@ -947,9 +949,11 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o mantis-1.2.1 o matchbox-panel-0.9.3 o mathomatic-15.1.4 + o mawk-1.3.4.20100625 o mc-4.7.0.5 o mdocml-1.10.2 o mediatomb-0.12.1 + o meld-1.3.2 o memconf-2.9 [pkg/40201] o merb-1.0.8.1 o merb-action-args-1.0.8.1 @@ -977,7 +981,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o mgetty+sendfax-1.1.35 o midori-0.2.6 [pkg/43500] o milkytracker-0.90.85 - o mimedefang-2.69 + o mimedefang-2.70 o mined-2000.16 o minicom-2.4 o minivmac-3.0.4 @@ -1074,10 +1078,11 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o p5-JSON-2.21 o p5-MIME-tools-5.428 o p5-Module-Build-0.36090 - o p5-Module-Install-0.99 + o p5-Module-CoreList-2.35 + o p5-Module-Install-1.00 o p5-Mouse-0.61 o p5-POE-1.289 [pkg/43115] - o p5-PerlMagick-6.6.2.7 + o p5-PerlMagick-6.6.2.9 o p5-Pod-Readme-0.10 o p5-Search-Xapian-1.0.20.0 o p5-Set-Infinite-0.65 @@ -1085,6 +1090,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o p5-URI-1.54 o p5-XML-RSS-1.48 o p5-YAML-Syck-1.10 + o p5-YAML-Tiny-1.42 o p5-ispman-1.2 o p5-sybperl-2.18 o p5-xmltv-0.5.57 @@ -1098,6 +1104,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o pbzip2-1.1.1 o pcal-4.8 o pcmanfm-0.5.2 [pkg/42451] + o pcre-8.10 o pdmenu-1.2.87 o pen-0.17.3 o perl-5.12.0 @@ -1125,6 +1132,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o plone3-3.3.4 o ploticus-2.41 o ploticus-examples-230 + o plptools-1.0.10 o pngcheck-2.3.0 o po4a-0.36.3 o polsms-2.1.0 @@ -1146,7 +1154,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o puf-0.93.3 o pure-ftpd-1.0.29 o puzzle-5.2 - o puzzles-8966 + o puzzles-8969 o pv-1.1.4 o pwlib-1.11.1 o py-FourSuite-1.0.2 @@ -1157,7 +1165,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o py-bdb-xml-2.1.8 o py-checker-0.8.17 o py-cheetah-2.4.2.1 [pkg/43458] - o py-cups-1.9.50 + o py-cups-1.9.51 o py-fpconst-0.7.2 [pkg/42556] o py-game-1.9.1 o py-gnome2-desktop-2.30.2 [GNOME 2.30] @@ -1170,6 +1178,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o py-m2crypto-0.20.2 o py-markdown-2.0.3 [pkg/43448] o py-matplotlib-0.99.3 + o py-moin-1.9.3 [pkg/43524] o py-nevow-0.10.0 o py-psycopg-2.2.1 o py-psycopg2-2.0.14 @@ -1185,6 +1194,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o qpopper-4.0.14 o qrencode-3.1.1 o qt3-qscintilla-2.4.3 [wip] + o qt4-creator-2.0.0 o qvplay-0.95 o radiance-3.7.2 o raine-0.51.8 @@ -1251,7 +1261,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o samba-3.5.3 o sane-backends-1.0.21 o sarg-2.2.5 - o sawfish-1.6.3 + o sawfish-1.6.3.1 o saxon-9.2 o scamper-20070201 o scapy-2.1.1 @@ -1334,7 +1344,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o tea-28.0.0 o ted-en-us-2.17 o teem-1.10.0 - o telepathy-gabble-0.9.13 + o telepathy-gabble-0.9.14 o tetrinetx-1.40c o tex-musixtex-113 [pkg/34758] o texmaker-1.9.9 @@ -1370,7 +1380,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o ubs-0.20 o ucarp-1.5.1 o ucblogo-5.5 - o udunits-1.12.9 + o udunits-2.1.17 [pkg/43529] o unicap-0.9.8 o unrealircd-3.2.8.1 o ups-nut-2.2.1 [pkgsrc-wip] @@ -1417,14 +1427,14 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o wmweather-2.4.4 o wmx-7 o wordpress-3.0 - o worker-2.17.7 + o worker-2.17.8 o wormux-0.9.2 o wpi-firmware-1.14.2 o wwwoffle-2.9f o wxGTK28-2.8.11 o wxRemind-101 o wyrd-1.4.4 - o x264-devel-20100619 + o x264-devel-20100626 o xanalyser-1.30 o xapian-1.0.21 o xapian-omega-1.0.21 @@ -1456,7 +1466,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o xf86-video-dummy-0.3.2 o xf86-video-geode-2.11.8 [wip] o xf86-video-glide-1.0.3 - o xf86-video-intel-2.11.0 + o xf86-video-intel-2.12.0 o xf86-video-mga-1.4.12 o xf86-video-newport-0.2.3 [unpackaged] o xf86-video-nv-2.1.17 @@ -1507,7 +1517,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o xmule-1.12.2 o xnap-2.5r3 o xorg-docs-1.5 - o xorg-util-macros-1.9.0 + o xorg-util-macros-1.10.0 o xpad-2.13 o xpr-1.0.3 [unpackaged] o xproto-7.0.17 diff --git a/editors/gnuserv/Makefile b/editors/gnuserv/Makefile index dc0fb1d81a6..08e60260edb 100644 --- a/editors/gnuserv/Makefile +++ b/editors/gnuserv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2009/12/14 23:42:10 joerg Exp $ +# $NetBSD: Makefile,v 1.13.6.1 2010/07/04 07:12:07 agc Exp $ DISTNAME= gnuserv-3.12.7 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -12,14 +12,17 @@ COMMENT= Improved version of emacsserver for GNU Emacs CONFLICTS+= xemacs-[0-9]* +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= YES .include "../../x11/libXau/buildlink3.mk" EL_FILES= devices.el gnuserv.el gnuserv-compat.el post-install: + ${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX} cd ${WRKSRC} && for FILE in ${EL_FILES}; do \ - ${INSTALL_DATA} $${FILE} $${FILE}c ${EMACS_LISPPREFIX}; \ + ${INSTALL_DATA} $${FILE} $${FILE}c ${DESTDIR}${EMACS_LISPPREFIX}; \ done .if ${X11_TYPE} == "modular" diff --git a/editors/gnuserv/distinfo b/editors/gnuserv/distinfo index b50ca0e37f0..659cafb0e0f 100644 --- a/editors/gnuserv/distinfo +++ b/editors/gnuserv/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.3 2005/02/23 17:15:10 agc Exp $ +$NetBSD: distinfo,v 1.3.48.1 2010/07/04 07:12:07 agc Exp $ SHA1 (gnuserv-3.12.7.tar.gz) = 5f5fd98b068fd1b221d32a0760c9914455e197b5 RMD160 (gnuserv-3.12.7.tar.gz) = 2fd5a28fb86cc05c26da50cab8d9ee036f2e2d00 Size (gnuserv-3.12.7.tar.gz) = 93709 bytes SHA1 (patch-aa) = f10c267b84290265df2a757454b0548bf8383889 +SHA1 (patch-ab) = f96a239e3efa786e8af84a3e7b9421c00a573735 diff --git a/editors/gnuserv/patches/patch-ab b/editors/gnuserv/patches/patch-ab new file mode 100644 index 00000000000..9fcde1effed --- /dev/null +++ b/editors/gnuserv/patches/patch-ab @@ -0,0 +1,16 @@ +$NetBSD: patch-ab,v 1.1.2.2 2010/07/04 07:12:07 agc Exp $ + +DESTDIR support + +--- Makefile.in.orig 2004-10-20 01:20:54.000000000 +0000 ++++ Makefile.in +@@ -42,8 +42,8 @@ CFLAGS = @CFLAGS@ + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ + +-prefix = @prefix@ ++prefix = $(DESTDIR)@prefix@ + exec_prefix = @exec_prefix@ + + # The directory for installing executable programs that users can run. + bindir = $(exec_prefix)/bin diff --git a/emulators/generator/PLIST b/emulators/generator/PLIST index 2125ec7ad69..9c09e40e7ff 100644 --- a/emulators/generator/PLIST +++ b/emulators/generator/PLIST @@ -1,2 +1,2 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/09 19:08:39 agc Exp $ +@comment $NetBSD: PLIST,v 1.1.1.1.58.1 2010/07/04 07:12:49 agc Exp $ bin/generator-gtk diff --git a/emulators/gxemul/Makefile b/emulators/gxemul/Makefile index 4a28d5a6aef..76763c11b24 100644 --- a/emulators/gxemul/Makefile +++ b/emulators/gxemul/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.43 2010/05/13 14:48:53 tsutsui Exp $ +# $NetBSD: Makefile,v 1.43.2.1 2010/07/04 07:12:50 agc Exp $ # DISTNAME= gxemul-0.6.0 +PKGREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://gxemul.sourceforge.net/src/ diff --git a/emulators/gxemul/PLIST b/emulators/gxemul/PLIST index 5cabff23764..4f055182691 100644 --- a/emulators/gxemul/PLIST +++ b/emulators/gxemul/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.24 2010/05/13 14:48:53 tsutsui Exp $ +@comment $NetBSD: PLIST,v 1.24.2.1 2010/07/04 07:12:50 agc Exp $ bin/gxemul man/man1/gxemul.1 share/doc/gxemul/20040504-ultrix45-boot1.png @@ -77,6 +77,8 @@ share/doc/gxemul/20070616-netbsd-pmppc-diskless.png share/doc/gxemul/20070616-netbsd-pmppc-diskless_small.png share/doc/gxemul/20081103-openbsd-landisk-small.png share/doc/gxemul/20081103-openbsd-landisk.png +share/doc/gxemul/20100205-netbsd-playstation2-small.png +share/doc/gxemul/20100205-netbsd-playstation2.png share/doc/gxemul/Doxyfile share/doc/gxemul/HISTORY share/doc/gxemul/LICENSE @@ -128,6 +130,7 @@ share/doc/gxemul/experiments.html share/doc/gxemul/framework.html share/doc/gxemul/generate_machine_doc.sh share/doc/gxemul/guestoses.html +share/doc/gxemul/head.html share/doc/gxemul/index.html share/doc/gxemul/intro.html share/doc/gxemul/machine_template.html @@ -140,6 +143,7 @@ share/doc/gxemul/machines/machine_testmips-thumb.png share/doc/gxemul/machines/machine_testmips.html.SKEL share/doc/gxemul/machines/machine_testmips.png share/doc/gxemul/misc.html +share/doc/gxemul/model.png share/doc/gxemul/networking.html share/doc/gxemul/openbsd-pmax-20040710.png share/doc/gxemul/openbsd-pmax-20040710_small.png diff --git a/emulators/gxemul/distinfo b/emulators/gxemul/distinfo index 724e6cc5733..b16d03b201c 100644 --- a/emulators/gxemul/distinfo +++ b/emulators/gxemul/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.30 2010/05/13 14:48:53 tsutsui Exp $ +$NetBSD: distinfo,v 1.30.2.1 2010/07/04 07:12:50 agc Exp $ SHA1 (gxemul-0.6.0.tar.gz) = aa37ad5f200eee045b1da2b1d3f651401cf474af RMD160 (gxemul-0.6.0.tar.gz) = ac6291a5f8bc9c0d1988d3ce39750339fe90a8ce Size (gxemul-0.6.0.tar.gz) = 3598795 bytes +SHA1 (patch-aa) = 6f2c0dc94606ba213bcc73527ea4bef997c89c45 diff --git a/emulators/gxemul/patches/patch-aa b/emulators/gxemul/patches/patch-aa new file mode 100644 index 00000000000..34c2569bd86 --- /dev/null +++ b/emulators/gxemul/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.9.2.2 2010/07/04 07:14:40 agc Exp $ + +--- src/main/fileloaders/FileLoader_aout.cc.orig 2010-07-02 14:06:41.000000000 +0000 ++++ src/main/fileloaders/FileLoader_aout.cc +@@ -265,7 +265,7 @@ bool FileLoader_aout::LoadIntoComponent( + + off_t oldpos = file.tellg(); + file.seekg(0, std::ios_base::end); +- int strings_len = file.tellg() - oldpos; ++ int strings_len = (off_t)file.tellg() - oldpos; + file.seekg(oldpos, std::ios_base::beg); + + messages.flags(std::ios::dec); diff --git a/filesystems/fuse/Makefile b/filesystems/fuse/Makefile index e69efb55ecf..233f8fc6344 100644 --- a/filesystems/fuse/Makefile +++ b/filesystems/fuse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2007/03/16 18:57:29 gdt Exp $ +# $NetBSD: Makefile,v 1.3.32.1 2010/07/04 07:15:16 agc Exp $ # DISTNAME= fuse-2.5.2 @@ -9,6 +9,8 @@ MAINTAINER= pancake@phreaker.net HOMEPAGE= http://fuse.sourceforge.net/ COMMENT= Filesystem in Userspace +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= yes # FUSE the implementation only builds on Linux and FreeBSD. diff --git a/games/openmortal/Makefile b/games/openmortal/Makefile index 292c1478e17..67a85c9cba0 100644 --- a/games/openmortal/Makefile +++ b/games/openmortal/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.29 2010/06/13 22:44:22 wiz Exp $ +# $NetBSD: Makefile,v 1.29.2.1 2010/07/04 07:16:10 agc Exp $ # DISTNAME= openmortal-0.7 -PKGREVISION= 11 +PKGREVISION= 12 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openmortal/} EXTRACT_SUFX= .tar.bz2 @@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://apocalypse.rulez.org/~upi/Mortal/ COMMENT= Parody of Mortal Kombat with real characters +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= yes USE_LANGUAGES= c c++ USE_TOOLS+= gmake diff --git a/games/openmortal/distinfo b/games/openmortal/distinfo index b4db1da4fab..6f36c49aecb 100644 --- a/games/openmortal/distinfo +++ b/games/openmortal/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.10 2007/08/08 20:53:47 joerg Exp $ +$NetBSD: distinfo,v 1.10.28.1 2010/07/04 07:16:10 agc Exp $ SHA1 (openmortal-0.7.tar.bz2) = a7177012e1c0eb04f357aa9ff013e53c8f7b835c RMD160 (openmortal-0.7.tar.bz2) = 6a0fdd46445ed243db261227a93526b97c6f9d79 Size (openmortal-0.7.tar.bz2) = 51197736 bytes -SHA1 (patch-aa) = d18089a348fb7718bed0f47fbff7aaf772915340 +SHA1 (patch-aa) = 8f9438695de1dd8fcb0e68f6cee9ee8efd2229c3 SHA1 (patch-ab) = 1f7f9075975994e76262df4d3153f1162cb40dd3 SHA1 (patch-ac) = 807cfb849a4a3408c5877b61690bf0cf37da59b6 SHA1 (patch-ad) = ad0fbd55c11a6076e9e5212b717a4b220820b206 diff --git a/games/openmortal/patches/patch-aa b/games/openmortal/patches/patch-aa index 963d3dd4098..9cf46acf027 100644 --- a/games/openmortal/patches/patch-aa +++ b/games/openmortal/patches/patch-aa @@ -1,20 +1,7 @@ -$NetBSD: patch-aa,v 1.2 2004/03/06 17:32:11 xtraeme Exp $ +$NetBSD: patch-aa,v 1.2.56.1 2010/07/04 07:16:11 agc Exp $ --- src/State.cpp.orig 2004-03-06 18:20:58.000000000 +0100 +++ src/State.cpp 2004-03-06 18:22:07.000000000 +0100 -@@ -151,10 +151,10 @@ - debug( "GetUserName failed: %d.\n", iResult ); - } - #else -- int iResult = getlogin_r( m_acNick, 127 ); -+ int iResult = (int)getlogin(); - if ( iResult ) - { -- debug( "getlogin_r failed: %d\n", iResult ); -+ debug( "getlogin failed: %d\n", iResult ); - strcpy( m_acNick, getenv("USER") ); - } - #endif @@ -273,7 +273,11 @@ void SState::Save() { |