pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2010Q2]: pkgsrc Pullup previous changes on HEAD to pkgsrc-2010...
details: https://anonhg.NetBSD.org/pkgsrc/rev/d5d2557d686d
branches: pkgsrc-2010Q2
changeset: 576894:d5d2557d686d
user: agc <agc%pkgsrc.org@localhost>
date: Sun Jul 04 07:06:23 2010 +0000
description:
Pullup previous changes on HEAD to pkgsrc-2010Q2 branch to fix branching
error, and to sync with reality.
diffstat:
archivers/gcpio/Makefile | 6 +-
databases/Makefile | 3 +-
databases/apache-cassandra/Makefile | 3 +-
databases/php-oci8/Makefile | 4 +-
databases/php-odbc/DESCR | 2 -
databases/php-odbc/Makefile | 15 -
databases/py-cassa/Makefile | 3 +-
devel/atf/Makefile | 6 +-
devel/atf/PLIST | 412 ++++++-----------------------------
devel/atf/distinfo | 8 +-
devel/nbitools/patches/patch-aa | 2 +-
devel/nbitools/patches/patch-ab | 2 +-
devel/nbitools/patches/patch-ae | 2 +-
devel/ptlib/Makefile | 4 +-
devel/py-sysctl/Makefile | 3 +-
devel/subversion/Makefile.common | 4 +-
devel/swt/Makefile | 10 +-
devel/swt/files/make_pkgsrc.mak | 4 +-
doc/CHANGES-2010 | 21 +-
doc/TODO | 54 ++-
editors/gnuserv/Makefile | 7 +-
editors/gnuserv/distinfo | 3 +-
editors/gnuserv/patches/patch-ab | 16 +
emulators/generator/PLIST | 2 +-
emulators/gxemul/Makefile | 3 +-
emulators/gxemul/PLIST | 6 +-
emulators/gxemul/distinfo | 3 +-
emulators/gxemul/patches/patch-aa | 13 +
filesystems/fuse/Makefile | 4 +-
games/openmortal/Makefile | 6 +-
games/openmortal/distinfo | 4 +-
games/openmortal/patches/patch-aa | 15 +-
32 files changed, 225 insertions(+), 425 deletions(-)
diffs (truncated from 1258 to 300 lines):
diff -r 93106ce3854b -r d5d2557d686d archivers/gcpio/Makefile
--- a/archivers/gcpio/Makefile Fri Jul 02 21:52:49 2010 +0000
+++ b/archivers/gcpio/Makefile Sun Jul 04 07:06:23 2010 +0000
@@ -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 @@
.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 -r 93106ce3854b -r d5d2557d686d databases/Makefile
--- a/databases/Makefile Fri Jul 02 21:52:49 2010 +0000
+++ b/databases/Makefile Sun Jul 04 07:06:23 2010 +0000
@@ -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-mysql
SUBDIR+= php-mysqli
SUBDIR+= php-oci8
-SUBDIR+= php-odbc
SUBDIR+= php-pdo
SUBDIR+= php-pdo_dblib
SUBDIR+= php-pdo_mysql
diff -r 93106ce3854b -r d5d2557d686d databases/apache-cassandra/Makefile
--- a/databases/apache-cassandra/Makefile Fri Jul 02 21:52:49 2010 +0000
+++ b/databases/apache-cassandra/Makefile Sun Jul 04 07:06:23 2010 +0000
@@ -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 @@
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 -r 93106ce3854b -r d5d2557d686d databases/php-oci8/Makefile
--- a/databases/php-oci8/Makefile Fri Jul 02 21:52:49 2010 +0000
+++ b/databases/php-oci8/Makefile Sun Jul 04 07:06:23 2010 +0000
@@ -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 -r 93106ce3854b -r d5d2557d686d databases/php-odbc/DESCR
--- a/databases/php-odbc/DESCR Fri Jul 02 21:52:49 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 93106ce3854b -r d5d2557d686d databases/php-odbc/Makefile
--- a/databases/php-odbc/Makefile Fri Jul 02 21:52:49 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 93106ce3854b -r d5d2557d686d databases/py-cassa/Makefile
--- a/databases/py-cassa/Makefile Fri Jul 02 21:52:49 2010 +0000
+++ b/databases/py-cassa/Makefile Sun Jul 04 07:06:23 2010 +0000
@@ -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 @@
PKG_DESTDIR_SUPPORT= user-destdir
+PYTHON_VERSIONS_ACCEPTED= 26 25
PYDISTUTILSPKG= yes
.include "../../lang/python/extension.mk"
diff -r 93106ce3854b -r d5d2557d686d devel/atf/Makefile
--- a/devel/atf/Makefile Fri Jul 02 21:52:49 2010 +0000
+++ b/devel/atf/Makefile Sun Jul 04 07:06:23 2010 +0000
@@ -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@localhost
HOMEPAGE= http://www.NetBSD.org/~jmmv/atf/
diff -r 93106ce3854b -r d5d2557d686d devel/atf/PLIST
--- a/devel/atf/PLIST Fri Jul 02 21:52:49 2010 +0000
+++ b/devel/atf/PLIST Sun Jul 04 07:06:23 2010 +0000
@@ -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-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/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/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
Home |
Main Index |
Thread Index |
Old Index