From bdwalton at users.sourceforge.net Sun Dec 1 20:49:00 2013 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 01 Dec 2013 19:49:00 +0000 Subject: SF.net SVN: gar:[22622] csw/mgar/pkg/git/trunk Message-ID: Revision: 22622 http://gar.svn.sourceforge.net/gar/?rev=22622&view=rev Author: bdwalton Date: 2013-12-01 19:48:59 +0000 (Sun, 01 Dec 2013) Log Message: ----------- git/trunk: update to 1.8.5, drop patches that were merged upstream Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/git/trunk/files/0007-Avoid-difference-in-tr-semantics-between-System-V-an.patch csw/mgar/pkg/git/trunk/files/0008-Change-sed-invocation-to-something-Solaris-sed-can-h.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2013-11-30 17:16:59 UTC (rev 22621) +++ csw/mgar/pkg/git/trunk/Makefile 2013-12-01 19:48:59 UTC (rev 22622) @@ -1,5 +1,5 @@ NAME = git -VERSION = 1.8.4.1 +VERSION = 1.8.5 #PATCHLEVEL = rc4 DISTNAME = $(NAME)-$(VERSION) GARTYPE = v2 @@ -117,8 +117,6 @@ # to the selection of available utf8 locales. PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch PATCHFILES += 0006-Patch-out-a-few-usr-share-references.patch -PATCHFILES += 0007-Avoid-difference-in-tr-semantics-between-System-V-an.patch -PATCHFILES += 0008-Change-sed-invocation-to-something-Solaris-sed-can-h.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2013-11-30 17:16:59 UTC (rev 22621) +++ csw/mgar/pkg/git/trunk/checksums 2013-12-01 19:48:59 UTC (rev 22622) @@ -1 +1 @@ -5d8c89ad312ca0b0e603259c9357e6b8 git-1.8.4.1.tar.gz +16448b1cfd62fcbe738729edc6279e14 git-1.8.5.tar.gz Deleted: csw/mgar/pkg/git/trunk/files/0007-Avoid-difference-in-tr-semantics-between-System-V-an.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0007-Avoid-difference-in-tr-semantics-between-System-V-an.patch 2013-11-30 17:16:59 UTC (rev 22621) +++ csw/mgar/pkg/git/trunk/files/0007-Avoid-difference-in-tr-semantics-between-System-V-an.patch 2013-12-01 19:48:59 UTC (rev 22622) @@ -1,90 +0,0 @@ -From 667867e20bbc4cdc0d0946e62cb4b8a9eca82134 Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Sun, 27 Oct 2013 13:30:26 +0100 -Subject: [PATCH] Avoid difference in tr semantics between System V and BSD - -Solaris' tr (both /usr/bin/ and /usr/xpg4/bin) uses the System V -semantics for tr whereby string1's length is truncated to the length -of string2 if string2 is shorter. The BSD semantics, as used by GNU tr -see string2 padded to the length of string1 using the final character -in string2. POSIX explicitly doesn't specify the correct behavior -here, making both equally valid. - -This difference means that Solaris' native tr implementations produce -different results for tr ":\t\n" "\0" than GNU tr. This breaks a few -tests in t0008-ignores.sh. - -Possible fixes for this are to make string2 be "\0\0\0" or "[\0*]". - -Instead, use perl to perform these transliterations which means we -don't need to worry about the difference at all. Since we're replacing -tr with perl, we also use perl to replace the sed invocations used to -transform the files. - -Replace four identical transforms with a function named -broken_c_unquote. Replace the other two identical transforms with a -fuction named broken_c_unquote_verbose. - -Signed-off-by: Ben Walton ---- - t/t0008-ignores.sh | 30 ++++++++++++++++++------------ - 1 file changed, 18 insertions(+), 12 deletions(-) - -diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh -index c29342d..b176057 100755 ---- a/t/t0008-ignores.sh -+++ b/t/t0008-ignores.sh -@@ -37,6 +37,14 @@ test_stderr () { - test_cmp "$HOME/expected-stderr" "$HOME/stderr" - } - -+broken_c_unquote () { -+ perl -pe 's/^"//; s/\\//; s/"$//; tr/\n/\0/' "$@" -+} -+ -+broken_c_unquote_verbose () { -+ perl -pe 's/ "/ /; s/\\//; s/"$//; tr/:\t\n/\0/' "$@" -+} -+ - stderr_contains () { - regexp="$1" - if grep "$regexp" "$HOME/stderr" -@@ -552,12 +560,11 @@ cat <<-EOF >expected-verbose - $global_excludes:2:!globaltwo b/globaltwo - EOF - --sed -e 's/^"//' -e 's/\\//' -e 's/"$//' stdin | \ -- tr "\n" "\0" >stdin0 --sed -e 's/^"//' -e 's/\\//' -e 's/"$//' expected-default | \ -- tr "\n" "\0" >expected-default0 --sed -e 's/ "/ /' -e 's/\\//' -e 's/"$//' expected-verbose | \ -- tr ":\t\n" "\0" >expected-verbose0 -+broken_c_unquote stdin >stdin0 -+ -+broken_c_unquote expected-default >expected-default0 -+ -+broken_c_unquote_verbose expected-verbose >expected-verbose0 - - test_expect_success '--stdin' ' - expect_from_stdin expected-verbose - sed -e 's/.* //' expected-verbose >expected-default - --sed -e 's/^"//' -e 's/\\//' -e 's/"$//' stdin | \ -- tr "\n" "\0" >stdin0 --sed -e 's/^"//' -e 's/\\//' -e 's/"$//' expected-default | \ -- tr "\n" "\0" >expected-default0 --sed -e 's/ "/ /' -e 's/\\//' -e 's/"$//' expected-verbose | \ -- tr ":\t\n" "\0" >expected-verbose0 -+broken_c_unquote stdin >stdin0 -+ -+broken_c_unquote expected-default >expected-default0 -+ -+broken_c_unquote_verbose expected-verbose >expected-verbose0 - - test_expect_success '--stdin from subdirectory' ' - expect_from_stdin -Date: Sun, 27 Oct 2013 17:41:19 +0100 -Subject: [PATCH] Change sed invocation to something Solaris sed can handle - -Solaris' sed expects a newline after the i\ command and fails -with a 'garbled command' message if it's not there. Modify two uses -of sed in t4015-diff-whitespace that worked in GNU sed but not in -Solaris'. - -Signed-off-by: Ben Walton ---- - t/t4015-diff-whitespace.sh | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh -index 3fb4b97..0126154 100755 ---- a/t/t4015-diff-whitespace.sh -+++ b/t/t4015-diff-whitespace.sh -@@ -145,7 +145,8 @@ test_expect_success 'another test, with --ignore-space-at-eol' 'test_cmp expect - test_expect_success 'ignore-blank-lines: only new lines' ' - test_seq 5 >x && - git update-index x && -- test_seq 5 | sed "/3/i \\ -+ test_seq 5 | sed "/3/i\\ -+\ - " >x && - git diff --ignore-blank-lines >out && - >expect && -@@ -155,7 +156,8 @@ test_expect_success 'ignore-blank-lines: only new lines' ' - test_expect_success 'ignore-blank-lines: only new lines with space' ' - test_seq 5 >x && - git update-index x && -- test_seq 5 | sed "/3/i \ " >x && -+ test_seq 5 | sed "/3/i\\ -+ " >x && - git diff -w --ignore-blank-lines >out && - >expect && - test_cmp out expect --- -1.8.3.4 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Tue Dec 3 11:42:03 2013 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Tue, 03 Dec 2013 10:42:03 +0000 Subject: SF.net SVN: gar:[22623] csw/mgar/pkg/octave/trunk/Makefile Message-ID: Revision: 22623 http://gar.svn.sourceforge.net/gar/?rev=22623&view=rev Author: opk Date: 2013-12-03 10:42:02 +0000 (Tue, 03 Dec 2013) Log Message: ----------- add some octave dependencies Modified Paths: -------------- csw/mgar/pkg/octave/trunk/Makefile Modified: csw/mgar/pkg/octave/trunk/Makefile =================================================================== --- csw/mgar/pkg/octave/trunk/Makefile 2013-12-01 19:48:59 UTC (rev 22622) +++ csw/mgar/pkg/octave/trunk/Makefile 2013-12-03 10:42:02 UTC (rev 22623) @@ -11,6 +11,8 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.bz2 +RUNTIME_DEP_PKGS = CSWlibhdf5-7 CSWlibsunperf7 CSWsunmath CSWss12f95rt + PATCHFILES += 0001-make-script-work-with-Solaris-sh.patch 0002-workaround-conflict-with-gets.patch # using the sunperf library for blas and lapack and therefore also the This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Dec 3 18:55:25 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 03 Dec 2013 17:55:25 +0000 Subject: SF.net SVN: gar:[22624] csw/mgar/pkg Message-ID: Revision: 22624 http://gar.svn.sourceforge.net/gar/?rev=22624&view=rev Author: dmichelsen Date: 2013-12-03 17:55:24 +0000 (Tue, 03 Dec 2013) Log Message: ----------- icmake/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/icmake/ csw/mgar/pkg/icmake/Makefile csw/mgar/pkg/icmake/branches/ csw/mgar/pkg/icmake/tags/ csw/mgar/pkg/icmake/trunk/ csw/mgar/pkg/icmake/trunk/Makefile csw/mgar/pkg/icmake/trunk/checksums csw/mgar/pkg/icmake/trunk/files/ csw/mgar/pkg/icmake/trunk/files/0001-Use-the-correct-dir-for-etc.patch csw/mgar/pkg/icmake/trunk/files/INSTALL.im Added: csw/mgar/pkg/icmake/Makefile =================================================================== --- csw/mgar/pkg/icmake/Makefile (rev 0) +++ csw/mgar/pkg/icmake/Makefile 2013-12-03 17:55:24 UTC (rev 22624) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/icmake/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/icmake/trunk/Makefile =================================================================== --- csw/mgar/pkg/icmake/trunk/Makefile (rev 0) +++ csw/mgar/pkg/icmake/trunk/Makefile 2013-12-03 17:55:24 UTC (rev 22624) @@ -0,0 +1,63 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = icmake +VERSION = 7.21.00 +GARTYPE = v2 + +DESCRIPTION = Make system + +MASTER_SITES = $(SF_MIRROR) +DISTFILES += $(NAME)_$(VERSION).orig.tar.gz +DISTFILES += INSTALL.im + +PATCHFILES += 0001-Use-the-correct-dir-for-etc.patch + +VENDOR_URL = http://icmake.sourceforge.net + +PACKAGES += CSWicmake +SPKG_DESC_CSWicmake = Make system +# PKGFILES is catchall + +# We should take care of this, but I really want to get some experience with icmake first +CHECKPKG_OVERRIDES_CSWicmake += file-with-bad-content|/usr/share|root/etc/opt/csw/icmake/icmake.rc + +# Default "usr/bin" +ICMAKE_BINDIR = $(patsubst /%,%,$(bindir)) +# Default "usr/share/icmake" +ICMAKE_SKELDIR = $(patsubst /%,%,$(sharedstatedir)/icmake) +# Default "usr/share/man" +ICMAKE_MANDIR = $(patsubst /%,%,$(mandir)) +# Default "usr/lib/icmake" +ICMAKE_LIBDIR = $(patsubst /%,%,$(libdir)/icmake) +# Default "etc/icmake" +ICMAKE_CONFDIR = $(patsubst /%,%,$(sysconfdir)/icmake) +# Default "etc/icmake" +ICMAKE_DOCDIR = $(patsubst /%,%,$(docdir)/icmake) +# Default "usr/share/doc/icmake" +ICMAKE_DOCDOCDIR = $(patsubst /%,%,$(docdir)/icmake) + +EXPANDVARS += INSTALL.im + +GARCOMPILER = GNU + +EXTRA_CFLAGS += -std=c99 + +CONFIGURE_SCRIPTS = custom +BUILD_SCRIPTS = custom +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +configure-custom: + cp $(WORKDIR)/INSTALL.im $(WORKSRC)/INSTALL.im + @$(MAKECOOKIE) + +build-custom: + cd $(WORKSRC) && PATH=/opt/csw/gnu:$(PATH) CFLAGS="$(CFLAGS)" ./icm_bootstrap / + @$(MAKECOOKIE) + +install-custom: + cd $(WORKSRC) && PATH=/opt/csw/gnu:$(PATH) ./icm_install all $(DESTDIR) + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/icmake/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/icmake/trunk/checksums =================================================================== --- csw/mgar/pkg/icmake/trunk/checksums (rev 0) +++ csw/mgar/pkg/icmake/trunk/checksums 2013-12-03 17:55:24 UTC (rev 22624) @@ -0,0 +1 @@ +2d6b12e2ec193339fde35eed7614089c icmake_7.21.00.orig.tar.gz Added: csw/mgar/pkg/icmake/trunk/files/0001-Use-the-correct-dir-for-etc.patch =================================================================== --- csw/mgar/pkg/icmake/trunk/files/0001-Use-the-correct-dir-for-etc.patch (rev 0) +++ csw/mgar/pkg/icmake/trunk/files/0001-Use-the-correct-dir-for-etc.patch 2013-12-03 17:55:24 UTC (rev 22624) @@ -0,0 +1,34 @@ +From d7ab461f09450812cda1308cbfb6c25fe60751c3 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 3 Dec 2013 18:45:34 +0100 +Subject: [PATCH] Use the correct dir for etc + +--- + icm_install | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/icm_install b/icm_install +index ecd44f2..4dc7324 100755 +--- a/icm_install ++++ b/icm_install +@@ -67,7 +67,7 @@ case $1 in + into ${SKELDIR} + into ${DOCDIR} + into ${DOCDOCDIR} +- into etc/icmake ++ into ${CONFDIR} + ;; + + (progs) +@@ -91,7 +91,7 @@ case $1 in + ;; + + (etc) +- into etc/icmake ++ into ${CONFDIR} + ;; + + (docdoc) +-- +1.8.4.1 + Added: csw/mgar/pkg/icmake/trunk/files/INSTALL.im =================================================================== --- csw/mgar/pkg/icmake/trunk/files/INSTALL.im (rev 0) +++ csw/mgar/pkg/icmake/trunk/files/INSTALL.im 2013-12-03 17:55:24 UTC (rev 22624) @@ -0,0 +1,31 @@ +/* + The locations of the binaries, the man pages and the documentation + ================================================================== + + The settings in this file are according to the Debian File Standard + Change them according to your tastes if you think they should be + different. + + All locations are relative to a specifiable base-directory. + + BINDIR the binary programs and scripts + SKELDIR the icmstart-script skeleton files + MANDIR the base directory of man-pages (under MANDIR/man1 and + MANDIR/man2) + LIBDIR icmake's support programs + CONFDIR the system-wide configuration files (AUTHOR, VERSION, + icmstart.rc) + DOCDIR various doc-files (e.g., changelog) + DOCDOCDIR more extensive documentation (icmake.ps, examples) +*/ + +// Define EXTENSION as ".exe" when compiling for CYGWIN +//#define EXTENSION ".exe" + +#define BINDIR "@ICMAKE_BINDIR@" +#define SKELDIR "@ICMAKE_SKELDIR@" +#define MANDIR "@ICMAKE_MANDIR@" +#define LIBDIR "@ICMAKE_LIBDIR@" +#define CONFDIR "@ICMAKE_CONFDIR@" +#define DOCDIR "@ICMAKE_DOCDIR@" +#define DOCDOCDIR "@ICMAKE_DOCDOCDIR@" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Dec 3 22:38:24 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 03 Dec 2013 21:38:24 +0000 Subject: SF.net SVN: gar:[22625] csw/mgar/pkg Message-ID: Revision: 22625 http://gar.svn.sourceforge.net/gar/?rev=22625&view=rev Author: dmichelsen Date: 2013-12-03 21:38:24 +0000 (Tue, 03 Dec 2013) Log Message: ----------- yodl/trunk: Initial commit, still dumps core Added Paths: ----------- csw/mgar/pkg/yodl/ csw/mgar/pkg/yodl/Makefile csw/mgar/pkg/yodl/branches/ csw/mgar/pkg/yodl/tags/ csw/mgar/pkg/yodl/trunk/ csw/mgar/pkg/yodl/trunk/Makefile csw/mgar/pkg/yodl/trunk/checksums csw/mgar/pkg/yodl/trunk/files/ csw/mgar/pkg/yodl/trunk/files/0001-getcwd-with-size-0-return-EINVAL-on-Solaris-even-whe.patch csw/mgar/pkg/yodl/trunk/files/0002-realpath-does-not-like-second-argument-to-be-NULL-on.patch csw/mgar/pkg/yodl/trunk/files/INSTALL.im Added: csw/mgar/pkg/yodl/Makefile =================================================================== --- csw/mgar/pkg/yodl/Makefile (rev 0) +++ csw/mgar/pkg/yodl/Makefile 2013-12-03 21:38:24 UTC (rev 22625) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/yodl/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/yodl/trunk/Makefile =================================================================== --- csw/mgar/pkg/yodl/trunk/Makefile (rev 0) +++ csw/mgar/pkg/yodl/trunk/Makefile 2013-12-03 21:38:24 UTC (rev 22625) @@ -0,0 +1,48 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = yodl +VERSION = 3.03.0 +GARTYPE = v2 + +DESCRIPTION = Your Own Document Language + +MASTER_SITES = $(SF_MIRROR) +DISTFILES += $(NAME)_$(VERSION).orig.tar.gz +DISTFILES += INSTALL.im + +PATCHFILES += 0001-getcwd-with-size-0-return-EINVAL-on-Solaris-even-whe.patch +PATCHFILES += 0002-realpath-does-not-like-second-argument-to-be-NULL-on.patch + +EXPANDVARS += INSTALL.im + +REINPLACEMENTS += icmake +REINPLACE_MATCH_icmake = /usr/bin/icmake +REINPLACE_WITH_icmake = $(bindir)/icmake +REINPLACE_FILES_icmake += build + +CONFIGURE_SCRIPTS = custom +BUILD_SCRIPTS = custom +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +configure-custom: + cp $(WORKDIR)/INSTALL.im $(WORKSRC)/INSTALL.im + @$(MAKECOOKIE) + +build-custom: + cd $(WORKSRC) && CFLAGS="$(CFLAGS)" ./build programs + cd $(WORKSRC) && CFLAGS="$(CFLAGS)" ./build man + cd $(WORKSRC) && CFLAGS="$(CFLAGS)" ./build manual + cd $(WORKSRC) && CFLAGS="$(CFLAGS)" ./build macros + @$(MAKECOOKIE) + +install-custom: + cd $(WORKSRC) && ./build install programs $(DESTDIR) + cd $(WORKSRC) && ./build install man $(DESTDIR) + cd $(WORKSRC) && ./build install manual $(DESTDIR) + cd $(WORKSRC) && ./build install macros $(DESTDIR) + cd $(WORKSRC) && ./build install docs $(DESTDIR) + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/yodl/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/yodl/trunk/checksums =================================================================== --- csw/mgar/pkg/yodl/trunk/checksums (rev 0) +++ csw/mgar/pkg/yodl/trunk/checksums 2013-12-03 21:38:24 UTC (rev 22625) @@ -0,0 +1 @@ +7df95988902055c98b2d784dd701efa8 yodl_3.03.0.orig.tar.gz Added: csw/mgar/pkg/yodl/trunk/files/0001-getcwd-with-size-0-return-EINVAL-on-Solaris-even-whe.patch =================================================================== --- csw/mgar/pkg/yodl/trunk/files/0001-getcwd-with-size-0-return-EINVAL-on-Solaris-even-whe.patch (rev 0) +++ csw/mgar/pkg/yodl/trunk/files/0001-getcwd-with-size-0-return-EINVAL-on-Solaris-even-whe.patch 2013-12-03 21:38:24 UTC (rev 22625) @@ -0,0 +1,29 @@ +From 48efd8d53f9ed778146fcc524eafa1709a11ad08 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 3 Dec 2013 22:33:16 +0100 +Subject: [PATCH] getcwd with size 0 return EINVAL on Solaris, even when + pointer is NULL + +--- + src/new/newgetcwd.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/new/newgetcwd.c b/src/new/newgetcwd.c +index 345ceb0..274b558 100644 +--- a/src/new/newgetcwd.c ++++ b/src/new/newgetcwd.c +@@ -1,9 +1,10 @@ + #include "new.ih" + #include ++#include + + char *new_getcwd() + { +- char *cwd = getcwd(NULL, 0); ++ char *cwd = getcwd(NULL, PATH_MAX+1); + + if (cwd == NULL) + { +-- +1.8.3.4 + Added: csw/mgar/pkg/yodl/trunk/files/0002-realpath-does-not-like-second-argument-to-be-NULL-on.patch =================================================================== --- csw/mgar/pkg/yodl/trunk/files/0002-realpath-does-not-like-second-argument-to-be-NULL-on.patch (rev 0) +++ csw/mgar/pkg/yodl/trunk/files/0002-realpath-does-not-like-second-argument-to-be-NULL-on.patch 2013-12-03 21:38:24 UTC (rev 22625) @@ -0,0 +1,27 @@ +From bc05f7210190d5e757f78c375d5566f9412f3590 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 3 Dec 2013 22:37:07 +0100 +Subject: [PATCH] realpath does not like second argument to be NULL on Solaris + +--- + src/lexer/lchdir.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/lexer/lchdir.c b/src/lexer/lchdir.c +index afa3a0a..3117d23 100644 +--- a/src/lexer/lchdir.c ++++ b/src/lexer/lchdir.c +@@ -6,8 +6,9 @@ void l_noChdir(Lexer *lp, char const *pathname) + void l_chdir(Lexer *lp, char const *pathname) + { + // fprintf(stderr, "CHANGING WD\n"); ++ char resolved_name[PATH_MAX]; + +- char *resolved = realpath(media_filename(lp->d_media_ptr), NULL); ++ char *resolved = realpath(media_filename(lp->d_media_ptr), resolved_name); + + if (resolved == NULL) + out_of_memory(); +-- +1.8.3.4 + Added: csw/mgar/pkg/yodl/trunk/files/INSTALL.im =================================================================== --- csw/mgar/pkg/yodl/trunk/files/INSTALL.im (rev 0) +++ csw/mgar/pkg/yodl/trunk/files/INSTALL.im 2013-12-03 21:38:24 UTC (rev 22625) @@ -0,0 +1,78 @@ +// Uncomment the following #define if you want to use the following exensive +// set of compilation options: +// -O0 -g3 -ansi -pedantic -fno-common -pipe -W -Wall -Wcast-align +// -Wcast-qual -Wconversion -Wformat=2 -Winline -Wnested-externs +// -Wpointer-arith -Wshadow -Wstrict-prototypes -Wundef +// -Wno-unused-parameter -Waggregate-return -Wnested-externs +// +//#define EXTENSIVE_OPTIONS + +// Alternatively, uncomment the following #define to compile the programs with +// the -pg option, so that gprof can be used for profiling purposes. +// If neither is defined, COPT is used (see build). +// EXTENSIVE_OPTIONS takes priority over PROFILING. +// +//#define PROFILING + + +string BASE; + + // BASE is the directory below which ALL yodl files will be stored. + + // For an operational non-Debian installation, you probably must be + // `root', and BASE "/usr" or BASE "/usr/local" is suggested (see + // below). `BASE' itself is not used outside of this file, so feel free to + // define BIN, STD_INCLUDE, MAN, DOC, and DOCDOC (below) in any which way + // you like. + + // However, make sure that BIN, STD_INCLUDE, MAN, DOC and DOCDOC all are + // absolute paths + +string BIN; + // the directory in which yodl will be stored + +string STD_INCLUDE; + // STD_INCLUDE is the directory in which the skeleton files + // will be stored + +string MAN; + // MAN is the directory in which the manual page will be stored + +string DOC; + // DOC is the directory in which all other documentation except for the + // manual and examples will be stored + +string DOCDOC; + // DOCDOC is the directory in which the manual and examples will be stored + +string COMPILER; + // COMPILER specifies the compiler to use. yodl is coined as + // belonging to the Debian `unstable' distribution, which may use a + // different version of the compiler you currently have in your + // system. E.g., in july 2006 the Debian `testing' version of the compiler + // was 4.0.4, but the `unstable' version's compiler was 4.1.2. By defining + // COMPILER with a specific version (e.g., COMPILER=g++-4.1) that + // particular version can be used. The distributed definition uses the + // `default' compiler version. + +//#define PROFILE "-pg" + // Uncomment the above #define to construct a binary program that can be + // used with the gprof profiler. When specified, no stripping is performed + // at ./build program strip (see INSTALL) + +void setLocations() +{ + BASE = ""; + + // make sure that BIN, STD_INCLUDE, MAN, DOC and DOCDOC all are + // absolute paths + + BIN = "@bindir@"; + DOC = "@docdir@/yodl"; + DOCDOC = "@docdir@/yodl"; + MAN = "@mandir@"; + STD_INCLUDE = "@sharedstatedir@/yodl"; + + COMPILER = "@CC@"; +} + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Dec 3 23:12:14 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 03 Dec 2013 22:12:14 +0000 Subject: SF.net SVN: gar:[22626] csw/mgar/pkg/yodl/trunk Message-ID: Revision: 22626 http://gar.svn.sourceforge.net/gar/?rev=22626&view=rev Author: dmichelsen Date: 2013-12-03 22:12:13 +0000 (Tue, 03 Dec 2013) Log Message: ----------- yodl/trunk: Some finishing Modified Paths: -------------- csw/mgar/pkg/yodl/trunk/Makefile csw/mgar/pkg/yodl/trunk/files/0002-realpath-does-not-like-second-argument-to-be-NULL-on.patch Modified: csw/mgar/pkg/yodl/trunk/Makefile =================================================================== --- csw/mgar/pkg/yodl/trunk/Makefile 2013-12-03 21:38:24 UTC (rev 22625) +++ csw/mgar/pkg/yodl/trunk/Makefile 2013-12-03 22:12:13 UTC (rev 22626) @@ -16,11 +16,28 @@ EXPANDVARS += INSTALL.im +BUILD_DEP_PKGS += CSWicmake +# For epsf.sty +BUILD_DEP_PKGS += CSWtexlive-generic-recommended + +PACKAGES += CSWyodl +SPKG_DESC_CSWyodl = Your Own Document Language +# PKGFILES is catchall + +# This is really just a comment +CHECKPKG_OVERRIDES_CSWyodl += file-with-bad-content|/usr/local|root/opt/csw/bin/yodl2whatever + REINPLACEMENTS += icmake REINPLACE_MATCH_icmake = /usr/bin/icmake REINPLACE_WITH_icmake = $(bindir)/icmake REINPLACE_FILES_icmake += build +# There is a dependency between the directory layout depth and the path depth here, very ugly +REINPLACEMENTS += xlatin1 +REINPLACE_MATCH_xlatin1 = ../../../../../wip/macros/xlatin1.tex +REINPLACE_WITH_xlatin1 = ../../../../../../wip/macros/xlatin1.tex +REINPLACE_FILES_xlatin1 += manual/yo/manual.yo + CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = custom TEST_SCRIPTS = Modified: csw/mgar/pkg/yodl/trunk/files/0002-realpath-does-not-like-second-argument-to-be-NULL-on.patch =================================================================== --- csw/mgar/pkg/yodl/trunk/files/0002-realpath-does-not-like-second-argument-to-be-NULL-on.patch 2013-12-03 21:38:24 UTC (rev 22625) +++ csw/mgar/pkg/yodl/trunk/files/0002-realpath-does-not-like-second-argument-to-be-NULL-on.patch 2013-12-03 22:12:13 UTC (rev 22626) @@ -1,23 +1,25 @@ -From bc05f7210190d5e757f78c375d5566f9412f3590 Mon Sep 17 00:00:00 2001 +From 707ba96fd821b215a03478f3d9acde08cd53714a Mon Sep 17 00:00:00 2001 From: Dagobert Michelsen -Date: Tue, 3 Dec 2013 22:37:07 +0100 -Subject: [PATCH] realpath does not like second argument to be NULL on Solaris +Date: Tue, 3 Dec 2013 22:47:57 +0100 +Subject: [PATCH] realpath does not like seocnds argument to be NULL on Solaris --- - src/lexer/lchdir.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + src/lexer/lchdir.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lexer/lchdir.c b/src/lexer/lchdir.c -index afa3a0a..3117d23 100644 +index afa3a0a..df23ff8 100644 --- a/src/lexer/lchdir.c +++ b/src/lexer/lchdir.c -@@ -6,8 +6,9 @@ void l_noChdir(Lexer *lp, char const *pathname) +@@ -6,8 +6,10 @@ void l_noChdir(Lexer *lp, char const *pathname) void l_chdir(Lexer *lp, char const *pathname) { // fprintf(stderr, "CHANGING WD\n"); -+ char resolved_name[PATH_MAX]; - +- - char *resolved = realpath(media_filename(lp->d_media_ptr), NULL); ++ char *resolved_name; ++ ++ resolved_name = malloc(PATH_MAX); + char *resolved = realpath(media_filename(lp->d_media_ptr), resolved_name); if (resolved == NULL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Wed Dec 4 10:26:37 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 04 Dec 2013 09:26:37 +0000 Subject: SF.net SVN: gar:[22627] csw/mgar/pkg/mysql5/branches/mysql-5.5.x Message-ID: Revision: 22627 http://gar.svn.sourceforge.net/gar/?rev=22627&view=rev Author: lblume Date: 2013-12-04 09:26:37 +0000 (Wed, 04 Dec 2013) Log Message: ----------- mysql5/branches/mysql-5.5.x: Bump to 5.5.35 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-12-03 22:12:13 UTC (rev 22626) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-12-04 09:26:37 UTC (rev 22627) @@ -14,7 +14,7 @@ PROJ_NAME = mysql NAME = $(PROJ_NAME)5 BASE_VERSION = 5.5 -PATCHLEVEL = 34 +PATCHLEVEL = 35 ALTS_PRIO = 55 VERSION = $(BASE_VERSION).$(PATCHLEVEL) Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2013-12-03 22:12:13 UTC (rev 22626) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2013-12-04 09:26:37 UTC (rev 22627) @@ -1 +1 @@ -930970a42d51e48599deb7fe01778a4a mysql-5.5.34.tar.gz +56f833052b579b7d4a2b16326cda6990 mysql-5.5.35.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Dec 4 12:59:42 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 04 Dec 2013 11:59:42 +0000 Subject: SF.net SVN: gar:[22628] csw/mgar/pkg/lang-python/pip/trunk/Makefile Message-ID: Revision: 22628 http://gar.svn.sourceforge.net/gar/?rev=22628&view=rev Author: cgrzemba Date: 2013-12-04 11:59:42 +0000 (Wed, 04 Dec 2013) Log Message: ----------- lang-python/pip/trunk: fix issue 5128: missing dependency py_setuptools Modified Paths: -------------- csw/mgar/pkg/lang-python/pip/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pip/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pip/trunk/Makefile 2013-12-04 09:26:37 UTC (rev 22627) +++ csw/mgar/pkg/lang-python/pip/trunk/Makefile 2013-12-04 11:59:42 UTC (rev 22628) @@ -16,6 +16,7 @@ ARCHALL_CSWpy-pip = 1 +RUNTIME_DEP_PKGS += CSWpy-setuptools # These are hardcodes for Mac OS X CHECKPKG_OVERRIDES_CSWpy-pip += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/pip/util.py CHECKPKG_OVERRIDES_CSWpy-pip += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/pip/util.py This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Dec 4 13:01:18 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 04 Dec 2013 12:01:18 +0000 Subject: SF.net SVN: gar:[22629] csw/mgar/pkg/lang-python/pip/trunk/Makefile Message-ID: Revision: 22629 http://gar.svn.sourceforge.net/gar/?rev=22629&view=rev Author: cgrzemba Date: 2013-12-04 12:01:17 +0000 (Wed, 04 Dec 2013) Log Message: ----------- lang-python/pip/trunk: add override Modified Paths: -------------- csw/mgar/pkg/lang-python/pip/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pip/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pip/trunk/Makefile 2013-12-04 11:59:42 UTC (rev 22628) +++ csw/mgar/pkg/lang-python/pip/trunk/Makefile 2013-12-04 12:01:17 UTC (rev 22629) @@ -17,6 +17,7 @@ ARCHALL_CSWpy-pip = 1 RUNTIME_DEP_PKGS += CSWpy-setuptools +CHECKPKG_OVERRIDES_CSWpy-pip += surplus-dependency|CSWpy-setuptools # These are hardcodes for Mac OS X CHECKPKG_OVERRIDES_CSWpy-pip += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/pip/util.py CHECKPKG_OVERRIDES_CSWpy-pip += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/pip/util.py This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Wed Dec 4 14:11:07 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 04 Dec 2013 13:11:07 +0000 Subject: SF.net SVN: gar:[22630] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 22630 http://gar.svn.sourceforge.net/gar/?rev=22630&view=rev Author: lblume Date: 2013-12-04 13:11:06 +0000 (Wed, 04 Dec 2013) Log Message: ----------- mysql5/branches/mysql-5.5.x: Switch compiler to GCC4 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-12-04 12:01:17 UTC (rev 22629) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-12-04 13:11:06 UTC (rev 22630) @@ -24,9 +24,9 @@ PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -# Keep Studio 12.0 for old S9 only +# Keep default old Studio 12.0 for old S9 only ifneq ($(shell /usr/bin/uname -r),5.9) - GARCOMPILER = SOS12U3 + GARCOMPILER = GCC4 # Try to get some more oomph out of a sparc # Benchmarks w/ 5.5.34 show no obvious benefit, so disabled for now #EXTRA_BUILD_ISAS_sparc = sparcv9+vis2 @@ -55,28 +55,32 @@ ### For Studio 12.3 # Those options follow those of the Solaris 11 build # https://java.net/projects/solaris-userland/sources/gate/show/components/mysql-5-1?rev=1502 -EXTRA_CXXFLAGS_64 += -features=no%except +EXTRA_CXXFLAGS_SOS12_64 += -features=no%except # Required at -xO4 # https://java.net/projects/solaris-userland/sources/gate/content/make-rules/shared-macros.mk?rev=1505` -EXTRA_CFLAGS_sparc += -xregs=no%appl -EXTRA_CFLAGS_i386 += -xregs=no%frameptr +EXTRA_CFLAGS_SOS12_sparc += -xregs=no%appl +EXTRA_CFLAGS_SOS12_i386 += -xregs=no%frameptr -EXTRA_CFLAGS += -xstrconst -xprefetch=auto -xprefetch_level=3 -fns=no -fsimple=1 -xbuiltin=%none -xlibmil -xlibmopt -xnorunpath -mt -KPIC -DPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm $(EXTRA_CFLAGS_$(GARCH)) -EXTRA_CXXFLAGS += -noex -xprefetch=auto -xprefetch_level=3 -fns=no -fsimple=1 -xbuiltin=%none -xlibmil -xlibmopt -mt -KPIC -DPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm $(EXTRA_CXXFLAGS_$(MEMORYMODEL)) +EXTRA_CFLAGS_SOS12 += -xstrconst -xprefetch=auto -xprefetch_level=3 -fns=no -fsimple=1 -xbuiltin=%none -xlibmil -xlibmopt -xnorunpath -mt -KPIC -DPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm $(EXTRA_CFLAGS_SOS12_$(GARCH)) +EXTRA_CXXFLAGS_SOS12 += -noex -xprefetch=auto -xprefetch_level=3 -fns=no -fsimple=1 -xbuiltin=%none -xlibmil -xlibmopt -mt -KPIC -DPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm $(EXTRA_CXXFLAGS_SOS12_$(MEMORYMODEL)) ### For GCC4 -#EXTRA_CFLAGS_sparc += -mno-app-regs +EXTRA_CFLAGS_GCC4_sparc += -mno-app-regs -#EXTRA_CFLAGS += -pthread -fPIC -DPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm $(EXTRA_CFLAGS_$(GARCH)) -#EXTRA_CXXFLAGS += -pthread -fPIC -DPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm $(EXTRA_CXXFLAGS_$(MEMORYMODEL)) +EXTRA_CFLAGS_GCC4 += -pthread -fPIC -DPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm $(EXTRA_CFLAGS_GCC4_$(GARCH)) +EXTRA_CXXFLAGS_GCC4 += -pthread -fPIC -DPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm $(EXTRA_CXXFLAGS_GCC4_$(MEMORYMODEL)) +### +EXTRA_CFLAGS = $(EXTRA_CFLAGS_$(GARCOMPILER)) +### + # The Solaris 11 build uses -xO4 by default -OPT_FLAGS_SOS_32 = -xO4 -OPT_FLAGS_SOS_64 = -xO4 -OPT_FLAGS_SOS_sparc_32 = -xmemalign=8s -OPT_FLAGS_SOS_sparc_64 = -xmemalign=16s -OPT_FLAGS_SOS += $(OPT_FLAGS_SOS_$(MEMORYMODEL)) $(OPT_FLAGS_SOS_$(GARCH)_$(MEMORYMODEL)) $(OPT_FLAGS_SOS_$(ISA)) +OPT_FLAGS_SOS12_32 = -xO4 +OPT_FLAGS_SOS12_64 = -xO4 +OPT_FLAGS_SOS12_sparc_32 = -xmemalign=8s +OPT_FLAGS_SOS12_sparc_64 = -xmemalign=16s +OPT_FLAGS_SOS12 += $(OPT_FLAGS_SOS12_$(MEMORYMODEL)) $(OPT_FLAGS_SOS12_$(GARCH)_$(MEMORYMODEL)) $(OPT_FLAGS_SOS12_$(ISA)) OPT_FLAGS_GCC4_32 = -O3 OPT_FLAGS_GCC4_64 = -O3 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 5 10:31:02 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Dec 2013 09:31:02 +0000 Subject: SF.net SVN: gar:[22631] csw/mgar/pkg/cpan/Class-Std/trunk/Makefile Message-ID: Revision: 22631 http://gar.svn.sourceforge.net/gar/?rev=22631&view=rev Author: dmichelsen Date: 2013-12-05 09:31:00 +0000 (Thu, 05 Dec 2013) Log Message: ----------- cpan/Class-Std/trunk: Update to makemake Modified Paths: -------------- csw/mgar/pkg/cpan/Class-Std/trunk/Makefile Modified: csw/mgar/pkg/cpan/Class-Std/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Class-Std/trunk/Makefile 2013-12-04 13:11:06 UTC (rev 22630) +++ csw/mgar/pkg/cpan/Class-Std/trunk/Makefile 2013-12-05 09:31:00 UTC (rev 22631) @@ -4,15 +4,25 @@ GARTYPE = v2 AUTHOR = DCONWAY -DESCRIPTION = Class::Std - Support for creating standard "inside-out" classes +DESCRIPTION = Support for creating standard "inside-out" classes define BLURB - Class::Std - Support for creating standard "inside-out" classes endef -PACKAGES = CSWpmclassstd -CATALOGNAME = pm_classstd -ARCHALL = 1 +CATALOG_RELEASE = unstable -LICENSE = README +LICENSE_TEXT = This module is licensed under the Perl license +PACKAGES += CSWpm-class-std +CATALOGNAME_CSWpm-class-std = pm_class_std +SPKG_DESC_CSWpm-class-std = Support for creating standard "inside-out" classes +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-class-std = 1 +OBSOLETED_BY_CSWpm-class-std += CSWpmclassstd +CATALOGNAME_CSWpmclassstd = pm_classstd_stub + +CONFIGURE_SCRIPTS = $(WORKSRC)/Build.PL +BUILD_SCRIPTS = $(WORKSRC)/Build +TEST_SCRIPTS = $(WORKSRC)/Build +INSTALL_SCRIPTS = $(WORKSRC)/Build + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 5 10:32:11 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Dec 2013 09:32:11 +0000 Subject: SF.net SVN: gar:[22632] csw/mgar/pkg/cpan Message-ID: Revision: 22632 http://gar.svn.sourceforge.net/gar/?rev=22632&view=rev Author: dmichelsen Date: 2013-12-05 09:32:11 +0000 (Thu, 05 Dec 2013) Log Message: ----------- cpan/Class-Std-Fast/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Class-Std-Fast/ csw/mgar/pkg/cpan/Class-Std-Fast/branches/ csw/mgar/pkg/cpan/Class-Std-Fast/tags/ csw/mgar/pkg/cpan/Class-Std-Fast/trunk/ csw/mgar/pkg/cpan/Class-Std-Fast/trunk/Makefile csw/mgar/pkg/cpan/Class-Std-Fast/trunk/checksums csw/mgar/pkg/cpan/Class-Std-Fast/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Class-Std-Fast/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Class-Std-Fast/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Class-Std-Fast/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Class-Std-Fast/trunk/Makefile 2013-12-05 09:32:11 UTC (rev 22632) @@ -0,0 +1,29 @@ +NAME = Class-Std-Fast +VERSION = v0.0.8 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = ACID + +DESCRIPTION = Faster but less secure than Class::Std +define BLURB +endef + +# MODDIST = Class-Std-Fast-v0.0.8.tar.gz + +CATALOG_RELEASE = unstable + +LICENSE_TEXT = This module is licensed under the perl license, please see for details http://dev.perl.org/licenses/ + +PACKAGES += CSWpm-class-std-fast +CATALOGNAME_CSWpm-class-std-fast = pm_class_std_fast +SPKG_DESC_CSWpm-class-std-fast = Faster but less secure than Class::Std +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-class-std-fast = 1 +RUNTIME_DEP_PKGS_CSWpm-class-std-fast += CSWpm-class-std + +CONFIGURE_SCRIPTS = $(WORKSRC)/Build.PL +BUILD_SCRIPTS = $(WORKSRC)/Build +TEST_SCRIPTS = $(WORKSRC)/Build +INSTALL_SCRIPTS = $(WORKSRC)/Build + +include gar/category.mk Added: csw/mgar/pkg/cpan/Class-Std-Fast/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Class-Std-Fast/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Class-Std-Fast/trunk/checksums 2013-12-05 09:32:11 UTC (rev 22632) @@ -0,0 +1 @@ +d06d084cb84f295b0aabf2eee78ef746 Class-Std-Fast-v0.0.8.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 5 11:13:59 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Dec 2013 10:13:59 +0000 Subject: SF.net SVN: gar:[22633] csw/mgar/pkg/cpan/SOAP-WSDL/trunk Message-ID: Revision: 22633 http://gar.svn.sourceforge.net/gar/?rev=22633&view=rev Author: dmichelsen Date: 2013-12-05 10:13:56 +0000 (Thu, 05 Dec 2013) Log Message: ----------- cpan/SOAP-WSDL/trunk: Update to 2.00.10 and makemake Modified Paths: -------------- csw/mgar/pkg/cpan/SOAP-WSDL/trunk/Makefile csw/mgar/pkg/cpan/SOAP-WSDL/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/SOAP-WSDL/trunk/files/CSWpmsoapwsdl.depend csw/mgar/pkg/cpan/SOAP-WSDL/trunk/files/CSWpmsoapwsdl.gspec Modified: csw/mgar/pkg/cpan/SOAP-WSDL/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/SOAP-WSDL/trunk/Makefile 2013-12-05 09:32:11 UTC (rev 22632) +++ csw/mgar/pkg/cpan/SOAP-WSDL/trunk/Makefile 2013-12-05 10:13:56 UTC (rev 22633) @@ -1,21 +1,39 @@ NAME = SOAP-WSDL -VERSION = 1.20 +VERSION = 2.00.10 CATEGORIES = cpan GARTYPE = v2 AUTHOR = MKUTTER -DESCRIPTION = Web Service Descriptor Language support for SOAP::Lite +DESCRIPTION = SOAP with WSDL support define BLURB - SOAP::WSDL provides decent WSDL support for SOAP::Lite. It is built as a - add-on to SOAP::Lite, and will sit on top of it, forwarding all the actual - request-response to SOAP::Lite - somewhat like a pre-processor. endef -DISTFILES += CSWpmsoapwsdl.gspec CSWpmsoapwsdl.depend +CATALOG_RELEASE = unstable -DEPENDS += cpan/URI cpan/XML-Parser cpan/libwww-perl -DEPENDS += cpan/MIME-Lite cpan/MIME-tools cpan/Compress-Zlib +LICENSE = LICENSE -CONFIGURE_ARGS = --noprompt +BUILD_DEP_PKGS += CSWpm-template +BUILD_DEP_PKGS += CSWpm-class-std-fast +BUILD_DEP_PKGS += CSWpm-module-build +BUILD_DEP_PKGS += CSWpm-libwww-perl +BUILD_DEP_PKGS += CSWpm-timedate +BUILD_DEP_PKGS += CSWpm-xml-parser +PACKAGES += CSWpm-soap-wsdl +CATALOGNAME_CSWpm-soap-wsdl = pm_soap_wsdl +SPKG_DESC_CSWpm-soap-wsdl = SOAP with WSDL support +ARCHALL_CSWpm-soap-wsdl = 1 +RUNTIME_DEP_PKGS_CSWpm-soap-wsdl += CSWpm-template +RUNTIME_DEP_PKGS_CSWpm-soap-wsdl += CSWpm-term-readkey +RUNTIME_DEP_PKGS_CSWpm-soap-wsdl += CSWpm-uri +RUNTIME_DEP_PKGS_CSWpm-soap-wsdl += CSWpm-class-std-fast +RUNTIME_DEP_PKGS_CSWpm-soap-wsdl += CSWpm-libwww-perl +RUNTIME_DEP_PKGS_CSWpm-soap-wsdl += CSWpm-timedate +RUNTIME_DEP_PKGS_CSWpm-soap-wsdl += CSWpm-xml-parser + +CONFIGURE_SCRIPTS = $(WORKSRC)/Build.PL +BUILD_SCRIPTS = $(WORKSRC)/Build +TEST_SCRIPTS = $(WORKSRC)/Build +INSTALL_SCRIPTS = $(WORKSRC)/Build + include gar/category.mk Modified: csw/mgar/pkg/cpan/SOAP-WSDL/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/SOAP-WSDL/trunk/checksums 2013-12-05 09:32:11 UTC (rev 22632) +++ csw/mgar/pkg/cpan/SOAP-WSDL/trunk/checksums 2013-12-05 10:13:56 UTC (rev 22633) @@ -1,3 +1 @@ -f85f3705c5772c23d73b0c49dcbd4f41 download/CSWpmsoapwsdl.gspec -57fea8ba27285c394e4a12b00e8dd190 download/CSWpmsoapwsdl.depend -73b244e32a6712d7f24cd29b7eaed3d7 download/SOAP-WSDL-1.20.tar.gz +c3f97ffae56881be65907ee9b4efa222 SOAP-WSDL-2.00.10.tar.gz Deleted: csw/mgar/pkg/cpan/SOAP-WSDL/trunk/files/CSWpmsoapwsdl.depend =================================================================== --- csw/mgar/pkg/cpan/SOAP-WSDL/trunk/files/CSWpmsoapwsdl.depend 2013-12-05 09:32:11 UTC (rev 22632) +++ csw/mgar/pkg/cpan/SOAP-WSDL/trunk/files/CSWpmsoapwsdl.depend 2013-12-05 10:13:56 UTC (rev 22633) @@ -1,6 +0,0 @@ -P CSWpmcompresszlib pm_compresszlib - Interface to zlib compression library -P CSWpmlibwww pm_libwww - a general-purpose Web API for Perl, based on W3C libwww. -P CSWpmmimelite pm_mimelite - low-calorie MIME generator -P CSWpmmimetools pm_mimetools - modules for parsing and creating MIME entities -P CSWpmuri pm_uri - Uniform Resource Identifiers (absolute and relative) -P CSWpmxmlparser pm_xmlparser - a module for parsing XML documents Deleted: csw/mgar/pkg/cpan/SOAP-WSDL/trunk/files/CSWpmsoapwsdl.gspec =================================================================== --- csw/mgar/pkg/cpan/SOAP-WSDL/trunk/files/CSWpmsoapwsdl.gspec 2013-12-05 09:32:11 UTC (rev 22632) +++ csw/mgar/pkg/cpan/SOAP-WSDL/trunk/files/CSWpmsoapwsdl.gspec 2013-12-05 10:13:56 UTC (rev 22633) @@ -1,9 +0,0 @@ -%var bitname pm_soapwsdl -%var pkgname CSWpmsoapwsdl -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -(c) 2004 Martin Kutter - -This library is free software, you can use it under the same -terms as perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Thu Dec 5 13:49:38 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Thu, 05 Dec 2013 12:49:38 +0000 Subject: SF.net SVN: gar:[22634] csw/mgar/pkg/x11/x11common/branches Message-ID: Revision: 22634 http://gar.svn.sourceforge.net/gar/?rev=22634&view=rev Author: mattdarcy Date: 2013-12-05 12:49:37 +0000 (Thu, 05 Dec 2013) Log Message: ----------- initial creation of nim branch to satisfy X11->xpm dependencies Modified Paths: -------------- csw/mgar/pkg/x11/x11common/branches/nim/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11common/branches/nim/ Modified: csw/mgar/pkg/x11/x11common/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/x11/x11common/trunk/Makefile 2013-07-31 10:29:30 UTC (rev 21590) +++ csw/mgar/pkg/x11/x11common/branches/nim/Makefile 2013-12-05 12:49:37 UTC (rev 22634) @@ -1,7 +1,7 @@ NAME = x11common VERSION = 1.0 CATEGORIES = x11 -GARTYPE = v2 +GARTYPE = bts DESCRIPTION = X11 common directories define BLURB This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Thu Dec 5 13:57:41 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Thu, 05 Dec 2013 12:57:41 +0000 Subject: SF.net SVN: gar:[22635] csw/mgar/pkg/x11/lib/libxdmcp/branches Message-ID: Revision: 22635 http://gar.svn.sourceforge.net/gar/?rev=22635&view=rev Author: mattdarcy Date: 2013-12-05 12:57:40 +0000 (Thu, 05 Dec 2013) Log Message: ----------- initial branch creation Modified Paths: -------------- csw/mgar/pkg/x11/lib/libxdmcp/branches/nim/Makefile Added Paths: ----------- csw/mgar/pkg/x11/lib/libxdmcp/branches/nim/ Modified: csw/mgar/pkg/x11/lib/libxdmcp/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxdmcp/trunk/Makefile 2013-07-31 10:29:30 UTC (rev 21590) +++ csw/mgar/pkg/x11/lib/libxdmcp/branches/nim/Makefile 2013-12-05 12:57:40 UTC (rev 22635) @@ -1,7 +1,9 @@ NAME = libxdmcp VERSION = 1.0.3 CATEGORIES = x11 +GARTYPE = bts + DESCRIPTION = X11 display manager control protocol library define BLURB This package provides the main interface to the X11 display manager control @@ -15,19 +17,19 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWlibxdmcp CSWlibxdmcpdevel -CATALOGNAME_CSWlibxdmcp = libxdmcp -CATALOGNAME_CSWlibxdmcpdevel = libxdmcp_devel +PACKAGES = NIMOSSlibxdmcp NIMOSSlibxdmcpdevel +CATALOGNAME_NIMOSSibxdmcp = libxdmcp +CATALOGNAME_NIMOSSlibxdmcpdevel = libxdmcp_devel -SPKG_DESC_CSWlibxdmcp = X11 display manager control protocol library -SPKG_DESC_CSWlibxdmcpdevel = X11 display manager control protocol library development package +SPKG_DESC_NIMOSSlibxdmcp = X11 display manager control protocol library +SPKG_DESC_NIMOSSlibxdmcpdevel = X11 display manager control protocol library development package -RUNTIME_DEP_PKGS_CSWlibxdmcpdevel = CSWlibxdmcp +RUNTIME_DEP_PKGS_NIMOSSlibxdmcpdevel = NIMOSSlibxdmcp BUILD64 = 1 NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) -PKGFILES_CSWlibxdmcpdevel = $(PKGFILES_DEVEL) +PKGFILES_NIMOSSlibxdmcpdevel = $(PKGFILES_DEVEL) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Thu Dec 5 14:06:06 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Thu, 05 Dec 2013 13:06:06 +0000 Subject: SF.net SVN: gar:[22636] csw/mgar/pkg/x11/proto/x11_xproto/branches Message-ID: Revision: 22636 http://gar.svn.sourceforge.net/gar/?rev=22636&view=rev Author: mattdarcy Date: 2013-12-05 13:06:06 +0000 (Thu, 05 Dec 2013) Log Message: ----------- initial branch creation Modified Paths: -------------- csw/mgar/pkg/x11/proto/x11_xproto/branches/nim/Makefile Added Paths: ----------- csw/mgar/pkg/x11/proto/x11_xproto/branches/nim/ Modified: csw/mgar/pkg/x11/proto/x11_xproto/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_xproto/trunk/Makefile 2013-07-31 10:29:30 UTC (rev 21590) +++ csw/mgar/pkg/x11/proto/x11_xproto/branches/nim/Makefile 2013-12-05 13:06:06 UTC (rev 22636) @@ -3,6 +3,7 @@ PROTONAME = xproto NAME = x11_$(PROTONAME) DISTNAME = $(PROTONAME)-$(VERSION) +GARTYPE = bts DESCRIPTION = X protocol and ancillary headers from X.org X11 define BLURB @@ -15,11 +16,11 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWx11$(PROTONAME) -CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) +PACKAGES = NIMOSSx11$(PROTONAME) +CATALOGNAME_NIMOSSx11$(PROTONAME) = x11_$(PROTONAME) -RUNTIME_DEP_PKGS = CSWx11common -INCOMPATIBLE_PKGS = CSWxproto +RUNTIME_DEP_PKGS = NIMOSSx11common +INCOMPATIBLE_PKGS = NIMOSSxproto BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Thu Dec 5 14:20:51 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Thu, 05 Dec 2013 13:20:51 +0000 Subject: SF.net SVN: gar:[22637] csw/mgar/pkg/x11/lib/libxau/branches Message-ID: Revision: 22637 http://gar.svn.sourceforge.net/gar/?rev=22637&view=rev Author: mattdarcy Date: 2013-12-05 13:20:51 +0000 (Thu, 05 Dec 2013) Log Message: ----------- initial branch creation Modified Paths: -------------- csw/mgar/pkg/x11/lib/libxau/branches/nim/Makefile Added Paths: ----------- csw/mgar/pkg/x11/lib/libxau/branches/nim/ Modified: csw/mgar/pkg/x11/lib/libxau/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxau/trunk/Makefile 2013-07-31 10:29:30 UTC (rev 21590) +++ csw/mgar/pkg/x11/lib/libxau/branches/nim/Makefile 2013-12-05 13:20:51 UTC (rev 22637) @@ -1,6 +1,7 @@ NAME = libxau VERSION = 1.0.4 CATEGORIES = x11 +GARTYPE = bts DESCRIPTION = X11 authorisation library define BLURB @@ -12,24 +13,24 @@ DISTNAME = libXau-$(VERSION) DISTFILES = $(DISTNAME).tar.bz2 -# BUILD_DEP_PKGS = CSWinputproto CSWxkbproto CSWxrenderproto CSWxcbproto -# BUILD_DEP_PKGS += CSWxextproto CSWx11xproto CSWxtrans CSWlibpthreadstubs +# BUILD_DEP_PKGS = NIMOSSinputproto NIMOSSxkbproto NIMOSSxrenderproto NIMOSSxcbproto +# BUILD_DEP_PKGS += NIMOSSxextproto NIMOSSx11xproto NIMOSSxtrans NIMOSSlibpthreadstubs -PACKAGES = CSWlibxau CSWlibxaudevel +PACKAGES = NIMOSSlibxau NIMOSSlibxaudevel # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -RUNTIME_DEP_PKGS_CSWlibxau = CSWx11common CSWx11xproto -RUNTIME_DEP_PKGS_CSWlibxaudevel = CSWlibxau +RUNTIME_DEP_PKGS_NIMOSSlibxau = NIMOSSx11common NIMOSSx11xproto +RUNTIME_DEP_PKGS_NIMOSSlibxaudevel = NIMOSSlibxau -CATALOGNAME_CSWlibxau = libxau -CATALOGNAME_CSWlibxaudevel = libxau_devel +CATALOGNAME_NIMOSSlibxau = libxau +CATALOGNAME_NIMOSSlibxaudevel = libxau_devel -SPKG_DESC_CSWlibxau = X11 authorisation library -SPKG_DESC_CSWlibxaudevel = X11 authorisation library development package +SPKG_DESC_NIMOSSlibxau = X11 authorisation library +SPKG_DESC_NIMOSSlibxaudevel = X11 authorisation library development package -PKGFILES_CSWlibxaudevel = $(PKGFILES_DEVEL) +PKGFILES_NIMOSSlibxaudevel = $(PKGFILES_DEVEL) BUILD64 = 1 NOISALIST = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Thu Dec 5 14:33:46 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Thu, 05 Dec 2013 13:33:46 +0000 Subject: SF.net SVN: gar:[22638] csw/mgar/pkg/x11/lib/libpthread-stubs/branches Message-ID: Revision: 22638 http://gar.svn.sourceforge.net/gar/?rev=22638&view=rev Author: mattdarcy Date: 2013-12-05 13:33:46 +0000 (Thu, 05 Dec 2013) Log Message: ----------- initial branch creation Modified Paths: -------------- csw/mgar/pkg/x11/lib/libpthread-stubs/branches/nim/Makefile Added Paths: ----------- csw/mgar/pkg/x11/lib/libpthread-stubs/branches/nim/ Modified: csw/mgar/pkg/x11/lib/libpthread-stubs/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libpthread-stubs/trunk/Makefile 2013-07-31 10:29:30 UTC (rev 21590) +++ csw/mgar/pkg/x11/lib/libpthread-stubs/branches/nim/Makefile 2013-12-05 13:33:46 UTC (rev 22638) @@ -1,6 +1,7 @@ NAME = libpthread-stubs VERSION = 0.3 CATEGORIES = x11 +GARTYPE = bts DESCRIPTION = pthread stubs not provided by native libc define BLURB @@ -10,12 +11,12 @@ MASTER_SITES = $(XCB_MASTER_SITES) DISTFILES = $(NAME)-$(VERSION).tar.gz -PACKAGES = CSWlibpthreadstubs +PACKAGES = NIMOSSlibpthreadstubs # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -RUNTIME_DEP_PKGS = CSWx11common +RUNTIME_DEP_PKGS = NIMOSSx11common BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Thu Dec 5 15:03:13 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Thu, 05 Dec 2013 14:03:13 +0000 Subject: SF.net SVN: gar:[22639] csw/mgar/pkg/freedesktop/xcbproto/branches Message-ID: Revision: 22639 http://gar.svn.sourceforge.net/gar/?rev=22639&view=rev Author: mattdarcy Date: 2013-12-05 14:03:13 +0000 (Thu, 05 Dec 2013) Log Message: ----------- brnach creation Modified Paths: -------------- csw/mgar/pkg/freedesktop/xcbproto/branches/nim/Makefile Added Paths: ----------- csw/mgar/pkg/freedesktop/xcbproto/branches/nim/ Modified: csw/mgar/pkg/freedesktop/xcbproto/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile 2013-07-31 10:29:30 UTC (rev 21590) +++ csw/mgar/pkg/freedesktop/xcbproto/branches/nim/Makefile 2013-12-05 14:03:13 UTC (rev 22639) @@ -1,7 +1,7 @@ # $Id$ VERSION = 1.6 -GARTYPE = v2 +GARTYPE = bts PROTONAME = xcb-proto NAME = $(PROTONAME) DISTNAME = $(PROTONAME)-$(VERSION) @@ -30,17 +30,17 @@ MASTER_SITES = http://xcb.freedesktop.org/dist/ DISTFILES = $(DISTNAME).tar.gz -PACKAGES = CSWxcbproto CSWpyxcbproto +PACKAGES = NIMOSSxcbproto NIMOSSpyxcbproto -CATALOGNAME_CSWxcbproto = xcbproto -CATALOGNAME_CSWpyxcbproto = py_xcbproto +CATALOGNAME_NIMOSSxcbproto = xcbproto +CATALOGNAME_NIMOSSpyxcbproto = py_xcbproto BUILD_DEP_PKGS = CSWpython -RUNTIME_DEP_PKGS_CSWxcbproto = CSWx11common -RUNTIME_DEP_PKGS_CSWpyxcbproto = CSWxcbproto CSWpython +RUNTIME_DEP_PKGS_NIMOSSxcbproto = NIMOSSx11common +RUNTIME_DEP_PKGS_NIMOSSpyxcbproto = NIMOSSxcbproto CSWpython -SPKG_DESC_CSWxcbproto = XCB protocol descriptions (in XML) -SPKG_DESC_CSWpyxcbproto = $(SPKG_DESC_CSWxcbproto) Python Bindings +SPKG_DESC_NIMOSSxcbproto = XCB protocol descriptions (in XML) +SPKG_DESC_NIMOSSpyxcbproto = $(SPKG_DESC_CSWxcbproto) Python Bindings UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz @@ -52,12 +52,12 @@ PYCOMPILE = 1 -PKGFILES_CSWpyxcbproto = .*\.py -ARCHALL_CSWpyxcbproto = 1 +PKGFILES_NIMOSSpyxcbproto = .*\.py +ARCHALL_NIMOSSpyxcbproto = 1 -CHECKPKG_OVERRIDES_CSWpyxcbproto += surplus-dependency|CSWxcbproto -CHECKPKG_OVERRIDES_CSWxcbproto += surplus-dependency|CSWx11common -CHECKPKG_OVERRIDES_CSWpyxcbproto += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_NIMOSSpyxcbproto += surplus-dependency|NIMOSSxcbproto +CHECKPKG_OVERRIDES_NIMOSSxcbproto += surplus-dependency|NIMOSSx11common +CHECKPKG_OVERRIDES_NIMOSSpyxcbproto += pkgname-does-not-start-with-NIMOSSpy- EXTRA_MERGE_EXCLUDE_FILES = .*.py[co] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Thu Dec 5 15:19:25 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Thu, 05 Dec 2013 14:19:25 +0000 Subject: SF.net SVN: gar:[22640] csw/mgar/pkg/freedesktop/libxcb/branches Message-ID: Revision: 22640 http://gar.svn.sourceforge.net/gar/?rev=22640&view=rev Author: mattdarcy Date: 2013-12-05 14:19:24 +0000 (Thu, 05 Dec 2013) Log Message: ----------- initial branch creation Modified Paths: -------------- csw/mgar/pkg/freedesktop/libxcb/branches/nim/Makefile Added Paths: ----------- csw/mgar/pkg/freedesktop/libxcb/branches/nim/ Modified: csw/mgar/pkg/freedesktop/libxcb/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/freedesktop/libxcb/trunk/Makefile 2013-07-31 10:29:30 UTC (rev 21590) +++ csw/mgar/pkg/freedesktop/libxcb/branches/nim/Makefile 2013-12-05 14:19:24 UTC (rev 22640) @@ -3,7 +3,7 @@ NAME = libxcb VERSION = 1.5 CATEGORIES = x11 -GARTYPE = v2 +GARTYPE = bts DESCRIPTION = The XCB library define BLURB @@ -15,27 +15,27 @@ DISTFILES = $(NAME)-$(VERSION).tar.bz2 BUILD_DEP_PKGS = CSWlibxaudevel CSWlibpthreadstubs CSWdoxygen CSWpython CSWxcbproto CSWgraphviz2 -RUNTIME_DEP_PKGS_CSWlibxcb = CSWlibxau -PACKAGES = CSWlibxcb CSWlibxcbdevel CSWlibxcbdoc +RUNTIME_DEP_PKGS_NIMOSSlibxcb = NIMOSSlibxau +PACKAGES = NIMOSSlibxcb NIMOSSlibxcbdevel NIMOSSlibxcbdoc # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_DESC_CSWlibxcb = The XCB library -SPKG_DESC_CSWlibxcbdevel = The XCB library development package -SPKG_DESC_CSWlibxcbdoc = The XCB library documentation +SPKG_DESC_NIMOSSlibxcb = The XCB library +SPKG_DESC_NIMOSSlibxcbdevel = The XCB library development package +SPKG_DESC_NIMOSSlibxcbdoc = The XCB library documentation -CATALOGNAME_CSWlibxcb = libxcb -CATALOGNAME_CSWlibxcbdevel = libxcb_devel -CATALOGNAME_CSWlibxcbdoc = libxcb_doc +CATALOGNAME_NIMOSSlibxcb = libxcb +CATALOGNAME_NIMOSSlibxcbdevel = libxcb_devel +CATALOGNAME_NIMOSSlibxcbdoc = libxcb_doc -PKGFILES_CSWlibxcbdevel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibxcbdoc = $(PKGFILES_DOC) +PKGFILES_NIMOSSlibxcbdevel = $(PKGFILES_DEVEL) +PKGFILES_NIMOSSlibxcbdoc = $(PKGFILES_DOC) -RUNTIME_DEP_PKGS_CSWlibxcbdevel = CSWlibxcb CSWlibpthreadstubs -RUNTIME_DEP_PKGS_CSWlibxcb = CSWx11common CSWlibxau CSWlibxdmcp +RUNTIME_DEP_PKGS_NIMOSSlibxcbdevel = NIMOSSlibxcb NIMOSSlibpthreadstubs +RUNTIME_DEP_PKGS_NIMOSSlibxcb = NIMOSSx11common NIMOSSlibxau NIMOSSlibxdmcp -ARCHALL_CSWlibxcbdoc = 1 +ARCHALL_NIMOSSlibxcbdoc = 1 BUILD64_LIBS_ONLY = 1 NOISALIST = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Thu Dec 5 15:46:03 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Thu, 05 Dec 2013 14:46:03 +0000 Subject: SF.net SVN: gar:[22641] csw/mgar/pkg/x11/proto/x11_xextproto/branches Message-ID: Revision: 22641 http://gar.svn.sourceforge.net/gar/?rev=22641&view=rev Author: mattdarcy Date: 2013-12-05 14:46:03 +0000 (Thu, 05 Dec 2013) Log Message: ----------- initial branch creation Modified Paths: -------------- csw/mgar/pkg/x11/proto/x11_xextproto/branches/nim/Makefile Added Paths: ----------- csw/mgar/pkg/x11/proto/x11_xextproto/branches/nim/ Modified: csw/mgar/pkg/x11/proto/x11_xextproto/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_xextproto/trunk/Makefile 2013-07-31 10:29:30 UTC (rev 21590) +++ csw/mgar/pkg/x11/proto/x11_xextproto/branches/nim/Makefile 2013-12-05 14:46:03 UTC (rev 22641) @@ -2,6 +2,7 @@ PROTONAME = xextproto NAME = x11_$(PROTONAME) DISTNAME = $(PROTONAME)-$(VERSION) +GARTYPE = bts CATEGORIES = x11 @@ -16,11 +17,11 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWx11$(PROTONAME) -CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) +PACKAGES = NIMOSSx11$(PROTONAME) +CATALOGNAME_NIMOSSx11$(PROTONAME) = x11_$(PROTONAME) -RUNTIME_DEP_PKGS = CSWx11common -INCOMPATIBLE_PKGS = CSWxextproto +RUNTIME_DEP_PKGS = NIMOSSx11common +INCOMPATIBLE_PKGS = NIMOSSxextproto BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Thu Dec 5 15:52:06 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Thu, 05 Dec 2013 14:52:06 +0000 Subject: SF.net SVN: gar:[22642] csw/mgar/pkg/x11/lib/xtrans/branches Message-ID: Revision: 22642 http://gar.svn.sourceforge.net/gar/?rev=22642&view=rev Author: mattdarcy Date: 2013-12-05 14:52:06 +0000 (Thu, 05 Dec 2013) Log Message: ----------- initial creation Modified Paths: -------------- csw/mgar/pkg/x11/lib/xtrans/branches/nim/Makefile Added Paths: ----------- csw/mgar/pkg/x11/lib/xtrans/branches/nim/ Modified: csw/mgar/pkg/x11/lib/xtrans/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/xtrans/trunk/Makefile 2013-07-31 10:29:30 UTC (rev 21590) +++ csw/mgar/pkg/x11/lib/xtrans/branches/nim/Makefile 2013-12-05 14:52:06 UTC (rev 22642) @@ -1,6 +1,7 @@ NAME = xtrans VERSION = 1.2.5 CATEGORIES = x11 +GARTYPE = bts DESCRIPTION = X transport library define BLURB @@ -14,7 +15,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -RUNTIME_DEP_PKGS = CSWx11common +RUNTIME_DEP_PKGS = NIMOSSx11common BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 5 15:56:57 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Dec 2013 14:56:57 +0000 Subject: SF.net SVN: gar:[22643] csw/mgar/pkg/cpan/DBD-Sybase/trunk Message-ID: Revision: 22643 http://gar.svn.sourceforge.net/gar/?rev=22643&view=rev Author: dmichelsen Date: 2013-12-05 14:56:57 +0000 (Thu, 05 Dec 2013) Log Message: ----------- cpan/DBD-Sybase/trunk: Update to Sybase 15 Modified Paths: -------------- csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile csw/mgar/pkg/cpan/DBD-Sybase/trunk/checksums Modified: csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile 2013-12-05 14:52:06 UTC (rev 22642) +++ csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile 2013-12-05 14:56:57 UTC (rev 22643) @@ -1,5 +1,5 @@ NAME = DBD-Sybase -VERSION = 1.11 +VERSION = 1.15 CATEGORIES = cpan GARTYPE = v2 AUTHOR = MEWP @@ -9,7 +9,7 @@ endef DISTFILES = COPYING -PATCHFILES = 0001-Use-CS_UNITEXT_TYPE-only-when-available.patch +# PATCHFILES = 0001-Use-CS_UNITEXT_TYPE-only-when-available.patch EXTRA_MODULATORS = DBDRIVER MODULATIONS_DBDRIVER = ocs freetds @@ -17,37 +17,55 @@ # I just don't have Sybase x86 OCS in 32 bit SKIP_MODULATIONS = isa-i386-dbdriver-ocs -PACKAGES = CSWpm-dbd-sybase-ocs CSWpm-dbd-sybase-freetds - -CATALOGNAME_CSWpm-dbd-sybase-ocs = pm_dbd_sybase_ocs -CATALOGNAME_CSWpm-dbd-sybase-freetds = pm_dbd_sybase_freetds - -SPKG_DESC_CSWpm-dbd-sybase-ocs = $(DESCRIPTION) (Linked against Sybase OCS) +PACKAGES += CSWpm-dbd-sybase-freetds SPKG_DESC_CSWpm-dbd-sybase-freetds = $(DESCRIPTION) (Linked against FreeTDS) - # The "standard" is to link against Sybase OCS as it does not have additional # dependencies. If you don't have that you can *additionally* install # the version linked against FreeTDS pulling in all additional dependencies. RUNTIME_DEP_PKGS_CSWpm-dbd-sybase-freetds += CSWfreetds -RUNTIME_DEP_PKGS_CSWpm-dbd-sybase-freetds += CSWggettextrt -RUNTIME_DEP_PKGS_CSWpm-dbd-sybase-ocs += CSWpm-dbd-sybase-freetds +RUNTIME_DEP_PKGS_CSWpm-dbd-sybase-freetds += CSWlibct4 +CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-freetds += bad-rpath-entry|/lib|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-freetds.so -SYBASE_ocs = /opt/csw/sybase/OCS-12_5 +PACKAGES += CSWpm-dbd-sybase-ocs +SPKG_DESC_CSWpm-dbd-sybase-ocs = $(DESCRIPTION) (Linked against Sybase OCS) +PKGFILES_CSWpm-dbd-sybase-ocs = $(DBDSYBASEDIR)/.*-ocs\..* +RUNTIME_DEP_PKGS_CSWpm-dbd-sybase-ocs += CSWpm-dbd-sybase-freetds + +# These are provided by the Sybase OCS libraries +CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libcs.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so +CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libcomn.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so +CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libtcl.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so +CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libct.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so +CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libsybtcl.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so +CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libsybct.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so +CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libsybcs.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so +CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libsybintl.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so +CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libsybblk.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so +CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libsybcomn.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so + +# These are just examples +CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-freetds += file-with-bad-content|/usr/local|root/opt/csw/lib/perl/site_perl/DBD/Sybase.pm + +CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += bad-rpath-entry|/lib|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so + +SYBASE_ocs = /opt/csw/sybase/OCS-15_0 SYBASE_freetds = /opt/csw -SYBASE = $(SYBASE_$(DBDRIVER)) -LD_LIBRARY_PATH = $(SYBASE)/lib - NOISALIST = 1 EXTRA_LIB = $(SYBASE)/lib -LD_OPTIONS = -EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) +#LD_OPTIONS = +#EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) -EXTRA_CONFIGURE_EXPORTS = SYBASE LD_LIBRARY_PATH +EXTRA_CONFIGURE_EXPORTS += SYBASE +CONFIGURE_ENV_SYBASE = $(SYBASE_$(DBDRIVER)) +EXTRA_CONFIGURE_EXPORTS += LD_LIBRARY_PATH +CONFIGURE_ENV_LD_LIBRARY_PATH = $(SYBASE)/lib + PERL_CONFIGURE_ARGS = --accept_test_defaults --chained Y --threaded_libs N -EXTRA_TEST_EXPORTS = LD_LIBRARY_PATH +EXTRA_TEST_EXPORTS += LD_LIBRARY_PATH +TEST_ENV_LD_LIBRARY_PATH = $(SYBASE)/lib # We need a running database for this TEST_SCRIPTS ?= @@ -61,8 +79,6 @@ EXTRA_PAX_ARGS = -s ",/Sybase\.bs$$,/Sybase-$(DBDRIVER).bs,p" EXTRA_PAX_ARGS += -s ",/Sybase\.so$$,/Sybase-$(DBDRIVER).so,p" -PKGFILES_CSWpm-dbd-sybase-ocs = $(DBDSYBASEDIR)/.*-ocs\..* - ALTERNATIVES_CSWpm-dbd-sybase-ocs = ocs ALTERNATIVES_CSWpm-dbd-sybase-freetds = freetds ALTERNATIVE_ocs = $(DBDSYBASEDIR)/Sybase.so so $(DBDSYBASEDIR)/Sybase-ocs.so 200 @@ -70,10 +86,4 @@ ALTERNATIVE_freetds = $(DBDSYBASEDIR)/Sybase.so so $(DBDSYBASEDIR)/Sybase-freetds.so 100 ALTERNATIVE_freetds += $(DBDSYBASEDIR)/Sybase.bs bs $(DBDSYBASEDIR)/Sybase-freetds.bs -# These are provided by the Sybase OCS libraries -CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libcs.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so -CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libcomn.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so -CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libtcl.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so -CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libct.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so - include gar/category.mk Modified: csw/mgar/pkg/cpan/DBD-Sybase/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/DBD-Sybase/trunk/checksums 2013-12-05 14:52:06 UTC (rev 22642) +++ csw/mgar/pkg/cpan/DBD-Sybase/trunk/checksums 2013-12-05 14:56:57 UTC (rev 22643) @@ -1 +1 @@ -7bbad79fcfc34195e6a3a8418277e64d DBD-Sybase-1.11.tar.gz +d76f09f9a25896fd879ef89a98748708 DBD-Sybase-1.15.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 5 16:11:37 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Dec 2013 15:11:37 +0000 Subject: SF.net SVN: gar:[22644] csw/mgar/pkg/xerces-c/branches Message-ID: Revision: 22644 http://gar.svn.sourceforge.net/gar/?rev=22644&view=rev Author: dmichelsen Date: 2013-12-05 15:11:37 +0000 (Thu, 05 Dec 2013) Log Message: ----------- xerces-c/branches/xerces-c-2.7.0: Prepare for XML::Xerces perl module Modified Paths: -------------- csw/mgar/pkg/xerces-c/branches/xerces-c-2.7.0/Makefile csw/mgar/pkg/xerces-c/branches/xerces-c-2.7.0/checksums Added Paths: ----------- csw/mgar/pkg/xerces-c/branches/xerces-c-2.7.0/ csw/mgar/pkg/xerces-c/branches/xerces-c-2.7.0/trunk/ Modified: csw/mgar/pkg/xerces-c/branches/xerces-c-2.7.0/Makefile =================================================================== --- csw/mgar/pkg/xerces-c/trunk/Makefile 2013-11-06 14:25:24 UTC (rev 22420) +++ csw/mgar/pkg/xerces-c/branches/xerces-c-2.7.0/Makefile 2013-12-05 15:11:37 UTC (rev 22644) @@ -1,5 +1,5 @@ NAME = xerces-c -VERSION = 3.1.1 +VERSION = 2_7_0 GARTYPE = v2 DESCRIPTION = Xerces XML parser for C++ @@ -12,13 +12,12 @@ refer to the Programming Guide. endef -MASTER_SITES = http://www.apache.org/dist/xerces/c/3/sources/ -DISTFILES += $(NAME)-$(VERSION).tar.gz +MASTER_SITES = http://archive.apache.org/dist/xml/xerces-c/source/ +DISTNAME = $(NAME)-src_$(VERSION) +DISTFILES += $(DISTNAME).tar.gz -PATCHFILES += 0001-Do-not-strip-norunpath.patch +# PATCHFILES += 0001-Do-not-strip-norunpath.patch -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 - VENDOR_URL = http://xerces.apache.org/xerces-c/ LICENSE = LICENSE @@ -58,6 +57,8 @@ BUILD64 = 1 ISAEXEC = 1 +WORKSRC = $(WORKDIR)/$(DISTNAME)/src/xercesc + EXTRA_CONFIGURE_EXPORTS = icu_config EXTRA_CONFIGURE_ENV_icu_config = $(bindir)/icu-config Modified: csw/mgar/pkg/xerces-c/branches/xerces-c-2.7.0/checksums =================================================================== --- csw/mgar/pkg/xerces-c/trunk/checksums 2013-11-06 14:25:24 UTC (rev 22420) +++ csw/mgar/pkg/xerces-c/branches/xerces-c-2.7.0/checksums 2013-12-05 15:11:37 UTC (rev 22644) @@ -1 +1 @@ -6a8ec45d83c8cfb1584c5a5345cb51ae xerces-c-3.1.1.tar.gz +04169609449a8846bc1e6891c04cadf4 xerces-c-src_2_7_0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 5 16:21:16 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Dec 2013 15:21:16 +0000 Subject: SF.net SVN: gar:[22645] csw/mgar/pkg/cpan/XML-Twig/trunk Message-ID: Revision: 22645 http://gar.svn.sourceforge.net/gar/?rev=22645&view=rev Author: dmichelsen Date: 2013-12-05 15:21:16 +0000 (Thu, 05 Dec 2013) Log Message: ----------- cpan/XML-Twig/trunk: Update to 3.44 and makemake Modified Paths: -------------- csw/mgar/pkg/cpan/XML-Twig/trunk/Makefile csw/mgar/pkg/cpan/XML-Twig/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/XML-Twig/trunk/files/CSWpmxmltwig.depend csw/mgar/pkg/cpan/XML-Twig/trunk/files/CSWpmxmltwig.gspec csw/mgar/pkg/cpan/XML-Twig/trunk/files/CSWpmxmltwig.prototype csw/mgar/pkg/cpan/XML-Twig/trunk/files/install.diff Modified: csw/mgar/pkg/cpan/XML-Twig/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/XML-Twig/trunk/Makefile 2013-12-05 15:11:37 UTC (rev 22644) +++ csw/mgar/pkg/cpan/XML-Twig/trunk/Makefile 2013-12-05 15:21:16 UTC (rev 22645) @@ -1,25 +1,23 @@ NAME = XML-Twig -VERSION = 3.34 +VERSION = 3.44 CATEGORIES = cpan GARTYPE = v2 AUTHOR = MIROD -DESCRIPTION = A module for processing huge XML documents in tree mode. +DESCRIPTION = XML, The Perl Way define BLURB - This module provides a way to process XML documents. It is build on top of - XML::Parser. The module offers a tree interface to the document, while - allowing you to output the parts of it that have been completely processed. endef +CATALOG_RELEASE = unstable -PACKAGES = CSWpmxmltwig -CATLOGNAME_CSWpmxmltwig = pm_xmltwig +LICENSE_TEXT = This module is licensed under the perl license -RUNTIME_DEP_PKGS += CSWpmxmlparser +PACKAGES += CSWpm-xml-twig +CATALOGNAME_CSWpm-xml-twig = pm_xml_twig +SPKG_DESC_CSWpm-xml-twig = XML, The Perl Way +ARCHALL_CSWpm-xml-twig = 1 +RUNTIME_DEP_PKGS_CSWpm-xml-twig += CSWpm-xml-parser +OBSOLETED_BY_CSWpm-xml-twig += CSWpmxmltwig +CATALOGNAME_CSWpmxmltwig = pm_xmltwig_stub -ARCHALL_CSWpmxmltwig = 1 - -# Force installation without prompting -PATCHFILES = install.diff - include gar/category.mk Modified: csw/mgar/pkg/cpan/XML-Twig/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/XML-Twig/trunk/checksums 2013-12-05 15:11:37 UTC (rev 22644) +++ csw/mgar/pkg/cpan/XML-Twig/trunk/checksums 2013-12-05 15:21:16 UTC (rev 22645) @@ -1,2 +1 @@ -88a24e3e09b2fc1e252f7662d1291f9a XML-Twig-3.34.tar.gz -ace5a7320bf7b6d46175fe7e098e2846 install.diff +f1d0b8848df388d96c1113fb63fa8e85 XML-Twig-3.44.tar.gz Deleted: csw/mgar/pkg/cpan/XML-Twig/trunk/files/CSWpmxmltwig.depend =================================================================== --- csw/mgar/pkg/cpan/XML-Twig/trunk/files/CSWpmxmltwig.depend 2013-12-05 15:11:37 UTC (rev 22644) +++ csw/mgar/pkg/cpan/XML-Twig/trunk/files/CSWpmxmltwig.depend 2013-12-05 15:21:16 UTC (rev 22645) @@ -1,3 +0,0 @@ -P CSWpmxmlparser pm_xmlparser - a module for parsing XML documents -P CSWpmxmlxpath pm_xmlxpath - Perl XML::Xpath Module -P CSWpmtieixhash pm_tieixhash - Perl Tie::IxHash module Deleted: csw/mgar/pkg/cpan/XML-Twig/trunk/files/CSWpmxmltwig.gspec =================================================================== --- csw/mgar/pkg/cpan/XML-Twig/trunk/files/CSWpmxmltwig.gspec 2013-12-05 15:11:37 UTC (rev 22644) +++ csw/mgar/pkg/cpan/XML-Twig/trunk/files/CSWpmxmltwig.gspec 2013-12-05 15:21:16 UTC (rev 22645) @@ -1,9 +0,0 @@ -%var bitname pm_xmltwig -%var pkgname CSWpmxmltwig -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright - Copyright (c) 1999-2004, Michel Rodriguez. All Rights Reserved. - This module is free software. It may be used, redistributed - and/or modified under the terms of the Perl Artistic License - (see http://www.perl.com/perl/misc/Artistic.html) Deleted: csw/mgar/pkg/cpan/XML-Twig/trunk/files/CSWpmxmltwig.prototype =================================================================== --- csw/mgar/pkg/cpan/XML-Twig/trunk/files/CSWpmxmltwig.prototype 2013-12-05 15:11:37 UTC (rev 22644) +++ csw/mgar/pkg/cpan/XML-Twig/trunk/files/CSWpmxmltwig.prototype 2013-12-05 15:21:16 UTC (rev 22645) @@ -1,29 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/xml_grep 0555 root bin -f none /opt/csw/bin/xml_merge 0555 root bin -f none /opt/csw/bin/xml_pp 0555 root bin -f none /opt/csw/bin/xml_spellcheck 0555 root bin -f none /opt/csw/bin/xml_split 0555 root bin -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/XML 0755 root bin -d none /opt/csw/lib/perl/csw/auto/XML/Twig 0755 root bin -f none /opt/csw/lib/perl/csw/auto/XML/Twig/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/xml_grep.1 0444 root bin -f none /opt/csw/share/man/man1/xml_merge.1 0444 root bin -f none /opt/csw/share/man/man1/xml_pp.1 0444 root bin -f none /opt/csw/share/man/man1/xml_spellcheck.1 0444 root bin -f none /opt/csw/share/man/man1/xml_split.1 0444 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/XML::Twig.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/XML 0755 root bin -d none /opt/csw/share/perl/csw/XML/Twig 0755 root bin -f none /opt/csw/share/perl/csw/XML/Twig.pm 0444 root bin -f none /opt/csw/share/perl/csw/XML/Twig/XPath.pm 0444 root bin Deleted: csw/mgar/pkg/cpan/XML-Twig/trunk/files/install.diff =================================================================== --- csw/mgar/pkg/cpan/XML-Twig/trunk/files/install.diff 2013-12-05 15:11:37 UTC (rev 22644) +++ csw/mgar/pkg/cpan/XML-Twig/trunk/files/install.diff 2013-12-05 15:21:16 UTC (rev 22645) @@ -1,12 +0,0 @@ -diff -ru XML-Twig-3.32.orig/Makefile.PL XML-Twig-3.32/Makefile.PL ---- XML-Twig-3.32.orig/Makefile.PL 2009-03-17 20:16:43.000000000 +0100 -+++ XML-Twig-3.32/Makefile.PL 2009-03-17 20:26:13.438626991 +0100 -@@ -24,7 +24,7 @@ - " 'perl Makefile.PL -n' to skip installation\n"; - foreach my $prompt (@prompts) - { my ($program, $default, $description) = @$prompt; -- if( prompt("Do you want to install '$program' ($description)?", $default) =~ /^y/) -+# if( prompt("Do you want to install '$program' ($description)?", $default) =~ /^y/) - { push(@programs, $program); } - } - } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Thu Dec 5 16:43:22 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Thu, 05 Dec 2013 15:43:22 +0000 Subject: SF.net SVN: gar:[22646] csw/mgar/pkg/xpm/branches/nim/Makefile Message-ID: Revision: 22646 http://gar.svn.sourceforge.net/gar/?rev=22646&view=rev Author: mattdarcy Date: 2013-12-05 15:43:21 +0000 (Thu, 05 Dec 2013) Log Message: ----------- removed EXTRA_PKG_CONFIG_DIRS = /opt/csw/X11/lib to stop invalid linking to X11 Modified Paths: -------------- csw/mgar/pkg/xpm/branches/nim/Makefile Modified: csw/mgar/pkg/xpm/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/xpm/branches/nim/Makefile 2013-12-05 15:21:16 UTC (rev 22645) +++ csw/mgar/pkg/xpm/branches/nim/Makefile 2013-12-05 15:43:21 UTC (rev 22646) @@ -34,6 +34,4 @@ CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += ac_cv_search_gettext=-lintl -EXTRA_PKG_CONFIG_DIRS = /opt/csw/X11/lib - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Dec 6 08:57:13 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 06 Dec 2013 07:57:13 +0000 Subject: SF.net SVN: gar:[22647] csw/mgar/pkg/xfig/trunk Message-ID: Revision: 22647 http://gar.svn.sourceforge.net/gar/?rev=22647&view=rev Author: cgrzemba Date: 2013-12-06 07:57:12 +0000 (Fri, 06 Dec 2013) Log Message: ----------- xfig/trunk: update version 3.2.5c Modified Paths: -------------- csw/mgar/pkg/xfig/trunk/Makefile csw/mgar/pkg/xfig/trunk/checksums Added Paths: ----------- csw/mgar/pkg/xfig/trunk/files/0002-set-csw-environment-and-reg_noerror.patch Modified: csw/mgar/pkg/xfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfig/trunk/Makefile 2013-12-05 15:43:21 UTC (rev 22646) +++ csw/mgar/pkg/xfig/trunk/Makefile 2013-12-06 07:57:12 UTC (rev 22647) @@ -1,6 +1,6 @@ # : Makefile 9089 2010-03-11 08:34:46Z wahwah $ NAME = xfig -VERSION = 3.2.5b +VERSION = 3.2.5c GARTYPE = v2 DESCRIPTION = An interactive drawing tool @@ -15,7 +15,7 @@ DISTNAME = $(NAME).$(VERSION) DISTFILES = $(DISTNAME).full.tar.gz -PATCHFILES = 0001-Add-missing-define-for-REG_NOERROR.patch +PATCHFILES += 0002-set-csw-environment-and-reg_noerror.patch # File name regex to get notifications about upstream software releases UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).full.tar.gz @@ -25,9 +25,23 @@ LICENSE = Libraries/GUI/LICENSE DEP_PKGS = CSWxpm CSWzlib CSWjpeg CSWpng CSWxaw3d +GARCOMPILER = GCC4 -CONFIGURE_SCRIPTS = $(WORKSRC)/Imakefile +REINPLACE_USRLOCAL += Imakefile +EXTRA_CONFIGURE_ENV += PATH=$(PATH):/usr/openwin/bin +RUNTIME_DEP_PKGS_CSWxfig += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWxfig += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWxfig += CSWlibxpm4 +RUNTIME_DEP_PKGS_CSWxfig += CSWxaw3d + +CONFIGURE_SCRIPTS = xmkmf +configure-xmkmf: + (cd $(WORKSRC) && OPENWINHOME=/usr/openwin export OPENWINHOME && \ + [ -f Makefile ] && mv -f Makefile Makefile.bak; \ + imake -DUseInstalled -I/usr/openwin/lib/X11/config -DHasGcc2=YES) + $(MAKECOOKIE) + BUILD_OVERRIDE_VARS = PNGLIBDIR PNGINC ZLIBDIR BUILD_OVERRIDE_VARS += JPEGLIBDIR JPEGINC BUILD_OVERRIDE_VARS += XPMLIBDIR XPMINC Modified: csw/mgar/pkg/xfig/trunk/checksums =================================================================== --- csw/mgar/pkg/xfig/trunk/checksums 2013-12-05 15:43:21 UTC (rev 22646) +++ csw/mgar/pkg/xfig/trunk/checksums 2013-12-06 07:57:12 UTC (rev 22647) @@ -1,2 +1 @@ -f07c03aa2c8e449e8fce29b6b4d652c5 0001-Add-missing-define-for-REG_NOERROR.patch -499b0ce103a6b353453bf7e327f9a3b9 xfig.3.2.5b.full.tar.gz +210851330fa4bb3581bec1f8448a4db8 xfig.3.2.5c.full.tar.gz Added: csw/mgar/pkg/xfig/trunk/files/0002-set-csw-environment-and-reg_noerror.patch =================================================================== --- csw/mgar/pkg/xfig/trunk/files/0002-set-csw-environment-and-reg_noerror.patch (rev 0) +++ csw/mgar/pkg/xfig/trunk/files/0002-set-csw-environment-and-reg_noerror.patch 2013-12-06 07:57:12 UTC (rev 22647) @@ -0,0 +1,54 @@ +From 3d9b3e1d426ba267256d4d753fe6c2e258f35b20 Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Thu, 5 Dec 2013 11:52:34 +0100 +Subject: [PATCH] set csw environment and reg_noerror + +--- + Imakefile | 4 ++-- + w_keyboard.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Imakefile b/Imakefile +index e2f43b7..ac31bd6 100755 +--- a/Imakefile ++++ b/Imakefile +@@ -30,9 +30,9 @@ XCOMM to the full path of the directory where you want xfig to be installed. + XCOMM Also, you may have to uncomment and redefine MKDIRHIER because "make" looks + XCOMM for it relative to the BINDIR variable. + XCOMM +-XCOMM BINDIR = /usr/bin ++BINDIR = /opt/csw/bin + XCOMM MKDIRHIER = /bin/sh /usr/bin/X11/mkdirhier -p +-MKDIRHIER = mkdirhier ++MKDIRHIER = mkdir -p + + XCOMM Uncomment and change XAPPLOADDIR to the directory where you want the + XCOMM app-defaults resource files to go. You will have to use the environment +diff --git a/w_keyboard.c b/w_keyboard.c +index 427d60c..a3360fd 100755 +--- a/w_keyboard.c ++++ b/w_keyboard.c +@@ -41,7 +41,7 @@ + #define REG_NOERROR 0 + #endif + +-#if defined(__FreeBSD__) && !defined(REG_NOERROR) ++#if (defined(__FreeBSD__) || defined(__sun)) && !defined(REG_NOERROR) + #define REG_NOERROR 0 + #endif + +diff --git a/Imakefile b/Imakefile +index ac31bd6..21471e0 100755 +--- a/Imakefile ++++ b/Imakefile +@@ -428,7 +428,6 @@ install.rhtml:: + echo Copying pdf and html files to $(DESTDIR)$(XFIGDOCDIR) ; \ + if [ -d $(DESTDIR)$(XFIGDOCDIR)/html ]; then set +x; \ + else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGDOCDIR)/html ); fi ; \ +- $(INSTALL) -m 644 -c xfig_man.html $(DESTDIR)$(XFIGDOCDIR) ; \ + $(INSTALL) -m 644 -c xfig_ref_en.pdf $(DESTDIR)$(XFIGDOCDIR) ; \ + $(INSTALL) -m 644 -c xfig-howto.pdf $(DESTDIR)$(XFIGDOCDIR) ; \ + if [ -d html ]; then \ +-- +1.8.4.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Dec 6 11:30:52 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 06 Dec 2013 10:30:52 +0000 Subject: SF.net SVN: gar:[22648] csw/mgar/pkg Message-ID: Revision: 22648 http://gar.svn.sourceforge.net/gar/?rev=22648&view=rev Author: cgrzemba Date: 2013-12-06 10:30:51 +0000 (Fri, 06 Dec 2013) Log Message: ----------- transfig/trunk: Inital commit Added Paths: ----------- csw/mgar/pkg/transfig/ csw/mgar/pkg/transfig/Makefile csw/mgar/pkg/transfig/branches/ csw/mgar/pkg/transfig/tags/ csw/mgar/pkg/transfig/trunk/ csw/mgar/pkg/transfig/trunk/Makefile csw/mgar/pkg/transfig/trunk/checksums csw/mgar/pkg/transfig/trunk/files/ Added: csw/mgar/pkg/transfig/Makefile =================================================================== --- csw/mgar/pkg/transfig/Makefile (rev 0) +++ csw/mgar/pkg/transfig/Makefile 2013-12-06 10:30:51 UTC (rev 22648) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/transfig/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/transfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/transfig/trunk/Makefile (rev 0) +++ csw/mgar/pkg/transfig/trunk/Makefile 2013-12-06 10:30:51 UTC (rev 22648) @@ -0,0 +1,51 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = transfig +VERSION = 3.2.5e +GARTYPE = v2 + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = $(SF_MIRROR) +# MASTER_SITES = http://sourceforge.net/projects/mcj/files/mcj-source/transfig.3.2.5e.tar.gz/download +DISTNAME = $(NAME).$(VERSION) +DISTFILES = $(DISTNAME).tar.gz + +GARCOMPILER = GCC4 +REINPLACE_USRLOCAL += fig2dev/Imakefile +REINPLACE_USRLOCAL += transfig/Imakefile + +BUILD_DEP_PKGS += CSWlibjpeg-dev +BUILD_DEP_PKGS += CSWlibpng-dev +BUILD_DEP_PKGS += CSWlibz-dev + +RUNTIME_DEP_PKGS_CSWtransfig += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWtransfig += CSWlibxpm4 + +EXTRA_CONFIGURE_ENV += PATH=$(PATH):/usr/openwin/bin +CONFIGURE_ARS = $(DIRPATHS) +CONFIGURE_SCRIPTS = xmkmf +configure-xmkmf: + (cd $(WORKSRC) && OPENWINHOME=/usr/openwin export OPENWINHOME && env && \ + [ -f Makefile ] && mv -f Makefile Makefile.bak; \ + gsed -i -e '/XCOMM BINDIR/s/.*/BINDIR = \/opt\/csw\/bin/' -e'/XCOMM MKDIRHIER/s/.*/MKDIRHIER = \/usr\/bin\/mkdir/' transfig/Imakefile ; \ + imake -DUseInstalled -I/usr/openwin/lib/X11/config -DHasGcc2=YES -ftransfig/Imakefile -s transfig/Makefile ; \ + gsed -i -e '/XCOMM BINDIR/s/.*/BINDIR = \/opt\/csw\/bin/' -e'/XCOMM MKDIRHIER/s/.*/MKDIRHIER = \/usr\/bin\/mkdir -p/' fig2dev/Imakefile ; \ + imake -DUseInstalled -I/usr/openwin/lib/X11/config -DHasGcc2=YES -ffig2dev/Imakefile -s fig2dev/Makefile ; \ + gsed -i -e '21 i BINDIR = $(prefix)\nMKDIRHIER = /usr/bin/mkdir -p\n' fig2dev/dev/Imakefile ; \ + imake -DUseInstalled -I/usr/openwin/lib/X11/config -DHasGcc2=YES -ffig2dev/dev/Imakefile -s fig2dev/dev/Makefile ; \ + gsed -i -e '/ MAKE = /s/usr\/ccs\/bin\/make/opt\/csw\/bin\/gmake/' transfig/Makefile ; \ + gsed -i -e '/ MAKE = /s/usr\/ccs\/bin\/make/opt\/csw\/bin\/gmake/' fig2dev/Makefile ; \ + imake -DUseInstalled -I/usr/openwin/lib/X11/config -DHasGcc2=YES ; \ + gsed -i -e '/ MAKE = /s/usr\/ccs\/bin\/make/opt\/csw\/bin\/gmake/' Makefile ; \ + ) + $(MAKECOOKIE) + +TEST_SCRIPTS = + +include gar/category.mk + Property changes on: csw/mgar/pkg/transfig/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/transfig/trunk/checksums =================================================================== --- csw/mgar/pkg/transfig/trunk/checksums (rev 0) +++ csw/mgar/pkg/transfig/trunk/checksums 2013-12-06 10:30:51 UTC (rev 22648) @@ -0,0 +1 @@ +f547c67a93422c72039204f159f53ea9 transfig.3.2.5e.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Dec 6 22:19:54 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 06 Dec 2013 21:19:54 +0000 Subject: SF.net SVN: gar:[22649] csw/mgar/pkg/cpan/Cache-Memcached-Fast/trunk Message-ID: Revision: 22649 http://gar.svn.sourceforge.net/gar/?rev=22649&view=rev Author: bonivart Date: 2013-12-06 21:19:54 +0000 (Fri, 06 Dec 2013) Log Message: ----------- cpan/Cache-Memcached-Fast/trunk: update to 0.21 Modified Paths: -------------- csw/mgar/pkg/cpan/Cache-Memcached-Fast/trunk/Makefile csw/mgar/pkg/cpan/Cache-Memcached-Fast/trunk/checksums Modified: csw/mgar/pkg/cpan/Cache-Memcached-Fast/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Cache-Memcached-Fast/trunk/Makefile 2013-12-06 10:30:51 UTC (rev 22648) +++ csw/mgar/pkg/cpan/Cache-Memcached-Fast/trunk/Makefile 2013-12-06 21:19:54 UTC (rev 22649) @@ -1,13 +1,10 @@ NAME = Cache-Memcached-Fast -VERSION = 0.19 +VERSION = 0.21 GARTYPE = v2 CATEGORIES = cpan AUTHOR = KROKI DESCRIPTION = Perl client for memcached, in C language -define BLURB - Perl client for memcached, in C language -endef DISTFILES += COPYING Modified: csw/mgar/pkg/cpan/Cache-Memcached-Fast/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Cache-Memcached-Fast/trunk/checksums 2013-12-06 10:30:51 UTC (rev 22648) +++ csw/mgar/pkg/cpan/Cache-Memcached-Fast/trunk/checksums 2013-12-06 21:19:54 UTC (rev 22649) @@ -1 +1 @@ -b1d7b4e7efc692804df559f494ac0fe7 Cache-Memcached-Fast-0.19.tar.gz +085eec7771e7afee9a904130131f8023 Cache-Memcached-Fast-0.21.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Dec 6 22:28:48 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 06 Dec 2013 21:28:48 +0000 Subject: SF.net SVN: gar:[22650] csw/mgar/pkg/cpan/DateTime-Set/trunk Message-ID: Revision: 22650 http://gar.svn.sourceforge.net/gar/?rev=22650&view=rev Author: bonivart Date: 2013-12-06 21:28:48 +0000 (Fri, 06 Dec 2013) Log Message: ----------- cpan/DateTime-Set/trunk: update to 0.33 Modified Paths: -------------- csw/mgar/pkg/cpan/DateTime-Set/trunk/Makefile csw/mgar/pkg/cpan/DateTime-Set/trunk/checksums Modified: csw/mgar/pkg/cpan/DateTime-Set/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DateTime-Set/trunk/Makefile 2013-12-06 21:19:54 UTC (rev 22649) +++ csw/mgar/pkg/cpan/DateTime-Set/trunk/Makefile 2013-12-06 21:28:48 UTC (rev 22650) @@ -1,13 +1,10 @@ NAME = DateTime-Set -VERSION = 0.31 +VERSION = 0.33 GARTYPE = v2 CATEGORIES = cpan AUTHOR = FGLOCK DESCRIPTION = Datetime sets and set math -define BLURB - Datetime sets and set math -endef LICENSE = LICENSE @@ -19,7 +16,4 @@ CONFIGURE_ARGS = -# Remove this on next build -CHECKPKG_OVERRIDES_CSWpm-datetime-set += unidentified-dependency|CSWpm-set-infinite - include gar/category.mk Modified: csw/mgar/pkg/cpan/DateTime-Set/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/DateTime-Set/trunk/checksums 2013-12-06 21:19:54 UTC (rev 22649) +++ csw/mgar/pkg/cpan/DateTime-Set/trunk/checksums 2013-12-06 21:28:48 UTC (rev 22650) @@ -1 +1 @@ -ab14a78a4912f14312ec44f356f63ea0 DateTime-Set-0.31.tar.gz +8cfb1921725cda545732256d93a4c0dd DateTime-Set-0.33.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Dec 6 22:38:07 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 06 Dec 2013 21:38:07 +0000 Subject: SF.net SVN: gar:[22651] csw/mgar/pkg/cpan/XML-SAX-Writer/trunk/Makefile Message-ID: Revision: 22651 http://gar.svn.sourceforge.net/gar/?rev=22651&view=rev Author: bonivart Date: 2013-12-06 21:38:07 +0000 (Fri, 06 Dec 2013) Log Message: ----------- cpan/XML-SAX-Writer/trunk: fix recipe Modified Paths: -------------- csw/mgar/pkg/cpan/XML-SAX-Writer/trunk/Makefile Modified: csw/mgar/pkg/cpan/XML-SAX-Writer/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/XML-SAX-Writer/trunk/Makefile 2013-12-06 21:28:48 UTC (rev 22650) +++ csw/mgar/pkg/cpan/XML-SAX-Writer/trunk/Makefile 2013-12-06 21:38:07 UTC (rev 22651) @@ -5,9 +5,6 @@ AUTHOR = PERIGRIN DESCRIPTION = SAX2 Writer -define BLURB - SAX2 Writer -endef DISTFILES += COPYING @@ -21,6 +18,4 @@ CONFIGURE_ARGS = -CHECKPKG_OVERRIDES_CSWpm-xml-sax-writer += unidentified-dependency|CSWpm-xml-filter-buffertext - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Dec 6 22:48:51 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 06 Dec 2013 21:48:51 +0000 Subject: SF.net SVN: gar:[22652] csw/mgar/pkg/cpan/Business-ISBN-Data/trunk Message-ID: Revision: 22652 http://gar.svn.sourceforge.net/gar/?rev=22652&view=rev Author: bonivart Date: 2013-12-06 21:48:51 +0000 (Fri, 06 Dec 2013) Log Message: ----------- cpan/Business-ISBN-Data/trunk: update to 20120719.001 Modified Paths: -------------- csw/mgar/pkg/cpan/Business-ISBN-Data/trunk/Makefile csw/mgar/pkg/cpan/Business-ISBN-Data/trunk/checksums Modified: csw/mgar/pkg/cpan/Business-ISBN-Data/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Business-ISBN-Data/trunk/Makefile 2013-12-06 21:38:07 UTC (rev 22651) +++ csw/mgar/pkg/cpan/Business-ISBN-Data/trunk/Makefile 2013-12-06 21:48:51 UTC (rev 22652) @@ -1,13 +1,10 @@ NAME = Business-ISBN-Data -VERSION = 20081208 +VERSION = 20120719.001 GARTYPE = v2 CATEGORIES = cpan AUTHOR = BDFOY DESCRIPTION = Data pack for Business::ISBN -define BLURB - Data pack for Business::ISBN -endef LICENSE = LICENSE Modified: csw/mgar/pkg/cpan/Business-ISBN-Data/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Business-ISBN-Data/trunk/checksums 2013-12-06 21:38:07 UTC (rev 22651) +++ csw/mgar/pkg/cpan/Business-ISBN-Data/trunk/checksums 2013-12-06 21:48:51 UTC (rev 22652) @@ -1 +1 @@ -e8edb53f04830344e20f61b02b6ed054 Business-ISBN-Data-20081208.tar.gz +e2f286566d8ce1af55d1372bbd5f329e Business-ISBN-Data-20120719.001.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Dec 6 23:36:10 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 06 Dec 2013 22:36:10 +0000 Subject: SF.net SVN: gar:[22653] csw/mgar/pkg/cpan/Email-Date/trunk Message-ID: Revision: 22653 http://gar.svn.sourceforge.net/gar/?rev=22653&view=rev Author: bonivart Date: 2013-12-06 22:36:10 +0000 (Fri, 06 Dec 2013) Log Message: ----------- cpan/Email-Date/trunk: update to 1.104 Modified Paths: -------------- csw/mgar/pkg/cpan/Email-Date/trunk/Makefile csw/mgar/pkg/cpan/Email-Date/trunk/checksums Modified: csw/mgar/pkg/cpan/Email-Date/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Email-Date/trunk/Makefile 2013-12-06 21:48:51 UTC (rev 22652) +++ csw/mgar/pkg/cpan/Email-Date/trunk/Makefile 2013-12-06 22:36:10 UTC (rev 22653) @@ -1,13 +1,10 @@ NAME = Email-Date -VERSION = 1.103 +VERSION = 1.104 GARTYPE = v2 CATEGORIES = cpan AUTHOR = RJBS DESCRIPTION = Find and Format Date Headers -define BLURB - Find and Format Date Headers -endef LICENSE = LICENSE @@ -18,7 +15,5 @@ CONFIGURE_ARGS = -CHECKPKG_OVERRIDES_CSWpm-email-date += unidentified-dependency|CSWpm-email-abstract - include gar/category.mk Modified: csw/mgar/pkg/cpan/Email-Date/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Email-Date/trunk/checksums 2013-12-06 21:48:51 UTC (rev 22652) +++ csw/mgar/pkg/cpan/Email-Date/trunk/checksums 2013-12-06 22:36:10 UTC (rev 22653) @@ -1 +1 @@ -c74b5b1d98ce7a92ed387970c461b5b4 Email-Date-1.103.tar.gz +4df8d2025e24ffc37217b678ec7e4cb3 Email-Date-1.104.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Dec 7 20:29:12 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 07 Dec 2013 19:29:12 +0000 Subject: SF.net SVN: gar:[22654] csw/mgar/pkg/cpan/CGI-Compile/trunk Message-ID: Revision: 22654 http://gar.svn.sourceforge.net/gar/?rev=22654&view=rev Author: bonivart Date: 2013-12-07 19:29:12 +0000 (Sat, 07 Dec 2013) Log Message: ----------- cpan/CGI-Compile/trunk: update to 0.16 Modified Paths: -------------- csw/mgar/pkg/cpan/CGI-Compile/trunk/Makefile csw/mgar/pkg/cpan/CGI-Compile/trunk/checksums Modified: csw/mgar/pkg/cpan/CGI-Compile/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/CGI-Compile/trunk/Makefile 2013-12-06 22:36:10 UTC (rev 22653) +++ csw/mgar/pkg/cpan/CGI-Compile/trunk/Makefile 2013-12-07 19:29:12 UTC (rev 22654) @@ -1,13 +1,10 @@ NAME = CGI-Compile -VERSION = 0.15 +VERSION = 0.16 GARTYPE = v2 CATEGORIES = cpan AUTHOR = MIYAGAWA DESCRIPTION = Compile .cgi scripts to a code reference like ModPerl::Registry -define BLURB - Compile .cgi scripts to a code reference like ModPerl::Registry -endef DISTFILES += COPYING @@ -17,9 +14,6 @@ RUNTIME_DEP_PKGS += CSWpm-file-pushd -# Remove on next build -CHECKPKG_OVERRIDES_CSWpm-cgi-compile += unidentified-dependency|CSWpm-file-pushd - CONFIGURE_ARGS = include gar/category.mk Modified: csw/mgar/pkg/cpan/CGI-Compile/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/CGI-Compile/trunk/checksums 2013-12-06 22:36:10 UTC (rev 22653) +++ csw/mgar/pkg/cpan/CGI-Compile/trunk/checksums 2013-12-07 19:29:12 UTC (rev 22654) @@ -1 +1 @@ -2fcf4bc473107130229f4e0a98c756ce CGI-Compile-0.15.tar.gz +321640c3a34a1564ffc4574ea4af381d CGI-Compile-0.16.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Dec 7 20:36:36 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 07 Dec 2013 19:36:36 +0000 Subject: SF.net SVN: gar:[22655] csw/mgar/pkg/cpan/Text-CSV-Encoded/trunk Message-ID: Revision: 22655 http://gar.svn.sourceforge.net/gar/?rev=22655&view=rev Author: bonivart Date: 2013-12-07 19:36:36 +0000 (Sat, 07 Dec 2013) Log Message: ----------- cpan/Text-CSV-Encoded/trunk: update to 0.22 Modified Paths: -------------- csw/mgar/pkg/cpan/Text-CSV-Encoded/trunk/Makefile csw/mgar/pkg/cpan/Text-CSV-Encoded/trunk/checksums Modified: csw/mgar/pkg/cpan/Text-CSV-Encoded/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-CSV-Encoded/trunk/Makefile 2013-12-07 19:29:12 UTC (rev 22654) +++ csw/mgar/pkg/cpan/Text-CSV-Encoded/trunk/Makefile 2013-12-07 19:36:36 UTC (rev 22655) @@ -1,13 +1,10 @@ NAME = Text-CSV-Encoded -VERSION = 0.10 +VERSION = 0.22 GARTYPE = v2 CATEGORIES = cpan AUTHOR = MAKAMAKA DESCRIPTION = Encoding aware Text::CSV -define BLURB - Encoding aware Text::CSV -endef DISTFILES += COPYING Modified: csw/mgar/pkg/cpan/Text-CSV-Encoded/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Text-CSV-Encoded/trunk/checksums 2013-12-07 19:29:12 UTC (rev 22654) +++ csw/mgar/pkg/cpan/Text-CSV-Encoded/trunk/checksums 2013-12-07 19:36:36 UTC (rev 22655) @@ -1 +1 @@ -9ed745eb7a416818b9c129eced8af93d Text-CSV-Encoded-0.10.tar.gz +9ce022c7a853e215e7dc9b49f1792d24 Text-CSV-Encoded-0.22.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Dec 7 20:44:43 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 07 Dec 2013 19:44:43 +0000 Subject: SF.net SVN: gar:[22656] csw/mgar/pkg/cpan/Business-ISBN/trunk Message-ID: Revision: 22656 http://gar.svn.sourceforge.net/gar/?rev=22656&view=rev Author: bonivart Date: 2013-12-07 19:44:42 +0000 (Sat, 07 Dec 2013) Log Message: ----------- cpan/Business-ISBN/trunk: update to 2.06 Modified Paths: -------------- csw/mgar/pkg/cpan/Business-ISBN/trunk/Makefile csw/mgar/pkg/cpan/Business-ISBN/trunk/checksums Modified: csw/mgar/pkg/cpan/Business-ISBN/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Business-ISBN/trunk/Makefile 2013-12-07 19:36:36 UTC (rev 22655) +++ csw/mgar/pkg/cpan/Business-ISBN/trunk/Makefile 2013-12-07 19:44:42 UTC (rev 22656) @@ -1,13 +1,10 @@ NAME = Business-ISBN -VERSION = 2.05 +VERSION = 2.06 GARTYPE = v2 CATEGORIES = cpan AUTHOR = BDFOY DESCRIPTION = Work with International Standard Book Numbers -define BLURB - Work with International Standard Book Numbers -endef LICENSE = LICENSE @@ -15,11 +12,8 @@ CATALOGNAME = pm_business_isbn ARCHALL = 1 -#BUILD_DEP_PKGS += CSWpm-business-isbn-data RUNTIME_DEP_PKGS += CSWpm-business-isbn-data -CHECKPKG_OVERRIDES_CSWpm-business-isbn += unidentified-dependency|CSWpm-business-isbn-data - CONFIGURE_ARGS = include gar/category.mk Modified: csw/mgar/pkg/cpan/Business-ISBN/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Business-ISBN/trunk/checksums 2013-12-07 19:36:36 UTC (rev 22655) +++ csw/mgar/pkg/cpan/Business-ISBN/trunk/checksums 2013-12-07 19:44:42 UTC (rev 22656) @@ -1 +1 @@ -944a2844711fa6ab1b079d8d2ef4cd75 Business-ISBN-2.05.tar.gz +7348e6da7cb0f87702bd5c4be89baf2f Business-ISBN-2.06.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Dec 7 20:53:26 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 07 Dec 2013 19:53:26 +0000 Subject: SF.net SVN: gar:[22657] csw/mgar/pkg/cpan/Test-MockObject/trunk/Makefile Message-ID: Revision: 22657 http://gar.svn.sourceforge.net/gar/?rev=22657&view=rev Author: bonivart Date: 2013-12-07 19:53:26 +0000 (Sat, 07 Dec 2013) Log Message: ----------- cpan/Test-MockObject/trunk: fix deps Modified Paths: -------------- csw/mgar/pkg/cpan/Test-MockObject/trunk/Makefile Modified: csw/mgar/pkg/cpan/Test-MockObject/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-MockObject/trunk/Makefile 2013-12-07 19:44:42 UTC (rev 22656) +++ csw/mgar/pkg/cpan/Test-MockObject/trunk/Makefile 2013-12-07 19:53:26 UTC (rev 22657) @@ -5,12 +5,6 @@ AUTHOR = CHROMATIC DESCRIPTION = Extension for emulating troublesome interfaces -define BLURB - It's a simple program that doesn't use any other modules, and those are easy - to test. More often, testing a program completely means faking up input to - another module, trying to coax the right output from something you're not - supposed to be testing anyway. -endef LICENSE = $(FILEDIR)/LICENSE @@ -21,7 +15,7 @@ CATALOGNAME_CSWpmtstmockobject = pm_tstmockobject_stub RUNTIME_DEP_PKGS += CSWpm-test-exception -RUNTIME_DEP_PKGS += CSWpmuniversalisa +RUNTIME_DEP_PKGS += CSWpm-universal-isa RUNTIME_DEP_PKGS += CSWpmuniversalcan ARCHALL = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Dec 7 23:24:23 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 07 Dec 2013 22:24:23 +0000 Subject: SF.net SVN: gar:[22658] csw/mgar/pkg/cpan Message-ID: Revision: 22658 http://gar.svn.sourceforge.net/gar/?rev=22658&view=rev Author: bonivart Date: 2013-12-07 22:24:23 +0000 (Sat, 07 Dec 2013) Log Message: ----------- cpan/DateTime-Event-Recurrence/trunk: first commit Added Paths: ----------- csw/mgar/pkg/cpan/DateTime-Event-Recurrence/ csw/mgar/pkg/cpan/DateTime-Event-Recurrence/Makefile csw/mgar/pkg/cpan/DateTime-Event-Recurrence/branches/ csw/mgar/pkg/cpan/DateTime-Event-Recurrence/tags/ csw/mgar/pkg/cpan/DateTime-Event-Recurrence/trunk/ csw/mgar/pkg/cpan/DateTime-Event-Recurrence/trunk/Makefile csw/mgar/pkg/cpan/DateTime-Event-Recurrence/trunk/checksums csw/mgar/pkg/cpan/DateTime-Event-Recurrence/trunk/files/ Added: csw/mgar/pkg/cpan/DateTime-Event-Recurrence/Makefile =================================================================== --- csw/mgar/pkg/cpan/DateTime-Event-Recurrence/Makefile (rev 0) +++ csw/mgar/pkg/cpan/DateTime-Event-Recurrence/Makefile 2013-12-07 22:24:23 UTC (rev 22658) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/cpan/DateTime-Event-Recurrence/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/DateTime-Event-Recurrence/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DateTime-Event-Recurrence/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/DateTime-Event-Recurrence/trunk/Makefile 2013-12-07 22:24:23 UTC (rev 22658) @@ -0,0 +1,18 @@ +NAME = DateTime-Event-Recurrence +VERSION = 0.16 +GARTYPE = v2 +CATEGORIES = cpan +AUTHOR = FGLOCK + +DESCRIPTION = DateTime::Set extension for create basic recurrence sets + +PACKAGES = CSWpm-datetime-event-recurrence +ARCHALL = 1 + +RUNTIME_DEP_PKGS += CSWpm-datetime +RUNTIME_DEP_PKGS += CSWpm-datetime-set + +CONFIGURE_ARGS = + +include gar/category.mk + Property changes on: csw/mgar/pkg/cpan/DateTime-Event-Recurrence/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/cpan/DateTime-Event-Recurrence/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/DateTime-Event-Recurrence/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/DateTime-Event-Recurrence/trunk/checksums 2013-12-07 22:24:23 UTC (rev 22658) @@ -0,0 +1 @@ +9a08830b081a93619f4a8564063e3bf0 DateTime-Event-Recurrence-0.16.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Dec 9 09:32:50 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 09 Dec 2013 08:32:50 +0000 Subject: SF.net SVN: gar:[22659] csw/mgar/pkg/mplayer/branches/snapshot/checksums Message-ID: Revision: 22659 http://gar.svn.sourceforge.net/gar/?rev=22659&view=rev Author: pfelecan Date: 2013-12-09 08:32:50 +0000 (Mon, 09 Dec 2013) Log Message: ----------- mplayer/branches/snapshot: new refresh Modified Paths: -------------- csw/mgar/pkg/mplayer/branches/snapshot/checksums Modified: csw/mgar/pkg/mplayer/branches/snapshot/checksums =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/checksums 2013-12-07 22:24:23 UTC (rev 22658) +++ csw/mgar/pkg/mplayer/branches/snapshot/checksums 2013-12-09 08:32:50 UTC (rev 22659) @@ -1,2 +1,2 @@ -223fc26893343f45f71c66e4c615d5f4 ffmpeg-snapshot.tar.bz2 -ebc7ba5e3938042e60010c982b830e71 mplayer-export-snapshot.tar.bz2 +b76999cb6612a7f2437190541b0330fe ffmpeg-snapshot.tar.bz2 +1de8984b0ee2f3c8b070794580d9c964 mplayer-export-snapshot.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Dec 9 09:34:12 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 09 Dec 2013 08:34:12 +0000 Subject: SF.net SVN: gar:[22660] csw/mgar/pkg/gnucash/trunk Message-ID: Revision: 22660 http://gar.svn.sourceforge.net/gar/?rev=22660&view=rev Author: pfelecan Date: 2013-12-09 08:34:12 +0000 (Mon, 09 Dec 2013) Log Message: ----------- gnucash/trunk: minor tweaks: - new upstream release - remove obsoleted dependency Modified Paths: -------------- csw/mgar/pkg/gnucash/trunk/Makefile csw/mgar/pkg/gnucash/trunk/checksums Modified: csw/mgar/pkg/gnucash/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnucash/trunk/Makefile 2013-12-09 08:32:50 UTC (rev 22659) +++ csw/mgar/pkg/gnucash/trunk/Makefile 2013-12-09 08:34:12 UTC (rev 22660) @@ -1,7 +1,7 @@ # $Id$ NAME = gnucash -VERSION = 2.4.11 +VERSION = 2.4.13 GARTYPE = v2 DESCRIPTION = A personal and small-business financial-accounting software @@ -44,7 +44,6 @@ BUILD_DEP_PKGS += CSWgtkhtml31 BUILD_DEP_PKGS += CSWlibdbi-dev BUILD_DEP_PKGS += CSWlibgnome-dev -BUILD_DEP_PKGS += CSWlibgtkhtml BUILD_DEP_PKGS += CSWlibgnomecanvas-dev GARCOMPILER = GNU @@ -55,7 +54,7 @@ include gar/category.mk -PATH := /opt/csw/gnu:/opt/csw/libexec/flex-2.5.35/bin:$(PATH) +PATH := /opt/csw/gnu:$(PATH) # this is private and not available publicly mydependencies: Modified: csw/mgar/pkg/gnucash/trunk/checksums =================================================================== --- csw/mgar/pkg/gnucash/trunk/checksums 2013-12-09 08:32:50 UTC (rev 22659) +++ csw/mgar/pkg/gnucash/trunk/checksums 2013-12-09 08:34:12 UTC (rev 22660) @@ -1 +1 @@ -e59f94a8c4cf41f47a9e74ba725bde45 gnucash-2.4.11.tar.bz2 +ee73b3fac8bac4bf1c3a39a33302a27d gnucash-2.4.13.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Dec 9 13:48:58 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 09 Dec 2013 12:48:58 +0000 Subject: SF.net SVN: gar:[22661] csw/mgar/pkg/tig/trunk Message-ID: Revision: 22661 http://gar.svn.sourceforge.net/gar/?rev=22661&view=rev Author: dmichelsen Date: 2013-12-09 12:48:57 +0000 (Mon, 09 Dec 2013) Log Message: ----------- tig/trunk: Update to 1.2.1 Modified Paths: -------------- csw/mgar/pkg/tig/trunk/Makefile csw/mgar/pkg/tig/trunk/checksums Modified: csw/mgar/pkg/tig/trunk/Makefile =================================================================== --- csw/mgar/pkg/tig/trunk/Makefile 2013-12-09 08:34:12 UTC (rev 22660) +++ csw/mgar/pkg/tig/trunk/Makefile 2013-12-09 12:48:57 UTC (rev 22661) @@ -1,5 +1,5 @@ NAME = tig -VERSION = 0.18 +VERSION = 1.2.1 GARTYPE = v2 DESCRIPTION = A git repository browser @@ -19,10 +19,10 @@ VENDOR_URL = http://jonas.nitro.dk/tig/ -BUILD_DEP_PKGS += CSWncurses +BUILD_DEP_PKGS += CSWlibncurses-dev BUILD_DEP_PKGS += CSWasciidoc BUILD_DEP_PKGS += CSWxmlto -BUILD_DEP_PKGS += CSWiconv +BUILD_DEP_PKGS += CSWlibiconv-dev RUNTIME_DEP_PKGS += CSWlibncursesw5 RUNTIME_DEP_PKGS += CSWlibiconv2 @@ -32,18 +32,20 @@ GARCOMPILER = GNU -sysconfdir = /etc/opt/csw - EXTRA_CPPFLAGS = -I$(includedir)/ncursesw CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libiconv=$(prefix) +# There is no testsuite TEST_SCRIPTS = -INSTALL_ARGS = install install-doc +# For GNU install to be available as "install" +INSTALL_ENV_PATH = /opt/csw/gnu:$(PATH) +# Installer uses $(...) idiom not available in /bin/sh +# CONFIG_SHELL is correctly detected as /bin/bash, but not used during make invocation +INSTALL_ARGS = SHELL=/opt/csw/bin/bash install install-doc + include gar/category.mk -# For GNU install to be available as "install" -PATH := /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/tig/trunk/checksums =================================================================== --- csw/mgar/pkg/tig/trunk/checksums 2013-12-09 08:34:12 UTC (rev 22660) +++ csw/mgar/pkg/tig/trunk/checksums 2013-12-09 12:48:57 UTC (rev 22661) @@ -1 +1 @@ -4fa9e33c5daa76b6fed11e068405356f tig-0.18.tar.gz +d5c1dd1d829f8e515f59c96a5d419323 tig-1.2.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Tue Dec 10 11:27:25 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Tue, 10 Dec 2013 10:27:25 +0000 Subject: SF.net SVN: gar:[22662] csw/mgar/pkg/cpan/GD/branches/nim/Makefile Message-ID: Revision: 22662 http://gar.svn.sourceforge.net/gar/?rev=22662&view=rev Author: mattdarcy Date: 2013-12-10 10:27:25 +0000 (Tue, 10 Dec 2013) Log Message: ----------- Updated to confirm new path Modified Paths: -------------- csw/mgar/pkg/cpan/GD/branches/nim/Makefile Modified: csw/mgar/pkg/cpan/GD/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/cpan/GD/branches/nim/Makefile 2013-12-09 12:48:57 UTC (rev 22661) +++ csw/mgar/pkg/cpan/GD/branches/nim/Makefile 2013-12-10 10:27:25 UTC (rev 22662) @@ -2,7 +2,7 @@ VERSION = 2.50 CATEGORIES = cpan GARTYPE = v2 -AUTHOR = LDS +AUTHOR = bts DESCRIPTION = Interface to GD Graphics Library define BLURB This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Tue Dec 10 11:32:46 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Tue, 10 Dec 2013 10:32:46 +0000 Subject: SF.net SVN: gar:[22663] csw/mgar/pkg/cpan/GD-Barcode/branches Message-ID: Revision: 22663 http://gar.svn.sourceforge.net/gar/?rev=22663&view=rev Author: mattdarcy Date: 2013-12-10 10:32:45 +0000 (Tue, 10 Dec 2013) Log Message: ----------- initial branch creation Modified Paths: -------------- csw/mgar/pkg/cpan/GD-Barcode/branches/nim/Makefile Added Paths: ----------- csw/mgar/pkg/cpan/GD-Barcode/branches/nim/ Modified: csw/mgar/pkg/cpan/GD-Barcode/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/cpan/GD-Barcode/trunk/Makefile 2013-07-31 10:29:30 UTC (rev 21590) +++ csw/mgar/pkg/cpan/GD-Barcode/branches/nim/Makefile 2013-12-10 10:32:45 UTC (rev 22663) @@ -1,7 +1,7 @@ NAME = GD-Barcode VERSION = 1.15 CATEGORIES = cpan -GARTYPE = v2 +GARTYPE = bts AUTHOR = KWITKNR DESCRIPTION = Create barcode images with GD @@ -10,14 +10,14 @@ DISTFILES += COPYING -PACKAGES = CSWpm-gd-barcode +PACKAGES = NIMOSSpm-gd-barcode CATALOGNAME = pm_gd_barcode -SPKG_DESC_CSWpm-gd-barcode = $(DESCRIPTION) -OBSOLETED_BY_CSWpm-gd-barcode = CSWpmgdbarcode -CATALOGNAME_CSWpmgdbarcode = pm_gdbarcode +SPKG_DESC_NIMOSSpm-gd-barcode = $(DESCRIPTION) +OBSOLETED_BY_NIMOSSpm-gd-barcode = CSWpmgdbarcode +CATALOGNAME_NIMOSSpmgdbarcode = pm_gdbarcode ARCHALL = 1 -RUNTIME_DEP_PKGS += CSWpm-gd +RUNTIME_DEP_PKGS += NIMOSSpm-gd include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Tue Dec 10 12:16:21 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Tue, 10 Dec 2013 11:16:21 +0000 Subject: SF.net SVN: gar:[22664] csw/mgar/pkg/cpan/GD/branches/nim/Makefile Message-ID: Revision: 22664 http://gar.svn.sourceforge.net/gar/?rev=22664&view=rev Author: mattdarcy Date: 2013-12-10 11:16:18 +0000 (Tue, 10 Dec 2013) Log Message: ----------- Added fix for dynamic path creation with REINPLACE Modified Paths: -------------- csw/mgar/pkg/cpan/GD/branches/nim/Makefile Modified: csw/mgar/pkg/cpan/GD/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/cpan/GD/branches/nim/Makefile 2013-12-10 10:32:45 UTC (rev 22663) +++ csw/mgar/pkg/cpan/GD/branches/nim/Makefile 2013-12-10 11:16:18 UTC (rev 22664) @@ -52,3 +52,8 @@ pre-test-modulated: @cp files/t/test.out.* ${WORKSRC}/t/ @$(MAKECOOKIE) + +REINPLACE_MATH = -Wformat=0 +REINPLACE_WITH = +REPLACE_FILES += Makefile.PL + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Dec 10 15:37:53 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Dec 2013 14:37:53 +0000 Subject: SF.net SVN: gar:[22665] csw/mgar/pkg/cgit/trunk Message-ID: Revision: 22665 http://gar.svn.sourceforge.net/gar/?rev=22665&view=rev Author: dmichelsen Date: 2013-12-10 14:37:53 +0000 (Tue, 10 Dec 2013) Log Message: ----------- cgit/trunk: Update to 0.9.2, complete rework Modified Paths: -------------- csw/mgar/pkg/cgit/trunk/Makefile csw/mgar/pkg/cgit/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cgit/trunk/files/0001-Add-substitute-for-timegm-on-Solaris.patch csw/mgar/pkg/cgit/trunk/files/cgit.conf csw/mgar/pkg/cgit/trunk/files/config.mak.uname csw/mgar/pkg/cgit/trunk/files/httpd-cgit.conf.CSW Removed Paths: ------------- csw/mgar/pkg/cgit/trunk/files/0001-cgit.conf csw/mgar/pkg/cgit/trunk/files/apache.conf.CSW Modified: csw/mgar/pkg/cgit/trunk/Makefile =================================================================== --- csw/mgar/pkg/cgit/trunk/Makefile 2013-12-10 11:16:18 UTC (rev 22664) +++ csw/mgar/pkg/cgit/trunk/Makefile 2013-12-10 14:37:53 UTC (rev 22665) @@ -1,69 +1,76 @@ NAME = cgit -VERSION = 0.8.3_opencsw_1 +VERSION = 0.9.2 GARTYPE = v2 DESCRIPTION = Web front-end for Git -define BLURB -cgit is - * a cgi application implemented in C: it's basically (yet) another git command, used to generate html. - * not forking: all git operations are performed by linking with libgit.a. - * using a built-in cache: the generated html is stored on disk for the benefit of later requests. - * fond of virtual urls - using PATH_INFO or modules like mod_rewrite makes cgit generate urls with few or no querystring parameters, e.g. - * http://hjemli.net/git/cgit/log/Makefile vs. - * http://hjemli.net/git?r=cgit&p=log&path=Makefile. - * not too visual, but sometimes a bit of graphics can be justified. - * open source - it is licensed under GPL v2. - * maintained by Lars Hjemli, who is happy to receive patches, suggestions and bug reports. -endef -RUNTIME_DEP_PKGS_CSWcgit = CSWiconv CSWosslrt CSWzlib +MASTER_SITES += http://git.zx2c4.com/cgit/snapshot/ +DISTFILES += $(NAME)-$(VERSION).tar.xz -#MASTER_SITES = http://hjemli.net/git/cgit/snapshot/ -#DISTFILES = $(NAME)-$(VERSION).tar.gz +MASTER_SITES += https://git-core.googlecode.com/files/ +DISTFILES += git-1.8.3.tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +DISTFILES += cgit.conf +EXPANDVARS += cgit.conf -GIT_REPOS = git://github.com/trygvis/cgit.git -#GIT_TREEISH_cgit = v$(VERSION)$(if $(PATCHLEVEL),-$(PATCHLEVEL)) -GIT_TREEISH_cgit.git = solaris +# The existing one ends at Solaris 9, we added Solaris 10 and 11 +DISTFILES += config.mak.uname -DISTFILES = apache.conf.CSW cgitrc.CSW +DISTFILES += httpd-cgit.conf.CSW +DISTFILES += cgitrc.CSW -# The Makefile use "install" to install files but the Sun one is not really compatible -PATH := /usr/ucb:$(PATH) +PATCHFILES += 0001-Add-substitute-for-timegm-on-Solaris.patch -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = +PACKAGES += CSWcgit +SPKG_DESC_CSWcgit = Web front-end for Git +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWcgit += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWcgit += CSWlibz1 +RUNTIME_DEP_PKGS_CSWcgit += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWcgit += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWcgit += CSWperl -PATCHFILES = 0001-cgit.conf +# This may be used with any other webserver, just preconfigured for apache +CHECKPKG_OVERRIDES_CSWcgit += missing-dependency|CSWapache2 +PRESERVECONF += $(sysconfdir)/cgitrc +PRESERVECONF += $(prefix)/apache2/etc/extra/httpd-cgit.conf + +GARCOMPILER = GNU + +# There is no configure step CONFIGURE_SCRIPTS = -# Disable tests for now, need a round GNU'ism removal there too -TEST_SCRIPTS = +BUILD_ARGS += V=1 +TEST_TARGET = test +# Tetsuite has major problems on this platform due to shell and calling conventions +SKIPTEST ?= 1 + +INSTALL_ENV_PATH = /opt/csw/gnu:$(PATH) + # pdf-doc does not work yet -INSTALL_ARGS += man-doc html-doc +INSTALL_ARGS += install install-man install-html -PRESERVECONF = /etc/opt/csw/cgit/apache.conf -PRESERVECONF += /etc/opt/csw/cgit/cgitrc +include gar/category.mk -# Trick to get the gar+git support to export the source code -pre-extract-modulated: git-extract-cgit +post-extract: + @# Link in GIT + rmdir $(WORKSRC)/git + mv $(WORKDIR)/git-1.8.3 $(WORKSRC)/git + cp $(WORKDIR)/config.mak.uname $(WORKSRC)/git/config.mak.uname + @$(MAKECOOKIE) -post-install-modulated: - @mkdir -p $(DESTDIR)/etc/opt/csw/cgit - @mkdir -p $(DESTDIR)/opt/csw/share/man/man5 - @mkdir -p $(DESTDIR)/opt/csw/share/doc/cgit - @cp $(FILEDIR)/apache.conf.CSW \ - $(FILEDIR)/cgitrc.CSW \ - $(DESTDIR)/etc/opt/csw/cgit/ - @cp $(WORKSRC)/cgitrc.5 $(DESTDIR)/opt/csw/share/man/man5 - @cp $(WORKSRC)/cgitrc.5.txt $(DESTDIR)/opt/csw/share/doc/cgit - @cp $(WORKSRC)/cgitrc.5.html $(DESTDIR)/opt/csw/share/doc/cgit -# @cp $(WORKSRC)/cgitrc.5.pdf $(DESTDIR)/opt/csw/share/doc/cgit +post-patch: + @# EXPANDVARS is done at patch phase + cp $(WORKDIR)/cgit.conf $(WORKSRC)/cgit.conf @$(MAKECOOKIE) -include gar/category.mk +post-install: + ginstall -D $(WORKDIR)/cgitrc.CSW $(DESTDIR)$(sysconfdir) + ginstall -D $(WORKDIR)/httpd-cgit.conf.CSW $(DESTDIR)$(prefix)/apache2/etc/extra/httpd-cgit.conf.CSW + mkdir -p $(DESTDIR)$(prefix)/apache2/share/htdocs + ln -s ../../../share/www/cgit/htdocs $(DESTDIR)$(prefix)/apache2/share/htdocs/cgit + mkdir -p $(DESTDIR)$(prefix)/apache2/share/cgi-bin + ln -s ../../../share/www/cgit/cgi-bin $(DESTDIR)$(prefix)/apache2/share/cgi-bin/cgit + @$(MAKECOOKIE) Modified: csw/mgar/pkg/cgit/trunk/checksums =================================================================== --- csw/mgar/pkg/cgit/trunk/checksums 2013-12-10 11:16:18 UTC (rev 22664) +++ csw/mgar/pkg/cgit/trunk/checksums 2013-12-10 14:37:53 UTC (rev 22665) @@ -1,3 +1,2 @@ -5bce8ac0de1a5e08e864c56c56906233 0001-cgit.conf -27ef98eeb9066a301e60def5b6895a2c apache.conf.CSW -03d013bbfdad0143ddcb4c29acf1b637 cgitrc.CSW +fe11018eff8d79caad112f4fac64b90f cgit-0.9.2.tar.xz +d91b6099fb6763cf92c696977a247060 git-1.8.3.tar.gz Added: csw/mgar/pkg/cgit/trunk/files/0001-Add-substitute-for-timegm-on-Solaris.patch =================================================================== --- csw/mgar/pkg/cgit/trunk/files/0001-Add-substitute-for-timegm-on-Solaris.patch (rev 0) +++ csw/mgar/pkg/cgit/trunk/files/0001-Add-substitute-for-timegm-on-Solaris.patch 2013-12-10 14:37:53 UTC (rev 22665) @@ -0,0 +1,51 @@ +From 4a79c7edf62b0fa5d8903d413f76649fc67274ec Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 9 Dec 2013 13:55:04 +0100 +Subject: [PATCH] Add substitute for timegm on Solaris + +--- + ui-stats.c | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 insertions(+) + +diff --git a/ui-stats.c b/ui-stats.c +index 28b794f..9e3c848 100644 +--- a/ui-stats.c ++++ b/ui-stats.c +@@ -19,6 +19,34 @@ struct authorstat { + #define DAY_SECS (60 * 60 * 24) + #define WEEK_SECS (DAY_SECS * 7) + ++ time_t timegm(struct tm *t) ++{ ++ time_t tl, tb; ++ struct tm *tg; ++ ++ tl = mktime (t); ++ if (tl == -1) ++ { ++ t->tm_hour--; ++ tl = mktime (t); ++ if (tl == -1) ++ return -1; /* can't deal with output from strptime */ ++ tl += 3600; ++ } ++ tg = gmtime (&tl); ++ tg->tm_isdst = 0; ++ tb = mktime (tg); ++ if (tb == -1) ++ { ++ tg->tm_hour--; ++ tb = mktime (tg); ++ if (tb == -1) ++ return -1; /* can't deal with output from gmtime */ ++ tb += 3600; ++ } ++ return (tl - (tb - tl)); ++} ++ + static void trunc_week(struct tm *tm) + { + time_t t = timegm(tm); +-- +1.8.4.1 + Deleted: csw/mgar/pkg/cgit/trunk/files/0001-cgit.conf =================================================================== --- csw/mgar/pkg/cgit/trunk/files/0001-cgit.conf 2013-12-10 11:16:18 UTC (rev 22664) +++ csw/mgar/pkg/cgit/trunk/files/0001-cgit.conf 2013-12-10 14:37:53 UTC (rev 22665) @@ -1,34 +0,0 @@ ---- a/dev/null 2009-09-18 13:04:46.000000000 +0200 -+++ b/cgit.conf 2009-09-18 13:08:12.674658346 +0200 -@@ -0,0 +1,31 @@ -+# Sun Studio -+CFLAGS += -DNO_SETENV -+MMFLAGS = -xM1 -+ -+# GCC -+#CC=/opt/csw/gcc4/bin/gcc -+ -+# Common -+LDFLAGS += -R/opt/csw/lib -+ -+LIBGIT_PATH=/opt/csw/lib/git/libgit.a -+ -+# Common -+CFLAGS += -I/opt/csw/include -+CFLAGS += -I/opt/csw/include/git -+ -+LDFLAGS += -L/opt/csw/lib -+LDFLAGS += -L/opt/csw/lib/git -+ -+# Solaris -+EXTLIBS = -lsocket -lnsl -lgit -lxdiff -+NEEDS_LIBICONV=1 -+NO_STRCASESTR=1 -+ -+# OpenCSW -+CGIT_SCRIPT_PATH = /opt/csw/libexec/cgit -+CGIT_DATA_PATH = /opt/csw/share/cgit/httpd -+CGIT_CONFIG = /etc/opt/csw/cgit/cgitrc -+CACHE_ROOT = /var/opt/csw/cgit/cache -+ -+INSTALL = /usr/ucb/install Deleted: csw/mgar/pkg/cgit/trunk/files/apache.conf.CSW =================================================================== --- csw/mgar/pkg/cgit/trunk/files/apache.conf.CSW 2013-12-10 11:16:18 UTC (rev 22664) +++ csw/mgar/pkg/cgit/trunk/files/apache.conf.CSW 2013-12-10 14:37:53 UTC (rev 22665) @@ -1,12 +0,0 @@ - - AllowOverride None - Options ExecCGI - Order allow,deny - Allow from all - - - - AllowOverride None - Order allow,deny - Allow from all - Added: csw/mgar/pkg/cgit/trunk/files/cgit.conf =================================================================== --- csw/mgar/pkg/cgit/trunk/files/cgit.conf (rev 0) +++ csw/mgar/pkg/cgit/trunk/files/cgit.conf 2013-12-10 14:37:53 UTC (rev 22665) @@ -0,0 +1,10 @@ +CC = @CC@ +CFLAGS = @CFLAGS@ +LDFLAGS = @LDFLAGS@ + +CGIT_SCRIPT_PATH = @sharedstatedir@/www/cgit/cgi-bin +CGIT_DATA_PATH = @sharedstatedir@/www/cgit/htdocs +CGIT_CONFIG = @sysconfdir@/cgitrc +CACHE_ROOT = @localstatedir@/cgit/cache + +prefix = @prefix@ Added: csw/mgar/pkg/cgit/trunk/files/config.mak.uname =================================================================== --- csw/mgar/pkg/cgit/trunk/files/config.mak.uname (rev 0) +++ csw/mgar/pkg/cgit/trunk/files/config.mak.uname 2013-12-10 14:37:53 UTC (rev 22665) @@ -0,0 +1,549 @@ +# Platform specific Makefile tweaks based on uname detection + +uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') +uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') +uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') +uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') +uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not') +uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not') + +ifdef MSVC + # avoid the MingW and Cygwin configuration sections + uname_S := Windows + uname_O := Windows +endif + +# We choose to avoid "if .. else if .. else .. endif endif" +# because maintaining the nesting to match is a pain. If +# we had "elif" things would have been much nicer... + +ifeq ($(uname_M),x86_64) + XDL_FAST_HASH = YesPlease +endif +ifeq ($(uname_S),OSF1) + # Need this for u_short definitions et al + BASIC_CFLAGS += -D_OSF_SOURCE + SOCKLEN_T = int + NO_STRTOULL = YesPlease + NO_NSEC = YesPlease +endif +ifeq ($(uname_S),Linux) + NO_STRLCPY = YesPlease + NO_MKSTEMPS = YesPlease + HAVE_PATHS_H = YesPlease + LIBC_CONTAINS_LIBINTL = YesPlease + HAVE_DEV_TTY = YesPlease +endif +ifeq ($(uname_S),GNU/kFreeBSD) + NO_STRLCPY = YesPlease + NO_MKSTEMPS = YesPlease + HAVE_PATHS_H = YesPlease + DIR_HAS_BSD_GROUP_SEMANTICS = YesPlease + LIBC_CONTAINS_LIBINTL = YesPlease +endif +ifeq ($(uname_S),UnixWare) + CC = cc + NEEDS_SOCKET = YesPlease + NEEDS_NSL = YesPlease + NEEDS_SSL_WITH_CRYPTO = YesPlease + NEEDS_LIBICONV = YesPlease + SHELL_PATH = /usr/local/bin/bash + NO_IPV6 = YesPlease + NO_HSTRERROR = YesPlease + NO_MKSTEMPS = YesPlease + BASIC_CFLAGS += -Kthread + BASIC_CFLAGS += -I/usr/local/include + BASIC_LDFLAGS += -L/usr/local/lib + INSTALL = ginstall + TAR = gtar + NO_STRCASESTR = YesPlease + NO_MEMMEM = YesPlease +endif +ifeq ($(uname_S),SCO_SV) + ifeq ($(uname_R),3.2) + CFLAGS = -O2 + endif + ifeq ($(uname_R),5) + CC = cc + BASIC_CFLAGS += -Kthread + endif + NEEDS_SOCKET = YesPlease + NEEDS_NSL = YesPlease + NEEDS_SSL_WITH_CRYPTO = YesPlease + NEEDS_LIBICONV = YesPlease + SHELL_PATH = /usr/bin/bash + NO_IPV6 = YesPlease + NO_HSTRERROR = YesPlease + NO_MKSTEMPS = YesPlease + BASIC_CFLAGS += -I/usr/local/include + BASIC_LDFLAGS += -L/usr/local/lib + NO_STRCASESTR = YesPlease + NO_MEMMEM = YesPlease + INSTALL = ginstall + TAR = gtar +endif +ifeq ($(uname_S),Darwin) + NEEDS_CRYPTO_WITH_SSL = YesPlease + NEEDS_SSL_WITH_CRYPTO = YesPlease + NEEDS_LIBICONV = YesPlease + ifeq ($(shell expr "$(uname_R)" : '[15678]\.'),2) + OLD_ICONV = UnfortunatelyYes + endif + ifeq ($(shell expr "$(uname_R)" : '[15]\.'),2) + NO_STRLCPY = YesPlease + endif + NO_MEMMEM = YesPlease + USE_ST_TIMESPEC = YesPlease + HAVE_DEV_TTY = YesPlease + COMPAT_OBJS += compat/precompose_utf8.o + BASIC_CFLAGS += -DPRECOMPOSE_UNICODE +endif +ifeq ($(uname_S),SunOS) + NEEDS_SOCKET = YesPlease + NEEDS_NSL = YesPlease + SHELL_PATH = /bin/bash + SANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin + NO_STRCASESTR = YesPlease + NO_MEMMEM = YesPlease + NO_MKDTEMP = YesPlease + NO_MKSTEMPS = YesPlease + NO_REGEX = YesPlease + NO_FNMATCH_CASEFOLD = YesPlease + NO_MSGFMT_EXTENDED_OPTIONS = YesPlease + HAVE_DEV_TTY = YesPlease + ifeq ($(uname_R),5.6) + SOCKLEN_T = int + NO_HSTRERROR = YesPlease + NO_IPV6 = YesPlease + NO_SOCKADDR_STORAGE = YesPlease + NO_UNSETENV = YesPlease + NO_SETENV = YesPlease + NO_STRLCPY = YesPlease + NO_STRTOUMAX = YesPlease + GIT_TEST_CMP = cmp + endif + ifeq ($(uname_R),5.7) + NEEDS_RESOLV = YesPlease + NO_IPV6 = YesPlease + NO_SOCKADDR_STORAGE = YesPlease + NO_UNSETENV = YesPlease + NO_SETENV = YesPlease + NO_STRLCPY = YesPlease + NO_STRTOUMAX = YesPlease + GIT_TEST_CMP = cmp + endif + ifeq ($(uname_R),5.8) + NO_UNSETENV = YesPlease + NO_SETENV = YesPlease + NO_STRTOUMAX = YesPlease + GIT_TEST_CMP = cmp + endif + ifeq ($(uname_R),5.9) + NO_UNSETENV = YesPlease + NO_SETENV = YesPlease + NO_STRTOUMAX = YesPlease + GIT_TEST_CMP = cmp + endif + ifeq ($(uname_R),5.10) + NEEDS_LIBICONV=YesPlease + GIT_TEST_CMP = cmp + endif + ifeq ($(uname_R),5.11) + NEEDS_LIBICONV=YesPlease + GIT_TEST_CMP = cmp + endif + INSTALL = /usr/ucb/install + TAR = gtar + BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__ -DHAVE_ALLOCA_H +endif +ifeq ($(uname_O),Cygwin) + ifeq ($(shell expr "$(uname_R)" : '1\.[1-6]\.'),4) + NO_D_TYPE_IN_DIRENT = YesPlease + NO_D_INO_IN_DIRENT = YesPlease + NO_STRCASESTR = YesPlease + NO_MEMMEM = YesPlease + NO_MKSTEMPS = YesPlease + NO_SYMLINK_HEAD = YesPlease + NO_IPV6 = YesPlease + OLD_ICONV = UnfortunatelyYes + CYGWIN_V15_WIN32API = YesPlease + endif + NO_THREAD_SAFE_PREAD = YesPlease + NEEDS_LIBICONV = YesPlease + NO_FAST_WORKING_DIRECTORY = UnfortunatelyYes + NO_TRUSTABLE_FILEMODE = UnfortunatelyYes + NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease + # There are conflicting reports about this. + # On some boxes NO_MMAP is needed, and not so elsewhere. + # Try commenting this out if you suspect MMAP is more efficient + NO_MMAP = YesPlease + X = .exe + COMPAT_OBJS += compat/cygwin.o + UNRELIABLE_FSTAT = UnfortunatelyYes + SPARSE_FLAGS = -isystem /usr/include/w32api -Wno-one-bit-signed-bitfield +endif +ifeq ($(uname_S),FreeBSD) + NEEDS_LIBICONV = YesPlease + OLD_ICONV = YesPlease + NO_MEMMEM = YesPlease + BASIC_CFLAGS += -I/usr/local/include + BASIC_LDFLAGS += -L/usr/local/lib + DIR_HAS_BSD_GROUP_SEMANTICS = YesPlease + USE_ST_TIMESPEC = YesPlease + ifeq ($(shell expr "$(uname_R)" : '4\.'),2) + PTHREAD_LIBS = -pthread + NO_UINTMAX_T = YesPlease + NO_STRTOUMAX = YesPlease + endif + PYTHON_PATH = /usr/local/bin/python + HAVE_PATHS_H = YesPlease +endif +ifeq ($(uname_S),OpenBSD) + NO_STRCASESTR = YesPlease + NO_MEMMEM = YesPlease + USE_ST_TIMESPEC = YesPlease + NEEDS_LIBICONV = YesPlease + BASIC_CFLAGS += -I/usr/local/include + BASIC_LDFLAGS += -L/usr/local/lib + HAVE_PATHS_H = YesPlease +endif +ifeq ($(uname_S),NetBSD) + ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2) + NEEDS_LIBICONV = YesPlease + endif + BASIC_CFLAGS += -I/usr/pkg/include + BASIC_LDFLAGS += -L/usr/pkg/lib $(CC_LD_DYNPATH)/usr/pkg/lib + USE_ST_TIMESPEC = YesPlease + NO_MKSTEMPS = YesPlease + HAVE_PATHS_H = YesPlease +endif +ifeq ($(uname_S),AIX) + DEFAULT_PAGER = more + NO_STRCASESTR = YesPlease + NO_MEMMEM = YesPlease + NO_MKDTEMP = YesPlease + NO_MKSTEMPS = YesPlease + NO_STRLCPY = YesPlease + NO_NSEC = YesPlease + FREAD_READS_DIRECTORIES = UnfortunatelyYes + INTERNAL_QSORT = UnfortunatelyYes + NEEDS_LIBICONV = YesPlease + BASIC_CFLAGS += -D_LARGE_FILES + ifeq ($(shell expr "$(uname_V)" : '[1234]'),1) + NO_PTHREADS = YesPlease + else + PTHREAD_LIBS = -lpthread + endif + ifeq ($(shell expr "$(uname_V).$(uname_R)" : '5\.1'),3) + INLINE = '' + endif + GIT_TEST_CMP = cmp +endif +ifeq ($(uname_S),GNU) + # GNU/Hurd + NO_STRLCPY = YesPlease + NO_MKSTEMPS = YesPlease + HAVE_PATHS_H = YesPlease + LIBC_CONTAINS_LIBINTL = YesPlease +endif +ifeq ($(uname_S),IRIX) + NO_SETENV = YesPlease + NO_UNSETENV = YesPlease + NO_STRCASESTR = YesPlease + NO_MEMMEM = YesPlease + NO_MKSTEMPS = YesPlease + NO_MKDTEMP = YesPlease + # When compiled with the MIPSpro 7.4.4m compiler, and without pthreads + # (i.e. NO_PTHREADS is set), and _with_ MMAP (i.e. NO_MMAP is not set), + # git dies with a segmentation fault when trying to access the first + # entry of a reflog. The conservative choice is made to always set + # NO_MMAP. If you suspect that your compiler is not affected by this + # issue, comment out the NO_MMAP statement. + NO_MMAP = YesPlease + NO_REGEX = YesPlease + NO_FNMATCH_CASEFOLD = YesPlease + SNPRINTF_RETURNS_BOGUS = YesPlease + SHELL_PATH = /usr/gnu/bin/bash + NEEDS_LIBGEN = YesPlease +endif +ifeq ($(uname_S),IRIX64) + NO_SETENV = YesPlease + NO_UNSETENV = YesPlease + NO_STRCASESTR = YesPlease + NO_MEMMEM = YesPlease + NO_MKSTEMPS = YesPlease + NO_MKDTEMP = YesPlease + # When compiled with the MIPSpro 7.4.4m compiler, and without pthreads + # (i.e. NO_PTHREADS is set), and _with_ MMAP (i.e. NO_MMAP is not set), + # git dies with a segmentation fault when trying to access the first + # entry of a reflog. The conservative choice is made to always set + # NO_MMAP. If you suspect that your compiler is not affected by this + # issue, comment out the NO_MMAP statement. + NO_MMAP = YesPlease + NO_REGEX = YesPlease + NO_FNMATCH_CASEFOLD = YesPlease + SNPRINTF_RETURNS_BOGUS = YesPlease + SHELL_PATH = /usr/gnu/bin/bash + NEEDS_LIBGEN = YesPlease +endif +ifeq ($(uname_S),HP-UX) + INLINE = __inline + NO_IPV6 = YesPlease + NO_SETENV = YesPlease + NO_STRCASESTR = YesPlease + NO_MEMMEM = YesPlease + NO_MKSTEMPS = YesPlease + NO_STRLCPY = YesPlease + NO_MKDTEMP = YesPlease + NO_UNSETENV = YesPlease + NO_HSTRERROR = YesPlease + NO_SYS_SELECT_H = YesPlease + NO_FNMATCH_CASEFOLD = YesPlease + SNPRINTF_RETURNS_BOGUS = YesPlease + NO_NSEC = YesPlease + ifeq ($(uname_R),B.11.00) + NO_INET_NTOP = YesPlease + NO_INET_PTON = YesPlease + endif + ifeq ($(uname_R),B.10.20) + # Override HP-UX 11.x setting: + INLINE = + SOCKLEN_T = size_t + NO_PREAD = YesPlease + NO_INET_NTOP = YesPlease + NO_INET_PTON = YesPlease + endif + GIT_TEST_CMP = cmp +endif +ifeq ($(uname_S),Windows) + GIT_VERSION := $(GIT_VERSION).MSVC + pathsep = ; + NO_PREAD = YesPlease + NEEDS_CRYPTO_WITH_SSL = YesPlease + NO_LIBGEN_H = YesPlease + NO_POLL = YesPlease + NO_SYMLINK_HEAD = YesPlease + NO_IPV6 = YesPlease + NO_UNIX_SOCKETS = YesPlease + NO_SETENV = YesPlease + NO_UNSETENV = YesPlease + NO_STRCASESTR = YesPlease + NO_STRLCPY = YesPlease + NO_FNMATCH = YesPlease + NO_MEMMEM = YesPlease + # NEEDS_LIBICONV = YesPlease + NO_ICONV = YesPlease + NO_STRTOUMAX = YesPlease + NO_MKDTEMP = YesPlease + NO_MKSTEMPS = YesPlease + SNPRINTF_RETURNS_BOGUS = YesPlease + NO_SVN_TESTS = YesPlease + NO_PERL_MAKEMAKER = YesPlease + RUNTIME_PREFIX = YesPlease + NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease + NO_NSEC = YesPlease + USE_WIN32_MMAP = YesPlease + # USE_NED_ALLOCATOR = YesPlease + UNRELIABLE_FSTAT = UnfortunatelyYes + OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo + NO_REGEX = YesPlease + NO_CURL = YesPlease + NO_PYTHON = YesPlease + BLK_SHA1 = YesPlease + ETAGS_TARGET = ETAGS + NO_INET_PTON = YesPlease + NO_INET_NTOP = YesPlease + NO_POSIX_GOODIES = UnfortunatelyYes + NATIVE_CRLF = YesPlease + DEFAULT_HELP_FORMAT = html + + CC = compat/vcbuild/scripts/clink.pl + AR = compat/vcbuild/scripts/lib.pl + CFLAGS = + BASIC_CFLAGS = -nologo -I. -I../zlib -Icompat/vcbuild -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE + COMPAT_OBJS = compat/msvc.o compat/winansi.o \ + compat/win32/pthread.o compat/win32/syslog.o \ + compat/win32/dirent.o + COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -DHAVE_ALLOCA_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\" + BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE -NODEFAULTLIB:MSVCRT.lib + EXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib + PTHREAD_LIBS = + lib = +ifndef DEBUG + BASIC_CFLAGS += -GL -Os -MT + BASIC_LDFLAGS += -LTCG + AR += -LTCG +else + BASIC_CFLAGS += -Zi -MTd +endif + X = .exe +endif +ifeq ($(uname_S),Interix) + NO_INITGROUPS = YesPlease + NO_IPV6 = YesPlease + NO_MEMMEM = YesPlease + NO_MKDTEMP = YesPlease + NO_STRTOUMAX = YesPlease + NO_NSEC = YesPlease + NO_MKSTEMPS = YesPlease + ifeq ($(uname_R),3.5) + NO_INET_NTOP = YesPlease + NO_INET_PTON = YesPlease + NO_SOCKADDR_STORAGE = YesPlease + NO_FNMATCH_CASEFOLD = YesPlease + endif + ifeq ($(uname_R),5.2) + NO_INET_NTOP = YesPlease + NO_INET_PTON = YesPlease + NO_SOCKADDR_STORAGE = YesPlease + NO_FNMATCH_CASEFOLD = YesPlease + endif +endif +ifeq ($(uname_S),Minix) + NO_IPV6 = YesPlease + NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease + NO_NSEC = YesPlease + NEEDS_LIBGEN = + NEEDS_CRYPTO_WITH_SSL = YesPlease + NEEDS_IDN_WITH_CURL = YesPlease + NEEDS_SSL_WITH_CURL = YesPlease + NEEDS_RESOLV = + NO_HSTRERROR = YesPlease + NO_MMAP = YesPlease + NO_CURL = + NO_EXPAT = +endif +ifeq ($(uname_S),NONSTOP_KERNEL) + # Needs some C99 features, "inline" is just one of them. + # INLINE='' would just replace one set of warnings with another and + # still not compile in c89 mode, due to non-const array initializations. + CC = cc -c99 + # Disable all optimization, seems to result in bad code, with -O or -O2 + # or even -O1 (default), /usr/local/libexec/git-core/git-pack-objects + # abends on "git push". Needs more investigation. + CFLAGS = -g -O0 + # We'd want it to be here. + prefix = /usr/local + # Our's are in ${prefix}/bin (perl might also be in /usr/bin/perl). + PERL_PATH = ${prefix}/bin/perl + PYTHON_PATH = ${prefix}/bin/python + + # As detected by './configure'. + # Missdetected, hence commented out, see below. + #NO_CURL = YesPlease + # Added manually, see above. + NEEDS_SSL_WITH_CURL = YesPlease + HAVE_LIBCHARSET_H = YesPlease + HAVE_STRINGS_H = YesPlease + NEEDS_LIBICONV = YesPlease + NEEDS_LIBINTL_BEFORE_LIBICONV = YesPlease + NO_SYS_SELECT_H = UnfortunatelyYes + NO_D_TYPE_IN_DIRENT = YesPlease + NO_HSTRERROR = YesPlease + NO_STRCASESTR = YesPlease + NO_FNMATCH_CASEFOLD = YesPlease + NO_MEMMEM = YesPlease + NO_STRLCPY = YesPlease + NO_SETENV = YesPlease + NO_UNSETENV = YesPlease + NO_MKDTEMP = YesPlease + NO_MKSTEMPS = YesPlease + # Currently libiconv-1.9.1. + OLD_ICONV = UnfortunatelyYes + NO_REGEX = YesPlease + NO_PTHREADS = UnfortunatelyYes + + # Not detected (nor checked for) by './configure'. + # We don't have SA_RESTART on NonStop, unfortunalety. + COMPAT_CFLAGS += -DSA_RESTART=0 + # Apparently needed in compat/fnmatch/fnmatch.c. + COMPAT_CFLAGS += -DHAVE_STRING_H=1 + NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease + NO_NSEC = YesPlease + NO_PREAD = YesPlease + NO_MMAP = YesPlease + NO_POLL = YesPlease + NO_INTPTR_T = UnfortunatelyYes + # Bug report 10-120822-4477 submitted to HP NonStop development. + MKDIR_WO_TRAILING_SLASH = YesPlease + # RFE 10-120912-4693 submitted to HP NonStop development. + NO_SETITIMER = UnfortunatelyYes + SANE_TOOL_PATH = /usr/coreutils/bin:/usr/local/bin + SHELL_PATH = /usr/local/bin/bash + # as of H06.25/J06.14, we might better use this + #SHELL_PATH = /usr/coreutils/bin/bash +endif +ifneq (,$(findstring MINGW,$(uname_S))) + pathsep = ; + NO_PREAD = YesPlease + NEEDS_CRYPTO_WITH_SSL = YesPlease + NO_LIBGEN_H = YesPlease + NO_POLL = YesPlease + NO_SYMLINK_HEAD = YesPlease + NO_UNIX_SOCKETS = YesPlease + NO_SETENV = YesPlease + NO_UNSETENV = YesPlease + NO_STRCASESTR = YesPlease + NO_STRLCPY = YesPlease + NO_FNMATCH = YesPlease + NO_MEMMEM = YesPlease + NEEDS_LIBICONV = YesPlease + OLD_ICONV = YesPlease + NO_STRTOUMAX = YesPlease + NO_MKDTEMP = YesPlease + NO_MKSTEMPS = YesPlease + NO_SVN_TESTS = YesPlease + NO_PERL_MAKEMAKER = YesPlease + RUNTIME_PREFIX = YesPlease + NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease + NO_NSEC = YesPlease + USE_WIN32_MMAP = YesPlease + USE_NED_ALLOCATOR = YesPlease + UNRELIABLE_FSTAT = UnfortunatelyYes + OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo + NO_REGEX = YesPlease + NO_PYTHON = YesPlease + BLK_SHA1 = YesPlease + ETAGS_TARGET = ETAGS + NO_INET_PTON = YesPlease + NO_INET_NTOP = YesPlease + NO_POSIX_GOODIES = UnfortunatelyYes + COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/win32 + COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\" + COMPAT_OBJS += compat/mingw.o compat/winansi.o \ + compat/win32/pthread.o compat/win32/syslog.o \ + compat/win32/dirent.o + EXTLIBS += -lws2_32 + PTHREAD_LIBS = + NATIVE_CRLF = YesPlease + X = .exe + SPARSE_FLAGS = -Wno-one-bit-signed-bitfield +ifneq (,$(wildcard ../THIS_IS_MSYSGIT)) + htmldir = doc/git/html/ + prefix = + INSTALL = /bin/install + EXTLIBS += /mingw/lib/libz.a + NO_R_TO_GCC_LINKER = YesPlease + INTERNAL_QSORT = YesPlease + HAVE_LIBCHARSET_H = YesPlease +else + NO_CURL = YesPlease +endif +endif +ifeq ($(uname_S),QNX) + COMPAT_CFLAGS += -DSA_RESTART=0 + EXPAT_NEEDS_XMLPARSE_H = YesPlease + HAVE_STRINGS_H = YesPlease + NEEDS_SOCKET = YesPlease + NO_FNMATCH_CASEFOLD = YesPlease + NO_GETPAGESIZE = YesPlease + NO_ICONV = YesPlease + NO_MEMMEM = YesPlease + NO_MKDTEMP = YesPlease + NO_MKSTEMPS = YesPlease + NO_NSEC = YesPlease + NO_PTHREADS = YesPlease + NO_R_TO_GCC_LINKER = YesPlease + NO_STRCASESTR = YesPlease + NO_STRLCPY = YesPlease +endif Copied: csw/mgar/pkg/cgit/trunk/files/httpd-cgit.conf.CSW (from rev 22420, csw/mgar/pkg/cgit/trunk/files/apache.conf.CSW) =================================================================== --- csw/mgar/pkg/cgit/trunk/files/httpd-cgit.conf.CSW (rev 0) +++ csw/mgar/pkg/cgit/trunk/files/httpd-cgit.conf.CSW 2013-12-10 14:37:53 UTC (rev 22665) @@ -0,0 +1,12 @@ + + AllowOverride None + Options ExecCGI + Order allow,deny + Allow from all + + + + AllowOverride None + Order allow,deny + Allow from all + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Dec 10 15:55:19 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Dec 2013 14:55:19 +0000 Subject: SF.net SVN: gar:[22666] csw/mgar/pkg/cgit/trunk/Makefile Message-ID: Revision: 22666 http://gar.svn.sourceforge.net/gar/?rev=22666&view=rev Author: dmichelsen Date: 2013-12-10 14:55:19 +0000 (Tue, 10 Dec 2013) Log Message: ----------- cgit/trunk: Fix missing part Modified Paths: -------------- csw/mgar/pkg/cgit/trunk/Makefile Modified: csw/mgar/pkg/cgit/trunk/Makefile =================================================================== --- csw/mgar/pkg/cgit/trunk/Makefile 2013-12-10 14:37:53 UTC (rev 22665) +++ csw/mgar/pkg/cgit/trunk/Makefile 2013-12-10 14:55:19 UTC (rev 22666) @@ -67,7 +67,7 @@ @$(MAKECOOKIE) post-install: - ginstall -D $(WORKDIR)/cgitrc.CSW $(DESTDIR)$(sysconfdir) + ginstall -D $(WORKDIR)/cgitrc.CSW $(DESTDIR)$(sysconfdir)/cgitrc.CSW ginstall -D $(WORKDIR)/httpd-cgit.conf.CSW $(DESTDIR)$(prefix)/apache2/etc/extra/httpd-cgit.conf.CSW mkdir -p $(DESTDIR)$(prefix)/apache2/share/htdocs ln -s ../../../share/www/cgit/htdocs $(DESTDIR)$(prefix)/apache2/share/htdocs/cgit This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Dec 10 16:26:07 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 10 Dec 2013 15:26:07 +0000 Subject: SF.net SVN: gar:[22667] csw/mgar/pkg/mplayer/branches/snapshot Message-ID: Revision: 22667 http://gar.svn.sourceforge.net/gar/?rev=22667&view=rev Author: pfelecan Date: 2013-12-10 15:26:07 +0000 (Tue, 10 Dec 2013) Log Message: ----------- mplayer/branches/snapshot: - new snapshot; - sub-packages renaming because I wish to reintroduce the "stable" release which will have the proper name when the snapshot will have the homonynous suffix. Modified Paths: -------------- csw/mgar/pkg/mplayer/branches/snapshot/Makefile csw/mgar/pkg/mplayer/branches/snapshot/checksums Modified: csw/mgar/pkg/mplayer/branches/snapshot/Makefile =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-12-10 14:55:19 UTC (rev 22666) +++ csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-12-10 15:26:07 UTC (rev 22667) @@ -1,15 +1,14 @@ # $Id$ NAME = mplayer -YEAR = $(shell date '+%Y') -MONTH = $(shell date '+%m') -DAY = $(shell date '+%d') -VERSION = $(YEAR)$(MONTH)$(DAY) +YEAR ?= $(shell date '+%Y') +MONTH ?= $(shell date '+%m') +DAY ?= $(shell date '+%d') +VERSION ?= $(YEAR)$(MONTH)$(DAY) GARTYPE = v2 -DESCRIPTION = The Movie Player and Encoder +DESCRIPTION = Development snapshot of The Movie Player and Encoder define BLURB - MPlayer can play most standard video formats out of the box and almost all others with the help of external codecs. MPlayer currently works best from the command line, but visual feedback @@ -87,150 +86,101 @@ BUILD_SCRIPTS = custom TEST_SCRIPTS = custom -PACKAGES = CSWmplayer -CATALOGNAME_CSWmplayer = mplayer -SPKG_DESC_CSWmplayer = $(DESCRIPTION), the player -RUNTIME_DEP_PKGS_CSWmplayer += CSWfaac -RUNTIME_DEP_PKGS_CSWmplayer += CSWliba52 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibaa1 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibaudiofile0 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibesd0 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfaad2 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfribidi0 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibjpeg62 -RUNTIME_DEP_PKGS_CSWmplayer += CSWliblzo2-2 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibmad0 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibmp3lame0 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibogg0 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibrtmp0 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibsdl1-2-0 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibtheoradec1 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibvorbis0 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibvorbisenc2 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibx264-133 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibxvidcore4 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibz1 -RUNTIME_DEP_PKGS_CSWmplayer += CSWmesa -RUNTIME_DEP_PKGS_CSWmplayer += CSWmpg123 -RUNTIME_DEP_PKGS_CSWmplayer += CSWnas +PACKAGES = CSWmplayer-snapshot +CATALOGNAME_CSWmplayer-snapshot = mplayer_snapshot +SPKG_DESC_CSWmplayer-snapshot = $(DESCRIPTION), the player +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWfaac +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWliba52 +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWlibaa1 +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWlibaudiofile0 +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWlibesd0 +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWlibfaad2 +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWlibfribidi0 +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWlibjpeg62 +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWliblzo2-2 +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWlibmad0 +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWlibmp3lame0 +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWlibogg0 +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWlibrtmp0 +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWlibsdl1-2-0 +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWlibspeex1 +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWlibtheoradec1 +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWlibvorbis0 +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWlibvorbisenc2 +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWlibx264-133 +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWlibxvidcore4 +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWlibz1 +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWmesa +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWmpg123 +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWnas +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libGL.so +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libSDL-1.2.so.0 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libX11.so.4 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libXext.so.0 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libXinerama.so.1 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libXt.so.4 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|liba52.so.0 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libaa.so.1 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libaudio.so.2 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libbz2.so.1 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libesd.so.0 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libfaac.so.0 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libfaad.so.2 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libfontconfig.so.1 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libfreetype.so.6 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libfribidi.so.0 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libiconv.so.2 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libjpeg.so.62 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libkstat.so.1 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|liblzo2.so.2 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libmad.so.0 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libmp3lame.so.0 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libmpg123.so.0 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libogg.so.0 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libpng12.so.0 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|librtmp.so.0 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libspeex.so.1 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libtheoradec.so.1 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libvdpau.so.1 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libvorbis.so.0 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libvorbisenc.so.2 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libx264.so.133 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libxvidcore.so.4 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libz.so.1 + # only on BO build farm; on my build farm it's included and detected TODO -CHECKPKG_OVERRIDES_CSWmplayer += surplus-dependency|CSWlibaudiofile0 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += surplus-dependency|CSWlibaudiofile0 # this cannot be computed: -RUNTIME_DEP_PKGS_CSWmplayer += CSWunrar -CHECKPKG_OVERRIDES_CSWmplayer += surplus-dependency|CSWunrar +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWunrar +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += surplus-dependency|CSWunrar -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libGL.so -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libSDL-1.2.so.0 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libXt.so.4 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|liba52.so.0 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libaa.so.1 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libaudio.so.2 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libaudiofile.so.0 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libbz2.so.1 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libesd.so.0 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libfaac.so.0 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libfaad.so.2 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libfontconfig.so.1 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libfreetype.so.6 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libfribidi.so.0 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libiconv.so.2 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libjpeg.so.62 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libkstat.so.1 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|liblzo2.so.2 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libmad.so.0 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libmp3lame.so.0 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libmpg123.so.0 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libogg.so.0 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libpng12.so.0 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|librtmp.so.0 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libspeex.so.1 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libtheoradec.so.1 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libvorbis.so.0 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libvorbisenc.so.2 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libx264.so.133 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libxvidcore.so.4 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libz.so.1 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libGL.so.1 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libX11.so.4 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libXext.so.0 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libXinerama.so.1 -# these is available only for i386 and BTW is not part of our libraires -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libvdpau.so.1 # this exists only on i386 and Solaris 10 -CHECKPKG_OVERRIDES_CSWmplayer += missing-dependency|NVDAgraphics +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += missing-dependency|NVDAgraphics # this in incongruous (due to man/cat1 usage): -CHECKPKG_OVERRIDES_CSWmencoder += missing-dependency|CSWfltk +CHECKPKG_OVERRIDES_CSWmencoder-snapshot += missing-dependency|CSWfltk -PACKAGES += CSWmencoder -CATALOGNAME_CSWmencoder = mencoder -SPKG_DESC_CSWmencoder = $(DESCRIPTION), the encoder -PKGFILES_CSWmencoder += /opt/csw/bin/mencoder -PKGFILES_CSWmencoder += /opt/csw/share/man/man1/mencoder.1 -PKGFILES_CSWmencoder += /opt/csw/share/man/cat1/mencoder.1 +PACKAGES += CSWmencoder-snapshot +CATALOGNAME_CSWmencoder-snapshot = mencoder_snapshot +SPKG_DESC_CSWmencoder-snapshot = $(DESCRIPTION), the encoder +PKGFILES_CSWmencoder-snapshot += /opt/csw/bin/mencoder-snapshot +PKGFILES_CSWmencoder-snapshot += /opt/csw/share/man/man1/mencoder-snapshot.1 +PKGFILES_CSWmencoder-snapshot += /opt/csw/share/man/cat1/mencoder-snapshot.1 +ARCHALL_CSWmencoder-snapshot = 1 +RUNTIME_DEP_PKGS_CSWmencoder-snapshot += CSWmplayer-snapshot +CHECKPKG_OVERRIDES_CSWmencoder-snapshot += surplus-dependency|CSWmplayer-snapshot -RUNTIME_DEP_PKGS_CSWmencoder += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWmencoder += CSWliba52 -RUNTIME_DEP_PKGS_CSWmencoder += CSWlibfribidi0 -RUNTIME_DEP_PKGS_CSWmencoder += CSWlibxvidcore4 -RUNTIME_DEP_PKGS_CSWmencoder += CSWlibmp3lame0 -RUNTIME_DEP_PKGS_CSWmencoder += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWmencoder += CSWlibfaad2 -RUNTIME_DEP_PKGS_CSWmencoder += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWmencoder += CSWlibx264-133 -RUNTIME_DEP_PKGS_CSWmencoder += CSWlibogg0 -RUNTIME_DEP_PKGS_CSWmencoder += CSWlibjpeg62 -RUNTIME_DEP_PKGS_CSWmencoder += CSWfaac -RUNTIME_DEP_PKGS_CSWmencoder += CSWlibrtmp0 -RUNTIME_DEP_PKGS_CSWmencoder += CSWliblzo2-2 -RUNTIME_DEP_PKGS_CSWmencoder += CSWlibz1 -RUNTIME_DEP_PKGS_CSWmencoder += CSWlibvorbis0 -RUNTIME_DEP_PKGS_CSWmencoder += CSWlibtheoradec1 -RUNTIME_DEP_PKGS_CSWmencoder += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWmencoder += CSWlibvorbisenc2 -RUNTIME_DEP_PKGS_CSWmencoder += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWmencoder += CSWlibmad0 -RUNTIME_DEP_PKGS_CSWmencoder += CSWmpg123 -RUNTIME_DEP_PKGS_CSWmencoder += CSWmplayer -CHECKPKG_OVERRIDES_CSWmencoder += surplus-dependency|CSWmplayer +PACKAGES += CSWmplayer-snapshot-doc +CATALOGNAME_CSWmplayer-snapshot-doc = $(NAME)_snapshot_doc +SPKG_DESC_CSWmplayer-snapshot-doc = $(DESCRIPTION), the documentation +PKGFILES_CSWmplayer-snapshot-doc += $(docdir)/$(NAME)_snapshot_doc/.* +ARCHALL_CSWmplayer-snapshot-doc = 1 -CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|liba52.so.0 -CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libbz2.so.1 -CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfaac.so.0 -CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfaad.so.2 -CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfontconfig.so.1 -CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfreetype.so.6 -CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfribidi.so.0 -CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libiconv.so.2 -CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libjpeg.so.62 -CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libkstat.so.1 -CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|liblzo2.so.2 -CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libmad.so.0 -CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libmp3lame.so.0 -CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libmpg123.so.0 -CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libogg.so.0 -CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libpng12.so.0 -CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|librtmp.so.0 -CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libspeex.so.1 -CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libtheoradec.so.1 -CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libvorbis.so.0 -CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libvorbisenc.so.2 -CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libx264.so.133 -CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libxvidcore.so.4 -CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libz.so.1 - -PACKAGES += CSWmplayer-doc -CATALOGNAME_CSWmplayer-doc = $(NAME)_doc -SPKG_DESC_CSWmplayer-doc = $(DESCRIPTION), the documentation -PKGFILES_CSWmplayer-doc += $(docdir)/$(NAME)_doc/.* -ARCHALL_CSWmplayer-doc = 1 - include gar/category.mk PATH := /opt/csw/gnu:$(PATH) @@ -265,7 +215,8 @@ $(CPU_DETECTION) \ --disable-shm \ --prefix=$(prefix) \ - --codecsdir=$(libexecdir)/mplayer + --confdir=$(sysconfdir)/$(NAME)-snapshot \ + --codecsdir=$(libexecdir)/mplayer-snapshot $(MAKECOOKIE) build-custom: @@ -282,17 +233,25 @@ endif $(MAKECOOKIE) -post-install: thedocdir = $(docdir)/$(NAME)_doc +post-install: thedocdir = $(docdir)/$(NAME)_snapshot_doc post-install: thehtmldocdir = $(thedocdir)/html post-install: thecatmandir = $(mandir)/cat1 post-install: ginstall -d "$(DESTDIR)/$(thecatmandir)" - gnroff -Tlatin1 -mman $(WORKSRC)/DOCS/man/en/mplayer.1 > "$(DESTDIR)/$(thecatmandir)/mplayer.1" - cd "$(DESTDIR)/$(thecatmandir)" && ln -s mplayer.1 mencoder.1 + gnroff -Tlatin1 -mman $(WORKSRC)/DOCS/man/en/mplayer.1 > "$(DESTDIR)/$(thecatmandir)/mplayer-snapshot.1" + cd "$(DESTDIR)/$(thecatmandir)" && ln -s mplayer-snapshot.1 mencoder-snapshot.1 ginstall -d "$(DESTDIR)/$(thedocdir)" gtar --directory $(WORKSRC)/DOCS --create --file=- tech | \ gtar --directory $(DESTDIR)/$(thedocdir) --extract ginstall -d "$(DESTDIR)/$(thehtmldocdir)" gtar --directory $(WORKSRC)/DOCS/HTML/en --create --file=- . | \ gtar --directory $(DESTDIR)/$(thehtmldocdir) --extract + cd $(DESTDIR)/$(bindir) && \ + mv mplayer mplayer-snapshot && \ + rm -f mencoder && \ + ln -s mplayer-snapshot mencoder-snapshot + cd $(DESTDIR)/$(mandir)/man1 && \ + mv mplayer.1 mplayer-snapshot.1 && \ + rm -f mencoder.1 && \ + ln -s mplayer-snapshot.1 mencoder-snapshot.1 $(MAKECOOKIE) Modified: csw/mgar/pkg/mplayer/branches/snapshot/checksums =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/checksums 2013-12-10 14:55:19 UTC (rev 22666) +++ csw/mgar/pkg/mplayer/branches/snapshot/checksums 2013-12-10 15:26:07 UTC (rev 22667) @@ -1,2 +1,2 @@ -b76999cb6612a7f2437190541b0330fe ffmpeg-snapshot.tar.bz2 -1de8984b0ee2f3c8b070794580d9c964 mplayer-export-snapshot.tar.bz2 +4a4e158e6a9b3075018ca1d534ec625c ffmpeg-snapshot.tar.bz2 +1c11768c04eaa8ecdf017a97f51769db mplayer-export-snapshot.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Tue Dec 10 16:33:51 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Tue, 10 Dec 2013 15:33:51 +0000 Subject: SF.net SVN: gar:[22668] csw/mgar/pkg/postgresql Message-ID: Revision: 22668 http://gar.svn.sourceforge.net/gar/?rev=22668&view=rev Author: guengel Date: 2013-12-10 15:33:51 +0000 (Tue, 10 Dec 2013) Log Message: ----------- New upstream releases. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile csw/mgar/pkg/postgresql/branches/postgresql-9.1/checksums csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/changelog.CSW csw/mgar/pkg/postgresql/branches/postgresql-9.2/Makefile csw/mgar/pkg/postgresql/branches/postgresql-9.2/checksums csw/mgar/pkg/postgresql/branches/postgresql-9.2/files/changelog.CSW csw/mgar/pkg/postgresql/trunk/Makefile csw/mgar/pkg/postgresql/trunk/checksums csw/mgar/pkg/postgresql/trunk/files/changelog.CSW Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile 2013-12-10 15:26:07 UTC (rev 22667) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile 2013-12-10 15:33:51 UTC (rev 22668) @@ -90,7 +90,7 @@ BASE_VERSION = 8.4 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 18 +PATCHLEVEL = 19 VERSION = $(BASE_VERSION).$(PATCHLEVEL) PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 @@ -359,6 +359,9 @@ PKGFILES_CSWlibecpg-compat3 += .*/libecpg_compat3/changelog.CSW RUNTIME_DEP_PKGS_CSWlibecpg-compat3 = CSWlibecpg6 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpgtypes3 +# ld -z ignore issue on sparc +RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpq5 +CHECKPKG_OVERRIDES_CSWlibecpg-compat3 += surplus-dependency|CSWlibpq5 PACKAGES += CSWlibecpg6 SPKG_DESC_CSWlibecpg6 = PostgreSQL $(VERSION), libecpg Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums 2013-12-10 15:26:07 UTC (rev 22667) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums 2013-12-10 15:33:51 UTC (rev 22668) @@ -1 +1 @@ -b5786d737b13f9fa687bf82e923b766d postgresql-8.4.18.tar.bz2 +62ddb68a7ec542abf7089afb91237198 postgresql-8.4.19.tar.bz2 Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW 2013-12-10 15:26:07 UTC (rev 22667) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW 2013-12-10 15:33:51 UTC (rev 22668) @@ -1,3 +1,10 @@ +postgresql84 (8.4.19,REV=2013.12.10) + + * New upstream release 8.4.19. + + -- Rafael Ostertag Tue, 10 Dec 2013 16:28:13 +0100 + + postgresql84 (8.4.18,REV=2013.10.21) * New upstream release 8.4.18. Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2013-12-10 15:26:07 UTC (rev 22667) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2013-12-10 15:33:51 UTC (rev 22668) @@ -90,7 +90,7 @@ BASE_VERSION = 9.0 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 14 +PATCHLEVEL = 15 VERSION = $(BASE_VERSION).$(PATCHLEVEL) PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 @@ -356,6 +356,9 @@ PKGFILES_CSWlibecpg-compat3 += .*/libecpg_compat3/changelog.CSW RUNTIME_DEP_PKGS_CSWlibecpg-compat3 = CSWlibecpg6 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpgtypes3 +# ld -z ignore issue on sparc +RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpq5 +CHECKPKG_OVERRIDES_CSWlibecpg-compat3 += surplus-dependency|CSWlibpq5 PACKAGES += CSWlibecpg6 SPKG_DESC_CSWlibecpg6 = PostgreSQL $(VERSION), libecpg Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums 2013-12-10 15:26:07 UTC (rev 22667) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums 2013-12-10 15:33:51 UTC (rev 22668) @@ -1 +1 @@ -efd374d5ce697aba781d1bf31b5f9b85 postgresql-9.0.14.tar.bz2 +1bd7f659c4f68e5fc23511c6952b494b postgresql-9.0.15.tar.bz2 Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW 2013-12-10 15:26:07 UTC (rev 22667) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW 2013-12-10 15:33:51 UTC (rev 22668) @@ -1,3 +1,10 @@ +postgresql90 (9.0.15,REV=2013.12.10) + + * New upstream release 9.0.15. + + -- Rafael Ostertag Tue, 10 Dec 2013 16:28:13 +0100 + + postgresql90 (9.0.14,REV=2013.10.21) * New upstream release 9.0.14. Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile 2013-12-10 15:26:07 UTC (rev 22667) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile 2013-12-10 15:33:51 UTC (rev 22668) @@ -90,7 +90,7 @@ BASE_VERSION = 9.1 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 10 +PATCHLEVEL = 11 VERSION = $(BASE_VERSION).$(PATCHLEVEL) GARTYPE = v2 @@ -407,6 +407,9 @@ PKGFILES_CSWlibecpg-compat3 += .*/libecpg_compat3/changelog.CSW RUNTIME_DEP_PKGS_CSWlibecpg-compat3 = CSWlibecpg6 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpgtypes3 +# ld -z ignore issue on sparc +RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpq5 +CHECKPKG_OVERRIDES_CSWlibecpg-compat3 += surplus-dependency|CSWlibpq5 PACKAGES += CSWlibecpg6 SPKG_DESC_CSWlibecpg6 = PostgreSQL $(VERSION), libecpg Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.1/checksums 2013-12-10 15:26:07 UTC (rev 22667) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.1/checksums 2013-12-10 15:33:51 UTC (rev 22668) @@ -1 +1 @@ -1af18f12bca0796a05dca280cb3e9410 postgresql-9.1.10.tar.bz2 +863caa3d9f57ab3cd031fd06f497e1b6 postgresql-9.1.11.tar.bz2 Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/changelog.CSW 2013-12-10 15:26:07 UTC (rev 22667) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/changelog.CSW 2013-12-10 15:33:51 UTC (rev 22668) @@ -1,3 +1,10 @@ +postgresql91 (9.1.11,REV=2013.12.10) + + * New upstream release 9.1.11. + + -- Rafael Ostertag Tue, 10 Dec 2013 16:28:13 +0100 + + postgresql91 (9.1.10,REV=2013.10.21) * New upstream release 9.1.10. Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.2/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.2/Makefile 2013-12-10 15:26:07 UTC (rev 22667) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.2/Makefile 2013-12-10 15:33:51 UTC (rev 22668) @@ -90,7 +90,7 @@ BASE_VERSION = 9.2 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 5 +PATCHLEVEL = 6 VERSION = $(BASE_VERSION).$(PATCHLEVEL) GARTYPE = v2 @@ -413,6 +413,9 @@ PKGFILES_CSWlibecpg-compat3 += .*/libecpg_compat3/changelog.CSW RUNTIME_DEP_PKGS_CSWlibecpg-compat3 = CSWlibecpg6 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpgtypes3 +# ld -z ignore issue on sparc +RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpq5 +CHECKPKG_OVERRIDES_CSWlibecpg-compat3 += surplus-dependency|CSWlibpq5 PACKAGES += CSWlibecpg6 SPKG_DESC_CSWlibecpg6 = PostgreSQL $(VERSION), libecpg Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.2/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.2/checksums 2013-12-10 15:26:07 UTC (rev 22667) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.2/checksums 2013-12-10 15:33:51 UTC (rev 22668) @@ -1 +1 @@ -e8438e0ed5e6371741be7697886e7340 postgresql-9.2.5.tar.bz2 +3e68c0c7468c56f73060a88a377dbde8 postgresql-9.2.6.tar.bz2 Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.2/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.2/files/changelog.CSW 2013-12-10 15:26:07 UTC (rev 22667) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.2/files/changelog.CSW 2013-12-10 15:33:51 UTC (rev 22668) @@ -1,3 +1,10 @@ +postgresql92 (9.2.6,REV=2013.12.10) + + * New upstream release 9.2.6. + + -- Rafael Ostertag Tue, 10 Dec 2013 16:28:13 +0100 + + postgresql92 (9.2.5,REV=2013.10.21) * New upstream release 9.2.5. Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2013-12-10 15:26:07 UTC (rev 22667) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2013-12-10 15:33:51 UTC (rev 22668) @@ -90,7 +90,7 @@ BASE_VERSION = 9.3 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 1 +PATCHLEVEL = 2 VERSION = $(BASE_VERSION).$(PATCHLEVEL) GARTYPE = v2 GARCOMPILER = SOS12U3 @@ -438,6 +438,9 @@ PKGFILES_CSWlibecpg-compat3 += .*/libecpg_compat3/changelog.CSW RUNTIME_DEP_PKGS_CSWlibecpg-compat3 = CSWlibecpg6 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpgtypes3 +# ld -z ignore issue on sparc +RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpq5 +CHECKPKG_OVERRIDES_CSWlibecpg-compat3 += surplus-dependency|CSWlibpq5 PACKAGES += CSWlibecpg6 SPKG_DESC_CSWlibecpg6 = PostgreSQL $(VERSION), libecpg Modified: csw/mgar/pkg/postgresql/trunk/checksums =================================================================== --- csw/mgar/pkg/postgresql/trunk/checksums 2013-12-10 15:26:07 UTC (rev 22667) +++ csw/mgar/pkg/postgresql/trunk/checksums 2013-12-10 15:33:51 UTC (rev 22668) @@ -1 +1 @@ -c003d871f712d4d3895956b028a96e74 postgresql-9.3.1.tar.bz2 +8c905155e3e9f9367b4299a9acb41d2a postgresql-9.3.2.tar.bz2 Modified: csw/mgar/pkg/postgresql/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/changelog.CSW 2013-12-10 15:26:07 UTC (rev 22667) +++ csw/mgar/pkg/postgresql/trunk/files/changelog.CSW 2013-12-10 15:33:51 UTC (rev 22668) @@ -1,3 +1,10 @@ +postgresql93 (9.3.2,REV=2013.12.10) + + * New upstream release 9.3.2. + + -- Rafael Ostertag Tue, 10 Dec 2013 16:28:13 +0100 + + postgresql93 (9.3.1,REV=2013.10.22) * New upstream release 9.3.1. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Tue Dec 10 18:11:59 2013 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Tue, 10 Dec 2013 17:11:59 +0000 Subject: SF.net SVN: gar:[22669] csw/mgar/pkg/lang-python Message-ID: Revision: 22669 http://gar.svn.sourceforge.net/gar/?rev=22669&view=rev Author: opk Date: 2013-12-10 17:11:58 +0000 (Tue, 10 Dec 2013) Log Message: ----------- add ZConfig which was previously there as part of CSWzope Added Paths: ----------- csw/mgar/pkg/lang-python/ZConfig/ csw/mgar/pkg/lang-python/ZConfig/Makefile csw/mgar/pkg/lang-python/ZConfig/branches/ csw/mgar/pkg/lang-python/ZConfig/tags/ csw/mgar/pkg/lang-python/ZConfig/trunk/ csw/mgar/pkg/lang-python/ZConfig/trunk/Makefile csw/mgar/pkg/lang-python/ZConfig/trunk/checksums csw/mgar/pkg/lang-python/ZConfig/trunk/files/ Added: csw/mgar/pkg/lang-python/ZConfig/Makefile =================================================================== --- csw/mgar/pkg/lang-python/ZConfig/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/ZConfig/Makefile 2013-12-10 17:11:58 UTC (rev 22669) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Added: csw/mgar/pkg/lang-python/ZConfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/ZConfig/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/ZConfig/trunk/Makefile 2013-12-10 17:11:58 UTC (rev 22669) @@ -0,0 +1,31 @@ +# $Id$ +NAME = ZConfig +VERSION = 3.0.3 +CATEGORIES = python +GARTYPE = v2 + +DESCRIPTION = Structured Configuration Library +define BLURB + ZConfig is a configuration library intended for general use. It supports a + hierarchical schema-driven configuration model that allows a schema to specify + data conversion routines written in Python. ZConfig's model is very different + from the model supported by the ConfigParser module found in Python's standard + library, and is more suitable to configuration-intensive applications. +endef + +MASTER_SITES = http://pypi.python.org/packages/source/Z/ZConfig/ +DISTFILES = $(NAME)-$(VERSION).tar.gz +PACKAGES = CSWpy-zconfig +CATALOGNAME = py_zconfig + +LICENSE = LICENSE.txt +ARCHALL = 1 + +# tests need zope.testrunner +TEST_SCRIPTS = + +# /usr/local is only an example here +CHECKPKG_OVERRIDES_CSWpy-zconfig += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ZConfig-3.0.3-py2.6.egg-info/PKG-INFO +CHECKPKG_OVERRIDES_CSWpy-zconfig += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ZConfig-3.0.3-py2.7.egg-info/PKG-INFO + +include gar/category.mk Added: csw/mgar/pkg/lang-python/ZConfig/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/ZConfig/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/ZConfig/trunk/checksums 2013-12-10 17:11:58 UTC (rev 22669) @@ -0,0 +1 @@ +60a107c5857c3877368dfe5930559804 ZConfig-3.0.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Dec 10 19:29:20 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 10 Dec 2013 18:29:20 +0000 Subject: SF.net SVN: gar:[22670] csw/mgar/pkg/mplayer/branches/snapshot/Makefile Message-ID: Revision: 22670 http://gar.svn.sourceforge.net/gar/?rev=22670&view=rev Author: pfelecan Date: 2013-12-10 18:29:20 +0000 (Tue, 10 Dec 2013) Log Message: ----------- mplayer/branches/snapshot: a forgotten override Modified Paths: -------------- csw/mgar/pkg/mplayer/branches/snapshot/Makefile Modified: csw/mgar/pkg/mplayer/branches/snapshot/Makefile =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-12-10 17:11:58 UTC (rev 22669) +++ csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-12-10 18:29:20 UTC (rev 22670) @@ -152,6 +152,7 @@ CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libx264.so.133 CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libxvidcore.so.4 CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libz.so.1 +CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libGL.so.1 # only on BO build farm; on my build farm it's included and detected TODO CHECKPKG_OVERRIDES_CSWmplayer-snapshot += surplus-dependency|CSWlibaudiofile0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Dec 10 19:32:00 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 10 Dec 2013 18:32:00 +0000 Subject: SF.net SVN: gar:[22671] csw/mgar/pkg/cpan Message-ID: Revision: 22671 http://gar.svn.sourceforge.net/gar/?rev=22671&view=rev Author: bonivart Date: 2013-12-10 18:31:59 +0000 (Tue, 10 Dec 2013) Log Message: ----------- cpan/DateTime-Event-ICal/trunk: first commit Added Paths: ----------- csw/mgar/pkg/cpan/DateTime-Event-ICal/ csw/mgar/pkg/cpan/DateTime-Event-ICal/Makefile csw/mgar/pkg/cpan/DateTime-Event-ICal/branches/ csw/mgar/pkg/cpan/DateTime-Event-ICal/tags/ csw/mgar/pkg/cpan/DateTime-Event-ICal/trunk/ csw/mgar/pkg/cpan/DateTime-Event-ICal/trunk/Makefile csw/mgar/pkg/cpan/DateTime-Event-ICal/trunk/checksums csw/mgar/pkg/cpan/DateTime-Event-ICal/trunk/files/ Added: csw/mgar/pkg/cpan/DateTime-Event-ICal/Makefile =================================================================== --- csw/mgar/pkg/cpan/DateTime-Event-ICal/Makefile (rev 0) +++ csw/mgar/pkg/cpan/DateTime-Event-ICal/Makefile 2013-12-10 18:31:59 UTC (rev 22671) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/cpan/DateTime-Event-ICal/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/DateTime-Event-ICal/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DateTime-Event-ICal/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/DateTime-Event-ICal/trunk/Makefile 2013-12-10 18:31:59 UTC (rev 22671) @@ -0,0 +1,18 @@ +NAME = DateTime-Event-ICal +VERSION = 0.11 +GARTYPE = v2 +CATEGORIES = cpan +AUTHOR = FGLOCK + +DESCRIPTION = Perl DateTime extension for computing rfc2445 recurrences + +PACKAGES = CSWpm-datetime-event-ical +ARCHALL = 1 + +RUNTIME_DEP_PKGS += CSWpm-datetime +RUNTIME_DEP_PKGS += CSWpm-datetime-event-recurrence + +CONFIGURE_ARGS = + +include gar/category.mk + Property changes on: csw/mgar/pkg/cpan/DateTime-Event-ICal/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/cpan/DateTime-Event-ICal/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/DateTime-Event-ICal/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/DateTime-Event-ICal/trunk/checksums 2013-12-10 18:31:59 UTC (rev 22671) @@ -0,0 +1 @@ +aea95965715c4e438fe981a5407e1328 DateTime-Event-ICal-0.11.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Dec 10 20:05:08 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 10 Dec 2013 19:05:08 +0000 Subject: SF.net SVN: gar:[22672] csw/mgar/pkg/mplayer/branches/snapshot/Makefile Message-ID: Revision: 22672 http://gar.svn.sourceforge.net/gar/?rev=22672&view=rev Author: pfelecan Date: 2013-12-10 19:05:07 +0000 (Tue, 10 Dec 2013) Log Message: ----------- mplayer/branches/snapshot: mediaLib activation Modified Paths: -------------- csw/mgar/pkg/mplayer/branches/snapshot/Makefile Modified: csw/mgar/pkg/mplayer/branches/snapshot/Makefile =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-12-10 18:31:59 UTC (rev 22671) +++ csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-12-10 19:05:07 UTC (rev 22672) @@ -214,6 +214,7 @@ --extra-cflags='-std=gnu99' \ --extra-ldflags='-lrt' \ $(CPU_DETECTION) \ + --enable-mlib \ --disable-shm \ --prefix=$(prefix) \ --confdir=$(sysconfdir)/$(NAME)-snapshot \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Dec 11 12:18:03 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 11 Dec 2013 11:18:03 +0000 Subject: SF.net SVN: gar:[22673] csw/mgar/pkg/mplayer/trunk Message-ID: Revision: 22673 http://gar.svn.sourceforge.net/gar/?rev=22673&view=rev Author: pfelecan Date: 2013-12-11 11:18:03 +0000 (Wed, 11 Dec 2013) Log Message: ----------- mplayer/trunk: instantiate again the release/stable version Modified Paths: -------------- csw/mgar/pkg/mplayer/trunk/Makefile csw/mgar/pkg/mplayer/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mplayer/trunk/files/0001-configure-uses-bash.patch csw/mgar/pkg/mplayer/trunk/files/0002-version-uses-bash.patch csw/mgar/pkg/mplayer/trunk/files/0003-use-csw-catalog-for-documentation.patch csw/mgar/pkg/mplayer/trunk/files/0004-test-sse-support.patch csw/mgar/pkg/mplayer/trunk/files/0005-enhance-X-Windows-detection.patch csw/mgar/pkg/mplayer/trunk/files/0006-fix-memalign-detection.patch csw/mgar/pkg/mplayer/trunk/files/0007-fix-memalign-prototype.patch csw/mgar/pkg/mplayer/trunk/files/0008-ffmpeg-script-uses-bash.patch Modified: csw/mgar/pkg/mplayer/trunk/Makefile =================================================================== --- csw/mgar/pkg/mplayer/trunk/Makefile 2013-12-10 19:05:07 UTC (rev 22672) +++ csw/mgar/pkg/mplayer/trunk/Makefile 2013-12-11 11:18:03 UTC (rev 22673) @@ -1,349 +1,281 @@ -# $Id$ -# -##Mplayer and $ISAEXEC makefile example### -# -# This makefile has a lot of notes and extra information in it, as I've been -# using it as documentation while working away at this project. It will be -# tidied up before I submit it for official review. +# $Id: Makefile 22672 2013-12-10 19:05:07Z pfelecan $ -NAME = MPlayer -VERSION = 1.0rc2 -VERSION_Blue = 1.7 -GARTYPE = v2 +NAME = mplayer +ALIAS = MPlayer +VERSION = 1.1.1 +GARTYPE = v2 -DESCRIPTION = MPlayer is a movie player which runs on many systems +DESCRIPTION = Stable Release of The Movie Player and Encoder define BLURB + MPlayer can play most standard video formats out of the box and + almost all others with the help of external codecs. MPlayer + currently works best from the command line, but visual feedback + for many functions is available from its onscreen status display + (OSD), which is also used for displaying subtitles. MPlayer also + has a GUI with skin support and several unofficial alternative + graphical frontends are available. - MPlayer is a movie player which runs on many systems (see the documentation). - It plays most MPEG/VOB, AVI, Ogg/OGM, VIVO, ASF/WMA/WMV, QT/MOV/MP4, - RealMedia, Matroska, NUT, NuppelVideo, FLI, YUV4MPEG, FILM, RoQ, PVA files, - supported by many native, XAnim, and Win32 DLL codecs. You can watch VideoCD, - SVCD, DVD, 3ivx, DivX 3/4/5 and even WMV movies.. - + MEncoder is a command line video encoder for advanced users that + can be built from the MPlayer source tree. Unofficial graphical + frontends exist but are not included. endef -MASTER_SITES = http://www3.mplayerhq.hu/MPlayer/releases/ http://www3.mplayerhq.hu/MPlayer/skins/ +VENDOR_URL = http://www.mplayerhq.hu/MPlayer/ +MASTER_SITES = http://www.mplayerhq.hu/MPlayer/releases/ +DISTFILES = $(ALIAS)-$(VERSION).tar.xz +DISTNAME = $(ALIAS)-$(VERSION) +PATCHFILES += 0001-configure-uses-bash.patch +PATCHFILES += 0002-version-uses-bash.patch +PATCHFILES += 0003-use-csw-catalog-for-documentation.patch +PATCHFILES += 0004-test-sse-support.patch +PATCHFILES += 0005-enhance-X-Windows-detection.patch +PATCHFILES += 0006-fix-memalign-detection.patch +PATCHFILES += 0007-fix-memalign-prototype.patch +PATCHFILES += 0008-ffmpeg-script-uses-bash.patch -GARCOMPILER = GCC4 -GNU_CC_HOME = /opt/csw/gcc4 +PACKAGING_PLATFORMS = solaris10-sparc +PACKAGING_PLATFORMS += solaris10-i386 -DISTFILES = $(NAME)-$(VERSION).tar.bz2 -DISTFILES += Blue-$(VERSION_Blue).tar.bz2 +BUILD_DEP_PKGS += CSWdocbookdtds +BUILD_DEP_PKGS += CSWdocbookxsl +BUILD_DEP_PKGS += CSWfaac +BUILD_DEP_PKGS += CSWfontconfig-dev +BUILD_DEP_PKGS += CSWgroff +BUILD_DEP_PKGS += CSWliba52 +BUILD_DEP_PKGS += CSWlibaa-dev +BUILD_DEP_PKGS += CSWlibaudiofile-dev +BUILD_DEP_PKGS += CSWlibdvdcss-dev +BUILD_DEP_PKGS += CSWlibdvdnav-dev +BUILD_DEP_PKGS += CSWlibdvdread-dev +BUILD_DEP_PKGS += CSWlibfaad-dev +BUILD_DEP_PKGS += CSWlibfreetype-dev +BUILD_DEP_PKGS += CSWlibfribidi-dev +BUILD_DEP_PKGS += CSWlibgif-dev +BUILD_DEP_PKGS += CSWlibiconv-dev +BUILD_DEP_PKGS += CSWlibjpeg-dev +BUILD_DEP_PKGS += CSWliblz-dev +BUILD_DEP_PKGS += CSWliblzo-dev +BUILD_DEP_PKGS += CSWlibmad-dev +BUILD_DEP_PKGS += CSWlibmp3lame-dev +BUILD_DEP_PKGS += CSWlibncurses-dev +BUILD_DEP_PKGS += CSWlibogg-dev +BUILD_DEP_PKGS += CSWliboggz-dev +BUILD_DEP_PKGS += CSWlibpng-dev +BUILD_DEP_PKGS += CSWlibrtmp-dev +BUILD_DEP_PKGS += CSWlibsdl-dev +BUILD_DEP_PKGS += CSWlibspeex-dev +BUILD_DEP_PKGS += CSWlibtheora-dev +BUILD_DEP_PKGS += CSWlibx264-dev +BUILD_DEP_PKGS += CSWlibxvidcore-dev +BUILD_DEP_PKGS += CSWmesa +BUILD_DEP_PKGS += CSWmpg123 +BUILD_DEP_PKGS += CSWnas +BUILD_DEP_PKGS += CSWunrar +BUILD_DEP_PKGS += CSWlibxmms-dev +BUILD_DEP_PKGS += CSWyasm -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 -LICENSE = LICENSE +GARCOMPILER = GNU -PACKAGES = CSWmplayer -CATALOGNAME_CSWmplayer = mplayer +# 2 packages: mplayer, mencoder; separate recipe for codec, fonts and +# skin -EXTRA_INC = $(prefix)/X11/include -EXTRA_LIB = $(prefix)/X11/lib +CONFIGURE_SCRIPTS = custom +BUILD_SCRIPTS = custom +TEST_SCRIPTS = custom -RUNTIME_DEP_PKGS_CSWmplayer += CSWaalib -RUNTIME_DEP_PKGS_CSWmplayer += CSWesound -RUNTIME_DEP_PKGS_CSWmplayer += CSWfaac -RUNTIME_DEP_PKGS_CSWmplayer += CSWfconfig -RUNTIME_DEP_PKGS_CSWmplayer += CSWftype2 -RUNTIME_DEP_PKGS_CSWmplayer += CSWgiflibrt -RUNTIME_DEP_PKGS_CSWmplayer += CSWglib -RUNTIME_DEP_PKGS_CSWmplayer += CSWgtk -RUNTIME_DEP_PKGS_CSWmplayer += CSWiconv -RUNTIME_DEP_PKGS_CSWmplayer += CSWjpeg -RUNTIME_DEP_PKGS_CSWmplayer += CSWlame -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibmad -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibogg -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibx11 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibxext -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibxt -RUNTIME_DEP_PKGS_CSWmplayer += CSWmesa -RUNTIME_DEP_PKGS_CSWmplayer += CSWnas -RUNTIME_DEP_PKGS_CSWmplayer += CSWncurses -RUNTIME_DEP_PKGS_CSWmplayer += CSWopenal -RUNTIME_DEP_PKGS_CSWmplayer += CSWpng -RUNTIME_DEP_PKGS_CSWmplayer += CSWspeex -RUNTIME_DEP_PKGS_CSWmplayer += CSWtheora -RUNTIME_DEP_PKGS_CSWmplayer += CSWzlib +PACKAGES = CSWmplayer +CATALOGNAME_CSWmplayer = mplayer +SPKG_DESC_CSWmplayer = $(DESCRIPTION), the player +RUNTIME_DEP_PKGS_CSWmplayer += CSWfaac +RUNTIME_DEP_PKGS_CSWmplayer += CSWliba52 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibaa1 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibaudiofile0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibesd0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfaad2 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfribidi0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWmplayer += CSWliblzo2-2 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibmad0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibmp3lame0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibogg0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibrtmp0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibsdl1-2-0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibspeex1 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibtheoradec1 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibx264-133 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibxvidcore4 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibz1 +RUNTIME_DEP_PKGS_CSWmplayer += CSWmesa +RUNTIME_DEP_PKGS_CSWmplayer += CSWmpg123 +RUNTIME_DEP_PKGS_CSWmplayer += CSWnas -BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWmplayer) -BUILD_DEP_PKGS += CSWgnulinks +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libGL.so +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libSDL-1.2.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libX11.so.4 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libXext.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libXinerama.so.1 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libXt.so.4 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|liba52.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libaa.so.1 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libaudio.so.2 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libesd.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libfaac.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libfaad.so.2 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libfontconfig.so.1 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libfreetype.so.6 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libfribidi.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libiconv.so.2 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libkstat.so.1 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|liblzo2.so.2 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libmad.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libmp3lame.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libmpg123.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libogg.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|librtmp.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libspeex.so.1 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libtheoradec.so.1 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libvdpau.so.1 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libx264.so.133 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libxvidcore.so.4 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libz.so.1 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libGL.so.1 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libbz2.so.1.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libjpeg.so.7 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libpng15.so.15 -PATCHFILES = fix-configure.diff -PATCHFILES += fix-libavcodec-gcc-bug.diff -PATCHFILES += fix-manpage-macros.diff -PATCHFILES += sparc-v8-novis.diff -#Sol8 only PATCHFILES += stdint-wrapper.diff +# only on BO build farm; on my build farm it's included and detected TODO +CHECKPKG_OVERRIDES_CSWmplayer += surplus-dependency|CSWlibaudiofile0 -UNWANTED_CONF_ARGS = --sysconfdir=/opt/csw/etc --sbindir=/opt/csw/sbin --exec_prefix=/opt/csw --libexecdir=/opt/csw/libexec -UNWANTED_CONF_ARGS += --sharedstatedir=/opt/csw/share -UNWANTED_CONF_ARGS += --localstatedir=/opt/csw/var -UNWANTED_CONF_ARGS += --infodir=/opt/csw/share/info -UNWANTED_CONF_ARGS += --includedir=/opt/csw/include -UNWANTED_CONF_ARGS += --sbindir=/opt/csw/sbin/amd64 -UNWANTED_CONF_ARGS += --libexecdir=/opt/csw/libexec/amd64 +# this cannot be computed: +RUNTIME_DEP_PKGS_CSWmplayer += CSWunrar +CHECKPKG_OVERRIDES_CSWmplayer += surplus-dependency|CSWunrar -CONFIGURE_ARGS = $(filter-out $(UNWANTED_CONF_ARGS),$(DIRPATHS)) -CONFIGURE_ARGS += --with-extraincdir=/opt/csw/X11/include -CONFIGURE_ARGS += --mandir=$(BUILD_PREFIX)/share/man -CONFIGURE_ARGS += --enable-gui -CONFIGURE_ARGS += --disable-win32dll -CONFIGURE_ARGS += --disable-libvorbis #Having trouble compiling it +# this exists only on i386 and Solaris 10 +CHECKPKG_OVERRIDES_CSWmplayer += missing-dependency|NVDAgraphics +# this in incongruous (due to man/cat1 usage): +CHECKPKG_OVERRIDES_CSWmencoder += missing-dependency|CSWfltk -NO_MMX_ARGS += --disable-sse -NO_MMX_ARGS += --disable-sse2 -NO_MMX_ARGS += --disable-ssse3 -NO_MMX_ARGS += --disable-mmx -NO_MMX_ARGS += --disable-mmxext -CONFIGURE_ARGS_isa-i386 += $(NO_MMX_ARGS) -CONFIGURE_ARGS_isa-amd64 += $(NO_MMX_ARGS) -CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) -#CONFIGURE_ARGS += --disable-libcdio -#CONFIGURE_ARGS += --disable-iconv #Solaris libc has iconv already +PACKAGES += CSWmencoder +CATALOGNAME_CSWmencoder = mencoder +SPKG_DESC_CSWmencoder = $(DESCRIPTION), the encoder +PKGFILES_CSWmencoder += /opt/csw/bin/mencoder +PKGFILES_CSWmencoder += /opt/csw/share/man/man1/mencoder.1 +PKGFILES_CSWmencoder += /opt/csw/share/man/cat1/mencoder.1 +RUNTIME_DEP_PKGS_CSWmencoder += CSWmplayer +CHECKPKG_OVERRIDES_CSWmencoder += surplus-dependency|CSWmplayer +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibogg0 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibfribidi0 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibxvidcore4 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibmp3lame0 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibspeex1 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibfaad2 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibx264-133 +RUNTIME_DEP_PKGS_CSWmencoder += CSWliba52 +RUNTIME_DEP_PKGS_CSWmencoder += CSWfaac +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibrtmp0 +RUNTIME_DEP_PKGS_CSWmencoder += CSWliblzo2-2 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibz1 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibtheoradec1 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibmad0 +RUNTIME_DEP_PKGS_CSWmencoder += CSWmpg123 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|liba52.so.0 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libbz2.so.1.0 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfaac.so.0 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfaad.so.2 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfontconfig.so.1 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfreetype.so.6 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfribidi.so.0 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libiconv.so.2 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libjpeg.so.7 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libkstat.so.1 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|liblzo2.so.2 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libmad.so.0 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libmp3lame.so.0 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libmpg123.so.0 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libogg.so.0 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libpng15.so.15 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|librtmp.so.0 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libspeex.so.1 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libtheoradec.so.1 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libx264.so.133 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libxvidcore.so.4 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libz.so.1 -# Mplayer sparc-specific patches -# Openal for sparc is broken -# OpenGL isn't working on osiris -ifeq ($(shell uname -p),sparc) -CONFIGURE_ARGS += --disable-openal -CONFIGURE_ARGS += --disable-gl -endif +PACKAGES += CSWmplayer-doc +CATALOGNAME_CSWmplayer-doc = $(NAME)_doc +SPKG_DESC_CSWmplayer-doc = $(DESCRIPTION), the documentation +PKGFILES_CSWmplayer-doc += $(docdir)/$(NAME)_doc/.* +ARCHALL_CSWmplayer-doc = 1 -# Fails in amd64 -# BUILD64 = 1 - -TEST_SCRIPTS = - -###Framework for an $ISAEXEC optimised build### -# To allow for the same build to run multiple times without each version -# clobbering the non-unique work/cookie folders each time, we append the -# target $ISA to each foldername. -# -# 1) gmake optbuild: runs the standard gar framework through the optbuild for -# loop. This loop allows for each of the targets in $ISATARGET to be built -# using the appropriate compiler flags for optimisation. -# The optbuild target takes us to the end of the install step. -# When all the building is done, we're going to only want the one package, -# (not N versions). All the resultant binaries from each $ISATARGET are -# merged into the $BASEISA $DESTDIR by the merge-opt-bins target. -# It's this $BASEISA that will be used for the final resultant ISAEXEC pkg -# -# Gar currently merges and overlaps the install & package targets. -# We want the install phase to be run in a for loop, but the package -# phase to run only once (on our $BASEISA), so I've had to explictly -# split the phases. -# -# 2) gmake only-package: Runs the standard packing steps on the $BASEISA -# install dir ($DESTDIR), however I've run into a problem with the -# mkpackage perl script's handling of the prototype file; we need it to -# merge both our standard directory structure, and also the added isaexec -# hardlinks. -# The isa-post-package step adds the appropriate lines to the prototype -# however mkpackage will then either 1) overwrite it anyway, or -# 2) in merge mode, it will take our 2 isaexec lines, and only append -# those 2 lines (ignoring all the standard files in our package). -# -# My sneaky workaround for this is to add the extra lines in the -# isa-post-package target, followed by re-running the package-create step. -# The package-create target the prototype already contains a full -# file/dir layout and our isaexec hardlink(s), so mkpackage simply -# merges(appends) the key isaexec links. -# In fact, the admfiles are actually already there (from the first trip -# through package-create), but mkpackage is smart enough to remove the -# duplicate lines! :) - -### Makefile target order ### -# 1) "gmake optbuild" runs the following gar steps on each of the $ISALIST -# build (and all of it's dependanies - extract/patch/etc etc) -# pre-install (calls timestamp, skins, fonts, and merge-opt-bins) -# ===> timestamp (creates timestamp to track the new files for packaging) -# ===> skins (copies the Mplayer skins into the install dirs) -# ===> fonts (creates a symlink for the Mplayer OSD font) -# ===> merge-opt-bins (Moves the optimised $ISAEXEC_BINS from $ISALIST -# into the appropriate $ISAEXEC_DIR within the $BASEISA) -# install (standard install target) -# post-install (calls strip/fixconfig) -# The $BASISA $DESTDIR now contain all ISAEXEC'ed bins, in the correct layout, -# reading for packaging. -# -# 2) gmake only-package (which won't run through the optbuild loop) will just -# act apon the $BASEISA. It will run the following steps: -# pre-package (empty) -# package-create (creates the package as per normal) -# post-package (Sneakily adds the isaexec symlinks, and reruns package-create) -# package-check (Standard target) - - -# Gar uses the $DESTIMG variable to create these directory names, so we need to -# change that variable to reflect a unique $ISATARGET name. -# $DESTDIR is where the package is installed to prior to packaging. We also -# need to make this directory name unique for each $ISA. -# $DESTDIR is defined in the core GAR makefile, which hasn't been included yet, -# so I have to set this variable after the main include. - -# Disabling for non-isaexec build, it breaks the depend generation path -# DESTIMG=$(NAME)-$(ISA) - -###Optimisation section### -# -# This gar package builds a plain non-optimised version of Mplayer by default. -# To build the fully optimised $ISAEXEC version use "gmake optbuild" -# -# $ISATARGETS represents the optimised cpu targets. -# These targets can be used in a couple of ways. We need to feed a desired -# optimisation target into our compiler, but we also need to create and copy -# the binaries into the `isalist` dir structure for the final install layout. -# -# Unfortunately for GCC at least, these names don't match, and 64-bit is even -# worse. -# -# $BASEISA is used for the base build, and for legacy use with plain "gmake". -# The $BASEISA represents the minimum optimisation level, but it's also used as -# the base (master) template for creating the package. All other $ISATARGET -# builds will have their binaries and libraries copied into the $BASEISA -# install dir, prior to final packaging. -# -# In theory, I should be able to just use the first string in $ISATARGET. -# Need to work out if Makefiles support this function. - -# ifeq ($(shell uname -p),i386) -# ISATARGETS ?= pentium pentium-mmx pentium2 -# BASEISA ?= pentium -# else -# ISATARGETS ?= v8 ultrasparc ultrasparc3 -# BASEISA ?= v8 -# endif - -# Mapping -# Do Makefiles have a concept of a hash table for matching these? -# $ISAEXEC name: | GCC mtune name: -# pentium=pentium -# pentium+mmx=pentium-mmx -# pentium_pro+mmx=pentium2 -# 64-bit is athlon=amd64 but I expect -m64 will be what we're after. - -## #If statement for gcc needed here! -## pentium_dir = pentium -## pentium-mmx_dir = pentium+mmx -## pentium2_dir = pentium_pro+mmx -## -## #Sparc -## v8_dir = sparcv8 -## # ?? = sparcv8plus -## # ?? = sparcv8plus+vis -## ultrasparc_dir = sparcv9 -## ultrasparc3_dir = sparcv9+vis -## #v9_dir = sparcv9+vis2 - - -# ISAEXEC_DIR = $($(ISA)_dir) - -# If you just typed gmake, this will build the stardard BASEISA build. -# For a single optimised build use gmake ISA=your-target-here. -# For all optimised versions ($ISAEXEC), use gmake optbuild -# ISA ?= $(BASEISA) - -#Which binaries do you want to use $ISAEXEC for? -# Note: These must be the full paths! -# ISAEXEC_BINS = opt/csw/bin/mplayer opt/csw/bin/mencoder - - -# Inclue all standard GAR variables and functionality from here onward: include gar/category.mk -# See earlier, we needed to set this VAR _after_ the category.mk include -# BASE_DESTDIR :=$(DESTDIR)-$(BASEISA) -# DESTDIR := $(DESTDIR)-$(ISA) +PATH := /opt/csw/gnu:$(PATH) -####Mplayer specific optimisation notes#### +# - configure is not configure ! +# - must use internal dvdnav as our library is not a snapshot and +# mplayer uses new primitives +# - run-time CPU detection is not implemented only for SPARC +# - disable shared memory, used only for X11, which, in Solaris 10 +# extensions doesn't support all the required primitives, +# e.g. XShmGetEventBase -# Mplayer uses -mtune, not -march +ifneq ($(GARCH),sparc) +CPU_DETECTION =--enable-runtime-cpudetection +else +CPU_DETECTION = +endif -## # Compiler options -## ifeq ($(GARCH),i386) -## ifeq ($(ISA),amd64) -## CFLAGS = -O2 -pipe -mtune=opteron -## else -## CFLAGS = -O2 -pipe -mtune=$(ISA) -## endif -## else # I.E sparc -## CFLAGS = -O2 -pipe -mcpu=$(ISA) -## endif +configure-custom: + cd $(WORKSRC) && \ + ./configure \ + --cc=gcc \ + --host-cc=gcc \ + --extra-cflags='-std=gnu99' \ + --extra-ldflags='-lrt' \ + $(CPU_DETECTION) \ + --enable-mlib \ + --disable-shm \ + --prefix=$(prefix) \ + --confdir=$(sysconfdir)/$(NAME) \ + --codecsdir=$(libexecdir)/mplayer + $(MAKECOOKIE) -#CPPFLAGS = $(CFLAGS) -#CXXFLAGS = $(CFLAGS) -#ASFLAGS = $(CFLAGS) -#OPTFLAGS = $(CFLAGS) +build-custom: + cd $(WORKSRC) && \ + $(MAKE) && \ + $(MAKE) doc + $(MAKECOOKIE) -# Makefile debugging/testing -showvars: - @echo " CFLAGS: $(CFLAGS)" - @echo " PATCHFILES: $(PATCHFILES)" +test-custom: +ifdef testData + cd $(WORKSRC) && \ + [ -d $(testData) ] && \ + $(MAKE) FATE_SAMPLES=$(testData) fatetest +endif + $(MAKECOOKIE) -###Fix the standard POST_INSTALL_TARGET Definition## -# By default Gar uses the install: target to install and then create a package. -# The package target simply points at install: (????) -# With this ISAEXEC framework, we actually need to separate these steps out! -# -# By setting the POST_INSTALL_TARGETS to the below, we're stripping off the -# packaging phase of the install: target. -# With the packaging steps striped, make install only installs the package into -# it's $DESTDIR as you would expect. -# -# We save the full unedited definiton of $PACKAGE for later, as we still to need -# to build a package at the end. Actually, no, I just define it manually... -# I've created a full-package: target which runs $(FULL_PACKAGE). This will be the final step - -# PLAIN_PACKAGE := $(POST_INSTALL_TARGETS) -# POST_INSTALL_TARGETS := strip fixconfig - -# This is the main target used by this Makefile for creating $ISAEXEC format pkgs. -# This for loop is very important for handling the $DESTDIR var as it applies in -# the post-install steps (I.E the ISA-specific dirs) - -# optbuild: -# (for TARGET in $(ISATARGETS); do \ -# gmake -e ISA=$$TARGET build only-install; done) - - -# This target is copied from gar.pkg.mk, just with $(POST_INSTALL_TARGETS) stripped -# from the end. This prevents the install target from kicking off the packaging step. -# only-install: $(addprefix dep-$(GARDIR)/,$(INSTALLDEPS)) test $(INSTALL_DIRS) $(PRE_INSTALL_TARGETS) pre-install $(INSTALL_TARGETS) isa-post-install - - -###Tidy ups and files below -# We need the skins dir copied into the master install dir -# We need the default font copied into the master install dir -# Finally, merge in all the optimised binaries - -#Isaexec version -post-install-modulated: skins fonts merge-opt-bins - -#### Skins, Fonts, Codecs and below all need to be run from optbuild to inherit -# the expanded $(DESTDIR) variable which includes their expanded path -# In Mplayer's case we don't actually need the skins/fonts in each ISA build -# but pulling them out of the loop is proving tricky - - -skins: - ginstall -m 755 -d $(DESTDIR)$(datadir)/mplayer/skins/default - (cp -r $(WORKSRC)/../Blue/* $(DESTDIR)$(datadir)/mplayer/skins/default) - -fonts: - (ln -f -s /usr/openwin/lib/X11/fonts/TrueType/Arial.ttf $(DESTDIR)$(BUILD_PREFIX)/share/mplayer/subfont.ttf) - -#Codecs aren't currently being bundled -codecs: - (mkdir -p $(DESTDIR)$(BUILD_PREFIX)/lib/codecs) - (cp -r $(WORKSRC)/../all-20061022/* $(DESTDIR)$(BUILD_PREFIX)/share/codecs) - -merge-opt-bins: - @echo "====> Running merge-opt-bins <====" - (mkdir -p $(BASE_DESTDIR)$(BUILD_PREFIX)/bin/$(ISAEXEC_DIR)) - (cd $(DESTDIR); if test ! -f $(BASE_DESTDIR)$(BUILD_PREFIX)/bin/$(ISAEXEC_DIR)/* ; then mv $(ISAEXEC_BINS) $(BASE_DESTDIR)$(BUILD_PREFIX)/bin/$(ISAEXEC_DIR); fi ) - -###not yet implemented, mplayer specific -## --enable-runtime-cpudetection allows the binary to run anywhere, use for i386? -#run-anywhere-build: -# (gmake ISA=pentium) -#CONFIGURE_ARGS += --enable-runtime-cpudetection - -PATH := /opt/csw/gnu:$(PATH) +post-install: thedocdir = $(docdir)/$(NAME)_doc +post-install: thehtmldocdir = $(thedocdir)/html +post-install: thecatmandir = $(mandir)/cat1 +post-install: + ginstall -d "$(DESTDIR)/$(thecatmandir)" + gnroff -Tlatin1 -mman $(WORKSRC)/DOCS/man/en/mplayer.1 > "$(DESTDIR)/$(thecatmandir)/mplayer.1" + cd "$(DESTDIR)/$(thecatmandir)" && ln -s mplayer.1 mencoder.1 + ginstall -d "$(DESTDIR)/$(thedocdir)" + gtar --directory $(WORKSRC)/DOCS --create --file=- tech | \ + gtar --directory $(DESTDIR)/$(thedocdir) --extract + ginstall -d "$(DESTDIR)/$(thehtmldocdir)" + gtar --directory $(WORKSRC)/DOCS/HTML/en --create --file=- . | \ + gtar --directory $(DESTDIR)/$(thehtmldocdir) --extract + $(MAKECOOKIE) Modified: csw/mgar/pkg/mplayer/trunk/checksums =================================================================== --- csw/mgar/pkg/mplayer/trunk/checksums 2013-12-10 19:05:07 UTC (rev 22672) +++ csw/mgar/pkg/mplayer/trunk/checksums 2013-12-11 11:18:03 UTC (rev 22673) @@ -1,8 +1 @@ -7e27e535c2d267637df34898f1b91707 download/MPlayer-1.0rc2.tar.bz2 -e4e2020d11b681aac898103b3ba723c4 download/Blue-1.7.tar.bz2 -f84bc9de8d2052da5c520d1a756f81b0 download/CSWmplayer.gspec -8ed311be34e23aa24825e016b1f946aa download/CSWmplayer.depend -8c02cf94c7af48a70c7e96e874379cb8 download/fix-configure.diff -76866779859be662d9eeac73bf6016d3 download/fix-libavcodec-gcc-bug.diff -1d801072350301c89f7ff58cad8f93a2 download/fix-manpage-macros.diff -94579f5ab17c17b8d89455128ae78cef download/sparc-v8-novis.diff +39dd55f30eb5403f219a606e79a6648a MPlayer-1.1.1.tar.xz Added: csw/mgar/pkg/mplayer/trunk/files/0001-configure-uses-bash.patch =================================================================== --- csw/mgar/pkg/mplayer/trunk/files/0001-configure-uses-bash.patch (rev 0) +++ csw/mgar/pkg/mplayer/trunk/files/0001-configure-uses-bash.patch 2013-12-11 11:18:03 UTC (rev 22673) @@ -0,0 +1,22 @@ +From d230c38db7bcad8063f7597ff2569ceccc938e0f Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Wed, 16 Oct 2013 19:06:15 +0200 +Subject: [PATCH] configure uses bash + +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 72f8ee5..f284646 100755 +--- a/configure ++++ b/configure +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /usr/bin/env bash + # + # Original version (C) 2000 Pontscho/fresh!mindworkz + # pontscho at makacs.poliod.hu +-- +1.8.3.4 + Added: csw/mgar/pkg/mplayer/trunk/files/0002-version-uses-bash.patch =================================================================== --- csw/mgar/pkg/mplayer/trunk/files/0002-version-uses-bash.patch (rev 0) +++ csw/mgar/pkg/mplayer/trunk/files/0002-version-uses-bash.patch 2013-12-11 11:18:03 UTC (rev 22673) @@ -0,0 +1,22 @@ +From c684fab9ad172ac202c468b95fecca7e6176e90a Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Thu, 17 Oct 2013 10:25:57 +0200 +Subject: [PATCH] version uses bash + +--- + version.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/version.sh b/version.sh +index ab9b8e8..0114248 100755 +--- a/version.sh ++++ b/version.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/bin/env bash + + test "$1" && extra="-$1" + +-- +1.8.3.4 + Added: csw/mgar/pkg/mplayer/trunk/files/0003-use-csw-catalog-for-documentation.patch =================================================================== --- csw/mgar/pkg/mplayer/trunk/files/0003-use-csw-catalog-for-documentation.patch (rev 0) +++ csw/mgar/pkg/mplayer/trunk/files/0003-use-csw-catalog-for-documentation.patch 2013-12-11 11:18:03 UTC (rev 22673) @@ -0,0 +1,36 @@ +From 51254d28ae3fa12862f9007ac169897e9fc740fd Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Mon, 21 Oct 2013 11:20:17 +0200 +Subject: [PATCH] use csw catalog for documentation + +--- + configure | 13 +------------ + 1 file changed, 1 insertion(+), 12 deletions(-) + +diff --git a/configure b/configure +index f284646..53bfb0d 100755 +--- a/configure ++++ b/configure +@@ -8057,18 +8057,7 @@ extra_ldflags="$extra_ldflags -lm" + # XML documentation tests + echocheck "XML catalogs" + for try_catalog in \ +- /etc/sgml/catalog \ +- /usr/share/xml/docbook/*/catalog.xml \ +- /opt/local/share/xml/docbook-xml/*/catalog.xml \ +- /opt/local/share/xml/docbook/*/catalog.xml \ +- /usr/share/sgml/docbook/*/*catalog \ +- /usr/share/apps/ksgmltools2/customization/en/catalog \ +- /usr/share/sgml/catalog \ +- /usr/local/share/sgml/catalog \ +- /usr/lib/sgml/catalog \ +- /usr/local/lib/sgml/catalog \ +- /usr/share/docbook-xml42/catalog.xml \ +- /usr/share/sgml/docbook/xmlcatalog; do ++ /opt/csw/share/sgml/docbook/xml-dtd-4.1.2/catalog; do + if test -f "$try_catalog"; then + catalog=$try_catalog + break +-- +1.8.3.4 + Added: csw/mgar/pkg/mplayer/trunk/files/0004-test-sse-support.patch =================================================================== --- csw/mgar/pkg/mplayer/trunk/files/0004-test-sse-support.patch (rev 0) +++ csw/mgar/pkg/mplayer/trunk/files/0004-test-sse-support.patch 2013-12-11 11:18:03 UTC (rev 22673) @@ -0,0 +1,91 @@ +From bafb52e605898a5afe86c5a7b007cd534c76ef1b Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Wed, 11 Dec 2013 10:25:19 +0100 +Subject: [PATCH] test sse support + +--- + cpudetect.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 60 insertions(+), 1 deletion(-) + +diff --git a/cpudetect.c b/cpudetect.c +index e643bdc..d2fd844 100644 +--- a/cpudetect.c ++++ b/cpudetect.c +@@ -46,6 +46,10 @@ CpuCaps gCpuCaps; + #include + #elif defined(__AMIGAOS4__) + #include ++#elif defined(sun) ++#include ++#include ++#include + #endif + + /* Thanks to the FreeBSD project for some of this cpuid code, and +@@ -209,7 +213,62 @@ static void check_os_katmai_support( void ) + * safe to go ahead and hook out the SSE code throughout Mesa. + */ + mp_msg(MSGT_CPUDETECT,MSGL_V, "Tests of OS support for SSE %s\n", gCpuCaps.hasSSE ? "passed." : "failed!" ); +-#else ++#elif defined(sun) ++ /* determine if SSE is available for the current CPU running ++ * Solaris in 32 bit mode; this can be done only for 5.10 or ++ * greater. ++ */ ++ struct utsname un; ++ char* dot; ++ int minor; ++ int major; ++ uint_t ui; ++ gCpuCaps.hasSSE=0; ++ if(uname(&un) != -1) ++ { ++ if(strcmp(un.sysname, "SunOS") == 0) ++ { ++ dot = strchr(un.release, '.'); ++ errno = 0; ++ if(dot != (char*)0) ++ { ++ minor = atoi(dot + 1); ++ *dot = '\0'; ++ if(!errno) ++ { ++ major = atoi(un.release); ++ if(!errno) ++ { ++ if(major >= 5 && minor >= 10) ++ { ++ (void)getisax(&ui, 1); ++ if(ui & AV_386_SSE) ++ { ++ gCpuCaps.hasSSE=1; ++ } ++ if(ui & AV_386_SSE2) ++ { ++ gCpuCaps.hasSSE2=1; ++ } ++ if(ui & AV_386_SSE3) ++ { ++ gCpuCaps.hasSSE3=1; ++ } ++ if(ui & AV_386_SSSE3) ++ { ++ gCpuCaps.hasSSSE3=1; ++ } ++ if(ui & AV_386_AMD_SSE4A) ++ { ++ gCpuCaps.hasSSE4a=1; ++ } ++ } ++ } ++ } ++ } ++ } ++ } ++#else /* : defined(sun) */ + /* We can't use POSIX signal handling to test the availability of + * SSE, so we disable it by default. + */ +-- +1.8.4.1 + Added: csw/mgar/pkg/mplayer/trunk/files/0005-enhance-X-Windows-detection.patch =================================================================== --- csw/mgar/pkg/mplayer/trunk/files/0005-enhance-X-Windows-detection.patch (rev 0) +++ csw/mgar/pkg/mplayer/trunk/files/0005-enhance-X-Windows-detection.patch 2013-12-11 11:18:03 UTC (rev 22673) @@ -0,0 +1,56 @@ +From f65b3b496e17ae71669e9dd3b3431ac709898e82 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Tue, 22 Oct 2013 14:12:27 +0200 +Subject: [PATCH] enhance X Windows detection + +--- + configure | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/configure b/configure +index 53bfb0d..407837e 100755 +--- a/configure ++++ b/configure +@@ -4443,6 +4443,12 @@ echocheck "X11 headers presence" + fi + echores "$_x11_headers" + ++ifBroken='' ++needsXlib='' ++if sunos; then ++ ifBroken="_broken" ++ needsXlib="X11/Xlib.h" ++fi + + echocheck "X11" + if test "$_x11" = auto && test "$_x11_headers" = yes ; then +@@ -4454,7 +4460,7 @@ if test "$_x11" = auto && test "$_x11_headers" = yes ; then + else + ld_tmp="$I -lXext -lX11 $ld_pthread" + fi +- statement_check X11/Xutil.h 'XCreateWindow(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)' $ld_tmp && ++ statement_check${ifBroken} ${needsXlib} X11/Xutil.h 'XCreateWindow(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)' $ld_tmp && + libs_mplayer="$libs_mplayer $ld_tmp" && _x11=yes && break + done + fi +@@ -4472,7 +4478,7 @@ echores "$_x11" + echocheck "Xss screensaver extensions" + if test "$_xss" = auto ; then + _xss=no +- statement_check "X11/extensions/scrnsaver.h" 'XScreenSaverSuspend(NULL, True)' -lXss && _xss=yes ++ statement_check${ifBroken} ${neddsXlib} "X11/extensions/scrnsaver.h" 'XScreenSaverSuspend(NULL, True)' -lXss && _xss=yes + fi + if test "$_xss" = yes ; then + def_xss='#define CONFIG_XSS 1' +@@ -4598,7 +4604,7 @@ echores "$_vdpau" + echocheck "Xinerama" + if test "$_xinerama" = auto && test "$_x11" = yes ; then + _xinerama=no +- statement_check X11/extensions/Xinerama.h 'XineramaIsActive(0)' -lXinerama && _xinerama=yes ++ statement_check${ifBroken} ${needsXlib} X11/extensions/Xinerama.h 'XineramaIsActive(0)' -lXinerama && _xinerama=yes + fi + + if test "$_xinerama" = yes ; then +-- +1.8.3.4 + Added: csw/mgar/pkg/mplayer/trunk/files/0006-fix-memalign-detection.patch =================================================================== --- csw/mgar/pkg/mplayer/trunk/files/0006-fix-memalign-detection.patch (rev 0) +++ csw/mgar/pkg/mplayer/trunk/files/0006-fix-memalign-detection.patch 2013-12-11 11:18:03 UTC (rev 22673) @@ -0,0 +1,24 @@ +From 291e34c28c9d9e7f488da650d0df9e907d14f991 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Wed, 23 Oct 2013 14:34:30 +0200 +Subject: [PATCH] fix memalign detection + +--- + configure | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure b/configure +index 407837e..89368a7 100755 +--- a/configure ++++ b/configure +@@ -3703,6 +3703,7 @@ echocheck "memalign()" + def_memalign_hack='#define CONFIG_MEMALIGN_HACK 0' + _memalign=no + statement_check malloc.h 'memalign(64, sizeof(char))' && _memalign=yes ++sunos && [ "${_memalign}" = "no" ] && statement_check stdlib.h 'memalign(64, sizeof(char))' && _memalign=yes + if test "$_memalign" = yes ; then + def_memalign='#define HAVE_MEMALIGN 1' + else +-- +1.8.3.4 + Added: csw/mgar/pkg/mplayer/trunk/files/0007-fix-memalign-prototype.patch =================================================================== --- csw/mgar/pkg/mplayer/trunk/files/0007-fix-memalign-prototype.patch (rev 0) +++ csw/mgar/pkg/mplayer/trunk/files/0007-fix-memalign-prototype.patch 2013-12-11 11:18:03 UTC (rev 22673) @@ -0,0 +1,27 @@ +From 7882916405a07afa33871ee8b70274c3302b259c Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Wed, 11 Dec 2013 09:55:24 +0100 +Subject: [PATCH] fix memalign prototype + +--- + ffmpeg/libavutil/mem.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/ffmpeg/libavutil/mem.c b/ffmpeg/libavutil/mem.c +index de22ad8..d3086c8 100644 +--- a/ffmpeg/libavutil/mem.c ++++ b/ffmpeg/libavutil/mem.c +@@ -30,6 +30,10 @@ + + #include + #include ++#if defined(sun) ++/* when _XOPEN_SOURCE is defined, the prototype is excluded from stdlib!? */ ++extern void *memalign(size_t, size_t); ++#endif /* : defined(sun) */ + #include + #if HAVE_MALLOC_H + #include +-- +1.8.4.1 + Added: csw/mgar/pkg/mplayer/trunk/files/0008-ffmpeg-script-uses-bash.patch =================================================================== --- csw/mgar/pkg/mplayer/trunk/files/0008-ffmpeg-script-uses-bash.patch (rev 0) +++ csw/mgar/pkg/mplayer/trunk/files/0008-ffmpeg-script-uses-bash.patch 2013-12-11 11:18:03 UTC (rev 22673) @@ -0,0 +1,33 @@ +From 8fb46fc11b2cb11fe712ad67713b5d614a400f4c Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Wed, 11 Dec 2013 10:59:11 +0100 +Subject: [PATCH] ffmpeg script uses bash + +--- + ffmpeg/libavcodec/codec_names.sh | 2 +- + ffmpeg/version.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ffmpeg/libavcodec/codec_names.sh b/ffmpeg/libavcodec/codec_names.sh +index 0e499c9..dcb3437 100755 +--- a/ffmpeg/libavcodec/codec_names.sh ++++ b/ffmpeg/libavcodec/codec_names.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/bin/env bash + + # Copyright (c) 2011 Nicolas George + # +diff --git a/ffmpeg/version.sh b/ffmpeg/version.sh +index 8d084c2..9fa06c7 100755 +--- a/ffmpeg/version.sh ++++ b/ffmpeg/version.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/bin/env bash + + # check for git short hash + if ! test "$revision"; then +-- +1.8.4.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Dec 11 13:13:13 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 11 Dec 2013 12:13:13 +0000 Subject: SF.net SVN: gar:[22674] csw/mgar/pkg/mplayer/trunk/Makefile Message-ID: Revision: 22674 http://gar.svn.sourceforge.net/gar/?rev=22674&view=rev Author: pfelecan Date: 2013-12-11 12:13:13 +0000 (Wed, 11 Dec 2013) Log Message: ----------- mplayer/trunk: activate Id keyword Modified Paths: -------------- csw/mgar/pkg/mplayer/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/mplayer/trunk/Makefile Modified: csw/mgar/pkg/mplayer/trunk/Makefile =================================================================== --- csw/mgar/pkg/mplayer/trunk/Makefile 2013-12-11 11:18:03 UTC (rev 22673) +++ csw/mgar/pkg/mplayer/trunk/Makefile 2013-12-11 12:13:13 UTC (rev 22674) @@ -1,4 +1,4 @@ -# $Id: Makefile 22672 2013-12-10 19:05:07Z pfelecan $ +# $Id$ NAME = mplayer ALIAS = MPlayer Property changes on: csw/mgar/pkg/mplayer/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Dec 11 14:02:39 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 11 Dec 2013 13:02:39 +0000 Subject: SF.net SVN: gar:[22675] csw/mgar/pkg/cpan/DateTime-Format-ICal/trunk/ Makefile Message-ID: Revision: 22675 http://gar.svn.sourceforge.net/gar/?rev=22675&view=rev Author: bonivart Date: 2013-12-11 13:02:39 +0000 (Wed, 11 Dec 2013) Log Message: ----------- cpan/DateTime-Format-ICal/trunk: first commit Modified Paths: -------------- csw/mgar/pkg/cpan/DateTime-Format-ICal/trunk/Makefile Modified: csw/mgar/pkg/cpan/DateTime-Format-ICal/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DateTime-Format-ICal/trunk/Makefile 2013-12-11 12:13:13 UTC (rev 22674) +++ csw/mgar/pkg/cpan/DateTime-Format-ICal/trunk/Makefile 2013-12-11 13:02:39 UTC (rev 22675) @@ -5,16 +5,15 @@ AUTHOR = DROLSKY DESCRIPTION = Parse and format iCal datetime and duration strings -define BLURB - Parse and format iCal datetime and duration strings -endef -LICENSE = LICENSE - PACKAGES = CSWpm-datetime-format-ical ARCHALL = 1 -RUNTIME_DEP_PKGS += CSWpmdatetime +RUNTIME_DEP_PKGS += CSWpm-datetime +RUNTIME_DEP_PKGS += CSWpm-datetime-event-ical +RUNTIME_DEP_PKGS += CSWpm-datetime-set +RUNTIME_DEP_PKGS += CSWpm-datetime-timezone +RUNTIME_DEP_PKGS += CSWpm-params-validate CONFIGURE_ARGS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 12 17:58:42 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Dec 2013 16:58:42 +0000 Subject: SF.net SVN: gar:[22676] csw/test/ Message-ID: <3dgLnX1Stzz1Dd@mail.opencsw.org> Revision: 22676 http://sourceforge.net/p/gar/code/22676 Author: dmichelsen Date: 2013-12-12 16:58:40 +0000 (Thu, 12 Dec 2013) Log Message: ----------- Test, please ignore Added Paths: ----------- csw/test/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 12 17:59:16 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Dec 2013 16:59:16 +0000 Subject: SF.net SVN: gar:[22677] csw/test/ Message-ID: <3dgLp41Q6fz1J4@mail.opencsw.org> Revision: 22677 http://sourceforge.net/p/gar/code/22677 Author: dmichelsen Date: 2013-12-12 16:59:15 +0000 (Thu, 12 Dec 2013) Log Message: ----------- Test, please ignore Removed Paths: ------------- csw/test/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 12 18:09:37 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Dec 2013 17:09:37 +0000 Subject: SF.net SVN: gar:[22678] csw/mgar/pkg/dia/trunk Message-ID: <3dgM280PYhz1Sg@mail.opencsw.org> Revision: 22678 http://sourceforge.net/p/gar/code/22678 Author: dmichelsen Date: 2013-12-12 17:09:37 +0000 (Thu, 12 Dec 2013) Log Message: ----------- dia/trunk: Update to 0.97.2 and new dependencies Modified Paths: -------------- csw/mgar/pkg/dia/trunk/Makefile csw/mgar/pkg/dia/trunk/checksums Added Paths: ----------- csw/mgar/pkg/dia/trunk/files/0001-Keep-norunpath-during-libtool.patch Removed Paths: ------------- csw/mgar/pkg/dia/trunk/files/0001-Make-sure-for-loop-is-not-empty.patch Modified: csw/mgar/pkg/dia/trunk/Makefile =================================================================== --- csw/mgar/pkg/dia/trunk/Makefile 2013-12-12 16:59:15 UTC (rev 22677) +++ csw/mgar/pkg/dia/trunk/Makefile 2013-12-12 17:09:37 UTC (rev 22678) @@ -1,44 +1,80 @@ # $Id$ NAME = dia -VERSION = 0.97 +VERSION = 0.97.2 GARTYPE = v2 DESCRIPTION = A GTK+ based diagram creation program -define BLURB -endef MASTER_SITES = $(GNOME_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.bz2 +DISTFILES += $(NAME)-$(VERSION).tar.xz -PATCHFILES = 0001-Make-sure-for-loop-is-not-empty.patch +PATCHFILES += 0001-Keep-norunpath-during-libtool.patch -# File name regex to get notifications about upstream software releases -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - VENDOR_URL = http://live.gnome.org/Dia +# BUILD_DEP_PKGS += + +PACKAGES += CSWdia +SPKG_DESC_CSWdia = A GTK+ based diagram creation program +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWdia += CSWlibpango1-0-0 +RUNTIME_DEP_PKGS_CSWdia += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWdia += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWdia += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWdia += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWdia += CSWlibemf1 +RUNTIME_DEP_PKGS_CSWdia += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWdia += CSWlibz1 +RUNTIME_DEP_PKGS_CSWdia += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWdia += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWdia += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWdia += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWdia += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWdia += CSWlibpangoft2-1-0-0 +RUNTIME_DEP_PKGS_CSWdia += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWdia += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWdia += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWdia += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSWdia += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWdia += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWdia += CSWlibpangocairo1-0-0 +RUNTIME_DEP_PKGS_CSWdia += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWdia += CSWlibart + +# Linker difference between sparc and i386 +CHECKPKG_OVERRIDES_CSWdia += surplus-dependency|CSWlibgio2-0-0 +CHECKPKG_OVERRIDES_CSWdia += surplus-dependency|CSWlibiconv2 +CHECKPKG_OVERRIDES_CSWdia += surplus-dependency|CSWlibbz2-1-0 +CHECKPKG_OVERRIDES_CSWdia += surplus-dependency|CSWlibfontconfig1 +CHECKPKG_OVERRIDES_CSWdia += surplus-dependency|CSWlibatk1-0-0 + +# Locations of locale.alias: +# /usr/share/locale/locale.alias: not used in Solaris +# /usr/local/share/locale/locale.alias: replace with /opt/csw/share/locale/locale.alias +# /usr/lib/X11/locale/locale.alias: not used in Solaris +# /usr/openwin/lib/locale/locale.alias: ok +REINPLACEMENTS += locale +REINPLACE_MATCH_locale = /usr/local/share/locale/locale.alias +REINPLACE_WITH_locale = $(sharedstatedir)/locale/locale.alias +REINPLACE_FILES_locale += lib/intl.c + +# Doesn't harm, see above +CHECKPKG_OVERRIDES_CSWdia += file-with-bad-content|/usr/share|root/opt/csw/lib/dia/libdia.so + +# For GNU gettext like msgmerge +CONFIGURE_ENV_PATH = $(prefix)/gnu:$(PATH) + +EXTRA_INC += $(includedir)/libEMF + +EXTRA_LINKER_FLAGS += -norunpath + CONFIGURE_ARGS = $(DIRPATHS) # Tests for i386 fail in /Dia/Objects/Istar - goal/Copy with # g_str_hash (100) + 16 -TEST_TARGET ?= check -RUNTIME_DEP_PKGS_CSWdia += CSWlibxslt -RUNTIME_DEP_PKGS_CSWdia += CSWlibatk -RUNTIME_DEP_PKGS_CSWdia += CSWggettextrt -RUNTIME_DEP_PKGS_CSWdia += CSWpng -RUNTIME_DEP_PKGS_CSWdia += CSWlibxml2 -RUNTIME_DEP_PKGS_CSWdia += CSWfconfig -RUNTIME_DEP_PKGS_CSWdia += CSWglib2 -RUNTIME_DEP_PKGS_CSWdia += CSWftype2 -RUNTIME_DEP_PKGS_CSWdia += CSWpango -RUNTIME_DEP_PKGS_CSWdia += CSWzlib -RUNTIME_DEP_PKGS_CSWdia += CSWlibart -RUNTIME_DEP_PKGS_CSWdia += CSWgtk2 -RUNTIME_DEP_PKGS_CSWdia += CSWlibcairo -RUNTIME_DEP_PKGS_CSWdia += CSWiconv +# For GNU xgettext +TEST_ENV_PATH = $(prefix)/gnu:$(PATH) include gar/category.mk -# For GNU gettext like msgmerge -PATH := /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/dia/trunk/checksums =================================================================== --- csw/mgar/pkg/dia/trunk/checksums 2013-12-12 16:59:15 UTC (rev 22677) +++ csw/mgar/pkg/dia/trunk/checksums 2013-12-12 17:09:37 UTC (rev 22678) @@ -1 +1 @@ -3d11f9aaa5a4923f0a5533962c87bdfb dia-0.97.tar.bz2 +1e1180a513fb567709b09bc19f12105e dia-0.97.2.tar.xz Added: csw/mgar/pkg/dia/trunk/files/0001-Keep-norunpath-during-libtool.patch =================================================================== --- csw/mgar/pkg/dia/trunk/files/0001-Keep-norunpath-during-libtool.patch (rev 0) +++ csw/mgar/pkg/dia/trunk/files/0001-Keep-norunpath-during-libtool.patch 2013-12-12 17:09:37 UTC (rev 22678) @@ -0,0 +1,25 @@ +From 2b9f48028b669ad74c060998e3e947251885cd4b Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 12 Dec 2013 16:06:44 +0100 +Subject: [PATCH] Keep -norunpath during libtool + +--- + ltmain.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ltmain.sh b/ltmain.sh +index 04eaea4..fd4ac68 100755 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -5091,7 +5091,7 @@ func_mode_link () + # @file GCC response files + # -tp=* Portland pgcc target processor selection + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-norunpath) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" +-- +1.8.4.1 + Deleted: csw/mgar/pkg/dia/trunk/files/0001-Make-sure-for-loop-is-not-empty.patch =================================================================== --- csw/mgar/pkg/dia/trunk/files/0001-Make-sure-for-loop-is-not-empty.patch 2013-12-12 16:59:15 UTC (rev 22677) +++ csw/mgar/pkg/dia/trunk/files/0001-Make-sure-for-loop-is-not-empty.patch 2013-12-12 17:09:37 UTC (rev 22678) @@ -1,52 +0,0 @@ -From 109bdcb02d7e43bf9b3d15382dd54681b09edc29 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Tue, 23 Nov 2010 11:09:26 +0100 -Subject: [PATCH] Make sure for-loop is not empty - ---- - doc/Makefile.in | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/doc/Makefile.in b/doc/Makefile.in -index ec95c51..85a9b44 100644 ---- a/doc/Makefile.in -+++ b/doc/Makefile.in -@@ -382,7 +382,7 @@ ctags-recursive: - done - - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ list='x$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -@@ -408,7 +408,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ list='x$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -@@ -423,7 +423,7 @@ ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ list='x$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -@@ -589,7 +589,7 @@ uninstall-am: uninstall-local - install-data-local: $(distfiles) - -(cd $(DESTDIR)$(helpdir) && rm -f C && ln -s en C) - $(mkinstalldirs) $(sysdoc) -- for i in $^; do \ -+ for i in x $^; do \ - if test -f "$$i"; then \ - echo "installing $$i" ;\ - $(INSTALL_DATA) $$i $(sysdoc)/$$(basename $$i); \ --- -1.7.3 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 12 18:09:56 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Dec 2013 17:09:56 +0000 Subject: SF.net SVN: gar:[22679] csw/mgar/pkg/libemf/trunk Message-ID: <3dgM2V4FzGz1X3@mail.opencsw.org> Revision: 22679 http://sourceforge.net/p/gar/code/22679 Author: dmichelsen Date: 2013-12-12 17:09:54 +0000 (Thu, 12 Dec 2013) Log Message: ----------- libemf/trunk: Rework and cleanup Modified Paths: -------------- csw/mgar/pkg/libemf/trunk/Makefile csw/mgar/pkg/libemf/trunk/files/0001-Use-__sparc-and-__i386-for-Solaris.patch Removed Paths: ------------- csw/mgar/pkg/libemf/trunk/files/0002-Remove-unneeded-definition-causing-link-errors.patch csw/mgar/pkg/libemf/trunk/files/0004-Do-not-use-link-against-libstdc.patch Modified: csw/mgar/pkg/libemf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libemf/trunk/Makefile 2013-12-12 17:09:37 UTC (rev 22678) +++ csw/mgar/pkg/libemf/trunk/Makefile 2013-12-12 17:09:54 UTC (rev 22679) @@ -14,10 +14,6 @@ PATCHFILES += 0001-Use-__sparc-and-__i386-for-Solaris.patch PATCHFILES += 0003-Keep-norunpath-during-libtool.patch -#PATCHFILES += 0002-Remove-unneeded-definition-causing-link-errors.patch -#PATCHFILES += 0003-Always-use-csw-libtool.patch -#PATCHFILES += 0004-Do-not-use-link-against-libstdc.patch - PACKAGES += CSWlibemf SPKG_DESC_CSWlibemf = $(DESCRIPTION) # PKGFILES is catchall @@ -26,6 +22,8 @@ PACKAGES += CSWlibemf1 SPKG_DESC_CSWlibemf1 = Runtime library libEMF.so.1 PKGFILES_CSWlibemf1 += $(call pkgfiles_lib,libEMF.so.1) +# This is true for sparc as the library does not work for sparc64 +CHECKPKG_OVERRIDES_CSWlibemf1 += 64-bit-binaries-missing PACKAGES += CSWlibemf-dev SPKG_DESC_CSWlibemf-dev = Development files for libEMF.so.1 @@ -40,10 +38,11 @@ EXTRA_LINKER_FLAGS += -norunpath +BUILD64_LIBS_ONLY = 1 + # 64 bit on Sparc is problematic as documented in include/libEMF/wine/winnt.h: # * This structure is valid only for 32-bit SPARC architectures, not for 64-bit SPARC. -SKIPTEST ?= 1 -BUILD64_LIBS_ONLY = 1 +SKIP_MODULATIONS += isa-$(ISA_DEFAULT64_sparc) include gar/category.mk Modified: csw/mgar/pkg/libemf/trunk/files/0001-Use-__sparc-and-__i386-for-Solaris.patch =================================================================== --- csw/mgar/pkg/libemf/trunk/files/0001-Use-__sparc-and-__i386-for-Solaris.patch 2013-12-12 17:09:37 UTC (rev 22678) +++ csw/mgar/pkg/libemf/trunk/files/0001-Use-__sparc-and-__i386-for-Solaris.patch 2013-12-12 17:09:54 UTC (rev 22679) @@ -1,14 +1,14 @@ -From 023a228660a6cdb955db4d4a5b3da3b5edfcde30 Mon Sep 17 00:00:00 2001 +From 3d08d8589aa7974d0eea96f59e6b5c5faf2354ea Mon Sep 17 00:00:00 2001 From: Dagobert Michelsen -Date: Tue, 1 Jan 2013 19:18:22 +0100 +Date: Thu, 12 Dec 2013 15:48:49 +0100 Subject: [PATCH] Use __sparc and __i386 for Solaris --- - include/libEMF/wine/winnt.h | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) + include/libEMF/wine/winnt.h | 18 +++++++++++++++--- + 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/include/libEMF/wine/winnt.h b/include/libEMF/wine/winnt.h -index f76c08a..3a8d6f2 100644 +index f76c08a..ad66499 100644 --- a/include/libEMF/wine/winnt.h +++ b/include/libEMF/wine/winnt.h @@ -29,7 +29,11 @@ @@ -24,9 +24,20 @@ # undef WORDS_BIGENDIAN # undef BITFIELDS_BIGENDIAN # define ALLOW_UNALIGNED_ACCESS -@@ -45,6 +49,10 @@ +@@ -37,6 +41,10 @@ # undef WORDS_BIGENDIAN # undef BITFIELDS_BIGENDIAN + # define ALLOW_UNALIGNED_ACCESS ++#elif defined(__amd64) ++# undef WORDS_BIGENDIAN ++# undef BITFIELDS_BIGENDIAN ++# define ALLOW_UNALIGNED_ACCESS + #elif defined(__alpha__) + # undef WORDS_BIGENDIAN + # undef BITFIELDS_BIGENDIAN +@@ -45,6 +53,10 @@ + # undef WORDS_BIGENDIAN + # undef BITFIELDS_BIGENDIAN # undef ALLOW_UNALIGNED_ACCESS +#elif defined(__sparc) +# define WORDS_BIGENDIAN @@ -35,7 +46,7 @@ #elif defined(__sparc__) # define WORDS_BIGENDIAN # define BITFIELDS_BIGENDIAN -@@ -676,7 +684,7 @@ typedef struct _CONTEXT86 +@@ -676,7 +688,7 @@ typedef struct _CONTEXT86 #define CONTEXT86_FULL (CONTEXT86_CONTROL | CONTEXT86_INTEGER | CONTEXT86_SEGMENTS) /* i386 context definitions */ @@ -44,7 +55,7 @@ #define CONTEXT_CONTROL CONTEXT86_CONTROL #define CONTEXT_INTEGER CONTEXT86_INTEGER -@@ -1225,7 +1233,7 @@ typedef struct _STACK_FRAME_HEADER +@@ -1225,7 +1237,7 @@ typedef struct _STACK_FRAME_HEADER #endif /* __PPC__ */ @@ -54,5 +65,5 @@ /* * FIXME: -- -1.8.0 +1.8.4.1 Deleted: csw/mgar/pkg/libemf/trunk/files/0002-Remove-unneeded-definition-causing-link-errors.patch =================================================================== --- csw/mgar/pkg/libemf/trunk/files/0002-Remove-unneeded-definition-causing-link-errors.patch 2013-12-12 17:09:37 UTC (rev 22678) +++ csw/mgar/pkg/libemf/trunk/files/0002-Remove-unneeded-definition-causing-link-errors.patch 2013-12-12 17:09:54 UTC (rev 22679) @@ -1,32 +0,0 @@ -From 313b74dc289993a8a41974545df95d2e41f16978 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Mon, 22 Nov 2010 15:43:35 +0100 -Subject: [PATCH 2/2] Remove unneeded definition causing link errors - ---- - include/libEMF/wine/winbase.h | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/include/libEMF/wine/winbase.h b/include/libEMF/wine/winbase.h -index 366a777..3abb6b1 100644 ---- a/include/libEMF/wine/winbase.h -+++ b/include/libEMF/wine/winbase.h -@@ -1802,6 +1802,7 @@ LONG WINAPI InterlockedIncrement(PLONG); - VOID WINAPI SetLastError(DWORD); - #endif /* __i386__ && __GNUC__ */ - -+#if 0 - /* FIXME: should handle platforms where sizeof(void*) != sizeof(long) */ - static inline PVOID WINAPI InterlockedCompareExchangePointer( PVOID *dest, PVOID xchg, PVOID compare ) - { -@@ -1812,6 +1813,7 @@ static inline PVOID WINAPI InterlockedExchangePointer( PVOID *dest, PVOID val ) - { - return (PVOID)InterlockedExchange( (PLONG)dest, (LONG)val ); - } -+#endif - - #ifdef __WINE__ - #define GetCurrentProcess() ((HANDLE)0xffffffff) --- -1.7.3 - Deleted: csw/mgar/pkg/libemf/trunk/files/0004-Do-not-use-link-against-libstdc.patch =================================================================== --- csw/mgar/pkg/libemf/trunk/files/0004-Do-not-use-link-against-libstdc.patch 2013-12-12 17:09:37 UTC (rev 22678) +++ csw/mgar/pkg/libemf/trunk/files/0004-Do-not-use-link-against-libstdc.patch 2013-12-12 17:09:54 UTC (rev 22679) @@ -1,39 +0,0 @@ -From 110d57854830c674d7dbacb65331df0995d0d3ee Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Mon, 22 Nov 2010 16:40:39 +0100 -Subject: [PATCH 4/4] Do not use link against libstdc++ - ---- - src/Makefile.in | 2 +- - tests/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile.in b/src/Makefile.in -index 2d7c678..7bd2c79 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -186,7 +186,7 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - INCLUDES = -I$(top_srcdir)/include --LDADD = $(top_builddir)/libemf/libEMF.la -lstdc++ -lm -+LDADD = $(top_builddir)/libemf/libEMF.la -lm - all: all-am - - .SUFFIXES: -diff --git a/tests/Makefile.in b/tests/Makefile.in -index 4e5ecfb..5c8fdb4 100644 ---- a/tests/Makefile.in -+++ b/tests/Makefile.in -@@ -202,7 +202,7 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - INCLUDES = -I$(top_srcdir)/include --LDADD = $(top_builddir)/libemf/libEMF.la -lstdc++ -+LDADD = $(top_builddir)/libemf/libEMF.la - TESTS = docheck1 docheck2 docheck3 - EXTRA_DIST = docheck1 docheck2 docheck3 emfs/check1.emf emfs/check3.emf - MOSTLYCLEANFILES = check1.emf check2.emf check3.emf --- -1.7.3 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 12 18:10:29 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Dec 2013 17:10:29 +0000 Subject: SF.net SVN: gar:[22680] csw/mgar/pkg/pound/trunk/Makefile Message-ID: <3dgM323hd9z3G@mail.opencsw.org> Revision: 22680 http://sourceforge.net/p/gar/code/22680 Author: dmichelsen Date: 2013-12-12 17:10:28 +0000 (Thu, 12 Dec 2013) Log Message: ----------- pound/trunk: Adjust locations Modified Paths: -------------- csw/mgar/pkg/pound/trunk/Makefile Modified: csw/mgar/pkg/pound/trunk/Makefile =================================================================== --- csw/mgar/pkg/pound/trunk/Makefile 2013-12-12 17:09:54 UTC (rev 22679) +++ csw/mgar/pkg/pound/trunk/Makefile 2013-12-12 17:10:28 UTC (rev 22680) @@ -43,7 +43,8 @@ EXTRA_DOCS += z2_2_5_1.py EXTRA_DOCS += z2_2_6_1.py -POUNDCFG = $(sysconfdir)/pound.cfg +POUNDCONFIGDIR = $(sysconfdir)/pound +POUNDCFG = $(POUNDCONFIGDIR)/pound.cfg REINPLACEMENTS += poundcfg REINPLACE_MATCH_poundcfg = /usr/local/etc/pound.cfg @@ -52,14 +53,20 @@ REINPLACEMENTS += certpath REINPLACE_MATCH_certpath = /usr/local/etc/pound/cert.pem -REINPLACE_WITH_certpath = $(sysconfdir)/cert.pem +REINPLACE_WITH_certpath = $(POUNDCONFIGDIR)/cert.pem REINPLACE_FILES_certpath += pound.8 REINPLACEMENTS += config REINPLACE_MATCH_config = /etc/pound/ -REINPLACE_WITH_config = $(sysconfdir)/pound/ +REINPLACE_WITH_config = $(POUNDCONFIGDIR)/ REINPLACE_FILES_config += pound.8 +# Make sure to use OpenCSW OpenSSL as the generated code from Solaris OpenSSL uses different functions not present in the other libcrypto +REINPLACEMENTS += openssl +REINPLACE_MATCH_openssl = openssl +REINPLACE_WITH_openssl = $(bindir)/openssl +REINPLACE_FILES_openssl += Makefile.in + BUILD64 = 1 ISAEXEC = 1 @@ -91,7 +98,7 @@ ginstall -m 644 $(WORKSRC)/pound.8 $(DESTDIR)$(mandir)/man8/pound.8 ginstall -m 644 $(WORKSRC)/poundctl.8 $(DESTDIR)$(mandir)/man8/poundctl.8 ginstall -d $(DESTDIR)$(sysconfdir)/$(NAME) - ginstall -m 644 $(FILEDIR)/pound2-sample.cfg $(DESTDIR)$(sysconfdir)/pound.cfg + ginstall -m 644 $(FILEDIR)/pound2-sample.cfg $(DESTDIR)$(POUNDCFG) ginstall -d $(DESTDIR)$(docdir)/$(NAME) ginstall -m 644 $(addprefix $(WORKSRC)/,$(EXTRA_DOCS)) $(DESTDIR)$(docdir)/$(NAME) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 12 18:11:03 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Dec 2013 17:11:03 +0000 Subject: SF.net SVN: gar:[22681] csw/mgar/pkg/mpg123/trunk Message-ID: <3dgM3j39Byz6g@mail.opencsw.org> Revision: 22681 http://sourceforge.net/p/gar/code/22681 Author: dmichelsen Date: 2013-12-12 17:11:02 +0000 (Thu, 12 Dec 2013) Log Message: ----------- mpg123/trunk: Update to 1.16.0 and split package Modified Paths: -------------- csw/mgar/pkg/mpg123/trunk/Makefile csw/mgar/pkg/mpg123/trunk/checksums Modified: csw/mgar/pkg/mpg123/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpg123/trunk/Makefile 2013-12-12 17:10:28 UTC (rev 22680) +++ csw/mgar/pkg/mpg123/trunk/Makefile 2013-12-12 17:11:02 UTC (rev 22681) @@ -1,5 +1,5 @@ NAME = mpg123 -VERSION = 1.13.3 +VERSION = 1.16.0 GARTYPE = v2 DESCRIPTION = A command-line MP3 player @@ -14,11 +14,28 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).tar.bz2 +PACKAGES += CSWmpg123 +SPKG_DESC_CSWmpg123 = A command-line MP3 player +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWmpg123 += CSWlibmpg123-0 RUNTIME_DEP_PKGS_CSWmpg123 += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWmpg123 += CSWlibesd0 -RUNTIME_DEP_PKGS_CSWmpg123 += CSWnas -RUNTIME_DEP_PKGS_CSWmpg123 += CSWlibsdl +PACKAGES += CSWlibmpg123-dev +SPKG_DESC_CSWlibmpg123-dev = Development files for libmpg123.so.0 +# The .la files are needed for the main library for dynamically loading the output libs +PKGFILES_DEVEL_LIBTOOL = +PKGFILES_CSWlibmpg123-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibmpg123-dev += CSWlibmpg123-0 + +PACKAGES += CSWlibmpg123-0 +SPKG_DESC_CSWlibmpg123-0 = MP3 decoding library, libmpg123.so.0 +PKGFILES_CSWlibmpg123-0 += $(call pkgfiles_lib,libmpg123.so.0) +# These are output libraries, bundle with primary library for now +PKGFILES_CSWlibmpg123-0 += $(call baseisadirs,$(libdir),mpg123/.*) +RUNTIME_DEP_PKGS_CSWlibmpg123-0 += CSWnas +RUNTIME_DEP_PKGS_CSWlibmpg123-0 += CSWlibsdl1-2-0 +RUNTIME_DEP_PKGS_CSWlibmpg123-0 += CSWlibesd0 + BUILD64_LIBS_ONLY = 1 EXTRA_BUILD_ISAS = sparcv8plus+vis pentium @@ -36,7 +53,7 @@ # The other one is mpg321 # This fixes #4342 -ALTERNATIVES = mpg123 +ALTERNATIVES_CSWmpg123 = mpg123 ALTERNATIVE_mpg123 = $(bindir)/mpg123 mpg123 $(bindir)/mpg123 100 # Checkpkg can't check this Modified: csw/mgar/pkg/mpg123/trunk/checksums =================================================================== --- csw/mgar/pkg/mpg123/trunk/checksums 2013-12-12 17:10:28 UTC (rev 22680) +++ csw/mgar/pkg/mpg123/trunk/checksums 2013-12-12 17:11:02 UTC (rev 22681) @@ -1 +1 @@ -b1f990ce76dcf2fdf9d53ac39fc6bc7e mpg123-1.13.3.tar.bz2 +169cfc32b32b5cae99212fe8e4347215 mpg123-1.16.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Dec 12 18:28:43 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 12 Dec 2013 17:28:43 +0000 Subject: SF.net SVN: gar:[22682] csw/mgar/pkg/mplayer/trunk/files/ 0004-test-sse-support.patch Message-ID: <3dgMS43gZlzC3@mail.opencsw.org> Revision: 22682 http://sourceforge.net/p/gar/code/22682 Author: pfelecan Date: 2013-12-12 17:28:42 +0000 (Thu, 12 Dec 2013) Log Message: ----------- fix the patch for SSE detection Modified Paths: -------------- csw/mgar/pkg/mplayer/trunk/files/0004-test-sse-support.patch Modified: csw/mgar/pkg/mplayer/trunk/files/0004-test-sse-support.patch =================================================================== --- csw/mgar/pkg/mplayer/trunk/files/0004-test-sse-support.patch 2013-12-12 17:11:02 UTC (rev 22681) +++ csw/mgar/pkg/mplayer/trunk/files/0004-test-sse-support.patch 2013-12-12 17:28:42 UTC (rev 22682) @@ -1,6 +1,6 @@ -From bafb52e605898a5afe86c5a7b007cd534c76ef1b Mon Sep 17 00:00:00 2001 +From ff6871e3463c9242151c4684b1ee0c59d510c0fb Mon Sep 17 00:00:00 2001 From: Peter Felecan -Date: Wed, 11 Dec 2013 10:25:19 +0100 +Date: Wed, 11 Dec 2013 14:24:15 +0100 Subject: [PATCH] test sse support --- @@ -8,7 +8,7 @@ 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/cpudetect.c b/cpudetect.c -index e643bdc..d2fd844 100644 +index e643bdc..e30ea2d 100644 --- a/cpudetect.c +++ b/cpudetect.c @@ -46,6 +46,10 @@ CpuCaps gCpuCaps; @@ -22,10 +22,10 @@ #endif /* Thanks to the FreeBSD project for some of this cpuid code, and -@@ -209,7 +213,62 @@ static void check_os_katmai_support( void ) - * safe to go ahead and hook out the SSE code throughout Mesa. - */ - mp_msg(MSGT_CPUDETECT,MSGL_V, "Tests of OS support for SSE %s\n", gCpuCaps.hasSSE ? "passed." : "failed!" ); +@@ -216,7 +220,62 @@ static void check_os_katmai_support( void ) + mp_msg(MSGT_CPUDETECT,MSGL_WARN, "Cannot test OS support for SSE, disabling to be safe.\n" ); + gCpuCaps.hasSSE=0; + #endif /* _POSIX_SOURCE */ -#else +#elif defined(sun) + /* determine if SSE is available for the current CPU running @@ -83,9 +83,9 @@ + } + } +#else /* : defined(sun) */ - /* We can't use POSIX signal handling to test the availability of - * SSE, so we disable it by default. + /* Do nothing on other platforms for now. */ + mp_msg(MSGT_CPUDETECT,MSGL_WARN, "Cannot test OS support for SSE, leaving disabled.\n" ); -- 1.8.4.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Dec 12 18:29:34 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 12 Dec 2013 17:29:34 +0000 Subject: SF.net SVN: gar:[22683] csw/mgar/pkg/gdb/trunk Message-ID: <3dgMT62NLrzGR@mail.opencsw.org> Revision: 22683 http://sourceforge.net/p/gar/code/22683 Author: pfelecan Date: 2013-12-12 17:29:34 +0000 (Thu, 12 Dec 2013) Log Message: ----------- mplayer/trunk: upstream version bump Modified Paths: -------------- csw/mgar/pkg/gdb/trunk/Makefile csw/mgar/pkg/gdb/trunk/checksums Modified: csw/mgar/pkg/gdb/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdb/trunk/Makefile 2013-12-12 17:28:42 UTC (rev 22682) +++ csw/mgar/pkg/gdb/trunk/Makefile 2013-12-12 17:29:34 UTC (rev 22683) @@ -1,7 +1,7 @@ # $Id$ NAME = gdb -VERSION = 7.6.1 +VERSION = 7.6.2 GARTYPE = v2 DESCRIPTION = The GNU Debugger @@ -26,7 +26,7 @@ endef MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(DISTNAME).tar.gz +DISTFILES = $(DISTNAME).tar.bz2 # from private patch 2: PATCHFILES += 0001-OpenSolaris-gdb-solib-svr4.patch # from private patch 3: @@ -49,6 +49,7 @@ BUILD_DEP_PKGS += CSWlibiconv-dev BUILD_DEP_PKGS += CSWlibncurses-dev BUILD_DEP_PKGS += CSWlibz-dev +BUILD_DEP_PKGS += CSWliblzma-dev BUILD_DEP_PKGS += CSWlibreadline-dev CONFIGURE_ARGS-32 += --with-python Modified: csw/mgar/pkg/gdb/trunk/checksums =================================================================== --- csw/mgar/pkg/gdb/trunk/checksums 2013-12-12 17:28:42 UTC (rev 22682) +++ csw/mgar/pkg/gdb/trunk/checksums 2013-12-12 17:29:34 UTC (rev 22683) @@ -1 +1 @@ -d42841167fd061d90fddf9a7212a1f9f gdb-7.6.1.tar.gz +496399e96654fc0f899a5c964bc1f0f8 gdb-7.6.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 12 20:36:00 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Dec 2013 19:36:00 +0000 Subject: SF.net SVN: gar:[22684] csw/mgar/pkg/pureftpd/trunk/Makefile Message-ID: <3dgQH16qZVzmp@mail.opencsw.org> Revision: 22684 http://sourceforge.net/p/gar/code/22684 Author: dmichelsen Date: 2013-12-12 19:35:59 +0000 (Thu, 12 Dec 2013) Log Message: ----------- pureftpd/trunk: Enable LDAP, some cleanup Modified Paths: -------------- csw/mgar/pkg/pureftpd/trunk/Makefile Modified: csw/mgar/pkg/pureftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/pureftpd/trunk/Makefile 2013-12-12 17:29:34 UTC (rev 22683) +++ csw/mgar/pkg/pureftpd/trunk/Makefile 2013-12-12 19:35:59 UTC (rev 22684) @@ -1,16 +1,12 @@ # known build facts # # no linkage against -# - ldap # - mysql # - pgsql -NAME = pureftpd +NAME = pure-ftpd VERSION = 1.0.36 GARTYPE = v2 -SRCNAME = pure-ftpd -PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc - DESCRIPTION = A secure FTP daemon define BLURB Pure-FTPd is a free (BSD), secure, production-quality and @@ -21,18 +17,21 @@ endef MASTER_SITES = http://download.pureftpd.org/pub/pure-ftpd/releases/ -DISTFILES = $(SRCNAME)-$(VERSION).tar.gz -WORKSRC = $(WORKDIR)/$(SRCNAME)-$(VERSION) +DISTFILES += $(DISTNAME).tar.gz BUILD_DEP_PKGS += CSWlibssl-dev +BUILD_DEP_PKGS += CSWopenldap-dev -# we require openssl for tls -RUNTIME_DEP_PKGS = CSWlibssl1-0-0 -RUNTIME_DEP_PKGS += CSWlibssp0 +PACKAGES += CSWpureftpd +SPKG_DESC_CSWpureftpd = A secure FTP daemon +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWpureftpd += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWpureftpd += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWpureftpd += CSWlibldap2-4-2 +CHECKPKG_OVERRIDES_CSWpureftpd += file-with-bad-content|/usr/share|root/opt/csw/share/man/man8/pure-ftpd.8 GARCOMPILER = GNU -# configure args CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-everything CONFIGURE_ARGS += --with-paranoidmsg @@ -42,7 +41,8 @@ CONFIGURE_ARGS += --with-altlog CONFIGURE_ARGS += --with-brokenrealpath CONFIGURE_ARGS += --enable-largefile -CONFIGURE_ARGS += --sysconfdir=$(prefix)/etc/$(SRCNAME) +CONFIGURE_ARGS += --sysconfdir=$(prefix)/etc/pure-ftpd +CONFIGURE_ARGS += --with-ldap # use X/Open CAE specifications EXTRA_CFLAGS = -D_XOPEN_SOURCE=1 -D_XOPEN_SOURCE_EXTENDED=1 @@ -50,15 +50,12 @@ # No test suite available TEST_SCRIPTS = -sysconfdir = /etc/opt/csw -SAMPLECONF = $(sysconfdir)/$(SRCNAME)/*.conf +SAMPLECONF = $(sysconfdir)/pure-ftpd/*.conf -CHECKPKG_OVERRIDES_CSWpureftpd += file-with-bad-content|/usr/share|root/opt/csw/share/man/man8/pure-ftpd.8 - include gar/category.mk # make sure, the linker uses libcrypt before libssl -post-configure-modulated: +post-configure: @perl -pi -e 's at -lssl -lcrypto -lcrypt at -lcrypt -lssl -lcrypto@' \ ${WORKSRC}/Makefile @perl -pi -e 's at -lssl -lcrypto -lcrypt at -lcrypt -lssl -lcrypto@' \ @@ -66,14 +63,13 @@ # strange archive... -post-build-modulated: +post-build: @chmod 751 $(WORKSRC)/x # create config directory -pre-install-modulated: - ginstall -d $(DESTDIR)$(sysconfdir)/$(SRCNAME) - ginstall -d $(DESTDIR)$(docdir)/$(SRCNAME) - ginstall -d $(DESTDIR)$(docdir)/$(NAME) +pre-install: + ginstall -d $(DESTDIR)$(sysconfdir)/pure-ftpd + ginstall -d $(DESTDIR)$(docdir)/pure-ftpd ginstall -d $(DESTDIR)/var/opt/csw/run perl -pi -e 's@/var/run@/var/opt/csw/run@' ${WORKSRC}/src/ftpd.h perl -pi -e 's@/var/run@/var/opt/csw/run@' ${WORKSRC}/src/ftpwho-update.h @@ -83,10 +79,9 @@ conf-list = $(WORKSRC)/pureftpd-ldap.conf conf-list += $(WORKSRC)/pureftpd-mysql.conf conf-list += $(WORKSRC)/pureftpd-pgsql.conf -post-install-modulated: +post-install: ( for file in $(conf-list) ; do \ - ginstall -m 644 $$file $(DESTDIR)$(sysconfdir)/$(SRCNAME) ; \ + ginstall -m 644 $$file $(DESTDIR)$(sysconfdir)/pure-ftpd ; \ done ) - ginstall -m 644 $(WORKSRC)/pureftpd.schema $(DESTDIR)$(docdir)/$(SRCNAME) - ginstall -m 644 $(WORKSRC)/COPYING $(DESTDIR)$(docdir)/$(NAME)/license + ginstall -m 644 $(WORKSRC)/pureftpd.schema $(DESTDIR)$(docdir)/pure-ftpd @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Dec 12 22:28:25 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 12 Dec 2013 21:28:25 +0000 Subject: SF.net SVN: gar:[22685] csw/mgar/pkg/koha/trunk Message-ID: <3dgSmx5f2Wz17q@mail.opencsw.org> Revision: 22685 http://sourceforge.net/p/gar/code/22685 Author: bonivart Date: 2013-12-12 21:28:24 +0000 (Thu, 12 Dec 2013) Log Message: ----------- koha/trunk: some deps added Modified Paths: -------------- csw/mgar/pkg/koha/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/koha/trunk/files/COPYING Modified: csw/mgar/pkg/koha/trunk/Makefile =================================================================== --- csw/mgar/pkg/koha/trunk/Makefile 2013-12-12 19:35:59 UTC (rev 22684) +++ csw/mgar/pkg/koha/trunk/Makefile 2013-12-12 21:28:24 UTC (rev 22685) @@ -21,57 +21,94 @@ CONFIGURE_ARGS = $(DIRPATHS) +# Dependencies RUNTIME_DEP_PKGS += CSWapache2 RUNTIME_DEP_PKGS += CSWidzebra RUNTIME_DEP_PKGS += CSWmysql5 RUNTIME_DEP_PKGS += CSWperl RUNTIME_DEP_PKGS += CSWyaz -#RUNTIME_DEP_PKGS += CSWimagemagick -RUNTIME_DEP_PKGS += CSWpmalgorithmchkdig +# Already in experimental +RUNTIME_DEP_PKGS += CSWpm-business-isbn +RUNTIME_DEP_PKGS += CSWpm-cgi-session-serializ-yaml +RUNTIME_DEP_PKGS += CSWpm-email-date +RUNTIME_DEP_PKGS += CSWpm-http-oai +RUNTIME_DEP_PKGS += CSWpm-xml-sax-writer +# Needs to be built +RUNTIME_DEP_PKGS += CSWpm-cache-memcached-fast +RUNTIME_DEP_PKGS += CSWpm-chi +RUNTIME_DEP_PKGS += CSWpm-datetime-format-dateparse +RUNTIME_DEP_PKGS += CSWpm-datetime-format-strptime +RUNTIME_DEP_PKGS += CSWpm-dbix-connector +RUNTIME_DEP_PKGS += CSWpm-http-exception +RUNTIME_DEP_PKGS += CSWpm-http-message +RUNTIME_DEP_PKGS += CSWpm-modern-perl +RUNTIME_DEP_PKGS += CSWpm-moose +RUNTIME_DEP_PKGS += CSWpm-moosex-role-parameterized +RUNTIME_DEP_PKGS += CSWpm-rose-db +RUNTIME_DEP_PKGS += CSWpm-rose-db-object +RUNTIME_DEP_PKGS += CSWpm-squatting +RUNTIME_DEP_PKGS += CSWpm-squatting-on-psgi +RUNTIME_DEP_PKGS += CSWpm-text-aspell +RUNTIME_DEP_PKGS += CSWpm-xml-sax-expatxs +# Perl modules needed +RUNTIME_DEP_PKGS += CSWpm-algorithm-checkdigits +RUNTIME_DEP_PKGS += CSWpm-cache-memcached +RUNTIME_DEP_PKGS += CSWpm-cgi-session +RUNTIME_DEP_PKGS += CSWpm-class-accessor +RUNTIME_DEP_PKGS += CSWpm-dbi +RUNTIME_DEP_PKGS += CSWpm-json +RUNTIME_DEP_PKGS += CSWpm-libwww-perl +RUNTIME_DEP_PKGS += CSWpm-list-moreutils +RUNTIME_DEP_PKGS += CSWpm-marc-charset +RUNTIME_DEP_PKGS += CSWpm-mime-base64 +RUNTIME_DEP_PKGS += CSWpm-plack +RUNTIME_DEP_PKGS += CSWpm-poe +RUNTIME_DEP_PKGS += CSWpm-schedule-at +RUNTIME_DEP_PKGS += CSWpm-try-tiny +RUNTIME_DEP_PKGS += CSWpm-uri +RUNTIME_DEP_PKGS += CSWpm-xml-sax +# Old style modules RUNTIME_DEP_PKGS += CSWpmbiblioendnotest -RUNTIME_DEP_PKGS += CSWpmcgisession RUNTIME_DEP_PKGS += CSWpmclassadapter RUNTIME_DEP_PKGS += CSWpmclassfactutil -RUNTIME_DEP_PKGS += CSWpmclsaccessor +RUNTIME_DEP_PKGS += CSWpmdataical RUNTIME_DEP_PKGS += CSWpmdatecalc RUNTIME_DEP_PKGS += CSWpmdateical -RUNTIME_DEP_PKGS += CSWpmdateleapyear RUNTIME_DEP_PKGS += CSWpmdatemanip -RUNTIME_DEP_PKGS += CSWpmdbi +RUNTIME_DEP_PKGS += CSWpmdatetime RUNTIME_DEP_PKGS += CSWpmdbdmysql -RUNTIME_DEP_PKGS += CSWpmdublincorerecrd +RUNTIME_DEP_PKGS += CSWpmfileslurp RUNTIME_DEP_PKGS += CSWpmgdbarcode RUNTIME_DEP_PKGS += CSWpmhtmlscrubber RUNTIME_DEP_PKGS += CSWpmhtmltemplatepro -RUNTIME_DEP_PKGS += CSWpmjson -RUNTIME_DEP_PKGS += CSWpmldap -RUNTIME_DEP_PKGS += CSWpmlibwww RUNTIME_DEP_PKGS += CSWpmlinguastem -RUNTIME_DEP_PKGS += CSWpmlistmoreutils RUNTIME_DEP_PKGS += CSWpmmailsendmail -RUNTIME_DEP_PKGS += CSWpm-marc-charset RUNTIME_DEP_PKGS += CSWpmmarccrswlkdblc RUNTIME_DEP_PKGS += CSWpmmarcrecord RUNTIME_DEP_PKGS += CSWpmmarcxml -RUNTIME_DEP_PKGS += CSWpmmimebase64 RUNTIME_DEP_PKGS += CSWpmmimelite +RUNTIME_DEP_PKGS += CSWpmnetip +RUNTIME_DEP_PKGS += CSWpmnetserver RUNTIME_DEP_PKGS += CSWpmnetz3950zoom RUNTIME_DEP_PKGS += CSWpmpdfapi2 RUNTIME_DEP_PKGS += CSWpmpdfreuse RUNTIME_DEP_PKGS += CSWpmpdfreusebarcode -RUNTIME_DEP_PKGS += CSWpmpoe -RUNTIME_DEP_PKGS += CSWpmscheduleat RUNTIME_DEP_PKGS += CSWpmsmssend RUNTIME_DEP_PKGS += CSWpmtextcsv RUNTIME_DEP_PKGS += CSWpmtextcsvxs -RUNTIME_DEP_PKGS += CSWpmtextwrap +RUNTIME_DEP_PKGS += CSWpmtexticonv +RUNTIME_DEP_PKGS += CSWpmtextwrapper RUNTIME_DEP_PKGS += CSWpmxmldumper RUNTIME_DEP_PKGS += CSWpmxmllibxml RUNTIME_DEP_PKGS += CSWpmxmllibxslt RUNTIME_DEP_PKGS += CSWpmxmlrss -RUNTIME_DEP_PKGS += CSWpmxmlsax RUNTIME_DEP_PKGS += CSWpmxmlsimple RUNTIME_DEP_PKGS += CSWpmyamlsyck +# Suspected not needed, try without +#RUNTIME_DEP_PKGS += CSWimagemagick +#RUNTIME_DEP_PKGS += CSWpmdateleapyear +#RUNTIME_DEP_PKGS += CSWpmdublincorerecrd +#RUNTIME_DEP_PKGS += CSWpm-ldap # Temporary #CHECKPKG_OVERRIDES_CSWkoha += unidentified-dependency Deleted: csw/mgar/pkg/koha/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/koha/trunk/files/COPYING 2013-12-12 19:35:59 UTC (rev 22684) +++ csw/mgar/pkg/koha/trunk/files/COPYING 2013-12-12 21:28:24 UTC (rev 22685) @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) 19yy - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) 19yy name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Thu Dec 12 23:07:17 2013 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Thu, 12 Dec 2013 22:07:17 +0000 Subject: SF.net SVN: gar:[22686] csw/mgar/pkg/dovecot/trunk/Makefile Message-ID: <3dgTdW1NCZz1G8@mail.opencsw.org> Revision: 22686 http://sourceforge.net/p/gar/code/22686 Author: jake_goerzen Date: 2013-12-12 22:07:17 +0000 (Thu, 12 Dec 2013) Log Message: ----------- dovecot: add CSWlibintl8 dependancy and also overried to handle buildfarm ld being out of sync Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2013-12-12 21:28:24 UTC (rev 22685) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2013-12-12 22:07:17 UTC (rev 22686) @@ -42,6 +42,7 @@ RUNTIME_DEP_PKGS_CSWdovecot += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWdovecot += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWdovecot += CSWliblzma5 +RUNTIME_DEP_PKGS_CSWdovecot += CSWlibintl8 PKGFILES_CSWdovecot-dev = $(PKGFILES_DEVEL) @@ -89,6 +90,9 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +# override needed until ld inconsistancy is resolved on buildfarm +CHECKPKG_OVERRIDES_CSWdovecot += surplus-dependency|CSWlibintl8 + include gar/category.mk pre-install-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Dec 13 08:19:55 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 13 Dec 2013 07:19:55 +0000 Subject: SF.net SVN: gar:[22687] csw/mgar/pkg/evince/trunk Message-ID: <3dgjvM3PcSzP3@mail.opencsw.org> Revision: 22687 http://sourceforge.net/p/gar/code/22687 Author: cgrzemba Date: 2013-12-13 07:19:53 +0000 (Fri, 13 Dec 2013) Log Message: ----------- evince/trunk: update version 2.32.0, but it stops with core Modified Paths: -------------- csw/mgar/pkg/evince/trunk/Makefile csw/mgar/pkg/evince/trunk/checksums Added Paths: ----------- csw/mgar/pkg/evince/trunk/files/0003-libxml-2.0.pc-workaround Modified: csw/mgar/pkg/evince/trunk/Makefile =================================================================== --- csw/mgar/pkg/evince/trunk/Makefile 2013-12-12 22:07:17 UTC (rev 22686) +++ csw/mgar/pkg/evince/trunk/Makefile 2013-12-13 07:19:53 UTC (rev 22687) @@ -3,8 +3,8 @@ # $Id$ NAME = evince -GNOME_VERSION = 2.30 -VERSION = $(GNOME_VERSION).3 +GNOME_VERSION = 2.32 +VERSION = $(GNOME_VERSION).0 CATEGORIES = gnome GARTYPE = v2 DESCRIPTION = Document viewer for multiple document formats: pdf, ps ,dvi @@ -17,15 +17,18 @@ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz # GARFLAVOR = DBG -# GARCOMPILER=GNU -GARCOMPILER=SOS12U3 +GARCOMPILER=GCC4 +# GARCOMPILER=SOS12U3 STRIP_LIBTOOL = 1 PATCHFILES += 0001-honor-aclocal_flags.patch -PATCHFILES += 0002-poppler-api-changed.patch -PATCHFILES += 0001-add-norunpath-to-allowed-compiler-flags-ltmain.sh.patch +# PATCHFILES += 0002-poppler-api-changed.patch +# PATCHFILES += 0001-add-norunpath-to-allowed-compiler-flags-ltmain.sh.patch PATCHFILES += 0001-fix-poppler-api-linearized-problem.patch +# remove this patch if Mantis 5130 is closed!!! +# PATCHFILES += 0003-libxml-2.0.pc-workaround + PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 CONFIGURE_ARGS = $(DIRPATHS) @@ -40,64 +43,84 @@ # EXTRA_CFLAGS_DBG = -g # EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(GARFLAVOR)) # EXTRA_CXXFLAGS += -DPOPPLER_WITH_GDK -EXTRA_CXXFLAGS += -DHAVE_POPPLER_PAGE_RENDER -DPOPPLER_HAS_CAIRO -norunpath -EXTRA_CFLAGS += -I/opt/csw/include/nautilus -I/opt/csw/include/gnome-vfs-2.0 -xnorunpath +EXTRA_CXXFLAGS += -DHAVE_POPPLER_PAGE_RENDER -DPOPPLER_HAS_CAIRO # -norunpath +EXTRA_CFLAGS += -I/opt/csw/include/nautilus -I/opt/csw/include/gnome-vfs-2.0 # -xnorunpath +EXTRA_CONFIGURE_ENV += PATH=/opt/csw/gnu:$(PATH) +EXTRA_INSTALL_ENV += PATH=/opt/csw/gnu:$(PATH) EXTRA_LD_OPTIONS = -lm +# EXTRA_LD_OPTIONS = -lgmodule-2.0 -lm -lz # EXTRA_LINKER_FLAGS = -norunpath -xnorunpath # EXTRA_LD_OPTIONS = /opt/csw/X11/lib/libX11.so -lm # There are no shared-object dependencies on CSWdbus, but it's required for # evince to work. +EXTRA_BUILD_ENV = V=1 -PACKAGES += CSWlibevdocument2 -CATALOGNAME_CSWlibevdocument2 = libevdocument2 -PKGFILES_CSWlibevdocument2 += $(call baseisadirs,$(libdir),libevdocument\.so\.2\.0\.0) -PKGFILES_CSWlibevdocument2 += $(call baseisadirs,$(libdir),libevdocument\.so\.2(\.\d+)*) -SPKG_DESC_CSWlibevdocument2 += $(DESCRIPTION), libevdocument.so.2 -RUNTIME_DEP_PKGS_CSWlibevdocument2 += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWlibevdocument2 += CSWlibgdk-x11-2-0-0 -RUNTIME_DEP_PKGS_CSWlibevdocument2 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibevdocument2 += CSWlibgdk-pixbuf2-0-0 -RUNTIME_DEP_PKGS_CSWlibevdocument2 += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWlibevdocument2 += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibevdocument2 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibevdocument2 += CSWlibgtk-x11-2-0-0 -RUNTIME_DEP_PKGS_CSWlibevdocument2 += CSWlibgio2-0-0 +PACKAGES += CSWlibevdocument3 +CATALOGNAME_CSWlibevdocument3 = libevdocument3 +PKGFILES_CSWlibevdocument3 += $(call baseisadirs,$(libdir),libevdocument\.so\.3\.0\.0) +PKGFILES_CSWlibevdocument3 += $(call baseisadirs,$(libdir),libevdocument\.so\.3(\.\d+)*) +SPKG_DESC_CSWlibevdocument3 += $(DESCRIPTION), libevdocument.so.3 +RUNTIME_DEP_PKGS_CSWlibevdocument3 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibevdocument3 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibevdocument3 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibevdocument3 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibevdocument3 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibevdocument3 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibevdocument3 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibevdocument3 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibevdocument3 += CSWlibgdk-pixbuf2-0-0 +# sparc, there is not realy a difference either elfdump nor ldd +RUNTIME_DEP_PKGS_CSWlibevdocument3_sparc += CSWlibpango1-0-0 +RUNTIME_DEP_PKGS_CSWlibevdocument3_sparc+= CSWlibpangoft2-1-0-0 +RUNTIME_DEP_PKGS_CSWlibevdocument3_sparc += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibevdocument3_sparc += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibevdocument3_sparc += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWlibevdocument3_sparc += CSWlibpangocairo1-0-0 +RUNTIME_DEP_PKGS_CSWlibevdocument3 += $(RUNTIME_DEP_PKGS_CSWlibevdocument3_$(GARCH)) -PACKAGES += CSWlibevview2 -CATALOGNAME_CSWlibevview2 = libevview2 -PKGFILES_CSWlibevview2 += $(call baseisadirs,$(libdir),libevview\.so\.2\.0\.0) -PKGFILES_CSWlibevview2 += $(call baseisadirs,$(libdir),libevview\.so\.2(\.\d+)*) -SPKG_DESC_CSWlibevview2 += $(DESCRIPTION), libevview.so.2 -RUNTIME_DEP_PKGS_CSWlibevview2 += CSWlibevdocument2 -RUNTIME_DEP_PKGS_CSWlibevview2 += CSWlibgdk-x11-2-0-0 -RUNTIME_DEP_PKGS_CSWlibevview2 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibevview2 += CSWlibgdk-pixbuf2-0-0 -RUNTIME_DEP_PKGS_CSWlibevview2 += CSWlibatk1-0-0 -RUNTIME_DEP_PKGS_CSWlibevview2 += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWlibevview2 += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibevview2 += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWlibevview2 += CSWpango -RUNTIME_DEP_PKGS_CSWlibevview2 += CSWlibgtk-x11-2-0-0 -RUNTIME_DEP_PKGS_CSWlibevview2 += CSWlibglib2-0-0 +PACKAGES += CSWlibevview3 +CATALOGNAME_CSWlibevview3 = libevview3 +PKGFILES_CSWlibevview3 += $(call baseisadirs,$(libdir),libevview\.so\.3\.0\.0) +PKGFILES_CSWlibevview3 += $(call baseisadirs,$(libdir),libevview\.so\.3(\.\d+)*) +SPKG_DESC_CSWlibevview3 += $(DESCRIPTION), libevview.so.3 +RUNTIME_DEP_PKGS_CSWlibevview3 += CSWlibevdocument3 +RUNTIME_DEP_PKGS_CSWlibevview3 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibevview3 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibevview3 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibevview3 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibevview3 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibevview3 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibevview3 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibevview3 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibevview3 += CSWlibgailutil18 +RUNTIME_DEP_PKGS_CSWlibevview3 += CSWlibpango1-0-0 +RUNTIME_DEP_PKGS_CSWlibevview3 += CSWlibgcc-s1 +# sparc, there is not realy a difference either elfdump nor ldd +RUNTIME_DEP_PKGS_CSWlibevview3_sparc += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibevview3_sparc += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibevview3_sparc += CSWlibpangocairo1-0-0 +RUNTIME_DEP_PKGS_CSWlibevview3_sparc += CSWlibpangoft2-1-0-0 +RUNTIME_DEP_PKGS_CSWlibevview3_sparc += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWlibevview3 += $(RUNTIME_DEP_PKGS_CSWlibevview3_$(GARCH)) PACKAGES += CSWevince-dev CATALOGNAME_CSWevince-dev = evince_dev SPKG_DESC_CSWevince-dev += $(DESCRIPTION), development files PKGFILES_CSWevince-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWevince-dev += CSWlibevdocument2 -RUNTIME_DEP_PKGS_CSWevince-dev += CSWlibevview2 +RUNTIME_DEP_PKGS_CSWevince-dev += CSWlibevdocument3 +RUNTIME_DEP_PKGS_CSWevince-dev += CSWlibevview3 +RUNTIME_DEP_PKGS_CSWevince-dev += CSWevince PACKAGES += CSWevince SPKG_DESC_CSWevince += $(DESCRIPTION), base -RUNTIME_DEP_PKGS_CSWevince += CSWlibevdocument2 -RUNTIME_DEP_PKGS_CSWevince += CSWlibevview2 +RUNTIME_DEP_PKGS_CSWevince += CSWlibevdocument3 +RUNTIME_DEP_PKGS_CSWevince += CSWlibevview3 RUNTIME_DEP_PKGS_CSWevince += CSWlibdjvulibre21 RUNTIME_DEP_PKGS_CSWevince += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWevince += CSWlibintl8 RUNTIME_DEP_PKGS_CSWevince += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWevince += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWevince += CSWlibdbus-glib1-2 RUNTIME_DEP_PKGS_CSWevince += CSWlibspectre1 RUNTIME_DEP_PKGS_CSWevince += CSWlibgdk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWevince += CSWlibgconf2-4 @@ -106,13 +129,21 @@ RUNTIME_DEP_PKGS_CSWevince += CSWlibgnome-keyring0 RUNTIME_DEP_PKGS_CSWevince += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWevince += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWevince += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWevince += CSWlibtiff5 RUNTIME_DEP_PKGS_CSWevince += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWevince += CSWlibpoppler-glib8 RUNTIME_DEP_PKGS_CSWevince += CSWlibkpathsea6 -# RUNTIME_DEP_PKGS_CSWevince += CSWgnomevfs2 -# RUNTIME_DEP_PKGS_CSWevince += CSWnautilus -# RUNTIME_DEP_PKGS_CSWevince += CSWdbus +RUNTIME_DEP_PKGS_CSWevince += CSWlibgcc-s1 +# sparc, there is not realy a difference either elfdump nor ldd +RUNTIME_DEP_PKGS_CSWevince_sparc += CSWlibpango1-0-0 +RUNTIME_DEP_PKGS_CSWevince_sparc += CSWlibpangoft2-1-0-0 +RUNTIME_DEP_PKGS_CSWevince_sparc += CSWlibz1 +RUNTIME_DEP_PKGS_CSWevince_sparc += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWevince_sparc += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWevince_sparc += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWevince_sparc += CSWlibpangocairo1-0-0 +RUNTIME_DEP_PKGS_CSWevince += $(RUNTIME_DEP_PKGS_CSWevince_$(GARCH)) + # at least the machine-id file must exist, dbus-daemon creates this # CHECKPKG_OVERRIDES_CSWevince += surplus-dependency|CSWdbus # Solaris10 paths: these are resuts of cmd: @@ -262,5 +293,4 @@ # automake-1.11 --add-missing --copy --force-missing ) # @$(MAKECOOKIE) -PATH := /opt/csw/gnu:$(PATH) AM_DEFAULT_VERBOSITY := 1 Modified: csw/mgar/pkg/evince/trunk/checksums =================================================================== --- csw/mgar/pkg/evince/trunk/checksums 2013-12-12 22:07:17 UTC (rev 22686) +++ csw/mgar/pkg/evince/trunk/checksums 2013-12-13 07:19:53 UTC (rev 22687) @@ -1 +1 @@ -4614e108cc4fda94bac2a242e490408a evince-2.30.3.tar.gz +f2621208fe255acab4172c0216a55504 evince-2.32.0.tar.gz Added: csw/mgar/pkg/evince/trunk/files/0003-libxml-2.0.pc-workaround =================================================================== --- csw/mgar/pkg/evince/trunk/files/0003-libxml-2.0.pc-workaround (rev 0) +++ csw/mgar/pkg/evince/trunk/files/0003-libxml-2.0.pc-workaround 2013-12-13 07:19:53 UTC (rev 22687) @@ -0,0 +1,26 @@ +From c0aa9fa861d6488980e6729bd6a275a7ac26f939 Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Thu, 12 Dec 2013 11:23:45 +0100 +Subject: [PATCH 3/3] libxml-2.0.ps workaround + +--- + configure | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure b/configure +index e63571a..7a270d4 100755 +--- a/configure ++++ b/configure +@@ -20398,7 +20399,8 @@ fi + + if test "x$enable_pdf" = "xyes"; then + evince_save_LIBS=$LIBS +- LIBS="$LIBS $POPPLER_LIBS" ++ LIBS="$LIBS $POPPLER_LIBS -lz" ++ echo "#### LIBS: $LIBS" + for ac_func in poppler_page_get_text_layout + do : + ac_fn_c_check_func "$LINENO" "poppler_page_get_text_layout" "ac_cv_func_poppler_page_get_text_layout" +-- +1.8.4.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Dec 13 11:49:55 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 13 Dec 2013 10:49:55 +0000 Subject: SF.net SVN: gar:[22688] csw/mgar/pkg/mplayer/branches/snapshot Message-ID: <3dgpYf2cY7z12g@mail.opencsw.org> Revision: 22688 http://sourceforge.net/p/gar/code/22688 Author: pfelecan Date: 2013-12-13 10:49:51 +0000 (Fri, 13 Dec 2013) Log Message: ----------- mplayer/branches/snapshot: - today's snapshot - tweaked dependencies, especially those related to mpg123 split - mencoder is not a symbolic link Modified Paths: -------------- csw/mgar/pkg/mplayer/branches/snapshot/Makefile csw/mgar/pkg/mplayer/branches/snapshot/checksums Modified: csw/mgar/pkg/mplayer/branches/snapshot/Makefile =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-12-13 07:19:53 UTC (rev 22687) +++ csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-12-13 10:49:51 UTC (rev 22688) @@ -71,7 +71,7 @@ BUILD_DEP_PKGS += CSWlibx264-dev BUILD_DEP_PKGS += CSWlibxvidcore-dev BUILD_DEP_PKGS += CSWmesa -BUILD_DEP_PKGS += CSWmpg123 +BUILD_DEP_PKGS += CSWlibmpg123-dev BUILD_DEP_PKGS += CSWnas BUILD_DEP_PKGS += CSWunrar BUILD_DEP_PKGS += CSWlibxmms-dev @@ -115,7 +115,7 @@ RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWlibxvidcore4 RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWlibz1 RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWmesa -RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWmpg123 +RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWlibmpg123-0 RUNTIME_DEP_PKGS_CSWmplayer-snapshot += CSWnas CHECKPKG_OVERRIDES_CSWmplayer-snapshot += no-direct-binding|/opt/csw/bin/mplayer-snapshot|is|not|directly|bound|to|soname|libGL.so @@ -172,9 +172,54 @@ PKGFILES_CSWmencoder-snapshot += /opt/csw/bin/mencoder-snapshot PKGFILES_CSWmencoder-snapshot += /opt/csw/share/man/man1/mencoder-snapshot.1 PKGFILES_CSWmencoder-snapshot += /opt/csw/share/man/cat1/mencoder-snapshot.1 -ARCHALL_CSWmencoder-snapshot = 1 RUNTIME_DEP_PKGS_CSWmencoder-snapshot += CSWmplayer-snapshot CHECKPKG_OVERRIDES_CSWmencoder-snapshot += surplus-dependency|CSWmplayer-snapshot +RUNTIME_DEP_PKGS_CSWmencoder-snapshot += CSWfaac +RUNTIME_DEP_PKGS_CSWmencoder-snapshot += CSWliba52 +RUNTIME_DEP_PKGS_CSWmencoder-snapshot += CSWlibfaad2 +RUNTIME_DEP_PKGS_CSWmencoder-snapshot += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWmencoder-snapshot += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWmencoder-snapshot += CSWlibfribidi0 +RUNTIME_DEP_PKGS_CSWmencoder-snapshot += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWmencoder-snapshot += CSWlibjpeg62 +RUNTIME_DEP_PKGS_CSWmencoder-snapshot += CSWliblzo2-2 +RUNTIME_DEP_PKGS_CSWmencoder-snapshot += CSWlibmad0 +RUNTIME_DEP_PKGS_CSWmencoder-snapshot += CSWlibmp3lame0 +RUNTIME_DEP_PKGS_CSWmencoder-snapshot += CSWlibmpg123-0 +RUNTIME_DEP_PKGS_CSWmencoder-snapshot += CSWlibogg0 +RUNTIME_DEP_PKGS_CSWmencoder-snapshot += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWmencoder-snapshot += CSWlibrtmp0 +RUNTIME_DEP_PKGS_CSWmencoder-snapshot += CSWlibspeex1 +RUNTIME_DEP_PKGS_CSWmencoder-snapshot += CSWlibtheoradec1 +RUNTIME_DEP_PKGS_CSWmencoder-snapshot += CSWlibvorbis0 +RUNTIME_DEP_PKGS_CSWmencoder-snapshot += CSWlibvorbisenc2 +RUNTIME_DEP_PKGS_CSWmencoder-snapshot += CSWlibx264-133 +RUNTIME_DEP_PKGS_CSWmencoder-snapshot += CSWlibxvidcore4 +RUNTIME_DEP_PKGS_CSWmencoder-snapshot += CSWlibz1 +CHECKPKG_OVERRIDES_CSWmencoder-snapshot += no-direct-binding|/opt/csw/bin/mencoder-snapshot|is|not|directly|bound|to|soname|liba52.so.0 +CHECKPKG_OVERRIDES_CSWmencoder-snapshot += no-direct-binding|/opt/csw/bin/mencoder-snapshot|is|not|directly|bound|to|soname|libbz2.so.1 +CHECKPKG_OVERRIDES_CSWmencoder-snapshot += no-direct-binding|/opt/csw/bin/mencoder-snapshot|is|not|directly|bound|to|soname|libfaac.so.0 +CHECKPKG_OVERRIDES_CSWmencoder-snapshot += no-direct-binding|/opt/csw/bin/mencoder-snapshot|is|not|directly|bound|to|soname|libfaad.so.2 +CHECKPKG_OVERRIDES_CSWmencoder-snapshot += no-direct-binding|/opt/csw/bin/mencoder-snapshot|is|not|directly|bound|to|soname|libfontconfig.so.1 +CHECKPKG_OVERRIDES_CSWmencoder-snapshot += no-direct-binding|/opt/csw/bin/mencoder-snapshot|is|not|directly|bound|to|soname|libfreetype.so.6 +CHECKPKG_OVERRIDES_CSWmencoder-snapshot += no-direct-binding|/opt/csw/bin/mencoder-snapshot|is|not|directly|bound|to|soname|libfribidi.so.0 +CHECKPKG_OVERRIDES_CSWmencoder-snapshot += no-direct-binding|/opt/csw/bin/mencoder-snapshot|is|not|directly|bound|to|soname|libiconv.so.2 +CHECKPKG_OVERRIDES_CSWmencoder-snapshot += no-direct-binding|/opt/csw/bin/mencoder-snapshot|is|not|directly|bound|to|soname|libjpeg.so.62 +CHECKPKG_OVERRIDES_CSWmencoder-snapshot += no-direct-binding|/opt/csw/bin/mencoder-snapshot|is|not|directly|bound|to|soname|libkstat.so.1 +CHECKPKG_OVERRIDES_CSWmencoder-snapshot += no-direct-binding|/opt/csw/bin/mencoder-snapshot|is|not|directly|bound|to|soname|liblzo2.so.2 +CHECKPKG_OVERRIDES_CSWmencoder-snapshot += no-direct-binding|/opt/csw/bin/mencoder-snapshot|is|not|directly|bound|to|soname|libmad.so.0 +CHECKPKG_OVERRIDES_CSWmencoder-snapshot += no-direct-binding|/opt/csw/bin/mencoder-snapshot|is|not|directly|bound|to|soname|libmp3lame.so.0 +CHECKPKG_OVERRIDES_CSWmencoder-snapshot += no-direct-binding|/opt/csw/bin/mencoder-snapshot|is|not|directly|bound|to|soname|libmpg123.so.0 +CHECKPKG_OVERRIDES_CSWmencoder-snapshot += no-direct-binding|/opt/csw/bin/mencoder-snapshot|is|not|directly|bound|to|soname|libogg.so.0 +CHECKPKG_OVERRIDES_CSWmencoder-snapshot += no-direct-binding|/opt/csw/bin/mencoder-snapshot|is|not|directly|bound|to|soname|libpng12.so.0 +CHECKPKG_OVERRIDES_CSWmencoder-snapshot += no-direct-binding|/opt/csw/bin/mencoder-snapshot|is|not|directly|bound|to|soname|librtmp.so.0 +CHECKPKG_OVERRIDES_CSWmencoder-snapshot += no-direct-binding|/opt/csw/bin/mencoder-snapshot|is|not|directly|bound|to|soname|libspeex.so.1 +CHECKPKG_OVERRIDES_CSWmencoder-snapshot += no-direct-binding|/opt/csw/bin/mencoder-snapshot|is|not|directly|bound|to|soname|libtheoradec.so.1 +CHECKPKG_OVERRIDES_CSWmencoder-snapshot += no-direct-binding|/opt/csw/bin/mencoder-snapshot|is|not|directly|bound|to|soname|libvorbis.so.0 +CHECKPKG_OVERRIDES_CSWmencoder-snapshot += no-direct-binding|/opt/csw/bin/mencoder-snapshot|is|not|directly|bound|to|soname|libvorbisenc.so.2 +CHECKPKG_OVERRIDES_CSWmencoder-snapshot += no-direct-binding|/opt/csw/bin/mencoder-snapshot|is|not|directly|bound|to|soname|libx264.so.133 +CHECKPKG_OVERRIDES_CSWmencoder-snapshot += no-direct-binding|/opt/csw/bin/mencoder-snapshot|is|not|directly|bound|to|soname|libxvidcore.so.4 +CHECKPKG_OVERRIDES_CSWmencoder-snapshot += no-direct-binding|/opt/csw/bin/mencoder-snapshot|is|not|directly|bound|to|soname|libz.so.1 PACKAGES += CSWmplayer-snapshot-doc CATALOGNAME_CSWmplayer-snapshot-doc = $(NAME)_snapshot_doc @@ -250,8 +295,7 @@ gtar --directory $(DESTDIR)/$(thehtmldocdir) --extract cd $(DESTDIR)/$(bindir) && \ mv mplayer mplayer-snapshot && \ - rm -f mencoder && \ - ln -s mplayer-snapshot mencoder-snapshot + mv mencoder mencoder-snapshot && \ cd $(DESTDIR)/$(mandir)/man1 && \ mv mplayer.1 mplayer-snapshot.1 && \ rm -f mencoder.1 && \ Modified: csw/mgar/pkg/mplayer/branches/snapshot/checksums =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/checksums 2013-12-13 07:19:53 UTC (rev 22687) +++ csw/mgar/pkg/mplayer/branches/snapshot/checksums 2013-12-13 10:49:51 UTC (rev 22688) @@ -1,2 +1,2 @@ -4a4e158e6a9b3075018ca1d534ec625c ffmpeg-snapshot.tar.bz2 -1c11768c04eaa8ecdf017a97f51769db mplayer-export-snapshot.tar.bz2 +3c126bb66528894aff1d498c9f47e3c2 ffmpeg-snapshot.tar.bz2 +de1c98b5eeba05bc26be3be946e2bbb1 mplayer-export-snapshot.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Dec 13 12:41:55 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 13 Dec 2013 11:41:55 +0000 Subject: SF.net SVN: gar:[22689] csw/mgar/pkg/mplayer/trunk/Makefile Message-ID: <3dgqjX3qJCz182@mail.opencsw.org> Revision: 22689 http://sourceforge.net/p/gar/code/22689 Author: pfelecan Date: 2013-12-13 11:41:52 +0000 (Fri, 13 Dec 2013) Log Message: ----------- mplayer/trunk: tweaked dependencies, especially those related to mpg123 split Modified Paths: -------------- csw/mgar/pkg/mplayer/trunk/Makefile Modified: csw/mgar/pkg/mplayer/trunk/Makefile =================================================================== --- csw/mgar/pkg/mplayer/trunk/Makefile 2013-12-13 10:49:51 UTC (rev 22688) +++ csw/mgar/pkg/mplayer/trunk/Makefile 2013-12-13 11:41:52 UTC (rev 22689) @@ -68,7 +68,7 @@ BUILD_DEP_PKGS += CSWlibx264-dev BUILD_DEP_PKGS += CSWlibxvidcore-dev BUILD_DEP_PKGS += CSWmesa -BUILD_DEP_PKGS += CSWmpg123 +BUILD_DEP_PKGS += CSWlibmpg123-dev BUILD_DEP_PKGS += CSWnas BUILD_DEP_PKGS += CSWunrar BUILD_DEP_PKGS += CSWlibxmms-dev @@ -111,7 +111,7 @@ RUNTIME_DEP_PKGS_CSWmplayer += CSWlibxvidcore4 RUNTIME_DEP_PKGS_CSWmplayer += CSWlibz1 RUNTIME_DEP_PKGS_CSWmplayer += CSWmesa -RUNTIME_DEP_PKGS_CSWmplayer += CSWmpg123 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibmpg123-0 RUNTIME_DEP_PKGS_CSWmplayer += CSWnas CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libGL.so @@ -188,7 +188,7 @@ RUNTIME_DEP_PKGS_CSWmencoder += CSWlibtheoradec1 RUNTIME_DEP_PKGS_CSWmencoder += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWmencoder += CSWlibmad0 -RUNTIME_DEP_PKGS_CSWmencoder += CSWmpg123 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibmpg123-0 CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|liba52.so.0 CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libbz2.so.1.0 CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfaac.so.0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Dec 14 11:27:35 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 14 Dec 2013 10:27:35 +0000 Subject: SF.net SVN: gar:[22690] csw/mgar/pkg/libicu51/trunk Message-ID: <3dhQ1V1pSZzqj@mail.opencsw.org> Revision: 22690 http://sourceforge.net/p/gar/code/22690 Author: dmichelsen Date: 2013-12-14 10:27:35 +0000 (Sat, 14 Dec 2013) Log Message: ----------- libicu51/trunk: Update to 51.2 Modified Paths: -------------- csw/mgar/pkg/libicu51/trunk/Makefile csw/mgar/pkg/libicu51/trunk/checksums Modified: csw/mgar/pkg/libicu51/trunk/Makefile =================================================================== --- csw/mgar/pkg/libicu51/trunk/Makefile 2013-12-13 11:41:52 UTC (rev 22689) +++ csw/mgar/pkg/libicu51/trunk/Makefile 2013-12-14 10:27:35 UTC (rev 22690) @@ -1,6 +1,6 @@ # $Id$ NAME = libicu -VERSION = 51.1 +VERSION = 51.2 GARTYPE = v2 DESCRIPTION = International Components for Unicode @@ -23,35 +23,42 @@ SPKG_DESC_CSWlibicui18n51 = International Components for Unicode, libicui18n.so.51 PKGFILES_CSWlibicui18n51 += $(call pkgfiles_lib,libicui18n.so.51) RUNTIME_DEP_PKGS_CSWlibicui18n51 += CSWlibicuuc51 +RUNTIME_DEP_PKGS_CSWlibicui18n51 += CSWlibicudata51 PACKAGES += CSWlibicuio51 SPKG_DESC_CSWlibicuio51 = International Components for Unicode, libicuio.so.51 PKGFILES_CSWlibicuio51 += $(call pkgfiles_lib,libicuio.so.51) RUNTIME_DEP_PKGS_CSWlibicuio51 += CSWlibicui18n51 RUNTIME_DEP_PKGS_CSWlibicuio51 += CSWlibicuuc51 +RUNTIME_DEP_PKGS_CSWlibicuio51 += CSWlibicudata51 PACKAGES += CSWlibicule51 SPKG_DESC_CSWlibicule51 = International Components for Unicode, libicule.so.51 PKGFILES_CSWlibicule51 += $(call pkgfiles_lib,libicule.so.51) RUNTIME_DEP_PKGS_CSWlibicule51 += CSWlibicuuc51 +RUNTIME_DEP_PKGS_CSWlibicule51 += CSWlibicudata51 PACKAGES += CSWlibiculx51 SPKG_DESC_CSWlibiculx51 = International Components for Unicode, libiculx.so.51 PKGFILES_CSWlibiculx51 += $(call pkgfiles_lib,libiculx.so.51) RUNTIME_DEP_PKGS_CSWlibiculx51 += CSWlibicuuc51 RUNTIME_DEP_PKGS_CSWlibiculx51 += CSWlibicule51 +RUNTIME_DEP_PKGS_CSWlibiculx51 += CSWlibicudata51 PACKAGES += CSWlibicutest51 SPKG_DESC_CSWlibicutest51 = International Components for Unicode, libicutest.so.51 PKGFILES_CSWlibicutest51 += $(call pkgfiles_lib,libicutest.so.51) RUNTIME_DEP_PKGS_CSWlibicutest51 += CSWlibicutu51 RUNTIME_DEP_PKGS_CSWlibicutest51 += CSWlibicuuc51 +RUNTIME_DEP_PKGS_CSWlibicutest51 += CSWlibicui18n51 +RUNTIME_DEP_PKGS_CSWlibicutest51 += CSWlibicudata51 PACKAGES += CSWlibicutu51 SPKG_DESC_CSWlibicutu51 = International Components for Unicode, libicutu.so.51 PKGFILES_CSWlibicutu51 += $(call pkgfiles_lib,libicutu.so.51) RUNTIME_DEP_PKGS_CSWlibicutu51 += CSWlibicuuc51 RUNTIME_DEP_PKGS_CSWlibicutu51 += CSWlibicui18n51 +RUNTIME_DEP_PKGS_CSWlibicutu51 += CSWlibicudata51 PACKAGES += CSWlibicuuc51 SPKG_DESC_CSWlibicuuc51 = International Components for Unicode, libicuuc.so.51 @@ -59,9 +66,9 @@ RUNTIME_DEP_PKGS_CSWlibicuuc51 += CSWlibicudata51 # This is the presence of /usr/share/lib/zoneinfo which is ok -CHECKPKG_OVERRIDES_CSWlibicuuc51 += file-with-bad-content|/usr/share|root/opt/csw/lib/libicuuc.so.51.1 -CHECKPKG_OVERRIDES_CSWlibicuuc51 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libicuuc.so.51.1 -CHECKPKG_OVERRIDES_CSWlibicuuc51 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libicuuc.so.51.1 +CHECKPKG_OVERRIDES_CSWlibicuuc51 += file-with-bad-content|/usr/share|root/opt/csw/lib/libicuuc.so.51.2 +CHECKPKG_OVERRIDES_CSWlibicuuc51 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libicuuc.so.51.2 +CHECKPKG_OVERRIDES_CSWlibicuuc51 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libicuuc.so.51.2 PACKAGES += CSWlibicu-dev SPKG_DESC_CSWlibicu-dev = Development files for libicu.so.51 Modified: csw/mgar/pkg/libicu51/trunk/checksums =================================================================== --- csw/mgar/pkg/libicu51/trunk/checksums 2013-12-13 11:41:52 UTC (rev 22689) +++ csw/mgar/pkg/libicu51/trunk/checksums 2013-12-14 10:27:35 UTC (rev 22690) @@ -1 +1 @@ -6eef33b229d0239d654983028c9c7053 icu4c-51_1-src.tgz +072e501b87065f3a0ca888f1b5165709 icu4c-51_2-src.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Dec 14 11:30:26 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 14 Dec 2013 10:30:26 +0000 Subject: SF.net SVN: gar:[22691] csw/mgar/pkg Message-ID: <3dhQ4c519Gzv6@mail.opencsw.org> Revision: 22691 http://sourceforge.net/p/gar/code/22691 Author: dmichelsen Date: 2013-12-14 10:30:22 +0000 (Sat, 14 Dec 2013) Log Message: ----------- libicu52: Initial commit Modified Paths: -------------- csw/mgar/pkg/libicu52/trunk/Makefile csw/mgar/pkg/libicu52/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libicu52/ Modified: csw/mgar/pkg/libicu52/trunk/Makefile =================================================================== --- csw/mgar/pkg/libicu51/trunk/Makefile 2013-11-06 14:25:24 UTC (rev 22420) +++ csw/mgar/pkg/libicu52/trunk/Makefile 2013-12-14 10:30:22 UTC (rev 22691) @@ -1,6 +1,6 @@ # $Id$ NAME = libicu -VERSION = 51.1 +VERSION = 52.1 GARTYPE = v2 DESCRIPTION = International Components for Unicode @@ -15,65 +15,72 @@ LICENSE = license.html -PACKAGES += CSWlibicudata51 -SPKG_DESC_CSWlibicudata51 = International Components for Unicode, libicudata.so.51 -PKGFILES_CSWlibicudata51 += $(call pkgfiles_lib,libicudata.so.51) +PACKAGES += CSWlibicudata52 +SPKG_DESC_CSWlibicudata52 = International Components for Unicode, libicudata.so.52 +PKGFILES_CSWlibicudata52 += $(call pkgfiles_lib,libicudata.so.52) -PACKAGES += CSWlibicui18n51 -SPKG_DESC_CSWlibicui18n51 = International Components for Unicode, libicui18n.so.51 -PKGFILES_CSWlibicui18n51 += $(call pkgfiles_lib,libicui18n.so.51) -RUNTIME_DEP_PKGS_CSWlibicui18n51 += CSWlibicuuc51 +PACKAGES += CSWlibicui18n52 +SPKG_DESC_CSWlibicui18n52 = International Components for Unicode, libicui18n.so.52 +PKGFILES_CSWlibicui18n52 += $(call pkgfiles_lib,libicui18n.so.52) +RUNTIME_DEP_PKGS_CSWlibicui18n52 += CSWlibicuuc52 +RUNTIME_DEP_PKGS_CSWlibicui18n52 += CSWlibicudata52 -PACKAGES += CSWlibicuio51 -SPKG_DESC_CSWlibicuio51 = International Components for Unicode, libicuio.so.51 -PKGFILES_CSWlibicuio51 += $(call pkgfiles_lib,libicuio.so.51) -RUNTIME_DEP_PKGS_CSWlibicuio51 += CSWlibicui18n51 -RUNTIME_DEP_PKGS_CSWlibicuio51 += CSWlibicuuc51 +PACKAGES += CSWlibicuio52 +SPKG_DESC_CSWlibicuio52 = International Components for Unicode, libicuio.so.52 +PKGFILES_CSWlibicuio52 += $(call pkgfiles_lib,libicuio.so.52) +RUNTIME_DEP_PKGS_CSWlibicuio52 += CSWlibicui18n52 +RUNTIME_DEP_PKGS_CSWlibicuio52 += CSWlibicuuc52 +RUNTIME_DEP_PKGS_CSWlibicuio52 += CSWlibicudata52 -PACKAGES += CSWlibicule51 -SPKG_DESC_CSWlibicule51 = International Components for Unicode, libicule.so.51 -PKGFILES_CSWlibicule51 += $(call pkgfiles_lib,libicule.so.51) -RUNTIME_DEP_PKGS_CSWlibicule51 += CSWlibicuuc51 +PACKAGES += CSWlibicule52 +SPKG_DESC_CSWlibicule52 = International Components for Unicode, libicule.so.52 +PKGFILES_CSWlibicule52 += $(call pkgfiles_lib,libicule.so.52) +RUNTIME_DEP_PKGS_CSWlibicule52 += CSWlibicuuc52 +RUNTIME_DEP_PKGS_CSWlibicule52 += CSWlibicudata52 -PACKAGES += CSWlibiculx51 -SPKG_DESC_CSWlibiculx51 = International Components for Unicode, libiculx.so.51 -PKGFILES_CSWlibiculx51 += $(call pkgfiles_lib,libiculx.so.51) -RUNTIME_DEP_PKGS_CSWlibiculx51 += CSWlibicuuc51 -RUNTIME_DEP_PKGS_CSWlibiculx51 += CSWlibicule51 +PACKAGES += CSWlibiculx52 +SPKG_DESC_CSWlibiculx52 = International Components for Unicode, libiculx.so.52 +PKGFILES_CSWlibiculx52 += $(call pkgfiles_lib,libiculx.so.52) +RUNTIME_DEP_PKGS_CSWlibiculx52 += CSWlibicuuc52 +RUNTIME_DEP_PKGS_CSWlibiculx52 += CSWlibicule52 +RUNTIME_DEP_PKGS_CSWlibiculx52 += CSWlibicudata52 -PACKAGES += CSWlibicutest51 -SPKG_DESC_CSWlibicutest51 = International Components for Unicode, libicutest.so.51 -PKGFILES_CSWlibicutest51 += $(call pkgfiles_lib,libicutest.so.51) -RUNTIME_DEP_PKGS_CSWlibicutest51 += CSWlibicutu51 -RUNTIME_DEP_PKGS_CSWlibicutest51 += CSWlibicuuc51 +PACKAGES += CSWlibicutest52 +SPKG_DESC_CSWlibicutest52 = International Components for Unicode, libicutest.so.52 +PKGFILES_CSWlibicutest52 += $(call pkgfiles_lib,libicutest.so.52) +RUNTIME_DEP_PKGS_CSWlibicutest52 += CSWlibicutu52 +RUNTIME_DEP_PKGS_CSWlibicutest52 += CSWlibicuuc52 +RUNTIME_DEP_PKGS_CSWlibicutest52 += CSWlibicui18n52 +RUNTIME_DEP_PKGS_CSWlibicutest52 += CSWlibicudata52 -PACKAGES += CSWlibicutu51 -SPKG_DESC_CSWlibicutu51 = International Components for Unicode, libicutu.so.51 -PKGFILES_CSWlibicutu51 += $(call pkgfiles_lib,libicutu.so.51) -RUNTIME_DEP_PKGS_CSWlibicutu51 += CSWlibicuuc51 -RUNTIME_DEP_PKGS_CSWlibicutu51 += CSWlibicui18n51 +PACKAGES += CSWlibicutu52 +SPKG_DESC_CSWlibicutu52 = International Components for Unicode, libicutu.so.52 +PKGFILES_CSWlibicutu52 += $(call pkgfiles_lib,libicutu.so.52) +RUNTIME_DEP_PKGS_CSWlibicutu52 += CSWlibicuuc52 +RUNTIME_DEP_PKGS_CSWlibicutu52 += CSWlibicui18n52 +RUNTIME_DEP_PKGS_CSWlibicutu52 += CSWlibicudata52 -PACKAGES += CSWlibicuuc51 -SPKG_DESC_CSWlibicuuc51 = International Components for Unicode, libicuuc.so.51 -PKGFILES_CSWlibicuuc51 += $(call pkgfiles_lib,libicuuc.so.51) -RUNTIME_DEP_PKGS_CSWlibicuuc51 += CSWlibicudata51 +PACKAGES += CSWlibicuuc52 +SPKG_DESC_CSWlibicuuc52 = International Components for Unicode, libicuuc.so.52 +PKGFILES_CSWlibicuuc52 += $(call pkgfiles_lib,libicuuc.so.52) +RUNTIME_DEP_PKGS_CSWlibicuuc52 += CSWlibicudata52 # This is the presence of /usr/share/lib/zoneinfo which is ok -CHECKPKG_OVERRIDES_CSWlibicuuc51 += file-with-bad-content|/usr/share|root/opt/csw/lib/libicuuc.so.51.1 -CHECKPKG_OVERRIDES_CSWlibicuuc51 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libicuuc.so.51.1 -CHECKPKG_OVERRIDES_CSWlibicuuc51 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libicuuc.so.51.1 +CHECKPKG_OVERRIDES_CSWlibicuuc52 += file-with-bad-content|/usr/share|root/opt/csw/lib/libicuuc.so.52.1 +CHECKPKG_OVERRIDES_CSWlibicuuc52 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libicuuc.so.52.1 +CHECKPKG_OVERRIDES_CSWlibicuuc52 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libicuuc.so.52.1 PACKAGES += CSWlibicu-dev -SPKG_DESC_CSWlibicu-dev = Development files for libicu.so.51 +SPKG_DESC_CSWlibicu-dev = Development files for libicu.so.52 # This package is PKGFILES catchall -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicudata51 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicui18n51 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuio51 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicule51 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibiculx51 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicutest51 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicutu51 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuuc51 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicudata52 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicui18n52 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuio52 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicule52 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibiculx52 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicutest52 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicutu52 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuuc52 DISTNAME = icu WORKSRC = $(WORKDIR)/$(DISTNAME)/source Modified: csw/mgar/pkg/libicu52/trunk/checksums =================================================================== --- csw/mgar/pkg/libicu51/trunk/checksums 2013-11-06 14:25:24 UTC (rev 22420) +++ csw/mgar/pkg/libicu52/trunk/checksums 2013-12-14 10:30:22 UTC (rev 22691) @@ -1 +1 @@ -6eef33b229d0239d654983028c9c7053 icu4c-51_1-src.tgz +9e96ed4c1d99c0d14ac03c140f9f346c icu4c-52_1-src.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Dec 14 15:17:55 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 14 Dec 2013 14:17:55 +0000 Subject: SF.net SVN: gar:[22692] csw/mgar/pkg/libicu51/trunk/Makefile Message-ID: <3dhW742cmNz15m@mail.opencsw.org> Revision: 22692 http://sourceforge.net/p/gar/code/22692 Author: dmichelsen Date: 2013-12-14 14:17:55 +0000 (Sat, 14 Dec 2013) Log Message: ----------- libicu51/trunk: Add overrides for linker differences Modified Paths: -------------- csw/mgar/pkg/libicu51/trunk/Makefile Modified: csw/mgar/pkg/libicu51/trunk/Makefile =================================================================== --- csw/mgar/pkg/libicu51/trunk/Makefile 2013-12-14 10:30:22 UTC (rev 22691) +++ csw/mgar/pkg/libicu51/trunk/Makefile 2013-12-14 14:17:55 UTC (rev 22692) @@ -82,6 +82,15 @@ RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicutu51 RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuuc51 +# For i386 due to different linker settings +CHECKPKG_OVERRIDES_CSWlibicutest51 += surplus-dependency|CSWlibicudata51 +CHECKPKG_OVERRIDES_CSWlibicutest51 += surplus-dependency|CSWlibicui18n51 +CHECKPKG_OVERRIDES_CSWlibicutu51 += surplus-dependency|CSWlibicudata51 +CHECKPKG_OVERRIDES_CSWlibicui18n51 += surplus-dependency|CSWlibicudata51 +CHECKPKG_OVERRIDES_CSWlibiculx51 += surplus-dependency|CSWlibicudata51 +CHECKPKG_OVERRIDES_CSWlibicule51 += surplus-dependency|CSWlibicudata51 +CHECKPKG_OVERRIDES_CSWlibicuio51 += surplus-dependency|CSWlibicudata51 + DISTNAME = icu WORKSRC = $(WORKDIR)/$(DISTNAME)/source This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Dec 14 15:18:04 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 14 Dec 2013 14:18:04 +0000 Subject: SF.net SVN: gar:[22693] csw/mgar/pkg/libicu52/trunk/Makefile Message-ID: <3dhW7D5m5jz17J@mail.opencsw.org> Revision: 22693 http://sourceforge.net/p/gar/code/22693 Author: dmichelsen Date: 2013-12-14 14:18:02 +0000 (Sat, 14 Dec 2013) Log Message: ----------- libicu52/trunk: Add overrides for linker differences Modified Paths: -------------- csw/mgar/pkg/libicu52/trunk/Makefile Modified: csw/mgar/pkg/libicu52/trunk/Makefile =================================================================== --- csw/mgar/pkg/libicu52/trunk/Makefile 2013-12-14 14:17:55 UTC (rev 22692) +++ csw/mgar/pkg/libicu52/trunk/Makefile 2013-12-14 14:18:02 UTC (rev 22693) @@ -82,6 +82,15 @@ RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicutu52 RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuuc52 +# For i386 due to different linker settings +CHECKPKG_OVERRIDES_CSWlibicutest51 += surplus-dependency|CSWlibicudata51 +CHECKPKG_OVERRIDES_CSWlibicutest51 += surplus-dependency|CSWlibicui18n51 +CHECKPKG_OVERRIDES_CSWlibicutu51 += surplus-dependency|CSWlibicudata51 +CHECKPKG_OVERRIDES_CSWlibicui18n51 += surplus-dependency|CSWlibicudata51 +CHECKPKG_OVERRIDES_CSWlibiculx51 += surplus-dependency|CSWlibicudata51 +CHECKPKG_OVERRIDES_CSWlibicule51 += surplus-dependency|CSWlibicudata51 +CHECKPKG_OVERRIDES_CSWlibicuio51 += surplus-dependency|CSWlibicudata51 + DISTNAME = icu WORKSRC = $(WORKDIR)/$(DISTNAME)/source This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Dec 14 15:49:54 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 14 Dec 2013 14:49:54 +0000 Subject: SF.net SVN: gar:[22694] csw/mgar/pkg/libicu52/trunk/Makefile Message-ID: <3dhWr12h8sz1Fv@mail.opencsw.org> Revision: 22694 http://sourceforge.net/p/gar/code/22694 Author: dmichelsen Date: 2013-12-14 14:49:52 +0000 (Sat, 14 Dec 2013) Log Message: ----------- libicu52/trunk: Fix typos Modified Paths: -------------- csw/mgar/pkg/libicu52/trunk/Makefile Modified: csw/mgar/pkg/libicu52/trunk/Makefile =================================================================== --- csw/mgar/pkg/libicu52/trunk/Makefile 2013-12-14 14:18:02 UTC (rev 22693) +++ csw/mgar/pkg/libicu52/trunk/Makefile 2013-12-14 14:49:52 UTC (rev 22694) @@ -83,13 +83,13 @@ RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuuc52 # For i386 due to different linker settings -CHECKPKG_OVERRIDES_CSWlibicutest51 += surplus-dependency|CSWlibicudata51 -CHECKPKG_OVERRIDES_CSWlibicutest51 += surplus-dependency|CSWlibicui18n51 -CHECKPKG_OVERRIDES_CSWlibicutu51 += surplus-dependency|CSWlibicudata51 -CHECKPKG_OVERRIDES_CSWlibicui18n51 += surplus-dependency|CSWlibicudata51 -CHECKPKG_OVERRIDES_CSWlibiculx51 += surplus-dependency|CSWlibicudata51 -CHECKPKG_OVERRIDES_CSWlibicule51 += surplus-dependency|CSWlibicudata51 -CHECKPKG_OVERRIDES_CSWlibicuio51 += surplus-dependency|CSWlibicudata51 +CHECKPKG_OVERRIDES_CSWlibicule52 += surplus-dependency|CSWlibicudata52 +CHECKPKG_OVERRIDES_CSWlibicutu52 += surplus-dependency|CSWlibicudata52 +CHECKPKG_OVERRIDES_CSWlibiculx52 += surplus-dependency|CSWlibicudata52 +CHECKPKG_OVERRIDES_CSWlibicuio52 += surplus-dependency|CSWlibicudata52 +CHECKPKG_OVERRIDES_CSWlibicutest52 += surplus-dependency|CSWlibicudata52 +CHECKPKG_OVERRIDES_CSWlibicutest52 += surplus-dependency|CSWlibicui18n52 +CHECKPKG_OVERRIDES_CSWlibicui18n52 += surplus-dependency|CSWlibicudata52 DISTNAME = icu WORKSRC = $(WORKDIR)/$(DISTNAME)/source This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Dec 14 18:21:54 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 14 Dec 2013 17:21:54 +0000 Subject: SF.net SVN: gar:[22695] csw/mgar/pkg/sqlite3/trunk Message-ID: <3dhbCG29s3z1RB@mail.opencsw.org> Revision: 22695 http://sourceforge.net/p/gar/code/22695 Author: dmichelsen Date: 2013-12-14 17:21:51 +0000 (Sat, 14 Dec 2013) Log Message: ----------- sqlite3/trunk: Update to 3080200 Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/Makefile csw/mgar/pkg/sqlite3/trunk/checksums Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2013-12-14 14:49:52 UTC (rev 22694) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2013-12-14 17:21:51 UTC (rev 22695) @@ -1,5 +1,5 @@ NAME = sqlite3 -VERSION = 3080100 +VERSION = 3080200 GARTYPE = v2 DESCRIPTION = An embeddable SQL engine in a C library Modified: csw/mgar/pkg/sqlite3/trunk/checksums =================================================================== --- csw/mgar/pkg/sqlite3/trunk/checksums 2013-12-14 14:49:52 UTC (rev 22694) +++ csw/mgar/pkg/sqlite3/trunk/checksums 2013-12-14 17:21:51 UTC (rev 22695) @@ -1,2 +1,2 @@ fc9432136482bcde03102bc3e06dd413 copyright-release.html -8b5a0a02dfcb0c7daf90856a5cfd485a sqlite-autoconf-3080100.tar.gz +f62206713e6a08d4ccbc60b1fd712a1a sqlite-autoconf-3080200.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Dec 15 20:50:48 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 15 Dec 2013 19:50:48 +0000 Subject: SF.net SVN: gar:[22696] csw/mgar/pkg/cppunit/trunk Message-ID: <3djGSp5dMqzn0@mail.opencsw.org> Revision: 22696 http://sourceforge.net/p/gar/code/22696 Author: dmichelsen Date: 2013-12-15 19:50:46 +0000 (Sun, 15 Dec 2013) Log Message: ----------- cppunit/trunk: Some last fixes Modified Paths: -------------- csw/mgar/pkg/cppunit/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cppunit/trunk/files/0003-Replace-macro-which-is-so-deprecated-that-its-use-is.patch Modified: csw/mgar/pkg/cppunit/trunk/Makefile =================================================================== --- csw/mgar/pkg/cppunit/trunk/Makefile 2013-12-14 17:21:51 UTC (rev 22695) +++ csw/mgar/pkg/cppunit/trunk/Makefile 2013-12-15 19:50:46 UTC (rev 22696) @@ -18,7 +18,8 @@ # http://sourceforge.net/tracker/?func=detail&aid=3483400&group_id=11795&atid=111795 PATCHFILES += cppunit-1.12.1-configure.in-fabs.patch -PATCHFILES += cppunit-1.12.1-configure.in-config-headers.patch +# Replace really outdated macros +PATCHFILES += 0003-Replace-macro-which-is-so-deprecated-that-its-use-is.patch PACKAGES += CSWlibcppunit1-12-1 SPKG_DESC_CSWlibcppunit1-12-1 = C++ port of JUnit, libcppunit-1.12.so.1 @@ -29,7 +30,7 @@ PACKAGES += CSWcppunit-dev SPKG_DESC_CSWcppunit-dev = Development files C++ port of JUnit # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWcppunit-dev += CSWlibcppunit1-12-1-gxx +RUNTIME_DEP_PKGS_CSWcppunit-dev += CSWlibcppunit1-12-1 RUNTIME_DEP_PKGS_CSWcppunit-dev += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWcppunit-dev += CSWlibstdc++6 @@ -42,6 +43,6 @@ include gar/category.mk -post-patch-modulated: +post-patch: cd $(WORKSRC) && autoreconf -fi @$(MAKECOOKIE) Added: csw/mgar/pkg/cppunit/trunk/files/0003-Replace-macro-which-is-so-deprecated-that-its-use-is.patch =================================================================== --- csw/mgar/pkg/cppunit/trunk/files/0003-Replace-macro-which-is-so-deprecated-that-its-use-is.patch (rev 0) +++ csw/mgar/pkg/cppunit/trunk/files/0003-Replace-macro-which-is-so-deprecated-that-its-use-is.patch 2013-12-15 19:50:46 UTC (rev 22696) @@ -0,0 +1,27 @@ +From d6fd9b4906bd5dd637e01d8b619c1e63f32a33ec Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sun, 15 Dec 2013 18:20:48 +0100 +Subject: [PATCH] Replace macro which is so deprecated that its use is an error + now + +--- + configure.in | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index 564d2d6..f22dbbb 100644 +--- a/configure.in ++++ b/configure.in +@@ -36,8 +36,7 @@ AC_SUBST(LT_CURRENT) + AC_SUBST(LT_REVISION) + AC_SUBST(LT_AGE) + +-AC_CONFIG_AUX_DIR(config) +-AM_CONFIG_HEADER(config/config.h) ++AC_CONFIG_HEADERS([config/config.h]) + AM_INIT_AUTOMAKE(cppunit, $CPPUNIT_VERSION) + + # General "with" options +-- +1.8.4.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Dec 15 21:31:35 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 15 Dec 2013 20:31:35 +0000 Subject: SF.net SVN: gar:[22697] csw/mgar/pkg/cppunit/trunk/Makefile Message-ID: <3djHMg4GMbzt7@mail.opencsw.org> Revision: 22697 http://sourceforge.net/p/gar/code/22697 Author: dmichelsen Date: 2013-12-15 20:31:33 +0000 (Sun, 15 Dec 2013) Log Message: ----------- cppunit/trunk: Add override Modified Paths: -------------- csw/mgar/pkg/cppunit/trunk/Makefile Modified: csw/mgar/pkg/cppunit/trunk/Makefile =================================================================== --- csw/mgar/pkg/cppunit/trunk/Makefile 2013-12-15 19:50:46 UTC (rev 22696) +++ csw/mgar/pkg/cppunit/trunk/Makefile 2013-12-15 20:31:33 UTC (rev 22697) @@ -41,6 +41,9 @@ BUILD64 = 1 +# Test examples/money is coredumping on amd64, don't know why yet +SKIPTEST ?= 1 + include gar/category.mk post-patch: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Dec 15 21:49:57 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 15 Dec 2013 20:49:57 +0000 Subject: SF.net SVN: gar:[22698] csw/mgar/pkg/cppunit/trunk/Makefile Message-ID: <3djHmt6ry9zyH@mail.opencsw.org> Revision: 22698 http://sourceforge.net/p/gar/code/22698 Author: dmichelsen Date: 2013-12-15 20:49:57 +0000 (Sun, 15 Dec 2013) Log Message: ----------- cppunit/trunk: Adjust package name Modified Paths: -------------- csw/mgar/pkg/cppunit/trunk/Makefile Modified: csw/mgar/pkg/cppunit/trunk/Makefile =================================================================== --- csw/mgar/pkg/cppunit/trunk/Makefile 2013-12-15 20:31:33 UTC (rev 22697) +++ csw/mgar/pkg/cppunit/trunk/Makefile 2013-12-15 20:49:57 UTC (rev 22698) @@ -27,15 +27,15 @@ RUNTIME_DEP_PKGS_CSWlibcppunit1-12-1 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibcppunit1-12-1 += CSWlibstdc++6 -PACKAGES += CSWcppunit-dev -SPKG_DESC_CSWcppunit-dev = Development files C++ port of JUnit +PACKAGES += CSWlibcppunit-dev +SPKG_DESC_CSWlibcppunit-dev = Development files C++ port of JUnit # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWcppunit-dev += CSWlibcppunit1-12-1 -RUNTIME_DEP_PKGS_CSWcppunit-dev += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWcppunit-dev += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibcppunit-dev += CSWlibcppunit1-12-1 +RUNTIME_DEP_PKGS_CSWlibcppunit-dev += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibcppunit-dev += CSWlibstdc++6 # This is just an example -CHECKPKG_OVERRIDES_CSWcppunit-dev += file-with-bad-content|/usr/local|root/opt/csw/gxx/share/doc/cppunit/money_example.html +CHECKPKG_OVERRIDES_CSWlibcppunit-dev += file-with-bad-content|/usr/local|root/opt/csw/gxx/share/doc/cppunit/money_example.html GARCOMPILER = GNU This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon Dec 16 12:41:06 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 16 Dec 2013 11:41:06 +0000 Subject: SF.net SVN: gar:[22699] csw/mgar/pkg/evince/trunk Message-ID: <3djgY80HQKzBr@mail.opencsw.org> Revision: 22699 http://sourceforge.net/p/gar/code/22699 Author: cgrzemba Date: 2013-12-16 11:41:04 +0000 (Mon, 16 Dec 2013) Log Message: ----------- evince/trunk: add postinstall hook for glib schema compile Modified Paths: -------------- csw/mgar/pkg/evince/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/evince/trunk/files/CSWevince.postinstall Modified: csw/mgar/pkg/evince/trunk/Makefile =================================================================== --- csw/mgar/pkg/evince/trunk/Makefile 2013-12-15 20:49:57 UTC (rev 22698) +++ csw/mgar/pkg/evince/trunk/Makefile 2013-12-16 11:41:04 UTC (rev 22699) @@ -14,6 +14,7 @@ SPKG_SOURCEURL = http://projects.gnome.org/evince/ MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/$(NAME)/$(GNOME_VERSION)/ DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += CSWevince.postinstall UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz # GARFLAVOR = DBG @@ -134,6 +135,7 @@ RUNTIME_DEP_PKGS_CSWevince += CSWlibpoppler-glib8 RUNTIME_DEP_PKGS_CSWevince += CSWlibkpathsea6 RUNTIME_DEP_PKGS_CSWevince += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWevince += CSWlibglib2-dev # sparc, there is not realy a difference either elfdump nor ldd RUNTIME_DEP_PKGS_CSWevince_sparc += CSWlibpango1-0-0 RUNTIME_DEP_PKGS_CSWevince_sparc += CSWlibpangoft2-1-0-0 @@ -143,6 +145,7 @@ RUNTIME_DEP_PKGS_CSWevince_sparc += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWevince_sparc += CSWlibpangocairo1-0-0 RUNTIME_DEP_PKGS_CSWevince += $(RUNTIME_DEP_PKGS_CSWevince_$(GARCH)) +CHECKPKG_OVERRIDES_CSWevince += surplus-dependency|CSWlibglib2-dev # at least the machine-id file must exist, dbus-daemon creates this # CHECKPKG_OVERRIDES_CSWevince += surplus-dependency|CSWdbus Added: csw/mgar/pkg/evince/trunk/files/CSWevince.postinstall =================================================================== --- csw/mgar/pkg/evince/trunk/files/CSWevince.postinstall (rev 0) +++ csw/mgar/pkg/evince/trunk/files/CSWevince.postinstall 2013-12-16 11:41:04 UTC (rev 22699) @@ -0,0 +1,2 @@ + +glib-compile-schemas /opt/csw/share/glib-2.0/schemas/org.gnome.Evince.gschema.xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Dec 16 14:10:13 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 16 Dec 2013 13:10:13 +0000 Subject: SF.net SVN: gar:[22700] csw/mgar/pkg/redis/trunk Message-ID: <3djjYL0qNgzNY@mail.opencsw.org> Revision: 22700 http://sourceforge.net/p/gar/code/22700 Author: dmichelsen Date: 2013-12-16 13:10:12 +0000 (Mon, 16 Dec 2013) Log Message: ----------- redis/trunk: Update to 2.8.3 Modified Paths: -------------- csw/mgar/pkg/redis/trunk/Makefile csw/mgar/pkg/redis/trunk/checksums Added Paths: ----------- csw/mgar/pkg/redis/trunk/files/0001-Solaris-needs-lrt-for-nanosleep.patch Modified: csw/mgar/pkg/redis/trunk/Makefile =================================================================== --- csw/mgar/pkg/redis/trunk/Makefile 2013-12-16 11:41:04 UTC (rev 22699) +++ csw/mgar/pkg/redis/trunk/Makefile 2013-12-16 13:10:12 UTC (rev 22700) @@ -2,23 +2,25 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = redis -VERSION = 2.6.14 +VERSION = 2.8.3 DESCRIPTION = An advanced key-value store -MASTER_SITES = $(GOOGLE_MIRROR) -DISTFILES = $(DISTNAME).tar.gz +MASTER_SITES = http://download.redis.io/releases/ +DISTFILES += $(DISTNAME).tar.gz PACKAGES += CSWredis SPKG_DESC_CSWredis = An advanced key-value store -#BUILD64 = 1 -#ISAEXEC = 1 +BUILD64 = 1 +ISAEXEC = 1 GARCOMPILER = GNU PATCHFILES += 0001-Fix-tclsh-finding.patch +PATCHFILES += 0001-Solaris-needs-lrt-for-nanosleep.patch + # These are set in the Makefile and are not inherited when we force our CFLAGS in EXTRA_CFLAGS += -std=c99 -pedantic -Wall -W -D__EXTENSIONS__ -D_XPG6 @@ -29,13 +31,13 @@ TEST_TARGET = test -# There are three tests failing which are harmless because strings are not compared in the actual program: -# Expected 'Infinity' to be equal to 'inf' -# https://groups.google.com/forum/#!msg/redis-db/gNtfZ3J-FAU/Ul-P_huFcdMJ -SKIPTEST ?= 1 +# Some tests fail +# SKIPTEST ?= 1 INSTALL_OVERRIDE_VARS += PREFIX INSTALL_OVERRIDE_VAR_PREFIX = $(DESTDIR)$(prefix) +INSTALL_OVERRIDE_VARS += INSTALL_BIN +INSTALL_OVERRIDE_VAR_INSTALL_BIN = $(DESTDIR)$(bindir) # This is for tail taking -n namely gtail for us TEST_ENV_PATH = $(prefix)/gnu:$(PATH) Modified: csw/mgar/pkg/redis/trunk/checksums =================================================================== --- csw/mgar/pkg/redis/trunk/checksums 2013-12-16 11:41:04 UTC (rev 22699) +++ csw/mgar/pkg/redis/trunk/checksums 2013-12-16 13:10:12 UTC (rev 22700) @@ -1 +1 @@ -02e0c06e953413017ff64862953e2756 redis-2.6.14.tar.gz +6327e6786130b556b048beef0edbdfa7 redis-2.8.3.tar.gz Added: csw/mgar/pkg/redis/trunk/files/0001-Solaris-needs-lrt-for-nanosleep.patch =================================================================== --- csw/mgar/pkg/redis/trunk/files/0001-Solaris-needs-lrt-for-nanosleep.patch (rev 0) +++ csw/mgar/pkg/redis/trunk/files/0001-Solaris-needs-lrt-for-nanosleep.patch 2013-12-16 13:10:12 UTC (rev 22700) @@ -0,0 +1,25 @@ +From 754f0d38b843f84f01d3617257f8ec1fe82cf1c7 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 16 Dec 2013 09:37:56 +0100 +Subject: [PATCH] Solaris needs -lrt for nanosleep + +--- + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index c37549d..eadd6b7 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -57,7 +57,7 @@ DEBUG=-g -ggdb + ifeq ($(uname_S),SunOS) + INSTALL=cp -pf + FINAL_CFLAGS+= -D__EXTENSIONS__ -D_XPG6 +- FINAL_LIBS+= -ldl -lnsl -lsocket -lpthread ++ FINAL_LIBS+= -ldl -lnsl -lsocket -lpthread -lrt + else ifeq ($(uname_S),Darwin) + + else +-- +1.8.4.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Dec 16 14:14:40 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 16 Dec 2013 13:14:40 +0000 Subject: SF.net SVN: gar:[22701] csw/mgar/pkg/redis/trunk/Makefile Message-ID: <3djjd60x7gzS6@mail.opencsw.org> Revision: 22701 http://sourceforge.net/p/gar/code/22701 Author: dmichelsen Date: 2013-12-16 13:14:38 +0000 (Mon, 16 Dec 2013) Log Message: ----------- redis/trunk: Skip tests for now Modified Paths: -------------- csw/mgar/pkg/redis/trunk/Makefile Modified: csw/mgar/pkg/redis/trunk/Makefile =================================================================== --- csw/mgar/pkg/redis/trunk/Makefile 2013-12-16 13:10:12 UTC (rev 22700) +++ csw/mgar/pkg/redis/trunk/Makefile 2013-12-16 13:14:38 UTC (rev 22701) @@ -32,7 +32,7 @@ TEST_TARGET = test # Some tests fail -# SKIPTEST ?= 1 +SKIPTEST ?= 1 INSTALL_OVERRIDE_VARS += PREFIX INSTALL_OVERRIDE_VAR_PREFIX = $(DESTDIR)$(prefix) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon Dec 16 15:15:30 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 16 Dec 2013 14:15:30 +0000 Subject: SF.net SVN: gar:[22702] csw/mgar/pkg/evince/trunk/files/CSWevince. postinstall Message-ID: <3djkzL24q9zd8@mail.opencsw.org> Revision: 22702 http://sourceforge.net/p/gar/code/22702 Author: cgrzemba Date: 2013-12-16 14:15:30 +0000 (Mon, 16 Dec 2013) Log Message: ----------- evince/trunk: add path to postinstall command Modified Paths: -------------- csw/mgar/pkg/evince/trunk/files/CSWevince.postinstall Modified: csw/mgar/pkg/evince/trunk/files/CSWevince.postinstall =================================================================== --- csw/mgar/pkg/evince/trunk/files/CSWevince.postinstall 2013-12-16 13:14:38 UTC (rev 22701) +++ csw/mgar/pkg/evince/trunk/files/CSWevince.postinstall 2013-12-16 14:15:30 UTC (rev 22702) @@ -1,2 +1 @@ - -glib-compile-schemas /opt/csw/share/glib-2.0/schemas/org.gnome.Evince.gschema.xml +/opt/csw/bin/glib-compile-schemas /opt/csw/share/glib-2.0/schemas/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Tue Dec 17 01:00:19 2013 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 17 Dec 2013 00:00:19 +0000 Subject: SF.net SVN: gar:[22703] csw/mgar/pkg/freeciv/trunk Message-ID: <3djzyH56Nqz1MD@mail.opencsw.org> Revision: 22703 http://sourceforge.net/p/gar/code/22703 Author: jake_goerzen Date: 2013-12-17 00:00:16 +0000 (Tue, 17 Dec 2013) Log Message: ----------- freeciv: update to 2.4.1 Modified Paths: -------------- csw/mgar/pkg/freeciv/trunk/Makefile csw/mgar/pkg/freeciv/trunk/checksums Added Paths: ----------- csw/mgar/pkg/freeciv/trunk/files/0001-use-finite-instead-of-isfinite-function.patch Modified: csw/mgar/pkg/freeciv/trunk/Makefile =================================================================== --- csw/mgar/pkg/freeciv/trunk/Makefile 2013-12-16 14:15:30 UTC (rev 22702) +++ csw/mgar/pkg/freeciv/trunk/Makefile 2013-12-17 00:00:16 UTC (rev 22703) @@ -1,5 +1,5 @@ NAME = freeciv -VERSION = 2.3.4 +VERSION = 2.4.1 GARTYPE = v2 DESCRIPTION = Free turn-based multiplayer strategy game @@ -8,7 +8,7 @@ endef MASTER_SITES += $(SF_MIRRORS) -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(NAME)-$(VERSION).tar.bz2 # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=138322 @@ -32,7 +32,7 @@ GARCOMPILER = GNU -PATCHFILES += 0001-use-finite-instead-of-isfinite.patch +PATCHFILES += 0001-use-finite-instead-of-isfinite-function.patch TEST_SCRIPTS = Modified: csw/mgar/pkg/freeciv/trunk/checksums =================================================================== --- csw/mgar/pkg/freeciv/trunk/checksums 2013-12-16 14:15:30 UTC (rev 22702) +++ csw/mgar/pkg/freeciv/trunk/checksums 2013-12-17 00:00:16 UTC (rev 22703) @@ -1 +1 @@ -36dc4dade12a85ed06b93730c4ee2c1a freeciv-2.3.4.tar.gz +9f280f320be0d597a29efe040f1b0025 freeciv-2.4.1.tar.bz2 Added: csw/mgar/pkg/freeciv/trunk/files/0001-use-finite-instead-of-isfinite-function.patch =================================================================== --- csw/mgar/pkg/freeciv/trunk/files/0001-use-finite-instead-of-isfinite-function.patch (rev 0) +++ csw/mgar/pkg/freeciv/trunk/files/0001-use-finite-instead-of-isfinite-function.patch 2013-12-17 00:00:16 UTC (rev 22703) @@ -0,0 +1,25 @@ +From 5888e2f90246e7aa88109239c7501360ba648ed7 Mon Sep 17 00:00:00 2001 +From: Jake Goerzen +Date: Tue, 17 Dec 2013 00:55:56 +0100 +Subject: [PATCH] use finite instead of isfinite function + +--- + client/cityrepdata.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/client/cityrepdata.c b/client/cityrepdata.c +index 7d0061b..e01e50c 100644 +--- a/client/cityrepdata.c ++++ b/client/cityrepdata.c +@@ -950,7 +950,7 @@ static void split_string(struct datum_vector *data, const char *str) + + errno = 0; + value = strtof(str, &endptr); +- if (errno != 0 || endptr == str || !isfinite(value)) { ++ if (errno != 0 || endptr == str || !finite(value)) { + /* that wasn't a sensible number; go on */ + str++; + } else { +-- +1.8.4.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Tue Dec 17 01:08:57 2013 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 17 Dec 2013 00:08:57 +0000 Subject: SF.net SVN: gar:[22704] csw/mgar/pkg/freeciv/trunk/Makefile Message-ID: <3dk0811Thhz1Qx@mail.opencsw.org> Revision: 22704 http://sourceforge.net/p/gar/code/22704 Author: jake_goerzen Date: 2013-12-17 00:08:53 +0000 (Tue, 17 Dec 2013) Log Message: ----------- freeciv: adjust some dependencies Modified Paths: -------------- csw/mgar/pkg/freeciv/trunk/Makefile Modified: csw/mgar/pkg/freeciv/trunk/Makefile =================================================================== --- csw/mgar/pkg/freeciv/trunk/Makefile 2013-12-17 00:00:16 UTC (rev 22703) +++ csw/mgar/pkg/freeciv/trunk/Makefile 2013-12-17 00:08:53 UTC (rev 22704) @@ -22,14 +22,18 @@ RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibintl8 RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibsdl1-2-0 -RUNTIME_DEP_PKGS_CSWfreeciv += CSWpango RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWfreeciv += CSWsdlmixer RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibgdk-pixbuf2-0-0 RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibpango1-0-0 +RUNTIME_DEP_PKGS_CSWfreeciv += CSWliblzma5 +RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibfreetype6 + GARCOMPILER = GNU PATCHFILES += 0001-use-finite-instead-of-isfinite-function.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Dec 17 14:11:31 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Dec 2013 13:11:31 +0000 Subject: SF.net SVN: gar:[22705] csw/mgar/pkg/xerces-c/branches/xerces-c-2.7.0 Message-ID: <3dkKW73zC3zqS@mail.opencsw.org> Revision: 22705 http://sourceforge.net/p/gar/code/22705 Author: dmichelsen Date: 2013-12-17 13:11:30 +0000 (Tue, 17 Dec 2013) Log Message: ----------- xerces-c/branches/xerces-c-2.7.0: Make special packages for 2.7.0 needed for XML::Xerces Modified Paths: -------------- csw/mgar/pkg/xerces-c/branches/xerces-c-2.7.0/Makefile Removed Paths: ------------- csw/mgar/pkg/xerces-c/branches/xerces-c-2.7.0/files/0001-Do-not-strip-norunpath.patch Modified: csw/mgar/pkg/xerces-c/branches/xerces-c-2.7.0/Makefile =================================================================== --- csw/mgar/pkg/xerces-c/branches/xerces-c-2.7.0/Makefile 2013-12-17 00:08:53 UTC (rev 22704) +++ csw/mgar/pkg/xerces-c/branches/xerces-c-2.7.0/Makefile 2013-12-17 13:11:30 UTC (rev 22705) @@ -16,50 +16,44 @@ DISTNAME = $(NAME)-src_$(VERSION) DISTFILES += $(DISTNAME).tar.gz -# PATCHFILES += 0001-Do-not-strip-norunpath.patch - VENDOR_URL = http://xerces.apache.org/xerces-c/ LICENSE = LICENSE -PACKAGES += CSWlibxerces-c3-1 -SPKG_DESC_CSWlibxerces-c3-1 = Xerces XML parser for C++ providing libxerces-c-3.1.so -PKGFILES_CSWlibxerces-c3-1 = $(call pkgfiles_lib,libxerces-c-3.1.so) -RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibcurl4 -RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibidn11 -RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibicudata48 -RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibicuuc48 -RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibicui18n48 +PACKAGES += CSWlibxerces-c27 +SPKG_DESC_CSWlibxerces-c27 = Xerces XML parser for C++ providing libxerces-c.so.27 +PKGFILES_CSWlibxerces-c27 = $(call pkgfiles_lib,libxerces-c.so.27) -# The version number is in the base and not appended to .so as usual -CHECKPKG_OVERRIDES_CSWlibxerces-c3-1 += soname-equals-filename +PACKAGES += CSWlibxerces-depdom27 +SPKG_DESC_CSWlibxerces-depdom27 = Xerces XML parser for C++ providing libxerces-depdom.so.27 +PKGFILES_CSWlibxerces-depdom27 = $(call pkgfiles_lib,libxerces-depdom.so.27) -PACKAGES += CSWlibxerces-c-dev -SPKG_DESC_CSWlibxerces-c-dev = Development files for libxerces-c-3.1.so +PACKAGES += CSWlibxerces-c27-dev +SPKG_DESC_CSWlibxerces-c27-dev = Development files for libxerces-c.so.27 # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWlibxerces-c-dev += CSWlibxerces-c3-1 +RUNTIME_DEP_PKGS_CSWlibxerces-c27-dev += CSWlibxerces-c27 +CHECKPKG_OVERRIDES_CSWlibxerces-c27-dev += surplus-dependency|CSWlibxerces-c27 +RUNTIME_DEP_PKGS_CSWlibxerces-c27-dev += CSWlibxerces-depdom27 +CHECKPKG_OVERRIDES_CSWlibxerces-c27-dev += surplus-dependency|CSWlibxerces-depdom27 -PACKAGES += CSWxerces-c -CATALOGNAME_CSWxerces-c = xerces_c -SPKG_DESC_CSWxerces-c = Utility programs from the Xerces XML parser -PKGFILES_CSWxerces-c = $(bindir)/.* -RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibxerces-c3-1 -RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibicudata48 -RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibz1 -RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibcurl4 -RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibicuuc48 -RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibidn11 -RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibicui18n48 +WORKSRC = $(WORKDIR)/$(DISTNAME)/src/xercesc -BUILD64 = 1 -ISAEXEC = 1 +EXTRA_LINKER_FLAGS += -norunpath -WORKSRC = $(WORKDIR)/$(DISTNAME)/src/xercesc +EXTRA_BUILD_EXPORTS += XERCESCROOT +BUILD_ENV_XERCESCROOT = $(abspath $(WORKDIR)/$(DISTNAME)) -EXTRA_CONFIGURE_EXPORTS = icu_config -EXTRA_CONFIGURE_ENV_icu_config = $(bindir)/icu-config +EXTRA_INSTALL_EXPORTS += XERCESCROOT +INSTALL_ENV_XERCESCROOT = $(abspath $(WORKDIR)/$(DISTNAME)) +# Arguments are not passed in the default Makefile +EXTRA_INSTALL_EXPORTS += MAKE +INSTALL_ENV_MAKE = gmake DESTDIR=$(DESTDIR) + +# There is no testsuite +TEST_SCRIPTS = + +EXTRA_PAX_ARGS += -s ',/include/,/include/xercesc-2.7.0/,' +EXTRA_PAX_ARGS += -s ',/lib/(.*\.so)$$,/lib/xercesc-2.7.0/$$1,' + include gar/category.mk Deleted: csw/mgar/pkg/xerces-c/branches/xerces-c-2.7.0/files/0001-Do-not-strip-norunpath.patch =================================================================== --- csw/mgar/pkg/xerces-c/branches/xerces-c-2.7.0/files/0001-Do-not-strip-norunpath.patch 2013-12-17 00:08:53 UTC (rev 22704) +++ csw/mgar/pkg/xerces-c/branches/xerces-c-2.7.0/files/0001-Do-not-strip-norunpath.patch 2013-12-17 13:11:30 UTC (rev 22705) @@ -1,25 +0,0 @@ -From 0cb78ef329cacbf4f4954a9d792b01b53ac63798 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 12 Jan 2011 14:24:04 +0100 -Subject: [PATCH] Do not strip -norunpath - ---- - config/ltmain.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/config/ltmain.sh b/config/ltmain.sh -index 3506ead..7e0670f 100755 ---- a/config/ltmain.sh -+++ b/config/ltmain.sh -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-norunpath) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" --- -1.7.3.2 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Dec 17 14:38:09 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Dec 2013 13:38:09 +0000 Subject: SF.net SVN: gar:[22706] csw/mgar/pkg/libcurl4/trunk Message-ID: <3dkL5q3NBZzwr@mail.opencsw.org> Revision: 22706 http://sourceforge.net/p/gar/code/22706 Author: dmichelsen Date: 2013-12-17 13:38:07 +0000 (Tue, 17 Dec 2013) Log Message: ----------- libcurl4/trunk: Update to 7.34.0 Modified Paths: -------------- csw/mgar/pkg/libcurl4/trunk/Makefile csw/mgar/pkg/libcurl4/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/libcurl4/trunk/files/0001-Add-patch-from-bug-1291.patch Modified: csw/mgar/pkg/libcurl4/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcurl4/trunk/Makefile 2013-12-17 13:11:30 UTC (rev 22705) +++ csw/mgar/pkg/libcurl4/trunk/Makefile 2013-12-17 13:38:07 UTC (rev 22706) @@ -1,5 +1,5 @@ NAME = curl -VERSION = 7.33.0 +VERSION = 7.34.0 GARTYPE = v2 DESCRIPTION = Command line tool and library for client-side URL transfers @@ -16,10 +16,6 @@ MASTER_SITES = http://curl.haxx.se/download/ DISTFILES += $(NAME)-$(VERSION).tar.lzma -# Use patch until this is fixed: -# http://sourceforge.net/p/curl/bugs/1291/ -PATCHFILES += 0001-Add-patch-from-bug-1291.patch - VENDOR_URL = http://curl.haxx.se # Because of OpenSSL 1.0 update Modified: csw/mgar/pkg/libcurl4/trunk/checksums =================================================================== --- csw/mgar/pkg/libcurl4/trunk/checksums 2013-12-17 13:11:30 UTC (rev 22705) +++ csw/mgar/pkg/libcurl4/trunk/checksums 2013-12-17 13:38:07 UTC (rev 22706) @@ -1 +1 @@ -eb463192f37c260163e006d6c4d3f114 curl-7.33.0.tar.lzma +552371ae5e40bd7d9c92c62ac4b7be81 curl-7.34.0.tar.lzma Deleted: csw/mgar/pkg/libcurl4/trunk/files/0001-Add-patch-from-bug-1291.patch =================================================================== --- csw/mgar/pkg/libcurl4/trunk/files/0001-Add-patch-from-bug-1291.patch 2013-12-17 13:11:30 UTC (rev 22705) +++ csw/mgar/pkg/libcurl4/trunk/files/0001-Add-patch-from-bug-1291.patch 2013-12-17 13:38:07 UTC (rev 22706) @@ -1,26 +0,0 @@ -From 8faa296be2f98a26456a5b8e73cb3baaa6f6b9ab Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Fri, 18 Oct 2013 17:44:40 +0200 -Subject: [PATCH] Add patch from bug #1291 - ---- - tests/data/test906 | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/tests/data/test906 b/tests/data/test906 -index 5072e90..6cf6bed 100644 ---- a/tests/data/test906 -+++ b/tests/data/test906 -@@ -41,6 +41,9 @@ mail body - - smtp://%HOSTIP:%SMTPPORT/906 --mail-rcpt recipient at example.com --mail-from sender at example.com -u testuser:testpass -T - - -+ -+chkhostname curlhost -+ - - - # --- -1.8.3.4 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Tue Dec 17 18:51:37 2013 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 17 Dec 2013 17:51:37 +0000 Subject: SF.net SVN: gar:[22707] csw/mgar/pkg/freeciv/trunk/Makefile Message-ID: <3dkRkB4WVYz1Md@mail.opencsw.org> Revision: 22707 http://sourceforge.net/p/gar/code/22707 Author: jake_goerzen Date: 2013-12-17 17:51:37 +0000 (Tue, 17 Dec 2013) Log Message: ----------- freeciv: add override for surplus-dependency CSWlibfreetype6 Modified Paths: -------------- csw/mgar/pkg/freeciv/trunk/Makefile Modified: csw/mgar/pkg/freeciv/trunk/Makefile =================================================================== --- csw/mgar/pkg/freeciv/trunk/Makefile 2013-12-17 13:38:07 UTC (rev 22706) +++ csw/mgar/pkg/freeciv/trunk/Makefile 2013-12-17 17:51:37 UTC (rev 22707) @@ -45,6 +45,9 @@ # build package on Solaris 10 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +# work around ld out of sync on buildfarm +CHECKPKG_OVERRIDES_CSWfreeciv += surplus-dependency|CSWlibfreetype6 + include gar/category.mk post-install-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Wed Dec 18 20:28:28 2013 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 18 Dec 2013 19:28:28 +0000 Subject: SF.net SVN: gar:[22708] csw/mgar/pkg/tor/trunk Message-ID: <3dl5qb2KPKz1Hh@mail.opencsw.org> Revision: 22708 http://sourceforge.net/p/gar/code/22708 Author: jake_goerzen Date: 2013-12-18 19:28:26 +0000 (Wed, 18 Dec 2013) Log Message: ----------- tor: update to latest stable version 0.2.4.19 Modified Paths: -------------- csw/mgar/pkg/tor/trunk/Makefile csw/mgar/pkg/tor/trunk/checksums Modified: csw/mgar/pkg/tor/trunk/Makefile =================================================================== --- csw/mgar/pkg/tor/trunk/Makefile 2013-12-17 17:51:37 UTC (rev 22707) +++ csw/mgar/pkg/tor/trunk/Makefile 2013-12-18 19:28:26 UTC (rev 22708) @@ -1,6 +1,6 @@ # $Id$ NAME = tor -VERSION = 0.2.3.25 +VERSION = 0.2.4.19 GARTYPE = v2 DESCRIPTION = Secure network traffic router Modified: csw/mgar/pkg/tor/trunk/checksums =================================================================== --- csw/mgar/pkg/tor/trunk/checksums 2013-12-17 17:51:37 UTC (rev 22707) +++ csw/mgar/pkg/tor/trunk/checksums 2013-12-18 19:28:26 UTC (rev 22708) @@ -1 +1 @@ -a1c364189a9a66ed9daa8e6436489daf tor-0.2.3.25.tar.gz +5fb5d7252b60859428083e34dde46421 tor-0.2.4.19.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 19 11:41:33 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Dec 2013 10:41:33 +0000 Subject: SF.net SVN: gar:[22709] csw/mgar/pkg/cpan Message-ID: <3dlV574TCTzXB@mail.opencsw.org> Revision: 22709 http://sourceforge.net/p/gar/code/22709 Author: dmichelsen Date: 2013-12-19 10:41:31 +0000 (Thu, 19 Dec 2013) Log Message: ----------- cpan/Apache-Log-Parser/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Apache-Log-Parser/ csw/mgar/pkg/cpan/Apache-Log-Parser/branches/ csw/mgar/pkg/cpan/Apache-Log-Parser/tags/ csw/mgar/pkg/cpan/Apache-Log-Parser/trunk/ csw/mgar/pkg/cpan/Apache-Log-Parser/trunk/Makefile csw/mgar/pkg/cpan/Apache-Log-Parser/trunk/checksums csw/mgar/pkg/cpan/Apache-Log-Parser/trunk/files/ Index: csw/mgar/pkg/cpan/Apache-Log-Parser/trunk =================================================================== --- csw/mgar/pkg/cpan/Apache-Log-Parser/trunk 2013-12-18 19:28:26 UTC (rev 22708) +++ csw/mgar/pkg/cpan/Apache-Log-Parser/trunk 2013-12-19 10:41:31 UTC (rev 22709) Property changes on: csw/mgar/pkg/cpan/Apache-Log-Parser/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1,2 ## +work + Added: csw/mgar/pkg/cpan/Apache-Log-Parser/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Apache-Log-Parser/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Apache-Log-Parser/trunk/Makefile 2013-12-19 10:41:31 UTC (rev 22709) @@ -0,0 +1,29 @@ +NAME = Apache-Log-Parser +VERSION = 0.02 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = TAGOMORIS + +DESCRIPTION = Parser for Apache Log +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE = LICENSE + +BUILD_DEP_PKGS += CSWpm-test-exception +BUILD_DEP_PKGS += CSWpm-test-deep + +PACKAGES += CSWpm-apache-log-parser +CATALOGNAME_CSWpm-apache-log-parser = pm_apache_log_parser +SPKG_DESC_CSWpm-apache-log-parser = Parser for Apache Log (common, combined, and any other custom styles by LogFormat) +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-apache-log-parser = 1 + +CONFIGURE_SCRIPTS = $(WORKSRC)/Build.PL +BUILD_SCRIPTS = $(WORKSRC)/Build +TEST_SCRIPTS = $(WORKSRC)/Build +INSTALL_SCRIPTS = $(WORKSRC)/Build + +include gar/category.mk Added: csw/mgar/pkg/cpan/Apache-Log-Parser/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Apache-Log-Parser/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Apache-Log-Parser/trunk/checksums 2013-12-19 10:41:31 UTC (rev 22709) @@ -0,0 +1 @@ +29ccd3d42cacbab5f92ff9df8be6baaa Apache-Log-Parser-0.02.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 19 12:17:20 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Dec 2013 11:17:20 +0000 Subject: SF.net SVN: gar:[22710] csw/mgar/pkg/cpan/Apache-Log-Parser/trunk/Makefile Message-ID: <3dlVtM4gPDzd7@mail.opencsw.org> Revision: 22710 http://sourceforge.net/p/gar/code/22710 Author: dmichelsen Date: 2013-12-19 11:17:18 +0000 (Thu, 19 Dec 2013) Log Message: ----------- cpan/Apache-Log-Parser/trunk: Adjust name length Modified Paths: -------------- csw/mgar/pkg/cpan/Apache-Log-Parser/trunk/Makefile Modified: csw/mgar/pkg/cpan/Apache-Log-Parser/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Apache-Log-Parser/trunk/Makefile 2013-12-19 10:41:31 UTC (rev 22709) +++ csw/mgar/pkg/cpan/Apache-Log-Parser/trunk/Makefile 2013-12-19 11:17:18 UTC (rev 22710) @@ -17,7 +17,7 @@ PACKAGES += CSWpm-apache-log-parser CATALOGNAME_CSWpm-apache-log-parser = pm_apache_log_parser -SPKG_DESC_CSWpm-apache-log-parser = Parser for Apache Log (common, combined, and any other custom styles by LogFormat) +SPKG_DESC_CSWpm-apache-log-parser = Parser for Apache Log # There was no information if this is pure Perl or not. Please remove if necessary. ARCHALL_CSWpm-apache-log-parser = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 19 15:35:06 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Dec 2013 14:35:06 +0000 Subject: SF.net SVN: gar:[22711] csw/mgar/pkg Message-ID: <3dlbHS2cXCzxV@mail.opencsw.org> Revision: 22711 http://sourceforge.net/p/gar/code/22711 Author: dmichelsen Date: 2013-12-19 14:35:00 +0000 (Thu, 19 Dec 2013) Log Message: ----------- mod_form: Initial commit Modified Paths: -------------- csw/mgar/pkg/mod_form/trunk/Makefile csw/mgar/pkg/mod_form/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mod_form/ csw/mgar/pkg/mod_form/trunk/files/CSWap2-mod-form.postinstall csw/mgar/pkg/mod_form/trunk/files/CSWap2-mod-form.preremove csw/mgar/pkg/mod_form/trunk/files/gpl.html Removed Paths: ------------- csw/mgar/pkg/mod_form/trunk/files/COPYING csw/mgar/pkg/mod_form/trunk/files/CSWap2modauthradius.postinstall csw/mgar/pkg/mod_form/trunk/files/CSWap2modauthradius.preremove Modified: csw/mgar/pkg/mod_form/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_auth_radius/trunk/Makefile 2013-11-06 14:25:24 UTC (rev 22420) +++ csw/mgar/pkg/mod_form/trunk/Makefile 2013-12-19 14:35:00 UTC (rev 22711) @@ -1,29 +1,24 @@ -NAME = mod_auth_radius -VERSION = 1.5.8 +NAME = mod_form +VERSION = 0.1 GARTYPE = v2 -DESCRIPTION = Apache RADIUS authentication module -define BLURB - This is the Apache RADIUS authentication module. It allows any Apache web-server - to become a RADIUS client for authentication and accounting requests. You will, - however, need to supply your own RADIUS server to perform the actual authentication. -endef +DESCRIPTION = A utility to decode data submitted from Web forms -MASTER_SITES = ftp://ftp.freeradius.org/pub/radius/ -DISTFILES = $(NAME)-$(VERSION).tar -DISTFILES += CSWap2modauthradius.postinstall CSWap2modauthradius.preremove -DISTFILES += COPYING +MASTER_SITES = http://apache.webthing.com/svn/apache/forms/ +DISTFILES += mod_form.c +DISTFILES += mod_form.h +DISTFILES += gpl.html +DISTFILES += CSWap2-mod-form.postinstall +DISTFILES += CSWap2-mod-form.preremove -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar +VENDOR_URL = http://apache.webthing.com/mod_form/ +LICENSE = gpl.html -VENDOR_URL = http://freeradius.org/mod_auth_radius/ +PACKAGES = CSWap2-mod-form +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWap2-mod-form += CSWapache2 +CHECKPKG_OVERRIDES_CSWap2-mod-form += surplus-dependency|CSWapache2 -PACKAGES = CSWap2modauthradius -CATALOGNAME = ap2_mod_auth_radius - -DEP_PKGS = CSWapache2 -CHECKPKG_OVERRIDES_CSWap2modauthradius += surplus-dependency|CSWapache2 - # Apache paths AP2_ROOT = $(prefix)/apache2 AP2_LIBEXEC = $(DESTDIR)$(AP2_ROOT)/libexec @@ -38,24 +33,16 @@ STRIP_DIRS = $(DESTDIR)$(prefix)/apache2/libexec -PRESERVECONF = $(prefix)/apache2/etc/extra/httpd-auth-radius.conf - include gar/category.mk build-custom: - cd $(WORKSRC) && $(APXS) -c mod_auth_radius-2.0.c - $(MAKECOOKIE) + cd $(WORKDIR) && $(APXS) -c mod_form.c + @$(MAKECOOKIE) -install-custom: DOCDEST=$(DESTDIR)$(docdir)/$(NAME) install-custom: mkdir -p $(AP2_LIBEXEC) - cd $(WORKSRC) && $(APXS) -S LIBEXECDIR=$(AP2_LIBEXEC) -i mod_auth_radius-2.0.la - ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra - ginstall -m 0644 $(WORKSRC)/httpd.conf $(DESTDIR)$(prefix)/apache2/etc/extra/httpd-auth-radius.conf - ginstall -d $(DOCDEST) - ginstall $(WORKSRC)/README $(DOCDEST) + cd $(WORKDIR) && $(APXS) -S LIBEXECDIR=$(AP2_LIBEXEC) -i mod_form.la + ginstall -d $(DESTDIR)$(prefix)/apache2/include + ginstall -m 0644 $(WORKDIR)/mod_form.h $(DESTDIR)$(prefix)/apache2/include/mod_form.h @$(MAKECOOKIE) - - - Modified: csw/mgar/pkg/mod_form/trunk/checksums =================================================================== --- csw/mgar/pkg/mod_auth_radius/trunk/checksums 2013-11-06 14:25:24 UTC (rev 22420) +++ csw/mgar/pkg/mod_form/trunk/checksums 2013-12-19 14:35:00 UTC (rev 22711) @@ -1,4 +1,2 @@ -6c2b9be793fdffe75bdf8dc816a85466 COPYING -5ec728767a9a7545de480ceb71d93e20 CSWap2modauthradius.postinstall -1c5e63dbb9b18aca27943e9b0011d1f3 CSWap2modauthradius.preremove -81de397fcbb18e3c5696d6cc9c73493b mod_auth_radius-1.5.8.tar +8339effe63ec1ea8ade1e8b90aabb23c mod_form.c +e524cf838ae990bf6e118d985b1b91ca mod_form.h Deleted: csw/mgar/pkg/mod_form/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/mod_auth_radius/trunk/files/COPYING 2013-11-06 14:25:24 UTC (rev 22420) +++ csw/mgar/pkg/mod_form/trunk/files/COPYING 2013-12-19 14:35:00 UTC (rev 22711) @@ -1,54 +0,0 @@ -/* ==================================================================== - * Copyright (c) 1997-2002 The Apache Group. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the Apache Group - * for use in the Apache HTTP server project (http://www.apache.org/)." - * - * 4. The names "Apache Server" and "Apache Group" must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 5. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the Apache Group - * for use in the Apache HTTP server project (http://www.apache.org/)." - * - * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY - * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Group and was originally based - * on public domain software written at the National Center for - * Supercomputing Applications, University of Illinois, Urbana-Champaign. - * For more information on the Apache Group and the Apache HTTP server - * project, please see . - * - * - * CVS $Id$ - */ - Copied: csw/mgar/pkg/mod_form/trunk/files/CSWap2-mod-form.postinstall (from rev 22420, csw/mgar/pkg/mod_auth_radius/trunk/files/CSWap2modauthradius.postinstall) =================================================================== --- csw/mgar/pkg/mod_form/trunk/files/CSWap2-mod-form.postinstall (rev 0) +++ csw/mgar/pkg/mod_form/trunk/files/CSWap2-mod-form.postinstall 2013-12-19 14:35:00 UTC (rev 22711) @@ -0,0 +1,25 @@ +#!/bin/sh + +CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw +AP2_PREFIX=$CSW_PREFIX/apache2 +AP2_BINDIR=$AP2_PREFIX/sbin +AP2_LIBEXEC=$AP2_PREFIX/libexec +AP2_CONFDIR=$AP2_PREFIX/etc +AP2_EXTRADIR=$AP2_CONFDIR/extra +AP2_CONFIG=$AP2_CONFDIR/httpd.conf + +# Enable the auth_radius modules +PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'} +chroot $PKG_INSTALL_ROOT \ + $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -a -n \ + form mod_form.so + +# Finito +cat < + + + + + + + + + + + + + + +The GNU General Public License v3.0 +- GNU Project - Free Software Foundation + + + + + + + + + + + + + + + + + + + + + + + + +
+

+English [en]   +??????? [ar]   +catal? [ca]   +Deutsch [de]   +fran?ais [fr]   +??? [ja]   +??????? [ru]   +

+
+ + + + +
+ + + + + + + + + + + + + +
+ + +

GNU General Public License

+ + + + + +
+ + +
+

GNU GENERAL PUBLIC LICENSE

+

Version 3, 29 June 2007

+ +

Copyright © 2007 Free Software Foundation, Inc. + <http://fsf.org/>

+ Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed.

+ +

Preamble

+ +

The GNU General Public License is a free, copyleft license for +software and other kinds of works.

+ +

The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too.

+ +

When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things.

+ +

To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others.

+ +

For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights.

+ +

Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it.

+ +

For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions.

+ +

Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users.

+ +

Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free.

+ +

The precise terms and conditions for copying, distribution and +modification follow.

+ +

TERMS AND CONDITIONS

+ +

0. Definitions.

+ +

“This License” refers to version 3 of the GNU General Public License.

+ +

“Copyright” also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks.

+ +

“The Program” refers to any copyrightable work licensed under this +License. Each licensee is addressed as “you”. “Licensees” and +“recipients” may be individuals or organizations.

+ +

To “modify” a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a “modified version” of the +earlier work or a work “based on” the earlier work.

+ +

A “covered work” means either the unmodified Program or a work based +on the Program.

+ +

To “propagate” a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well.

+ +

To “convey” a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying.

+ +

An interactive user interface displays “Appropriate Legal Notices” +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion.

+ +

1. Source Code.

+ +

The “source code” for a work means the preferred form of the work +for making modifications to it. “Object code” means any non-source +form of a work.

+ +

A “Standard Interface” means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language.

+ +

The “System Libraries” of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +“Major Component”, in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it.

+ +

The “Corresponding Source” for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work.

+ +

The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source.

+ +

The Corresponding Source for a work in source code form is that +same work.

+ +

2. Basic Permissions.

+ +

All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law.

+ +

You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you.

+ +

Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary.

+ +

3. Protecting Users' Legal Rights From Anti-Circumvention Law.

+ +

No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures.

+ +

When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures.

+ +

4. Conveying Verbatim Copies.

+ +

You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program.

+ +

You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee.

+ +

5. Conveying Modified Source Versions.

+ +

You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions:

+ +
    +
  • a) The work must carry prominent notices stating that you modified + it, and giving a relevant date.
  • + +
  • b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + “keep intact all notices”.
  • + +
  • c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it.
  • + +
  • d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so.
  • +
+ +

A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +“aggregate” if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate.

+ +

6. Conveying Non-Source Forms.

+ +

You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways:

+ +
    +
  • a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange.
  • + +
  • b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge.
  • + +
  • c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b.
  • + +
  • d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements.
  • + +
  • e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d.
  • +
+ +

A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work.

+ +

A “User Product” is either (1) a “consumer product”, which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, “normally used” refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product.

+ +

“Installation Information” for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made.

+ +

If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM).

+ +

The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network.

+ +

Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying.

+ +

7. Additional Terms.

+ +

“Additional permissions” are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions.

+ +

When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission.

+ +

Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms:

+ +
    +
  • a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or
  • + +
  • b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or
  • + +
  • c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or
  • + +
  • d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or
  • + +
  • e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or
  • + +
  • f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors.
  • +
+ +

All other non-permissive additional terms are considered “further +restrictions” within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying.

+ +

If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms.

+ +

Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way.

+ +

8. Termination.

+ +

You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11).

+ +

However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation.

+ +

Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice.

+ +

Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10.

+ +

9. Acceptance Not Required for Having Copies.

+ +

You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so.

+ +

10. Automatic Licensing of Downstream Recipients.

+ +

Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License.

+ +

An “entity transaction” is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts.

+ +

You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it.

+ +

11. Patents.

+ +

A “contributor” is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's “contributor version”.

+ +

A contributor's “essential patent claims” are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, “control” includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License.

+ +

Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version.

+ +

In the following three paragraphs, a “patent license” is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To “grant” such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party.

+ +

If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. “Knowingly relying” means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid.

+ +

If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it.

+ +

A patent license is “discriminatory” if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007.

+ +

Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law.

+ +

12. No Surrender of Others' Freedom.

+ +

If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program.

+ +

13. Use with the GNU Affero General Public License.

+ +

Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such.

+ +

14. Revised Versions of this License.

+ +

The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns.

+ +

Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License “or any later version” applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation.

+ +

If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program.

+ +

Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version.

+ +

15. Disclaimer of Warranty.

+ +

THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

+ +

16. Limitation of Liability.

+ +

IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES.

+ +

17. Interpretation of Sections 15 and 16.

+ +

If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee.

+ +

END OF TERMS AND CONDITIONS

+ +

How to Apply These Terms to Your New Programs

+ +

If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms.

+ +

To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the “copyright” line and a pointer to where the full notice is found.

+ +
    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+ +

Also add information on how to contact you by electronic and paper mail.

+ +

If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode:

+ +
    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+ +

The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an “about box”.

+ +

You should also get your employer (if you work as a programmer) or school, +if any, to sign a “copyright disclaimer” for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>.

+ +

The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>.

+ +
+ +
+ + +
+ + + +
+ +

The Free Software +Foundation is the principal organizational sponsor of the GNU Operating System. Our +mission is to preserve, protect and promote the freedom to use, study, +copy, modify, and redistribute computer software, and to defend the +rights of Free Software users. Support GNU and the FSF by buying manuals and gear, joining the FSF as an associate +member or by making a +donation, either directly to the FSF +or via Flattr.

+ +

back to top

+ + + + +
+ + +
+ + + + +
+ + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 19 17:10:59 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Dec 2013 16:10:59 +0000 Subject: SF.net SVN: gar:[22712] csw/mgar/pkg/mod_form/trunk Message-ID: <3dldPH3Ntcz56@mail.opencsw.org> Revision: 22712 http://sourceforge.net/p/gar/code/22712 Author: dmichelsen Date: 2013-12-19 16:10:58 +0000 (Thu, 19 Dec 2013) Log Message: ----------- mod_form/trunk: Add patch from mirrorbrain site Modified Paths: -------------- csw/mgar/pkg/mod_form/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/mod_form/trunk/files/formget.patch Modified: csw/mgar/pkg/mod_form/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_form/trunk/Makefile 2013-12-19 14:35:00 UTC (rev 22711) +++ csw/mgar/pkg/mod_form/trunk/Makefile 2013-12-19 16:10:58 UTC (rev 22712) @@ -11,6 +11,10 @@ DISTFILES += CSWap2-mod-form.postinstall DISTFILES += CSWap2-mod-form.preremove +# Patch from http://mirrorbrain.org/docs/installation/source/ +PATCHFILES += formget.patch +PATCHDIRLEVEL = 0 + VENDOR_URL = http://apache.webthing.com/mod_form/ LICENSE = gpl.html @@ -35,14 +39,18 @@ include gar/category.mk +post-extract: + ginstall -d $(WORKSRC) + cp $(WORKDIR)/mod_form.c $(WORKDIR)/mod_form.h $(WORKSRC) + build-custom: - cd $(WORKDIR) && $(APXS) -c mod_form.c + cd $(WORKSRC) && $(APXS) -c mod_form.c @$(MAKECOOKIE) install-custom: mkdir -p $(AP2_LIBEXEC) - cd $(WORKDIR) && $(APXS) -S LIBEXECDIR=$(AP2_LIBEXEC) -i mod_form.la + cd $(WORKSRC) && $(APXS) -S LIBEXECDIR=$(AP2_LIBEXEC) -i mod_form.la ginstall -d $(DESTDIR)$(prefix)/apache2/include - ginstall -m 0644 $(WORKDIR)/mod_form.h $(DESTDIR)$(prefix)/apache2/include/mod_form.h + ginstall -m 0644 $(WORKSRC)/mod_form.h $(DESTDIR)$(prefix)/apache2/include/mod_form.h @$(MAKECOOKIE) Added: csw/mgar/pkg/mod_form/trunk/files/formget.patch =================================================================== --- csw/mgar/pkg/mod_form/trunk/files/formget.patch (rev 0) +++ csw/mgar/pkg/mod_form/trunk/files/formget.patch 2013-12-19 16:10:58 UTC (rev 22712) @@ -0,0 +1,26 @@ +Tue Mar 13 15:16:30 CET 2007 - poeml at cmdline.net + +preserve r->args (apr_strtok is destructive in this regard). Makes +mod_autoindex work again in conjunction with directories where FormGET is +enabled. + +--- mod_form.c.old 2007-03-13 15:05:13.872945000 +0100 ++++ mod_form.c 2007-03-13 15:06:26.378367000 +0100 +@@ -61,6 +61,7 @@ + char* pair ; + char* last = NULL ; + char* eq ; ++ char* a ; + if ( ! ctx ) { + ctx = apr_pcalloc(r->pool, sizeof(form_ctx)) ; + ctx->delim = delim[0]; +@@ -69,7 +70,8 @@ + if ( ! ctx->vars ) { + ctx->vars = apr_table_make(r->pool, 10) ; + } +- for ( pair = apr_strtok(args, delim, &last) ; pair ; ++ a = apr_pstrdup(r->pool, args); ++ for ( pair = apr_strtok(a, delim, &last) ; pair ; + pair = apr_strtok(NULL, delim, &last) ) { + for (eq = pair ; *eq ; ++eq) + if ( *eq == '+' ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Thu Dec 19 18:38:27 2013 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Thu, 19 Dec 2013 17:38:27 +0000 Subject: SF.net SVN: gar:[22713] csw/mgar/pkg/tor/trunk Message-ID: <3dlgL64PZ9zF8@mail.opencsw.org> Revision: 22713 http://sourceforge.net/p/gar/code/22713 Author: jake_goerzen Date: 2013-12-19 17:38:27 +0000 (Thu, 19 Dec 2013) Log Message: ----------- tor: work towards adding SMF integration Modified Paths: -------------- csw/mgar/pkg/tor/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/tor/trunk/files/README.CSW csw/mgar/pkg/tor/trunk/files/cswtor Modified: csw/mgar/pkg/tor/trunk/Makefile =================================================================== --- csw/mgar/pkg/tor/trunk/Makefile 2013-12-19 16:10:58 UTC (rev 22712) +++ csw/mgar/pkg/tor/trunk/Makefile 2013-12-19 17:38:27 UTC (rev 22713) @@ -1,10 +1,15 @@ # $Id$ +# TODO: need to create smf start/stop script. +# add "PidFile /var/run/tor.pid" to torrc.CSW sample conf. +# also add "Log syslog" to torrc.CSW sample conf. +# also add "RunAsDaemon 1" to torrc.CSW. NAME = tor VERSION = 0.2.4.19 GARTYPE = v2 DESCRIPTION = Secure network traffic router define BLURB +Basically tor provides a distributed network of servers (onion routers). Users bounce their TCP streams (web traffic, ftp, ssh, etc) around the routers, and recipients, observers, and even the routers themselves have difficulty tracking the source of the stream. endef MASTER_SITES = http://www.torproject.org/dist/ @@ -31,6 +36,8 @@ MIGRATE_FILES += tor/tor-tsocks.conf MIGRATE_FILES += tor/torrc +INITSMF = /etc/opt/csw/init.d/cswtor + PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 include gar/category.mk Added: csw/mgar/pkg/tor/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/tor/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/tor/trunk/files/README.CSW 2013-12-19 17:38:27 UTC (rev 22713) @@ -0,0 +1,3 @@ +NOTE: This is a system level instance of Tor which may not be the most secure way to implement Tor. You should read the Tor documentation and understand the security implications of running a system level Tor before depending on this method for anonymity. + +https://www.torproject.org/docs/documentation.html Added: csw/mgar/pkg/tor/trunk/files/cswtor =================================================================== --- csw/mgar/pkg/tor/trunk/files/cswtor (rev 0) +++ csw/mgar/pkg/tor/trunk/files/cswtor 2013-12-19 17:38:27 UTC (rev 22713) @@ -0,0 +1,30 @@ +#!/bin/sh + +#FMRI network + +DAEMON=/opt/csw/bin/tor +CONF=/etc/opt/csw/tor/torrc +pidfile=/var/run/tor.pid + +case "$1" in + start) + echo "Starting Tor" + $DAEMON -f $CONF + ;; + stop) + echo "Stopping Tor" + kill `cat $pidfile` + ;; + restart) + echo "Restarting Tor" + kill `cat $pidfile` + sleep 1 + $DAEMON -f $CONF + ;; + *) + echo "Usage: $0 { start | stop | restart }" + exit 1 + ;; +esac + +exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Thu Dec 19 20:45:31 2013 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Thu, 19 Dec 2013 19:45:31 +0000 Subject: SF.net SVN: gar:[22714] csw/mgar/pkg/tor/trunk/Makefile Message-ID: <3dlk8q3fL8zPk@mail.opencsw.org> Revision: 22714 http://sourceforge.net/p/gar/code/22714 Author: jake_goerzen Date: 2013-12-19 19:45:30 +0000 (Thu, 19 Dec 2013) Log Message: ----------- tor: add some default options to sample conf Modified Paths: -------------- csw/mgar/pkg/tor/trunk/Makefile Modified: csw/mgar/pkg/tor/trunk/Makefile =================================================================== --- csw/mgar/pkg/tor/trunk/Makefile 2013-12-19 17:38:27 UTC (rev 22713) +++ csw/mgar/pkg/tor/trunk/Makefile 2013-12-19 19:45:30 UTC (rev 22714) @@ -1,8 +1,4 @@ # $Id$ -# TODO: need to create smf start/stop script. -# add "PidFile /var/run/tor.pid" to torrc.CSW sample conf. -# also add "Log syslog" to torrc.CSW sample conf. -# also add "RunAsDaemon 1" to torrc.CSW. NAME = tor VERSION = 0.2.4.19 GARTYPE = v2 @@ -41,3 +37,12 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 include gar/category.mk + +post-install-modulated: + + # add some config options to sample conf + echo "# OpenCSW added default options" >> $(DESTDIR)$(sysconfdir)/tor/torrc.sample + echo "Log syslog" >> $(DESTDIR)$(sysconfdir)/tor/torrc.sample + echo "PidFile /var/run/tor.pid" >> $(DESTDIR)$(sysconfdir)/tor/torrc.sample + echo "RunAsDaemon 1" >> $(DESTDIR)$(sysconfdir)/tor/torrc.sample + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 19 22:24:47 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Dec 2013 21:24:47 +0000 Subject: SF.net SVN: gar:[22715] csw/mgar/pkg/lang-python Message-ID: <3dlmMG10kVzc1@mail.opencsw.org> Revision: 22715 http://sourceforge.net/p/gar/code/22715 Author: dmichelsen Date: 2013-12-19 21:24:46 +0000 (Thu, 19 Dec 2013) Log Message: ----------- lang-python/cmdln: Initial commit Added Paths: ----------- csw/mgar/pkg/lang-python/cmdln/ csw/mgar/pkg/lang-python/cmdln/trunk/Makefile csw/mgar/pkg/lang-python/cmdln/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/lang-python/cmdln/trunk/Makefile csw/mgar/pkg/lang-python/cmdln/trunk/checksums Deleted: csw/mgar/pkg/lang-python/cmdln/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/setproctitle/trunk/Makefile 2013-11-06 14:25:24 UTC (rev 22420) +++ csw/mgar/pkg/lang-python/cmdln/trunk/Makefile 2013-12-19 21:24:46 UTC (rev 22715) @@ -1,24 +0,0 @@ -# Copyright 2009 OpenCSW -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -NAME = setproctitle -VERSION = 1.1.5 -CATEGORIES = python -GARTYPE = v2 - -DESCRIPTION = A library to allow customization of the process title - -MASTER_SITES = $(PYPI_MIRROR) -DISTFILES = $(DISTNAME).tar.gz - -VENDOR_URL = http://code.google.com/p/py-setproctitle/ - -PACKAGES = CSWpy-setproctitle -RUNTIME_DEP_PKGS_CSWpy-setproctitle += CSWlibpython2-6-1-0 -CHECKPKG_OVERRIDES_CSWpy-setproctitle += surplus-dependency|CSWpython - -# There is no testsuite -TEST_SCRIPTS = - -include gar/category.mk Copied: csw/mgar/pkg/lang-python/cmdln/trunk/Makefile (from rev 22613, csw/mgar/pkg/lang-python/setproctitle/trunk/Makefile) =================================================================== --- csw/mgar/pkg/lang-python/cmdln/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/cmdln/trunk/Makefile 2013-12-19 21:24:46 UTC (rev 22715) @@ -0,0 +1,25 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +NAME = cmdln +VERSION = 1.1.2 +CATEGORIES = python +GARTYPE = v2 + +DESCRIPTION = An improved cmd.py for writing multi-command scripts and shells + +MASTER_SITES = $(PYPI_MIRROR) +DISTFILES = $(DISTNAME).zip + +VENDOR_URL = https://pypi.python.org/pypi/cmdln + +PACKAGES += CSWpy-cmdln +SPKG_DESC_CSWpy-cmdln = An improved cmd.py for writing multi-command scripts and shells +# PKGFILES is catchall +ARCHALL_CSWpy-cmdln = 1 + +# There is no testsuite +TEST_SCRIPTS = + +include gar/category.mk Deleted: csw/mgar/pkg/lang-python/cmdln/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/setproctitle/trunk/checksums 2013-11-06 14:25:24 UTC (rev 22420) +++ csw/mgar/pkg/lang-python/cmdln/trunk/checksums 2013-12-19 21:24:46 UTC (rev 22715) @@ -1 +0,0 @@ -8dc236c23727a4aca031fcd29b7f8a73 setproctitle-1.1.5.tar.gz Copied: csw/mgar/pkg/lang-python/cmdln/trunk/checksums (from rev 22612, csw/mgar/pkg/lang-python/setproctitle/trunk/checksums) =================================================================== --- csw/mgar/pkg/lang-python/cmdln/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/cmdln/trunk/checksums 2013-12-19 21:24:46 UTC (rev 22715) @@ -0,0 +1 @@ +3a7f003147ad9dfb9e7e3f2f4b6b11b2 cmdln-1.1.2.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 19 22:45:16 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Dec 2013 21:45:16 +0000 Subject: SF.net SVN: gar:[22716] csw/mgar/pkg Message-ID: <3dlmpt0w0JzhP@mail.opencsw.org> Revision: 22716 http://sourceforge.net/p/gar/code/22716 Author: dmichelsen Date: 2013-12-19 21:45:14 +0000 (Thu, 19 Dec 2013) Log Message: ----------- famfamfam-flag-icons/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/famfamfam-flag-icons/ csw/mgar/pkg/famfamfam-flag-icons/Makefile csw/mgar/pkg/famfamfam-flag-icons/branches/ csw/mgar/pkg/famfamfam-flag-icons/tags/ csw/mgar/pkg/famfamfam-flag-icons/trunk/ csw/mgar/pkg/famfamfam-flag-icons/trunk/Makefile csw/mgar/pkg/famfamfam-flag-icons/trunk/checksums csw/mgar/pkg/famfamfam-flag-icons/trunk/files/ Added: csw/mgar/pkg/famfamfam-flag-icons/Makefile =================================================================== --- csw/mgar/pkg/famfamfam-flag-icons/Makefile (rev 0) +++ csw/mgar/pkg/famfamfam-flag-icons/Makefile 2013-12-19 21:45:14 UTC (rev 22716) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/famfamfam-flag-icons/trunk =================================================================== --- csw/mgar/pkg/famfamfam-flag-icons/trunk 2013-12-19 21:24:46 UTC (rev 22715) +++ csw/mgar/pkg/famfamfam-flag-icons/trunk 2013-12-19 21:45:14 UTC (rev 22716) Property changes on: csw/mgar/pkg/famfamfam-flag-icons/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/famfamfam-flag-icons/trunk/Makefile =================================================================== --- csw/mgar/pkg/famfamfam-flag-icons/trunk/Makefile (rev 0) +++ csw/mgar/pkg/famfamfam-flag-icons/trunk/Makefile 2013-12-19 21:45:14 UTC (rev 22716) @@ -0,0 +1,32 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = famfamfam_flag_icons +VERSION = 1.0 +GARTYPE = v2 + +DESCRIPTION = FamFamFam Flag Icons + +MASTER_SITES = http://www.famfamfam.com/lab/icons/flags/ +DISTNAME = $(NAME) +DISTFILES += $(DISTNAME).zip + +LICENSE = readme.txt + +ARCHALL_CSWfamfamfam-flag-icons = 1 + +# Come on, these are just pictures +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(sharedstatedir)/www/famfamfam-flag-icons/gif + ginstall -m 0644 $(WORKDIR)/gif/* $(DESTDIR)$(sharedstatedir)/www/famfamfam-flag-icons/gif + ginstall -d $(DESTDIR)$(sharedstatedir)/www/famfamfam-flag-icons/png + ginstall -m 0644 $(WORKDIR)/png/* $(DESTDIR)$(sharedstatedir)/www/famfamfam-flag-icons/png + @$(MAKECOOKIE) + Property changes on: csw/mgar/pkg/famfamfam-flag-icons/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/famfamfam-flag-icons/trunk/checksums =================================================================== --- csw/mgar/pkg/famfamfam-flag-icons/trunk/checksums (rev 0) +++ csw/mgar/pkg/famfamfam-flag-icons/trunk/checksums 2013-12-19 21:45:14 UTC (rev 22716) @@ -0,0 +1 @@ +76b589be9c83ac1a7ff2bb8fb13a6649 famfamfam_flag_icons.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Thu Dec 19 22:46:01 2013 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Thu, 19 Dec 2013 21:46:01 +0000 Subject: SF.net SVN: gar:[22717] csw/mgar/pkg/tor/trunk/Makefile Message-ID: <3dlmql4r1czll@mail.opencsw.org> Revision: 22717 http://sourceforge.net/p/gar/code/22717 Author: jake_goerzen Date: 2013-12-19 21:46:00 +0000 (Thu, 19 Dec 2013) Log Message: ----------- tor: post-install-modulated additions and fixes Modified Paths: -------------- csw/mgar/pkg/tor/trunk/Makefile Modified: csw/mgar/pkg/tor/trunk/Makefile =================================================================== --- csw/mgar/pkg/tor/trunk/Makefile 2013-12-19 21:45:14 UTC (rev 22716) +++ csw/mgar/pkg/tor/trunk/Makefile 2013-12-19 21:46:00 UTC (rev 22717) @@ -36,6 +36,8 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +PKGFILES_CSWtor = /opt/csw/share/doc/tor/README.CSW + include gar/category.mk post-install-modulated: @@ -45,4 +47,13 @@ echo "Log syslog" >> $(DESTDIR)$(sysconfdir)/tor/torrc.sample echo "PidFile /var/run/tor.pid" >> $(DESTDIR)$(sysconfdir)/tor/torrc.sample echo "RunAsDaemon 1" >> $(DESTDIR)$(sysconfdir)/tor/torrc.sample + + # Copy SMF script + ginstall -Dm 755 $(FILEDIR)/cswtor \ + $(DESTDIR)/etc/opt/csw/init.d/cswtor + + # Copy README.CSW to docs + ginstall -m 444 $(FILEDIR)/README.CSW \ + $(DESTDIR)/opt/csw/share/doc/tor/ + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Fri Dec 20 01:06:59 2013 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Fri, 20 Dec 2013 00:06:59 +0000 Subject: SF.net SVN: gar:[22718] csw/mgar/pkg/tor/trunk/Makefile Message-ID: <3dlqyN1DK8zy4@mail.opencsw.org> Revision: 22718 http://sourceforge.net/p/gar/code/22718 Author: jake_goerzen Date: 2013-12-20 00:06:58 +0000 (Fri, 20 Dec 2013) Log Message: ----------- tor: build recipe clean-up Modified Paths: -------------- csw/mgar/pkg/tor/trunk/Makefile Modified: csw/mgar/pkg/tor/trunk/Makefile =================================================================== --- csw/mgar/pkg/tor/trunk/Makefile 2013-12-19 21:46:00 UTC (rev 22717) +++ csw/mgar/pkg/tor/trunk/Makefile 2013-12-20 00:06:58 UTC (rev 22718) @@ -36,8 +36,6 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -PKGFILES_CSWtor = /opt/csw/share/doc/tor/README.CSW - include gar/category.mk post-install-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Fri Dec 20 04:26:57 2013 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Fri, 20 Dec 2013 03:26:57 +0000 Subject: SF.net SVN: gar:[22719] csw/mgar/pkg/dovecot/trunk Message-ID: <3dlwP66BtYz1Dq@mail.opencsw.org> Revision: 22719 http://sourceforge.net/p/gar/code/22719 Author: jake_goerzen Date: 2013-12-20 03:26:53 +0000 (Fri, 20 Dec 2013) Log Message: ----------- dovecot: update to 2.2.10 Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile csw/mgar/pkg/dovecot/trunk/checksums Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2013-12-20 00:06:58 UTC (rev 22718) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2013-12-20 03:26:53 UTC (rev 22719) @@ -2,7 +2,7 @@ # - SSL certs to /etc/opt/csw/ssl? # - /var/run/dovecot instead of /var/opt/csw/run? NAME = dovecot -VERSION = 2.2.9 +VERSION = 2.2.10 GARTYPE = v2 DESCRIPTION = Secure IMAP server Modified: csw/mgar/pkg/dovecot/trunk/checksums =================================================================== --- csw/mgar/pkg/dovecot/trunk/checksums 2013-12-20 00:06:58 UTC (rev 22718) +++ csw/mgar/pkg/dovecot/trunk/checksums 2013-12-20 03:26:53 UTC (rev 22719) @@ -1 +1 @@ -6e620a4020b7cc9855cbb304a63efc87 dovecot-2.2.9.tar.gz +037e9c9e07d9dbff54dcff09f280fc8c dovecot-2.2.10.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Dec 20 09:59:30 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 20 Dec 2013 08:59:30 +0000 Subject: SF.net SVN: gar:[22720] csw/mgar/pkg/mplayer/branches/snapshot/checksums Message-ID: <3dm3mr62xsz1RH@mail.opencsw.org> Revision: 22720 http://sourceforge.net/p/gar/code/22720 Author: pfelecan Date: 2013-12-20 08:59:28 +0000 (Fri, 20 Dec 2013) Log Message: ----------- weekly snapshot Modified Paths: -------------- csw/mgar/pkg/mplayer/branches/snapshot/checksums Modified: csw/mgar/pkg/mplayer/branches/snapshot/checksums =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/checksums 2013-12-20 03:26:53 UTC (rev 22719) +++ csw/mgar/pkg/mplayer/branches/snapshot/checksums 2013-12-20 08:59:28 UTC (rev 22720) @@ -1,2 +1,2 @@ -3c126bb66528894aff1d498c9f47e3c2 ffmpeg-snapshot.tar.bz2 -de1c98b5eeba05bc26be3be946e2bbb1 mplayer-export-snapshot.tar.bz2 +6c02fc5190a7096e7e7eae8ce2a8345e ffmpeg-snapshot.tar.bz2 +5221a2ed84fb67c4bd23000b205795d2 mplayer-export-snapshot.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Dec 20 13:06:11 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 20 Dec 2013 12:06:11 +0000 Subject: SF.net SVN: gar:[22721] csw/mgar/pkg Message-ID: <3dm7wF2dGZz6l@mail.opencsw.org> Revision: 22721 http://sourceforge.net/p/gar/code/22721 Author: dmichelsen Date: 2013-12-20 12:06:10 +0000 (Fri, 20 Dec 2013) Log Message: ----------- famfamfam-silk-icons: Initial commit Modified Paths: -------------- csw/mgar/pkg/famfamfam-silk-icons/trunk/Makefile csw/mgar/pkg/famfamfam-silk-icons/trunk/checksums Added Paths: ----------- csw/mgar/pkg/famfamfam-silk-icons/ Modified: csw/mgar/pkg/famfamfam-silk-icons/trunk/Makefile =================================================================== --- csw/mgar/pkg/famfamfam-flag-icons/trunk/Makefile 2013-12-19 21:45:14 UTC (rev 22716) +++ csw/mgar/pkg/famfamfam-silk-icons/trunk/Makefile 2013-12-20 12:06:10 UTC (rev 22721) @@ -1,19 +1,19 @@ # $Id$ # TODO (release-critical prefixed with !, non release-critical with *) # -NAME = famfamfam_flag_icons -VERSION = 1.0 +NAME = famfamfam_silk_icons +VERSION = 1.3 GARTYPE = v2 -DESCRIPTION = FamFamFam Flag Icons +DESCRIPTION = FamFamFam Silk Icons -MASTER_SITES = http://www.famfamfam.com/lab/icons/flags/ -DISTNAME = $(NAME) +MASTER_SITES = http://www.famfamfam.com/lab/icons/silk/ +DISTNAME = $(NAME)_v0$(subst .,,$(VERSION)) DISTFILES += $(DISTNAME).zip LICENSE = readme.txt -ARCHALL_CSWfamfamfam-flag-icons = 1 +ARCHALL_CSWfamfamfam-silk-icons = 1 # Come on, these are just pictures CONFIGURE_SCRIPTS = @@ -24,9 +24,9 @@ include gar/category.mk install-custom: - ginstall -d $(DESTDIR)$(sharedstatedir)/www/famfamfam-flag-icons/gif - ginstall -m 0644 $(WORKDIR)/gif/* $(DESTDIR)$(sharedstatedir)/www/famfamfam-flag-icons/gif - ginstall -d $(DESTDIR)$(sharedstatedir)/www/famfamfam-flag-icons/png - ginstall -m 0644 $(WORKDIR)/png/* $(DESTDIR)$(sharedstatedir)/www/famfamfam-flag-icons/png + ginstall -d $(DESTDIR)$(sharedstatedir)/www/famfamfam-silk-icons/ + ginstall -m 0644 $(WORKDIR)/readme.html $(DESTDIR)$(sharedstatedir)/www/famfamfam-silk-icons/ + ginstall -d $(DESTDIR)$(sharedstatedir)/www/famfamfam-silk-icons/icons + ginstall -m 0644 $(WORKDIR)/icons/* $(DESTDIR)$(sharedstatedir)/www/famfamfam-silk-icons/icons @$(MAKECOOKIE) Modified: csw/mgar/pkg/famfamfam-silk-icons/trunk/checksums =================================================================== --- csw/mgar/pkg/famfamfam-flag-icons/trunk/checksums 2013-12-19 21:45:14 UTC (rev 22716) +++ csw/mgar/pkg/famfamfam-silk-icons/trunk/checksums 2013-12-20 12:06:10 UTC (rev 22721) @@ -1 +1 @@ -76b589be9c83ac1a7ff2bb8fb13a6649 famfamfam_flag_icons.zip +7c60fef364ca681448d39726930535de famfamfam_silk_icons_v013.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Dec 20 14:07:32 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 20 Dec 2013 13:07:32 +0000 Subject: SF.net SVN: gar:[22722] csw/mgar/pkg/lang-python Message-ID: <3dm9Jg3RHBzH3@mail.opencsw.org> Revision: 22722 http://sourceforge.net/p/gar/code/22722 Author: dmichelsen Date: 2013-12-20 13:07:29 +0000 (Fri, 20 Dec 2013) Log Message: ----------- lang-python/mb: Initial commit Added Paths: ----------- csw/mgar/pkg/lang-python/mb/ csw/mgar/pkg/lang-python/mb/Makefile csw/mgar/pkg/lang-python/mb/branches/ csw/mgar/pkg/lang-python/mb/tags/ csw/mgar/pkg/lang-python/mb/trunk/ csw/mgar/pkg/lang-python/mb/trunk/Makefile csw/mgar/pkg/lang-python/mb/trunk/checksums csw/mgar/pkg/lang-python/mb/trunk/files/ csw/mgar/pkg/lang-python/mb/trunk/files/0001-New-locations-for-GeoIP-databases.patch Added: csw/mgar/pkg/lang-python/mb/Makefile =================================================================== --- csw/mgar/pkg/lang-python/mb/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/mb/Makefile 2013-12-20 13:07:29 UTC (rev 22722) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/lang-python/mb/trunk =================================================================== --- csw/mgar/pkg/lang-python/mb/trunk 2013-12-20 12:06:10 UTC (rev 22721) +++ csw/mgar/pkg/lang-python/mb/trunk 2013-12-20 13:07:29 UTC (rev 22722) Property changes on: csw/mgar/pkg/lang-python/mb/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/lang-python/mb/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/mb/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/mb/trunk/Makefile 2013-12-20 13:07:29 UTC (rev 22722) @@ -0,0 +1,37 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = mirrorbrain +VERSION = 2.17.0 +CATEGORIES = python +GARTYPE = v2 + +DESCRIPTION = Brief description + +MASTER_SITES = http://mirrorbrain.org/files/releases/ +DISTFILES = $(DISTNAME).tar.gz + +PATCHFILES += 0001-New-locations-for-GeoIP-databases.patch + +WORKSRC = $(WORKDIR)/$(DISTNAME)/mb + +LICENSE = COPYING + +PACKAGES += CSWpy-mb +SPKG_DESC_CSWpy-mb = Python module used by the MirrorBrain commandline tools +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWpy-mb += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWpy-mb += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-mb += CSWlibpython2-7-1-0 +RUNTIME_DEP_PKGS_CSWpy-mb += CSWpy-cmdln +RUNTIME_DEP_PKGS_CSWpy-mb += CSWgeolitedb +# checkpkg cannot detect these deps +CHECKPKG_OVERRIDES_CSWpy-mb += surplus-dependency|CSWpy-cmdln +CHECKPKG_OVERRIDES_CSWpy-mb += surplus-dependency|CSWgeolitedb + +# There is no testsuite +SKIPTEST ?= 1 + +include gar/category.mk + + Property changes on: csw/mgar/pkg/lang-python/mb/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/lang-python/mb/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/mb/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/mb/trunk/checksums 2013-12-20 13:07:29 UTC (rev 22722) @@ -0,0 +1 @@ +c0556adb5c5eef8983b517f938375abc mirrorbrain-2.17.0.tar.gz Added: csw/mgar/pkg/lang-python/mb/trunk/files/0001-New-locations-for-GeoIP-databases.patch =================================================================== --- csw/mgar/pkg/lang-python/mb/trunk/files/0001-New-locations-for-GeoIP-databases.patch (rev 0) +++ csw/mgar/pkg/lang-python/mb/trunk/files/0001-New-locations-for-GeoIP-databases.patch 2013-12-20 13:07:29 UTC (rev 22722) @@ -0,0 +1,44 @@ +From 2f8223de7837825fb1838686b75a46796b85e15c Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 20 Dec 2013 13:51:33 +0100 +Subject: [PATCH] New locations for GeoIP databases + +--- + mb/mb/geoip.py | 16 ++++------------ + 1 file changed, 4 insertions(+), 12 deletions(-) + +diff --git a/mb/mb/geoip.py b/mb/mb/geoip.py +index bcfda33..7b52e2f 100644 +--- a/mb/mb/geoip.py ++++ b/mb/mb/geoip.py +@@ -4,23 +4,15 @@ from subprocess import Popen, PIPE + import errno + + # try different databases and different locations +-databases = ['/var/lib/GeoIP/GeoLiteCity.dat.updated', +- '/var/lib/GeoIP/GeoLiteCity.dat', +- '/var/lib/GeoIP/GeoIP.dat.updated', +- '/var/lib/GeoIP/GeoIP.dat', +- '/usr/share/GeoIP/GeoLiteCity.dat.updated', +- '/usr/share/GeoIP/GeoLiteCity.dat', +- '/usr/share/GeoIP/GeoIP.dat.updated', +- '/usr/share/GeoIP/GeoIP.dat', ++databases = ['/opt/csw/share/GeoIP/GeoIPCity.dat', ++ '/opt/csw/share/GeoIP/GeoIP.dat', + ] + for i in databases: + if os.path.exists(i): + database = i + break +-databases6 = ['/var/lib/GeoIP/GeoIPv6.dat.updated', +- '/var/lib/GeoIP/GeoIPv6.dat', +- '/usr/share/GeoIP/GeoIPv6.dat.updated', +- '/usr/share/GeoIP/GeoIPv6.dat', ++databases6 = ['/opt/csw/share/GeoIP/GeoIPCityv6.dat', ++ '/opt/csw/share/GeoIP/GeoIPv6.dat', + ] + for i in databases6: + if os.path.exists(i): +-- +1.8.3.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Dec 20 14:58:16 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 20 Dec 2013 13:58:16 +0000 Subject: SF.net SVN: gar:[22723] csw/mgar/pkg/lang-python/mb/trunk Message-ID: <3dmBPZ1M7XzQZ@mail.opencsw.org> Revision: 22723 http://sourceforge.net/p/gar/code/22723 Author: dmichelsen Date: 2013-12-20 13:58:14 +0000 (Fri, 20 Dec 2013) Log Message: ----------- lang-python/mb/trunk: Adjustments for mirrorbrain.conf Modified Paths: -------------- csw/mgar/pkg/lang-python/mb/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/lang-python/mb/trunk/files/mirrorbrain.conf.CSW Modified: csw/mgar/pkg/lang-python/mb/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/mb/trunk/Makefile 2013-12-20 13:07:29 UTC (rev 22722) +++ csw/mgar/pkg/lang-python/mb/trunk/Makefile 2013-12-20 13:58:14 UTC (rev 22723) @@ -9,14 +9,24 @@ DESCRIPTION = Brief description MASTER_SITES = http://mirrorbrain.org/files/releases/ -DISTFILES = $(DISTNAME).tar.gz +DISTFILES += $(DISTNAME).tar.gz +DISTFILES += mirrorbrain.conf.CSW PATCHFILES += 0001-New-locations-for-GeoIP-databases.patch -WORKSRC = $(WORKDIR)/$(DISTNAME)/mb +# We really do only care for MirrorBrain on Solaris 10 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 LICENSE = COPYING +WORKSRC = $(WORKDIR)/$(DISTNAME)/mb + +REINPLACEMENTS += conf +REINPLACE_MATCH_conf = /etc/mirrorbrain\.conf +REINPLACE_WITH_conf = $(sysconfdir)/mirrorbrain.conf +REINPLACE_FILES_conf += mb.py +REINPLACE_FILES_conf += mb/conf.py + PACKAGES += CSWpy-mb SPKG_DESC_CSWpy-mb = Python module used by the MirrorBrain commandline tools # PKGFILES is catchall @@ -29,9 +39,12 @@ CHECKPKG_OVERRIDES_CSWpy-mb += surplus-dependency|CSWpy-cmdln CHECKPKG_OVERRIDES_CSWpy-mb += surplus-dependency|CSWgeolitedb +PRESERVECONF += $(sysconfdir)/mirrorbrain.conf + # There is no testsuite SKIPTEST ?= 1 include gar/category.mk - +post-merge-all: + ginstall -D -m 0640 $(WORKDIR)/mirrorbrain.conf.CSW $(PKGROOT)$(sysconfdir)/mirrorbrain.conf.CSW Added: csw/mgar/pkg/lang-python/mb/trunk/files/mirrorbrain.conf.CSW =================================================================== --- csw/mgar/pkg/lang-python/mb/trunk/files/mirrorbrain.conf.CSW (rev 0) +++ csw/mgar/pkg/lang-python/mb/trunk/files/mirrorbrain.conf.CSW 2013-12-20 13:58:14 UTC (rev 22723) @@ -0,0 +1,15 @@ +[general] +instances = main + +[main] +dbuser = mirrorbrain +dbpass = 12345 +dbdriver = postgresql +dbhost = 127.0.0.1 +# optional: dbport = ... +dbname = mirrorbrain + +[mirrorprobe] +# logfile = /var/opt/csw/mirrorbrain/mirrorprobe.log +# loglevel = INFO + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Dec 20 16:06:49 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 20 Dec 2013 15:06:49 +0000 Subject: SF.net SVN: gar:[22724] csw/mgar/pkg/lang-python/mb/trunk/Makefile Message-ID: <3dmCwg1KrYzpW@mail.opencsw.org> Revision: 22724 http://sourceforge.net/p/gar/code/22724 Author: dmichelsen Date: 2013-12-20 15:06:49 +0000 (Fri, 20 Dec 2013) Log Message: ----------- lang-python/mb/trunk: Add dependency Modified Paths: -------------- csw/mgar/pkg/lang-python/mb/trunk/Makefile Modified: csw/mgar/pkg/lang-python/mb/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/mb/trunk/Makefile 2013-12-20 13:58:14 UTC (rev 22723) +++ csw/mgar/pkg/lang-python/mb/trunk/Makefile 2013-12-20 15:06:49 UTC (rev 22724) @@ -34,9 +34,11 @@ RUNTIME_DEP_PKGS_CSWpy-mb += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWpy-mb += CSWlibpython2-7-1-0 RUNTIME_DEP_PKGS_CSWpy-mb += CSWpy-cmdln +RUNTIME_DEP_PKGS_CSWpy-mb += CSWpy-psycopg2 RUNTIME_DEP_PKGS_CSWpy-mb += CSWgeolitedb # checkpkg cannot detect these deps CHECKPKG_OVERRIDES_CSWpy-mb += surplus-dependency|CSWpy-cmdln +CHECKPKG_OVERRIDES_CSWpy-mb += surplus-dependency|CSWpy-psycopg2 CHECKPKG_OVERRIDES_CSWpy-mb += surplus-dependency|CSWgeolitedb PRESERVECONF += $(sysconfdir)/mirrorbrain.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Sat Dec 21 00:56:40 2013 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Fri, 20 Dec 2013 23:56:40 +0000 Subject: SF.net SVN: gar:[22725] csw/mgar/pkg/zsh/trunk Message-ID: <3dmRhB0TDXz1S1@mail.opencsw.org> Revision: 22725 http://sourceforge.net/p/gar/code/22725 Author: opk Date: 2013-12-20 23:56:35 +0000 (Fri, 20 Dec 2013) Log Message: ----------- update zsh to 5.0.4 Modified Paths: -------------- csw/mgar/pkg/zsh/trunk/Makefile csw/mgar/pkg/zsh/trunk/checksums Modified: csw/mgar/pkg/zsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/zsh/trunk/Makefile 2013-12-20 15:06:49 UTC (rev 22724) +++ csw/mgar/pkg/zsh/trunk/Makefile 2013-12-20 23:56:35 UTC (rev 22725) @@ -1,5 +1,5 @@ NAME = zsh -VERSION = 5.0.1 +VERSION = 5.0.4 GARTYPE = v2 DESCRIPTION = Powerful UNIX shell @@ -30,33 +30,6 @@ CONFIGURE_ARGS += --enable-pcre CONFIGURE_ARGS += --enable-etcdir=$(sysconfdir) -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/_urxvt -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_units -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_hg -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_loadkeys -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_ecasound -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_path_commands -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_lintian -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_lsusb -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/run-help -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_cdrdao -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_setxkbmap -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/_units -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/bin/zsh-$(VERSION) -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/zshcontrib.1 -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/_gcc -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/_urls -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/_path_files -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/zshmisc.1 -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/zshmodules.1 -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/zshoptions.1 -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/zshcontrib.1 -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/zshparam.1 -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/_complete_tag -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/_twisted -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/compaudit -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/mere - ETCSHELLS = /opt/csw/bin/zsh include gar/category.mk Modified: csw/mgar/pkg/zsh/trunk/checksums =================================================================== --- csw/mgar/pkg/zsh/trunk/checksums 2013-12-20 15:06:49 UTC (rev 22724) +++ csw/mgar/pkg/zsh/trunk/checksums 2013-12-20 23:56:35 UTC (rev 22725) @@ -1 +1 @@ -fa5f0f2b64df667d17993d06bb11a7bc zsh-5.0.1.tar.bz2 +9829fe8932c25740173a272e8959cf8c zsh-5.0.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Sat Dec 21 01:25:01 2013 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Sat, 21 Dec 2013 00:25:01 +0000 Subject: SF.net SVN: gar:[22726] csw/mgar/pkg/zsh/trunk/Makefile Message-ID: <3dmSJl0vTQz1X3@mail.opencsw.org> Revision: 22726 http://sourceforge.net/p/gar/code/22726 Author: opk Date: 2013-12-21 00:24:59 +0000 (Sat, 21 Dec 2013) Log Message: ----------- add overrides for zsh Modified Paths: -------------- csw/mgar/pkg/zsh/trunk/Makefile Modified: csw/mgar/pkg/zsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/zsh/trunk/Makefile 2013-12-20 23:56:35 UTC (rev 22725) +++ csw/mgar/pkg/zsh/trunk/Makefile 2013-12-21 00:24:59 UTC (rev 22726) @@ -30,6 +30,8 @@ CONFIGURE_ARGS += --enable-pcre CONFIGURE_ARGS += --enable-etcdir=$(sysconfdir) +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/bin/zsh-$(VERSION) + ETCSHELLS = /opt/csw/bin/zsh include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Dec 22 15:54:59 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 22 Dec 2013 14:54:59 +0000 Subject: SF.net SVN: gar:[22727] csw/mgar/pkg/sendmail/trunk Message-ID: <3dnRZJ2Zl0zrl@mail.opencsw.org> Revision: 22727 http://sourceforge.net/p/gar/code/22727 Author: bonivart Date: 2013-12-22 14:54:57 +0000 (Sun, 22 Dec 2013) Log Message: ----------- sendmail/trunk: update to 8.14.7 Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile csw/mgar/pkg/sendmail/trunk/checksums Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2013-12-21 00:24:59 UTC (rev 22726) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2013-12-22 14:54:57 UTC (rev 22727) @@ -31,12 +31,11 @@ # + #4150 Sendmail 8.14.4 released -> this is 8.14.5 NAME = sendmail -VERSION = 8.14.6 +VERSION = 8.14.7 GARTYPE = v2 DESCRIPTION = Sendmail MTA define BLURB - Sendmail MTA endef MASTER_SITES = ftp://ftp.sendmail.org/pub/sendmail/ @@ -146,32 +145,17 @@ ALTERNATIVE_sendmail += $(mandir)/man1/newaliases.1 newaliases.1 $(mandir)/man1/newaliases.1.sendmail ALTERNATIVE_sendmail += $(mandir)/man5/aliases.5 aliases.5 $(mandir)/man5/aliases.5.sendmail -# Look thru these to see if they are harmless, e.g. examples -CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/etc/opt/csw/movemail.conf -CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/bin/bounce-resender.pl -CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/bin/etrn.pl -CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/bin/re-mqueue.pl -CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/bin/movemail.pl -CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/bin/doublebounce.pl -CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/bin/expn.pl -CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sendmail_contrib/mmuegel -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/README -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/mailer/fax.m4 -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/mailer/qpage.m4 -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/mailer/procmail.m4 -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/mailer/phquery.m4 -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/ostype/dragonfly.m4 -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/ostype/freebsd5.m4 -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/ostype/freebsd6.m4 -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/ostype/powerux.m4 -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/cf/mail.cs.mc -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/cf/mail.eecs.mc -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/cf/knecht.mc -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/feature/local_procmail.m4 -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/sendmail.8 -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/smrsh.8 -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/share|root/opt/csw/share/sendmail/cf/README +REINPLACE_USRLOCAL += $(sysconfdir)/movemail.conf +REINPLACE_USRLOCAL += $(bindir)/bounce-resender.pl +REINPLACE_USRLOCAL += $(bindir)/movemail.pl +REINPLACE_USRLOCAL += $(bindir)/doublebounce.pl +REINPLACE_USRLOCAL += $(bindir)/re-mqueue.pl +REINPLACE_USRLOCAL += $(bindir)/expn.pl +REINPLACE_WHEN_USRLOCAL = postinstall +# Don't know how to fix this or if it needs fixing +CHECKPKG_OVERRIDES_CSWsendmail += no-direct-binding + # The static libs from libmilter CHECKPKG_OVERRIDES_CSWlibmilter += discouraged-path-in-pkgmap|/opt/csw/lib/libsmutil.a CHECKPKG_OVERRIDES_CSWlibmilter += discouraged-path-in-pkgmap|/opt/csw/lib/libmilter.a @@ -214,7 +198,7 @@ build-custom: @echo " ==> Building $(NAME) (custom)" - cd $(WORKSRC) && ./Build + cd $(WORKSRC) && PATH=/opt/csw/gnu:/opt/csw/bin:/bin ./Build @$(MAKECOOKIE) test-custom: Modified: csw/mgar/pkg/sendmail/trunk/checksums =================================================================== --- csw/mgar/pkg/sendmail/trunk/checksums 2013-12-21 00:24:59 UTC (rev 22726) +++ csw/mgar/pkg/sendmail/trunk/checksums 2013-12-22 14:54:57 UTC (rev 22727) @@ -1 +1 @@ -9eeed3d1baecbf4e17d829d2ec005553 sendmail.8.14.6.tar.gz +348eedfab0ed00931f2df94e78f22c43 sendmail.8.14.7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Mon Dec 23 02:00:45 2013 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Mon, 23 Dec 2013 01:00:45 +0000 Subject: SF.net SVN: gar:[22728] csw/mgar/pkg/wesnoth/trunk Message-ID: <3dnj135g5tz1Cr@mail.opencsw.org> Revision: 22728 http://sourceforge.net/p/gar/code/22728 Author: jake_goerzen Date: 2013-12-23 01:00:39 +0000 (Mon, 23 Dec 2013) Log Message: ----------- wesnoth: update to 1.10.7; not buildable yet needs work Modified Paths: -------------- csw/mgar/pkg/wesnoth/trunk/Makefile csw/mgar/pkg/wesnoth/trunk/checksums Modified: csw/mgar/pkg/wesnoth/trunk/Makefile =================================================================== --- csw/mgar/pkg/wesnoth/trunk/Makefile 2013-12-22 14:54:57 UTC (rev 22727) +++ csw/mgar/pkg/wesnoth/trunk/Makefile 2013-12-23 01:00:39 UTC (rev 22728) @@ -2,7 +2,7 @@ # NOTE: cmake finds boost library but "mgar build" step can't find boost # headers and setting EXTRA_INC or EXTRA_CPPFLAGS doesn't help. NAME = wesnoth -VERSION = 1.10.2 +VERSION = 1.10.7 GARTYPE = v2 DESCRIPTION = A free turn-based strategy game with a fanasy theme @@ -27,11 +27,31 @@ TEST_SCRIPTS = CONFIGURE_SCRIPTS = custom +BUILD_SCRIPTS = custom +INSTALL_SCRIPTS = custom +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + include gar/category.mk # Autotools build depreciated now using cmake configure-custom: + mkdir $(WORKSRC)/build + cd $(WORKSRC)/build && \ + CMAKE_INCLUDE_PATH=/opt/csw/gxx/include:/opt/csw/include \ + CMAKE_LIBRARY_PATH=/opt/csw/gxx/lib:/opt/csw/lib \ + CC=gcc CXX=g++ \ + /opt/csw/bin/cmake \ + -DCMAKE_INSTALL_PREFIX=/opt/csw \ + -DCMAKE_VERBOSE_MAKEFILE=TRUE \ + -DCMAKE_CPP_FLAGS=-I/opt/csw/gxx/include \ + -DBoost_INCLUDE_DIR=/opt/csw/gxx/include .. + @$(MAKECOOKIE) - cd $(WORKSRC) && /opt/csw/bin/cmake -DCMAKE_INSTALL_PREFIX=/opt/csw -DBOOST_INCLUDEDIR=/opt/csw/gxx/include . +build-custom: + cd $(WORKSRC)/build && /opt/csw/bin/gmake @$(MAKECOOKIE) + +install-custom: + cd $(WORKSRC)/build && /opt/csw/bin/gmake install DESTDIR=$(DESTDIR) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/wesnoth/trunk/checksums =================================================================== --- csw/mgar/pkg/wesnoth/trunk/checksums 2013-12-22 14:54:57 UTC (rev 22727) +++ csw/mgar/pkg/wesnoth/trunk/checksums 2013-12-23 01:00:39 UTC (rev 22728) @@ -1 +1 @@ -61f93437ba13a27a048e5ee2ee63736a wesnoth-1.10.2.tar.bz2 +3f460a494530d32aa5d5d0f19c95efbd wesnoth-1.10.7.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Mon Dec 23 16:37:37 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 23 Dec 2013 15:37:37 +0000 Subject: SF.net SVN: gar:[22729] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: <3dp4Sy0J1fzKj@mail.opencsw.org> Revision: 22729 http://sourceforge.net/p/gar/code/22729 Author: lblume Date: 2013-12-23 15:37:36 +0000 (Mon, 23 Dec 2013) Log Message: ----------- mysql5/branches/mysql-5.5.x: Add deps for GCC Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-12-23 01:00:39 UTC (rev 22728) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-12-23 15:37:36 UTC (rev 22729) @@ -21,7 +21,7 @@ # Useful when making a series of builds on the same day # GARFLAVOR ?= DBG -PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +#PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 # Keep default old Studio 12.0 for old S9 only @@ -126,7 +126,7 @@ RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER)_5.10 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER)_$(GAROSREL)) # For GCC4 -#RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibgcc-s1 PACKAGES += CSWlibmysqlclient-r$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient_r\.so\.$(MYSQL_LIB_VER)(\.\d+)*) @@ -164,9 +164,9 @@ RUNTIME_DEP_PKGS_CSW$(NAME)client_5.10 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)client += $(RUNTIME_DEP_PKGS_CSW$(NAME)client_$(GAROSREL)) ### For GCC4 -#RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibgcc-s1 -#RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibstdc++6 -CHECKPKG_OVERRIDES_CSW$(NAME)client += bad-rpath-entry +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibstdc++6 +#CHECKPKG_OVERRIDES_CSW$(NAME)client += bad-rpath-entry # It's intentional. There's a sparcv8-incompatible assembler code there, so we # must build for sparcv8+ on Solaris 9. @@ -176,7 +176,7 @@ CHECKPKG_OVERRIDES_CSWlibmysqlclient18 += binary-architecture-does-not-match-placement endif -CHECKPKG_OVERRIDES_CSWlibmysqlclient18 += bad-rpath-entry +#CHECKPKG_OVERRIDES_CSWlibmysqlclient18 += bad-rpath-entry PACKAGES += CSW$(NAME) SPKG_DESC_CSW$(NAME) = Multithreaded SQL database @@ -186,9 +186,9 @@ RUNTIME_DEP_PKGS_CSW$(NAME)_5.10 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME) += $(RUNTIME_DEP_PKGS_CSW$(NAME)_$(GAROSREL)) ### For GCC4 -#RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibgcc-s1 -#RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibstdc++6 -#RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1 +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1 CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue Dec 24 12:47:28 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 24 Dec 2013 11:47:28 +0000 Subject: SF.net SVN: gar:[22730] csw/mgar/pkg/subversion/trunk Message-ID: <3dpbJq0KMlz14N@mail.opencsw.org> Revision: 22730 http://sourceforge.net/p/gar/code/22730 Author: rthurner Date: 2013-12-24 11:47:26 +0000 (Tue, 24 Dec 2013) Log Message: ----------- subversion, update to svn-1.8.5 Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile csw/mgar/pkg/subversion/trunk/checksums Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2013-12-23 15:37:36 UTC (rev 22729) +++ csw/mgar/pkg/subversion/trunk/Makefile 2013-12-24 11:47:26 UTC (rev 22730) @@ -20,7 +20,7 @@ # http://subversion.apache.org/mailing-lists.html NAME = subversion -VERSION = 1.8.0 +VERSION = 1.8.5 GARTYPE = v2 DESCRIPTION = Version control rethought Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2013-12-23 15:37:36 UTC (rev 22729) +++ csw/mgar/pkg/subversion/trunk/checksums 2013-12-24 11:47:26 UTC (rev 22730) @@ -1 +1 @@ -f053a9948dfe5c70eff5c00509723214 subversion-1.8.0.tar.bz2 +77349caf0ef5a612c9718c53516a9934 subversion-1.8.5.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue Dec 24 12:48:14 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 24 Dec 2013 11:48:14 +0000 Subject: SF.net SVN: gar:[22731] csw/mgar/pkg/libserf/trunk Message-ID: <3dpbKd6Stvz17k@mail.opencsw.org> Revision: 22731 http://sourceforge.net/p/gar/code/22731 Author: rthurner Date: 2013-12-24 11:48:12 +0000 (Tue, 24 Dec 2013) Log Message: ----------- libserf, upgrade to serf-1.3.3 Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile csw/mgar/pkg/libserf/trunk/checksums Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2013-12-24 11:47:26 UTC (rev 22730) +++ csw/mgar/pkg/libserf/trunk/Makefile 2013-12-24 11:48:12 UTC (rev 22731) @@ -1,5 +1,5 @@ NAME = libserf -VERSION = 1.3.1 +VERSION = 1.3.3 DISTNAME = serf-$(VERSION) GARTYPE = v2 Modified: csw/mgar/pkg/libserf/trunk/checksums =================================================================== --- csw/mgar/pkg/libserf/trunk/checksums 2013-12-24 11:47:26 UTC (rev 22730) +++ csw/mgar/pkg/libserf/trunk/checksums 2013-12-24 11:48:12 UTC (rev 22731) @@ -1 +1 @@ -da5aca0cad19fd9c19129c3f8f7393dd serf-1.3.1.tar.bz2 +8375cf4fe2a89773c7d6dbf0d540ed27 serf-1.3.3.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue Dec 24 13:49:50 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 24 Dec 2013 12:49:50 +0000 Subject: SF.net SVN: gar:[22732] csw/mgar/pkg/mercurial/trunk/Makefile Message-ID: <3dpchm4tKxz1Fk@mail.opencsw.org> Revision: 22732 http://sourceforge.net/p/gar/code/22732 Author: rthurner Date: 2013-12-24 12:49:48 +0000 (Tue, 24 Dec 2013) Log Message: ----------- mercurial, update to hg-2.8.1 Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2013-12-24 11:48:12 UTC (rev 22731) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2013-12-24 12:49:48 UTC (rev 22732) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 2.7.2 +VERSION = 2.8.1 CATEGORIES = python GARTYPE = v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue Dec 24 13:52:42 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 24 Dec 2013 12:52:42 +0000 Subject: SF.net SVN: gar:[22733] csw/mgar/pkg/mercurial/trunk/checksums Message-ID: <3dpcm22N4lz1K6@mail.opencsw.org> Revision: 22733 http://sourceforge.net/p/gar/code/22733 Author: rthurner Date: 2013-12-24 12:52:41 +0000 (Tue, 24 Dec 2013) Log Message: ----------- mercurial, update to hg-2.8.1 Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/checksums Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2013-12-24 12:49:48 UTC (rev 22732) +++ csw/mgar/pkg/mercurial/trunk/checksums 2013-12-24 12:52:41 UTC (rev 22733) @@ -1 +1 @@ -ec00ddc6aadfea1e11b23650cb741d53 mercurial-2.7.2.tar.gz +bede5869f9b5d09ab3269bac472495e7 mercurial-2.8.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue Dec 24 15:50:31 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 24 Dec 2013 14:50:31 +0000 Subject: SF.net SVN: gar:[22734] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: <3dpgN06NSNz1SW@mail.opencsw.org> Revision: 22734 http://sourceforge.net/p/gar/code/22734 Author: rthurner Date: 2013-12-24 14:50:29 +0000 (Tue, 24 Dec 2013) Log Message: ----------- libserf, use different prefix to install before packaging, just like when not using scons Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2013-12-24 12:52:41 UTC (rev 22733) +++ csw/mgar/pkg/libserf/trunk/Makefile 2013-12-24 14:50:29 UTC (rev 22734) @@ -46,7 +46,6 @@ EXTRA_LIB = $(prefix)/bdb48/lib -SCONS_FLAGS += PREFIX=$(prefix) SCONS_FLAGS += APR=$(bindir)/apr-1-config SCONS_FLAGS += APU=$(bindir)/apu-1-config @@ -55,14 +54,14 @@ build-serf: (cd $(WORKSRC); \ scons \ - $(SCONS_FLAGS)) + $(SCONS_FLAGS) PREFIX=$(prefix) ) @$(MAKECOOKIE) install-serf: (cd $(WORKSRC); \ scons \ $(SCONS_FLAGS) \ - -Q --prefix=$(DESTDIR)$(BUILD_PREFIX) \ + -Q PREFIX=$(DESTDIR)$(BUILD_PREFIX) \ install) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue Dec 24 18:44:42 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 24 Dec 2013 17:44:42 +0000 Subject: SF.net SVN: gar:[22735] csw/mgar/pkg/libserf/trunk/files/ 0001-mark-solaris-as-posix-for-scons.patch Message-ID: <3dplF62jY7z5p@mail.opencsw.org> Revision: 22735 http://sourceforge.net/p/gar/code/22735 Author: rthurner Date: 2013-12-24 17:44:41 +0000 (Tue, 24 Dec 2013) Log Message: ----------- libserf, add patch to mark solaris as posix in scons build Added Paths: ----------- csw/mgar/pkg/libserf/trunk/files/0001-mark-solaris-as-posix-for-scons.patch Added: csw/mgar/pkg/libserf/trunk/files/0001-mark-solaris-as-posix-for-scons.patch =================================================================== --- csw/mgar/pkg/libserf/trunk/files/0001-mark-solaris-as-posix-for-scons.patch (rev 0) +++ csw/mgar/pkg/libserf/trunk/files/0001-mark-solaris-as-posix-for-scons.patch 2013-12-24 17:44:41 UTC (rev 22735) @@ -0,0 +1,24 @@ +From 885dd84598fdf04abc0daf28cd26bded41dba2bc Mon Sep 17 00:00:00 2001 +From: THURNER rupert +Date: Tue, 24 Dec 2013 18:42:21 +0100 +Subject: [PATCH] mark solaris as posix for scons + +--- + SConstruct | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/SConstruct b/SConstruct +index d9be156..1de6cb7 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -248,6 +248,7 @@ if sys.platform != 'win32': + + if sys.platform == 'sunos5': + env.Append(LIBS='m') ++ env['PLATFORM'] = 'posix' + else: + # Warning level 4, no unused argument warnings + env.Append(CCFLAGS=['/W4', '/wd4100']) +-- +1.8.4.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue Dec 24 19:02:06 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 24 Dec 2013 18:02:06 +0000 Subject: SF.net SVN: gar:[22736] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: <3dpld239m6z9h@mail.opencsw.org> Revision: 22736 http://sourceforge.net/p/gar/code/22736 Author: rthurner Date: 2013-12-24 18:02:05 +0000 (Tue, 24 Dec 2013) Log Message: ----------- libserf, add patch to mark solaris as posix in scons build Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2013-12-24 17:44:41 UTC (rev 22735) +++ csw/mgar/pkg/libserf/trunk/Makefile 2013-12-24 18:02:05 UTC (rev 22736) @@ -13,9 +13,10 @@ endef MASTER_SITES = http://serf.googlecode.com/files/ -DISTFILES = $(DISTNAME).tar.bz2 -LICENSE = LICENSE -VENDOR_URL = http://code.google.com/p/serf/ +DISTFILES = $(DISTNAME).tar.bz2 +PATCHFILES += 0001-mark-solaris-as-posix-for-scons.patch +LICENSE = LICENSE +VENDOR_URL = http://code.google.com/p/serf/ CONFIGURE_SCRIPTS = BUILD_SCRIPTS = serf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue Dec 24 19:11:53 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 24 Dec 2013 18:11:53 +0000 Subject: SF.net SVN: gar:[22737] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: <3dplrL1pF1zFG@mail.opencsw.org> Revision: 22737 http://sourceforge.net/p/gar/code/22737 Author: rthurner Date: 2013-12-24 18:11:51 +0000 (Tue, 24 Dec 2013) Log Message: ----------- libserf, checkpkg errors, just save them for the moment ... Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2013-12-24 18:02:05 UTC (rev 22736) +++ csw/mgar/pkg/libserf/trunk/Makefile 2013-12-24 18:11:51 UTC (rev 22737) @@ -50,6 +50,27 @@ SCONS_FLAGS += APR=$(bindir)/apr-1-config SCONS_FLAGS += APU=$(bindir)/apu-1-config +CHECKPKG_OVERRIDES_CSWlibserf1-3 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libserf-1.so.1.3.0|soname=libserf-1.so.1|pkgname=CSWlibserf1-3|expected=CSWlibserf1-1 +CHECKPKG_OVERRIDES_CSWlibserf1-3 += no-direct-binding|/opt/csw/lib/libserf-1.so.1.3.0|is|not|directly|bound|to|soname|libapr-1.so.0 +CHECKPKG_OVERRIDES_CSWlibserf1-3 += no-direct-binding|/opt/csw/lib/libserf-1.so.1.3.0|is|not|directly|bound|to|soname|libaprutil-1.so.0 +CHECKPKG_OVERRIDES_CSWlibserf1-3 += no-direct-binding|/opt/csw/lib/libserf-1.so.1.3.0|is|not|directly|bound|to|soname|libcrypto.so.1.0.0 +CHECKPKG_OVERRIDES_CSWlibserf1-3 += no-direct-binding|/opt/csw/lib/libserf-1.so.1.3.0|is|not|directly|bound|to|soname|libdb-4.8.so +CHECKPKG_OVERRIDES_CSWlibserf1-3 += no-direct-binding|/opt/csw/lib/libserf-1.so.1.3.0|is|not|directly|bound|to|soname|libexpat.so.1 +CHECKPKG_OVERRIDES_CSWlibserf1-3 += no-direct-binding|/opt/csw/lib/libserf-1.so.1.3.0|is|not|directly|bound|to|soname|liblber-2.4.so.2 +CHECKPKG_OVERRIDES_CSWlibserf1-3 += no-direct-binding|/opt/csw/lib/libserf-1.so.1.3.0|is|not|directly|bound|to|soname|libldap-2.4.so.2 +CHECKPKG_OVERRIDES_CSWlibserf1-3 += no-direct-binding|/opt/csw/lib/libserf-1.so.1.3.0|is|not|directly|bound|to|soname|libsendfile.so.1 +CHECKPKG_OVERRIDES_CSWlibserf1-3 += no-direct-binding|/opt/csw/lib/libserf-1.so.1.3.0|is|not|directly|bound|to|soname|libssl.so.1.0.0 +CHECKPKG_OVERRIDES_CSWlibserf1-3 += no-direct-binding|/opt/csw/lib/libserf-1.so.1.3.0|is|not|directly|bound|to|soname|libuuid.so.1 +CHECKPKG_OVERRIDES_CSWlibserf1-3 += no-direct-binding|/opt/csw/lib/libserf-1.so.1.3.0|is|not|directly|bound|to|soname|libz.so.1 +CHECKPKG_OVERRIDES_CSWlibserf1-3 += soname-not-found|liblber-2.4.so.2|is|needed|by|opt/csw/lib/libserf-1.so.1.3.0 +CHECKPKG_OVERRIDES_CSWlibserf1-3 += soname-not-found|libapr-1.so.0|is|needed|by|opt/csw/lib/libserf-1.so.1.3.0 +CHECKPKG_OVERRIDES_CSWlibserf1-3 += soname-not-found|libdb-4.8.so|is|needed|by|opt/csw/lib/libserf-1.so.1.3.0 +CHECKPKG_OVERRIDES_CSWlibserf1-3 += soname-not-found|libldap-2.4.so.2|is|needed|by|opt/csw/lib/libserf-1.so.1.3.0 +CHECKPKG_OVERRIDES_CSWlibserf1-3 += soname-not-found|libssl.so.1.0.0|is|needed|by|opt/csw/lib/libserf-1.so.1.3.0 +CHECKPKG_OVERRIDES_CSWlibserf1-3 += soname-not-found|libaprutil-1.so.0|is|needed|by|opt/csw/lib/libserf-1.so.1.3.0 +CHECKPKG_OVERRIDES_CSWlibserf1-3 += soname-not-found|libcrypto.so.1.0.0|is|needed|by|opt/csw/lib/libserf-1.so.1.3.0 +CHECKPKG_OVERRIDES_CSWlibserf1-3 += soname-not-found|libexpat.so.1|is|needed|by|opt/csw/lib/libserf-1.so.1.3.0 + include gar/category.mk build-serf: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 26 18:21:42 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 26 Dec 2013 17:21:42 +0000 Subject: SF.net SVN: gar:[22738] csw/mgar/pkg/cmake/trunk Message-ID: <3dqydd2bd7z1DV@mail.opencsw.org> Revision: 22738 http://sourceforge.net/p/gar/code/22738 Author: rthurner Date: 2013-12-26 17:21:38 +0000 (Thu, 26 Dec 2013) Log Message: ----------- cmake: upgrade to cmake 2.8.12. Modified Paths: -------------- csw/mgar/pkg/cmake/trunk/Makefile csw/mgar/pkg/cmake/trunk/checksums Modified: csw/mgar/pkg/cmake/trunk/Makefile =================================================================== --- csw/mgar/pkg/cmake/trunk/Makefile 2013-12-24 18:11:51 UTC (rev 22737) +++ csw/mgar/pkg/cmake/trunk/Makefile 2013-12-26 17:21:38 UTC (rev 22738) @@ -1,7 +1,7 @@ # $Id$ NAME = cmake -VERSION = 2.8.10 +VERSION = 2.8.12 GARTYPE = v2 DESCRIPTION = Cross-platform make Modified: csw/mgar/pkg/cmake/trunk/checksums =================================================================== --- csw/mgar/pkg/cmake/trunk/checksums 2013-12-24 18:11:51 UTC (rev 22737) +++ csw/mgar/pkg/cmake/trunk/checksums 2013-12-26 17:21:38 UTC (rev 22738) @@ -1 +1 @@ -d4aef1eab859df61d2664721a72732c0 cmake-2.8.10.tar.gz +105bc6d21cc2e9b6aff901e43c53afea cmake-2.8.12.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 26 18:28:21 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 26 Dec 2013 17:28:21 +0000 Subject: SF.net SVN: gar:[22739] csw/mgar/pkg/lang-python/subvertpy/trunk Message-ID: <3dqyn94lLmz1JC@mail.opencsw.org> Revision: 22739 http://sourceforge.net/p/gar/code/22739 Author: rthurner Date: 2013-12-26 17:28:20 +0000 (Thu, 26 Dec 2013) Log Message: ----------- subvertpy: upgrade to subvertpy-0.9.1 Modified Paths: -------------- csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile csw/mgar/pkg/lang-python/subvertpy/trunk/checksums Modified: csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile 2013-12-26 17:21:38 UTC (rev 22738) +++ csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile 2013-12-26 17:28:20 UTC (rev 22739) @@ -1,7 +1,7 @@ # $Id$ # NAME = subvertpy -VERSION = 0.9.0 +VERSION = 0.9.1 GARTYPE = v2 CATEGORIES = python Modified: csw/mgar/pkg/lang-python/subvertpy/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/subvertpy/trunk/checksums 2013-12-26 17:21:38 UTC (rev 22738) +++ csw/mgar/pkg/lang-python/subvertpy/trunk/checksums 2013-12-26 17:28:20 UTC (rev 22739) @@ -1 +1 @@ -29ddf3f5899968cdd04cbab03cdf1a29 subvertpy-0.9.0.tar.gz +365ff13066def2cac0bc0de75502d3d3 subvertpy-0.9.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 26 18:32:24 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 26 Dec 2013 17:32:24 +0000 Subject: SF.net SVN: gar:[22740] csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile Message-ID: <3dqyss1Ksqz1Mf@mail.opencsw.org> Revision: 22740 http://sourceforge.net/p/gar/code/22740 Author: rthurner Date: 2013-12-26 17:32:19 +0000 (Thu, 26 Dec 2013) Log Message: ----------- subvertpy: upgrade to subvertpy-0.9.1, upgrade to python 2.7 Modified Paths: -------------- csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile Modified: csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile 2013-12-26 17:28:20 UTC (rev 22739) +++ csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile 2013-12-26 17:32:19 UTC (rev 22740) @@ -13,7 +13,7 @@ LICENSE = COPYING RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWlibapr1-0 -RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWlibpython2-7-1-0 RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWsvn SVN_LIBRARY_PATH = $(libdir)/svn This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 26 18:37:30 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 26 Dec 2013 17:37:30 +0000 Subject: SF.net SVN: gar:[22741] csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile Message-ID: <3dqyzm2ztQz1R4@mail.opencsw.org> Revision: 22741 http://sourceforge.net/p/gar/code/22741 Author: rthurner Date: 2013-12-26 17:37:30 +0000 (Thu, 26 Dec 2013) Log Message: ----------- subvertpy: include both pythongs and libgcc as checkpkg complains :( Modified Paths: -------------- csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile Modified: csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile 2013-12-26 17:32:19 UTC (rev 22740) +++ csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile 2013-12-26 17:37:30 UTC (rev 22741) @@ -13,6 +13,8 @@ LICENSE = COPYING RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWlibapr1-0 +RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWlibpython2-7-1-0 RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWsvn This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 26 18:51:20 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 26 Dec 2013 17:51:20 +0000 Subject: SF.net SVN: gar:[22742] csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile Message-ID: <3dqzHj69mwz1W9@mail.opencsw.org> Revision: 22742 http://sourceforge.net/p/gar/code/22742 Author: rthurner Date: 2013-12-26 17:51:17 +0000 (Thu, 26 Dec 2013) Log Message: ----------- subvertpy: include libuuid in dependencies. Modified Paths: -------------- csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile Modified: csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile 2013-12-26 17:37:30 UTC (rev 22741) +++ csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile 2013-12-26 17:51:17 UTC (rev 22742) @@ -16,6 +16,7 @@ RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWlibpython2-7-1-0 +RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWlibuuid1 RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWsvn SVN_LIBRARY_PATH = $(libdir)/svn This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 26 18:57:55 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 26 Dec 2013 17:57:55 +0000 Subject: SF.net SVN: gar:[22743] csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile Message-ID: <3dqzRK2xj0z32@mail.opencsw.org> Revision: 22743 http://sourceforge.net/p/gar/code/22743 Author: rthurner Date: 2013-12-26 17:57:55 +0000 (Thu, 26 Dec 2013) Log Message: ----------- subvertpy: am confused, libuuid is one time necessary, one time not. restrict to solaris-10. Modified Paths: -------------- csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile Modified: csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile 2013-12-26 17:51:17 UTC (rev 22742) +++ csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile 2013-12-26 17:57:55 UTC (rev 22743) @@ -12,6 +12,8 @@ UPSTREAM_MASTER_SITES = http://pypi.python.org/pypi/subvertpy LICENSE = COPYING +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWlibpython2-6-1-0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 26 19:08:44 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 26 Dec 2013 18:08:44 +0000 Subject: SF.net SVN: gar:[22744] csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile Message-ID: <3dqzjM6l8Bz6m@mail.opencsw.org> Revision: 22744 http://sourceforge.net/p/gar/code/22744 Author: rthurner Date: 2013-12-26 18:08:43 +0000 (Thu, 26 Dec 2013) Log Message: ----------- subvertpy: am confused, libuuid is one time necessary, one time not. seems to be for solaris-11. Modified Paths: -------------- csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile Modified: csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile 2013-12-26 17:57:55 UTC (rev 22743) +++ csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile 2013-12-26 18:08:43 UTC (rev 22744) @@ -12,14 +12,12 @@ UPSTREAM_MASTER_SITES = http://pypi.python.org/pypi/subvertpy LICENSE = COPYING -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 - RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWlibpython2-7-1-0 -RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWlibuuid1 RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWsvn +RUNTIME_DEP_PKGS_CSWpy-subvertpy_5.11 += CSWlibuuid1 SVN_LIBRARY_PATH = $(libdir)/svn SVN_HEADER_PATH = $(includedir)/subversion-1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 26 19:21:45 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 26 Dec 2013 18:21:45 +0000 Subject: SF.net SVN: gar:[22745] csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile Message-ID: <3dqzyn6XdSzBN@mail.opencsw.org> Revision: 22745 http://sourceforge.net/p/gar/code/22745 Author: rthurner Date: 2013-12-26 18:21:44 +0000 (Thu, 26 Dec 2013) Log Message: ----------- subvertpy: am confused, libuuid is one time necessary, one time not. seems to be for solaris-10 as well. Modified Paths: -------------- csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile Modified: csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile 2013-12-26 18:08:43 UTC (rev 22744) +++ csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile 2013-12-26 18:21:44 UTC (rev 22745) @@ -17,6 +17,7 @@ RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWlibpython2-7-1-0 RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWsvn +RUNTIME_DEP_PKGS_CSWpy-subvertpy_5.10 += CSWlibuuid1 RUNTIME_DEP_PKGS_CSWpy-subvertpy_5.11 += CSWlibuuid1 SVN_LIBRARY_PATH = $(libdir)/svn This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 26 19:25:25 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 26 Dec 2013 18:25:25 +0000 Subject: SF.net SVN: gar:[22746] csw/mgar/pkg/trac/trunk Message-ID: <3dr0341TpszFp@mail.opencsw.org> Revision: 22746 http://sourceforge.net/p/gar/code/22746 Author: rthurner Date: 2013-12-26 18:25:23 +0000 (Thu, 26 Dec 2013) Log Message: ----------- trac, upgrade to trac-1.0.1 Modified Paths: -------------- csw/mgar/pkg/trac/trunk/Makefile csw/mgar/pkg/trac/trunk/checksums Modified: csw/mgar/pkg/trac/trunk/Makefile =================================================================== --- csw/mgar/pkg/trac/trunk/Makefile 2013-12-26 18:21:44 UTC (rev 22745) +++ csw/mgar/pkg/trac/trunk/Makefile 2013-12-26 18:25:23 UTC (rev 22746) @@ -1,7 +1,7 @@ # $Id$ NAME = Trac -VERSION = 0.12.2 +VERSION = 1.0.1 CATEGORIES = python GARTYPE = v2 Modified: csw/mgar/pkg/trac/trunk/checksums =================================================================== --- csw/mgar/pkg/trac/trunk/checksums 2013-12-26 18:21:44 UTC (rev 22745) +++ csw/mgar/pkg/trac/trunk/checksums 2013-12-26 18:25:23 UTC (rev 22746) @@ -1 +1 @@ -f70c7676601f2592bcb7871319e62dd7 Trac-0.12.2.tar.gz +c869fa40e29fa4597e2c9c960de9f2f3 Trac-1.0.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 26 19:35:27 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 26 Dec 2013 18:35:27 +0000 Subject: SF.net SVN: gar:[22747] csw/mgar/pkg/genshi/trunk Message-ID: <3dr0Gc19snzKG@mail.opencsw.org> Revision: 22747 http://sourceforge.net/p/gar/code/22747 Author: rthurner Date: 2013-12-26 18:35:24 +0000 (Thu, 26 Dec 2013) Log Message: ----------- genshi, upgrade to genshi-0.7. Modified Paths: -------------- csw/mgar/pkg/genshi/trunk/Makefile csw/mgar/pkg/genshi/trunk/checksums Modified: csw/mgar/pkg/genshi/trunk/Makefile =================================================================== --- csw/mgar/pkg/genshi/trunk/Makefile 2013-12-26 18:25:23 UTC (rev 22746) +++ csw/mgar/pkg/genshi/trunk/Makefile 2013-12-26 18:35:24 UTC (rev 22747) @@ -1,5 +1,5 @@ NAME = Genshi -VERSION = 0.6 +VERSION = 0.7 CATEGORIES = python GARTYPE = v2 Modified: csw/mgar/pkg/genshi/trunk/checksums =================================================================== --- csw/mgar/pkg/genshi/trunk/checksums 2013-12-26 18:25:23 UTC (rev 22746) +++ csw/mgar/pkg/genshi/trunk/checksums 2013-12-26 18:35:24 UTC (rev 22747) @@ -1 +1 @@ -604e8b23b4697655d36a69c2d8ef7187 Genshi-0.6.tar.gz +54e64dd69da3ec961f86e686e0848a82 Genshi-0.7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 26 19:39:08 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 26 Dec 2013 18:39:08 +0000 Subject: SF.net SVN: gar:[22748] csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile Message-ID: <3dr0Lt5T3NzNf@mail.opencsw.org> Revision: 22748 http://sourceforge.net/p/gar/code/22748 Author: rthurner Date: 2013-12-26 18:39:05 +0000 (Thu, 26 Dec 2013) Log Message: ----------- subvertpy: am confused, libuuid ignored. Modified Paths: -------------- csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile Modified: csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile 2013-12-26 18:35:24 UTC (rev 22747) +++ csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile 2013-12-26 18:39:05 UTC (rev 22748) @@ -17,9 +17,9 @@ RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWlibpython2-7-1-0 RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWsvn -RUNTIME_DEP_PKGS_CSWpy-subvertpy_5.10 += CSWlibuuid1 -RUNTIME_DEP_PKGS_CSWpy-subvertpy_5.11 += CSWlibuuid1 +CHECKPKG_OVERRIDES_CSWpy-subvertpy += missing-dependency|CSWlibuuid1 + SVN_LIBRARY_PATH = $(libdir)/svn SVN_HEADER_PATH = $(includedir)/subversion-1 EXTRA_COMMON_EXPORTS = SVN_LIBRARY_PATH SVN_HEADER_PATH This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 26 19:43:27 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 26 Dec 2013 18:43:27 +0000 Subject: SF.net SVN: gar:[22749] csw/mgar/pkg/genshi/trunk/Makefile Message-ID: <3dr0Rq4SNRzS3@mail.opencsw.org> Revision: 22749 http://sourceforge.net/p/gar/code/22749 Author: rthurner Date: 2013-12-26 18:43:27 +0000 (Thu, 26 Dec 2013) Log Message: ----------- genshi, depende on pyhton-2.6 and python-2.7 Modified Paths: -------------- csw/mgar/pkg/genshi/trunk/Makefile Modified: csw/mgar/pkg/genshi/trunk/Makefile =================================================================== --- csw/mgar/pkg/genshi/trunk/Makefile 2013-12-26 18:39:05 UTC (rev 22748) +++ csw/mgar/pkg/genshi/trunk/Makefile 2013-12-26 18:43:27 UTC (rev 22749) @@ -17,6 +17,9 @@ PACKAGES = CSWgenshi CATALOGNAME = genshi +RUNTIME_DEP_PKGS_CSWgenshi += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWgenshi += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWgenshi += CSWlibpython2-7-1-0 ARCHALL = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 26 19:54:06 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 26 Dec 2013 18:54:06 +0000 Subject: SF.net SVN: gar:[22750] csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile Message-ID: <3dr0h63FfwzWc@mail.opencsw.org> Revision: 22750 http://sourceforge.net/p/gar/code/22750 Author: rthurner Date: 2013-12-26 18:54:05 +0000 (Thu, 26 Dec 2013) Log Message: ----------- subvertpy: restrict platforms again ... Modified Paths: -------------- csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile Modified: csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile 2013-12-26 18:43:27 UTC (rev 22749) +++ csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile 2013-12-26 18:54:05 UTC (rev 22750) @@ -12,6 +12,8 @@ UPSTREAM_MASTER_SITES = http://pypi.python.org/pypi/subvertpy LICENSE = COPYING +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWlibpython2-6-1-0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Thu Dec 26 19:54:44 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Thu, 26 Dec 2013 18:54:44 +0000 Subject: SF.net SVN: gar:[22751] csw/mgar/pkg/cfengine3/trunk Message-ID: <3dr0k00GtCzb3@mail.opencsw.org> Revision: 22751 http://sourceforge.net/p/gar/code/22751 Author: guengel Date: 2013-12-26 18:54:44 +0000 (Thu, 26 Dec 2013) Log Message: ----------- New upstream release 3.5.3. Modified Paths: -------------- csw/mgar/pkg/cfengine3/trunk/Makefile csw/mgar/pkg/cfengine3/trunk/checksums csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/cfengine3/trunk/files/0002-Add-z-interpose-to-evalfunction_test-and-set_domainn.patch Removed Paths: ------------- csw/mgar/pkg/cfengine3/trunk/files/0000-evalfunction-unittest-needs-z-interpose-when-linking.patch csw/mgar/pkg/cfengine3/trunk/files/0003-Solaris-11-DATA_TYPE_-name-clash-patch.patch Modified: csw/mgar/pkg/cfengine3/trunk/Makefile =================================================================== --- csw/mgar/pkg/cfengine3/trunk/Makefile 2013-12-26 18:54:05 UTC (rev 22750) +++ csw/mgar/pkg/cfengine3/trunk/Makefile 2013-12-26 18:54:44 UTC (rev 22751) @@ -1,7 +1,7 @@ # $Id$ # NAME = cfengine3 -VERSION = 3.5.2 +VERSION = 3.5.3 GARTYPE = v2 GARCOMPILER = GCC4 @@ -38,11 +38,8 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -PATCHFILES += 0000-evalfunction-unittest-needs-z-interpose-when-linking.patch PATCHFILES += 0000-Disable-acceptance-test.patch -# Patch has been generated by using -# find work/solaris11-sparc/build-isa-sparcv8plus/cfengine-3.5.2/ -type f \( -name \*.c -o -name \*.h -o -name \*.y \) -exec gsed -i.bak 's/DATA_TYPE_/CF_DATA_TYPE_/g' \{\} \; -PATCHFILES += 0003-Solaris-11-DATA_TYPE_-name-clash-patch.patch +PATCHFILES += 0002-Add-z-interpose-to-evalfunction_test-and-set_domainn.patch # # CUSTOM VARIABLES Modified: csw/mgar/pkg/cfengine3/trunk/checksums =================================================================== --- csw/mgar/pkg/cfengine3/trunk/checksums 2013-12-26 18:54:05 UTC (rev 22750) +++ csw/mgar/pkg/cfengine3/trunk/checksums 2013-12-26 18:54:44 UTC (rev 22751) @@ -1 +1 @@ -fa5a5270803fa24e9ab662aae6f73b4a cfengine-3.5.2.tar.gz +c840eb0163924ca657ab180fe5a170b4 cfengine-3.5.3.tar.gz Deleted: csw/mgar/pkg/cfengine3/trunk/files/0000-evalfunction-unittest-needs-z-interpose-when-linking.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0000-evalfunction-unittest-needs-z-interpose-when-linking.patch 2013-12-26 18:54:05 UTC (rev 22750) +++ csw/mgar/pkg/cfengine3/trunk/files/0000-evalfunction-unittest-needs-z-interpose-when-linking.patch 2013-12-26 18:54:44 UTC (rev 22751) @@ -1,25 +0,0 @@ -From 861b9272653520866f07cee72b1a9277ab4410f3 Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Sat, 28 Sep 2013 16:53:23 +0200 -Subject: [PATCH] evalfunction unittest needs `-z interpose' when linking. - ---- - tests/unit/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/unit/Makefile.in b/tests/unit/Makefile.in -index 05df581..1bfaa6d 100644 ---- a/tests/unit/Makefile.in -+++ b/tests/unit/Makefile.in -@@ -205,7 +205,7 @@ domainname_test_DEPENDENCIES = ../../libpromises/libpromises.la \ - libtest.la - evalfunction_test_SOURCES = evalfunction_test.c - evalfunction_test_OBJECTS = evalfunction_test.$(OBJEXT) --evalfunction_test_LDADD = $(LDADD) -+evalfunction_test_LDADD = $(LDADD) -z interpose - evalfunction_test_DEPENDENCIES = ../../libpromises/libpromises.la \ - libtest.la - am_exec_config_test_OBJECTS = exec-config-test.$(OBJEXT) \ --- -1.8.3.4 - Added: csw/mgar/pkg/cfengine3/trunk/files/0002-Add-z-interpose-to-evalfunction_test-and-set_domainn.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0002-Add-z-interpose-to-evalfunction_test-and-set_domainn.patch (rev 0) +++ csw/mgar/pkg/cfengine3/trunk/files/0002-Add-z-interpose-to-evalfunction_test-and-set_domainn.patch 2013-12-26 18:54:44 UTC (rev 22751) @@ -0,0 +1,34 @@ +From 7db6e67b943a7f8d04c0e9d05028239c0727a048 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Thu, 26 Dec 2013 18:26:17 +0100 +Subject: [PATCH] Add -z interpose to evalfunction_test and set_domainname_test + +--- + tests/unit/Makefile.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/unit/Makefile.in b/tests/unit/Makefile.in +index 9304065..cfea627 100644 +--- a/tests/unit/Makefile.in ++++ b/tests/unit/Makefile.in +@@ -205,7 +205,7 @@ domainname_test_DEPENDENCIES = ../../libpromises/libpromises.la \ + libtest.la + evalfunction_test_SOURCES = evalfunction_test.c + evalfunction_test_OBJECTS = evalfunction_test.$(OBJEXT) +-evalfunction_test_LDADD = $(LDADD) ++evalfunction_test_LDADD = $(LDADD) -z interpose + evalfunction_test_DEPENDENCIES = ../../libpromises/libpromises.la \ + libtest.la + am_exec_config_test_OBJECTS = exec-config-test.$(OBJEXT) \ +@@ -728,7 +728,7 @@ csv_writer_test_SOURCES = csv_writer_test.c ../../libutils/csv_writer.c + csv_writer_test_LDADD = libtest.la libstr.la + conversion_test_SOURCES = conversion_test.c ../../libpromises/conversion.c + set_domainname_test_SOURCES = set_domainname_test.c +-set_domainname_test_LDADD = libstr.la ../../libpromises/libpromises.la ++set_domainname_test_LDADD = -z interpose libstr.la ../../libpromises/libpromises.la + str_test_SOURCES = str_test.c + str_test_LDADD = libstr.la + xml_writer_test_SOURCES = xml_writer_test.c ../../libutils/xml_writer.c +-- +1.8.4.1 + Deleted: csw/mgar/pkg/cfengine3/trunk/files/0003-Solaris-11-DATA_TYPE_-name-clash-patch.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0003-Solaris-11-DATA_TYPE_-name-clash-patch.patch 2013-12-26 18:54:05 UTC (rev 22750) +++ csw/mgar/pkg/cfengine3/trunk/files/0003-Solaris-11-DATA_TYPE_-name-clash-patch.patch 2013-12-26 18:54:44 UTC (rev 22751) @@ -1,3747 +0,0 @@ -From 2b6e0b6cd2e733b488c9d2bf5db8e0c7c4299e3b Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Sun, 29 Sep 2013 14:50:15 +0200 -Subject: [PATCH] Solaris 11 DATA_TYPE_* name clash patch. - ---- - cf-agent/cf-agent.c | 12 +- - cf-agent/files_editline.c | 2 +- - cf-agent/files_editxml.c | 2 +- - cf-agent/vercmp.c | 4 +- - cf-agent/verify_environments.c | 2 +- - cf-agent/verify_exec.c | 2 +- - cf-agent/verify_files.c | 4 +- - cf-agent/verify_files_utils.c | 2 +- - cf-agent/verify_methods.c | 2 +- - cf-agent/verify_packages.c | 24 +- - cf-agent/verify_processes.c | 2 +- - cf-agent/verify_services.c | 10 +- - cf-execd/cf-execd.c | 2 +- - cf-gendoc/export_xml.c | 40 +- - cf-gendoc/manual.c | 8 +- - cf-monitord/verify_measurements.c | 10 +- - libpromises/attributes.c | 4 +- - libpromises/bootstrap.c | 6 +- - libpromises/cf3.defs.h | 32 +- - libpromises/cf3parse.c | 14 +- - libpromises/cf3parse.y | 14 +- - libpromises/conversion.c | 40 +- - libpromises/env_context.c | 12 +- - libpromises/evalfunction.c | 984 +++++++++++++++++++------------------- - libpromises/expand.c | 46 +- - libpromises/generic_agent.c | 4 +- - libpromises/iteration.c | 2 +- - libpromises/policy.c | 40 +- - libpromises/promises.c | 2 +- - libpromises/rlist.c | 32 +- - libpromises/scope.c | 34 +- - libpromises/syntax.c | 74 +-- - libpromises/syntax.h | 32 +- - libpromises/sysinfo.c | 100 ++-- - libpromises/unix.c | 28 +- - libpromises/vars.c | 10 +- - libpromises/verify_reports.c | 2 +- - libpromises/verify_vars.c | 6 +- - tests/unit/assoc_test.c | 2 +- - tests/unit/exec-config-test.c | 2 +- - tests/unit/expand_test.c | 30 +- - tests/unit/scope_test.c | 6 +- - tests/unit/set_domainname_test.c | 2 +- - 43 files changed, 844 insertions(+), 844 deletions(-) - -diff --git a/cf-agent/cf-agent.c b/cf-agent/cf-agent.c -index be3cf9a..c63f233 100644 ---- a/cf-agent/cf-agent.c -+++ b/cf-agent/cf-agent.c -@@ -1311,9 +1311,9 @@ static void DefaultVarPromise(EvalContext *ctx, const Promise *pp) - - switch (dt) - { -- case DATA_TYPE_STRING: -- case DATA_TYPE_INT: -- case DATA_TYPE_REAL: -+ case CF_DATA_TYPE_STRING: -+ case CF_DATA_TYPE_INT: -+ case CF_DATA_TYPE_REAL: - - if (regex && !FullTextMatch(regex,rval.item)) - { -@@ -1327,9 +1327,9 @@ static void DefaultVarPromise(EvalContext *ctx, const Promise *pp) - - break; - -- case DATA_TYPE_STRING_LIST: -- case DATA_TYPE_INT_LIST: -- case DATA_TYPE_REAL_LIST: -+ case CF_DATA_TYPE_STRING_LIST: -+ case CF_DATA_TYPE_INT_LIST: -+ case CF_DATA_TYPE_REAL_LIST: - - if (regex) - { -diff --git a/cf-agent/files_editline.c b/cf-agent/files_editline.c -index 24ad1ae..7786981 100644 ---- a/cf-agent/files_editline.c -+++ b/cf-agent/files_editline.c -@@ -113,7 +113,7 @@ int ScheduleEditLineOperations(EvalContext *ctx, Bundle *bp, Attributes a, const - return false; - } - -- ScopeNewSpecial(ctx, "edit", "filename", edcontext->filename, DATA_TYPE_STRING); -+ ScopeNewSpecial(ctx, "edit", "filename", edcontext->filename, CF_DATA_TYPE_STRING); - - for (pass = 1; pass < CF_DONEPASSES; pass++) - { -diff --git a/cf-agent/files_editxml.c b/cf-agent/files_editxml.c -index ebe953e..f861ccb 100644 ---- a/cf-agent/files_editxml.c -+++ b/cf-agent/files_editxml.c -@@ -160,7 +160,7 @@ int ScheduleEditXmlOperations(EvalContext *ctx, Bundle *bp, Attributes a, const - return false; - } - -- ScopeNewSpecial(ctx, "edit", "filename", edcontext->filename, DATA_TYPE_STRING); -+ ScopeNewSpecial(ctx, "edit", "filename", edcontext->filename, CF_DATA_TYPE_STRING); - - for (pass = 1; pass < CF_DONEPASSES; pass++) - { -diff --git a/cf-agent/vercmp.c b/cf-agent/vercmp.c -index 8515826..2be84da 100644 ---- a/cf-agent/vercmp.c -+++ b/cf-agent/vercmp.c -@@ -64,8 +64,8 @@ static VersionCmpResult RunCmpCommand(EvalContext *ctx, const char *command, con - char expanded_command[CF_EXPANDSIZE]; - - { -- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "v1" }, (Rval) { v1, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); -- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "v2" }, (Rval) { v2, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); -+ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "v1" }, (Rval) { v1, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); -+ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "v2" }, (Rval) { v2, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); - ExpandScalar(ctx, "cf_pack_context", command, expanded_command); - - ScopeClear("cf_pack_context"); -diff --git a/cf-agent/verify_environments.c b/cf-agent/verify_environments.c -index 6a87431..0ff582e 100644 ---- a/cf-agent/verify_environments.c -+++ b/cf-agent/verify_environments.c -@@ -134,7 +134,7 @@ void VerifyEnvironmentsPromise(EvalContext *ctx, Promise *pp) - } - - PromiseBanner(pp); -- ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, DATA_TYPE_STRING); -+ ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, CF_DATA_TYPE_STRING); - - pexp = ExpandDeRefPromise(ctx, "this", pp); - VerifyEnvironments(ctx, a, pp); -diff --git a/cf-agent/verify_exec.c b/cf-agent/verify_exec.c -index 1dd7a86..51051af 100644 ---- a/cf-agent/verify_exec.c -+++ b/cf-agent/verify_exec.c -@@ -64,7 +64,7 @@ void VerifyExecPromise(EvalContext *ctx, Promise *pp) - - a = GetExecAttributes(ctx, pp); - -- ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, DATA_TYPE_STRING); -+ ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, CF_DATA_TYPE_STRING); - - if (!SyntaxCheckExec(a, pp)) - { -diff --git a/cf-agent/verify_files.c b/cf-agent/verify_files.c -index d117529..45ae46a 100644 ---- a/cf-agent/verify_files.c -+++ b/cf-agent/verify_files.c -@@ -196,7 +196,7 @@ static void VerifyFilePromise(EvalContext *ctx, char *path, Promise *pp) - } - - ScopeDeleteSpecial("this", "promiser"); -- ScopeNewSpecial(ctx, "this", "promiser", path, DATA_TYPE_STRING); -+ ScopeNewSpecial(ctx, "this", "promiser", path, CF_DATA_TYPE_STRING); - - thislock = AcquireLock(ctx, path, VUQNAME, CFSTARTTIME, a.transaction, pp, false); - -@@ -588,7 +588,7 @@ static void FindFilePromiserObjects(EvalContext *ctx, Promise *pp) - if (literal) - { - // Prime the promiser temporarily, may override later -- ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, DATA_TYPE_STRING); -+ ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, CF_DATA_TYPE_STRING); - VerifyFilePromise(ctx, pp->promiser, pp); - } - else // Default is to expand regex paths -diff --git a/cf-agent/verify_files_utils.c b/cf-agent/verify_files_utils.c -index 21f195c..c16b965 100644 ---- a/cf-agent/verify_files_utils.c -+++ b/cf-agent/verify_files_utils.c -@@ -124,7 +124,7 @@ int VerifyFileLeaf(EvalContext *ctx, char *path, struct stat *sb, Attributes att - /* We still need to augment the scope of context "this" for commands */ - - ScopeDeleteSpecial("this", "promiser"); -- ScopeNewSpecial(ctx, "this", "promiser", path, DATA_TYPE_STRING); // Parameters may only be scalars -+ ScopeNewSpecial(ctx, "this", "promiser", path, CF_DATA_TYPE_STRING); // Parameters may only be scalars - - if (attr.transformer != NULL) - { -diff --git a/cf-agent/verify_methods.c b/cf-agent/verify_methods.c -index 14296e2..e652609 100644 ---- a/cf-agent/verify_methods.c -+++ b/cf-agent/verify_methods.c -@@ -227,7 +227,7 @@ static void GetReturnValue(EvalContext *ctx, char *scope, Promise *pp) - snprintf(newname, CF_BUFSIZE, "%s", result); - } - -- EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(pp)->name, newname }, assoc->rval, DATA_TYPE_STRING); -+ EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(pp)->name, newname }, assoc->rval, CF_DATA_TYPE_STRING); - } - } - -diff --git a/cf-agent/verify_packages.c b/cf-agent/verify_packages.c -index 1e4ec7e..bcdbfcf 100644 ---- a/cf-agent/verify_packages.c -+++ b/cf-agent/verify_packages.c -@@ -948,9 +948,9 @@ static void SchedulePackageOp(EvalContext *ctx, const char *name, const char *ve - - if ((a.packages.package_name_convention) || (a.packages.package_delete_convention)) - { -- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "name" }, (Rval) { name, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); -- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "version" }, (Rval) { version, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); -- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "arch" }, (Rval) { arch, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); -+ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "name" }, (Rval) { name, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); -+ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "version" }, (Rval) { version, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); -+ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "arch" }, (Rval) { arch, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); - - if ((a.packages.package_delete_convention) && (a.packages.package_policy == PACKAGE_ACTION_DELETE)) - { -@@ -1013,9 +1013,9 @@ static void SchedulePackageOp(EvalContext *ctx, const char *name, const char *ve - ((a.packages.package_select == PACKAGE_VERSION_COMPARATOR_GT) || (a.packages.package_select == PACKAGE_VERSION_COMPARATOR_GE))) - { - { -- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "name" }, (Rval) { name, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); -- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "version" }, (Rval) { "(.*)", RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); -- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "arch" }, (Rval) { arch, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); -+ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "name" }, (Rval) { name, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); -+ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "version" }, (Rval) { "(.*)", RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); -+ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "arch" }, (Rval) { arch, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); - ExpandScalar(ctx, "cf_pack_context_anyver", a.packages.package_name_convention, refAnyVer); - - ScopeClear("cf_pack_context_anyver"); -@@ -1134,9 +1134,9 @@ static void SchedulePackageOp(EvalContext *ctx, const char *name, const char *ve - ((a.packages.package_select == PACKAGE_VERSION_COMPARATOR_GT) || (a.packages.package_select == PACKAGE_VERSION_COMPARATOR_GE))) - { - { -- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "name" }, (Rval) { name, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); -- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "version" }, (Rval) { "(.*)", RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); -- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "arch" }, (Rval) { arch, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); -+ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "name" }, (Rval) { name, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); -+ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "version" }, (Rval) { "(.*)", RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); -+ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "arch" }, (Rval) { arch, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); - ExpandScalar(ctx, "cf_pack_context_anyver", a.packages.package_name_convention, refAnyVer); - - ScopeClear("cf_pack_context_anyver"); -@@ -1199,9 +1199,9 @@ static void SchedulePackageOp(EvalContext *ctx, const char *name, const char *ve - } - - { -- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "name" }, (Rval) { name, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); -- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "version" }, (Rval) { instVer, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); -- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "arch" }, (Rval) { instArch, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); -+ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "name" }, (Rval) { name, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); -+ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "version" }, (Rval) { instVer, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); -+ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "arch" }, (Rval) { instArch, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); - ExpandScalar(ctx, "cf_pack_context", a.packages.package_delete_convention, reference2); - id_del = reference2; - -diff --git a/cf-agent/verify_processes.c b/cf-agent/verify_processes.c -index ebd9975..a593aae 100644 ---- a/cf-agent/verify_processes.c -+++ b/cf-agent/verify_processes.c -@@ -124,7 +124,7 @@ static void VerifyProcesses(EvalContext *ctx, Attributes a, Promise *pp) - } - - ScopeDeleteSpecial("this", "promiser"); -- ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, DATA_TYPE_STRING); -+ ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, CF_DATA_TYPE_STRING); - PromiseBanner(pp); - VerifyProcessOp(ctx, PROCESSTABLE, a, pp); - ScopeDeleteSpecial("this", "promiser"); -diff --git a/cf-agent/verify_services.c b/cf-agent/verify_services.c -index 9adb726..25562b4 100644 ---- a/cf-agent/verify_services.c -+++ b/cf-agent/verify_services.c -@@ -163,7 +163,7 @@ void VerifyServices(EvalContext *ctx, Attributes a, Promise *pp) - return; - } - -- ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, DATA_TYPE_STRING); -+ ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, CF_DATA_TYPE_STRING); - PromiseBanner(pp); - - if (strcmp(a.service.service_type, "windows") == 0) -@@ -229,21 +229,21 @@ static void DoVerifyServices(EvalContext *ctx, Attributes a, Promise *pp) - switch (a.service.service_policy) - { - case SERVICE_POLICY_START: -- ScopeNewSpecial(ctx, "this", "service_policy", "start", DATA_TYPE_STRING); -+ ScopeNewSpecial(ctx, "this", "service_policy", "start", CF_DATA_TYPE_STRING); - break; - - case SERVICE_POLICY_RESTART: -- ScopeNewSpecial(ctx, "this", "service_policy", "restart", DATA_TYPE_STRING); -+ ScopeNewSpecial(ctx, "this", "service_policy", "restart", CF_DATA_TYPE_STRING); - break; - - case SERVICE_POLICY_RELOAD: -- ScopeNewSpecial(ctx, "this", "service_policy", "reload", DATA_TYPE_STRING); -+ ScopeNewSpecial(ctx, "this", "service_policy", "reload", CF_DATA_TYPE_STRING); - break; - - case SERVICE_POLICY_STOP: - case SERVICE_POLICY_DISABLE: - default: -- ScopeNewSpecial(ctx, "this", "service_policy", "stop", DATA_TYPE_STRING); -+ ScopeNewSpecial(ctx, "this", "service_policy", "stop", CF_DATA_TYPE_STRING); - break; - } - -diff --git a/cf-execd/cf-execd.c b/cf-execd/cf-execd.c -index 3cc5d43..4776904 100644 ---- a/cf-execd/cf-execd.c -+++ b/cf-execd/cf-execd.c -@@ -534,7 +534,7 @@ static bool ScheduleRun(EvalContext *ctx, Policy **policy, GenericAgentConfig *c - free(existing_policy_server); - } - -- ScopeNewSpecial(ctx, "sys", "policy_hub", POLICY_SERVER, DATA_TYPE_STRING); -+ ScopeNewSpecial(ctx, "sys", "policy_hub", POLICY_SERVER, CF_DATA_TYPE_STRING); - - GetNameInfo3(ctx, AGENT_TYPE_EXECUTOR); - GetInterfacesInfo(ctx, AGENT_TYPE_EXECUTOR); -diff --git a/cf-gendoc/export_xml.c b/cf-gendoc/export_xml.c -index e8699ff..3e5c195 100644 ---- a/cf-gendoc/export_xml.c -+++ b/cf-gendoc/export_xml.c -@@ -355,10 +355,10 @@ void XmlExportConstraint(Writer *writer, const ConstraintSyntax *bs) - - switch (bs->dtype) - { -- case DATA_TYPE_BODY: -- case DATA_TYPE_BUNDLE: -- case DATA_TYPE_NONE: -- case DATA_TYPE_COUNTER: -+ case CF_DATA_TYPE_BODY: -+ case CF_DATA_TYPE_BUNDLE: -+ case CF_DATA_TYPE_NONE: -+ case CF_DATA_TYPE_COUNTER: - /* NO ADDITIONAL INFO */ - break; - -@@ -394,17 +394,17 @@ static void XmlExportType(Writer *writer, const ConstraintSyntax *constraint_syn - - switch (constraint_syntax->dtype) - { -- case DATA_TYPE_BODY: -+ case CF_DATA_TYPE_BODY: - /* EXPORT CONSTRAINTS */ - XmlExportConstraints(writer, constraint_syntax->range.body_type_syntax->constraints); - break; - -- case DATA_TYPE_INT: -- case DATA_TYPE_REAL: -- case DATA_TYPE_INT_LIST: -- case DATA_TYPE_REAL_LIST: -- case DATA_TYPE_INT_RANGE: -- case DATA_TYPE_REAL_RANGE: -+ case CF_DATA_TYPE_INT: -+ case CF_DATA_TYPE_REAL: -+ case CF_DATA_TYPE_INT_LIST: -+ case CF_DATA_TYPE_REAL_LIST: -+ case CF_DATA_TYPE_INT_RANGE: -+ case CF_DATA_TYPE_REAL_RANGE: - if (constraint_syntax->range.validation_string != NULL) - { - /* START XML ELEMENT -- RANGE */ -@@ -433,8 +433,8 @@ static void XmlExportType(Writer *writer, const ConstraintSyntax *constraint_syn - break; - } - -- case DATA_TYPE_OPTION: -- case DATA_TYPE_OPTION_LIST: -+ case CF_DATA_TYPE_OPTION: -+ case CF_DATA_TYPE_OPTION_LIST: - if (constraint_syntax->range.validation_string != NULL) - { - /* START XML ELEMENT -- OPTIONS */ -@@ -454,10 +454,10 @@ static void XmlExportType(Writer *writer, const ConstraintSyntax *constraint_syn - break; - } - -- case DATA_TYPE_STRING: -- case DATA_TYPE_STRING_LIST: -- case DATA_TYPE_CONTEXT: -- case DATA_TYPE_CONTEXT_LIST: -+ case CF_DATA_TYPE_STRING: -+ case CF_DATA_TYPE_STRING_LIST: -+ case CF_DATA_TYPE_CONTEXT: -+ case CF_DATA_TYPE_CONTEXT_LIST: - /* XML ELEMENT -- ACCEPTED-VALUES */ - if (strlen(constraint_syntax->range.validation_string) == 0) - { -@@ -470,9 +470,9 @@ static void XmlExportType(Writer *writer, const ConstraintSyntax *constraint_syn - - break; - -- case DATA_TYPE_BUNDLE: -- case DATA_TYPE_NONE: -- case DATA_TYPE_COUNTER: -+ case CF_DATA_TYPE_BUNDLE: -+ case CF_DATA_TYPE_NONE: -+ case CF_DATA_TYPE_COUNTER: - /* NONE */ - break; - } -diff --git a/cf-gendoc/manual.c b/cf-gendoc/manual.c -index f1096ee..c1ad823 100644 ---- a/cf-gendoc/manual.c -+++ b/cf-gendoc/manual.c -@@ -249,7 +249,7 @@ void TexinfoManual(EvalContext *ctx, const char *source_dir, const char *output_ - - // scopes const and sys - -- ScopeNewSpecial(ctx, "edit", "filename", "x", DATA_TYPE_STRING); -+ ScopeNewSpecial(ctx, "edit", "filename", "x", CF_DATA_TYPE_STRING); - - ScopePutMatch(0, "x"); - -@@ -481,7 +481,7 @@ static void TexinfoBodyParts(const char *source_dir, FILE *fout, const Constrain - fprintf(fout, "\n\n at node %s in %s\n at subsection @code{%s}\n\n at b{Type}: %s (Separate Bundle) \n", bs[i].lval, - context, bs[i].lval, DataTypeToString(bs[i].dtype)); - } -- else if (bs[i].dtype == DATA_TYPE_BODY) -+ else if (bs[i].dtype == CF_DATA_TYPE_BODY) - { - fprintf(fout, "\n\n at node %s in %s\n at subsection @code{%s} (body template)\n at noindent @b{Type}: %s\n\n", - bs[i].lval, context, bs[i].lval, DataTypeToString(bs[i].dtype)); -@@ -613,7 +613,7 @@ static void TexinfoShowRange(FILE *fout, const char *s, DataType type) - return; - } - -- if ((type == DATA_TYPE_OPTION) || (type == DATA_TYPE_OPTION_LIST)) -+ if ((type == CF_DATA_TYPE_OPTION) || (type == CF_DATA_TYPE_OPTION_LIST)) - { - list = RlistFromSplitString(s, ','); - fprintf(fout, "@noindent @b{Allowed input range}: @*\n at example"); -@@ -656,7 +656,7 @@ static void TexinfoSubBodyParts(const char *source_dir, FILE *fout, const Constr - fprintf(fout, "@item @code{%s}\n at b{Type}: %s\n (Separate Bundle) \n\n", bs[i].lval, - DataTypeToString(bs[i].dtype)); - } -- else if (bs[i].dtype == DATA_TYPE_BODY) -+ else if (bs[i].dtype == CF_DATA_TYPE_BODY) - { - fprintf(fout, "@item @code{%s}\n at b{Type}: %s\n\n", bs[i].lval, DataTypeToString(bs[i].dtype)); - TexinfoSubBodyParts(source_dir, fout, bs[i].range.body_type_syntax->constraints); -diff --git a/cf-monitord/verify_measurements.c b/cf-monitord/verify_measurements.c -index 1c35a16..2a659e4 100644 ---- a/cf-monitord/verify_measurements.c -+++ b/cf-monitord/verify_measurements.c -@@ -85,7 +85,7 @@ static bool CheckMeasureSanity(Measurement m, Promise *pp) - retval = false; - } - -- if (m.data_type == DATA_TYPE_NONE) -+ if (m.data_type == CF_DATA_TYPE_NONE) - { - Log(LOG_LEVEL_ERR, "The promiser '%s' did not specify a data type", pp->promiser); - PromiseRef(LOG_LEVEL_ERR, pp); -@@ -97,10 +97,10 @@ static bool CheckMeasureSanity(Measurement m, Promise *pp) - { - switch (m.data_type) - { -- case DATA_TYPE_COUNTER: -- case DATA_TYPE_STRING: -- case DATA_TYPE_INT: -- case DATA_TYPE_REAL: -+ case CF_DATA_TYPE_COUNTER: -+ case CF_DATA_TYPE_STRING: -+ case CF_DATA_TYPE_INT: -+ case CF_DATA_TYPE_REAL: - break; - - default: -diff --git a/libpromises/attributes.c b/libpromises/attributes.c -index 3b8e1f4..9213c61 100644 ---- a/libpromises/attributes.c -+++ b/libpromises/attributes.c -@@ -1606,9 +1606,9 @@ Measurement GetMeasurementConstraint(const EvalContext *ctx, const Promise *pp) - value = ConstraintGetRvalValue(ctx, "data_type", pp, RVAL_TYPE_SCALAR); - m.data_type = DataTypeFromString(value); - -- if (m.data_type == DATA_TYPE_NONE) -+ if (m.data_type == CF_DATA_TYPE_NONE) - { -- m.data_type = DATA_TYPE_STRING; -+ m.data_type = CF_DATA_TYPE_STRING; - } - - m.history_type = ConstraintGetRvalValue(ctx, "history_type", pp, RVAL_TYPE_SCALAR); -diff --git a/libpromises/bootstrap.c b/libpromises/bootstrap.c -index b06ee35..30f4253 100644 ---- a/libpromises/bootstrap.c -+++ b/libpromises/bootstrap.c -@@ -113,12 +113,12 @@ void SetPolicyServer(EvalContext *ctx, const char *new_policy_server) - if (new_policy_server) - { - snprintf(POLICY_SERVER, CF_MAX_IP_LEN, "%s", new_policy_server); -- ScopeNewSpecial(ctx, "sys", "policy_hub", new_policy_server, DATA_TYPE_STRING); -+ ScopeNewSpecial(ctx, "sys", "policy_hub", new_policy_server, CF_DATA_TYPE_STRING); - } - else - { - POLICY_SERVER[0] = '\0'; -- ScopeNewSpecial(ctx, "sys", "policy_hub", "undefined", DATA_TYPE_STRING); -+ ScopeNewSpecial(ctx, "sys", "policy_hub", "undefined", CF_DATA_TYPE_STRING); - } - - // Get the timestamp on policy update -@@ -137,7 +137,7 @@ void SetPolicyServer(EvalContext *ctx, const char *new_policy_server) - char timebuf[26]; - cf_strtimestamp_local(sb.st_mtime, timebuf); - -- ScopeNewSpecial(ctx, "sys", "last_policy_update", timebuf, DATA_TYPE_STRING); -+ ScopeNewSpecial(ctx, "sys", "last_policy_update", timebuf, CF_DATA_TYPE_STRING); - } - - static char *PolicyServerFilename(const char *workdir) -diff --git a/libpromises/cf3.defs.h b/libpromises/cf3.defs.h -index c04c2a1..45faeee 100644 ---- a/libpromises/cf3.defs.h -+++ b/libpromises/cf3.defs.h -@@ -428,22 +428,22 @@ typedef struct FnCall_ FnCall; - - typedef enum - { -- DATA_TYPE_STRING, -- DATA_TYPE_INT, -- DATA_TYPE_REAL, -- DATA_TYPE_STRING_LIST, -- DATA_TYPE_INT_LIST, -- DATA_TYPE_REAL_LIST, -- DATA_TYPE_OPTION, -- DATA_TYPE_OPTION_LIST, -- DATA_TYPE_BODY, -- DATA_TYPE_BUNDLE, -- DATA_TYPE_CONTEXT, -- DATA_TYPE_CONTEXT_LIST, -- DATA_TYPE_INT_RANGE, -- DATA_TYPE_REAL_RANGE, -- DATA_TYPE_COUNTER, -- DATA_TYPE_NONE -+ CF_DATA_TYPE_STRING, -+ CF_DATA_TYPE_INT, -+ CF_DATA_TYPE_REAL, -+ CF_DATA_TYPE_STRING_LIST, -+ CF_DATA_TYPE_INT_LIST, -+ CF_DATA_TYPE_REAL_LIST, -+ CF_DATA_TYPE_OPTION, -+ CF_DATA_TYPE_OPTION_LIST, -+ CF_DATA_TYPE_BODY, -+ CF_DATA_TYPE_BUNDLE, -+ CF_DATA_TYPE_CONTEXT, -+ CF_DATA_TYPE_CONTEXT_LIST, -+ CF_DATA_TYPE_INT_RANGE, -+ CF_DATA_TYPE_REAL_RANGE, -+ CF_DATA_TYPE_COUNTER, -+ CF_DATA_TYPE_NONE - } DataType; - - /*************************************************************************/ -diff --git a/libpromises/cf3parse.c b/libpromises/cf3parse.c -index f382919..a516083 100644 ---- a/libpromises/cf3parse.c -+++ b/libpromises/cf3parse.c -@@ -3120,7 +3120,7 @@ static bool LvalWantsBody(char *stype, char *lval) - { - if (strcmp(bs[l].lval, lval) == 0) - { -- if (bs[l].dtype == DATA_TYPE_BODY) -+ if (bs[l].dtype == CF_DATA_TYPE_BODY) - { - return true; - } -@@ -3151,11 +3151,11 @@ static SyntaxTypeMatch CheckSelection(const char *type, const char *name, const - { - if (strcmp(lval, bs[l].lval) == 0) - { -- if (bs[l].dtype == DATA_TYPE_BODY) -+ if (bs[l].dtype == CF_DATA_TYPE_BODY) - { - return SYNTAX_TYPE_MATCH_OK; - } -- else if (bs[l].dtype == DATA_TYPE_BUNDLE) -+ else if (bs[l].dtype == CF_DATA_TYPE_BUNDLE) - { - return SYNTAX_TYPE_MATCH_OK; - } -@@ -3190,7 +3190,7 @@ static SyntaxTypeMatch CheckSelection(const char *type, const char *name, const - - for (int l = 0; bs[l].lval != NULL; l++) - { -- if (bs[l].dtype == DATA_TYPE_BODY) -+ if (bs[l].dtype == CF_DATA_TYPE_BODY) - { - const ConstraintSyntax *bs2 = bs[l].range.body_type_syntax->constraints; - -@@ -3199,7 +3199,7 @@ static SyntaxTypeMatch CheckSelection(const char *type, const char *name, const - continue; - } - -- for (int k = 0; bs2[k].dtype != DATA_TYPE_NONE; k++) -+ for (int k = 0; bs2[k].dtype != CF_DATA_TYPE_NONE; k++) - { - /* Either module defined or common */ - -@@ -3249,8 +3249,8 @@ static SyntaxTypeMatch CheckConstraint(const char *type, const char *lval, Rval - - /* For bodies and bundles definitions can be elsewhere, so - they are checked in PolicyCheckRunnable(). */ -- if (bs[l].dtype != DATA_TYPE_BODY && -- bs[l].dtype != DATA_TYPE_BUNDLE) -+ if (bs[l].dtype != CF_DATA_TYPE_BODY && -+ bs[l].dtype != CF_DATA_TYPE_BUNDLE) - { - return CheckConstraintTypeMatch(lval, rval, bs[l].dtype, bs[l].range.validation_string, 0); - } -diff --git a/libpromises/cf3parse.y b/libpromises/cf3parse.y -index 24c4f55..98aa36c 100644 ---- a/libpromises/cf3parse.y -+++ b/libpromises/cf3parse.y -@@ -1279,7 +1279,7 @@ static bool LvalWantsBody(char *stype, char *lval) - { - if (strcmp(bs[l].lval, lval) == 0) - { -- if (bs[l].dtype == DATA_TYPE_BODY) -+ if (bs[l].dtype == CF_DATA_TYPE_BODY) - { - return true; - } -@@ -1310,11 +1310,11 @@ static SyntaxTypeMatch CheckSelection(const char *type, const char *name, const - { - if (strcmp(lval, bs[l].lval) == 0) - { -- if (bs[l].dtype == DATA_TYPE_BODY) -+ if (bs[l].dtype == CF_DATA_TYPE_BODY) - { - return SYNTAX_TYPE_MATCH_OK; - } -- else if (bs[l].dtype == DATA_TYPE_BUNDLE) -+ else if (bs[l].dtype == CF_DATA_TYPE_BUNDLE) - { - return SYNTAX_TYPE_MATCH_OK; - } -@@ -1349,7 +1349,7 @@ static SyntaxTypeMatch CheckSelection(const char *type, const char *name, const - - for (int l = 0; bs[l].lval != NULL; l++) - { -- if (bs[l].dtype == DATA_TYPE_BODY) -+ if (bs[l].dtype == CF_DATA_TYPE_BODY) - { - const ConstraintSyntax *bs2 = bs[l].range.body_type_syntax->constraints; - -@@ -1358,7 +1358,7 @@ static SyntaxTypeMatch CheckSelection(const char *type, const char *name, const - continue; - } - -- for (int k = 0; bs2[k].dtype != DATA_TYPE_NONE; k++) -+ for (int k = 0; bs2[k].dtype != CF_DATA_TYPE_NONE; k++) - { - /* Either module defined or common */ - -@@ -1408,8 +1408,8 @@ static SyntaxTypeMatch CheckConstraint(const char *type, const char *lval, Rval - - /* For bodies and bundles definitions can be elsewhere, so - they are checked in PolicyCheckRunnable(). */ -- if (bs[l].dtype != DATA_TYPE_BODY && -- bs[l].dtype != DATA_TYPE_BUNDLE) -+ if (bs[l].dtype != CF_DATA_TYPE_BODY && -+ bs[l].dtype != CF_DATA_TYPE_BUNDLE) - { - return CheckConstraintTypeMatch(lval, rval, bs[l].dtype, bs[l].range.validation_string, 0); - } -diff --git a/libpromises/conversion.c b/libpromises/conversion.c -index 04c22b7..764556e 100644 ---- a/libpromises/conversion.c -+++ b/libpromises/conversion.c -@@ -274,27 +274,27 @@ FileComparator FileComparatorFromString(const char *s) - - static const char *datatype_strings[] = - { -- [DATA_TYPE_STRING] = "string", -- [DATA_TYPE_INT] = "int", -- [DATA_TYPE_REAL] = "real", -- [DATA_TYPE_STRING_LIST] = "slist", -- [DATA_TYPE_INT_LIST] = "ilist", -- [DATA_TYPE_REAL_LIST] = "rlist", -- [DATA_TYPE_OPTION] = "option", -- [DATA_TYPE_OPTION_LIST] = "olist", -- [DATA_TYPE_BODY] = "body", -- [DATA_TYPE_BUNDLE] = "bundle", -- [DATA_TYPE_CONTEXT] = "context", -- [DATA_TYPE_CONTEXT_LIST] = "clist", -- [DATA_TYPE_INT_RANGE] = "irange", -- [DATA_TYPE_REAL_RANGE] = "rrange", -- [DATA_TYPE_COUNTER] = "counter", -- [DATA_TYPE_NONE] = "none" -+ [CF_DATA_TYPE_STRING] = "string", -+ [CF_DATA_TYPE_INT] = "int", -+ [CF_DATA_TYPE_REAL] = "real", -+ [CF_DATA_TYPE_STRING_LIST] = "slist", -+ [CF_DATA_TYPE_INT_LIST] = "ilist", -+ [CF_DATA_TYPE_REAL_LIST] = "rlist", -+ [CF_DATA_TYPE_OPTION] = "option", -+ [CF_DATA_TYPE_OPTION_LIST] = "olist", -+ [CF_DATA_TYPE_BODY] = "body", -+ [CF_DATA_TYPE_BUNDLE] = "bundle", -+ [CF_DATA_TYPE_CONTEXT] = "context", -+ [CF_DATA_TYPE_CONTEXT_LIST] = "clist", -+ [CF_DATA_TYPE_INT_RANGE] = "irange", -+ [CF_DATA_TYPE_REAL_RANGE] = "rrange", -+ [CF_DATA_TYPE_COUNTER] = "counter", -+ [CF_DATA_TYPE_NONE] = "none" - }; - - DataType DataTypeFromString(const char *name) - { -- for (int i = 0; i < DATA_TYPE_NONE; i++) -+ for (int i = 0; i < CF_DATA_TYPE_NONE; i++) - { - if (strcmp(datatype_strings[i], name) == 0) - { -@@ -302,12 +302,12 @@ DataType DataTypeFromString(const char *name) - } - } - -- return DATA_TYPE_NONE; -+ return CF_DATA_TYPE_NONE; - } - - const char *DataTypeToString(DataType type) - { -- assert(type < DATA_TYPE_NONE); -+ assert(type < CF_DATA_TYPE_NONE); - return datatype_strings[type]; - } - -@@ -323,7 +323,7 @@ DataType ConstraintSyntaxGetDataType(const ConstraintSyntax *body_syntax, const - } - } - -- return DATA_TYPE_NONE; -+ return CF_DATA_TYPE_NONE; - } - - /****************************************************************************/ -diff --git a/libpromises/env_context.c b/libpromises/env_context.c -index db85f53..4203cee 100644 ---- a/libpromises/env_context.c -+++ b/libpromises/env_context.c -@@ -1194,7 +1194,7 @@ char *EvalContextStackPath(const EvalContext *ctx) - - bool EvalContextVariablePut(EvalContext *ctx, VarRef lval, Rval rval, DataType type) - { -- assert(type != DATA_TYPE_NONE); -+ assert(type != CF_DATA_TYPE_NONE); - - if (lval.lval == NULL || lval.scope == NULL) - { -@@ -1320,7 +1320,7 @@ bool EvalContextVariableGet(const EvalContext *ctx, VarRef lval, Rval *rval_out, - } - if (type_out) - { -- *type_out = DATA_TYPE_NONE; -+ *type_out = CF_DATA_TYPE_NONE; - } - return false; - } -@@ -1345,7 +1345,7 @@ bool EvalContextVariableGet(const EvalContext *ctx, VarRef lval, Rval *rval_out, - } - if (type_out) - { -- *type_out = DATA_TYPE_NONE; -+ *type_out = CF_DATA_TYPE_NONE; - } - return false; - } -@@ -1386,7 +1386,7 @@ bool EvalContextVariableGet(const EvalContext *ctx, VarRef lval, Rval *rval_out, - } - if (type_out) - { -- *type_out = DATA_TYPE_NONE; -+ *type_out = CF_DATA_TYPE_NONE; - } - return false; - } -@@ -1400,7 +1400,7 @@ bool EvalContextVariableGet(const EvalContext *ctx, VarRef lval, Rval *rval_out, - } - if (type_out) - { -- *type_out = DATA_TYPE_NONE; -+ *type_out = CF_DATA_TYPE_NONE; - } - return false; - } -@@ -1412,7 +1412,7 @@ bool EvalContextVariableGet(const EvalContext *ctx, VarRef lval, Rval *rval_out, - if (type_out) - { - *type_out = assoc->dtype; -- assert(*type_out != DATA_TYPE_NONE); -+ assert(*type_out != CF_DATA_TYPE_NONE); - } - - return true; -diff --git a/libpromises/evalfunction.c b/libpromises/evalfunction.c -index a1773dc..1d314cb 100644 ---- a/libpromises/evalfunction.c -+++ b/libpromises/evalfunction.c -@@ -227,7 +227,7 @@ static FnCallResult FnCallAnd(EvalContext *ctx, FnCall *fp, Rlist *finalargs) - /* We need to check all the arguments, ArgTemplate does not check varadic functions */ - for (arg = finalargs; arg; arg = arg->next) - { -- SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, DATA_TYPE_STRING, "", 1); -+ SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, CF_DATA_TYPE_STRING, "", 1); - if (err != SYNTAX_TYPE_MATCH_OK && err != SYNTAX_TYPE_MATCH_ERROR_UNEXPANDED) - { - FatalError(ctx, "in %s: %s", id, SyntaxTypeMatchToString(err)); -@@ -634,7 +634,7 @@ static FnCallResult FnCallConcat(EvalContext *ctx, FnCall *fp, Rlist *finalargs) - /* We need to check all the arguments, ArgTemplate does not check varadic functions */ - for (arg = finalargs; arg; arg = arg->next) - { -- SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, DATA_TYPE_STRING, "", 1); -+ SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, CF_DATA_TYPE_STRING, "", 1); - if (err != SYNTAX_TYPE_MATCH_OK && err != SYNTAX_TYPE_MATCH_ERROR_UNEXPANDED) - { - FatalError(ctx, "in %s: %s", id, SyntaxTypeMatchToString(err)); -@@ -683,7 +683,7 @@ static FnCallResult FnCallIfElse(EvalContext *ctx, FnCall *fp, Rlist *finalargs) - /* We need to check all the arguments, ArgTemplate does not check varadic functions */ - for (arg = finalargs; arg; arg = arg->next) - { -- SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, DATA_TYPE_STRING, "", 1); -+ SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, CF_DATA_TYPE_STRING, "", 1); - if (err != SYNTAX_TYPE_MATCH_OK && err != SYNTAX_TYPE_MATCH_ERROR_UNEXPANDED) - { - FatalError(ctx, "in %s: %s", id, SyntaxTypeMatchToString(err)); -@@ -1610,7 +1610,7 @@ static FnCallResult FnCallGetFields(EvalContext *ctx, FnCall *fp, Rlist *finalar - for (rp = newlist; rp != NULL; rp = rp->next) - { - snprintf(name, CF_MAXVARSIZE - 1, "%s[%d]", array_lval, vcount); -- EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(fp->caller)->name, name }, (Rval) { RlistScalarValue(rp), RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); -+ EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(fp->caller)->name, name }, (Rval) { RlistScalarValue(rp), RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); - Log(LOG_LEVEL_VERBOSE, "getfields: defining '%s' => '%s'", name, RlistScalarValue(rp)); - vcount++; - } -@@ -1794,12 +1794,12 @@ static FnCallResult FnCallMapArray(EvalContext *ctx, FnCall *fp, Rlist *finalarg - - if (strlen(index) > 0) - { -- ScopeNewSpecial(ctx, "this", "k", index, DATA_TYPE_STRING); -+ ScopeNewSpecial(ctx, "this", "k", index, CF_DATA_TYPE_STRING); - - switch (assoc->rval.type) - { - case RVAL_TYPE_SCALAR: -- ScopeNewSpecial(ctx, "this", "v", assoc->rval.item, DATA_TYPE_STRING); -+ ScopeNewSpecial(ctx, "this", "v", assoc->rval.item, CF_DATA_TYPE_STRING); - ExpandScalar(ctx, PromiseGetBundle(fp->caller)->name, map, expbuf); - - if (strstr(expbuf, "$(this.k)") || strstr(expbuf, "${this.k}") || -@@ -1818,7 +1818,7 @@ static FnCallResult FnCallMapArray(EvalContext *ctx, FnCall *fp, Rlist *finalarg - case RVAL_TYPE_LIST: - for (rp = assoc->rval.item; rp != NULL; rp = rp->next) - { -- ScopeNewSpecial(ctx, "this", "v", rp->item, DATA_TYPE_STRING); -+ ScopeNewSpecial(ctx, "this", "v", rp->item, CF_DATA_TYPE_STRING); - ExpandScalar(ctx, PromiseGetBundle(fp->caller)->name, map, expbuf); - - if (strstr(expbuf, "$(this.k)") || strstr(expbuf, "${this.k}") || -@@ -1896,13 +1896,13 @@ static FnCallResult FnCallMapList(EvalContext *ctx, FnCall *fp, Rlist *finalargs - return (FnCallResult) { FNCALL_FAILURE }; - } - -- retype = DATA_TYPE_NONE; -+ retype = CF_DATA_TYPE_NONE; - if (!EvalContextVariableGet(ctx, (VarRef) { NULL, scopeid, lval }, &rval, &retype)) - { - return (FnCallResult) { FNCALL_FAILURE }; - } - -- if (retype != DATA_TYPE_STRING_LIST && retype != DATA_TYPE_INT_LIST && retype != DATA_TYPE_REAL_LIST) -+ if (retype != CF_DATA_TYPE_STRING_LIST && retype != CF_DATA_TYPE_INT_LIST && retype != CF_DATA_TYPE_REAL_LIST) - { - return (FnCallResult) { FNCALL_FAILURE }; - } -@@ -1910,7 +1910,7 @@ static FnCallResult FnCallMapList(EvalContext *ctx, FnCall *fp, Rlist *finalargs - for (const Rlist *rp = RvalRlistValue(rval); rp != NULL; rp = rp->next) - { - const char *current_value = RlistScalarValue(rp); -- ScopeNewSpecial(ctx, "this", "this", current_value, DATA_TYPE_STRING); -+ ScopeNewSpecial(ctx, "this", "this", current_value, CF_DATA_TYPE_STRING); - - ExpandScalar(ctx, "this", map, expbuf); - -@@ -2050,7 +2050,7 @@ static FnCallResult FnCallSelectServers(EvalContext *ctx, FnCall *fp, Rlist *fin - { - Log(LOG_LEVEL_VERBOSE, "Host '%s' is alive and responding correctly", RlistScalarValue(rp)); - snprintf(buffer, CF_MAXVARSIZE - 1, "%s[%d]", array_lval, count); -- EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(fp->caller)->name, buffer }, (Rval) { rp->item, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); -+ EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(fp->caller)->name, buffer }, (Rval) { rp->item, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); - count++; - } - } -@@ -2058,7 +2058,7 @@ static FnCallResult FnCallSelectServers(EvalContext *ctx, FnCall *fp, Rlist *fin - { - Log(LOG_LEVEL_VERBOSE, "Host '%s' is alive", RlistScalarValue(rp)); - snprintf(buffer, CF_MAXVARSIZE - 1, "%s[%d]", array_lval, count); -- EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(fp->caller)->name, buffer }, (Rval) { rp->item, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); -+ EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(fp->caller)->name, buffer }, (Rval) { rp->item, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); - - if (IsDefinedClass(ctx, CanonifyName(rp->item), PromiseGetNamespace(fp->caller))) - { -@@ -2091,14 +2091,14 @@ static FnCallResult FnCallShuffle(EvalContext *ctx, FnCall *fp, Rlist *finalargs - const char *seed_str = RlistScalarValue(finalargs->next); - - Rval list_rval; -- DataType list_dtype = DATA_TYPE_NONE; -+ DataType list_dtype = CF_DATA_TYPE_NONE; - - if (!GetListReferenceArgument(ctx, fp, RlistScalarValue(finalargs), &list_rval, &list_dtype)) - { - return (FnCallResult) { FNCALL_FAILURE }; - } - -- if (list_dtype != DATA_TYPE_STRING_LIST) -+ if (list_dtype != CF_DATA_TYPE_STRING_LIST) - { - Log(LOG_LEVEL_ERR, "Function '%s' expected a variable that resolves to a string list, got '%s'", fp->name, DataTypeToString(list_dtype)); - return (FnCallResult) { FNCALL_FAILURE }; -@@ -2716,7 +2716,7 @@ static FnCallResult FnCallSort(EvalContext *ctx, FnCall *fp, Rlist *finalargs) - { - VarRef list_var_lval = VarRefParseFromBundle(RlistScalarValue(finalargs), PromiseGetBundle(fp->caller)); - Rval list_var_rval; -- DataType list_var_dtype = DATA_TYPE_NONE; -+ DataType list_var_dtype = CF_DATA_TYPE_NONE; - - if (!EvalContextVariableGet(ctx, list_var_lval, &list_var_rval, &list_var_dtype)) - { -@@ -2726,7 +2726,7 @@ static FnCallResult FnCallSort(EvalContext *ctx, FnCall *fp, Rlist *finalargs) - - VarRefDestroy(list_var_lval); - -- if (list_var_dtype != DATA_TYPE_STRING_LIST) -+ if (list_var_dtype != CF_DATA_TYPE_STRING_LIST) - { - return (FnCallResult) { FNCALL_FAILURE }; - } -@@ -2747,7 +2747,7 @@ static FnCallResult FnCallFormat(EvalContext *ctx, FnCall *fp, Rlist *finalargs) - /* We need to check all the arguments, ArgTemplate does not check varadic functions */ - for (const Rlist *arg = finalargs; arg; arg = arg->next) - { -- SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, DATA_TYPE_STRING, "", 1); -+ SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, CF_DATA_TYPE_STRING, "", 1); - if (err != SYNTAX_TYPE_MATCH_OK && err != SYNTAX_TYPE_MATCH_ERROR_UNEXPANDED) - { - FatalError(ctx, "in %s: %s", id, SyntaxTypeMatchToString(err)); -@@ -3550,7 +3550,7 @@ static FnCallResult FnCallRegExtract(EvalContext *ctx, FnCall *fp, Rlist *finala - else - { - snprintf(var, CF_MAXVARSIZE - 1, "%s[%s]", arrayname, assoc->lval); -- EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(fp->caller)->name, var }, assoc->rval, DATA_TYPE_STRING); -+ EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(fp->caller)->name, var }, assoc->rval, CF_DATA_TYPE_STRING); - } - } - } -@@ -3760,14 +3760,14 @@ static FnCallResult FnCallRRange(EvalContext *ctx, FnCall *fp, Rlist *finalargs) - static FnCallResult FnCallReverse(EvalContext *ctx, FnCall *fp, Rlist *finalargs) - { - Rval list_rval; -- DataType list_dtype = DATA_TYPE_NONE; -+ DataType list_dtype = CF_DATA_TYPE_NONE; - - if (!GetListReferenceArgument(ctx, fp, RlistScalarValue(finalargs), &list_rval, &list_dtype)) - { - return (FnCallResult) { FNCALL_FAILURE }; - } - -- if (list_dtype != DATA_TYPE_STRING_LIST) -+ if (list_dtype != CF_DATA_TYPE_STRING_LIST) - { - Log(LOG_LEVEL_ERR, "Function '%s' expected a variable that resolves to a string list, got '%s'", fp->name, DataTypeToString(list_dtype)); - return (FnCallResult) { FNCALL_FAILURE }; -@@ -3837,7 +3837,7 @@ static FnCallResult FnCallOr(EvalContext *ctx, FnCall *fp, Rlist *finalargs) - /* We need to check all the arguments, ArgTemplate does not check varadic functions */ - for (arg = finalargs; arg; arg = arg->next) - { -- SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, DATA_TYPE_STRING, "", 1); -+ SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, CF_DATA_TYPE_STRING, "", 1); - if (err != SYNTAX_TYPE_MATCH_OK && err != SYNTAX_TYPE_MATCH_ERROR_UNEXPANDED) - { - FatalError(ctx, "in %s: %s", id, SyntaxTypeMatchToString(err)); -@@ -4117,10 +4117,10 @@ static FnCallResult ReadList(EvalContext *ctx, FnCall *fp, Rlist *finalargs, Dat - - switch (type) - { -- case DATA_TYPE_STRING: -+ case CF_DATA_TYPE_STRING: - break; - -- case DATA_TYPE_INT: -+ case CF_DATA_TYPE_INT: - for (rp = newlist; rp != NULL; rp = rp->next) - { - if (IntFromString(RlistScalarValue(rp)) == CF_NOINT) -@@ -4132,7 +4132,7 @@ static FnCallResult ReadList(EvalContext *ctx, FnCall *fp, Rlist *finalargs, Dat - } - break; - -- case DATA_TYPE_REAL: -+ case CF_DATA_TYPE_REAL: - for (rp = newlist; rp != NULL; rp = rp->next) - { - double real_value = 0; -@@ -4164,17 +4164,17 @@ static FnCallResult ReadList(EvalContext *ctx, FnCall *fp, Rlist *finalargs, Dat - - static FnCallResult FnCallReadStringList(EvalContext *ctx, FnCall *fp, Rlist *args) - { -- return ReadList(ctx, fp, args, DATA_TYPE_STRING); -+ return ReadList(ctx, fp, args, CF_DATA_TYPE_STRING); - } - - static FnCallResult FnCallReadIntList(EvalContext *ctx, FnCall *fp, Rlist *args) - { -- return ReadList(ctx, fp, args, DATA_TYPE_INT); -+ return ReadList(ctx, fp, args, CF_DATA_TYPE_INT); - } - - static FnCallResult FnCallReadRealList(EvalContext *ctx, FnCall *fp, Rlist *args) - { -- return ReadList(ctx, fp, args, DATA_TYPE_REAL); -+ return ReadList(ctx, fp, args, CF_DATA_TYPE_REAL); - } - - /*********************************************************************/ -@@ -4229,9 +4229,9 @@ static FnCallResult ReadArray(EvalContext *ctx, FnCall *fp, Rlist *finalargs, Da - - switch (type) - { -- case DATA_TYPE_STRING: -- case DATA_TYPE_INT: -- case DATA_TYPE_REAL: -+ case CF_DATA_TYPE_STRING: -+ case CF_DATA_TYPE_INT: -+ case CF_DATA_TYPE_REAL: - break; - - default: -@@ -4250,28 +4250,28 @@ static FnCallResult ReadArray(EvalContext *ctx, FnCall *fp, Rlist *finalargs, Da - - static FnCallResult FnCallReadStringArray(EvalContext *ctx, FnCall *fp, Rlist *args) - { -- return ReadArray(ctx, fp, args, DATA_TYPE_STRING, false); -+ return ReadArray(ctx, fp, args, CF_DATA_TYPE_STRING, false); - } - - /*********************************************************************/ - - static FnCallResult FnCallReadStringArrayIndex(EvalContext *ctx, FnCall *fp, Rlist *args) - { -- return ReadArray(ctx, fp, args, DATA_TYPE_STRING, true); -+ return ReadArray(ctx, fp, args, CF_DATA_TYPE_STRING, true); - } - - /*********************************************************************/ - - static FnCallResult FnCallReadIntArray(EvalContext *ctx, FnCall *fp, Rlist *args) - { -- return ReadArray(ctx, fp, args, DATA_TYPE_INT, false); -+ return ReadArray(ctx, fp, args, CF_DATA_TYPE_INT, false); - } - - /*********************************************************************/ - - static FnCallResult FnCallReadRealArray(EvalContext *ctx, FnCall *fp, Rlist *args) - { -- return ReadArray(ctx, fp, args, DATA_TYPE_REAL, false); -+ return ReadArray(ctx, fp, args, CF_DATA_TYPE_REAL, false); - } - - /*********************************************************************/ -@@ -4328,9 +4328,9 @@ static FnCallResult ParseArray(EvalContext *ctx, FnCall *fp, Rlist *finalargs, D - - switch (type) - { -- case DATA_TYPE_STRING: -- case DATA_TYPE_INT: -- case DATA_TYPE_REAL: -+ case CF_DATA_TYPE_STRING: -+ case CF_DATA_TYPE_INT: -+ case CF_DATA_TYPE_REAL: - break; - - default: -@@ -4349,28 +4349,28 @@ static FnCallResult ParseArray(EvalContext *ctx, FnCall *fp, Rlist *finalargs, D - - static FnCallResult FnCallParseStringArray(EvalContext *ctx, FnCall *fp, Rlist *args) - { -- return ParseArray(ctx, fp, args, DATA_TYPE_STRING, false); -+ return ParseArray(ctx, fp, args, CF_DATA_TYPE_STRING, false); - } - - /*********************************************************************/ - - static FnCallResult FnCallParseStringArrayIndex(EvalContext *ctx, FnCall *fp, Rlist *args) - { -- return ParseArray(ctx, fp, args, DATA_TYPE_STRING, true); -+ return ParseArray(ctx, fp, args, CF_DATA_TYPE_STRING, true); - } - - /*********************************************************************/ - - static FnCallResult FnCallParseIntArray(EvalContext *ctx, FnCall *fp, Rlist *args) - { -- return ParseArray(ctx, fp, args, DATA_TYPE_INT, false); -+ return ParseArray(ctx, fp, args, CF_DATA_TYPE_INT, false); - } - - /*********************************************************************/ - - static FnCallResult FnCallParseRealArray(EvalContext *ctx, FnCall *fp, Rlist *args) - { -- return ParseArray(ctx, fp, args, DATA_TYPE_REAL, false); -+ return ParseArray(ctx, fp, args, CF_DATA_TYPE_REAL, false); - } - - /*********************************************************************/ -@@ -4855,16 +4855,16 @@ static int BuildLineArray(EvalContext *ctx, const Bundle *bundle, char *array_lv - - switch (type) - { -- case DATA_TYPE_STRING: -+ case CF_DATA_TYPE_STRING: - strncpy(this_rval, rp->item, CF_MAXVARSIZE - 1); - break; - -- case DATA_TYPE_INT: -+ case CF_DATA_TYPE_INT: - ival = IntFromString(rp->item); - snprintf(this_rval, CF_MAXVARSIZE, "%d", (int) ival); - break; - -- case DATA_TYPE_REAL: -+ case CF_DATA_TYPE_REAL: - { - double real_value = 0; - if (!DoubleFromString(rp->item, &real_value)) -@@ -5029,7 +5029,7 @@ void ModuleProtocol(EvalContext *ctx, char *command, char *line, int print, cons - if (CheckID(name)) - { - Log(LOG_LEVEL_VERBOSE, "Defined variable '%s' in context '%s' with value '%s'", name, context, content); -- EvalContextVariablePut(ctx, (VarRef) { NULL, context, name }, (Rval) { content, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); -+ EvalContextVariablePut(ctx, (VarRef) { NULL, context, name }, (Rval) { content, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); - } - break; - -@@ -5044,7 +5044,7 @@ void ModuleProtocol(EvalContext *ctx, char *command, char *line, int print, cons - list = RlistParseString(content); - Log(LOG_LEVEL_VERBOSE, "Defined variable '%s' in context '%s' with value '%s'", name, context, content); - -- EvalContextVariablePut(ctx, (VarRef) { NULL, context, name }, (Rval) { list, RVAL_TYPE_LIST }, DATA_TYPE_STRING_LIST); -+ EvalContextVariablePut(ctx, (VarRef) { NULL, context, name }, (Rval) { list, RVAL_TYPE_LIST }, CF_DATA_TYPE_STRING_LIST); - } - break; - -@@ -5096,728 +5096,728 @@ FnCallResult CallFunction(EvalContext *ctx, const FnCallType *function, FnCall * - - FnCallArg ACCESSEDBEFORE_ARGS[] = - { -- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Newer filename"}, -- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Older filename"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "Newer filename"}, -+ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "Older filename"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg ACCUM_ARGS[] = - { -- {"0,1000", DATA_TYPE_INT, "Years"}, -- {"0,1000", DATA_TYPE_INT, "Months"}, -- {"0,1000", DATA_TYPE_INT, "Days"}, -- {"0,1000", DATA_TYPE_INT, "Hours"}, -- {"0,1000", DATA_TYPE_INT, "Minutes"}, -- {"0,40000", DATA_TYPE_INT, "Seconds"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {"0,1000", CF_DATA_TYPE_INT, "Years"}, -+ {"0,1000", CF_DATA_TYPE_INT, "Months"}, -+ {"0,1000", CF_DATA_TYPE_INT, "Days"}, -+ {"0,1000", CF_DATA_TYPE_INT, "Hours"}, -+ {"0,1000", CF_DATA_TYPE_INT, "Minutes"}, -+ {"0,40000", CF_DATA_TYPE_INT, "Seconds"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg AND_ARGS[] = - { -- {NULL, DATA_TYPE_NONE, NULL} -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg AGO_ARGS[] = - { -- {"0,1000", DATA_TYPE_INT, "Years"}, -- {"0,1000", DATA_TYPE_INT, "Months"}, -- {"0,1000", DATA_TYPE_INT, "Days"}, -- {"0,1000", DATA_TYPE_INT, "Hours"}, -- {"0,1000", DATA_TYPE_INT, "Minutes"}, -- {"0,40000", DATA_TYPE_INT, "Seconds"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {"0,1000", CF_DATA_TYPE_INT, "Years"}, -+ {"0,1000", CF_DATA_TYPE_INT, "Months"}, -+ {"0,1000", CF_DATA_TYPE_INT, "Days"}, -+ {"0,1000", CF_DATA_TYPE_INT, "Hours"}, -+ {"0,1000", CF_DATA_TYPE_INT, "Minutes"}, -+ {"0,40000", CF_DATA_TYPE_INT, "Seconds"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg LATERTHAN_ARGS[] = - { -- {"0,1000", DATA_TYPE_INT, "Years"}, -- {"0,1000", DATA_TYPE_INT, "Months"}, -- {"0,1000", DATA_TYPE_INT, "Days"}, -- {"0,1000", DATA_TYPE_INT, "Hours"}, -- {"0,1000", DATA_TYPE_INT, "Minutes"}, -- {"0,40000", DATA_TYPE_INT, "Seconds"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {"0,1000", CF_DATA_TYPE_INT, "Years"}, -+ {"0,1000", CF_DATA_TYPE_INT, "Months"}, -+ {"0,1000", CF_DATA_TYPE_INT, "Days"}, -+ {"0,1000", CF_DATA_TYPE_INT, "Hours"}, -+ {"0,1000", CF_DATA_TYPE_INT, "Minutes"}, -+ {"0,40000", CF_DATA_TYPE_INT, "Seconds"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg CANONIFY_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "String containing non-identifier characters"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "String containing non-identifier characters"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg CHANGEDBEFORE_ARGS[] = - { -- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Newer filename"}, -- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Older filename"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "Newer filename"}, -+ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "Older filename"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg CLASSIFY_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Input string"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Input string"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg CLASSMATCH_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg CONCAT_ARGS[] = - { -- {NULL, DATA_TYPE_NONE, NULL} -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg COUNTCLASSESMATCHING_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg COUNTLINESMATCHING_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, -- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Filename"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression"}, -+ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "Filename"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg DIRNAME_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "File path"}, -- {NULL, DATA_TYPE_NONE, NULL}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "File path"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL}, - }; - - FnCallArg DISKFREE_ARGS[] = - { -- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "File system directory"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "File system directory"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg ESCAPE_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "IP address or string to escape"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "IP address or string to escape"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg EXECRESULT_ARGS[] = - { -- {CF_PATHRANGE, DATA_TYPE_STRING, "Fully qualified command path"}, -- {"useshell,noshell,powershell", DATA_TYPE_OPTION, "Shell encapsulation option"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_PATHRANGE, CF_DATA_TYPE_STRING, "Fully qualified command path"}, -+ {"useshell,noshell,powershell", CF_DATA_TYPE_OPTION, "Shell encapsulation option"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - // fileexists, isdir,isplain,islink - - FnCallArg FILESTAT_ARGS[] = - { -- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "File object name"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "File object name"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg FILESTAT_DETAIL_ARGS[] = - { -- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "File object name"}, -- {"size,gid,uid,ino,nlink,ctime,atime,mtime,mode,modeoct,permstr,permoct,type,devno,dev_minor,dev_major,basename,dirname", DATA_TYPE_OPTION, "stat() field to get"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "File object name"}, -+ {"size,gid,uid,ino,nlink,ctime,atime,mtime,mode,modeoct,permstr,permoct,type,devno,dev_minor,dev_major,basename,dirname", CF_DATA_TYPE_OPTION, "stat() field to get"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg FILESEXIST_ARGS[] = - { -- {CF_NAKEDLRANGE, DATA_TYPE_STRING, "Array identifier containing list"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_NAKEDLRANGE, CF_DATA_TYPE_STRING, "Array identifier containing list"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg FILTER_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression or string"}, -- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, -- {CF_BOOL, DATA_TYPE_OPTION, "Match as regular expression if true, as exact string otherwise"}, -- {CF_BOOL, DATA_TYPE_OPTION, "Invert matches"}, -- {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of matches to return"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression or string"}, -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine list identifier"}, -+ {CF_BOOL, CF_DATA_TYPE_OPTION, "Match as regular expression if true, as exact string otherwise"}, -+ {CF_BOOL, CF_DATA_TYPE_OPTION, "Invert matches"}, -+ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum number of matches to return"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg GETFIELDS_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression to match line"}, -- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Filename to read"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression to split fields"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Return array name"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression to match line"}, -+ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "Filename to read"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression to split fields"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Return array name"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg GETINDICES_ARGS[] = - { -- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine array identifier"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine array identifier"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg GETUSERS_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Comma separated list of User names"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Comma separated list of UserID numbers"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Comma separated list of User names"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Comma separated list of UserID numbers"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg GETENV_ARGS[] = - { -- {CF_IDRANGE, DATA_TYPE_STRING, "Name of environment variable"}, -- {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of characters to read "}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "Name of environment variable"}, -+ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum number of characters to read "}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg GETGID_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Group name in text"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Group name in text"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg GETUID_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "User name in text"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "User name in text"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg GREP_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, -- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression"}, -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine list identifier"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg GROUPEXISTS_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Group name or identifier"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Group name or identifier"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg HASH_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Input text"}, -- {"md5,sha1,sha256,sha512,sha384,crypt", DATA_TYPE_OPTION, "Hash or digest algorithm"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Input text"}, -+ {"md5,sha1,sha256,sha512,sha384,crypt", CF_DATA_TYPE_OPTION, "Hash or digest algorithm"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg HASHMATCH_ARGS[] = - { -- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Filename to hash"}, -- {"md5,sha1,crypt,cf_sha224,cf_sha256,cf_sha384,cf_sha512", DATA_TYPE_OPTION, "Hash or digest algorithm"}, -- {CF_IDRANGE, DATA_TYPE_STRING, "ASCII representation of hash for comparison"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "Filename to hash"}, -+ {"md5,sha1,crypt,cf_sha224,cf_sha256,cf_sha384,cf_sha512", CF_DATA_TYPE_OPTION, "Hash or digest algorithm"}, -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "ASCII representation of hash for comparison"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg HOST2IP_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Host name in ascii"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Host name in ascii"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg IP2HOST_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "IP address (IPv4 or IPv6)"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "IP address (IPv4 or IPv6)"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg HOSTINNETGROUP_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Netgroup name"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Netgroup name"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg HOSTRANGE_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Hostname prefix"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Enumerated range"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Hostname prefix"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Enumerated range"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg HOSTSSEEN_ARGS[] = - { -- {CF_VALRANGE, DATA_TYPE_INT, "Horizon since last seen in hours"}, -- {"lastseen,notseen", DATA_TYPE_OPTION, "Complements for selection policy"}, -- {"name,address", DATA_TYPE_OPTION, "Type of return value desired"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_VALRANGE, CF_DATA_TYPE_INT, "Horizon since last seen in hours"}, -+ {"lastseen,notseen", CF_DATA_TYPE_OPTION, "Complements for selection policy"}, -+ {"name,address", CF_DATA_TYPE_OPTION, "Type of return value desired"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg HOSTSWITHCLASS_ARGS[] = - { -- {"[a-zA-Z0-9_]+", DATA_TYPE_STRING, "Class name to look for"}, -- {"name,address", DATA_TYPE_OPTION, "Type of return value desired"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {"[a-zA-Z0-9_]+", CF_DATA_TYPE_STRING, "Class name to look for"}, -+ {"name,address", CF_DATA_TYPE_OPTION, "Type of return value desired"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg IFELSE_ARGS[] = - { -- {NULL, DATA_TYPE_NONE, NULL} -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg IPRANGE_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "IP address range syntax"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "IP address range syntax"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg IRANGE_ARGS[] = - { -- {CF_INTRANGE, DATA_TYPE_INT, "Integer"}, -- {CF_INTRANGE, DATA_TYPE_INT, "Integer"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_INTRANGE, CF_DATA_TYPE_INT, "Integer"}, -+ {CF_INTRANGE, CF_DATA_TYPE_INT, "Integer"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg ISGREATERTHAN_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Larger string or value"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Smaller string or value"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Larger string or value"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Smaller string or value"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg ISLESSTHAN_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Smaller string or value"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Larger string or value"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Smaller string or value"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Larger string or value"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg ISNEWERTHAN_ARGS[] = - { -- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Newer file name"}, -- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Older file name"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "Newer file name"}, -+ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "Older file name"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg ISVARIABLE_ARGS[] = - { -- {CF_IDRANGE, DATA_TYPE_STRING, "Variable identifier"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "Variable identifier"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg JOIN_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Join glue-string"}, -- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Join glue-string"}, -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine list identifier"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg LASTNODE_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Input string"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Link separator, e.g. /,:"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Input string"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Link separator, e.g. /,:"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg LDAPARRAY_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Array name"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "URI"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Distinguished name"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Filter"}, -- {"subtree,onelevel,base", DATA_TYPE_OPTION, "Search scope policy"}, -- {"none,ssl,sasl", DATA_TYPE_OPTION, "Security level"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Array name"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "URI"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Distinguished name"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Filter"}, -+ {"subtree,onelevel,base", CF_DATA_TYPE_OPTION, "Search scope policy"}, -+ {"none,ssl,sasl", CF_DATA_TYPE_OPTION, "Security level"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg LDAPLIST_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "URI"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Distinguished name"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Filter"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Record name"}, -- {"subtree,onelevel,base", DATA_TYPE_OPTION, "Search scope policy"}, -- {"none,ssl,sasl", DATA_TYPE_OPTION, "Security level"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "URI"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Distinguished name"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Filter"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Record name"}, -+ {"subtree,onelevel,base", CF_DATA_TYPE_OPTION, "Search scope policy"}, -+ {"none,ssl,sasl", CF_DATA_TYPE_OPTION, "Security level"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg LDAPVALUE_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "URI"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Distinguished name"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Filter"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Record name"}, -- {"subtree,onelevel,base", DATA_TYPE_OPTION, "Search scope policy"}, -- {"none,ssl,sasl", DATA_TYPE_OPTION, "Security level"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "URI"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Distinguished name"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Filter"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Record name"}, -+ {"subtree,onelevel,base", CF_DATA_TYPE_OPTION, "Search scope policy"}, -+ {"none,ssl,sasl", CF_DATA_TYPE_OPTION, "Security level"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg LSDIRLIST_ARGS[] = - { -- {CF_PATHRANGE, DATA_TYPE_STRING, "Path to base directory"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression to match files or blank"}, -- {CF_BOOL, DATA_TYPE_OPTION, "Include the base path in the list"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_PATHRANGE, CF_DATA_TYPE_STRING, "Path to base directory"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression to match files or blank"}, -+ {CF_BOOL, CF_DATA_TYPE_OPTION, "Include the base path in the list"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg MAPLIST_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Pattern based on $(this) as original text"}, -- {CF_IDRANGE, DATA_TYPE_STRING, "The name of the list variable to map"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Pattern based on $(this) as original text"}, -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "The name of the list variable to map"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg MAPARRAY_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Pattern based on $(this.k) and $(this.v) as original text"}, -- {CF_IDRANGE, DATA_TYPE_STRING, "The name of the array variable to map"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Pattern based on $(this.k) and $(this.v) as original text"}, -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "The name of the array variable to map"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg NOT_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Class value"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Class value"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg NOW_ARGS[] = - { -- {NULL, DATA_TYPE_NONE, NULL} -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg OR_ARGS[] = - { -- {NULL, DATA_TYPE_NONE, NULL} -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg SUM_ARGS[] = - { -- {CF_IDRANGE, DATA_TYPE_STRING, "A list of arbitrary real values"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "A list of arbitrary real values"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg PRODUCT_ARGS[] = - { -- {CF_IDRANGE, DATA_TYPE_STRING, "A list of arbitrary real values"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "A list of arbitrary real values"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg DATE_ARGS[] = - { -- {"1970,3000", DATA_TYPE_INT, "Year"}, -- {"1,12", DATA_TYPE_INT, "Month"}, -- {"1,31", DATA_TYPE_INT, "Day"}, -- {"0,23", DATA_TYPE_INT, "Hour"}, -- {"0,59", DATA_TYPE_INT, "Minute"}, -- {"0,59", DATA_TYPE_INT, "Second"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {"1970,3000", CF_DATA_TYPE_INT, "Year"}, -+ {"1,12", CF_DATA_TYPE_INT, "Month"}, -+ {"1,31", CF_DATA_TYPE_INT, "Day"}, -+ {"0,23", CF_DATA_TYPE_INT, "Hour"}, -+ {"0,59", CF_DATA_TYPE_INT, "Minute"}, -+ {"0,59", CF_DATA_TYPE_INT, "Second"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg PEERS_ARGS[] = - { -- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "File name of host list"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Comment regex pattern"}, -- {CF_VALRANGE, DATA_TYPE_INT, "Peer group size"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "File name of host list"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Comment regex pattern"}, -+ {CF_VALRANGE, CF_DATA_TYPE_INT, "Peer group size"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg PEERLEADER_ARGS[] = - { -- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "File name of host list"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Comment regex pattern"}, -- {CF_VALRANGE, DATA_TYPE_INT, "Peer group size"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "File name of host list"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Comment regex pattern"}, -+ {CF_VALRANGE, CF_DATA_TYPE_INT, "Peer group size"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg PEERLEADERS_ARGS[] = - { -- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "File name of host list"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Comment regex pattern"}, -- {CF_VALRANGE, DATA_TYPE_INT, "Peer group size"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "File name of host list"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Comment regex pattern"}, -+ {CF_VALRANGE, CF_DATA_TYPE_INT, "Peer group size"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg RANDOMINT_ARGS[] = - { -- {CF_INTRANGE, DATA_TYPE_INT, "Lower inclusive bound"}, -- {CF_INTRANGE, DATA_TYPE_INT, "Upper inclusive bound"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_INTRANGE, CF_DATA_TYPE_INT, "Lower inclusive bound"}, -+ {CF_INTRANGE, CF_DATA_TYPE_INT, "Upper inclusive bound"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg READFILE_ARGS[] = - { -- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "File name"}, -- {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of bytes to read"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "File name"}, -+ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum number of bytes to read"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg READSTRINGARRAY_ARGS[] = - { -- {CF_IDRANGE, DATA_TYPE_STRING, "Array identifier to populate"}, -- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "File name to read"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex matching comments"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex to split data"}, -- {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of entries to read"}, -- {CF_VALRANGE, DATA_TYPE_INT, "Maximum bytes to read"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "Array identifier to populate"}, -+ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "File name to read"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regex matching comments"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regex to split data"}, -+ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum number of entries to read"}, -+ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum bytes to read"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg PARSESTRINGARRAY_ARGS[] = - { -- {CF_IDRANGE, DATA_TYPE_STRING, "Array identifier to populate"}, -- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "A string to parse for input data"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex matching comments"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex to split data"}, -- {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of entries to read"}, -- {CF_VALRANGE, DATA_TYPE_INT, "Maximum bytes to read"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "Array identifier to populate"}, -+ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "A string to parse for input data"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regex matching comments"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regex to split data"}, -+ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum number of entries to read"}, -+ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum bytes to read"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg READSTRINGARRAYIDX_ARGS[] = - { -- {CF_IDRANGE, DATA_TYPE_STRING, "Array identifier to populate"}, -- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "A string to parse for input data"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex matching comments"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex to split data"}, -- {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of entries to read"}, -- {CF_VALRANGE, DATA_TYPE_INT, "Maximum bytes to read"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "Array identifier to populate"}, -+ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "A string to parse for input data"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regex matching comments"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regex to split data"}, -+ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum number of entries to read"}, -+ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum bytes to read"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg PARSESTRINGARRAYIDX_ARGS[] = - { -- {CF_IDRANGE, DATA_TYPE_STRING, "Array identifier to populate"}, -- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "A string to parse for input data"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex matching comments"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex to split data"}, -- {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of entries to read"}, -- {CF_VALRANGE, DATA_TYPE_INT, "Maximum bytes to read"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "Array identifier to populate"}, -+ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "A string to parse for input data"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regex matching comments"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regex to split data"}, -+ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum number of entries to read"}, -+ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum bytes to read"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg READSTRINGLIST_ARGS[] = - { -- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "File name to read"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex matching comments"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex to split data"}, -- {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of entries to read"}, -- {CF_VALRANGE, DATA_TYPE_INT, "Maximum bytes to read"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "File name to read"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regex matching comments"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regex to split data"}, -+ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum number of entries to read"}, -+ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum bytes to read"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg READTCP_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Host name or IP address of server socket"}, -- {CF_VALRANGE, DATA_TYPE_INT, "Port number"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Protocol query string"}, -- {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of bytes to read"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Host name or IP address of server socket"}, -+ {CF_VALRANGE, CF_DATA_TYPE_INT, "Port number"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Protocol query string"}, -+ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum number of bytes to read"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg REGARRAY_ARGS[] = - { -- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine array identifier"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine array identifier"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg REGCMP_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Match string"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Match string"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg REGEXTRACT_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Match string"}, -- {CF_IDRANGE, DATA_TYPE_STRING, "Identifier for back-references"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Match string"}, -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "Identifier for back-references"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg REGISTRYVALUE_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Windows registry key"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Windows registry value-id"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Windows registry key"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Windows registry value-id"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg REGLINE_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Filename to search"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Filename to search"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg REGLIST_ARGS[] = - { -- {CF_NAKEDLRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_NAKEDLRANGE, CF_DATA_TYPE_STRING, "CFEngine list identifier"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg REGLDAP_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "URI"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Distinguished name"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Filter"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Record name"}, -- {"subtree,onelevel,base", DATA_TYPE_OPTION, "Search scope policy"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex to match results"}, -- {"none,ssl,sasl", DATA_TYPE_OPTION, "Security level"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "URI"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Distinguished name"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Filter"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Record name"}, -+ {"subtree,onelevel,base", CF_DATA_TYPE_OPTION, "Search scope policy"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regex to match results"}, -+ {"none,ssl,sasl", CF_DATA_TYPE_OPTION, "Security level"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg REMOTESCALAR_ARGS[] = - { -- {CF_IDRANGE, DATA_TYPE_STRING, "Variable identifier"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Hostname or IP address of server"}, -- {CF_BOOL, DATA_TYPE_OPTION, "Use enryption"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "Variable identifier"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Hostname or IP address of server"}, -+ {CF_BOOL, CF_DATA_TYPE_OPTION, "Use enryption"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg HUB_KNOWLEDGE_ARGS[] = - { -- {CF_IDRANGE, DATA_TYPE_STRING, "Variable identifier"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "Variable identifier"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg REMOTECLASSESMATCHING_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Server name or address"}, -- {CF_BOOL, DATA_TYPE_OPTION, "Use encryption"}, -- {CF_IDRANGE, DATA_TYPE_STRING, "Return class prefix"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Server name or address"}, -+ {CF_BOOL, CF_DATA_TYPE_OPTION, "Use encryption"}, -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "Return class prefix"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg RETURNSZERO_ARGS[] = - { -- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Fully qualified command path"}, -- {"useshell,noshell,powershell", DATA_TYPE_OPTION, "Shell encapsulation option"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "Fully qualified command path"}, -+ {"useshell,noshell,powershell", CF_DATA_TYPE_OPTION, "Shell encapsulation option"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg RRANGE_ARGS[] = - { -- {CF_REALRANGE, DATA_TYPE_REAL, "Real number"}, -- {CF_REALRANGE, DATA_TYPE_REAL, "Real number"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_REALRANGE, CF_DATA_TYPE_REAL, "Real number"}, -+ {CF_REALRANGE, CF_DATA_TYPE_REAL, "Real number"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg SELECTSERVERS_ARGS[] = - { -- {CF_NAKEDLRANGE, DATA_TYPE_STRING, "The identifier of a cfengine list of hosts or addresses to contact"}, -- {CF_VALRANGE, DATA_TYPE_INT, "The port number"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "A query string"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "A regular expression to match success"}, -- {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of bytes to read from server"}, -- {CF_IDRANGE, DATA_TYPE_STRING, "Name for array of results"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_NAKEDLRANGE, CF_DATA_TYPE_STRING, "The identifier of a cfengine list of hosts or addresses to contact"}, -+ {CF_VALRANGE, CF_DATA_TYPE_INT, "The port number"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "A query string"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "A regular expression to match success"}, -+ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum number of bytes to read from server"}, -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "Name for array of results"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg SPLAYCLASS_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Input string for classification"}, -- {"daily,hourly", DATA_TYPE_OPTION, "Splay time policy"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Input string for classification"}, -+ {"daily,hourly", CF_DATA_TYPE_OPTION, "Splay time policy"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg SPLITSTRING_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "A data string"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex to split on"}, -- {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of pieces"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "A data string"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regex to split on"}, -+ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum number of pieces"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg STRCMP_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "String"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "String"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "String"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "String"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg STRFTIME_ARGS[] = - { -- {"gmtime,localtime", DATA_TYPE_OPTION, "Use GMT or local time"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "A format string"}, -- {CF_VALRANGE, DATA_TYPE_INT, "The time as a Unix epoch offset"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {"gmtime,localtime", CF_DATA_TYPE_OPTION, "Use GMT or local time"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "A format string"}, -+ {CF_VALRANGE, CF_DATA_TYPE_INT, "The time as a Unix epoch offset"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg SUBLIST_ARGS[] = - { -- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, -- {"head,tail", DATA_TYPE_OPTION, "Whether to return elements from the head or from the tail of the list"}, -- {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of elements to return"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine list identifier"}, -+ {"head,tail", CF_DATA_TYPE_OPTION, "Whether to return elements from the head or from the tail of the list"}, -+ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum number of elements to return"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg TRANSLATEPATH_ARGS[] = - { -- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Unix style path"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "Unix style path"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg USEMODULE_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Name of module command"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Argument string for the module"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Name of module command"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Argument string for the module"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg UNIQUE_ARGS[] = - { -- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine list identifier"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg NTH_ARGS[] = - { -- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, -- {CF_VALRANGE, DATA_TYPE_INT, "Offset of element to return"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine list identifier"}, -+ {CF_VALRANGE, CF_DATA_TYPE_INT, "Offset of element to return"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg EVERY_SOME_NONE_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression or string"}, -- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression or string"}, -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine list identifier"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg USEREXISTS_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "User name or identifier"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "User name or identifier"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg SORT_ARGS[] = - { -- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, -- {"lex", DATA_TYPE_STRING, "Sorting method: lex"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine list identifier"}, -+ {"lex", CF_DATA_TYPE_STRING, "Sorting method: lex"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg REVERSE_ARGS[] = - { -- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine list identifier"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg SHUFFLE_ARGS[] = - { -- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, -- {CF_ANYSTRING, DATA_TYPE_STRING, "Any seed string"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine list identifier"}, -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Any seed string"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg LENGTH_ARGS[] = - { -- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine list identifier"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg SETOP_ARGS[] = - { -- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine base list identifier"}, -- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine filter list identifier"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine base list identifier"}, -+ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine filter list identifier"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - FnCallArg FORMAT_ARGS[] = - { -- {CF_ANYSTRING, DATA_TYPE_STRING, "CFEngine format string"}, -- {NULL, DATA_TYPE_NONE, NULL} -+ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "CFEngine format string"}, -+ {NULL, CF_DATA_TYPE_NONE, NULL} - }; - - /*********************************************************/ -@@ -5828,119 +5828,119 @@ FnCallArg FORMAT_ARGS[] = - - const FnCallType CF_FNCALL_TYPES[] = - { -- FnCallTypeNew("accessedbefore", DATA_TYPE_CONTEXT, ACCESSEDBEFORE_ARGS, &FnCallIsAccessedBefore, "True if arg1 was accessed before arg2 (atime)", false, FNCALL_CATEGORY_FILES, SYNTAX_STATUS_NORMAL), -- FnCallTypeNew("accumulated", DATA_TYPE_INT, ACCUM_ARGS, &FnCallAccumulatedDate, "Convert an accumulated amount of time into a system representation", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), -- FnCallTypeNew("ago", DATA_TYPE_INT, AGO_ARGS, &FnCallAgoDate, "Convert a time relative to now to an integer system representation", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), -- FnCallTypeNew("and", DATA_TYPE_STRING, AND_ARGS, &FnCallAnd, "Calculate whether all arguments evaluate to true", true, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), -- FnCallTypeNew("canonify", DATA_TYPE_STRING, CANONIFY_ARGS, &FnCallCanonify, "Convert an abitrary string into a legal class name", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), -- FnCallTypeNew("concat", DATA_TYPE_STRING, CONCAT_ARGS, &FnCallConcat, "Concatenate all arguments into string", true, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 26 20:02:32 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 26 Dec 2013 19:02:32 +0000 Subject: SF.net SVN: gar:[22752] csw/mgar/pkg/genshi/trunk/Makefile Message-ID: <3dr0sr44nWzfY@mail.opencsw.org> Revision: 22752 http://sourceforge.net/p/gar/code/22752 Author: rthurner Date: 2013-12-26 19:02:31 +0000 (Thu, 26 Dec 2013) Log Message: ----------- genshi, not for all architectures any more as there are speedups in c Modified Paths: -------------- csw/mgar/pkg/genshi/trunk/Makefile Modified: csw/mgar/pkg/genshi/trunk/Makefile =================================================================== --- csw/mgar/pkg/genshi/trunk/Makefile 2013-12-26 18:54:44 UTC (rev 22751) +++ csw/mgar/pkg/genshi/trunk/Makefile 2013-12-26 19:02:31 UTC (rev 22752) @@ -21,8 +21,6 @@ RUNTIME_DEP_PKGS_CSWgenshi += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWgenshi += CSWlibpython2-7-1-0 -ARCHALL = 1 - VENDOR_URL = http://genshi.edgewall.org/ TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Thu Dec 26 21:02:05 2013 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Thu, 26 Dec 2013 20:02:05 +0000 Subject: SF.net SVN: gar:[22753] csw/mgar/pkg/puppet3/trunk Message-ID: <3dr2Bb3mndzkl@mail.opencsw.org> Revision: 22753 http://sourceforge.net/p/gar/code/22753 Author: phipsy Date: 2013-12-26 20:02:05 +0000 (Thu, 26 Dec 2013) Log Message: ----------- puppet3: 3.2.4 Modified Paths: -------------- csw/mgar/pkg/puppet3/trunk/Makefile csw/mgar/pkg/puppet3/trunk/checksums Modified: csw/mgar/pkg/puppet3/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet3/trunk/Makefile 2013-12-26 19:02:31 UTC (rev 22752) +++ csw/mgar/pkg/puppet3/trunk/Makefile 2013-12-26 20:02:05 UTC (rev 22753) @@ -3,7 +3,7 @@ # $Id$ NAME = puppet3 -VERSION = 3.3.1 +VERSION = 3.4.1 GARTYPE = v2 define BLURB Modified: csw/mgar/pkg/puppet3/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet3/trunk/checksums 2013-12-26 19:02:31 UTC (rev 22752) +++ csw/mgar/pkg/puppet3/trunk/checksums 2013-12-26 20:02:05 UTC (rev 22753) @@ -5,3 +5,4 @@ 318de47ab9e7d41cce98c1cbc5d33cc1 puppet-3.2.2.tar.gz 7084f61bea287ba6720ed2ccccd1fb03 puppet-3.2.4.tar.gz e553c381df75b24c8eda00ecc6dcef8a puppet-3.3.1.tar.gz +25e230a05fbf6a23ff477869994de8b8 puppet-3.4.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Thu Dec 26 21:03:29 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Thu, 26 Dec 2013 20:03:29 +0000 Subject: SF.net SVN: gar:[22754] csw/mgar/pkg/cfengine3/trunk/Makefile Message-ID: <3dr2DC16d9zpH@mail.opencsw.org> Revision: 22754 http://sourceforge.net/p/gar/code/22754 Author: guengel Date: 2013-12-26 20:03:26 +0000 (Thu, 26 Dec 2013) Log Message: ----------- Updated dependencies/checkpkg overrides. Modified Paths: -------------- csw/mgar/pkg/cfengine3/trunk/Makefile Modified: csw/mgar/pkg/cfengine3/trunk/Makefile =================================================================== --- csw/mgar/pkg/cfengine3/trunk/Makefile 2013-12-26 20:02:05 UTC (rev 22753) +++ csw/mgar/pkg/cfengine3/trunk/Makefile 2013-12-26 20:03:26 UTC (rev 22754) @@ -73,6 +73,8 @@ PKGFILES_CSW$(NAME)server += $(initddir)/csw$(NAME)-cfserverd PKGFILES_CSW$(NAME)server += $(docdir)/$(NAME)_server/.*\.CSW CHECKPKG_OVERRIDES_CSW$(NAME)server += catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)server|catalogname=$(NAME)_server|expected-catalogname=$(NAME)server +RUNTIME_DEP_PKGS_CSW$(NAME)server+= CSWlibtokyocabinet9 +CHECKPKG_OVERRIDES_CSW$(NAME)server += surplus-dependency|CSWlibtokyocabinet9 PACKAGES += CSW$(NAME)client CATALOGNAME_CSW$(NAME)client = $(NAME)_client @@ -91,6 +93,8 @@ PKGFILES_CSW$(NAME)client += $(initddir)/csw$(NAME)-cfmonitord PKGFILES_CSW$(NAME)client += $(docdir)/$(NAME)_client/.*\.CSW CHECKPKG_OVERRIDES_CSW$(NAME)client += catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)client|catalogname=$(NAME)_client|expected-catalogname=$(NAME)client +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibtokyocabinet9 +CHECKPKG_OVERRIDES_CSW$(NAME)client += surplus-dependency|CSWlibtokyocabinet9 # CFEngine provides three daemons # - cf-execd (client) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 26 21:35:25 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 26 Dec 2013 20:35:25 +0000 Subject: SF.net SVN: gar:[22755] csw/mgar/pkg/genshi/trunk/Makefile Message-ID: <3dr2x33937zt9@mail.opencsw.org> Revision: 22755 http://sourceforge.net/p/gar/code/22755 Author: rthurner Date: 2013-12-26 20:35:22 +0000 (Thu, 26 Dec 2013) Log Message: ----------- genshi, templates for tests do not matter for checkpkg Modified Paths: -------------- csw/mgar/pkg/genshi/trunk/Makefile Modified: csw/mgar/pkg/genshi/trunk/Makefile =================================================================== --- csw/mgar/pkg/genshi/trunk/Makefile 2013-12-26 20:03:26 UTC (rev 22754) +++ csw/mgar/pkg/genshi/trunk/Makefile 2013-12-26 20:35:22 UTC (rev 22755) @@ -28,6 +28,11 @@ # This is a legacy name, don't change for now CHECKPKG_OVERRIDES_CSWgenshi += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWgenshi += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWgenshi += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/genshi/template/tests/plugin.py +CHECKPKG_OVERRIDES_CSWgenshi += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/genshi/template/tests/plugin.py +CHECKPKG_OVERRIDES_CSWgenshi += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/genshi/template/tests/plugin.py +CHECKPKG_OVERRIDES_CSWgenshi += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/genshi/template/tests/plugin.py + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Dec 27 10:37:33 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 27 Dec 2013 09:37:33 +0000 Subject: SF.net SVN: gar:[22756] csw/mgar/pkg/cmake/trunk/Makefile Message-ID: <3drNHW2rG4z1Ft@mail.opencsw.org> Revision: 22756 http://sourceforge.net/p/gar/code/22756 Author: rthurner Date: 2013-12-27 09:37:32 +0000 (Fri, 27 Dec 2013) Log Message: ----------- cmake, do not require emacs-common to be installed Modified Paths: -------------- csw/mgar/pkg/cmake/trunk/Makefile Modified: csw/mgar/pkg/cmake/trunk/Makefile =================================================================== --- csw/mgar/pkg/cmake/trunk/Makefile 2013-12-26 20:35:22 UTC (rev 22755) +++ csw/mgar/pkg/cmake/trunk/Makefile 2013-12-27 09:37:32 UTC (rev 22756) @@ -42,8 +42,8 @@ CHECKPKG_OVERRIDES_CSWcmake += disallowed-path|opt/csw/man/man1/cmake.1 CHECKPKG_OVERRIDES_CSWcmake += disallowed-path|opt/csw/man/man1/cmakevars.1 CHECKPKG_OVERRIDES_CSWcmake += missing-dependency|CSWemacscommon +CHECKPKG_OVERRIDES_CSWcmake += missing-dependency|CSWemacs-common - NOISALIST = 1 CONFIGURE_ARGS = --prefix=$(prefix) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Dec 27 11:07:28 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 27 Dec 2013 10:07:28 +0000 Subject: SF.net SVN: gar:[22757] csw/mgar/pkg/cpan Message-ID: <3drNy26j7mz1Kp@mail.opencsw.org> Revision: 22757 http://sourceforge.net/p/gar/code/22757 Author: dmichelsen Date: 2013-12-27 10:07:26 +0000 (Fri, 27 Dec 2013) Log Message: ----------- cpan/Net-Proxy: Initial commit Modified Paths: -------------- csw/mgar/pkg/cpan/Net-Proxy/trunk/Makefile csw/mgar/pkg/cpan/Net-Proxy/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Net-Proxy/ Modified: csw/mgar/pkg/cpan/Net-Proxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-Telnet/trunk/Makefile 2013-11-06 14:25:24 UTC (rev 22420) +++ csw/mgar/pkg/cpan/Net-Proxy/trunk/Makefile 2013-12-27 10:07:26 UTC (rev 22757) @@ -1,29 +1,14 @@ -NAME = Net-Telnet -VERSION = 3.03 +NAME = Net-Proxy +VERSION = 0.12 CATEGORIES = cpan GARTYPE = v2 -AUTHOR = JROGERS +AUTHOR = BOOK -DESCRIPTION = Interact with TELNET port or other TCP ports -define BLURB - Net::Telnet allows you to make client connections to a TCP port and do - network I/O, especially to a port using the TELNET protocol. Simple I/O - methods such as print, get, and getline are provided. More sophisticated - interactive features are provided because connecting to a TELNET port - ultimately means communicating with a program designed for human - interaction. These interactive features include the ability to specify a - time-out and to wait for patterns to appear in the input stream, such as - the prompt from a shell. -endef +DESCRIPTION = Framework for proxying network connections in many ways -PACKAGES = CSWpmnettelnet -CATALOGNAME = pm_nettelnet -ARCHALL = 1 +PACKAGES += CSWpm-net-proxy +SPKG_DESC_CSWpm-net-proxy = Framework for proxying network connections in many ways +# PKGFILES is catchall +ARCHALL_CSWpm-net-proxy = 1 include gar/category.mk - -post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(NAME) -post-install-modulated: - @ginstall -d $(DOCDEST) - @cp $(FILEDIR)/changelog.CSW $(DOCDEST) - @$(MAKECOOKIE) Modified: csw/mgar/pkg/cpan/Net-Proxy/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-Telnet/trunk/checksums 2013-11-06 14:25:24 UTC (rev 22420) +++ csw/mgar/pkg/cpan/Net-Proxy/trunk/checksums 2013-12-27 10:07:26 UTC (rev 22757) @@ -1 +1 @@ -2f7d34b09d6117baefe89d44cff9d5fc download/Net-Telnet-3.03.tar.gz +84975f4d832fdccd1d3be2e49a783cde Net-Proxy-0.12.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Fri Dec 27 16:18:54 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Fri, 27 Dec 2013 15:18:54 +0000 Subject: SF.net SVN: gar:[22758] csw/mgar/pkg/cfengine3/trunk Message-ID: <3drWtW2ND4z1Xs@mail.opencsw.org> Revision: 22758 http://sourceforge.net/p/gar/code/22758 Author: guengel Date: 2013-12-27 15:18:49 +0000 (Fri, 27 Dec 2013) Log Message: ----------- Again, had to fix DATA_TYPE_STRING issue, still in CFEngine 3.5.3, although bug https://cfengine.com/dev/issues/3472 has been closed. Modified Paths: -------------- csw/mgar/pkg/cfengine3/trunk/Makefile csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/cfengine3/trunk/files/0003-Make-it-compile-under-solaris-11.patch Modified: csw/mgar/pkg/cfengine3/trunk/Makefile =================================================================== --- csw/mgar/pkg/cfengine3/trunk/Makefile 2013-12-27 10:07:26 UTC (rev 22757) +++ csw/mgar/pkg/cfengine3/trunk/Makefile 2013-12-27 15:18:49 UTC (rev 22758) @@ -40,6 +40,7 @@ PATCHFILES += 0000-Disable-acceptance-test.patch PATCHFILES += 0002-Add-z-interpose-to-evalfunction_test-and-set_domainn.patch +PATCHFILES += 0003-Make-it-compile-under-solaris-11.patch # # CUSTOM VARIABLES Added: csw/mgar/pkg/cfengine3/trunk/files/0003-Make-it-compile-under-solaris-11.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0003-Make-it-compile-under-solaris-11.patch (rev 0) +++ csw/mgar/pkg/cfengine3/trunk/files/0003-Make-it-compile-under-solaris-11.patch 2013-12-27 15:18:49 UTC (rev 22758) @@ -0,0 +1,2557 @@ +From ae4b57fd3c073eecd9c21c0eeb59df73eddd0851 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Fri, 27 Dec 2013 15:54:51 +0100 +Subject: [PATCH] Make it compile under solaris 11. + +--- + cf-agent/cf-agent.c | 4 +- + cf-agent/files_editline.c | 2 +- + cf-agent/files_editxml.c | 2 +- + cf-agent/vercmp.c | 4 +- + cf-agent/verify_environments.c | 2 +- + cf-agent/verify_exec.c | 2 +- + cf-agent/verify_files.c | 4 +- + cf-agent/verify_files_utils.c | 2 +- + cf-agent/verify_methods.c | 2 +- + cf-agent/verify_packages.c | 24 +- + cf-agent/verify_processes.c | 2 +- + cf-agent/verify_services.c | 10 +- + cf-execd/cf-execd.c | 2 +- + cf-gendoc/export_xml.c | 4 +- + cf-gendoc/manual.c | 2 +- + cf-monitord/verify_measurements.c | 2 +- + libpromises/attributes.c | 2 +- + libpromises/bootstrap.c | 6 +- + libpromises/cf3.defs.h | 4 +- + libpromises/conversion.c | 4 +- + libpromises/evalfunction.c | 466 +++++++++++++++++++------------------- + libpromises/expand.c | 30 +-- + libpromises/generic_agent.c | 4 +- + libpromises/policy.c | 4 +- + libpromises/rlist.c | 4 +- + libpromises/scope.c | 18 +- + libpromises/syntax.c | 14 +- + libpromises/syntax.h | 4 +- + libpromises/sysinfo.c | 100 ++++---- + libpromises/unix.c | 28 +-- + libpromises/vars.c | 10 +- + libpromises/verify_reports.c | 2 +- + tests/unit/assoc_test.c | 2 +- + tests/unit/exec-config-test.c | 2 +- + tests/unit/expand_test.c | 30 +-- + tests/unit/scope_test.c | 6 +- + tests/unit/set_domainname_test.c | 2 +- + 37 files changed, 406 insertions(+), 406 deletions(-) + +diff --git a/cf-agent/cf-agent.c b/cf-agent/cf-agent.c +index 61ca750..d969bc9 100644 +--- a/cf-agent/cf-agent.c ++++ b/cf-agent/cf-agent.c +@@ -1311,7 +1311,7 @@ static void DefaultVarPromise(EvalContext *ctx, const Promise *pp) + + switch (dt) + { +- case DATA_TYPE_STRING: ++ case CFE_DATA_TYPE_STRING: + case DATA_TYPE_INT: + case DATA_TYPE_REAL: + +@@ -1327,7 +1327,7 @@ static void DefaultVarPromise(EvalContext *ctx, const Promise *pp) + + break; + +- case DATA_TYPE_STRING_LIST: ++ case CFE_DATA_TYPE_STRING_LIST: + case DATA_TYPE_INT_LIST: + case DATA_TYPE_REAL_LIST: + +diff --git a/cf-agent/files_editline.c b/cf-agent/files_editline.c +index ab8e7a7..12dcde6 100644 +--- a/cf-agent/files_editline.c ++++ b/cf-agent/files_editline.c +@@ -114,7 +114,7 @@ int ScheduleEditLineOperations(EvalContext *ctx, Bundle *bp, Attributes a, const + return false; + } + +- ScopeNewSpecial(ctx, "edit", "filename", edcontext->filename, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "edit", "filename", edcontext->filename, CFE_DATA_TYPE_STRING); + + for (pass = 1; pass < CF_DONEPASSES; pass++) + { +diff --git a/cf-agent/files_editxml.c b/cf-agent/files_editxml.c +index ebe953e..ef5510f 100644 +--- a/cf-agent/files_editxml.c ++++ b/cf-agent/files_editxml.c +@@ -160,7 +160,7 @@ int ScheduleEditXmlOperations(EvalContext *ctx, Bundle *bp, Attributes a, const + return false; + } + +- ScopeNewSpecial(ctx, "edit", "filename", edcontext->filename, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "edit", "filename", edcontext->filename, CFE_DATA_TYPE_STRING); + + for (pass = 1; pass < CF_DONEPASSES; pass++) + { +diff --git a/cf-agent/vercmp.c b/cf-agent/vercmp.c +index ce932a5..3e32cf8 100644 +--- a/cf-agent/vercmp.c ++++ b/cf-agent/vercmp.c +@@ -64,8 +64,8 @@ static VersionCmpResult RunCmpCommand(EvalContext *ctx, const char *command, con + char expanded_command[CF_EXPANDSIZE]; + + { +- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "v1" }, (Rval) { v1, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); +- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "v2" }, (Rval) { v2, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "v1" }, (Rval) { v1, RVAL_TYPE_SCALAR }, CFE_DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "v2" }, (Rval) { v2, RVAL_TYPE_SCALAR }, CFE_DATA_TYPE_STRING); + ExpandScalar(ctx, "cf_pack_context", command, expanded_command); + + ScopeClear("cf_pack_context"); +diff --git a/cf-agent/verify_environments.c b/cf-agent/verify_environments.c +index 67e6fab..fe0471f 100644 +--- a/cf-agent/verify_environments.c ++++ b/cf-agent/verify_environments.c +@@ -136,7 +136,7 @@ void VerifyEnvironmentsPromise(EvalContext *ctx, Promise *pp) + } + + PromiseBanner(pp); +- ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, CFE_DATA_TYPE_STRING); + + pexp = ExpandDeRefPromise(ctx, "this", pp); + VerifyEnvironments(ctx, a, pp); +diff --git a/cf-agent/verify_exec.c b/cf-agent/verify_exec.c +index 1dd7a86..b7c46d7 100644 +--- a/cf-agent/verify_exec.c ++++ b/cf-agent/verify_exec.c +@@ -64,7 +64,7 @@ void VerifyExecPromise(EvalContext *ctx, Promise *pp) + + a = GetExecAttributes(ctx, pp); + +- ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, CFE_DATA_TYPE_STRING); + + if (!SyntaxCheckExec(a, pp)) + { +diff --git a/cf-agent/verify_files.c b/cf-agent/verify_files.c +index 8e28387..c1e556f 100644 +--- a/cf-agent/verify_files.c ++++ b/cf-agent/verify_files.c +@@ -197,7 +197,7 @@ static void VerifyFilePromise(EvalContext *ctx, char *path, Promise *pp) + } + + ScopeDeleteSpecial("this", "promiser"); +- ScopeNewSpecial(ctx, "this", "promiser", path, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "this", "promiser", path, CFE_DATA_TYPE_STRING); + + thislock = AcquireLock(ctx, path, VUQNAME, CFSTARTTIME, a.transaction, pp, false); + +@@ -589,7 +589,7 @@ static void FindFilePromiserObjects(EvalContext *ctx, Promise *pp) + if (literal) + { + // Prime the promiser temporarily, may override later +- ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, CFE_DATA_TYPE_STRING); + VerifyFilePromise(ctx, pp->promiser, pp); + } + else // Default is to expand regex paths +diff --git a/cf-agent/verify_files_utils.c b/cf-agent/verify_files_utils.c +index 85d0637..ef4de98 100644 +--- a/cf-agent/verify_files_utils.c ++++ b/cf-agent/verify_files_utils.c +@@ -124,7 +124,7 @@ int VerifyFileLeaf(EvalContext *ctx, char *path, struct stat *sb, Attributes att + /* We still need to augment the scope of context "this" for commands */ + + ScopeDeleteSpecial("this", "promiser"); +- ScopeNewSpecial(ctx, "this", "promiser", path, DATA_TYPE_STRING); // Parameters may only be scalars ++ ScopeNewSpecial(ctx, "this", "promiser", path, CFE_DATA_TYPE_STRING); // Parameters may only be scalars + + if (attr.transformer != NULL) + { +diff --git a/cf-agent/verify_methods.c b/cf-agent/verify_methods.c +index 14296e2..8288c56 100644 +--- a/cf-agent/verify_methods.c ++++ b/cf-agent/verify_methods.c +@@ -227,7 +227,7 @@ static void GetReturnValue(EvalContext *ctx, char *scope, Promise *pp) + snprintf(newname, CF_BUFSIZE, "%s", result); + } + +- EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(pp)->name, newname }, assoc->rval, DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(pp)->name, newname }, assoc->rval, CFE_DATA_TYPE_STRING); + } + } + +diff --git a/cf-agent/verify_packages.c b/cf-agent/verify_packages.c +index fc8823d..38bec73 100644 +--- a/cf-agent/verify_packages.c ++++ b/cf-agent/verify_packages.c +@@ -940,9 +940,9 @@ static void SchedulePackageOp(EvalContext *ctx, const char *name, const char *ve + + if ((a.packages.package_name_convention) || (a.packages.package_delete_convention)) + { +- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "name" }, (Rval) { name, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); +- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "version" }, (Rval) { version, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); +- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "arch" }, (Rval) { arch, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "name" }, (Rval) { name, RVAL_TYPE_SCALAR }, CFE_DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "version" }, (Rval) { version, RVAL_TYPE_SCALAR }, CFE_DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "arch" }, (Rval) { arch, RVAL_TYPE_SCALAR }, CFE_DATA_TYPE_STRING); + + if ((a.packages.package_delete_convention) && (a.packages.package_policy == PACKAGE_ACTION_DELETE)) + { +@@ -1004,9 +1004,9 @@ static void SchedulePackageOp(EvalContext *ctx, const char *name, const char *ve + if ((a.packages.package_file_repositories != NULL)) + { + { +- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "name" }, (Rval) { name, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); +- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "version" }, (Rval) { "(.*)", RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); +- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "arch" }, (Rval) { arch, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "name" }, (Rval) { name, RVAL_TYPE_SCALAR }, CFE_DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "version" }, (Rval) { "(.*)", RVAL_TYPE_SCALAR }, CFE_DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "arch" }, (Rval) { arch, RVAL_TYPE_SCALAR }, CFE_DATA_TYPE_STRING); + ExpandScalar(ctx, "cf_pack_context_anyver", a.packages.package_name_convention, refAnyVer); + + ScopeClear("cf_pack_context_anyver"); +@@ -1124,9 +1124,9 @@ static void SchedulePackageOp(EvalContext *ctx, const char *name, const char *ve + if ((a.packages.package_file_repositories != NULL)) + { + { +- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "name" }, (Rval) { name, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); +- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "version" }, (Rval) { "(.*)", RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); +- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "arch" }, (Rval) { arch, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "name" }, (Rval) { name, RVAL_TYPE_SCALAR }, CFE_DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "version" }, (Rval) { "(.*)", RVAL_TYPE_SCALAR }, CFE_DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "arch" }, (Rval) { arch, RVAL_TYPE_SCALAR }, CFE_DATA_TYPE_STRING); + ExpandScalar(ctx, "cf_pack_context_anyver", a.packages.package_name_convention, refAnyVer); + + ScopeClear("cf_pack_context_anyver"); +@@ -1189,9 +1189,9 @@ static void SchedulePackageOp(EvalContext *ctx, const char *name, const char *ve + } + + { +- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "name" }, (Rval) { name, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); +- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "version" }, (Rval) { instVer, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); +- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "arch" }, (Rval) { instArch, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "name" }, (Rval) { name, RVAL_TYPE_SCALAR }, CFE_DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "version" }, (Rval) { instVer, RVAL_TYPE_SCALAR }, CFE_DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "arch" }, (Rval) { instArch, RVAL_TYPE_SCALAR }, CFE_DATA_TYPE_STRING); + ExpandScalar(ctx, "cf_pack_context", a.packages.package_delete_convention, reference2); + id_del = reference2; + +diff --git a/cf-agent/verify_processes.c b/cf-agent/verify_processes.c +index ebd9975..700f0d8 100644 +--- a/cf-agent/verify_processes.c ++++ b/cf-agent/verify_processes.c +@@ -124,7 +124,7 @@ static void VerifyProcesses(EvalContext *ctx, Attributes a, Promise *pp) + } + + ScopeDeleteSpecial("this", "promiser"); +- ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, CFE_DATA_TYPE_STRING); + PromiseBanner(pp); + VerifyProcessOp(ctx, PROCESSTABLE, a, pp); + ScopeDeleteSpecial("this", "promiser"); +diff --git a/cf-agent/verify_services.c b/cf-agent/verify_services.c +index 9adb726..613136e 100644 +--- a/cf-agent/verify_services.c ++++ b/cf-agent/verify_services.c +@@ -163,7 +163,7 @@ void VerifyServices(EvalContext *ctx, Attributes a, Promise *pp) + return; + } + +- ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, CFE_DATA_TYPE_STRING); + PromiseBanner(pp); + + if (strcmp(a.service.service_type, "windows") == 0) +@@ -229,21 +229,21 @@ static void DoVerifyServices(EvalContext *ctx, Attributes a, Promise *pp) + switch (a.service.service_policy) + { + case SERVICE_POLICY_START: +- ScopeNewSpecial(ctx, "this", "service_policy", "start", DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "this", "service_policy", "start", CFE_DATA_TYPE_STRING); + break; + + case SERVICE_POLICY_RESTART: +- ScopeNewSpecial(ctx, "this", "service_policy", "restart", DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "this", "service_policy", "restart", CFE_DATA_TYPE_STRING); + break; + + case SERVICE_POLICY_RELOAD: +- ScopeNewSpecial(ctx, "this", "service_policy", "reload", DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "this", "service_policy", "reload", CFE_DATA_TYPE_STRING); + break; + + case SERVICE_POLICY_STOP: + case SERVICE_POLICY_DISABLE: + default: +- ScopeNewSpecial(ctx, "this", "service_policy", "stop", DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "this", "service_policy", "stop", CFE_DATA_TYPE_STRING); + break; + } + +diff --git a/cf-execd/cf-execd.c b/cf-execd/cf-execd.c +index 7f25dc2..0ac4cb1 100644 +--- a/cf-execd/cf-execd.c ++++ b/cf-execd/cf-execd.c +@@ -553,7 +553,7 @@ static bool ScheduleRun(EvalContext *ctx, Policy **policy, GenericAgentConfig *c + free(existing_policy_server); + } + +- ScopeNewSpecial(ctx, "sys", "policy_hub", POLICY_SERVER, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "sys", "policy_hub", POLICY_SERVER, CFE_DATA_TYPE_STRING); + + GetNameInfo3(ctx, AGENT_TYPE_EXECUTOR); + GetInterfacesInfo(ctx, AGENT_TYPE_EXECUTOR); +diff --git a/cf-gendoc/export_xml.c b/cf-gendoc/export_xml.c +index e8699ff..1e8463c 100644 +--- a/cf-gendoc/export_xml.c ++++ b/cf-gendoc/export_xml.c +@@ -454,8 +454,8 @@ static void XmlExportType(Writer *writer, const ConstraintSyntax *constraint_syn + break; + } + +- case DATA_TYPE_STRING: +- case DATA_TYPE_STRING_LIST: ++ case CFE_DATA_TYPE_STRING: ++ case CFE_DATA_TYPE_STRING_LIST: + case DATA_TYPE_CONTEXT: + case DATA_TYPE_CONTEXT_LIST: + /* XML ELEMENT -- ACCEPTED-VALUES */ +diff --git a/cf-gendoc/manual.c b/cf-gendoc/manual.c +index f1096ee..18cca16 100644 +--- a/cf-gendoc/manual.c ++++ b/cf-gendoc/manual.c +@@ -249,7 +249,7 @@ void TexinfoManual(EvalContext *ctx, const char *source_dir, const char *output_ + + // scopes const and sys + +- ScopeNewSpecial(ctx, "edit", "filename", "x", DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "edit", "filename", "x", CFE_DATA_TYPE_STRING); + + ScopePutMatch(0, "x"); + +diff --git a/cf-monitord/verify_measurements.c b/cf-monitord/verify_measurements.c +index 1c35a16..6ee995c 100644 +--- a/cf-monitord/verify_measurements.c ++++ b/cf-monitord/verify_measurements.c +@@ -98,7 +98,7 @@ static bool CheckMeasureSanity(Measurement m, Promise *pp) + switch (m.data_type) + { + case DATA_TYPE_COUNTER: +- case DATA_TYPE_STRING: ++ case CFE_DATA_TYPE_STRING: + case DATA_TYPE_INT: + case DATA_TYPE_REAL: + break; +diff --git a/libpromises/attributes.c b/libpromises/attributes.c +index 3b8e1f4..8c95b14 100644 +--- a/libpromises/attributes.c ++++ b/libpromises/attributes.c +@@ -1608,7 +1608,7 @@ Measurement GetMeasurementConstraint(const EvalContext *ctx, const Promise *pp) + + if (m.data_type == DATA_TYPE_NONE) + { +- m.data_type = DATA_TYPE_STRING; ++ m.data_type = CFE_DATA_TYPE_STRING; + } + + m.history_type = ConstraintGetRvalValue(ctx, "history_type", pp, RVAL_TYPE_SCALAR); +diff --git a/libpromises/bootstrap.c b/libpromises/bootstrap.c +index 0cd27f1..c6dbe3f 100644 +--- a/libpromises/bootstrap.c ++++ b/libpromises/bootstrap.c +@@ -113,12 +113,12 @@ void SetPolicyServer(EvalContext *ctx, const char *new_policy_server) + if (new_policy_server) + { + snprintf(POLICY_SERVER, CF_MAX_IP_LEN, "%s", new_policy_server); +- ScopeNewSpecial(ctx, "sys", "policy_hub", new_policy_server, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "sys", "policy_hub", new_policy_server, CFE_DATA_TYPE_STRING); + } + else + { + POLICY_SERVER[0] = '\0'; +- ScopeNewSpecial(ctx, "sys", "policy_hub", "undefined", DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "sys", "policy_hub", "undefined", CFE_DATA_TYPE_STRING); + } + + // Get the timestamp on policy update +@@ -137,7 +137,7 @@ void SetPolicyServer(EvalContext *ctx, const char *new_policy_server) + char timebuf[26]; + cf_strtimestamp_local(sb.st_mtime, timebuf); + +- ScopeNewSpecial(ctx, "sys", "last_policy_update", timebuf, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "sys", "last_policy_update", timebuf, CFE_DATA_TYPE_STRING); + } + + static char *PolicyServerFilename(const char *workdir) +diff --git a/libpromises/cf3.defs.h b/libpromises/cf3.defs.h +index c04c2a1..db6c565 100644 +--- a/libpromises/cf3.defs.h ++++ b/libpromises/cf3.defs.h +@@ -428,10 +428,10 @@ typedef struct FnCall_ FnCall; + + typedef enum + { +- DATA_TYPE_STRING, ++ CFE_DATA_TYPE_STRING, + DATA_TYPE_INT, + DATA_TYPE_REAL, +- DATA_TYPE_STRING_LIST, ++ CFE_DATA_TYPE_STRING_LIST, + DATA_TYPE_INT_LIST, + DATA_TYPE_REAL_LIST, + DATA_TYPE_OPTION, +diff --git a/libpromises/conversion.c b/libpromises/conversion.c +index 4c4b7c6..81a8fe7 100644 +--- a/libpromises/conversion.c ++++ b/libpromises/conversion.c +@@ -274,10 +274,10 @@ FileComparator FileComparatorFromString(const char *s) + + static const char *datatype_strings[] = + { +- [DATA_TYPE_STRING] = "string", ++ [CFE_DATA_TYPE_STRING] = "string", + [DATA_TYPE_INT] = "int", + [DATA_TYPE_REAL] = "real", +- [DATA_TYPE_STRING_LIST] = "slist", ++ [CFE_DATA_TYPE_STRING_LIST] = "slist", + [DATA_TYPE_INT_LIST] = "ilist", + [DATA_TYPE_REAL_LIST] = "rlist", + [DATA_TYPE_OPTION] = "option", +diff --git a/libpromises/evalfunction.c b/libpromises/evalfunction.c +index e714fec..e18970a 100644 +--- a/libpromises/evalfunction.c ++++ b/libpromises/evalfunction.c +@@ -228,7 +228,7 @@ static FnCallResult FnCallAnd(EvalContext *ctx, FnCall *fp, Rlist *finalargs) + /* We need to check all the arguments, ArgTemplate does not check varadic functions */ + for (arg = finalargs; arg; arg = arg->next) + { +- SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, DATA_TYPE_STRING, "", 1); ++ SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, CFE_DATA_TYPE_STRING, "", 1); + if (err != SYNTAX_TYPE_MATCH_OK && err != SYNTAX_TYPE_MATCH_ERROR_UNEXPANDED) + { + FatalError(ctx, "in %s: %s", id, SyntaxTypeMatchToString(err)); +@@ -635,7 +635,7 @@ static FnCallResult FnCallConcat(EvalContext *ctx, FnCall *fp, Rlist *finalargs) + /* We need to check all the arguments, ArgTemplate does not check varadic functions */ + for (arg = finalargs; arg; arg = arg->next) + { +- SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, DATA_TYPE_STRING, "", 1); ++ SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, CFE_DATA_TYPE_STRING, "", 1); + if (err != SYNTAX_TYPE_MATCH_OK && err != SYNTAX_TYPE_MATCH_ERROR_UNEXPANDED) + { + FatalError(ctx, "in %s: %s", id, SyntaxTypeMatchToString(err)); +@@ -684,7 +684,7 @@ static FnCallResult FnCallIfElse(EvalContext *ctx, FnCall *fp, Rlist *finalargs) + /* We need to check all the arguments, ArgTemplate does not check varadic functions */ + for (arg = finalargs; arg; arg = arg->next) + { +- SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, DATA_TYPE_STRING, "", 1); ++ SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, CFE_DATA_TYPE_STRING, "", 1); + if (err != SYNTAX_TYPE_MATCH_OK && err != SYNTAX_TYPE_MATCH_ERROR_UNEXPANDED) + { + FatalError(ctx, "in %s: %s", id, SyntaxTypeMatchToString(err)); +@@ -1611,7 +1611,7 @@ static FnCallResult FnCallGetFields(EvalContext *ctx, FnCall *fp, Rlist *finalar + for (rp = newlist; rp != NULL; rp = rp->next) + { + snprintf(name, CF_MAXVARSIZE - 1, "%s[%d]", array_lval, vcount); +- EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(fp->caller)->name, name }, (Rval) { RlistScalarValue(rp), RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(fp->caller)->name, name }, (Rval) { RlistScalarValue(rp), RVAL_TYPE_SCALAR }, CFE_DATA_TYPE_STRING); + Log(LOG_LEVEL_VERBOSE, "getfields: defining '%s' => '%s'", name, RlistScalarValue(rp)); + vcount++; + } +@@ -1795,12 +1795,12 @@ static FnCallResult FnCallMapArray(EvalContext *ctx, FnCall *fp, Rlist *finalarg + + if (strlen(index) > 0) + { +- ScopeNewSpecial(ctx, "this", "k", index, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "this", "k", index, CFE_DATA_TYPE_STRING); + + switch (assoc->rval.type) + { + case RVAL_TYPE_SCALAR: +- ScopeNewSpecial(ctx, "this", "v", assoc->rval.item, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "this", "v", assoc->rval.item, CFE_DATA_TYPE_STRING); + ExpandScalar(ctx, PromiseGetBundle(fp->caller)->name, map, expbuf); + + if (strstr(expbuf, "$(this.k)") || strstr(expbuf, "${this.k}") || +@@ -1819,7 +1819,7 @@ static FnCallResult FnCallMapArray(EvalContext *ctx, FnCall *fp, Rlist *finalarg + case RVAL_TYPE_LIST: + for (rp = assoc->rval.item; rp != NULL; rp = rp->next) + { +- ScopeNewSpecial(ctx, "this", "v", rp->item, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "this", "v", rp->item, CFE_DATA_TYPE_STRING); + ExpandScalar(ctx, PromiseGetBundle(fp->caller)->name, map, expbuf); + + if (strstr(expbuf, "$(this.k)") || strstr(expbuf, "${this.k}") || +@@ -1903,7 +1903,7 @@ static FnCallResult FnCallMapList(EvalContext *ctx, FnCall *fp, Rlist *finalargs + return (FnCallResult) { FNCALL_FAILURE }; + } + +- if (retype != DATA_TYPE_STRING_LIST && retype != DATA_TYPE_INT_LIST && retype != DATA_TYPE_REAL_LIST) ++ if (retype != CFE_DATA_TYPE_STRING_LIST && retype != DATA_TYPE_INT_LIST && retype != DATA_TYPE_REAL_LIST) + { + return (FnCallResult) { FNCALL_FAILURE }; + } +@@ -1911,7 +1911,7 @@ static FnCallResult FnCallMapList(EvalContext *ctx, FnCall *fp, Rlist *finalargs + for (const Rlist *rp = RvalRlistValue(rval); rp != NULL; rp = rp->next) + { + const char *current_value = RlistScalarValue(rp); +- ScopeNewSpecial(ctx, "this", "this", current_value, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "this", "this", current_value, CFE_DATA_TYPE_STRING); + + ExpandScalar(ctx, "this", map, expbuf); + +@@ -2051,7 +2051,7 @@ static FnCallResult FnCallSelectServers(EvalContext *ctx, FnCall *fp, Rlist *fin + { + Log(LOG_LEVEL_VERBOSE, "Host '%s' is alive and responding correctly", RlistScalarValue(rp)); + snprintf(buffer, CF_MAXVARSIZE - 1, "%s[%d]", array_lval, count); +- EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(fp->caller)->name, buffer }, (Rval) { rp->item, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(fp->caller)->name, buffer }, (Rval) { rp->item, RVAL_TYPE_SCALAR }, CFE_DATA_TYPE_STRING); + count++; + } + } +@@ -2059,7 +2059,7 @@ static FnCallResult FnCallSelectServers(EvalContext *ctx, FnCall *fp, Rlist *fin + { + Log(LOG_LEVEL_VERBOSE, "Host '%s' is alive", RlistScalarValue(rp)); + snprintf(buffer, CF_MAXVARSIZE - 1, "%s[%d]", array_lval, count); +- EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(fp->caller)->name, buffer }, (Rval) { rp->item, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(fp->caller)->name, buffer }, (Rval) { rp->item, RVAL_TYPE_SCALAR }, CFE_DATA_TYPE_STRING); + + if (IsDefinedClass(ctx, CanonifyName(rp->item), PromiseGetNamespace(fp->caller))) + { +@@ -2099,7 +2099,7 @@ static FnCallResult FnCallShuffle(EvalContext *ctx, FnCall *fp, Rlist *finalargs + return (FnCallResult) { FNCALL_FAILURE }; + } + +- if (list_dtype != DATA_TYPE_STRING_LIST) ++ if (list_dtype != CFE_DATA_TYPE_STRING_LIST) + { + Log(LOG_LEVEL_ERR, "Function '%s' expected a variable that resolves to a string list, got '%s'", fp->name, DataTypeToString(list_dtype)); + return (FnCallResult) { FNCALL_FAILURE }; +@@ -2727,7 +2727,7 @@ static FnCallResult FnCallSort(EvalContext *ctx, FnCall *fp, Rlist *finalargs) + + VarRefDestroy(list_var_lval); + +- if (list_var_dtype != DATA_TYPE_STRING_LIST) ++ if (list_var_dtype != CFE_DATA_TYPE_STRING_LIST) + { + return (FnCallResult) { FNCALL_FAILURE }; + } +@@ -2748,7 +2748,7 @@ static FnCallResult FnCallFormat(EvalContext *ctx, FnCall *fp, Rlist *finalargs) + /* We need to check all the arguments, ArgTemplate does not check varadic functions */ + for (const Rlist *arg = finalargs; arg; arg = arg->next) + { +- SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, DATA_TYPE_STRING, "", 1); ++ SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, CFE_DATA_TYPE_STRING, "", 1); + if (err != SYNTAX_TYPE_MATCH_OK && err != SYNTAX_TYPE_MATCH_ERROR_UNEXPANDED) + { + FatalError(ctx, "in %s: %s", id, SyntaxTypeMatchToString(err)); +@@ -3549,7 +3549,7 @@ static FnCallResult FnCallRegExtract(EvalContext *ctx, FnCall *fp, Rlist *finala + else + { + snprintf(var, CF_MAXVARSIZE - 1, "%s[%s]", arrayname, assoc->lval); +- EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(fp->caller)->name, var }, assoc->rval, DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(fp->caller)->name, var }, assoc->rval, CFE_DATA_TYPE_STRING); + } + } + } +@@ -3766,7 +3766,7 @@ static FnCallResult FnCallReverse(EvalContext *ctx, FnCall *fp, Rlist *finalargs + return (FnCallResult) { FNCALL_FAILURE }; + } + +- if (list_dtype != DATA_TYPE_STRING_LIST) ++ if (list_dtype != CFE_DATA_TYPE_STRING_LIST) + { + Log(LOG_LEVEL_ERR, "Function '%s' expected a variable that resolves to a string list, got '%s'", fp->name, DataTypeToString(list_dtype)); + return (FnCallResult) { FNCALL_FAILURE }; +@@ -3836,7 +3836,7 @@ static FnCallResult FnCallOr(EvalContext *ctx, FnCall *fp, Rlist *finalargs) + /* We need to check all the arguments, ArgTemplate does not check varadic functions */ + for (arg = finalargs; arg; arg = arg->next) + { +- SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, DATA_TYPE_STRING, "", 1); ++ SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, CFE_DATA_TYPE_STRING, "", 1); + if (err != SYNTAX_TYPE_MATCH_OK && err != SYNTAX_TYPE_MATCH_ERROR_UNEXPANDED) + { + FatalError(ctx, "in %s: %s", id, SyntaxTypeMatchToString(err)); +@@ -4116,7 +4116,7 @@ static FnCallResult ReadList(EvalContext *ctx, FnCall *fp, Rlist *finalargs, Dat + + switch (type) + { +- case DATA_TYPE_STRING: ++ case CFE_DATA_TYPE_STRING: + break; + + case DATA_TYPE_INT: +@@ -4163,7 +4163,7 @@ static FnCallResult ReadList(EvalContext *ctx, FnCall *fp, Rlist *finalargs, Dat + + static FnCallResult FnCallReadStringList(EvalContext *ctx, FnCall *fp, Rlist *args) + { +- return ReadList(ctx, fp, args, DATA_TYPE_STRING); ++ return ReadList(ctx, fp, args, CFE_DATA_TYPE_STRING); + } + + static FnCallResult FnCallReadIntList(EvalContext *ctx, FnCall *fp, Rlist *args) +@@ -4228,7 +4228,7 @@ static FnCallResult ReadArray(EvalContext *ctx, FnCall *fp, Rlist *finalargs, Da + + switch (type) + { +- case DATA_TYPE_STRING: ++ case CFE_DATA_TYPE_STRING: + case DATA_TYPE_INT: + case DATA_TYPE_REAL: + break; +@@ -4249,14 +4249,14 @@ static FnCallResult ReadArray(EvalContext *ctx, FnCall *fp, Rlist *finalargs, Da + + static FnCallResult FnCallReadStringArray(EvalContext *ctx, FnCall *fp, Rlist *args) + { +- return ReadArray(ctx, fp, args, DATA_TYPE_STRING, false); ++ return ReadArray(ctx, fp, args, CFE_DATA_TYPE_STRING, false); + } + + /*********************************************************************/ + + static FnCallResult FnCallReadStringArrayIndex(EvalContext *ctx, FnCall *fp, Rlist *args) + { +- return ReadArray(ctx, fp, args, DATA_TYPE_STRING, true); ++ return ReadArray(ctx, fp, args, CFE_DATA_TYPE_STRING, true); + } + + /*********************************************************************/ +@@ -4327,7 +4327,7 @@ static FnCallResult ParseArray(EvalContext *ctx, FnCall *fp, Rlist *finalargs, D + + switch (type) + { +- case DATA_TYPE_STRING: ++ case CFE_DATA_TYPE_STRING: + case DATA_TYPE_INT: + case DATA_TYPE_REAL: + break; +@@ -4348,14 +4348,14 @@ static FnCallResult ParseArray(EvalContext *ctx, FnCall *fp, Rlist *finalargs, D + + static FnCallResult FnCallParseStringArray(EvalContext *ctx, FnCall *fp, Rlist *args) + { +- return ParseArray(ctx, fp, args, DATA_TYPE_STRING, false); ++ return ParseArray(ctx, fp, args, CFE_DATA_TYPE_STRING, false); + } + + /*********************************************************************/ + + static FnCallResult FnCallParseStringArrayIndex(EvalContext *ctx, FnCall *fp, Rlist *args) + { +- return ParseArray(ctx, fp, args, DATA_TYPE_STRING, true); ++ return ParseArray(ctx, fp, args, CFE_DATA_TYPE_STRING, true); + } + + /*********************************************************************/ +@@ -4854,7 +4854,7 @@ static int BuildLineArray(EvalContext *ctx, const Bundle *bundle, char *array_lv + + switch (type) + { +- case DATA_TYPE_STRING: ++ case CFE_DATA_TYPE_STRING: + strncpy(this_rval, rp->item, CF_MAXVARSIZE - 1); + break; + +@@ -5028,7 +5028,7 @@ void ModuleProtocol(EvalContext *ctx, char *command, char *line, int print, cons + if (CheckID(name)) + { + Log(LOG_LEVEL_VERBOSE, "Defined variable '%s' in context '%s' with value '%s'", name, context, content); +- EvalContextVariablePut(ctx, (VarRef) { NULL, context, name }, (Rval) { content, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, context, name }, (Rval) { content, RVAL_TYPE_SCALAR }, CFE_DATA_TYPE_STRING); + } + break; + +@@ -5043,7 +5043,7 @@ void ModuleProtocol(EvalContext *ctx, char *command, char *line, int print, cons + list = RlistParseString(content); + Log(LOG_LEVEL_VERBOSE, "Defined variable '%s' in context '%s' with value '%s'", name, context, content); + +- EvalContextVariablePut(ctx, (VarRef) { NULL, context, name }, (Rval) { list, RVAL_TYPE_LIST }, DATA_TYPE_STRING_LIST); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, context, name }, (Rval) { list, RVAL_TYPE_LIST }, CFE_DATA_TYPE_STRING_LIST); + } + break; + +@@ -5095,8 +5095,8 @@ FnCallResult CallFunction(EvalContext *ctx, const FnCallType *function, FnCall * + + FnCallArg ACCESSEDBEFORE_ARGS[] = + { +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Newer filename"}, +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Older filename"}, ++ {CF_ABSPATHRANGE, CFE_DATA_TYPE_STRING, "Newer filename"}, ++ {CF_ABSPATHRANGE, CFE_DATA_TYPE_STRING, "Older filename"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + +@@ -5140,26 +5140,26 @@ FnCallArg LATERTHAN_ARGS[] = + + FnCallArg CANONIFY_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "String containing non-identifier characters"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "String containing non-identifier characters"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg CHANGEDBEFORE_ARGS[] = + { +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Newer filename"}, +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Older filename"}, ++ {CF_ABSPATHRANGE, CFE_DATA_TYPE_STRING, "Newer filename"}, ++ {CF_ABSPATHRANGE, CFE_DATA_TYPE_STRING, "Older filename"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg CLASSIFY_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Input string"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Input string"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg CLASSMATCH_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Regular expression"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + +@@ -5170,38 +5170,38 @@ FnCallArg CONCAT_ARGS[] = + + FnCallArg COUNTCLASSESMATCHING_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Regular expression"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg COUNTLINESMATCHING_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Filename"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Regular expression"}, ++ {CF_ABSPATHRANGE, CFE_DATA_TYPE_STRING, "Filename"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg DIRNAME_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "File path"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "File path"}, + {NULL, DATA_TYPE_NONE, NULL}, + }; + + FnCallArg DISKFREE_ARGS[] = + { +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "File system directory"}, ++ {CF_ABSPATHRANGE, CFE_DATA_TYPE_STRING, "File system directory"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg ESCAPE_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "IP address or string to escape"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "IP address or string to escape"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg EXECRESULT_ARGS[] = + { +- {CF_PATHRANGE, DATA_TYPE_STRING, "Fully qualified command path"}, ++ {CF_PATHRANGE, CFE_DATA_TYPE_STRING, "Fully qualified command path"}, + {"useshell,noshell,powershell", DATA_TYPE_OPTION, "Shell encapsulation option"}, + {NULL, DATA_TYPE_NONE, NULL} + }; +@@ -5210,27 +5210,27 @@ FnCallArg EXECRESULT_ARGS[] = + + FnCallArg FILESTAT_ARGS[] = + { +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "File object name"}, ++ {CF_ABSPATHRANGE, CFE_DATA_TYPE_STRING, "File object name"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg FILESTAT_DETAIL_ARGS[] = + { +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "File object name"}, ++ {CF_ABSPATHRANGE, CFE_DATA_TYPE_STRING, "File object name"}, + {"size,gid,uid,ino,nlink,ctime,atime,mtime,mode,modeoct,permstr,permoct,type,devno,dev_minor,dev_major,basename,dirname", DATA_TYPE_OPTION, "stat() field to get"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg FILESEXIST_ARGS[] = + { +- {CF_NAKEDLRANGE, DATA_TYPE_STRING, "Array identifier containing list"}, ++ {CF_NAKEDLRANGE, CFE_DATA_TYPE_STRING, "Array identifier containing list"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg FILTER_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression or string"}, +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Regular expression or string"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "CFEngine list identifier"}, + {CF_BOOL, DATA_TYPE_OPTION, "Match as regular expression if true, as exact string otherwise"}, + {CF_BOOL, DATA_TYPE_OPTION, "Invert matches"}, + {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of matches to return"}, +@@ -5239,95 +5239,95 @@ FnCallArg FILTER_ARGS[] = + + FnCallArg GETFIELDS_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression to match line"}, +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Filename to read"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression to split fields"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Return array name"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Regular expression to match line"}, ++ {CF_ABSPATHRANGE, CFE_DATA_TYPE_STRING, "Filename to read"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Regular expression to split fields"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Return array name"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg GETINDICES_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine array identifier"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "CFEngine array identifier"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg GETUSERS_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Comma separated list of User names"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Comma separated list of UserID numbers"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Comma separated list of User names"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Comma separated list of UserID numbers"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg GETENV_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "Name of environment variable"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "Name of environment variable"}, + {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of characters to read "}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg GETGID_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Group name in text"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Group name in text"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg GETUID_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "User name in text"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "User name in text"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg GREP_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Regular expression"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "CFEngine list identifier"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg GROUPEXISTS_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Group name or identifier"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Group name or identifier"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg HASH_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Input text"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Input text"}, + {"md5,sha1,sha256,sha512,sha384,crypt", DATA_TYPE_OPTION, "Hash or digest algorithm"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg HASHMATCH_ARGS[] = + { +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Filename to hash"}, ++ {CF_ABSPATHRANGE, CFE_DATA_TYPE_STRING, "Filename to hash"}, + {"md5,sha1,crypt,cf_sha224,cf_sha256,cf_sha384,cf_sha512", DATA_TYPE_OPTION, "Hash or digest algorithm"}, +- {CF_IDRANGE, DATA_TYPE_STRING, "ASCII representation of hash for comparison"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "ASCII representation of hash for comparison"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg HOST2IP_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Host name in ascii"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Host name in ascii"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg IP2HOST_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "IP address (IPv4 or IPv6)"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "IP address (IPv4 or IPv6)"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg HOSTINNETGROUP_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Netgroup name"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Netgroup name"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg HOSTRANGE_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Hostname prefix"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Enumerated range"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Hostname prefix"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Enumerated range"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + +@@ -5341,7 +5341,7 @@ FnCallArg HOSTSSEEN_ARGS[] = + + FnCallArg HOSTSWITHCLASS_ARGS[] = + { +- {"[a-zA-Z0-9_]+", DATA_TYPE_STRING, "Class name to look for"}, ++ {"[a-zA-Z0-9_]+", CFE_DATA_TYPE_STRING, "Class name to look for"}, + {"name,address", DATA_TYPE_OPTION, "Type of return value desired"}, + {NULL, DATA_TYPE_NONE, NULL} + }; +@@ -5353,7 +5353,7 @@ FnCallArg IFELSE_ARGS[] = + + FnCallArg IPRANGE_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "IP address range syntax"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "IP address range syntax"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + +@@ -5366,51 +5366,51 @@ FnCallArg IRANGE_ARGS[] = + + FnCallArg ISGREATERTHAN_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Larger string or value"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Smaller string or value"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Larger string or value"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Smaller string or value"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg ISLESSTHAN_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Smaller string or value"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Larger string or value"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Smaller string or value"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Larger string or value"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg ISNEWERTHAN_ARGS[] = + { +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Newer file name"}, +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Older file name"}, ++ {CF_ABSPATHRANGE, CFE_DATA_TYPE_STRING, "Newer file name"}, ++ {CF_ABSPATHRANGE, CFE_DATA_TYPE_STRING, "Older file name"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg ISVARIABLE_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "Variable identifier"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "Variable identifier"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg JOIN_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Join glue-string"}, +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Join glue-string"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "CFEngine list identifier"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg LASTNODE_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Input string"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Link separator, e.g. /,:"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Input string"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Link separator, e.g. /,:"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg LDAPARRAY_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Array name"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "URI"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Distinguished name"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Filter"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Array name"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "URI"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Distinguished name"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Filter"}, + {"subtree,onelevel,base", DATA_TYPE_OPTION, "Search scope policy"}, + {"none,ssl,sasl", DATA_TYPE_OPTION, "Security level"}, + {NULL, DATA_TYPE_NONE, NULL} +@@ -5418,10 +5418,10 @@ FnCallArg LDAPARRAY_ARGS[] = + + FnCallArg LDAPLIST_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "URI"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Distinguished name"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Filter"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Record name"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "URI"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Distinguished name"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Filter"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Record name"}, + {"subtree,onelevel,base", DATA_TYPE_OPTION, "Search scope policy"}, + {"none,ssl,sasl", DATA_TYPE_OPTION, "Security level"}, + {NULL, DATA_TYPE_NONE, NULL} +@@ -5429,10 +5429,10 @@ FnCallArg LDAPLIST_ARGS[] = + + FnCallArg LDAPVALUE_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "URI"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Distinguished name"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Filter"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Record name"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "URI"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Distinguished name"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Filter"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Record name"}, + {"subtree,onelevel,base", DATA_TYPE_OPTION, "Search scope policy"}, + {"none,ssl,sasl", DATA_TYPE_OPTION, "Security level"}, + {NULL, DATA_TYPE_NONE, NULL} +@@ -5440,29 +5440,29 @@ FnCallArg LDAPVALUE_ARGS[] = + + FnCallArg LSDIRLIST_ARGS[] = + { +- {CF_PATHRANGE, DATA_TYPE_STRING, "Path to base directory"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression to match files or blank"}, ++ {CF_PATHRANGE, CFE_DATA_TYPE_STRING, "Path to base directory"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Regular expression to match files or blank"}, + {CF_BOOL, DATA_TYPE_OPTION, "Include the base path in the list"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg MAPLIST_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Pattern based on $(this) as original text"}, +- {CF_IDRANGE, DATA_TYPE_STRING, "The name of the list variable to map"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Pattern based on $(this) as original text"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "The name of the list variable to map"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg MAPARRAY_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Pattern based on $(this.k) and $(this.v) as original text"}, +- {CF_IDRANGE, DATA_TYPE_STRING, "The name of the array variable to map"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Pattern based on $(this.k) and $(this.v) as original text"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "The name of the array variable to map"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg NOT_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Class value"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Class value"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + +@@ -5478,13 +5478,13 @@ FnCallArg OR_ARGS[] = + + FnCallArg SUM_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "A list of arbitrary real values"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "A list of arbitrary real values"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg PRODUCT_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "A list of arbitrary real values"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "A list of arbitrary real values"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + +@@ -5501,24 +5501,24 @@ FnCallArg DATE_ARGS[] = + + FnCallArg PEERS_ARGS[] = + { +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "File name of host list"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Comment regex pattern"}, ++ {CF_ABSPATHRANGE, CFE_DATA_TYPE_STRING, "File name of host list"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Comment regex pattern"}, + {CF_VALRANGE, DATA_TYPE_INT, "Peer group size"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg PEERLEADER_ARGS[] = + { +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "File name of host list"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Comment regex pattern"}, ++ {CF_ABSPATHRANGE, CFE_DATA_TYPE_STRING, "File name of host list"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Comment regex pattern"}, + {CF_VALRANGE, DATA_TYPE_INT, "Peer group size"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg PEERLEADERS_ARGS[] = + { +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "File name of host list"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Comment regex pattern"}, ++ {CF_ABSPATHRANGE, CFE_DATA_TYPE_STRING, "File name of host list"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Comment regex pattern"}, + {CF_VALRANGE, DATA_TYPE_INT, "Peer group size"}, + {NULL, DATA_TYPE_NONE, NULL} + }; +@@ -5532,17 +5532,17 @@ FnCallArg RANDOMINT_ARGS[] = + + FnCallArg READFILE_ARGS[] = + { +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "File name"}, ++ {CF_ABSPATHRANGE, CFE_DATA_TYPE_STRING, "File name"}, + {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of bytes to read"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg READSTRINGARRAY_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "Array identifier to populate"}, +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "File name to read"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex matching comments"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex to split data"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "Array identifier to populate"}, ++ {CF_ABSPATHRANGE, CFE_DATA_TYPE_STRING, "File name to read"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Regex matching comments"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Regex to split data"}, + {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of entries to read"}, + {CF_VALRANGE, DATA_TYPE_INT, "Maximum bytes to read"}, + {NULL, DATA_TYPE_NONE, NULL} +@@ -5550,10 +5550,10 @@ FnCallArg READSTRINGARRAY_ARGS[] = + + FnCallArg PARSESTRINGARRAY_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "Array identifier to populate"}, +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "A string to parse for input data"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex matching comments"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex to split data"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "Array identifier to populate"}, ++ {CF_ABSPATHRANGE, CFE_DATA_TYPE_STRING, "A string to parse for input data"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Regex matching comments"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Regex to split data"}, + {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of entries to read"}, + {CF_VALRANGE, DATA_TYPE_INT, "Maximum bytes to read"}, + {NULL, DATA_TYPE_NONE, NULL} +@@ -5561,10 +5561,10 @@ FnCallArg PARSESTRINGARRAY_ARGS[] = + + FnCallArg READSTRINGARRAYIDX_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "Array identifier to populate"}, +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "A string to parse for input data"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex matching comments"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex to split data"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "Array identifier to populate"}, ++ {CF_ABSPATHRANGE, CFE_DATA_TYPE_STRING, "A string to parse for input data"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Regex matching comments"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Regex to split data"}, + {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of entries to read"}, + {CF_VALRANGE, DATA_TYPE_INT, "Maximum bytes to read"}, + {NULL, DATA_TYPE_NONE, NULL} +@@ -5572,10 +5572,10 @@ FnCallArg READSTRINGARRAYIDX_ARGS[] = + + FnCallArg PARSESTRINGARRAYIDX_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "Array identifier to populate"}, +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "A string to parse for input data"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex matching comments"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex to split data"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "Array identifier to populate"}, ++ {CF_ABSPATHRANGE, CFE_DATA_TYPE_STRING, "A string to parse for input data"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Regex matching comments"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Regex to split data"}, + {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of entries to read"}, + {CF_VALRANGE, DATA_TYPE_INT, "Maximum bytes to read"}, + {NULL, DATA_TYPE_NONE, NULL} +@@ -5583,9 +5583,9 @@ FnCallArg PARSESTRINGARRAYIDX_ARGS[] = + + FnCallArg READSTRINGLIST_ARGS[] = + { +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "File name to read"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex matching comments"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex to split data"}, ++ {CF_ABSPATHRANGE, CFE_DATA_TYPE_STRING, "File name to read"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Regex matching comments"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Regex to split data"}, + {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of entries to read"}, + {CF_VALRANGE, DATA_TYPE_INT, "Maximum bytes to read"}, + {NULL, DATA_TYPE_NONE, NULL} +@@ -5593,94 +5593,94 @@ FnCallArg READSTRINGLIST_ARGS[] = + + FnCallArg READTCP_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Host name or IP address of server socket"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Host name or IP address of server socket"}, + {CF_VALRANGE, DATA_TYPE_INT, "Port number"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Protocol query string"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Protocol query string"}, + {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of bytes to read"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg REGARRAY_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine array identifier"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "CFEngine array identifier"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Regular expression"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg REGCMP_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Match string"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Regular expression"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Match string"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg REGEXTRACT_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Match string"}, +- {CF_IDRANGE, DATA_TYPE_STRING, "Identifier for back-references"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Regular expression"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Match string"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "Identifier for back-references"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg REGISTRYVALUE_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Windows registry key"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Windows registry value-id"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Windows registry key"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Windows registry value-id"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg REGLINE_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Filename to search"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Regular expression"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Filename to search"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg REGLIST_ARGS[] = + { +- {CF_NAKEDLRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, ++ {CF_NAKEDLRANGE, CFE_DATA_TYPE_STRING, "CFEngine list identifier"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Regular expression"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg REGLDAP_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "URI"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Distinguished name"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Filter"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Record name"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "URI"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Distinguished name"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Filter"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Record name"}, + {"subtree,onelevel,base", DATA_TYPE_OPTION, "Search scope policy"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex to match results"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Regex to match results"}, + {"none,ssl,sasl", DATA_TYPE_OPTION, "Security level"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg REMOTESCALAR_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "Variable identifier"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Hostname or IP address of server"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "Variable identifier"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Hostname or IP address of server"}, + {CF_BOOL, DATA_TYPE_OPTION, "Use enryption"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg HUB_KNOWLEDGE_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "Variable identifier"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "Variable identifier"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg REMOTECLASSESMATCHING_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Server name or address"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Regular expression"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Server name or address"}, + {CF_BOOL, DATA_TYPE_OPTION, "Use encryption"}, +- {CF_IDRANGE, DATA_TYPE_STRING, "Return class prefix"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "Return class prefix"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg RETURNSZERO_ARGS[] = + { +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Fully qualified command path"}, ++ {CF_ABSPATHRANGE, CFE_DATA_TYPE_STRING, "Fully qualified command path"}, + {"useshell,noshell,powershell", DATA_TYPE_OPTION, "Shell encapsulation option"}, + {NULL, DATA_TYPE_NONE, NULL} + }; +@@ -5694,48 +5694,48 @@ FnCallArg RRANGE_ARGS[] = + + FnCallArg SELECTSERVERS_ARGS[] = + { +- {CF_NAKEDLRANGE, DATA_TYPE_STRING, "The identifier of a cfengine list of hosts or addresses to contact"}, ++ {CF_NAKEDLRANGE, CFE_DATA_TYPE_STRING, "The identifier of a cfengine list of hosts or addresses to contact"}, + {CF_VALRANGE, DATA_TYPE_INT, "The port number"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "A query string"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "A regular expression to match success"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "A query string"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "A regular expression to match success"}, + {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of bytes to read from server"}, +- {CF_IDRANGE, DATA_TYPE_STRING, "Name for array of results"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "Name for array of results"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg SPLAYCLASS_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Input string for classification"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Input string for classification"}, + {"daily,hourly", DATA_TYPE_OPTION, "Splay time policy"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg SPLITSTRING_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "A data string"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex to split on"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "A data string"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Regex to split on"}, + {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of pieces"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg STRCMP_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "String"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "String"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "String"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "String"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg STRFTIME_ARGS[] = + { + {"gmtime,localtime", DATA_TYPE_OPTION, "Use GMT or local time"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "A format string"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "A format string"}, + {CF_VALRANGE, DATA_TYPE_INT, "The time as a Unix epoch offset"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg SUBLIST_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "CFEngine list identifier"}, + {"head,tail", DATA_TYPE_OPTION, "Whether to return elements from the head or from the tail of the list"}, + {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of elements to return"}, + {NULL, DATA_TYPE_NONE, NULL} +@@ -5743,79 +5743,79 @@ FnCallArg SUBLIST_ARGS[] = + + FnCallArg TRANSLATEPATH_ARGS[] = + { +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Unix style path"}, ++ {CF_ABSPATHRANGE, CFE_DATA_TYPE_STRING, "Unix style path"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg USEMODULE_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Name of module command"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Argument string for the module"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Name of module command"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Argument string for the module"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg UNIQUE_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "CFEngine list identifier"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg NTH_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "CFEngine list identifier"}, + {CF_VALRANGE, DATA_TYPE_INT, "Offset of element to return"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg EVERY_SOME_NONE_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression or string"}, +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Regular expression or string"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "CFEngine list identifier"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg USEREXISTS_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "User name or identifier"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "User name or identifier"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg SORT_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, +- {"lex", DATA_TYPE_STRING, "Sorting method: lex"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "CFEngine list identifier"}, ++ {"lex", CFE_DATA_TYPE_STRING, "Sorting method: lex"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg REVERSE_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "CFEngine list identifier"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg SHUFFLE_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Any seed string"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "CFEngine list identifier"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "Any seed string"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg LENGTH_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "CFEngine list identifier"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg SETOP_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine base list identifier"}, +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine filter list identifier"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "CFEngine base list identifier"}, ++ {CF_IDRANGE, CFE_DATA_TYPE_STRING, "CFEngine filter list identifier"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + + FnCallArg FORMAT_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "CFEngine format string"}, ++ {CF_ANYSTRING, CFE_DATA_TYPE_STRING, "CFEngine format string"}, + {NULL, DATA_TYPE_NONE, NULL} + }; + +@@ -5830,47 +5830,47 @@ const FnCallType CF_FNCALL_TYPES[] = + FnCallTypeNew("accessedbefore", DATA_TYPE_CONTEXT, ACCESSEDBEFORE_ARGS, &FnCallIsAccessedBefore, "True if arg1 was accessed before arg2 (atime)", false, FNCALL_CATEGORY_FILES, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("accumulated", DATA_TYPE_INT, ACCUM_ARGS, &FnCallAccumulatedDate, "Convert an accumulated amount of time into a system representation", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("ago", DATA_TYPE_INT, AGO_ARGS, &FnCallAgoDate, "Convert a time relative to now to an integer system representation", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("and", DATA_TYPE_STRING, AND_ARGS, &FnCallAnd, "Calculate whether all arguments evaluate to true", true, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("canonify", DATA_TYPE_STRING, CANONIFY_ARGS, &FnCallCanonify, "Convert an abitrary string into a legal class name", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("concat", DATA_TYPE_STRING, CONCAT_ARGS, &FnCallConcat, "Concatenate all arguments into string", true, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("and", CFE_DATA_TYPE_STRING, AND_ARGS, &FnCallAnd, "Calculate whether all arguments evaluate to true", true, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("canonify", CFE_DATA_TYPE_STRING, CANONIFY_ARGS, &FnCallCanonify, "Convert an abitrary string into a legal class name", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("concat", CFE_DATA_TYPE_STRING, CONCAT_ARGS, &FnCallConcat, "Concatenate all arguments into string", true, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("changedbefore", DATA_TYPE_CONTEXT, CHANGEDBEFORE_ARGS, &FnCallIsChangedBefore, "True if arg1 was changed before arg2 (ctime)", false, FNCALL_CATEGORY_FILES, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("classify", DATA_TYPE_CONTEXT, CLASSIFY_ARGS, &FnCallClassify, "True if the canonicalization of the argument is a currently defined class", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("classmatch", DATA_TYPE_CONTEXT, CLASSMATCH_ARGS, &FnCallClassMatch, "True if the regular expression matches any currently defined class", false, FNCALL_CATEGORY_UTILS, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("classesmatching", DATA_TYPE_STRING_LIST, CLASSMATCH_ARGS, &FnCallClassesMatching, "List the defined classes matching regex arg1", false, FNCALL_CATEGORY_UTILS, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("classesmatching", CFE_DATA_TYPE_STRING_LIST, CLASSMATCH_ARGS, &FnCallClassesMatching, "List the defined classes matching regex arg1", false, FNCALL_CATEGORY_UTILS, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("countclassesmatching", DATA_TYPE_INT, COUNTCLASSESMATCHING_ARGS, &FnCallCountClassesMatching, "Count the number of defined classes matching regex arg1", false, FNCALL_CATEGORY_UTILS, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("countlinesmatching", DATA_TYPE_INT, COUNTLINESMATCHING_ARGS, &FnCallCountLinesMatching, "Count the number of lines matching regex arg1 in file arg2", false, FNCALL_CATEGORY_IO, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("difference", DATA_TYPE_STRING_LIST, SETOP_ARGS, &FnCallSetop, "Returns all the unique elements of list arg1 that are not in list arg2", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("dirname", DATA_TYPE_STRING, DIRNAME_ARGS, &FnCallDirname, "Return the parent directory name for given path", false, FNCALL_CATEGORY_FILES, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("difference", CFE_DATA_TYPE_STRING_LIST, SETOP_ARGS, &FnCallSetop, "Returns all the unique elements of list arg1 that are not in list arg2", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("dirname", CFE_DATA_TYPE_STRING, DIRNAME_ARGS, &FnCallDirname, "Return the parent directory name for given path", false, FNCALL_CATEGORY_FILES, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("diskfree", DATA_TYPE_INT, DISKFREE_ARGS, &FnCallDiskFree, "Return the free space (in KB) available on the directory's current partition (0 if not found)", false, FNCALL_CATEGORY_FILES, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("escape", DATA_TYPE_STRING, ESCAPE_ARGS, &FnCallEscape, "Escape regular expression characters in a string", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("escape", CFE_DATA_TYPE_STRING, ESCAPE_ARGS, &FnCallEscape, "Escape regular expression characters in a string", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("every", DATA_TYPE_CONTEXT, EVERY_SOME_NONE_ARGS, &FnCallEverySomeNone, "True if every element in the named list matches the given regular expression", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("execresult", DATA_TYPE_STRING, EXECRESULT_ARGS, &FnCallExecResult, "Execute named command and assign output to variable", false, FNCALL_CATEGORY_UTILS, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("execresult", CFE_DATA_TYPE_STRING, EXECRESULT_ARGS, &FnCallExecResult, "Execute named command and assign output to variable", false, FNCALL_CATEGORY_UTILS, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("fileexists", DATA_TYPE_CONTEXT, FILESTAT_ARGS, &FnCallFileStat, "True if the named file can be accessed", false, FNCALL_CATEGORY_FILES, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("filesexist", DATA_TYPE_CONTEXT, FILESEXIST_ARGS, &FnCallFileSexist, "True if the named list of files can ALL be accessed", false, FNCALL_CATEGORY_FILES, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("filesize", DATA_TYPE_INT, FILESTAT_ARGS, &FnCallFileStat, "Returns the size in bytes of the file", false, FNCALL_CATEGORY_FILES, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("filestat", DATA_TYPE_STRING, FILESTAT_DETAIL_ARGS, &FnCallFileStatDetails, "Returns stat() details of the file", false, FNCALL_CATEGORY_FILES, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("filter", DATA_TYPE_STRING_LIST, FILTER_ARGS, &FnCallFilter, "Similarly to grep(), filter the list arg2 for matches to arg2. The matching can be as a regular expression or exactly depending on arg3. The matching can be inverted with arg4. A maximum on the number of matches returned can be set with arg5.", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("format", DATA_TYPE_STRING, FORMAT_ARGS, &FnCallFormat, "Applies a list of string values in arg2,arg3... to a string format in arg1 with sprintf() rules", true, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("getenv", DATA_TYPE_STRING, GETENV_ARGS, &FnCallGetEnv, "Return the environment variable named arg1, truncated at arg2 characters", false, FNCALL_CATEGORY_SYSTEM, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("filestat", CFE_DATA_TYPE_STRING, FILESTAT_DETAIL_ARGS, &FnCallFileStatDetails, "Returns stat() details of the file", false, FNCALL_CATEGORY_FILES, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("filter", CFE_DATA_TYPE_STRING_LIST, FILTER_ARGS, &FnCallFilter, "Similarly to grep(), filter the list arg2 for matches to arg2. The matching can be as a regular expression or exactly depending on arg3. The matching can be inverted with arg4. A maximum on the number of matches returned can be set with arg5.", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("format", CFE_DATA_TYPE_STRING, FORMAT_ARGS, &FnCallFormat, "Applies a list of string values in arg2,arg3... to a string format in arg1 with sprintf() rules", true, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("getenv", CFE_DATA_TYPE_STRING, GETENV_ARGS, &FnCallGetEnv, "Return the environment variable named arg1, truncated at arg2 characters", false, FNCALL_CATEGORY_SYSTEM, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("getfields", DATA_TYPE_INT, GETFIELDS_ARGS, &FnCallGetFields, "Get an array of fields in the lines matching regex arg1 in file arg2, split on regex arg3 as array name arg4", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("getgid", DATA_TYPE_INT, GETGID_ARGS, &FnCallGetGid, "Return the integer group id of the named group on this host", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("getindices", DATA_TYPE_STRING_LIST, GETINDICES_ARGS, &FnCallGetIndices, "Get a list of keys to the array whose id is the argument and assign to variable", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("getindices", CFE_DATA_TYPE_STRING_LIST, GETINDICES_ARGS, &FnCallGetIndices, "Get a list of keys to the array whose id is the argument and assign to variable", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("getuid", DATA_TYPE_INT, GETUID_ARGS, &FnCallGetUid, "Return the integer user id of the named user on this host", false, FNCALL_CATEGORY_SYSTEM, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("getusers", DATA_TYPE_STRING_LIST, GETUSERS_ARGS, &FnCallGetUsers, "Get a list of all system users defined, minus those names defined in arg1 and uids in arg2", false, FNCALL_CATEGORY_SYSTEM, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("getvalues", DATA_TYPE_STRING_LIST, GETINDICES_ARGS, &FnCallGetValues, "Get a list of values corresponding to the right hand sides in an array whose id is the argument and assign to variable", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("grep", DATA_TYPE_STRING_LIST, GREP_ARGS, &FnCallGrep, "Extract the sub-list if items matching the regular expression in arg1 of the list named in arg2", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("getusers", CFE_DATA_TYPE_STRING_LIST, GETUSERS_ARGS, &FnCallGetUsers, "Get a list of all system users defined, minus those names defined in arg1 and uids in arg2", false, FNCALL_CATEGORY_SYSTEM, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("getvalues", CFE_DATA_TYPE_STRING_LIST, GETINDICES_ARGS, &FnCallGetValues, "Get a list of values corresponding to the right hand sides in an array whose id is the argument and assign to variable", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("grep", CFE_DATA_TYPE_STRING_LIST, GREP_ARGS, &FnCallGrep, "Extract the sub-list if items matching the regular expression in arg1 of the list named in arg2", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("groupexists", DATA_TYPE_CONTEXT, GROUPEXISTS_ARGS, &FnCallGroupExists, "True if group or numerical id exists on this host", false, FNCALL_CATEGORY_SYSTEM, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("hash", DATA_TYPE_STRING, HASH_ARGS, &FnCallHash, "Return the hash of arg1, type arg2 and assign to a variable", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("hash", CFE_DATA_TYPE_STRING, HASH_ARGS, &FnCallHash, "Return the hash of arg1, type arg2 and assign to a variable", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("hashmatch", DATA_TYPE_CONTEXT, HASHMATCH_ARGS, &FnCallHashMatch, "Compute the hash of arg1, of type arg2 and test if it matches the value in arg3", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("host2ip", DATA_TYPE_STRING, HOST2IP_ARGS, &FnCallHost2IP, "Returns the primary name-service IP address for the named host", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("ip2host", DATA_TYPE_STRING, IP2HOST_ARGS, &FnCallIP2Host, "Returns the primary name-service host name for the IP address", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("host2ip", CFE_DATA_TYPE_STRING, HOST2IP_ARGS, &FnCallHost2IP, "Returns the primary name-service IP address for the named host", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("ip2host", CFE_DATA_TYPE_STRING, IP2HOST_ARGS, &FnCallIP2Host, "Returns the primary name-service host name for the IP address", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("hostinnetgroup", DATA_TYPE_CONTEXT, HOSTINNETGROUP_ARGS, &FnCallHostInNetgroup, "True if the current host is in the named netgroup", false, FNCALL_CATEGORY_SYSTEM, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("hostrange", DATA_TYPE_CONTEXT, HOSTRANGE_ARGS, &FnCallHostRange, "True if the current host lies in the range of enumerated hostnames specified", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("hostsseen", DATA_TYPE_STRING_LIST, HOSTSSEEN_ARGS, &FnCallHostsSeen, "Extract the list of hosts last seen/not seen within the last arg1 hours", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("hostswithclass", DATA_TYPE_STRING_LIST, HOSTSWITHCLASS_ARGS, &FnCallHostsWithClass, "Extract the list of hosts with the given class set from the hub database (enterprise extension)", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("hubknowledge", DATA_TYPE_STRING, HUB_KNOWLEDGE_ARGS, &FnCallHubKnowledge, "Read global knowledge from the hub host by id (enterprise extension)", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("ifelse", DATA_TYPE_STRING, IFELSE_ARGS, &FnCallIfElse, "Do If-ElseIf-ElseIf-...-Else evaluation of arguments", true, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("intersection", DATA_TYPE_STRING_LIST, SETOP_ARGS, &FnCallSetop, "Returns all the unique elements of list arg1 that are also in list arg2", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("hostsseen", CFE_DATA_TYPE_STRING_LIST, HOSTSSEEN_ARGS, &FnCallHostsSeen, "Extract the list of hosts last seen/not seen within the last arg1 hours", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("hostswithclass", CFE_DATA_TYPE_STRING_LIST, HOSTSWITHCLASS_ARGS, &FnCallHostsWithClass, "Extract the list of hosts with the given class set from the hub database (enterprise extension)", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("hubknowledge", CFE_DATA_TYPE_STRING, HUB_KNOWLEDGE_ARGS, &FnCallHubKnowledge, "Read global knowledge from the hub host by id (enterprise extension)", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("ifelse", CFE_DATA_TYPE_STRING, IFELSE_ARGS, &FnCallIfElse, "Do If-ElseIf-ElseIf-...-Else evaluation of arguments", true, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("intersection", CFE_DATA_TYPE_STRING_LIST, SETOP_ARGS, &FnCallSetop, "Returns all the unique elements of list arg1 that are also in list arg2", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("iprange", DATA_TYPE_CONTEXT, IPRANGE_ARGS, &FnCallIPRange, "True if the current host lies in the range of IP addresses specified", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("irange", DATA_TYPE_INT_RANGE, IRANGE_ARGS, &FnCallIRange, "Define a range of integer values for cfengine internal use", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("isdir", DATA_TYPE_CONTEXT, FILESTAT_ARGS, &FnCallFileStat, "True if the named object is a directory", false, FNCALL_CATEGORY_FILES, SYNTAX_STATUS_NORMAL), +@@ -5881,64 +5881,64 @@ const FnCallType CF_FNCALL_TYPES[] = + FnCallTypeNew("isnewerthan", DATA_TYPE_CONTEXT, ISNEWERTHAN_ARGS, &FnCallIsNewerThan, "True if arg1 is newer (modified later) than arg2 (mtime)", false, FNCALL_CATEGORY_FILES, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("isplain", DATA_TYPE_CONTEXT, FILESTAT_ARGS, &FnCallFileStat, "True if the named object is a plain/regular file", false, FNCALL_CATEGORY_FILES, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("isvariable", DATA_TYPE_CONTEXT, ISVARIABLE_ARGS, &FnCallIsVariable, "True if the named variable is defined", false, FNCALL_CATEGORY_UTILS, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("join", DATA_TYPE_STRING, JOIN_ARGS, &FnCallJoin, "Join the items of arg2 into a string, using the conjunction in arg1", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("lastnode", DATA_TYPE_STRING, LASTNODE_ARGS, &FnCallLastNode, "Extract the last of a separated string, e.g. filename from a path", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("join", CFE_DATA_TYPE_STRING, JOIN_ARGS, &FnCallJoin, "Join the items of arg2 into a string, using the conjunction in arg1", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("lastnode", CFE_DATA_TYPE_STRING, LASTNODE_ARGS, &FnCallLastNode, "Extract the last of a separated string, e.g. filename from a path", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("laterthan", DATA_TYPE_CONTEXT, LATERTHAN_ARGS, &FnCallLaterThan, "True if the current time is later than the given date", false, FNCALL_CATEGORY_FILES, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("ldaparray", DATA_TYPE_CONTEXT, LDAPARRAY_ARGS, &FnCallLDAPArray, "Extract all values from an ldap record", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("ldaplist", DATA_TYPE_STRING_LIST, LDAPLIST_ARGS, &FnCallLDAPList, "Extract all named values from multiple ldap records", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("ldapvalue", DATA_TYPE_STRING, LDAPVALUE_ARGS, &FnCallLDAPValue, "Extract the first matching named value from ldap", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("ldaplist", CFE_DATA_TYPE_STRING_LIST, LDAPLIST_ARGS, &FnCallLDAPList, "Extract all named values from multiple ldap records", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("ldapvalue", CFE_DATA_TYPE_STRING, LDAPVALUE_ARGS, &FnCallLDAPValue, "Extract the first matching named value from ldap", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("length", DATA_TYPE_INT, LENGTH_ARGS, &FnCallLength, "Return the length of a list", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("lsdir", DATA_TYPE_STRING_LIST, LSDIRLIST_ARGS, &FnCallLsDir, "Return a list of files in a directory matching a regular expression", false, FNCALL_CATEGORY_FILES, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("maparray", DATA_TYPE_STRING_LIST, MAPARRAY_ARGS, &FnCallMapArray, "Return a list with each element modified by a pattern based $(this.k) and $(this.v)", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("maplist", DATA_TYPE_STRING_LIST, MAPLIST_ARGS, &FnCallMapList, "Return a list with each element modified by a pattern based $(this)", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("lsdir", CFE_DATA_TYPE_STRING_LIST, LSDIRLIST_ARGS, &FnCallLsDir, "Return a list of files in a directory matching a regular expression", false, FNCALL_CATEGORY_FILES, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("maparray", CFE_DATA_TYPE_STRING_LIST, MAPARRAY_ARGS, &FnCallMapArray, "Return a list with each element modified by a pattern based $(this.k) and $(this.v)", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("maplist", CFE_DATA_TYPE_STRING_LIST, MAPLIST_ARGS, &FnCallMapList, "Return a list with each element modified by a pattern based $(this)", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("none", DATA_TYPE_CONTEXT, EVERY_SOME_NONE_ARGS, &FnCallEverySomeNone, "True if no element in the named list matches the given regular expression", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("not", DATA_TYPE_STRING, NOT_ARGS, &FnCallNot, "Calculate whether argument is false", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("not", CFE_DATA_TYPE_STRING, NOT_ARGS, &FnCallNot, "Calculate whether argument is false", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("now", DATA_TYPE_INT, NOW_ARGS, &FnCallNow, "Convert the current time into system representation", false, FNCALL_CATEGORY_SYSTEM, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("nth", DATA_TYPE_STRING, NTH_ARGS, &FnCallNth, "Get the element at arg2 in list arg1", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("nth", CFE_DATA_TYPE_STRING, NTH_ARGS, &FnCallNth, "Get the element at arg2 in list arg1", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("on", DATA_TYPE_INT, DATE_ARGS, &FnCallOn, "Convert an exact date/time to an integer system representation", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("or", DATA_TYPE_STRING, OR_ARGS, &FnCallOr, "Calculate whether any argument evaluates to true", true, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("or", CFE_DATA_TYPE_STRING, OR_ARGS, &FnCallOr, "Calculate whether any argument evaluates to true", true, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("parseintarray", DATA_TYPE_INT, PARSESTRINGARRAY_ARGS, &FnCallParseIntArray, "Read an array of integers from a file and assign the dimension to a variable", false, FNCALL_CATEGORY_IO, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("parserealarray", DATA_TYPE_INT, PARSESTRINGARRAY_ARGS, &FnCallParseRealArray, "Read an array of real numbers from a file and assign the dimension to a variable", false, FNCALL_CATEGORY_IO, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("parsestringarray", DATA_TYPE_INT, PARSESTRINGARRAY_ARGS, &FnCallParseStringArray, "Read an array of strings from a file and assign the dimension to a variable", false, FNCALL_CATEGORY_IO, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("parsestringarrayidx", DATA_TYPE_INT, PARSESTRINGARRAYIDX_ARGS, &FnCallParseStringArrayIndex, "Read an array of strings from a file and assign the dimension to a variable with integer indeces", false, FNCALL_CATEGORY_IO, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("peers", DATA_TYPE_STRING_LIST, PEERS_ARGS, &FnCallPeers, "Get a list of peers (not including ourself) from the partition to which we belong", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("peerleader", DATA_TYPE_STRING, PEERLEADER_ARGS, &FnCallPeerLeader, "Get the assigned peer-leader of the partition to which we belong", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("peerleaders", DATA_TYPE_STRING_LIST, PEERLEADERS_ARGS, &FnCallPeerLeaders, "Get a list of peer leaders from the named partitioning", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("peers", CFE_DATA_TYPE_STRING_LIST, PEERS_ARGS, &FnCallPeers, "Get a list of peers (not including ourself) from the partition to which we belong", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("peerleader", CFE_DATA_TYPE_STRING, PEERLEADER_ARGS, &FnCallPeerLeader, "Get the assigned peer-leader of the partition to which we belong", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("peerleaders", CFE_DATA_TYPE_STRING_LIST, PEERLEADERS_ARGS, &FnCallPeerLeaders, "Get a list of peer leaders from the named partitioning", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("product", DATA_TYPE_REAL, PRODUCT_ARGS, &FnCallProduct, "Return the product of a list of reals", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("randomint", DATA_TYPE_INT, RANDOMINT_ARGS, &FnCallRandomInt, "Generate a random integer between the given limits", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("readfile", DATA_TYPE_STRING, READFILE_ARGS, &FnCallReadFile, "Read max number of bytes from named file and assign to variable", false, FNCALL_CATEGORY_IO, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("readfile", CFE_DATA_TYPE_STRING, READFILE_ARGS, &FnCallReadFile, "Read max number of bytes from named file and assign to variable", false, FNCALL_CATEGORY_IO, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("readintarray", DATA_TYPE_INT, READSTRINGARRAY_ARGS, &FnCallReadIntArray, "Read an array of integers from a file and assign the dimension to a variable", false, FNCALL_CATEGORY_IO, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("readintlist", DATA_TYPE_INT_LIST, READSTRINGLIST_ARGS, &FnCallReadIntList, "Read and assign a list variable from a file of separated ints", false, FNCALL_CATEGORY_IO, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("readrealarray", DATA_TYPE_INT, READSTRINGARRAY_ARGS, &FnCallReadRealArray, "Read an array of real numbers from a file and assign the dimension to a variable", false, FNCALL_CATEGORY_IO, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("readreallist", DATA_TYPE_REAL_LIST, READSTRINGLIST_ARGS, &FnCallReadRealList, "Read and assign a list variable from a file of separated real numbers", false, FNCALL_CATEGORY_IO, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("readstringarray", DATA_TYPE_INT, READSTRINGARRAY_ARGS, &FnCallReadStringArray, "Read an array of strings from a file and assign the dimension to a variable", false, FNCALL_CATEGORY_IO, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("readstringarrayidx", DATA_TYPE_INT, READSTRINGARRAYIDX_ARGS, &FnCallReadStringArrayIndex, "Read an array of strings from a file and assign the dimension to a variable with integer indeces", false, FNCALL_CATEGORY_IO, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("readstringlist", DATA_TYPE_STRING_LIST, READSTRINGLIST_ARGS, &FnCallReadStringList, "Read and assign a list variable from a file of separated strings", false, FNCALL_CATEGORY_IO, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("readtcp", DATA_TYPE_STRING, READTCP_ARGS, &FnCallReadTcp, "Connect to tcp port, send string and assign result to variable", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("readstringlist", CFE_DATA_TYPE_STRING_LIST, READSTRINGLIST_ARGS, &FnCallReadStringList, "Read and assign a list variable from a file of separated strings", false, FNCALL_CATEGORY_IO, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("readtcp", CFE_DATA_TYPE_STRING, READTCP_ARGS, &FnCallReadTcp, "Connect to tcp port, send string and assign result to variable", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("regarray", DATA_TYPE_CONTEXT, REGARRAY_ARGS, &FnCallRegArray, "True if arg1 matches any item in the associative array with id=arg2", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("regcmp", DATA_TYPE_CONTEXT, REGCMP_ARGS, &FnCallRegCmp, "True if arg1 is a regular expression matching that matches string arg2", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("regextract", DATA_TYPE_CONTEXT, REGEXTRACT_ARGS, &FnCallRegExtract, "True if the regular expression in arg 1 matches the string in arg2 and sets a non-empty array of backreferences named arg3", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("registryvalue", DATA_TYPE_STRING, REGISTRYVALUE_ARGS, &FnCallRegistryValue, "Returns a value for an MS-Win registry key,value pair", false, FNCALL_CATEGORY_SYSTEM, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("registryvalue", CFE_DATA_TYPE_STRING, REGISTRYVALUE_ARGS, &FnCallRegistryValue, "Returns a value for an MS-Win registry key,value pair", false, FNCALL_CATEGORY_SYSTEM, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("regline", DATA_TYPE_CONTEXT, REGLINE_ARGS, &FnCallRegLine, "True if the regular expression in arg1 matches a line in file arg2", false, FNCALL_CATEGORY_IO, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("reglist", DATA_TYPE_CONTEXT, REGLIST_ARGS, &FnCallRegList, "True if the regular expression in arg2 matches any item in the list whose id is arg1", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("regldap", DATA_TYPE_CONTEXT, REGLDAP_ARGS, &FnCallRegLDAP, "True if the regular expression in arg6 matches a value item in an ldap search", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("remotescalar", DATA_TYPE_STRING, REMOTESCALAR_ARGS, &FnCallRemoteScalar, "Read a scalar value from a remote cfengine server", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("remotescalar", CFE_DATA_TYPE_STRING, REMOTESCALAR_ARGS, &FnCallRemoteScalar, "Read a scalar value from a remote cfengine server", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("remoteclassesmatching", DATA_TYPE_CONTEXT, REMOTECLASSESMATCHING_ARGS, &FnCallRemoteClassesMatching, "Read persistent classes matching a regular expression from a remote cfengine server and add them into local context with prefix", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("returnszero", DATA_TYPE_CONTEXT, RETURNSZERO_ARGS, &FnCallReturnsZero, "True if named shell command has exit status zero", false, FNCALL_CATEGORY_UTILS, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("rrange", DATA_TYPE_REAL_RANGE, RRANGE_ARGS, &FnCallRRange, "Define a range of real numbers for cfengine internal use", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("reverse", DATA_TYPE_STRING_LIST, REVERSE_ARGS, &FnCallReverse, "Reverse a string list", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("reverse", CFE_DATA_TYPE_STRING_LIST, REVERSE_ARGS, &FnCallReverse, "Reverse a string list", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("selectservers", DATA_TYPE_INT, SELECTSERVERS_ARGS, &FnCallSelectServers, "Select tcp servers which respond correctly to a query and return their number, set array of names", false, FNCALL_CATEGORY_COMM, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("shuffle", DATA_TYPE_STRING_LIST, SHUFFLE_ARGS, &FnCallShuffle, "Shuffle a string list", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("shuffle", CFE_DATA_TYPE_STRING_LIST, SHUFFLE_ARGS, &FnCallShuffle, "Shuffle a string list", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("some", DATA_TYPE_CONTEXT, EVERY_SOME_NONE_ARGS, &FnCallEverySomeNone, "True if an element in the named list matches the given regular expression", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("sort", DATA_TYPE_STRING_LIST, SORT_ARGS, &FnCallSort, "Sort a string list", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("sort", CFE_DATA_TYPE_STRING_LIST, SORT_ARGS, &FnCallSort, "Sort a string list", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("splayclass", DATA_TYPE_CONTEXT, SPLAYCLASS_ARGS, &FnCallSplayClass, "True if the first argument's time-slot has arrived, according to a policy in arg2", false, FNCALL_CATEGORY_UTILS, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("splitstring", DATA_TYPE_STRING_LIST, SPLITSTRING_ARGS, &FnCallSplitString, "Convert a string in arg1 into a list of max arg3 strings by splitting on a regular expression in arg2", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("splitstring", CFE_DATA_TYPE_STRING_LIST, SPLITSTRING_ARGS, &FnCallSplitString, "Convert a string in arg1 into a list of max arg3 strings by splitting on a regular expression in arg2", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("strcmp", DATA_TYPE_CONTEXT, STRCMP_ARGS, &FnCallStrCmp, "True if the two strings match exactly", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("strftime", DATA_TYPE_STRING, STRFTIME_ARGS, &FnCallStrftime, "Format a date and time string", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("sublist", DATA_TYPE_STRING_LIST, SUBLIST_ARGS, &FnCallSublist, "Returns arg3 element from either the head or the tail (according to arg2) of list arg1.", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("strftime", CFE_DATA_TYPE_STRING, STRFTIME_ARGS, &FnCallStrftime, "Format a date and time string", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("sublist", CFE_DATA_TYPE_STRING_LIST, SUBLIST_ARGS, &FnCallSublist, "Returns arg3 element from either the head or the tail (according to arg2) of list arg1.", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("sum", DATA_TYPE_REAL, SUM_ARGS, &FnCallSum, "Return the sum of a list of reals", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("translatepath", DATA_TYPE_STRING, TRANSLATEPATH_ARGS, &FnCallTranslatePath, "Translate path separators from Unix style to the host's native", false, FNCALL_CATEGORY_FILES, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("unique", DATA_TYPE_STRING_LIST, UNIQUE_ARGS, &FnCallUnique, "Returns all the unique elements of list arg1", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("translatepath", CFE_DATA_TYPE_STRING, TRANSLATEPATH_ARGS, &FnCallTranslatePath, "Translate path separators from Unix style to the host's native", false, FNCALL_CATEGORY_FILES, SYNTAX_STATUS_NORMAL), ++ FnCallTypeNew("unique", CFE_DATA_TYPE_STRING_LIST, UNIQUE_ARGS, &FnCallUnique, "Returns all the unique elements of list arg1", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("usemodule", DATA_TYPE_CONTEXT, USEMODULE_ARGS, &FnCallUseModule, "Execute cfengine module script and set class if successful", false, FNCALL_CATEGORY_UTILS, SYNTAX_STATUS_NORMAL), + FnCallTypeNew("userexists", DATA_TYPE_CONTEXT, USEREXISTS_ARGS, &FnCallUserExists, "True if user name or numerical id exists on this host", false, FNCALL_CATEGORY_SYSTEM, SYNTAX_STATUS_NORMAL), + FnCallTypeNewNull() +diff --git a/libpromises/expand.c b/libpromises/expand.c +index 4df3e84..7981e12 100644 +--- a/libpromises/expand.c ++++ b/libpromises/expand.c +@@ -652,7 +652,7 @@ bool ExpandScalar(const EvalContext *ctx, const char *scopeid, const char *strin + { + switch (type) + { +- case DATA_TYPE_STRING: ++ case CFE_DATA_TYPE_STRING: + case DATA_TYPE_INT: + case DATA_TYPE_REAL: + +@@ -664,7 +664,7 @@ bool ExpandScalar(const EvalContext *ctx, const char *scopeid, const char *strin + strlcat(buffer, (char *) rval.item, CF_EXPANDSIZE); + break; + +- case DATA_TYPE_STRING_LIST: ++ case CFE_DATA_TYPE_STRING_LIST: + case DATA_TYPE_INT_LIST: + case DATA_TYPE_REAL_LIST: + case DATA_TYPE_NONE: @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Dec 28 01:18:25 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 28 Dec 2013 00:18:25 +0000 Subject: SF.net SVN: gar:[22759] csw/mgar/pkg/cmake/trunk/Makefile Message-ID: <3drlqz2QMlzKF@mail.opencsw.org> Revision: 22759 http://sourceforge.net/p/gar/code/22759 Author: rthurner Date: 2013-12-28 00:18:20 +0000 (Sat, 28 Dec 2013) Log Message: ----------- cmake, remove unused override. Modified Paths: -------------- csw/mgar/pkg/cmake/trunk/Makefile Modified: csw/mgar/pkg/cmake/trunk/Makefile =================================================================== --- csw/mgar/pkg/cmake/trunk/Makefile 2013-12-27 15:18:49 UTC (rev 22758) +++ csw/mgar/pkg/cmake/trunk/Makefile 2013-12-28 00:18:20 UTC (rev 22759) @@ -41,7 +41,6 @@ CHECKPKG_OVERRIDES_CSWcmake += disallowed-path|opt/csw/man/man1/cmakecommands.1 CHECKPKG_OVERRIDES_CSWcmake += disallowed-path|opt/csw/man/man1/cmake.1 CHECKPKG_OVERRIDES_CSWcmake += disallowed-path|opt/csw/man/man1/cmakevars.1 -CHECKPKG_OVERRIDES_CSWcmake += missing-dependency|CSWemacscommon CHECKPKG_OVERRIDES_CSWcmake += missing-dependency|CSWemacs-common NOISALIST = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sat Dec 28 18:56:46 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 28 Dec 2013 17:56:46 +0000 Subject: SF.net SVN: gar:[22760] csw/mgar/pkg/krb5-lib/trunk/Makefile Message-ID: <3dsCK53VZKz1Hh@mail.opencsw.org> Revision: 22760 http://sourceforge.net/p/gar/code/22760 Author: lblume Date: 2013-12-28 17:56:45 +0000 (Sat, 28 Dec 2013) Log Message: ----------- krb5-lib/trunk: Merge the -priv package into the main lib one for now Modified Paths: -------------- csw/mgar/pkg/krb5-lib/trunk/Makefile Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/krb5-lib/trunk/Makefile 2013-12-28 00:18:20 UTC (rev 22759) +++ csw/mgar/pkg/krb5-lib/trunk/Makefile 2013-12-28 17:56:45 UTC (rev 22760) @@ -39,7 +39,6 @@ PKGFILES_CSWlibkrb5-dev += $(PKGFILES_DEVEL) PKGFILES_CSWlibkrb5-dev += $(bindir)/(uuclient|sim_client|sclient|krb5-config|gss-client|compile_et) RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5-priv OBSOLETED_BY_CSWlibkrb5-dev = CSWkrb5libdev CATALOGNAME_CSWkrb5libdev = krb5_lib_dev_stub # On unstable10x, that lib does not appear to be linked @@ -75,39 +74,49 @@ RUNTIME_DEP_PKGS_CSWlibk5crypto3 += CSWlibgcc-s1 OBSOLETED_BY_CSWlibk5crypto3 = CSWkrb5lib -PACKAGES += CSWlibkrb5-priv -SPKG_DESC_CSWlibkrb5-priv = Kerberos private shared libraries, do not link against this package -PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libgssrpc\.so\.\d+(\.\d+)*) -PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libkadm5clnt_mit\.so\.\d+(\.\d+)*) -PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libkadm5srv_mit\.so\.\d+(\.\d+)*) -PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libkdb5\.so\.\d+(\.\d+)*) -PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),krb5.*) -# Private libraries in one common package. -CHECKPKG_OVERRIDES_CSWlibkrb5-priv += shared-lib-pkgname-mismatch -CHECKPKG_OVERRIDES_CSWlibkrb5-priv += soname-not-part-of-filename -RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibkrb5support0 -RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibgcc-s1 - +# It would be nice to have this as a separate package again, but the deps +# are difficult to handle without a full Kerberos package +#PACKAGES += CSWlibkrb5-priv +#SPKG_DESC_CSWlibkrb5-priv = Kerberos private shared libraries, do not link against this package +#PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libgssrpc\.so\.\d+(\.\d+)*) +#PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libkadm5clnt_mit\.so\.\d+(\.\d+)*) +#PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libkadm5srv_mit\.so\.\d+(\.\d+)*) +#PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libkdb5\.so\.\d+(\.\d+)*) +#PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),krb5.*) +## Private libraries in one common package. +#CHECKPKG_OVERRIDES_CSWlibkrb5-priv += shared-lib-pkgname-mismatch +#CHECKPKG_OVERRIDES_CSWlibkrb5-priv += soname-not-part-of-filename +#RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibssl1-0-0 +#RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibgssapi-krb5-2 +#RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibkrb5support0 +#RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibcom-err3 +#RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibk5crypto3 +#RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibintl8 +#RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibgcc-s1 +# PACKAGES += CSWlibkrb5-3 CATALOGNAME_CSWlibkrb5-3 = libkrb5_3 PKGFILES_CSWlibkrb5-3 += $(call baseisadirs,$(libdir),libkrb5\.so\.3(\.\d+)*) PKGFILES_CSWlibkrb5-3 += $(sysconfdir)/krb5.conf PKGFILES_CSWlibkrb5-3 += $(mandir)/man5/krb5.conf.5 -SPKG_DESC_CSWlibkrb5-3 += MIT Kerberos 5 core libraries, libkrb5.so.3 -OBSOLETED_BY_CSWlibkrb5-3 = CSWkrb5lib +# Include the private bits in this package +PKGFILES_CSWlibkrb5-3 += $(call baseisadirs,$(libdir),libgssrpc\.so\.\d+(\.\d+)*) +PKGFILES_CSWlibkrb5-3 += $(call baseisadirs,$(libdir),libkadm5clnt_mit\.so\.\d+(\.\d+)*) +PKGFILES_CSWlibkrb5-3 += $(call baseisadirs,$(libdir),libkadm5srv_mit\.so\.\d+(\.\d+)*) +PKGFILES_CSWlibkrb5-3 += $(call baseisadirs,$(libdir),libkdb5\.so\.\d+(\.\d+)*) +PKGFILES_CSWlibkrb5-3 += $(call baseisadirs,$(libdir),krb5.*) +SPKG_DESC_CSWlibkrb5-3 += MIT Kerberos 5 core and private libraries, libkrb5.so.3 +OBSOLETED_BY_CSWlibkrb5-3 += CSWkrb5lib +OBSOLETED_BY_CSWlibkrb5-3 += CSWlibkrb5-priv RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibkrb5support0 RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibcom-err3 RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibkrb5-priv -CHECKPKG_OVERRIDES_CSWlibkrb5-3 += surplus-dependency|CSWlibkrb5-priv +RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibgssapi-krb5-2 +CHECKPKG_OVERRIDES_CSWlibkrb5-3 += soname-not-part-of-filename +CHECKPKG_OVERRIDES_CSWlibkrb5-3 += shared-lib-pkgname-mismatch PACKAGES += CSWlibkrb5support0 CATALOGNAME_CSWlibkrb5support0 = libkrb5support0 @@ -115,7 +124,6 @@ SPKG_DESC_CSWlibkrb5support0 += MIT Kerberos 5 core libraries, libkrb5support.so.0 RUNTIME_DEP_PKGS_CSWlibkrb5support0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibkrb5support0 += CSWlibgcc-s1 -OBSOLETED_BY_CSWlibkrb5-3 = CSWkrb5lib PACKAGES += CSWlibverto0 CATALOGNAME_CSWlibverto0 = libverto0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sat Dec 28 23:56:02 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 28 Dec 2013 22:56:02 +0000 Subject: SF.net SVN: gar:[22761] csw/mgar/pkg/krb5-lib/trunk/Makefile Message-ID: <3dsKyQ0hP4z1Y0@mail.opencsw.org> Revision: 22761 http://sourceforge.net/p/gar/code/22761 Author: lblume Date: 2013-12-28 22:56:01 +0000 (Sat, 28 Dec 2013) Log Message: ----------- krb5-lib/trunk: Merge another dep Modified Paths: -------------- csw/mgar/pkg/krb5-lib/trunk/Makefile Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/krb5-lib/trunk/Makefile 2013-12-28 17:56:45 UTC (rev 22760) +++ csw/mgar/pkg/krb5-lib/trunk/Makefile 2013-12-28 22:56:01 UTC (rev 22761) @@ -29,7 +29,6 @@ SPKG_DESC_CSWlibkrb5-dev = MIT Kerberos 5 developer libraries RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibgssapi-krb5-2 RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5support0 RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibverto0 @@ -42,7 +41,7 @@ OBSOLETED_BY_CSWlibkrb5-dev = CSWkrb5libdev CATALOGNAME_CSWkrb5libdev = krb5_lib_dev_stub # On unstable10x, that lib does not appear to be linked -CHECKPKG_OVERRIDES_CSWlibkrb5-dev += surplus-dependency|CSWlibintl8 +#CHECKPKG_OVERRIDES_CSWlibkrb5-dev += surplus-dependency|CSWlibintl8 PACKAGES += CSWlibcom-err3 CATALOGNAME_CSWlibcom-err3 = libcom_err3 @@ -53,17 +52,17 @@ RUNTIME_DEP_PKGS_CSWlibcom-err3 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibcom-err3 += CSWlibgcc-s1 -PACKAGES += CSWlibgssapi-krb5-2 -CATALOGNAME_CSWlibgssapi-krb5-2 = libgssapi_krb5_2 -PKGFILES_CSWlibgssapi-krb5-2 += $(call baseisadirs,$(libdir),libgssapi_krb5\.so\.2(\.\d+)*) -SPKG_DESC_CSWlibgssapi-krb5-2 += MIT Kerberos 5 core libraries, libgssapi_krb5.so.2 -OBSOLETED_BY_CSWlibgssapi-krb5-2 = CSWkrb5lib -RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibkrb5support0 -RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibgcc-s1 +#PACKAGES += CSWlibgssapi-krb5-2 +#CATALOGNAME_CSWlibgssapi-krb5-2 = libgssapi_krb5_2 +#PKGFILES_CSWlibgssapi-krb5-2 += $(call baseisadirs,$(libdir),libgssapi_krb5\.so\.2(\.\d+)*) +#SPKG_DESC_CSWlibgssapi-krb5-2 += MIT Kerberos 5 core libraries, libgssapi_krb5.so.2 +#OBSOLETED_BY_CSWlibgssapi-krb5-2 = CSWkrb5lib +#RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibkrb5-3 +#RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibcom-err3 +#RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibk5crypto3 +#RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibkrb5support0 +#RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibintl8 +#RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibgcc-s1 PACKAGES += CSWlibk5crypto3 CATALOGNAME_CSWlibk5crypto3 = libk5crypto3 @@ -99,6 +98,8 @@ PKGFILES_CSWlibkrb5-3 += $(call baseisadirs,$(libdir),libkrb5\.so\.3(\.\d+)*) PKGFILES_CSWlibkrb5-3 += $(sysconfdir)/krb5.conf PKGFILES_CSWlibkrb5-3 += $(mandir)/man5/krb5.conf.5 +# Include this lib in this package +PKGFILES_CSWlibkrb5-3 += $(call baseisadirs,$(libdir),libgssapi_krb5\.so\.2(\.\d+)*) # Include the private bits in this package PKGFILES_CSWlibkrb5-3 += $(call baseisadirs,$(libdir),libgssrpc\.so\.\d+(\.\d+)*) PKGFILES_CSWlibkrb5-3 += $(call baseisadirs,$(libdir),libkadm5clnt_mit\.so\.\d+(\.\d+)*) @@ -108,13 +109,13 @@ SPKG_DESC_CSWlibkrb5-3 += MIT Kerberos 5 core and private libraries, libkrb5.so.3 OBSOLETED_BY_CSWlibkrb5-3 += CSWkrb5lib OBSOLETED_BY_CSWlibkrb5-3 += CSWlibkrb5-priv +OBSOLETED_BY_CSWlibkrb5-3 += CSWlibgssapi-krb5-2 RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibkrb5support0 RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibcom-err3 RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibgssapi-krb5-2 CHECKPKG_OVERRIDES_CSWlibkrb5-3 += soname-not-part-of-filename CHECKPKG_OVERRIDES_CSWlibkrb5-3 += shared-lib-pkgname-mismatch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sun Dec 29 00:12:02 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 28 Dec 2013 23:12:02 +0000 Subject: SF.net SVN: gar:[22762] csw/mgar/pkg/krb5-lib/trunk/Makefile Message-ID: <3dsLJq4LqBz4g@mail.opencsw.org> Revision: 22762 http://sourceforge.net/p/gar/code/22762 Author: lblume Date: 2013-12-28 23:11:57 +0000 (Sat, 28 Dec 2013) Log Message: ----------- krb5-lib/trunk: Override commented by mistake Modified Paths: -------------- csw/mgar/pkg/krb5-lib/trunk/Makefile Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/krb5-lib/trunk/Makefile 2013-12-28 22:56:01 UTC (rev 22761) +++ csw/mgar/pkg/krb5-lib/trunk/Makefile 2013-12-28 23:11:57 UTC (rev 22762) @@ -41,7 +41,7 @@ OBSOLETED_BY_CSWlibkrb5-dev = CSWkrb5libdev CATALOGNAME_CSWkrb5libdev = krb5_lib_dev_stub # On unstable10x, that lib does not appear to be linked -#CHECKPKG_OVERRIDES_CSWlibkrb5-dev += surplus-dependency|CSWlibintl8 +CHECKPKG_OVERRIDES_CSWlibkrb5-dev += surplus-dependency|CSWlibintl8 PACKAGES += CSWlibcom-err3 CATALOGNAME_CSWlibcom-err3 = libcom_err3 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Dec 30 18:30:54 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 30 Dec 2013 17:30:54 +0000 Subject: SF.net SVN: gar:[22763] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: <3dtQfP27kNz1J@mail.opencsw.org> Revision: 22763 http://sourceforge.net/p/gar/code/22763 Author: rthurner Date: 2013-12-30 17:30:53 +0000 (Mon, 30 Dec 2013) Log Message: ----------- subversion, make sure newest serf library is used. Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2013-12-28 23:11:57 UTC (rev 22762) +++ csw/mgar/pkg/subversion/trunk/Makefile 2013-12-30 17:30:53 UTC (rev 22763) @@ -57,6 +57,7 @@ RUNTIME_DEP_PKGS_CSWsvn += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWsvn += CSWlibaprutil1-0 RUNTIME_DEP_PKGS_CSWsvn += CSWlibneon27 +RUNTIME_DEP_PKGS_CSWsvn += CSWlibserf1-3 RUNTIME_DEP_PKGS_CSWsvn_5.10 += CSWlibdbus1-3 RUNTIME_DEP_PKGS_CSWsvn_5.10 += CSWlibgnome-keyring0 RUNTIME_DEP_PKGS_CSWsvn_5.10 += CSWlibglib2-0-0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Tue Dec 31 09:37:33 2013 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Tue, 31 Dec 2013 08:37:33 +0000 Subject: SF.net SVN: gar:[22763] csw/mgar/pkg/subversion/trunk/Makefile In-Reply-To: <3dtQfP27kNz1J@mail.opencsw.org> References: <3dtQfP27kNz1J@mail.opencsw.org> Message-ID: 2013/12/30 > Revision: 22763 > http://sourceforge.net/p/gar/code/22763 > Author: rthurner > Date: 2013-12-30 17:30:53 +0000 (Mon, 30 Dec 2013) > Log Message: > ----------- > subversion, make sure newest serf library is used. > Hi Rupert, You can type this: mgar ci -m "your message" ...it will automatically add the package name to the commit message. -------------- next part -------------- An HTML attachment was scrubbed... URL: From rthurner at users.sourceforge.net Tue Dec 31 14:37:44 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 31 Dec 2013 13:37:44 +0000 Subject: SF.net SVN: gar:[22764] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: <3dtxQn3x6Zzks@mail.opencsw.org> Revision: 22764 http://sourceforge.net/p/gar/code/22764 Author: rthurner Date: 2013-12-31 13:37:44 +0000 (Tue, 31 Dec 2013) Log Message: ----------- subversion/trunk: -Wno-int-to-pointer-cast not known by solaris cc Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2013-12-30 17:30:53 UTC (rev 22763) +++ csw/mgar/pkg/subversion/trunk/Makefile 2013-12-31 13:37:44 UTC (rev 22764) @@ -247,6 +247,7 @@ @# libtool.gcc, but what for? -mt is recognized by both Sun's cc @# and gcc and is responsible for adding multi-threading support. gsed -i \ + -e 's,-Wno-int-to-pointer-cast,,' \ -e 's,-mt|*,,' \ -e 's,-xO3,-pipe -O2,' \ -e 's,KPIC,fPIC,' \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Dec 31 14:56:51 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 31 Dec 2013 13:56:51 +0000 Subject: SF.net SVN: gar:[22765] csw/mgar/pkg/mplayer/branches/snapshot/checksums Message-ID: <3dtxrq3nNPzpQ@mail.opencsw.org> Revision: 22765 http://sourceforge.net/p/gar/code/22765 Author: pfelecan Date: 2013-12-31 13:56:49 +0000 (Tue, 31 Dec 2013) Log Message: ----------- mplayer/branches/snapshot: new snapshot Modified Paths: -------------- csw/mgar/pkg/mplayer/branches/snapshot/checksums Modified: csw/mgar/pkg/mplayer/branches/snapshot/checksums =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/checksums 2013-12-31 13:37:44 UTC (rev 22764) +++ csw/mgar/pkg/mplayer/branches/snapshot/checksums 2013-12-31 13:56:49 UTC (rev 22765) @@ -1,2 +1,2 @@ -6c02fc5190a7096e7e7eae8ce2a8345e ffmpeg-snapshot.tar.bz2 -5221a2ed84fb67c4bd23000b205795d2 mplayer-export-snapshot.tar.bz2 +06c8a1df9b356749c74b5e5f92006e3b ffmpeg-snapshot.tar.bz2 +14d25df83c7e8b87063106e8c05d0635 mplayer-export-snapshot.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From laurent at opencsw.org Tue Dec 31 16:21:25 2013 From: laurent at opencsw.org (Laurent Blume) Date: Tue, 31 Dec 2013 16:21:25 +0100 Subject: SF.net SVN: gar:[22370] csw/mgar/pkg/gtk2/trunk In-Reply-To: References: Message-ID: <52C2E0F5.4030609@opencsw.org> Hello, I'm not sure if this is directly related to that commit: I've noticed that input method doesn't work anymore for me in at least 2 CSW GTK2 apps where it used to work, gvim and pidgin. Ie, when I set the IM to Chinese, nothing happens, input keeps being the direct key symbols. It still works fine in Solaris 10's GNOME apps. I've set this environment variable: GTK_IM_MODULE=xim A little tinkering and some truss shows no attempt at all of using /etc/opt/csw/gtk-2.0/gtk.immodules. Any idea? Laurent Le 2013/12/31 16:17 +0100, guengel a ?crit: > Revision: 22370 > http://gar.svn.sourceforge.net/gar/?rev=22370&view=rev > Author: guengel > Date: 2013-11-04 12:15:31 +0000 (Mon, 04 Nov 2013) > Log Message: > ----------- > gtk2/trunk: Updated patch files. Fixed error in post-merge, resulting in etc/csw/64/64 directory. Minor changes. > > Modified Paths: > -------------- > csw/mgar/pkg/gtk2/trunk/Makefile > csw/mgar/pkg/gtk2/trunk/files/CSWgtk2.postinstall > > Added Paths: > ----------- > csw/mgar/pkg/gtk2/trunk/files/0000-Use-absolute-path-to-Xvfb.patch > > Removed Paths: > ------------- > csw/mgar/pkg/gtk2/trunk/files/0001-Add-update-modules-cmd-line-option.patch > csw/mgar/pkg/gtk2/trunk/files/0002-Use-absolute-path-to-Xvfb.patch > > Modified: csw/mgar/pkg/gtk2/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/gtk2/trunk/Makefile 2013-11-04 09:54:03 UTC (rev 22369) > +++ csw/mgar/pkg/gtk2/trunk/Makefile 2013-11-04 12:15:31 UTC (rev 22370) > @@ -26,13 +26,8 @@ > EXPANDVARS = CSWgtk2.postinstall > > # This makes the tests work in the first place > -#PATCHFILES += 0002-Use-absolute-path-to-Xvfb.patch > +PATCHFILES += 0000-Use-absolute-path-to-Xvfb.patch > > -# This patch adds a command line option `--update-modules` to > -# gtk-query-immodules-2.0 which has the default location of > -# gtk.immodules hardcoded and takes 32/64bit ISAs into account. > -PATCHFILES += 0001-Add-update-modules-cmd-line-option.patch > - > PATCHFILES += 0000-Disable-gtk_test_create_widget-g_type_from_name-GtkT.patch > > PATCHFILES += 0003-Adjust-hardcoded-path-to-opt-csw-share.patch > @@ -191,8 +186,6 @@ > CHECKPKG_OVERRIDES_CSWlibgtk2-dev += missing-dependency|CSWlibglib2-0-0 > > > - > - > PACKAGES += CSWgtk2doc > SPKG_DESC_CSWgtk2doc = $(DESCRIPTION), Documentation > ARCHALL_CSWgtk2doc = 1 > @@ -219,6 +212,9 @@ > BUILD_DEP_PKGS += CSWlibpng-dev > BUILD_DEP_PKGS += CSWfontconfig-dev > BUILD_DEP_PKGS += CSWlibfreetype-dev > +BUILD_DEP_PKGS += CSWlibgcrypt-dev > +BUILD_DEP_PKGS += CSWlibgpg-error-dev > +BUILD_DEP_PKGS += CSWlibgnutls-dev > # Needed to make a test work > BUILD_DEP_PKGS += CSWgamin > # Used to adjust documentation > @@ -244,8 +240,8 @@ > include gar/category.mk > > post-merge: > - ginstall -d $(PKGROOT)$(sysconfdir)/64/gtk-2.0 > - ginstall $(PKGROOT)$(sysconfdir)/gtk-2.0/im-multipress.conf $(PKGROOT)$(sysconfdir)/64/gtk-2.0/ > + ginstall -d $(PKGROOT)$(sysconfdir)/gtk-2.0 > + [ -f $(PKGROOT)$(sysconfdir)/gtk-2.0/im-multipress.conf ] || ginstall $(PKGROOT)/etc/opt/csw/gtk-2.0/im-multipress.conf $(PKGROOT)$(sysconfdir)/gtk-2.0/ > gsed -i -e 's|/usr/share/|$(sharedstatedir)/|g' \ > -e 's|/usr/lib|$(libdir)|g' \ > -e 's|/usr/include|$(includedir)|g' `find $(PKGROOT)$(sharedstatedir)/gtk-doc -type f` > > Added: csw/mgar/pkg/gtk2/trunk/files/0000-Use-absolute-path-to-Xvfb.patch > =================================================================== > --- csw/mgar/pkg/gtk2/trunk/files/0000-Use-absolute-path-to-Xvfb.patch (rev 0) > +++ csw/mgar/pkg/gtk2/trunk/files/0000-Use-absolute-path-to-Xvfb.patch 2013-11-04 12:15:31 UTC (rev 22370) > @@ -0,0 +1,1136 @@ > +From ee4b41c24742a456a5d772bb648d2f1c7b5a9c89 Mon Sep 17 00:00:00 2001 > +From: Rafael Ostertag > +Date: Mon, 4 Nov 2013 11:01:39 +0100 > +Subject: [PATCH] Use absolute path to Xvfb > + > +--- > + Makefile.decl | 6 +++--- > + Makefile.in | 6 +++--- > + build/Makefile.in | 6 +++--- > + build/win32/Makefile.in | 6 +++--- > + build/win32/vs10/Makefile.in | 6 +++--- > + build/win32/vs9/Makefile.in | 6 +++--- > + demos/Makefile.in | 6 +++--- > + demos/gtk-demo/Makefile.in | 6 +++--- > + docs/Makefile.in | 6 +++--- > + docs/faq/Makefile.in | 6 +++--- > + docs/reference/Makefile.in | 6 +++--- > + docs/reference/gdk/Makefile.in | 6 +++--- > + docs/reference/gtk/Makefile.in | 6 +++--- > + docs/reference/libgail-util/Makefile.in | 6 +++--- > + docs/tools/Makefile.in | 6 +++--- > + docs/tutorial/Makefile.in | 6 +++--- > + gdk/Makefile.in | 6 +++--- > + gdk/directfb/Makefile.in | 6 +++--- > + gdk/quartz/Makefile.in | 6 +++--- > + gdk/tests/Makefile.in | 6 +++--- > + gdk/win32/Makefile.in | 6 +++--- > + gdk/win32/rc/Makefile.in | 6 +++--- > + gdk/x11/Makefile.in | 6 +++--- > + gtk/Makefile.in | 6 +++--- > + gtk/tests/Makefile.in | 6 +++--- > + gtk/theme-bits/Makefile.in | 6 +++--- > + m4macros/Makefile.in | 6 +++--- > + modules/Makefile.in | 6 +++--- > + modules/engines/Makefile.in | 6 +++--- > + modules/engines/ms-windows/Makefile.in | 6 +++--- > + modules/engines/ms-windows/Theme/Makefile.in | 6 +++--- > + modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in | 6 +++--- > + modules/engines/pixbuf/Makefile.in | 6 +++--- > + modules/input/Makefile.in | 6 +++--- > + modules/other/Makefile.in | 6 +++--- > + modules/other/gail/Makefile.in | 6 +++--- > + modules/other/gail/libgail-util/Makefile.in | 6 +++--- > + modules/other/gail/tests/Makefile.in | 6 +++--- > + modules/printbackends/Makefile.in | 6 +++--- > + modules/printbackends/cups/Makefile.in | 6 +++--- > + modules/printbackends/file/Makefile.in | 6 +++--- > + modules/printbackends/lpr/Makefile.in | 6 +++--- > + modules/printbackends/test/Makefile.in | 6 +++--- > + perf/Makefile.in | 6 +++--- > + tests/Makefile.in | 6 +++--- > + 45 files changed, 135 insertions(+), 135 deletions(-) > + > +diff --git a/Makefile.decl b/Makefile.decl > +index 2f6c579..46a9864 100644 > +--- a/Makefile.decl > ++++ b/Makefile.decl > +@@ -9,8 +9,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -25,7 +25,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + # call as: $(XVFB_START) && someprogram > + > +diff --git a/Makefile.in b/Makefile.in > +index 14be894..144c7bd 100644 > +--- a/Makefile.in > ++++ b/Makefile.in > +@@ -531,8 +531,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -549,7 +549,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + SRC_SUBDIRS = gdk gtk modules demos tests perf > +diff --git a/build/Makefile.in b/build/Makefile.in > +index 76c8e1f..c3f8dc2 100644 > +--- a/build/Makefile.in > ++++ b/build/Makefile.in > +@@ -415,8 +415,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -433,7 +433,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + SUBDIRS = \ > +diff --git a/build/win32/Makefile.in b/build/win32/Makefile.in > +index 8a82342..7ea9e7f 100644 > +--- a/build/win32/Makefile.in > ++++ b/build/win32/Makefile.in > +@@ -415,8 +415,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -433,7 +433,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + SUBDIRS = \ > +diff --git a/build/win32/vs10/Makefile.in b/build/win32/vs10/Makefile.in > +index f0981dc..a42270f 100644 > +--- a/build/win32/vs10/Makefile.in > ++++ b/build/win32/vs10/Makefile.in > +@@ -361,8 +361,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -379,7 +379,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + all: all-am > +diff --git a/build/win32/vs9/Makefile.in b/build/win32/vs9/Makefile.in > +index 00013d5..8f49c62 100644 > +--- a/build/win32/vs9/Makefile.in > ++++ b/build/win32/vs9/Makefile.in > +@@ -357,8 +357,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -375,7 +375,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + all: all-am > +diff --git a/demos/Makefile.in b/demos/Makefile.in > +index 6e896b4..66ac0ee 100644 > +--- a/demos/Makefile.in > ++++ b/demos/Makefile.in > +@@ -476,8 +476,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -494,7 +494,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + SUBDIRS = gtk-demo > +diff --git a/demos/gtk-demo/Makefile.in b/demos/gtk-demo/Makefile.in > +index 25ba622..bd320c5 100644 > +--- a/demos/gtk-demo/Makefile.in > ++++ b/demos/gtk-demo/Makefile.in > +@@ -457,8 +457,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -475,7 +475,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + democodedir = $(datadir)/gtk-2.0/demo > +diff --git a/docs/Makefile.in b/docs/Makefile.in > +index adceca2..7eae1b6 100644 > +--- a/docs/Makefile.in > ++++ b/docs/Makefile.in > +@@ -419,8 +419,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -437,7 +437,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + SUBDIRS = tutorial faq reference tools > +diff --git a/docs/faq/Makefile.in b/docs/faq/Makefile.in > +index 6f896a7..aaea95f 100644 > +--- a/docs/faq/Makefile.in > ++++ b/docs/faq/Makefile.in > +@@ -355,8 +355,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -373,7 +373,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + all: all-am > +diff --git a/docs/reference/Makefile.in b/docs/reference/Makefile.in > +index 86aa70f..46c1dc4 100644 > +--- a/docs/reference/Makefile.in > ++++ b/docs/reference/Makefile.in > +@@ -415,8 +415,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -433,7 +433,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + SUBDIRS = gdk gtk libgail-util > +diff --git a/docs/reference/gdk/Makefile.in b/docs/reference/gdk/Makefile.in > +index 0a5771c..4cb237f 100644 > +--- a/docs/reference/gdk/Makefile.in > ++++ b/docs/reference/gdk/Makefile.in > +@@ -362,8 +362,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -380,7 +380,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + AUTOMAKE_OPTIONS = 1.6 > +diff --git a/docs/reference/gtk/Makefile.in b/docs/reference/gtk/Makefile.in > +index c4e031d..399da26 100644 > +--- a/docs/reference/gtk/Makefile.in > ++++ b/docs/reference/gtk/Makefile.in > +@@ -393,8 +393,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -411,7 +411,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + AUTOMAKE_OPTIONS = 1.6 > +diff --git a/docs/reference/libgail-util/Makefile.in b/docs/reference/libgail-util/Makefile.in > +index ea6f06a..9be07c9 100644 > +--- a/docs/reference/libgail-util/Makefile.in > ++++ b/docs/reference/libgail-util/Makefile.in > +@@ -362,8 +362,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -380,7 +380,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + AUTOMAKE_OPTIONS = 1.7 > +diff --git a/docs/tools/Makefile.in b/docs/tools/Makefile.in > +index 77d105a..72951ee 100644 > +--- a/docs/tools/Makefile.in > ++++ b/docs/tools/Makefile.in > +@@ -409,8 +409,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -427,7 +427,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + INCLUDES = \ > +diff --git a/docs/tutorial/Makefile.in b/docs/tutorial/Makefile.in > +index d606fc0..5300503 100644 > +--- a/docs/tutorial/Makefile.in > ++++ b/docs/tutorial/Makefile.in > +@@ -366,8 +366,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -384,7 +384,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + all: all-am > +diff --git a/gdk/Makefile.in b/gdk/Makefile.in > +index 954c755..6ea19a5 100644 > +--- a/gdk/Makefile.in > ++++ b/gdk/Makefile.in > +@@ -752,8 +752,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -770,7 +770,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + INTROSPECTION_GIRS = $(am__append_1) $(am__append_2) > +diff --git a/gdk/directfb/Makefile.in b/gdk/directfb/Makefile.in > +index ccda1b7..34dc589 100644 > +--- a/gdk/directfb/Makefile.in > ++++ b/gdk/directfb/Makefile.in > +@@ -445,8 +445,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -463,7 +463,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + libgdkincludedir = $(includedir)/gtk-2.0/gdk > +diff --git a/gdk/quartz/Makefile.in b/gdk/quartz/Makefile.in > +index 159a437..60ae58a 100644 > +--- a/gdk/quartz/Makefile.in > ++++ b/gdk/quartz/Makefile.in > +@@ -444,8 +444,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -462,7 +462,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + libgdkincludedir = $(includedir)/gtk-2.0/gdk > +diff --git a/gdk/tests/Makefile.in b/gdk/tests/Makefile.in > +index 8506730..7c6a383 100644 > +--- a/gdk/tests/Makefile.in > ++++ b/gdk/tests/Makefile.in > +@@ -560,8 +560,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -578,7 +578,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + NULL = > +diff --git a/gdk/win32/Makefile.in b/gdk/win32/Makefile.in > +index 996acda..3bbb565 100644 > +--- a/gdk/win32/Makefile.in > ++++ b/gdk/win32/Makefile.in > +@@ -486,8 +486,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -504,7 +504,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + libgdkincludedir = $(includedir)/gtk-2.0/gdk > +diff --git a/gdk/win32/rc/Makefile.in b/gdk/win32/rc/Makefile.in > +index a994aae..6280f98 100644 > +--- a/gdk/win32/rc/Makefile.in > ++++ b/gdk/win32/rc/Makefile.in > +@@ -357,8 +357,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -375,7 +375,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + @USE_WIN32_TRUE at noinst_DATA = gdk-win32-res.o > +diff --git a/gdk/x11/Makefile.in b/gdk/x11/Makefile.in > +index 72fa239..cef6cd0 100644 > +--- a/gdk/x11/Makefile.in > ++++ b/gdk/x11/Makefile.in > +@@ -652,8 +652,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -670,7 +670,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + libgdkincludedir = $(includedir)/gtk-2.0/gdk > +diff --git a/gtk/Makefile.in b/gtk/Makefile.in > +index 61491c3..d6908a8 100644 > +--- a/gtk/Makefile.in > ++++ b/gtk/Makefile.in > +@@ -1464,8 +1464,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -1482,7 +1482,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + INTROSPECTION_GIRS = $(am__append_16) > +diff --git a/gtk/tests/Makefile.in b/gtk/tests/Makefile.in > +index 072995f..2c4735d 100644 > +--- a/gtk/tests/Makefile.in > ++++ b/gtk/tests/Makefile.in > +@@ -476,8 +476,8 @@ TEST_PROGS = testing liststore treestore treeview treeview-scrolling \ > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -494,7 +494,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + INCLUDES = \ > +diff --git a/gtk/theme-bits/Makefile.in b/gtk/theme-bits/Makefile.in > +index 9f17ee0..4539c32 100644 > +--- a/gtk/theme-bits/Makefile.in > ++++ b/gtk/theme-bits/Makefile.in > +@@ -407,8 +407,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -425,7 +425,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + INCLUDES = \ > +diff --git a/m4macros/Makefile.in b/m4macros/Makefile.in > +index 7d4364a..25a250b 100644 > +--- a/m4macros/Makefile.in > ++++ b/m4macros/Makefile.in > +@@ -385,8 +385,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -403,7 +403,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + installed_m4 = gtk-2.0.m4 > +diff --git a/modules/Makefile.in b/modules/Makefile.in > +index d096963..4eb8a3f 100644 > +--- a/modules/Makefile.in > ++++ b/modules/Makefile.in > +@@ -416,8 +416,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -434,7 +434,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + SUBDIRS = input engines other $(am__append_1) > +diff --git a/modules/engines/Makefile.in b/modules/engines/Makefile.in > +index 61cd1f8..dc71eec 100644 > +--- a/modules/engines/Makefile.in > ++++ b/modules/engines/Makefile.in > +@@ -415,8 +415,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -433,7 +433,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + @USE_WIN32_TRUE at wimp = ms-windows > +diff --git a/modules/engines/ms-windows/Makefile.in b/modules/engines/ms-windows/Makefile.in > +index 06b02a3..64db751 100644 > +--- a/modules/engines/ms-windows/Makefile.in > ++++ b/modules/engines/ms-windows/Makefile.in > +@@ -481,8 +481,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -499,7 +499,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + SUBDIRS = Theme > +diff --git a/modules/engines/ms-windows/Theme/Makefile.in b/modules/engines/ms-windows/Theme/Makefile.in > +index 4d4ea1e..5add436 100644 > +--- a/modules/engines/ms-windows/Theme/Makefile.in > ++++ b/modules/engines/ms-windows/Theme/Makefile.in > +@@ -415,8 +415,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -433,7 +433,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + SUBDIRS = gtk-2.0 > +diff --git a/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in b/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in > +index a88fa10..d2f9145 100644 > +--- a/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in > ++++ b/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in > +@@ -385,8 +385,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -403,7 +403,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + themedir = $(datadir)/themes/MS-Windows/gtk-2.0 > +diff --git a/modules/engines/pixbuf/Makefile.in b/modules/engines/pixbuf/Makefile.in > +index 78cbc0a..0f71891 100644 > +--- a/modules/engines/pixbuf/Makefile.in > ++++ b/modules/engines/pixbuf/Makefile.in > +@@ -440,8 +440,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -458,7 +458,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined > +diff --git a/modules/input/Makefile.in b/modules/input/Makefile.in > +index 6c1bf95..241dea7 100644 > +--- a/modules/input/Makefile.in > ++++ b/modules/input/Makefile.in > +@@ -657,8 +657,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -675,7 +675,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined > +diff --git a/modules/other/Makefile.in b/modules/other/Makefile.in > +index 27fc352..c308000 100644 > +--- a/modules/other/Makefile.in > ++++ b/modules/other/Makefile.in > +@@ -415,8 +415,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -433,7 +433,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + SUBDIRS = gail > +diff --git a/modules/other/gail/Makefile.in b/modules/other/gail/Makefile.in > +index 5d0c421..2b30e1f 100644 > +--- a/modules/other/gail/Makefile.in > ++++ b/modules/other/gail/Makefile.in > +@@ -516,8 +516,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -534,7 +534,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + SUBDIRS = libgail-util tests > +diff --git a/modules/other/gail/libgail-util/Makefile.in b/modules/other/gail/libgail-util/Makefile.in > +index 662d504..39ffa49 100644 > +--- a/modules/other/gail/libgail-util/Makefile.in > ++++ b/modules/other/gail/libgail-util/Makefile.in > +@@ -446,8 +446,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -464,7 +464,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined > +diff --git a/modules/other/gail/tests/Makefile.in b/modules/other/gail/tests/Makefile.in > +index 7b1bedc..9bfc526 100644 > +--- a/modules/other/gail/tests/Makefile.in > ++++ b/modules/other/gail/tests/Makefile.in > +@@ -584,8 +584,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -602,7 +602,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined > +diff --git a/modules/printbackends/Makefile.in b/modules/printbackends/Makefile.in > +index b391ee5..4d1a604 100644 > +--- a/modules/printbackends/Makefile.in > ++++ b/modules/printbackends/Makefile.in > +@@ -417,8 +417,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -435,7 +435,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + SUBDIRS = file lpr $(am__append_1) $(am__append_2) $(am__append_3) > +diff --git a/modules/printbackends/cups/Makefile.in b/modules/printbackends/cups/Makefile.in > +index dda693b..7d2db62 100644 > +--- a/modules/printbackends/cups/Makefile.in > ++++ b/modules/printbackends/cups/Makefile.in > +@@ -444,8 +444,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -462,7 +462,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined > +diff --git a/modules/printbackends/file/Makefile.in b/modules/printbackends/file/Makefile.in > +index b3ed091..7457181 100644 > +--- a/modules/printbackends/file/Makefile.in > ++++ b/modules/printbackends/file/Makefile.in > +@@ -443,8 +443,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -461,7 +461,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined > +diff --git a/modules/printbackends/lpr/Makefile.in b/modules/printbackends/lpr/Makefile.in > +index f353313..616a0e9 100644 > +--- a/modules/printbackends/lpr/Makefile.in > ++++ b/modules/printbackends/lpr/Makefile.in > +@@ -441,8 +441,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -459,7 +459,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined > +diff --git a/modules/printbackends/test/Makefile.in b/modules/printbackends/test/Makefile.in > +index a31655a..66a2df5 100644 > +--- a/modules/printbackends/test/Makefile.in > ++++ b/modules/printbackends/test/Makefile.in > +@@ -442,8 +442,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -460,7 +460,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined > +diff --git a/perf/Makefile.in b/perf/Makefile.in > +index a1d3491..2a33017 100644 > +--- a/perf/Makefile.in > ++++ b/perf/Makefile.in > +@@ -410,8 +410,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -428,7 +428,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + INCLUDES = \ > +diff --git a/tests/Makefile.in b/tests/Makefile.in > +index 8b937c9..2629d74 100644 > +--- a/tests/Makefile.in > ++++ b/tests/Makefile.in > +@@ -933,8 +933,8 @@ TEST_PROGS = > + > + ### testing rules > + > +-# Xvfb based test rules > +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > ++# /usr/X11/bin/Xvfb based test rules > ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > +@@ -951,7 +951,7 @@ XVFB_START = \ > + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ > + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ > + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ > +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ > ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb environment for X11 target tests."; exit 1; } \ > + && DISPLAY=:$$XID && export DISPLAY > + > + INCLUDES = \ > +-- > +1.8.4.1 > + > > Deleted: csw/mgar/pkg/gtk2/trunk/files/0001-Add-update-modules-cmd-line-option.patch > =================================================================== > --- csw/mgar/pkg/gtk2/trunk/files/0001-Add-update-modules-cmd-line-option.patch 2013-11-04 09:54:03 UTC (rev 22369) > +++ csw/mgar/pkg/gtk2/trunk/files/0001-Add-update-modules-cmd-line-option.patch 2013-11-04 12:15:31 UTC (rev 22370) > @@ -1,109 +0,0 @@ > -From 12dfaa24cf6f26d7293d68e5b0ad3c1ce1504ea6 Mon Sep 17 00:00:00 2001 > -From: Rafael Ostertag > -Date: Mon, 4 Nov 2013 08:43:08 +0100 > -Subject: [PATCH] Add --update-modules cmd line option > - > ---- > - gtk/queryimmodules.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++---- > - 1 file changed, 51 insertions(+), 4 deletions(-) > - > -diff --git a/gtk/queryimmodules.c b/gtk/queryimmodules.c > -index a91ea47..69d89df 100644 > ---- a/gtk/queryimmodules.c > -+++ b/gtk/queryimmodules.c > -@@ -23,6 +23,7 @@ > - > - #include > - #include > -+#include > - #include > - > - #include > -@@ -30,6 +31,8 @@ > - #ifdef HAVE_UNISTD_H > - #include > - #endif > -+#include > -+#include > - > - #ifdef USE_LA_MODULES > - #define SOEXT ".la" > -@@ -162,27 +165,71 @@ query_module (const char *dir, const char *name, GString *contents) > - int main (int argc, char **argv) > - { > - char *cwd; > -- int i; > -+ int i, fd, retval; > - char *path; > -+ char *gtk_immodules; > - gboolean error = FALSE; > - gchar *cache_file = NULL; > - gint first_file = 1; > - GString *contents; > - > -+ > -+ > - if (argc > 1 && strcmp (argv[1], "--update-cache") == 0) > - { > - cache_file = gtk_rc_get_im_module_file (); > - first_file = 2; > - } > - > -+ /* > -+ * Quick an dirty hack. > -+ * > -+ * This will allow us to create the gtk.immodules in the default > -+ * place by providing `--update-modules' as cmd line argument, > -+ * without worrying where this might be when calling > -+ * gtk-query-immodules-2.0 from a postinstall script. > -+ * > -+ * The basic idea is to redirect STDOUT to the default file and then > -+ * let the normal flow of the program continue like there was no cmd > -+ * line argument. Be aware, that this only works when no other cmd > -+ * line options were passed. > -+ */ > -+ if ( argc == 2 && strcmp("--update-modules", argv[1]) == 0 ) > -+ { > -+ gtk_immodules = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); > -+ fd = g_open(gtk_immodules, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); > -+ if ( fd == -1 ) > -+ { > -+ g_fprintf(stderr, "Cannot open %s.\n", gtk_immodules); > -+ exit(1); > -+ } > -+ > -+ if ( dup2(fd, STDOUT_FILENO) == -1 ) > -+ { > -+ g_fprintf(stderr, "Unable to redirect STDOUT.\n"); > -+ exit(1); > -+ } > -+ > -+ /* > -+ * cheat, to make it think there are no arguments given > -+ */ > -+ first_file = 2; > -+ } > -+ > -+ > - contents = g_string_new (""); > - g_string_append_printf (contents, > - "# GTK+ Input Method Modules file\n" > - "# Automatically generated file, do not edit\n" > -- "# Created by %s from gtk+-%d.%d.%d\n" > -- "#\n", > -+ "# Created by %s from gtk+-%d.%d.%d (OpenCSW Patch)\n" > -+ "#\n" > -+ "#\n" > -+ "# DefaultFile = %s\n" > -+ "# DefaultDir = %s\n", > - argv[0], > -- GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); > -+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION, > -+ g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL), > -+ g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", NULL)); > - > - if (argc == first_file) /* No file arguments given */ > - { > --- > -1.8.3.4 > - > > Deleted: csw/mgar/pkg/gtk2/trunk/files/0002-Use-absolute-path-to-Xvfb.patch > =================================================================== > --- csw/mgar/pkg/gtk2/trunk/files/0002-Use-absolute-path-to-Xvfb.patch 2013-11-04 09:54:03 UTC (rev 22369) > +++ csw/mgar/pkg/gtk2/trunk/files/0002-Use-absolute-path-to-Xvfb.patch 2013-11-04 12:15:31 UTC (rev 22370) > @@ -1,25 +0,0 @@ > -From 8f4ed5e421c668213e57da64ee73eb4de443b727 Mon Sep 17 00:00:00 2001 > -From: Rafael Ostertag > -Date: Mon, 4 Nov 2013 08:55:28 +0100 > -Subject: [PATCH] Use absolute path to Xvfb > - > ---- > - tests/Makefile.in | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/tests/Makefile.in b/tests/Makefile.in > -index 8b937c9..a1b316e 100644 > ---- a/tests/Makefile.in > -+++ b/tests/Makefile.in > -@@ -934,7 +934,7 @@ TEST_PROGS = > - ### testing rules > - > - # Xvfb based test rules > --XVFB = Xvfb -ac -noreset -screen 0 800x600x16 > -+XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 > - XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ > - 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ > - 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ > --- > -1.8.3.4 > - > > Modified: csw/mgar/pkg/gtk2/trunk/files/CSWgtk2.postinstall > =================================================================== > --- csw/mgar/pkg/gtk2/trunk/files/CSWgtk2.postinstall 2013-11-04 09:54:03 UTC (rev 22369) > +++ csw/mgar/pkg/gtk2/trunk/files/CSWgtk2.postinstall 2013-11-04 12:15:31 UTC (rev 22370) > @@ -41,11 +41,10 @@ > echo "** Done Updating Icon cache" > > BIN=gtk-query-immodules-2.0 > -BIN_OPTS="--update-modules" > +BIN_OPTS="--update-cache" > > echo "** Querying IM Modules" > > -# Now, do all other > for i in @NEEDED_ISAS@ > do > # The default ISA is removed > @@ -60,10 +59,6 @@ > /usr/bin/printf "- ${isa} ISA... " > fi > > - # Figure out the default file path (binary has to be patched for this) > - gtk_immodules="`${ISABIN} | /usr/bin/awk '/DefaultFile =/ { print $4 }`" > - > - > /usr/sbin/chroot "${PKG_ROOT_DIR}" "${ISABIN}" ${BIN_OPTS} >/dev/null 2>&1 > if [ $? -ne 0 ] > then > @@ -77,4 +72,4 @@ > > /usr/sbin/chroot "${PKG_ROOT_DIR}" /usr/sbin/installf -f ${PKGINST} > > -echo "** Done querying IM Modules" > \ No newline at end of file > +echo "** Done querying IM Modules" > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. >