From skayser at users.sourceforge.net Sat May 1 00:45:13 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 30 Apr 2010 22:45:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[9798] csw/mgar/pkg/password-gorilla/trunk/Makefile Message-ID: Revision: 9798 http://gar.svn.sourceforge.net/gar/?rev=9798&view=rev Author: skayser Date: 2010-04-30 22:45:13 +0000 (Fri, 30 Apr 2010) Log Message: ----------- password-gorilla: fix permissions Modified Paths: -------------- csw/mgar/pkg/password-gorilla/trunk/Makefile Modified: csw/mgar/pkg/password-gorilla/trunk/Makefile =================================================================== --- csw/mgar/pkg/password-gorilla/trunk/Makefile 2010-04-30 19:14:55 UTC (rev 9797) +++ csw/mgar/pkg/password-gorilla/trunk/Makefile 2010-04-30 22:45:13 UTC (rev 9798) @@ -25,21 +25,24 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += -with-wish=$(bindir)/tclsh +BUILD_SCRIPTS = INSTALL_SCRIPTS = custom TEST_SCRIPTS = include gar/category.mk install-custom: TCLPKGS = twofish blowfish sha1 pwsafe -install-custom: TCLDEST = $(DESTDIR)$(datadir)/password-gorilla/ +install-custom: TCLDEST = $(DESTDIR)$(datadir)/password-gorilla install-custom: $(foreach P,$(TCLPKGS),\ - mkdir -p $(TCLDEST)$(P); \ - cp -r $(WORKSRC)/$(P) $(TCLDEST)$(P); \ + mkdir -p $(TCLDEST)/$(P); \ + cp $(WORKSRC)/$(P)/* $(TCLDEST)/$(P); \ + chmod 644 $(TCLDEST)/$(P)/*; \ ) cp $(WORKSRC)/gorilla $(WORKSRC)/gorilla.tcl $(TCLDEST) mkdir -p $(DESTDIR)$(bindir) echo '#!/bin/sh\nexec $(datadir)/password-gorilla/gorilla' > \ $(DESTDIR)$(bindir)/password-gorilla chmod 755 $(DESTDIR)$(bindir)/password-gorilla + chmod 644 $(WORKSRC)/$(LICENSE) $(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 Sun May 2 15:43:14 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 02 May 2010 13:43:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[9799] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 9799 http://gar.svn.sourceforge.net/gar/?rev=9799&view=rev Author: rthurner Date: 2010-05-02 13:43:14 +0000 (Sun, 02 May 2010) Log Message: ----------- mercurial - upgrade to hg-1.5.2 Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile csw/mgar/pkg/mercurial/trunk/checksums Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2010-04-30 22:45:13 UTC (rev 9798) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2010-05-02 13:43:14 UTC (rev 9799) @@ -1,5 +1,5 @@ GARNAME = mercurial -GARVERSION = 1.5.1 +GARVERSION = 1.5.2 CATEGORIES = python DESCRIPTION = Fast, lightweight Source Control Management system Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2010-04-30 22:45:13 UTC (rev 9798) +++ csw/mgar/pkg/mercurial/trunk/checksums 2010-05-02 13:43:14 UTC (rev 9799) @@ -1 +1 @@ -22eac5602d777f9601e23700e641503f mercurial-1.5.1.tar.gz +deafaaf017fc3c8a9deef39e566aec80 mercurial-1.5.2.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 Sun May 2 16:32:59 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 02 May 2010 14:32:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[9800] csw/mgar/pkg/mercurial/trunk/Makefile Message-ID: Revision: 9800 http://gar.svn.sourceforge.net/gar/?rev=9800&view=rev Author: rthurner Date: 2010-05-02 14:32:59 +0000 (Sun, 02 May 2010) Log Message: ----------- mercurial - upgrade to hg-1.5.2 Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2010-05-02 13:43:14 UTC (rev 9799) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2010-05-02 14:32:59 UTC (rev 9800) @@ -20,6 +20,9 @@ TEST_SCRIPTS = #TEST_TARGET = #tests +CHECKPKG_OVERRIDES_CSWmercurial += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWmercurial += catalogname-does-not-start-with-py_ + include gar/category.mk pre-build-modulated: 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 May 3 15:32:56 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 03 May 2010 13:32:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[9801] csw/mgar/pkg/csup/trunk Message-ID: Revision: 9801 http://gar.svn.sourceforge.net/gar/?rev=9801&view=rev Author: dmichelsen Date: 2010-05-03 13:32:56 +0000 (Mon, 03 May 2010) Log Message: ----------- csup: Work towards Solaris port Modified Paths: -------------- csw/mgar/pkg/csup/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/csup/trunk/checksums csw/mgar/pkg/csup/trunk/files/0001-Quick-and-dirty-Solaris-port.patch Removed Paths: ------------- csw/mgar/pkg/csup/trunk/files/CSWcsup.gspec Modified: csw/mgar/pkg/csup/trunk/Makefile =================================================================== --- csw/mgar/pkg/csup/trunk/Makefile 2010-05-02 14:32:59 UTC (rev 9800) +++ csw/mgar/pkg/csup/trunk/Makefile 2010-05-03 13:32:56 UTC (rev 9801) @@ -5,16 +5,26 @@ DESCRIPTION = A replacement for CVSup define BLURB -A solid replacement for CVSup for checkout-only functionality. + A solid replacement for CVSup for checkout-only functionality. endef MASTER_SITES = http://www.mu.org/~mux/ DISTFILES = $(GARNAME)-$(GARVERSION)-$(PATCHLEVEL).tgz -DISTFILES += $(call admfiles,CSWcsup,) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz +LICENSE = LICENSE + CONFIGURE_ARGS = $(DIRPATHS) +# PATH=$PATH:/opt/csw/bin gmake \ +# CC=/opt/studio/SOS12/SUNWspro/bin/cc \ +# WARNS= \ +# PREFIX=/opt/csw \ +# LEX=/opt/csw/bin/flex \ +# YACC=/opt/csw/bin/bison \ +# CFLAGS="-I/usr/include -I/opt/csw/include -features=extensions -D_POSIX_PTHREAD_SEMANTICS" \ +# LDFLAGS="-R/usr/ucblib -R/opt/csw/lib -L/opt/csw/lib -lcrypto -lz -lsocket -lnsl -L/usr/ucblib -lucb" + include gar/category.mk Added: csw/mgar/pkg/csup/trunk/checksums =================================================================== --- csw/mgar/pkg/csup/trunk/checksums (rev 0) +++ csw/mgar/pkg/csup/trunk/checksums 2010-05-03 13:32:56 UTC (rev 9801) @@ -0,0 +1 @@ +9218f06f13ed28d1086eec413a734915 csup-snap-20060318.tgz Added: csw/mgar/pkg/csup/trunk/files/0001-Quick-and-dirty-Solaris-port.patch =================================================================== --- csw/mgar/pkg/csup/trunk/files/0001-Quick-and-dirty-Solaris-port.patch (rev 0) +++ csw/mgar/pkg/csup/trunk/files/0001-Quick-and-dirty-Solaris-port.patch 2010-05-03 13:32:56 UTC (rev 9801) @@ -0,0 +1,367 @@ +From 03b518d55e8a0784f3c76c99ffc76c6435543960 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 3 May 2010 15:29:26 +0200 +Subject: [PATCH] Quick and dirty Solaris port + +--- + GNUmakefile | 3 ++- + diff.c | 6 +++++- + keyword.c | 2 ++ + main.c | 2 +- + misc.c | 18 ++++++++++++++++-- + misc.h | 10 +++++++--- + proto.c | 2 ++ + stream.c | 12 ++++++++++++ + strsep.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + threads.c | 2 ++ + timegm.c | 31 +++++++++++++++++++++++++++++++ + token.l | 2 ++ + 12 files changed, 140 insertions(+), 8 deletions(-) + create mode 100644 strsep.c + create mode 100644 timegm.c + +diff --git a/GNUmakefile b/GNUmakefile +index 73e840b..d5dc128 100644 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -13,7 +13,8 @@ UNAME= $(shell uname -s) + + SRCS= attrstack.c config.c detailer.c diff.c fattr.c fixups.c fnmatch.c \ + globtree.c idcache.c keyword.c lister.c main.c misc.c mux.c pathcomp.c \ +- parse.c proto.c status.c stream.c threads.c token.c updater.c ++ parse.c proto.c status.c stream.c threads.c token.c updater.c \ ++ strsep.c timegm.c + OBJS= $(SRCS:.c=.o) + + WARNS= -Wall -W -Wno-unused-parameter -Wmissing-prototypes -Wpointer-arith \ +diff --git a/diff.c b/diff.c +index 7ced38e..b6e1d7d 100644 +--- a/diff.c ++++ b/diff.c +@@ -27,7 +27,11 @@ + */ + + #include ++#if !defined(__sun) + #include ++#else ++#include ++#endif + #include + #include + #include +@@ -136,7 +140,7 @@ diff_apply(struct stream *rd, struct stream *orig, struct stream *dest, + if (noeol) { + error = stream_truncate_rel(dest, -1); + if (error) { +- warn("stream_truncate_rel"); ++ fprintf(stderr,"stream_truncate_rel"); + return (-1); + } + } +diff --git a/keyword.c b/keyword.c +index 0cbb3f9..58f1786 100644 +--- a/keyword.c ++++ b/keyword.c +@@ -27,7 +27,9 @@ + */ + + #include ++#if !defined(__sun) + #include ++#endif + #include + #include + #include +diff --git a/main.c b/main.c +index fa3b44d..4781169 100644 +--- a/main.c ++++ b/main.c +@@ -26,7 +26,7 @@ + * $FreeBSD: projects/csup/main.c,v 1.39 2006/03/07 12:02:13 mux Exp $ + */ + +-#include ++#include "/usr/ucbinclude/sys/file.h" + #include + #include + +diff --git a/misc.c b/misc.c +index 875e15c..6c720ac 100644 +--- a/misc.c ++++ b/misc.c +@@ -31,7 +31,6 @@ + #include + + #include +-#include + #include + #include + #include +@@ -47,6 +46,21 @@ + #include "main.h" + #include "misc.h" + ++#if defined(__sun) ++#include ++void ++err(int eval, const char* fmt, ...) { ++ va_list args; ++ va_start( args ); ++ fprintf( stderr, "ERROR: " ); ++ fprintf( stderr, fmt, args ); ++ va_end( args ); ++ if( eval ) exit(eval); ++} ++#else ++#include ++#endif ++ + struct pattlist { + char **patterns; + size_t size; +@@ -403,7 +417,7 @@ xasprintf(char **ret, const char *format, ...) + int rv; + + va_start(ap, format); +- rv = vasprintf(ret, format, ap); ++ rv = vsprintf(ret, format, ap); + va_end(ap); + if (*ret == NULL) + err(1, "asprintf"); +diff --git a/misc.h b/misc.h +index 51c2b53..5dee4bc 100644 +--- a/misc.h ++++ b/misc.h +@@ -30,10 +30,10 @@ + + #include + +-#include ++#include + + /* If we're not compiling in a C99 environment, define the C99 types. */ +-#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901 ++#if !defined(__sun) && (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901) + + #ifdef uint32_t + #undef uint32_t +@@ -51,7 +51,11 @@ + #define uint8_t u_int8_t + + #else +-#include ++#include ++#include ++/* Use substitute */ ++void err(int eval, const char* fmt, ...); ++char * strsep (char **stringp, const char *delim); + #endif + + /* This is a GCC-specific keyword but some other compilers (namely icc) +diff --git a/proto.c b/proto.c +index 5ddaba3..553c06b 100644 +--- a/proto.c ++++ b/proto.c +@@ -33,7 +33,9 @@ + #include + + #include ++#if !defined (__sun) + #include ++#endif + #include + #include + #include +diff --git a/stream.c b/stream.c +index 91b0e80..ec46260 100644 +--- a/stream.c ++++ b/stream.c +@@ -31,7 +31,11 @@ + + #include + #include ++#if !defined(__sun) + #include ++#else ++#include ++#endif + #include + #include + #include +@@ -861,8 +865,10 @@ zfilter_init(struct stream *stream, void __unused *data) + state->zfree = zfilter_free; + state->opaque = Z_NULL; + rv = inflateInit(state); ++/* + if (rv != Z_OK) + errx(1, "inflateInit: %s", state->msg); ++*/ + buf = buf_new(buf_size(stream->rdbuf)); + zf->rdbuf = stream->rdbuf; + stream->rdbuf = buf; +@@ -874,8 +880,10 @@ zfilter_init(struct stream *stream, void __unused *data) + state->zfree = zfilter_free; + state->opaque = Z_NULL; + rv = deflateInit(state, Z_DEFAULT_COMPRESSION); ++/* + if (rv != Z_OK) + errx(1, "deflateInit: %s", state->msg); ++*/ + buf = buf_new(buf_size(stream->wrbuf)); + zf->wrbuf = stream->wrbuf; + stream->wrbuf = buf; +@@ -971,8 +979,10 @@ again: + lastin = state->avail_in; + lastout = state->avail_out; + rv = deflate(state, flags); ++/* + if (rv != Z_BUF_ERROR && rv != Z_OK && rv != Z_STREAM_END) + errx(1, "deflate: %s", state->msg); ++*/ + ate = lastin - state->avail_in; + prod = lastout - state->avail_out; + buf_less(buf, ate); +@@ -1026,8 +1036,10 @@ again: + return (0); + goto again; + } ++/* + if (rv != Z_STREAM_END && rv != Z_OK) + errx(1, "inflate: %s", state->msg); ++*/ + if (rv == Z_STREAM_END) + zf->flags |= ZFILTER_EOF; + buf_more(buf, new); +diff --git a/strsep.c b/strsep.c +new file mode 100644 +index 0000000..9f2fdd2 +--- /dev/null ++++ b/strsep.c +@@ -0,0 +1,58 @@ ++/* Copyright (C) 2004, 2007 Free Software Foundation, Inc. ++ ++ Written by Yoann Vandoorselaere . ++ ++ 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, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ ++ ++#ifdef HAVE_CONFIG_H ++# include ++#endif ++ ++/* Specification. */ ++#include ++ ++char * ++strsep (char **stringp, const char *delim) ++{ ++ char *start = *stringp; ++ char *ptr; ++ ++ if (start == NULL) ++ return NULL; ++ ++ /* Optimize the case of no delimiters. */ ++ if (delim[0] == '\0') ++ { ++ *stringp = NULL; ++ return start; ++ } ++ ++ /* Optimize the case of one delimiter. */ ++ if (delim[1] == '\0') ++ ptr = strchr (start, delim[0]); ++ else ++ /* The general case. */ ++ ptr = strpbrk (start, delim); ++ if (ptr == NULL) ++ { ++ *stringp = NULL; ++ return start; ++ } ++ ++ *ptr = '\0'; ++ *stringp = ptr + 1; ++ ++ return start; ++} +diff --git a/threads.c b/threads.c +index 2525a10..2dd8c64 100644 +--- a/threads.c ++++ b/threads.c +@@ -27,7 +27,9 @@ + */ + + #include ++#if !defined(__sun) + #include ++#endif + #include + #include + +diff --git a/timegm.c b/timegm.c +new file mode 100644 +index 0000000..e028b4e +--- /dev/null ++++ b/timegm.c +@@ -0,0 +1,31 @@ ++ ++ ++#include ++ ++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)); ++} +diff --git a/token.l b/token.l +index 44e417b..6b218fc 100644 +--- a/token.l ++++ b/token.l +@@ -27,7 +27,9 @@ + * $FreeBSD: projects/csup/token.l,v 1.18 2006/03/07 02:13:55 mux Exp $ + */ + ++#if !defined(__sun) + #include ++#endif + #include + #include + +-- +1.7.0 + Deleted: csw/mgar/pkg/csup/trunk/files/CSWcsup.gspec =================================================================== --- csw/mgar/pkg/csup/trunk/files/CSWcsup.gspec 2010-05-02 14:32:59 UTC (rev 9800) +++ csw/mgar/pkg/csup/trunk/files/CSWcsup.gspec 2010-05-03 13:32:56 UTC (rev 9801) @@ -1,3 +0,0 @@ -%var bitname csup -%var pkgname CSWcsup -%copyright url file://%{WORKSRC}/LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue May 4 02:42:50 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 04 May 2010 00:42:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[9802] csw/mgar/pkg/colormake/trunk/ Message-ID: Revision: 9802 http://gar.svn.sourceforge.net/gar/?rev=9802&view=rev Author: bdwalton Date: 2010-05-04 00:42:49 +0000 (Tue, 04 May 2010) Log Message: ----------- colormake: switch to my gar to fully experiment with gar/git Property Changed: ---------------- csw/mgar/pkg/colormake/trunk/ Property changes on: csw/mgar/pkg/colormake/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-bwalton This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue May 4 04:10:50 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 04 May 2010 02:10:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[9803] csw/mgar/gar/v2-bwalton/gar.mk Message-ID: Revision: 9803 http://gar.svn.sourceforge.net/gar/?rev=9803&view=rev Author: bdwalton Date: 2010-05-04 02:10:50 +0000 (Tue, 04 May 2010) Log Message: ----------- gar/v2-bwalton: enforce a basic ~/.gitconfig Modified Paths: -------------- csw/mgar/gar/v2-bwalton/gar.mk Modified: csw/mgar/gar/v2-bwalton/gar.mk =================================================================== --- csw/mgar/gar/v2-bwalton/gar.mk 2010-05-04 00:42:49 UTC (rev 9802) +++ csw/mgar/gar/v2-bwalton/gar.mk 2010-05-04 02:10:50 UTC (rev 9803) @@ -389,9 +389,40 @@ extract-modulated: checksum-modulated $(EXTRACTDIR) $(COOKIEDIR) \ $(addprefix dep-$(GARDIR)/,$(EXTRACTDEPS)) \ announce-modulation \ - pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS) $(if $(filter $(firstword $(MODULATIONS)),$(MODULATION)),post-extract-gitsnap) post-extract-$(MODULATION) post-extract-modulated + pre-extract-modulated pre-extract-$(MODULATION) pre-extract-git-check $(EXTRACT_TARGETS) $(if $(filter $(firstword $(MODULATIONS)),$(MODULATION)),post-extract-gitsnap) post-extract-$(MODULATION) post-extract-modulated @$(DONADA) +pre-extract-git-check: + @( if [ ! -f $(HOME)/.gitconfig ]; then \ + name=`getent passwd $$USER | awk -F: '{print $$5}'`; \ + echo "===================================================="; \ + echo "You need to create a basic ~/.gitconfig."; \ + echo "Try: "; \ + echo " git config --global user.email $$USER at opencsw.org"; \ + echo " git config --global user.name \"$$name\""; \ + echo "===================================================="; \ + exit 1; \ + else \ + g_email=`git config --global user.email`; \ + g_name=`git config --global user.name`; \ + email=$$USER at opencsw.org; \ + name=`getent passwd $$USER | awk -F: '{print $$5}'`; \ + if [ -z "$$g_email" ]; then \ + echo "==================================================="; \ + echo "Your ~/.gitconfig doesn't define user.email. Try:"; \ + echo " git config --global user.email $$email"; \ + echo "==================================================="; \ + exit 1; \ + elif [ -z "$$g_name" ]; then \ + echo "==================================================="; \ + echo "Your ~/.gitconfig doesn't define user.name. Try:"; \ + echo " git config --global user.name '$$name'"; \ + echo "==================================================="; \ + exit 1; \ + fi; \ + fi ) + @$(MAKECOOKIE) + post-extract-gitsnap: $(EXTRACT_TARGETS) @echo Snapshotting extracted source tree with git... @( cd $(WORKSRC); git init; git add .; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue May 4 04:50:41 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 04 May 2010 02:50:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[9804] csw/mgar/gar/v2-bwalton Message-ID: Revision: 9804 http://gar.svn.sourceforge.net/gar/?rev=9804&view=rev Author: bdwalton Date: 2010-05-04 02:50:41 +0000 (Tue, 04 May 2010) Log Message: ----------- gar/v2-bwalton: commit individual patches with git instead of one lump commit; use git am where possible, patch where not Modified Paths: -------------- csw/mgar/gar/v2-bwalton/gar.lib.mk csw/mgar/gar/v2-bwalton/gar.mk Modified: csw/mgar/gar/v2-bwalton/gar.lib.mk =================================================================== --- csw/mgar/gar/v2-bwalton/gar.lib.mk 2010-05-04 02:10:50 UTC (rev 9803) +++ csw/mgar/gar/v2-bwalton/gar.lib.mk 2010-05-04 02:50:41 UTC (rev 9804) @@ -471,10 +471,23 @@ @gzip -dc $(DOWNLOADDIR)/$* | $(GARPATCH) @$(MAKECOOKIE) -# apply normal patches +# apply normal patches (git format-patch output or old-style diff -r) +# git should only be used in $(WORKSRC_FIRSTMOD) normal-patch-%: @echo " ==> Applying patch $(DOWNLOADDIR)/$*" - $(GARPATCH) < $(DOWNLOADDIR)/$* + @( if [ -d "$(abspath $(WORKSRC)/.git)" ]; then \ + if ggrep -q 'Subject:' $(abspath $(DOWNLOADDIR)/$*); then \ + echo Adding git-style patch...; \ + cd $(WORKSRC); git am $(abspath $(DOWNLOADDIR)/$*); \ + else \ + echo Adding old-style patch...; \ + $(GARPATCH) < $(DOWNLOADDIR)/$*; \ + cd $(WORKSRC); git add -A; \ + git commit -am "old style patch: $*"; \ + fi; \ + else \ + $(GARPATCH) < $(DOWNLOADDIR)/$*; \ + fi ) @$(MAKECOOKIE) ### PATCH FILE TYPE MAPPINGS ### Modified: csw/mgar/gar/v2-bwalton/gar.mk =================================================================== --- csw/mgar/gar/v2-bwalton/gar.mk 2010-05-04 02:10:50 UTC (rev 9803) +++ csw/mgar/gar/v2-bwalton/gar.mk 2010-05-04 02:50:41 UTC (rev 9804) @@ -448,16 +448,9 @@ patch: pre-patch $(addprefix patch-,$(MODULATIONS)) post-patch @$(DONADA) -patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) $(if $(filter $(firstword $(MODULATIONS)),$(MODULATION)),post-patch-gitsnap) post-patch-$(MODULATION) post-patch-modulated +patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) post-patch-$(MODULATION) post-patch-modulated @$(DONADA) -post-patch-gitsnap: $(PATCH_TARGETS) - @echo Snapshotting patched source tree with git... - @( cd $(WORKSRC); \ - git checkout -b csw-$(GARVERSION) upstream-$(GARVERSION); \ - git add -A; git commit -m "CSW patches for $(GARVERSION)" ) - @$(MAKECOOKIE) - # returns true if patch has completed successfully, false # otherwise patch-p: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue May 4 08:23:44 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 04 May 2010 06:23:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[9805] csw/mgar/pkg/password-gorilla/trunk/Makefile Message-ID: Revision: 9805 http://gar.svn.sourceforge.net/gar/?rev=9805&view=rev Author: skayser Date: 2010-05-04 06:23:44 +0000 (Tue, 04 May 2010) Log Message: ----------- password-gorilla: added checkpkg override for CSWtk Modified Paths: -------------- csw/mgar/pkg/password-gorilla/trunk/Makefile Modified: csw/mgar/pkg/password-gorilla/trunk/Makefile =================================================================== --- csw/mgar/pkg/password-gorilla/trunk/Makefile 2010-05-04 02:50:41 UTC (rev 9804) +++ csw/mgar/pkg/password-gorilla/trunk/Makefile 2010-05-04 06:23:44 UTC (rev 9805) @@ -29,6 +29,8 @@ INSTALL_SCRIPTS = custom TEST_SCRIPTS = +CHECKPKG_OVERRIDES_CSWpassword-gorilla += surplus-dependency|CSWtk + include gar/category.mk install-custom: TCLPKGS = twofish blowfish sha1 pwsafe This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue May 4 08:48:30 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 04 May 2010 06:48:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[9806] csw/mgar/pkg/password-gorilla/trunk/Makefile Message-ID: Revision: 9806 http://gar.svn.sourceforge.net/gar/?rev=9806&view=rev Author: skayser Date: 2010-05-04 06:48:30 +0000 (Tue, 04 May 2010) Log Message: ----------- password-gorilla: fix permissions Modified Paths: -------------- csw/mgar/pkg/password-gorilla/trunk/Makefile Modified: csw/mgar/pkg/password-gorilla/trunk/Makefile =================================================================== --- csw/mgar/pkg/password-gorilla/trunk/Makefile 2010-05-04 06:23:44 UTC (rev 9805) +++ csw/mgar/pkg/password-gorilla/trunk/Makefile 2010-05-04 06:48:30 UTC (rev 9806) @@ -41,7 +41,7 @@ cp $(WORKSRC)/$(P)/* $(TCLDEST)/$(P); \ chmod 644 $(TCLDEST)/$(P)/*; \ ) - cp $(WORKSRC)/gorilla $(WORKSRC)/gorilla.tcl $(TCLDEST) + ginstall -m755 $(WORKSRC)/gorilla $(WORKSRC)/gorilla.tcl $(TCLDEST) mkdir -p $(DESTDIR)$(bindir) echo '#!/bin/sh\nexec $(datadir)/password-gorilla/gorilla' > \ $(DESTDIR)$(bindir)/password-gorilla This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue May 4 09:00:17 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 04 May 2010 07:00:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[9807] csw/mgar/pkg/password-gorilla/trunk/Makefile Message-ID: Revision: 9807 http://gar.svn.sourceforge.net/gar/?rev=9807&view=rev Author: skayser Date: 2010-05-04 07:00:17 +0000 (Tue, 04 May 2010) Log Message: ----------- password-gorilla: add missing file Modified Paths: -------------- csw/mgar/pkg/password-gorilla/trunk/Makefile Modified: csw/mgar/pkg/password-gorilla/trunk/Makefile =================================================================== --- csw/mgar/pkg/password-gorilla/trunk/Makefile 2010-05-04 06:48:30 UTC (rev 9806) +++ csw/mgar/pkg/password-gorilla/trunk/Makefile 2010-05-04 07:00:17 UTC (rev 9807) @@ -41,7 +41,11 @@ cp $(WORKSRC)/$(P)/* $(TCLDEST)/$(P); \ chmod 644 $(TCLDEST)/$(P)/*; \ ) - ginstall -m755 $(WORKSRC)/gorilla $(WORKSRC)/gorilla.tcl $(TCLDEST) + ginstall -m755 \ + $(WORKSRC)/gorilla \ + $(WORKSRC)/gorilla.tcl \ + $(WORKSRC)/isaac.tcl + $(TCLDEST) mkdir -p $(DESTDIR)$(bindir) echo '#!/bin/sh\nexec $(datadir)/password-gorilla/gorilla' > \ $(DESTDIR)$(bindir)/password-gorilla This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue May 4 09:03:52 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 04 May 2010 07:03:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[9808] csw/mgar/pkg/password-gorilla/trunk/Makefile Message-ID: Revision: 9808 http://gar.svn.sourceforge.net/gar/?rev=9808&view=rev Author: skayser Date: 2010-05-04 07:03:52 +0000 (Tue, 04 May 2010) Log Message: ----------- password-gorilla: add missing file Modified Paths: -------------- csw/mgar/pkg/password-gorilla/trunk/Makefile Modified: csw/mgar/pkg/password-gorilla/trunk/Makefile =================================================================== --- csw/mgar/pkg/password-gorilla/trunk/Makefile 2010-05-04 07:00:17 UTC (rev 9807) +++ csw/mgar/pkg/password-gorilla/trunk/Makefile 2010-05-04 07:03:52 UTC (rev 9808) @@ -44,7 +44,7 @@ ginstall -m755 \ $(WORKSRC)/gorilla \ $(WORKSRC)/gorilla.tcl \ - $(WORKSRC)/isaac.tcl + $(WORKSRC)/isaac.tcl \ $(TCLDEST) mkdir -p $(DESTDIR)$(bindir) echo '#!/bin/sh\nexec $(datadir)/password-gorilla/gorilla' > \ 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 May 4 10:24:36 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 04 May 2010 08:24:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[9809] csw/mgar/pkg/diffutils/trunk Message-ID: Revision: 9809 http://gar.svn.sourceforge.net/gar/?rev=9809&view=rev Author: dmichelsen Date: 2010-05-04 08:24:36 +0000 (Tue, 04 May 2010) Log Message: ----------- diffutils: Update to 3.0 and include gnulinks Modified Paths: -------------- csw/mgar/pkg/diffutils/trunk/Makefile csw/mgar/pkg/diffutils/trunk/checksums Modified: csw/mgar/pkg/diffutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/diffutils/trunk/Makefile 2010-05-04 07:03:52 UTC (rev 9808) +++ csw/mgar/pkg/diffutils/trunk/Makefile 2010-05-04 08:24:36 UTC (rev 9809) @@ -1,5 +1,5 @@ GARNAME = diffutils -GARVERSION = 2.9 +GARVERSION = 3.0 CATEGORIES = utils DESCRIPTION = Diff utilities @@ -13,7 +13,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -DEP_PKGS = CSWggettextrt CSWiconv CSWlibsigsegv +RUNTIME_DEP_PKGS = CSWggettextrt CSWiconv CSWlibsigsegv +BUILD_DEP_PKGS = CSWtextutils CSWggettext CSWiconv CSWlibsigsegv CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --program-prefix=g @@ -23,3 +24,12 @@ EXTRA_MERGE_EXCLUDE_FILES = /opt/csw/lib/charset.alias include gar/category.mk + +post-install-modulated: + ginstall -d $(DESTDIR)$(prefix)/gnu + $(foreach G,$(notdir $(wildcard $(DESTDIR)$(bindir)/*)),ln -s ../bin/$G $(DESTDIR)$(prefix)/gnu/$(patsubst g%,%,$G);) + @$(MAKECOOKIE) + +# We need GNU tail for the testsuite +PATH := /opt/csw/gnu:$(PATH) + Modified: csw/mgar/pkg/diffutils/trunk/checksums =================================================================== --- csw/mgar/pkg/diffutils/trunk/checksums 2010-05-04 07:03:52 UTC (rev 9808) +++ csw/mgar/pkg/diffutils/trunk/checksums 2010-05-04 08:24:36 UTC (rev 9809) @@ -1 +1 @@ -d6bc1bdc874ddb14cfed4d1655a0dbbe diffutils-2.9.tar.gz +684aaba1baab743a2a90e52162ff07da diffutils-3.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue May 4 22:28:19 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 04 May 2010 20:28:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[9810] csw/mgar/pkg/xterm/trunk Message-ID: Revision: 9810 http://gar.svn.sourceforge.net/gar/?rev=9810&view=rev Author: skayser Date: 2010-05-04 20:28:19 +0000 (Tue, 04 May 2010) Log Message: ----------- xterm: version bump Modified Paths: -------------- csw/mgar/pkg/xterm/trunk/Makefile csw/mgar/pkg/xterm/trunk/checksums csw/mgar/pkg/xterm/trunk/files/README.CSW Modified: csw/mgar/pkg/xterm/trunk/Makefile =================================================================== --- csw/mgar/pkg/xterm/trunk/Makefile 2010-05-04 08:24:36 UTC (rev 9809) +++ csw/mgar/pkg/xterm/trunk/Makefile 2010-05-04 20:28:19 UTC (rev 9810) @@ -1,5 +1,7 @@ +# TODO +# ! Test app-defaults loading (cf. files/README.CSW) GARNAME = xterm -GARVERSION = 256 +GARVERSION = 258 CATEGORIES = apps DESCRIPTION = Terminal emulator for the X Window System Modified: csw/mgar/pkg/xterm/trunk/checksums =================================================================== --- csw/mgar/pkg/xterm/trunk/checksums 2010-05-04 08:24:36 UTC (rev 9809) +++ csw/mgar/pkg/xterm/trunk/checksums 2010-05-04 20:28:19 UTC (rev 9810) @@ -1,2 +1,2 @@ d028c88c07ae91b8367ee76cdcb16cc8 COPYING -6da5c166e1c633fc26917b66d6433f1f xterm-256.tgz +bcf4f0ba51f5f58fd5bef76b3d05e40e xterm-258.tgz Modified: csw/mgar/pkg/xterm/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/xterm/trunk/files/README.CSW 2010-05-04 08:24:36 UTC (rev 9809) +++ csw/mgar/pkg/xterm/trunk/files/README.CSW 2010-05-04 20:28:19 UTC (rev 9810) @@ -27,12 +27,3 @@ http://www.faqs.org/faqs/x-faq/part2/section-22.html - -Note: mkWidth/-mk_width activated per default ---------------------------------------------- - -This xterm has been adjusted to set the mkWidth resource to true per -default (xterm command line argument -mk_width), which works around some -bugs with box drawing characters and Solaris locales. In case you want -to restore the default behaviour, either start xterm with +mk_width or -set the mkWidth resource to false. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue May 4 23:37:51 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 04 May 2010 21:37:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[9811] csw/mgar/pkg/xterm/trunk Message-ID: Revision: 9811 http://gar.svn.sourceforge.net/gar/?rev=9811&view=rev Author: skayser Date: 2010-05-04 21:37:51 +0000 (Tue, 04 May 2010) Log Message: ----------- xterm: adjust path for app-defaults Modified Paths: -------------- csw/mgar/pkg/xterm/trunk/Makefile csw/mgar/pkg/xterm/trunk/files/README.CSW Modified: csw/mgar/pkg/xterm/trunk/Makefile =================================================================== --- csw/mgar/pkg/xterm/trunk/Makefile 2010-05-04 20:28:19 UTC (rev 9810) +++ csw/mgar/pkg/xterm/trunk/Makefile 2010-05-04 21:37:51 UTC (rev 9811) @@ -1,5 +1,7 @@ -# TODO -# ! Test app-defaults loading (cf. files/README.CSW) +# TODO (release-critical prefixed with !, non release-critical with *) +# * app-defaults are currently in $(prefix)/X11/etc/X11/app-defaults +# because of our libXt. Once the whole X11 mess is sorted, they +# might go to $(prefix)/etc/X11/app-defaults instead. GARNAME = xterm GARVERSION = 258 CATEGORIES = apps @@ -63,6 +65,10 @@ CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +# Xt app-default files need to go where Xt looks for them (one of +# $(prefix)/X11/{etc,share,lib}/X11/app-defaults) +CONFIGURE_ARGS += --with-app-defaults=$(prefix)/X11/etc/X11/app-defaults + # Make sure to runtime link the same way that we link edited # * xterm link edit order is (-L/-R): X11/lib/, lib/ # * LD_OPTIONS would prepend (-R): lib/ Modified: csw/mgar/pkg/xterm/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/xterm/trunk/files/README.CSW 2010-05-04 20:28:19 UTC (rev 9810) +++ csw/mgar/pkg/xterm/trunk/files/README.CSW 2010-05-04 21:37:51 UTC (rev 9811) @@ -12,18 +12,3 @@ SSH'ing to machines where xterm-new isn't known to terminfo ("terminal not fully functional" messages). That's the main reason TERM=xterm-new hasn't been compiled in as a default by the way. - - -Note: X resource files in /opt/csw/lib/X11/app-defaults -------------------------------------------------------- - -Although this package delivers some X resource files in -/opt/csw/lib/X11/app-defaults/ this folder is not evaluated by the -Solaris libXt per default. - -Either treat them as example files and copy and paste what you need into -your system / personal X resource files or set XFILESEARCHPATH / -XUSERFILESEARCHPATH to honor this directory. - - http://www.faqs.org/faqs/x-faq/part2/section-22.html - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed May 5 01:00:31 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 04 May 2010 23:00:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[9812] csw/mgar/pkg/nano/trunk Message-ID: Revision: 9812 http://gar.svn.sourceforge.net/gar/?rev=9812&view=rev Author: skayser Date: 2010-05-04 23:00:30 +0000 (Tue, 04 May 2010) Log Message: ----------- nano: version bump to 2.2.4, dropped post-scripts in favor of cswtexinfo Modified Paths: -------------- csw/mgar/pkg/nano/trunk/Makefile csw/mgar/pkg/nano/trunk/checksums csw/mgar/pkg/nano/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/nano/trunk/files/CSWnano.postinstall csw/mgar/pkg/nano/trunk/files/CSWnano.postremove Modified: csw/mgar/pkg/nano/trunk/Makefile =================================================================== --- csw/mgar/pkg/nano/trunk/Makefile 2010-05-04 21:37:51 UTC (rev 9811) +++ csw/mgar/pkg/nano/trunk/Makefile 2010-05-04 23:00:30 UTC (rev 9812) @@ -1,5 +1,5 @@ GARNAME = nano -GARVERSION = 2.0.9 +GARVERSION = 2.2.4 CATEGORIES = utils DESCRIPTION = Enhanced clone of the Pico text editor @@ -10,11 +10,9 @@ functionality". endef -MASTER_SITES = http://www.nano-editor.org/dist/v2.0/ -SPKG_SOURCEURL = http://www.nano-editor.org/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += CSWnano.postinstall CSWnano.postremove - +VENDOR_URL = http://www.nano-editor.org/ +MASTER_SITES = http://www.nano-editor.org/dist/v2.2/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz RUNTIME_DEP_PKGS = CSWggettextrt CSWncurses Modified: csw/mgar/pkg/nano/trunk/checksums =================================================================== --- csw/mgar/pkg/nano/trunk/checksums 2010-05-04 21:37:51 UTC (rev 9811) +++ csw/mgar/pkg/nano/trunk/checksums 2010-05-04 23:00:30 UTC (rev 9812) @@ -1,3 +1 @@ -c1bfcb567c7a645b5c4f5130158d7808 download/CSWnano.postinstall -46649817cd38cea9fb6fb8c201f7f227 download/CSWnano.postremove -2be94dc43fb60fff4626a2401a977220 download/nano-2.0.9.tar.gz +6304308afb1f7ef4a5e93eb99206632a nano-2.2.4.tar.gz Deleted: csw/mgar/pkg/nano/trunk/files/CSWnano.postinstall =================================================================== --- csw/mgar/pkg/nano/trunk/files/CSWnano.postinstall 2010-05-04 21:37:51 UTC (rev 9811) +++ csw/mgar/pkg/nano/trunk/files/CSWnano.postinstall 2010-05-04 23:00:30 UTC (rev 9812) @@ -1,18 +0,0 @@ -#!/bin/sh -# -# postinstall - this script is executed after the CVS PKG install -# -# This script updates the info dir file for textinfo - -if [ "$PKG_ROOT_DIR" = "" ] ; then PKG_ROOT_DIR=/ ; fi -if [ ! -x "$PKG_ROOT_DIR/opt/csw/sbin/mkdirentries" ] ; then exit 0; fi - -savepath=$PATH -PATH=/usr/bin:/opt/csw/bin - -echo "Updating the info dir file for CSWtexinfo" -/usr/sbin/chroot $PKG_ROOT_DIR /opt/csw/sbin/mkdirentries - -PATH=$savepath - -exit 0 Deleted: csw/mgar/pkg/nano/trunk/files/CSWnano.postremove =================================================================== --- csw/mgar/pkg/nano/trunk/files/CSWnano.postremove 2010-05-04 21:37:51 UTC (rev 9811) +++ csw/mgar/pkg/nano/trunk/files/CSWnano.postremove 2010-05-04 23:00:30 UTC (rev 9812) @@ -1,16 +0,0 @@ -# postremove - this script is executed after the CVS PKG remove -# -# This script updates the info dir file for textinfo - -if [ "$PKG_ROOT_DIR" = "" ] ; then PKG_ROOT_DIR=/ ; fi -if [ ! -x "$PKG_ROOT_DIR/opt/csw/sbin/mkdirentries" ] ; then exit 0; fi - -savepath=$PATH -PATH=/usr/bin:/opt/csw/bin - -echo "Updating the info dir file for CSWtexinfo" -/usr/sbin/chroot $PKG_ROOT_DIR /opt/csw/sbin/mkdirentries - -PATH=savepath - -exit 0 Modified: csw/mgar/pkg/nano/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/nano/trunk/files/changelog.CSW 2010-05-04 21:37:51 UTC (rev 9811) +++ csw/mgar/pkg/nano/trunk/files/changelog.CSW 2010-05-04 23:00:30 UTC (rev 9812) @@ -1,3 +1,9 @@ +nano (2.2.4,REV=2010.05.05) + + * Version bump to 2.2.4. + + -- Sebastian Kayser Wed, 5 May 2010 00:59:30 +0200 + nano (2.0.9,REV=2009.07.05) * Adopted and updated to 2.0.9. (Closes #2969, #3082) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed May 5 03:00:14 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 05 May 2010 01:00:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[9813] csw/mgar/gar/v2-bwalton/gar.mk Message-ID: Revision: 9813 http://gar.svn.sourceforge.net/gar/?rev=9813&view=rev Author: bdwalton Date: 2010-05-05 01:00:14 +0000 (Wed, 05 May 2010) Log Message: ----------- gar/v2-bwalton: initialize a git repo for each modulation except global Modified Paths: -------------- csw/mgar/gar/v2-bwalton/gar.mk Modified: csw/mgar/gar/v2-bwalton/gar.mk =================================================================== --- csw/mgar/gar/v2-bwalton/gar.mk 2010-05-04 23:00:30 UTC (rev 9812) +++ csw/mgar/gar/v2-bwalton/gar.mk 2010-05-05 01:00:14 UTC (rev 9813) @@ -379,7 +379,7 @@ # We call an additional extract-modulated without resetting any variables so # a complete unpacked set goes to the global dir for packaging (like gspec) -extract: checksum $(COOKIEDIR) pre-extract extract-modulated $(addprefix extract-,$(MODULATIONS)) post-extract +extract: checksum $(COOKIEDIR) pre-extract pre-extract-git-check extract-modulated $(addprefix extract-,$(MODULATIONS)) post-extract @$(DONADA) extract-global: $(if $(filter global,$(MODULATION)),extract-modulated) @@ -389,7 +389,7 @@ extract-modulated: checksum-modulated $(EXTRACTDIR) $(COOKIEDIR) \ $(addprefix dep-$(GARDIR)/,$(EXTRACTDEPS)) \ announce-modulation \ - pre-extract-modulated pre-extract-$(MODULATION) pre-extract-git-check $(EXTRACT_TARGETS) $(if $(filter $(firstword $(MODULATIONS)),$(MODULATION)),post-extract-gitsnap) post-extract-$(MODULATION) post-extract-modulated + pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS) $(if $(filter global,$(MODULATION)),,post-extract-gitsnap) post-extract-$(MODULATION) post-extract-modulated @$(DONADA) pre-extract-git-check: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed May 5 04:20:43 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 05 May 2010 02:20:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9814] csw/mgar/gar/v2-bwalton/gar.mk Message-ID: Revision: 9814 http://gar.svn.sourceforge.net/gar/?rev=9814&view=rev Author: bdwalton Date: 2010-05-05 02:20:42 +0000 (Wed, 05 May 2010) Log Message: ----------- gar/v2-bwalton: extract git code now creates csw branch; make announcement nicer Modified Paths: -------------- csw/mgar/gar/v2-bwalton/gar.mk Modified: csw/mgar/gar/v2-bwalton/gar.mk =================================================================== --- csw/mgar/gar/v2-bwalton/gar.mk 2010-05-05 01:00:14 UTC (rev 9813) +++ csw/mgar/gar/v2-bwalton/gar.mk 2010-05-05 02:20:42 UTC (rev 9814) @@ -424,10 +424,11 @@ @$(MAKECOOKIE) post-extract-gitsnap: $(EXTRACT_TARGETS) - @echo Snapshotting extracted source tree with git... + @echo ' ==> Snapshotting extracted source tree with git' @( cd $(WORKSRC); git init; git add .; \ git commit -m "Upstream $(GARVERSION)"; \ - git tag -a -m "Upstream $(GARVERSION)" upstream-$(GARVERSION) ) + git tag -am "Upstream $(GARVERSION)" upstream-$(GARVERSION); \ + git checkout -b csw ) @$(MAKECOOKIE) # returns true if extract has completed successfully, false This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed May 5 04:25:29 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 05 May 2010 02:25:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[9815] csw/mgar/gar/v2-bwalton/gar.lib.mk Message-ID: Revision: 9815 http://gar.svn.sourceforge.net/gar/?rev=9815&view=rev Author: bdwalton Date: 2010-05-05 02:25:29 +0000 (Wed, 05 May 2010) Log Message: ----------- gar/v2-bwalton: commit each patch after application, no more modulation detection based on presence of .git/ Modified Paths: -------------- csw/mgar/gar/v2-bwalton/gar.lib.mk Modified: csw/mgar/gar/v2-bwalton/gar.lib.mk =================================================================== --- csw/mgar/gar/v2-bwalton/gar.lib.mk 2010-05-05 02:20:42 UTC (rev 9814) +++ csw/mgar/gar/v2-bwalton/gar.lib.mk 2010-05-05 02:25:29 UTC (rev 9815) @@ -472,22 +472,17 @@ @$(MAKECOOKIE) # apply normal patches (git format-patch output or old-style diff -r) -# git should only be used in $(WORKSRC_FIRSTMOD) normal-patch-%: @echo " ==> Applying patch $(DOWNLOADDIR)/$*" - @( if [ -d "$(abspath $(WORKSRC)/.git)" ]; then \ - if ggrep -q 'Subject:' $(abspath $(DOWNLOADDIR)/$*); then \ - echo Adding git-style patch...; \ - cd $(WORKSRC); git am $(abspath $(DOWNLOADDIR)/$*); \ - else \ - echo Adding old-style patch...; \ - $(GARPATCH) < $(DOWNLOADDIR)/$*; \ - cd $(WORKSRC); git add -A; \ - git commit -am "old style patch: $*"; \ - fi; \ - else \ + @( if ggrep -q 'Subject:' $(abspath $(DOWNLOADDIR)/$*); then \ + echo Adding git-style patch...; \ + cd $(WORKSRC); git am $(abspath $(DOWNLOADDIR)/$*); \ + else \ + echo Adding old-style patch...; \ $(GARPATCH) < $(DOWNLOADDIR)/$*; \ - fi ) + cd $(WORKSRC); git add -A; \ + git commit -am "old style patch: $*"; \ + fi ) @$(MAKECOOKIE) ### PATCH FILE TYPE MAPPINGS ### This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed May 5 04:34:54 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 05 May 2010 02:34:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[9816] csw/mgar/gar/v2-bwalton/gar.mk Message-ID: Revision: 9816 http://gar.svn.sourceforge.net/gar/?rev=9816&view=rev Author: bdwalton Date: 2010-05-05 02:34:54 +0000 (Wed, 05 May 2010) Log Message: ----------- gar/v2-bwalton: tag git repo for each modulation with csw-$(GARVERSION) after all patches are committed Modified Paths: -------------- csw/mgar/gar/v2-bwalton/gar.mk Modified: csw/mgar/gar/v2-bwalton/gar.mk =================================================================== --- csw/mgar/gar/v2-bwalton/gar.mk 2010-05-05 02:25:29 UTC (rev 9815) +++ csw/mgar/gar/v2-bwalton/gar.mk 2010-05-05 02:34:54 UTC (rev 9816) @@ -449,7 +449,7 @@ patch: pre-patch $(addprefix patch-,$(MODULATIONS)) post-patch @$(DONADA) -patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) post-patch-$(MODULATION) post-patch-modulated +patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) post-patch-gitsnap post-patch-$(MODULATION) post-patch-modulated @$(DONADA) # returns true if patch has completed successfully, false @@ -457,6 +457,10 @@ patch-p: @$(foreach COOKIEFILE,$(PATCH_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) +post-patch-gitsnap: $(WORKSRC) $(PATCH_TARGETS) + @( cd $(WORKSRC); git tag -am "CSW $(GARVERSION)" csw-$(GARVERSION) ) + @$(MAKECOOKIE) + # Allow generation of patches from modified work source. makepatch: $(FILEDIR) @echo Makepatch: Checking for changes in work tree... This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 5 11:58:52 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 May 2010 09:58:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[9817] csw/mgar/pkg Message-ID: Revision: 9817 http://gar.svn.sourceforge.net/gar/?rev=9817&view=rev Author: dmichelsen Date: 2010-05-05 09:58:52 +0000 (Wed, 05 May 2010) Log Message: ----------- mtwrite: Initial commit Added Paths: ----------- csw/mgar/pkg/mtwrite/ csw/mgar/pkg/mtwrite/branches/ csw/mgar/pkg/mtwrite/tags/ csw/mgar/pkg/mtwrite/trunk/ csw/mgar/pkg/mtwrite/trunk/Makefile csw/mgar/pkg/mtwrite/trunk/checksums csw/mgar/pkg/mtwrite/trunk/files/ csw/mgar/pkg/mtwrite/trunk/files/0001-Create-correct-man-directory.patch csw/mgar/pkg/mtwrite/trunk/files/0002-Calculate-threadcount-instead-of-hardcoding.patch Property changes on: csw/mgar/pkg/mtwrite/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/mtwrite/trunk/Makefile =================================================================== --- csw/mgar/pkg/mtwrite/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mtwrite/trunk/Makefile 2010-05-05 09:58:52 UTC (rev 9817) @@ -0,0 +1,30 @@ +# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +GARNAME = mtwrite +GARVERSION = r90214 +CATEGORIES = lib + +DESCRIPTION = Library to enable tar and unzip to write multiple files in parallel +define BLURB +endef + +MASTER_SITES = http://www.maier-komor.de/mtwrite/ +DISTFILES = $(GARNAME)-$(GARVERSION).tgz +PATCHFILES = 0001-Create-correct-man-directory.patch +PATCHFILES += 0002-Calculate-threadcount-instead-of-hardcoding.patch + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz + +LICENSE = lgpl.txt + +CONFIGURE_SCRIPTS = + +BUILD_OVERRIDE_VARS = CC +BUILD_OVERRIDE_VAR_CC = $(CC) + +TEST_SCRIPTS = + +INSTALL_OVERRIDE_DIRS = PREFIX +PREFIX=$(prefix) + +include gar/category.mk Property changes on: csw/mgar/pkg/mtwrite/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/mtwrite/trunk/checksums =================================================================== --- csw/mgar/pkg/mtwrite/trunk/checksums (rev 0) +++ csw/mgar/pkg/mtwrite/trunk/checksums 2010-05-05 09:58:52 UTC (rev 9817) @@ -0,0 +1,3 @@ +4a3e8c3a315f81bb36efdee62a2ed770 0001-Create-correct-man-directory.patch +12d6a72ebbd9d10c1c74740ca3942a15 0002-Calculate-threadcount-instead-of-hardcoding.patch +d1bf9be5af47ac77f9308e9849453057 mtwrite-r90214.tgz Added: csw/mgar/pkg/mtwrite/trunk/files/0001-Create-correct-man-directory.patch =================================================================== --- csw/mgar/pkg/mtwrite/trunk/files/0001-Create-correct-man-directory.patch (rev 0) +++ csw/mgar/pkg/mtwrite/trunk/files/0001-Create-correct-man-directory.patch 2010-05-05 09:58:52 UTC (rev 9817) @@ -0,0 +1,25 @@ +From 8463404c64d85f9f39b164f199feefaf20b0d8cc Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 5 May 2010 11:46:44 +0200 +Subject: [PATCH 1/2] Create correct man directory + +--- + Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile b/Makefile +index 822d63d..82e4986 100644 +--- a/Makefile ++++ b/Makefile +@@ -32,7 +32,7 @@ clean: + install: mtwrite.so + -$(MKDIR) $(PREFIX)/bin + -$(MKDIR) $(PREFIX)/lib/$(OS)-$(MACH) +- -$(MKDIR) $(PREFIX)/share/man/man1 ++ -$(MKDIR) $(PREFIX)/share/man/man3 + $(CP) mtwrite.so $(PREFIX)/lib/$(OS)-$(MACH) + $(CP) mttar mtcp mtgtar mtstar mtunzip $(PREFIX)/bin + $(CP) mtwrite.3 $(PREFIX)/share/man/man3 +-- +1.7.0 + Added: csw/mgar/pkg/mtwrite/trunk/files/0002-Calculate-threadcount-instead-of-hardcoding.patch =================================================================== --- csw/mgar/pkg/mtwrite/trunk/files/0002-Calculate-threadcount-instead-of-hardcoding.patch (rev 0) +++ csw/mgar/pkg/mtwrite/trunk/files/0002-Calculate-threadcount-instead-of-hardcoding.patch 2010-05-05 09:58:52 UTC (rev 9817) @@ -0,0 +1,89 @@ +From bbacd109a1314356064f26397ff68dd1a7fa72f4 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 5 May 2010 11:55:37 +0200 +Subject: [PATCH 2/2] Calculate threadcount instead of hardcoding + +--- + mtcp | 4 ++-- + mtgtar | 4 ++-- + mtstar | 4 ++-- + mttar | 2 +- + mtunzip | 4 ++-- + 5 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/mtcp b/mtcp +index 5e9a373..62a38f2 100755 +--- a/mtcp ++++ b/mtcp +@@ -1,8 +1,8 @@ + #!/bin/ksh + INSTALLDIR=`dirname $0`/../lib +-LD_PRELOAD=$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so ++LD_PRELOAD=${LD_PRELOAD:-}:$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so + MTWRITE_VERBOSE=${MTWRITE_VERBOSE:=1} # default +-MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32} # default ++MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=`/usr/sbin/psrinfo | wc -l`} # default + MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M} # default + export LD_PRELOAD MTWRITE_VERBOSE MTWRITE_MAXTHREADS MTWRITE_MEMPERTHREAD + exec cp $@ +diff --git a/mtgtar b/mtgtar +index b56399c..0a8e9f3 100755 +--- a/mtgtar ++++ b/mtgtar +@@ -1,8 +1,8 @@ + #!/bin/ksh + INSTALLDIR=`dirname $0`/../lib +-LD_PRELOAD=$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so ++LD_PRELOAD=${LD_PRELOAD:-}:$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so + MTWRITE_VERBOSE=${MTWRITE_VERBOSE:=1} # default +-MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32} # default ++MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=`/usr/sbin/psrinfo | wc -l`} # default + MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M} # default + export LD_PRELOAD MTWRITE_VERBOSE MTWRITE_MAXTHREADS MTWRITE_MEMPERTHREAD + exec gtar $@ +diff --git a/mtstar b/mtstar +index ed37a89..3cb2b1f 100755 +--- a/mtstar ++++ b/mtstar +@@ -1,8 +1,8 @@ + #!/bin/ksh + INSTALLDIR=`dirname $0`/../lib +-LD_PRELOAD=$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so ++LD_PRELOAD=${LD_PRELOAD:-}:$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so + MTWRITE_VERBOSE=${MTWRITE_VERBOSE:=1} # default +-MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32} # default ++MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=`/usr/sbin/psrinfo | wc -l`} # default + MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M} # default + export LD_PRELOAD MTWRITE_VERBOSE MTWRITE_MAXTHREADS MTWRITE_MEMPERTHREAD + exec star $@ +diff --git a/mttar b/mttar +index ec45cec..49e985f 100755 +--- a/mttar ++++ b/mttar +@@ -2,7 +2,7 @@ + INSTALLDIR=`dirname $0`/../lib + LD_PRELOAD=${LD_PRELOAD:-}:$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so + MTWRITE_VERBOSE=${MTWRITE_VERBOSE:=1} # default +-MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32} # default ++MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=`/usr/sbin/psrinfo | wc -l`} # default + MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M} # default + export LD_PRELOAD MTWRITE_VERBOSE MTWRITE_MAXTHREADS MTWRITE_MEMPERTHREAD + exec tar $@ +diff --git a/mtunzip b/mtunzip +index 1763686..200d0d6 100755 +--- a/mtunzip ++++ b/mtunzip +@@ -1,8 +1,8 @@ + #!/bin/ksh + INSTALLDIR=`dirname $0`/../lib +-LD_PRELOAD=$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so ++LD_PRELOAD=${LD_PRELOAD:-}:$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so + MTWRITE_VERBOSE=${MTWRITE_VERBOSE:=1} # default +-MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32} # default ++MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=`/usr/sbin/psrinfo | wc -l`} # default + MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M} # default + export LD_PRELOAD MTWRITE_VERBOSE MTWRITE_MAXTHREADS MTWRITE_MEMPERTHREAD + exec unzip $@ +-- +1.7.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 Wed May 5 12:57:47 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 May 2010 10:57:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[9818] csw/mgar/pkg/mtwrite/trunk Message-ID: Revision: 9818 http://gar.svn.sourceforge.net/gar/?rev=9818&view=rev Author: dmichelsen Date: 2010-05-05 10:57:47 +0000 (Wed, 05 May 2010) Log Message: ----------- mtwrite: Some fixes Modified Paths: -------------- csw/mgar/pkg/mtwrite/trunk/Makefile csw/mgar/pkg/mtwrite/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mtwrite/trunk/files/0001-Use-man3-and-skip-intermediate-lib-dir.patch csw/mgar/pkg/mtwrite/trunk/files/0002-Hardcode-library-position.patch csw/mgar/pkg/mtwrite/trunk/files/0003-Fix-path-in-manpage.patch Removed Paths: ------------- csw/mgar/pkg/mtwrite/trunk/files/0001-Create-correct-man-directory.patch csw/mgar/pkg/mtwrite/trunk/files/0002-Calculate-threadcount-instead-of-hardcoding.patch Modified: csw/mgar/pkg/mtwrite/trunk/Makefile =================================================================== --- csw/mgar/pkg/mtwrite/trunk/Makefile 2010-05-05 09:58:52 UTC (rev 9817) +++ csw/mgar/pkg/mtwrite/trunk/Makefile 2010-05-05 10:57:47 UTC (rev 9818) @@ -9,8 +9,9 @@ MASTER_SITES = http://www.maier-komor.de/mtwrite/ DISTFILES = $(GARNAME)-$(GARVERSION).tgz -PATCHFILES = 0001-Create-correct-man-directory.patch -PATCHFILES += 0002-Calculate-threadcount-instead-of-hardcoding.patch +PATCHFILES = 0001-Use-man3-and-skip-intermediate-lib-dir.patch +PATCHFILES += 0002-Hardcode-library-position.patch +PATCHFILES += 0003-Fix-path-in-manpage.patch # File name regex to get notifications about upstream software releases UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz Modified: csw/mgar/pkg/mtwrite/trunk/checksums =================================================================== --- csw/mgar/pkg/mtwrite/trunk/checksums 2010-05-05 09:58:52 UTC (rev 9817) +++ csw/mgar/pkg/mtwrite/trunk/checksums 2010-05-05 10:57:47 UTC (rev 9818) @@ -1,3 +1,4 @@ -4a3e8c3a315f81bb36efdee62a2ed770 0001-Create-correct-man-directory.patch -12d6a72ebbd9d10c1c74740ca3942a15 0002-Calculate-threadcount-instead-of-hardcoding.patch +38d741f25b39df66bc3a76ad9ca3a564 0001-Use-man3-and-skip-intermediate-lib-dir.patch +acf7c038a96e406fae02714e721fbeb1 0002-Hardcode-library-position.patch +62a7d62f1a70e72686dcd6c84cb48717 0003-Fix-path-in-manpage.patch d1bf9be5af47ac77f9308e9849453057 mtwrite-r90214.tgz Deleted: csw/mgar/pkg/mtwrite/trunk/files/0001-Create-correct-man-directory.patch =================================================================== --- csw/mgar/pkg/mtwrite/trunk/files/0001-Create-correct-man-directory.patch 2010-05-05 09:58:52 UTC (rev 9817) +++ csw/mgar/pkg/mtwrite/trunk/files/0001-Create-correct-man-directory.patch 2010-05-05 10:57:47 UTC (rev 9818) @@ -1,25 +0,0 @@ -From 8463404c64d85f9f39b164f199feefaf20b0d8cc Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 5 May 2010 11:46:44 +0200 -Subject: [PATCH 1/2] Create correct man directory - ---- - Makefile | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Makefile b/Makefile -index 822d63d..82e4986 100644 ---- a/Makefile -+++ b/Makefile -@@ -32,7 +32,7 @@ clean: - install: mtwrite.so - -$(MKDIR) $(PREFIX)/bin - -$(MKDIR) $(PREFIX)/lib/$(OS)-$(MACH) -- -$(MKDIR) $(PREFIX)/share/man/man1 -+ -$(MKDIR) $(PREFIX)/share/man/man3 - $(CP) mtwrite.so $(PREFIX)/lib/$(OS)-$(MACH) - $(CP) mttar mtcp mtgtar mtstar mtunzip $(PREFIX)/bin - $(CP) mtwrite.3 $(PREFIX)/share/man/man3 --- -1.7.0 - Added: csw/mgar/pkg/mtwrite/trunk/files/0001-Use-man3-and-skip-intermediate-lib-dir.patch =================================================================== --- csw/mgar/pkg/mtwrite/trunk/files/0001-Use-man3-and-skip-intermediate-lib-dir.patch (rev 0) +++ csw/mgar/pkg/mtwrite/trunk/files/0001-Use-man3-and-skip-intermediate-lib-dir.patch 2010-05-05 10:57:47 UTC (rev 9818) @@ -0,0 +1,28 @@ +From 754fc5773a38db0d2a2196c378fbe4a125628ee5 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 5 May 2010 12:33:48 +0200 +Subject: [PATCH 1/2] Use man3 and skip intermediate lib dir + +--- + Makefile | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 822d63d..d62261d 100644 +--- a/Makefile ++++ b/Makefile +@@ -31,8 +31,8 @@ clean: + + install: mtwrite.so + -$(MKDIR) $(PREFIX)/bin +- -$(MKDIR) $(PREFIX)/lib/$(OS)-$(MACH) +- -$(MKDIR) $(PREFIX)/share/man/man1 +- $(CP) mtwrite.so $(PREFIX)/lib/$(OS)-$(MACH) ++ -$(MKDIR) $(PREFIX)/lib ++ -$(MKDIR) $(PREFIX)/share/man/man3 ++ $(CP) mtwrite.so $(PREFIX)/lib + $(CP) mttar mtcp mtgtar mtstar mtunzip $(PREFIX)/bin + $(CP) mtwrite.3 $(PREFIX)/share/man/man3 +-- +1.7.0 + Deleted: csw/mgar/pkg/mtwrite/trunk/files/0002-Calculate-threadcount-instead-of-hardcoding.patch =================================================================== --- csw/mgar/pkg/mtwrite/trunk/files/0002-Calculate-threadcount-instead-of-hardcoding.patch 2010-05-05 09:58:52 UTC (rev 9817) +++ csw/mgar/pkg/mtwrite/trunk/files/0002-Calculate-threadcount-instead-of-hardcoding.patch 2010-05-05 10:57:47 UTC (rev 9818) @@ -1,89 +0,0 @@ -From bbacd109a1314356064f26397ff68dd1a7fa72f4 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 5 May 2010 11:55:37 +0200 -Subject: [PATCH 2/2] Calculate threadcount instead of hardcoding - ---- - mtcp | 4 ++-- - mtgtar | 4 ++-- - mtstar | 4 ++-- - mttar | 2 +- - mtunzip | 4 ++-- - 5 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/mtcp b/mtcp -index 5e9a373..62a38f2 100755 ---- a/mtcp -+++ b/mtcp -@@ -1,8 +1,8 @@ - #!/bin/ksh - INSTALLDIR=`dirname $0`/../lib --LD_PRELOAD=$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so -+LD_PRELOAD=${LD_PRELOAD:-}:$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so - MTWRITE_VERBOSE=${MTWRITE_VERBOSE:=1} # default --MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32} # default -+MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=`/usr/sbin/psrinfo | wc -l`} # default - MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M} # default - export LD_PRELOAD MTWRITE_VERBOSE MTWRITE_MAXTHREADS MTWRITE_MEMPERTHREAD - exec cp $@ -diff --git a/mtgtar b/mtgtar -index b56399c..0a8e9f3 100755 ---- a/mtgtar -+++ b/mtgtar -@@ -1,8 +1,8 @@ - #!/bin/ksh - INSTALLDIR=`dirname $0`/../lib --LD_PRELOAD=$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so -+LD_PRELOAD=${LD_PRELOAD:-}:$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so - MTWRITE_VERBOSE=${MTWRITE_VERBOSE:=1} # default --MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32} # default -+MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=`/usr/sbin/psrinfo | wc -l`} # default - MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M} # default - export LD_PRELOAD MTWRITE_VERBOSE MTWRITE_MAXTHREADS MTWRITE_MEMPERTHREAD - exec gtar $@ -diff --git a/mtstar b/mtstar -index ed37a89..3cb2b1f 100755 ---- a/mtstar -+++ b/mtstar -@@ -1,8 +1,8 @@ - #!/bin/ksh - INSTALLDIR=`dirname $0`/../lib --LD_PRELOAD=$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so -+LD_PRELOAD=${LD_PRELOAD:-}:$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so - MTWRITE_VERBOSE=${MTWRITE_VERBOSE:=1} # default --MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32} # default -+MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=`/usr/sbin/psrinfo | wc -l`} # default - MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M} # default - export LD_PRELOAD MTWRITE_VERBOSE MTWRITE_MAXTHREADS MTWRITE_MEMPERTHREAD - exec star $@ -diff --git a/mttar b/mttar -index ec45cec..49e985f 100755 ---- a/mttar -+++ b/mttar -@@ -2,7 +2,7 @@ - INSTALLDIR=`dirname $0`/../lib - LD_PRELOAD=${LD_PRELOAD:-}:$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so - MTWRITE_VERBOSE=${MTWRITE_VERBOSE:=1} # default --MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32} # default -+MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=`/usr/sbin/psrinfo | wc -l`} # default - MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M} # default - export LD_PRELOAD MTWRITE_VERBOSE MTWRITE_MAXTHREADS MTWRITE_MEMPERTHREAD - exec tar $@ -diff --git a/mtunzip b/mtunzip -index 1763686..200d0d6 100755 ---- a/mtunzip -+++ b/mtunzip -@@ -1,8 +1,8 @@ - #!/bin/ksh - INSTALLDIR=`dirname $0`/../lib --LD_PRELOAD=$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so -+LD_PRELOAD=${LD_PRELOAD:-}:$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so - MTWRITE_VERBOSE=${MTWRITE_VERBOSE:=1} # default --MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32} # default -+MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=`/usr/sbin/psrinfo | wc -l`} # default - MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M} # default - export LD_PRELOAD MTWRITE_VERBOSE MTWRITE_MAXTHREADS MTWRITE_MEMPERTHREAD - exec unzip $@ --- -1.7.0 - Added: csw/mgar/pkg/mtwrite/trunk/files/0002-Hardcode-library-position.patch =================================================================== --- csw/mgar/pkg/mtwrite/trunk/files/0002-Hardcode-library-position.patch (rev 0) +++ csw/mgar/pkg/mtwrite/trunk/files/0002-Hardcode-library-position.patch 2010-05-05 10:57:47 UTC (rev 9818) @@ -0,0 +1,76 @@ +From 252a4e3086661f851e90ea32690ca734548a015b Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 5 May 2010 12:34:13 +0200 +Subject: [PATCH 2/2] Hardcode library position + +--- + mtcp | 3 +-- + mtgtar | 3 +-- + mtstar | 3 +-- + mttar | 3 +-- + mtunzip | 3 +-- + 5 files changed, 5 insertions(+), 10 deletions(-) + +diff --git a/mtcp b/mtcp +index 5e9a373..a6d7aa6 100755 +--- a/mtcp ++++ b/mtcp +@@ -1,6 +1,5 @@ + #!/bin/ksh +-INSTALLDIR=`dirname $0`/../lib +-LD_PRELOAD=$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so ++LD_PRELOAD=/opt/csw/lib/mtwrite.so + MTWRITE_VERBOSE=${MTWRITE_VERBOSE:=1} # default + MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32} # default + MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M} # default +diff --git a/mtgtar b/mtgtar +index b56399c..f697ebc 100755 +--- a/mtgtar ++++ b/mtgtar +@@ -1,6 +1,5 @@ + #!/bin/ksh +-INSTALLDIR=`dirname $0`/../lib +-LD_PRELOAD=$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so ++LD_PRELOAD=/opt/csw/lib/mtwrite.so + MTWRITE_VERBOSE=${MTWRITE_VERBOSE:=1} # default + MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32} # default + MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M} # default +diff --git a/mtstar b/mtstar +index ed37a89..ab40828 100755 +--- a/mtstar ++++ b/mtstar +@@ -1,6 +1,5 @@ + #!/bin/ksh +-INSTALLDIR=`dirname $0`/../lib +-LD_PRELOAD=$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so ++LD_PRELOAD=/opt/csw/lib/mtwrite.so + MTWRITE_VERBOSE=${MTWRITE_VERBOSE:=1} # default + MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32} # default + MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M} # default +diff --git a/mttar b/mttar +index ec45cec..90c85ee 100755 +--- a/mttar ++++ b/mttar +@@ -1,6 +1,5 @@ + #!/bin/ksh +-INSTALLDIR=`dirname $0`/../lib +-LD_PRELOAD=${LD_PRELOAD:-}:$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so ++LD_PRELOAD=/opt/csw/lib/mtwrite.so + MTWRITE_VERBOSE=${MTWRITE_VERBOSE:=1} # default + MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32} # default + MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M} # default +diff --git a/mtunzip b/mtunzip +index 1763686..a2f6b62 100755 +--- a/mtunzip ++++ b/mtunzip +@@ -1,6 +1,5 @@ + #!/bin/ksh +-INSTALLDIR=`dirname $0`/../lib +-LD_PRELOAD=$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so ++LD_PRELOAD=/opt/csw/lib/mtwrite.so + MTWRITE_VERBOSE=${MTWRITE_VERBOSE:=1} # default + MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32} # default + MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M} # default +-- +1.7.0 + Added: csw/mgar/pkg/mtwrite/trunk/files/0003-Fix-path-in-manpage.patch =================================================================== --- csw/mgar/pkg/mtwrite/trunk/files/0003-Fix-path-in-manpage.patch (rev 0) +++ csw/mgar/pkg/mtwrite/trunk/files/0003-Fix-path-in-manpage.patch 2010-05-05 10:57:47 UTC (rev 9818) @@ -0,0 +1,25 @@ +From ee74ce1c6c6833f2599dbf57f4ba51ab2610fd14 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 5 May 2010 12:56:17 +0200 +Subject: [PATCH 3/3] Fix path in manpage + +--- + mtwrite.3 | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/mtwrite.3 b/mtwrite.3 +index da61094..9fd8282 100644 +--- a/mtwrite.3 ++++ b/mtwrite.3 +@@ -45,7 +45,7 @@ to include + for use with a program of your choice. You may want to take a look at + the supplied wrapper scripts to learn how to write your own. + .SH EXAMPLE +-env LD_PRELOAD=/usr/local/lib/mtwrite.so cp -r /home/me/mystuff /backup ++env LD_PRELOAD=/opt/csw/lib/mtwrite.so cp -r /home/me/mystuff /backup + .SH "ENVIRONMENT VARIABLES" + .TP + .B MTWRITE_VERBOSE +-- +1.7.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 Wed May 5 15:17:44 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 May 2010 13:17:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[9819] csw/mgar/pkg/libatk/trunk Message-ID: Revision: 9819 http://gar.svn.sourceforge.net/gar/?rev=9819&view=rev Author: dmichelsen Date: 2010-05-05 13:17:44 +0000 (Wed, 05 May 2010) Log Message: ----------- libatk: Update to 1.30.0 Modified Paths: -------------- csw/mgar/pkg/libatk/trunk/Makefile csw/mgar/pkg/libatk/trunk/checksums Modified: csw/mgar/pkg/libatk/trunk/Makefile =================================================================== --- csw/mgar/pkg/libatk/trunk/Makefile 2010-05-05 10:57:47 UTC (rev 9818) +++ csw/mgar/pkg/libatk/trunk/Makefile 2010-05-05 13:17:44 UTC (rev 9819) @@ -1,5 +1,5 @@ GARNAME = atk -GARVERSION = 1.29.92 +GARVERSION = 1.30.0 CATEGORIES = lib DESCRIPTION = An accessibility toolkit for GNOME @@ -36,4 +36,7 @@ PKGFILES_CSWlibatkdevel = $(PKGFILES_DEVEL) PKGFILES_CSWlibatkdevel += $(sharedstatedir)/gtk-doc/.* +CHECKPKG_OVERRIDES_CSWlibatkdevel += surplus-dependency|CSWglib2devel +CHECKPKG_OVERRIDES_CSWlibatkdevel += surplus-dependency|CSWlibatk + include gar/category.mk Modified: csw/mgar/pkg/libatk/trunk/checksums =================================================================== --- csw/mgar/pkg/libatk/trunk/checksums 2010-05-05 10:57:47 UTC (rev 9818) +++ csw/mgar/pkg/libatk/trunk/checksums 2010-05-05 13:17:44 UTC (rev 9819) @@ -1 +1 @@ -48e06ab8971acb9df4203fbda8d46d77 atk-1.29.92.tar.bz2 +548d413775819fef425410739041cac3 atk-1.30.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu May 6 03:44:01 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 06 May 2010 01:44:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[9820] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 9820 http://gar.svn.sourceforge.net/gar/?rev=9820&view=rev Author: bdwalton Date: 2010-05-06 01:43:40 +0000 (Thu, 06 May 2010) Log Message: ----------- cswclassutils: update cswinetd -> no grep; cswetcservices -> no grep, ignore # CSWfoo comments Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/checksums csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2010-05-05 13:17:44 UTC (rev 9819) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2010-05-06 01:43:40 UTC (rev 9820) @@ -1,15 +1,15 @@ 48a97af56d55bc90ce90303228ed8cc3 COPYING 9846081f8109dc9149dc026b89fbf137 CSWcswclassutils.i.cswcpsampleconf 9a6f5ad4919b78e4083491edcd86db0c CSWcswclassutils.i.cswcrontab -56900bb1fc9f40f7c227877eca32b1f8 CSWcswclassutils.i.cswetcservices -4f2e9de463cb4b17ba6e1b3dfdf18913 CSWcswclassutils.i.cswinetd +5e2ae2c6bd828061f86d84f09087b06a CSWcswclassutils.i.cswetcservices +4a0971d15bc02e7496f876336c68ddf4 CSWcswclassutils.i.cswinetd 6abb13158fee906870d1d68dc0fae6f3 CSWcswclassutils.i.cswinitsmf a667515489aafc81d41159765faf698f CSWcswclassutils.i.cswmigrateconf 8ab721535d43dcef702538d394e7a2ce CSWcswclassutils.i.cswpostmsg 0fc6128391af4c9aebf72b84755532cb CSWcswclassutils.i.cswpreserveconf 9018419febe06c12e89d66cc76e7261f CSWcswclassutils.i.cswpycompile 4f816acb06e8f95add6faf8607859da2 CSWcswclassutils.i.cswtexinfo -7f04b24b421f3afbf3c61845941ef5dd CSWcswclassutils.i.cswusergroup +5071bfb677bcdeda35ccdb9cd6f56f34 CSWcswclassutils.i.cswusergroup d278a28a6f901c4ff5f07c583b4cff3d CSWcswclassutils.r.cswcpsampleconf a204ca80139dd1d79e1a3af3e8bad7cb CSWcswclassutils.r.cswcrontab d60261ddc46e2cc83ecbbfc586a7e686 CSWcswclassutils.r.cswetcservices Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices 2010-05-05 13:17:44 UTC (rev 9819) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices 2010-05-06 01:43:40 UTC (rev 9820) @@ -28,8 +28,9 @@ echo "svcname: $svcname; port/proto: $port_proto" fi - /usr/xpg4/bin/grep -q "^$svcname[[:space:]].*$port_proto.*$PKGINST" $svcfile - if [ $? -ne 0 ]; then + exists=`awk "\\\$1 == \"$svcname\" && \\\$2 == \"$port_proto\" { print \"found\" }" $svcfile` + + if [ "$exists" != "found" ]; then echo "$svcname $port_proto # $PKGINST" >> $svcfile fi done Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd 2010-05-05 13:17:44 UTC (rev 9819) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd 2010-05-06 01:43:40 UTC (rev 9820) @@ -58,8 +58,8 @@ # we won't register with inetd if the service name isn't registered # in the global services file. - /usr/xpg4/bin/grep -q "^$svcname[[:space:]]" /etc/services - if [ $? -eq 0 ]; then + exists=`awk "\\\$1 == \"$svcname\" {print \"found\" }" /etc/services` + if [ "$exists" == "found" ]; then if [ -n "$DEBUG" ]; then echo "Installing inetd service:" echo "$inetdsvc" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu May 6 03:49:24 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 06 May 2010 01:49:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[9821] csw/mgar/pkg/cswclassutils/trunk/Makefile Message-ID: Revision: 9821 http://gar.svn.sourceforge.net/gar/?rev=9821&view=rev Author: bdwalton Date: 2010-05-06 01:49:23 +0000 (Thu, 06 May 2010) Log Message: ----------- cswclassutils: tweak sample csw.smf instalation; override cas warning Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-05-06 01:43:40 UTC (rev 9820) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-05-06 01:49:23 UTC (rev 9821) @@ -27,18 +27,20 @@ PROTOTYPE_USER_cas = bin PROTOTYPE_GROUP_cas = sys +CHECKPKG_OVERRIDES_CSWcswclassutils += init-file-missing-cswinitsmf-class|/opt/csw/etc/init.d/csw.smf.sample|class=none + include gar/category.mk install-custom: @echo " ==> Installing $(GARNAME) (custom)" @rm -rf $(DESTDIR) - @ginstall -m 0755 -d $(DESTDIR)/etc/opt/csw/init.d + @ginstall -m 0755 -d $(DESTDIR)/opt/csw/etc/init.d @ginstall -m 0755 -d $(DESTDIR)$(docdir)/$(GARNAME) @ginstall -m 0755 -d $(DESTDIR)/usr/sadm/install/scripts @ginstall -m 0755 -d $(DESTDIR)/var/opt/csw/svc/manifest @ginstall -m 0755 -d $(DESTDIR)/var/opt/csw/svc/method @ginstall -m 0755 -d $(DESTDIR)/var/opt/csw/cswclassutils - @ginstall -m 0755 $(FILEDIR)/CSW$(GARNAME).csw.smf.sample $(DESTDIR)/etc/opt/csw/init.d/csw.smf.sample + @ginstall -m 0755 $(FILEDIR)/CSW$(GARNAME).csw.smf.sample $(DESTDIR)/opt/csw/etc/init.d/csw.smf.sample @ginstall -m 0444 $(FILEDIR)/CSW$(GARNAME).README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW @$(foreach CAS,$(CASLIST),ginstall -m 0555 $(FILEDIR)/CSW$(GARNAME).$(CAS) $(DESTDIR)/usr/sadm/install/scripts/$(CAS);) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu May 6 04:02:22 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 06 May 2010 02:02:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[9822] csw/mgar/pkg/cswclassutils/trunk/Makefile Message-ID: Revision: 9822 http://gar.svn.sourceforge.net/gar/?rev=9822&view=rev Author: bdwalton Date: 2010-05-06 02:02:22 +0000 (Thu, 06 May 2010) Log Message: ----------- cswclassutils: version bump Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-05-06 01:49:23 UTC (rev 9821) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-05-06 02:02:22 UTC (rev 9822) @@ -1,7 +1,7 @@ # $Id$ GARNAME = cswclassutils -GARVERSION = 1.34 +GARVERSION = 1.35 CATEGORIES = utils DESCRIPTION = CSW class action utilities 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 May 6 09:19:06 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 06 May 2010 07:19:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[9823] csw/mgar/pkg/libatk/trunk/Makefile Message-ID: Revision: 9823 http://gar.svn.sourceforge.net/gar/?rev=9823&view=rev Author: dmichelsen Date: 2010-05-06 07:19:06 +0000 (Thu, 06 May 2010) Log Message: ----------- libatk: Fix description Modified Paths: -------------- csw/mgar/pkg/libatk/trunk/Makefile Modified: csw/mgar/pkg/libatk/trunk/Makefile =================================================================== --- csw/mgar/pkg/libatk/trunk/Makefile 2010-05-06 02:02:22 UTC (rev 9822) +++ csw/mgar/pkg/libatk/trunk/Makefile 2010-05-06 07:19:06 UTC (rev 9823) @@ -22,7 +22,7 @@ CATALOGNAME_CSWlibatkdevel = libatk_devel SPKG_DESC_CSWlibatk = $(DESCRIPTION) -SPKG_DESC_CSWlibatk = Developer files for libatk +SPKG_DESC_CSWlibatkdevel = Developer files for libatk RUNTIME_DEP_PKGS_CSWlibatk = CSWggettextrt CSWglib2 RUNTIME_DEP_PKGS_CSWlibatkdevel = CSWlibatk CSWglib2devel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Thu May 6 09:58:30 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 06 May 2010 07:58:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[9824] csw/mgar/pkg/libsigcpp/trunk Message-ID: Revision: 9824 http://gar.svn.sourceforge.net/gar/?rev=9824&view=rev Author: janholzh Date: 2010-05-06 07:58:30 +0000 (Thu, 06 May 2010) Log Message: ----------- libsigc++: update to 2.2.7 and change package name Modified Paths: -------------- csw/mgar/pkg/libsigcpp/trunk/Makefile csw/mgar/pkg/libsigcpp/trunk/checksums Modified: csw/mgar/pkg/libsigcpp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsigcpp/trunk/Makefile 2010-05-06 07:19:06 UTC (rev 9823) +++ csw/mgar/pkg/libsigcpp/trunk/Makefile 2010-05-06 07:58:30 UTC (rev 9824) @@ -1,5 +1,5 @@ GARNAME = libsigc++ -GARVERSION = 2.2.6 +GARVERSION = 2.2.7 CATEGORIES = lib DESCRIPTION = Typesafe signal and callback system for C++ @@ -17,9 +17,9 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -PACKAGES = CSWlibsigc++rt +PACKAGES = CSWlibsigc++ PACKAGES += CSWlibsigc++devel -SPKG_DESC_CSWlibsigc++rt = Typesafe signal and callback system for C++ +SPKG_DESC_CSWlibsigc++ = Typesafe signal and callback system for C++ SPKG_DESC_CSWlibsigc++devel = Header files and docs for libsigc++ PKGFILES_CSWlibsigc++devel = /opt/csw/share/.* @@ -27,7 +27,7 @@ PKGFILES_CSWlibsigc++devel += /opt/csw/lib/pkgconfig/.* PKGFILES_CSWlibsigc++devel += /opt/csw/lib/sigc\+\+-2.0/include/.* -CATALOGNAME_CSWlibsigc++rt= libsigc++_rt +CATALOGNAME_CSWlibsigc++= libsigc++ CATALOGNAME_CSWlibsigc++devel = libsigc++_devel CONFIGURE_ARGS = $(DIRPATHS) --disable-static Modified: csw/mgar/pkg/libsigcpp/trunk/checksums =================================================================== --- csw/mgar/pkg/libsigcpp/trunk/checksums 2010-05-06 07:19:06 UTC (rev 9823) +++ csw/mgar/pkg/libsigcpp/trunk/checksums 2010-05-06 07:58:30 UTC (rev 9824) @@ -1 +1 @@ -cd897cdcb313de0090682c54787f39bc libsigc++-2.2.6.tar.gz +48afe53ba0e3958f6ac5f072afed1c53 libsigc++-2.2.7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu May 6 19:01:49 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 06 May 2010 17:01:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[9825] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswusergroup Message-ID: Revision: 9825 http://gar.svn.sourceforge.net/gar/?rev=9825&view=rev Author: skayser Date: 2010-05-06 17:01:49 +0000 (Thu, 06 May 2010) Log Message: ----------- cswclassutils: fixed exclamation mark bashism and argument passing for set_user_nologin Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup 2010-05-06 07:58:30 UTC (rev 9824) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup 2010-05-06 17:01:49 UTC (rev 9825) @@ -170,6 +170,7 @@ dir="$4" shell="$5" create="$6" + nopass="$7" if getent passwd $user > /dev/null; then echo User $user already exists @@ -194,9 +195,12 @@ else exit_error "Failed to add user $user" fi + [ -n "$nopass" ] && set_user_nologin "$user" } set_user_nologin() { + user="$1" + case "`uname -r`" in 5.8|5.9) # for old solaris, we munge the shadow file manually. @@ -221,7 +225,8 @@ ;; *) # for modern solaris, use the built-in tools - if ! passwd -N $user; then + passwd -N $user + if [ $? -ne 0 ]; then exit_error "Setting NP for '$user' failed." fi ;; @@ -256,8 +261,8 @@ fi if [ -n "$user" ]; then - create_user "$user" "$group" "$gcos" "$dir" "$shell" "$create" - [ -n "$nopass" ] && set_user_nologin "$user" + create_user \ + "$user" "$group" "$gcos" "$dir" "$shell" "$create" "$nopass" else echo No user to create fi 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 May 7 09:40:40 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 07 May 2010 07:40:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[9826] csw/mgar/pkg/gcpio/trunk Message-ID: Revision: 9826 http://gar.svn.sourceforge.net/gar/?rev=9826&view=rev Author: dmichelsen Date: 2010-05-07 07:40:39 +0000 (Fri, 07 May 2010) Log Message: ----------- gcpio: Fixes for downrev to 2.10 Modified Paths: -------------- csw/mgar/pkg/gcpio/trunk/Makefile csw/mgar/pkg/gcpio/trunk/checksums Modified: csw/mgar/pkg/gcpio/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcpio/trunk/Makefile 2010-05-06 17:01:49 UTC (rev 9825) +++ csw/mgar/pkg/gcpio/trunk/Makefile 2010-05-07 07:40:39 UTC (rev 9826) @@ -1,5 +1,5 @@ GARNAME = cpio -GARVERSION = 2.11 +GARVERSION = 2.10 CATEGORIES = utils DESCRIPTION = GNU cpio @@ -20,13 +20,15 @@ SPKG_SOURCEURL = http://www.gnu.org/software/cpio/ -RUNTIME_DEP_PKGS = +DEP_PKGS = CSWggettextrt +EXTRA_LINKER_FLAGS = -lnsl + NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) --program-prefix=g TEST_SCRIPTS = -#EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias +EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias include gar/category.mk Modified: csw/mgar/pkg/gcpio/trunk/checksums =================================================================== --- csw/mgar/pkg/gcpio/trunk/checksums 2010-05-06 17:01:49 UTC (rev 9825) +++ csw/mgar/pkg/gcpio/trunk/checksums 2010-05-07 07:40:39 UTC (rev 9826) @@ -1,2 +1,2 @@ -1112bb6c45863468b5496ba128792f6c cpio-2.11.tar.gz +351ab3d38d8949913e478cc23b9d6ad4 cpio-2.10.tar.gz ff86aab1185277a2ae53928e4bd01692 non-gnu-compiler.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 Fri May 7 11:42:26 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 07 May 2010 09:42:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[9827] csw/mgar/pkg/libevent/branches Message-ID: Revision: 9827 http://gar.svn.sourceforge.net/gar/?rev=9827&view=rev Author: dmichelsen Date: 2010-05-07 09:42:25 +0000 (Fri, 07 May 2010) Log Message: ----------- libevent: Make branch for new 2.0 alpha version Added Paths: ----------- csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/ csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/Makefile csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/checksums csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/files/0001-Detect-broken-unsetenv-at-unit-test-runtime.patch csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/files/0001-Detect-setenv-unsetenv-skip-main-base_environ-test.patch csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/files/0001-Fix-getaddrinfo-with-protocol-unset-on-Solaris-9.patch Removed Paths: ------------- csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/Makefile csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/checksums Deleted: csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/Makefile =================================================================== --- csw/mgar/pkg/libevent/trunk/Makefile 2009-12-07 09:20:11 UTC (rev 7572) +++ csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/Makefile 2010-05-07 09:42:25 UTC (rev 9827) @@ -1,70 +0,0 @@ -GARNAME = libevent -GARVERSION = 1.4.12 -CATEGORIES = lib - -EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 1.1a 1.4.12 - -SKIP_MODULATIONS = isa-sparcv9-garversion-1.1a -SKIP_MODULATIONS += isa-amd64-garversion-1.1a - -DISTVERSION-1.1a = 1.1a -DISTVERSION-1.4.12 = 1.4.12-stable - -DESCRIPTION = Event notification library -define BLURB - The libevent API provides a mechanism to execute a callback function when a - specific event occurs on a file descriptor or after a timeout has been - reached. Furthermore, libevent also support callbacks due to signals or - regular timeouts. -endef - -MASTER_SITES = http://www.monkey.org/~provos/ -SOURCEFILES = $(foreach V,$(MODULATIONS_GARVERSION),$(GARNAME)-$(DISTVERSION-$V).tar.gz) -DISTFILES += $(SOURCEFILES) - -NOEXTRACT = $(filter-out $(GARNAME)-$(DISTVERSION-$(GARVERSION)).tar.gz,$(SOURCEFILES)) - -PACKAGES = CSWlibevent CSWlibevent-devel - -REQUIRED_PKGS_CSWlibevent-devel = CSWlibevent - -CATALOGNAME_CSWlibevent = libevent -CATALOGNAME_CSWlibevent-devel = libevent_devel - -SPKG_DESC_CSWlibevent = Event notification library -SPKG_DESC_CSWlibevent-devel = Event notification library header files - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-stable.tar.gz - -SPKG_SOURCEURL = http://www.monkey.org/~provos/libevent/ - -WORKSRC = $(WORKDIR)/$(GARNAME)-$(DISTVERSION-$(GARVERSION)) - -BUILD64 = 1 -NO_ISAEXEC = 1 -CONFIGURE_ARGS = $(DIRPATHS) - -TEST_TARGET = verify - -MERGE_SCRIPTS_isa-default-garversion-1.1a = copy-only -MERGE_DIRS_isa-default-garversion-1.1a = $(libdir) -MERGE_SCRIPTS_isa-extra-garversion-1.1a = copy-relocated-only -MERGE_DIRS_isa-extra-garversion-1.1a = $(libdir) - -MERGE_SCRIPTS_isa-default-garversion-1.4.12 = copy-all -MERGE_SCRIPTS_isa-extra-garversion-1.4.12 = copy-relocated-only -MERGE_DIRS_isa-extra-garversion-1.4.12 = $(libdir) - -PKGFILES_CSWlibevent-devel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibevent-devel += $(bindir)/.* - -include gar/category.mk - -#LIBS += -lresolv -lnsl -#export LIBS - -post-extract-modulated: - -test -f $(WORKSRC)/test/test.sh && perl -pi -e 's,#!/bin/sh,#!/bin/bash,' $(WORKSRC)/test/test.sh - @$(MAKECOOKIE) Copied: csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/Makefile (from rev 7772, csw/mgar/pkg/libevent/trunk/Makefile) =================================================================== --- csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/Makefile (rev 0) +++ csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/Makefile 2010-05-07 09:42:25 UTC (rev 9827) @@ -0,0 +1,79 @@ +GARNAME = libevent +GARVERSION = 2.0.4 +CATEGORIES = lib + +EXTRA_MODULATORS = GARVERSION +#MODULATIONS_GARVERSION = 1.1a 2.0.4 +MODULATIONS_GARVERSION = 2.0.4 + +SKIP_MODULATIONS = isa-sparcv9-garversion-1.1a +SKIP_MODULATIONS += isa-amd64-garversion-1.1a + +DISTVERSION-1.1a = 1.1a +DISTVERSION-2.0.4 = 2.0.4-alpha + +DESCRIPTION = Event notification library +define BLURB + The libevent API provides a mechanism to execute a callback function when a + specific event occurs on a file descriptor or after a timeout has been + reached. Furthermore, libevent also support callbacks due to signals or + regular timeouts. +endef + +MASTER_SITES = http://www.monkey.org/~provos/ +SOURCEFILES = $(foreach V,$(MODULATIONS_GARVERSION),$(GARNAME)-$(DISTVERSION-$V).tar.gz) +DISTFILES += $(SOURCEFILES) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-alpha.tar.gz + +PATCHFILES += 0001-Detect-broken-unsetenv-at-unit-test-runtime.patch +PATCHFILES += 0001-Fix-getaddrinfo-with-protocol-unset-on-Solaris-9.patch + +NOEXTRACT = $(filter-out $(GARNAME)-$(DISTVERSION-$(GARVERSION)).tar.gz,$(SOURCEFILES)) + +LICENSE = LICENSE + +PACKAGES = CSWlibevent CSWlibevent-devel + +RUNTIME_DEP_PKGS_CSWlibevent += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibevent-devel = CSWlibevent + +CATALOGNAME_CSWlibevent = libevent +CATALOGNAME_CSWlibevent-devel = libevent_devel + +SPKG_DESC_CSWlibevent = Event notification library +SPKG_DESC_CSWlibevent-devel = Event notification library header files + +SPKG_SOURCEURL = http://www.monkey.org/~provos/libevent/ + +WORKSRC = $(WORKDIR)/$(GARNAME)-$(DISTVERSION-$(GARVERSION)) + +BUILD64 = 1 +NOISAEXEC = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = verify + +MERGE_SCRIPTS_isa-default-garversion-1.1a = copy-only +MERGE_DIRS_isa-default-garversion-1.1a = $(libdir) +MERGE_SCRIPTS_isa-extra-garversion-1.1a = copy-relocated-only +MERGE_DIRS_isa-extra-garversion-1.1a = $(libdir) + +MERGE_SCRIPTS_isa-default-garversion-2.0.4 = copy-all +MERGE_SCRIPTS_isa-extra-garversion-2.0.4 = copy-relocated-only +MERGE_DIRS_isa-extra-garversion-2.0.4 = $(libdir) + +PKGFILES_CSWlibevent-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibevent-devel += $(bindir)/.* + +CHECKPKG_OVERRIDES_CSWlibevent-devel += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWlibevent-devel += surplus-dependency|CSWlibevent + +include gar/category.mk + +post-extract-modulated: + -test -f $(WORKSRC)/test/test.sh && perl -pi -e 's,#!/bin/sh,#!/bin/bash,' $(WORKSRC)/test/test.sh + @$(MAKECOOKIE) + + Deleted: csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/checksums =================================================================== --- csw/mgar/pkg/libevent/trunk/checksums 2009-12-07 09:20:11 UTC (rev 7572) +++ csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/checksums 2010-05-07 09:42:25 UTC (rev 9827) @@ -1,2 +0,0 @@ -6cc776458ecaf9247550863702a44d7c libevent-1.1a.tar.gz -77b0d8b9885496871bb083165b35ba11 libevent-1.4.12-stable.tar.gz Copied: csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/checksums (from rev 7772, csw/mgar/pkg/libevent/trunk/checksums) =================================================================== --- csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/checksums (rev 0) +++ csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/checksums 2010-05-07 09:42:25 UTC (rev 9827) @@ -0,0 +1,4 @@ +50c285b06a7843509d5a1d6ae7310153 0001-Detect-broken-unsetenv-at-unit-test-runtime.patch +8f00dfd6a27eb8ab308014ef15bb1883 0001-Detect-setenv-unsetenv-skip-main-base_environ-test.patch +cfb3d03f400a75503595795b60a05244 0001-Fix-getaddrinfo-with-protocol-unset-on-Solaris-9.patch +dbc50f32af9f2ade151a0737e5edf205 libevent-2.0.4-alpha.tar.gz Added: csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/files/0001-Detect-broken-unsetenv-at-unit-test-runtime.patch =================================================================== --- csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/files/0001-Detect-broken-unsetenv-at-unit-test-runtime.patch (rev 0) +++ csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/files/0001-Detect-broken-unsetenv-at-unit-test-runtime.patch 2010-05-07 09:42:25 UTC (rev 9827) @@ -0,0 +1,37 @@ +From 3a003733e6c8081c07fec51a77f65d3d5d8a1094 Mon Sep 17 00:00:00 2001 +From: Nick Mathewson +Date: Wed, 21 Apr 2010 12:25:29 -0400 +Subject: [PATCH] Detect broken unsetenv at unit-test runtime + +If we have an unsetenv function that doesn't work, we can't run the +main/base_environ unit test, so we should skip it. +--- + test/regress.c | 12 ++++++++++++ + 1 files changed, 12 insertions(+), 0 deletions(-) + +diff --git a/test/regress.c b/test/regress.c +index 513c3c8..cda0892 100644 +--- a/test/regress.c ++++ b/test/regress.c +@@ -1830,6 +1830,18 @@ test_base_environ(void *arg) + int i, n_methods=0; + const char *defaultname; + ++ /* See if unsetenv works before we rely on it. */ ++ setenv("EVENT_NOWAFFLES", "1", 1); ++ unsetenv("EVENT_NOWAFFLES"); ++ if (getenv("EVENT_NOWAFFLES") != NULL) { ++#ifndef _EVENT_HAVE_UNSETENV ++ TT_DECLARE("NOTE", ("Can't fake unsetenv; skipping test")); ++#else ++ TT_DECLARE("NOTE", ("unsetenv doesn't work; skipping test")); ++#endif ++ tt_skip(); ++ } ++ + basenames = event_get_supported_methods(); + for (i = 0; basenames[i]; ++i) { + methodname_to_envvar(basenames[i], varbuf, sizeof(varbuf)); +-- +1.6.6.1 + Added: csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/files/0001-Detect-setenv-unsetenv-skip-main-base_environ-test.patch =================================================================== --- csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/files/0001-Detect-setenv-unsetenv-skip-main-base_environ-test.patch (rev 0) +++ csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/files/0001-Detect-setenv-unsetenv-skip-main-base_environ-test.patch 2010-05-07 09:42:25 UTC (rev 9827) @@ -0,0 +1,120 @@ +From b76470ed69b4b7875d5f764cc0f0d0577ef8b21f Mon Sep 17 00:00:00 2001 +From: Nick Mathewson +Date: Tue, 29 Dec 2009 16:38:03 -0500 +Subject: [PATCH] Detect setenv/unsetenv; skip main/base_environ test if we can't fake them. + +Previously, we assumed that we would have setenv/unsetenv everywhere +but WIN32, where we could fake them with putenv. This isn't so: some +other non-windows systems lack setenv/unsetenv, and some of them lack +putenv too. + +The first part of the solution, then, is to detect setenv/unsetenv/ +putenv from configure.in, and to fake setenv/unsetenv with putenv +whenever we have the latter but not one of the former. + +But what should we do when we don't even have putenv? We could do +elaborate tricks to manipulate the environ pointer, but since we're +only doing this for the unit tests, let's just skip the one test in +question that uses setenv/unsetenv. +--- + configure.in | 3 +-- + test/regress.c | 42 +++++++++++++++++++++++++++++------------- + 2 files changed, 30 insertions(+), 15 deletions(-) + +diff --git a/configure.in b/configure.in +index 67f0816..76bf85b 100644 +--- a/configure.in ++++ b/configure.in +@@ -180,8 +180,7 @@ AC_C_INLINE + AC_HEADER_TIME + + dnl Checks for library functions. +-AC_CHECK_FUNCS(gettimeofday vasprintf fcntl clock_gettime strtok_r strsep getaddrinfo getnameinfo strlcpy inet_ntop inet_pton signal sigaction strtoll inet_aton pipe eventfd sendfile mmap splice arc4random issetugid geteuid getegid getservbyname getprotobynumber) +- ++AC_CHECK_FUNCS(gettimeofday vasprintf fcntl clock_gettime strtok_r strsep getaddrinfo getnameinfo strlcpy inet_ntop inet_pton signal sigaction strtoll inet_aton pipe eventfd sendfile mmap splice arc4random issetugid geteuid getegid getservbyname getprotobynumber setenv unsetenv putenv) + + # Check for gethostbyname_r in all its glorious incompatible versions. + # (This is cut-and-pasted from Tor, which based its logic on +diff --git a/test/regress.c b/test/regress.c +index 4e4e11b..f34890a 100644 +--- a/test/regress.c ++++ b/test/regress.c +@@ -1683,39 +1683,52 @@ end: + event_config_free(cfg); + } + +-static void +-methodname_to_envvar(const char *mname, char *buf, size_t buflen) +-{ +- char *cp; +- evutil_snprintf(buf, buflen, "EVENT_NO%s", mname); +- for (cp = buf; *cp; ++cp) { +- *cp = toupper(*cp); +- } +-} +- +-#ifdef WIN32 ++#ifdef _EVENT_HAVE_SETENV ++#define SETENV_OK ++#elif !defined(_EVENT_HAVE_SETENV) && defined(_EVENT_HAVE_PUTENV) + static void setenv(const char *k, const char *v, int _o) + { + char b[256]; + evutil_snprintf(b, sizeof(b), "%s=%s",k,v); + putenv(b); + } ++#define SETENV_OK ++#endif ++ ++#ifdef _EVENT_HAVE_UNSETENV ++#define UNSETENV_OK ++#elif !defined(_EVENT_HAVE_UNSETENV) && defined(_EVENT_HAVE_PUTENV) + static void unsetenv(const char *k) + { + char b[256]; + evutil_snprintf(b, sizeof(b), "%s=",k); + putenv(b); + } ++#define UNSETENV_OK ++#endif ++ ++#if defined(SETENV_OK) && defined(UNSETENV_OK) ++static void ++methodname_to_envvar(const char *mname, char *buf, size_t buflen) ++{ ++ char *cp; ++ evutil_snprintf(buf, buflen, "EVENT_NO%s", mname); ++ for (cp = buf; *cp; ++cp) { ++ *cp = toupper(*cp); ++ } ++} + #endif + + static void + test_base_environ(void *arg) + { ++ struct event_base *base = NULL; ++ struct event_config *cfg = NULL; ++ ++#if defined(SETENV_OK) && defined(UNSETENV_OK) + const char **basenames; + char varbuf[128]; + int i, n_methods=0; +- struct event_base *base = NULL; +- struct event_config *cfg = NULL; + const char *defaultname; + + basenames = event_get_supported_methods(); +@@ -1757,6 +1770,9 @@ test_base_environ(void *arg) + base = event_base_new_with_config(cfg); + tt_assert(base); + tt_str_op(defaultname, ==, event_base_get_method(base)); ++#else ++ tt_skip(); ++#endif + + end: + if (base) +-- +1.6.0.5 + Added: csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/files/0001-Fix-getaddrinfo-with-protocol-unset-on-Solaris-9.patch =================================================================== --- csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/files/0001-Fix-getaddrinfo-with-protocol-unset-on-Solaris-9.patch (rev 0) +++ csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/files/0001-Fix-getaddrinfo-with-protocol-unset-on-Solaris-9.patch 2010-05-07 09:42:25 UTC (rev 9827) @@ -0,0 +1,115 @@ +From af71b4553549bced3cae1b51cc17c42ce8dc2bb0 Mon Sep 17 00:00:00 2001 +From: Nick Mathewson +Date: Wed, 21 Apr 2010 11:57:55 -0400 +Subject: [PATCH] Fix getaddrinfo with protocol unset on Solaris 9. Found by Dagobert Michelsen + +Apparently when you call Solaris 9's getaddrinfo() with socktype set, +but protocol unset, it likes to leave ai_protocol unset in the result. +This is no way to behave, if I'm reading RFC3493 right. + +This patch makes us check for a getaddrinfo() that's broken in this way, +and work around it by trying to infer socktype and protocol from one +another. + +Possible partial bugfix for 2987542 +--- + evutil.c | 46 ++++++++++++++++++++++++++++++++++++---------- + 1 files changed, 36 insertions(+), 10 deletions(-) + +diff --git a/evutil.c b/evutil.c +index 2509f17..9d36941 100644 +--- a/evutil.c ++++ b/evutil.c +@@ -959,6 +959,10 @@ evutil_adjust_hints_for_addrconfig(struct evutil_addrinfo *hints) + } + + #ifdef USE_NATIVE_GETADDRINFO ++static int need_numeric_port_hack_=0; ++static int need_socktype_protocol_hack_=0; ++static int tested_for_getaddrinfo_hacks=0; ++ + /* Some older BSDs (like OpenBSD up to 4.6) used to believe that + giving a numeric port without giving an ai_socktype was verboten. + We test for this so we can apply an appropriate workaround. If it +@@ -973,17 +977,17 @@ evutil_adjust_hints_for_addrconfig(struct evutil_addrinfo *hints) + + We test for this bug at runtime, since otherwise we can't have the + same binary run on multiple BSD versions. ++ ++ - Some versions of Solaris believe that if the protocol field isn't ++ specified, it's nice to leave it as 0. We test for this so we can apply an ++ appropriate workaround. + */ +-static int +-need_numeric_port_hack(void) ++static void ++test_for_getaddrinfo_hacks(void) + { +- static int tested=0; +- static int need_hack=0; + int r, r2; + struct evutil_addrinfo *ai=NULL, *ai2=NULL; + struct evutil_addrinfo hints; +- if (tested) +- return need_hack; + + memset(&hints,0,sizeof(hints)); + hints.ai_family = PF_UNSPEC; +@@ -999,21 +1003,40 @@ need_numeric_port_hack(void) + hints.ai_socktype = SOCK_STREAM; + r2 = getaddrinfo("1.2.3.4", "80", &hints, &ai2); + if (r2 == 0 && r != 0) { +- need_hack=1; ++ need_numeric_port_hack_=1; ++ } ++ if (ai2 && ai2->ai_protocol == 0) { ++ need_socktype_protocol_hack_=1; + } ++ + if (ai) + freeaddrinfo(ai); + if (ai2) + freeaddrinfo(ai2); +- tested = 1; +- return need_hack; ++ tested_for_getaddrinfo_hacks=1; ++} ++ ++static inline int ++need_numeric_port_hack(void) ++{ ++ if (!tested_for_getaddrinfo_hacks) ++ test_for_getaddrinfo_hacks(); ++ return need_numeric_port_hack_; ++} ++ ++static inline int ++need_socktype_protocol_hack(void) ++{ ++ if (!tested_for_getaddrinfo_hacks) ++ test_for_getaddrinfo_hacks(); ++ return need_socktype_protocol_hack_; + } + + static void + apply_numeric_port_hack(int port, struct evutil_addrinfo **ai) + { + /* Now we run through the list and set the ports on all of the +- * results where ports */ ++ * results where ports would make sense. */ + for ( ; *ai; ai = &(*ai)->ai_next) { + struct sockaddr *sa = (*ai)->ai_addr; + if (sa && sa->sa_family == AF_INET) { +@@ -1100,6 +1123,9 @@ evutil_getaddrinfo(const char *nodename, const char *servname, + servname = NULL; + } + ++ if (need_socktype_protocol_hack()) ++ evutil_getaddrinfo_infer_protocols(&hints); ++ + /* Make sure that we didn't actually steal any AI_FLAGS values that + * the system is using. (This is a constant expression, and should ge + * optimized out.) +-- +1.6.6.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 Fri May 7 13:40:30 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 07 May 2010 11:40:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[9828] csw/mgar/pkg/cpan/GD/tags/GD-2.44, REV_2010.02.08/ Message-ID: Revision: 9828 http://gar.svn.sourceforge.net/gar/?rev=9828&view=rev Author: dmichelsen Date: 2010-05-07 11:40:30 +0000 (Fri, 07 May 2010) Log Message: ----------- cpan/GD: Tag 2.44,REV=2010.02.08 Added Paths: ----------- csw/mgar/pkg/cpan/GD/tags/GD-2.44,REV_2010.02.08/ 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 May 7 15:40:54 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 07 May 2010 13:40:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[9829] csw/mgar/pkg/cpan/GD/trunk Message-ID: Revision: 9829 http://gar.svn.sourceforge.net/gar/?rev=9829&view=rev Author: dmichelsen Date: 2010-05-07 13:40:54 +0000 (Fri, 07 May 2010) Log Message: ----------- cpan/GD: Update to 2.45 and link to libjpeg.so.7 Modified Paths: -------------- csw/mgar/pkg/cpan/GD/trunk/Makefile csw/mgar/pkg/cpan/GD/trunk/checksums csw/mgar/pkg/cpan/GD/trunk/files/diff-GD.t Modified: csw/mgar/pkg/cpan/GD/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/GD/trunk/Makefile 2010-05-07 11:40:30 UTC (rev 9828) +++ csw/mgar/pkg/cpan/GD/trunk/Makefile 2010-05-07 13:40:54 UTC (rev 9829) @@ -1,5 +1,5 @@ GARNAME = GD -GARVERSION = 2.44 +GARVERSION = 2.45 CATEGORIES = cpan AUTHOR = LDS @@ -10,15 +10,18 @@ large number of graphics primitives, and emit the drawings as PNG files. endef +# The file format for files written with libjpeg.so.7 has changed. +# Disable binary identity test until this is fixed: +# https://rt.cpan.org/Ticket/Display.html?id=49053 +PATCHFILES = diff-GD.t + PACKAGES = CSWpmgd CATALOGNAME = pm_gd -RUNTIME_DEP_PKGS = CSWftype2 CSWgd CSWiconv CSWjpeg CSWpng -RUNTIME_DEP_PKGS += CSWxpm CSWzlib CSWfconfig -BUILD_DEP_PKGS = CSWgd +LICENSE = LICENSE -# if we build against libjpeg7, we need to patch one test -# PATCHFILES = diff-GD.t +DEP_PKGS = CSWftype2 CSWgd CSWiconv CSWjpeg CSWpng +DEP_PKGS += CSWxpm CSWzlib CSWfconfig CONFIGURE_ARGS = lib_gd_path $(libdir) CONFIGURE_ARGS += lib_ft_path $(libdir) @@ -30,6 +33,6 @@ # Don't use hardcoded -Wformat=0 BUILD_OVERRIDE_DIRS = CCFLAGS +CHECKPKG_OVERRIDES_CSWpmgd += linked-against-discouraged-library|GD.so|libX11.so.4 + include gar/category.mk -pre-build-modulated: - gsed -i'' 's,-ljpeg,/opt/csw/lib/libjpeg.so.62,' $(WORKSRC)/Makefile Modified: csw/mgar/pkg/cpan/GD/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/GD/trunk/checksums 2010-05-07 11:40:30 UTC (rev 9828) +++ csw/mgar/pkg/cpan/GD/trunk/checksums 2010-05-07 13:40:54 UTC (rev 9829) @@ -1 +1,2 @@ -9b9a4d78a5af0616a96264b0aa354859 GD-2.44.tar.gz +430b15e74eb6287519c403c4772dc1e3 GD-2.45.tar.gz +ef1e469ea526f7a58fe986fdc0b67a4f diff-GD.t Modified: csw/mgar/pkg/cpan/GD/trunk/files/diff-GD.t =================================================================== --- csw/mgar/pkg/cpan/GD/trunk/files/diff-GD.t 2010-05-07 11:40:30 UTC (rev 9828) +++ csw/mgar/pkg/cpan/GD/trunk/files/diff-GD.t 2010-05-07 13:40:54 UTC (rev 9829) @@ -5,7 +5,7 @@ if (GD::Image->can('newFromJpeg')) { - compare(test10('frog.jpg'),10); -+ print "ok ",10," # Skip, see CPAN bug 49053\n"; ++ print "ok ",10," # Skip, see CPAN bug 49053 at https://rt.cpan.org/Ticket/Display.html?id=49053\n"; } else { print "ok ",10," # Skip, no JPEG support\n"; } 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 May 7 17:33:45 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 07 May 2010 15:33:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[9830] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 9830 http://gar.svn.sourceforge.net/gar/?rev=9830&view=rev Author: bonivart Date: 2010-05-07 15:33:44 +0000 (Fri, 07 May 2010) Log Message: ----------- pkgutil: 2.0 beta 2 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.preremove Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2010-05-07 13:40:54 UTC (rev 9829) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2010-05-07 15:33:44 UTC (rev 9830) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 2.0b1 +GARVERSION = 2.0b2 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2010-05-07 13:40:54 UTC (rev 9829) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2010-05-07 15:33:44 UTC (rev 9830) @@ -1,8 +1,8 @@ a16c6f81bc537d6172fd65d8da1aeecc CSWpkgutil.gspec f5a00bd5eedf3b967fafbf29dc389e4c CSWpkgutil.postinstall -95003b45c574ae06ba92ad0adee1e3dd CSWpkgutil.preremove +832c616f6ca7a3030d21bb61d9c62e42 CSWpkgutil.preremove a0e549282bf18241e4490ed6b051b92a CSWpkgutil.prototype b5fffa0be100ddbb7262ce3a0a4e3bb7 build_sun_catalog.py 7ad27336f90e73da3254a61d91025ee5 cswcatalog 3a6b789b3d5e05f41d2363dd26a92acf opencsw.py -79d42025a6c478123f0de319cd4a29fd pkgutil-2.0b1.zip +cbb36675728b15bd6f0b24712e7a3039 pkgutil-2.0b2.zip Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.preremove =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.preremove 2010-05-07 13:40:54 UTC (rev 9829) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.preremove 2010-05-07 15:33:44 UTC (rev 9830) @@ -9,18 +9,21 @@ if [ "`cmp "$ETC1/pkgutil.conf" "$ETC1/pkgutil.conf.CSW"`" ]; then echo "/opt/csw/etc/pkgutil.conf modified, will not remove it." else + echo "Removing unmodified $ETC1/pkgutil.conf." /bin/rm $ETC1/pkgutil.conf fi if [ "`cmp "$ETC2/pkgutil.conf" "$ETC2/pkgutil.conf.CSW"`" ]; then echo "/etc/opt/csw/pkgutil.conf modified, will not remove it." else + echo "Removing unmodified $ETC2/pkgutil.conf." /bin/rm $ETC2/pkgutil.conf fi if [ "`cmp "$VAR/admin" "$VAR/admin.CSW"`" ]; then echo "/var/opt/csw/pkgutil/admin modified, will not remove it." else + echo "Removing unmodified $VAR/admin." /bin/rm $VAR/admin fi 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 May 7 20:55:42 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 07 May 2010 18:55:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[9831] csw/mgar/pkg/cmake/trunk Message-ID: Revision: 9831 http://gar.svn.sourceforge.net/gar/?rev=9831&view=rev Author: rthurner Date: 2010-05-07 18:55:42 +0000 (Fri, 07 May 2010) Log Message: ----------- cmake - upgrade to cmake-2.8.1 from cmake-2.8.0 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 2010-05-07 15:33:44 UTC (rev 9830) +++ csw/mgar/pkg/cmake/trunk/Makefile 2010-05-07 18:55:42 UTC (rev 9831) @@ -1,5 +1,5 @@ GARNAME = cmake -GARVERSION = 2.8.0 +GARVERSION = 2.8.1 CATEGORIES = devel DESCRIPTION = Cross-platform make Modified: csw/mgar/pkg/cmake/trunk/checksums =================================================================== --- csw/mgar/pkg/cmake/trunk/checksums 2010-05-07 15:33:44 UTC (rev 9830) +++ csw/mgar/pkg/cmake/trunk/checksums 2010-05-07 18:55:42 UTC (rev 9831) @@ -1 +1 @@ -3b3679b8a6afaedc38a8c15dd7ff4fcf cmake-2.8.0.tar.gz +feadc2e5ebbfed0efc90178583503725 cmake-2.8.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From darinper at users.sourceforge.net Fri May 7 21:25:13 2010 From: darinper at users.sourceforge.net (darinper at users.sourceforge.net) Date: Fri, 07 May 2010 19:25:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[9832] csw/mgar/pkg Message-ID: Revision: 9832 http://gar.svn.sourceforge.net/gar/?rev=9832&view=rev Author: darinper Date: 2010-05-07 19:25:13 +0000 (Fri, 07 May 2010) Log Message: ----------- a2ps: Initial commit Added Paths: ----------- csw/mgar/pkg/a2ps/ csw/mgar/pkg/a2ps/branches/ csw/mgar/pkg/a2ps/tags/ csw/mgar/pkg/a2ps/trunk/ csw/mgar/pkg/a2ps/trunk/Makefile csw/mgar/pkg/a2ps/trunk/checksums csw/mgar/pkg/a2ps/trunk/files/ Property changes on: csw/mgar/pkg/a2ps/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/a2ps/trunk/Makefile =================================================================== --- csw/mgar/pkg/a2ps/trunk/Makefile (rev 0) +++ csw/mgar/pkg/a2ps/trunk/Makefile 2010-05-07 19:25:13 UTC (rev 9832) @@ -0,0 +1,35 @@ +# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +GARNAME = a2ps +GARVERSION = 4.13 +SPKG_VERSION = 4.13b +CATEGORIES = apps + +DESCRIPTION = Any to PostScript filter +define BLURB + Any to PostScript filter +endef + +MASTER_SITES = http://ftp.gnu.org/pub/gnu/a2ps/ +DISTFILES = $(GARNAME)-$(GARVERSION)b.tar.gz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_SCRIPTS = + +include gar/category.mk + +# +PRESERVECONF = /opt/csw/etc/a2ps-site.cfg +PRESERVECONF = /opt/csw/etc/a2ps.cfg + +#RUNTIME_DEP_PKGS += +RUNTIME_DEP_PKGS_CSWa2ps += CSWggettextrt +RUNTIME_DEP_PKGS_CSWa2ps += CSWemacscommon + Property changes on: csw/mgar/pkg/a2ps/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/a2ps/trunk/checksums =================================================================== --- csw/mgar/pkg/a2ps/trunk/checksums (rev 0) +++ csw/mgar/pkg/a2ps/trunk/checksums 2010-05-07 19:25:13 UTC (rev 9832) @@ -0,0 +1 @@ +0c8e0c31b08c14f7a7198ce967eb3281 a2ps-4.13b.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From darinper at users.sourceforge.net Fri May 7 21:58:49 2010 From: darinper at users.sourceforge.net (darinper at users.sourceforge.net) Date: Fri, 07 May 2010 19:58:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[9833] csw/mgar/pkg Message-ID: Revision: 9833 http://gar.svn.sourceforge.net/gar/?rev=9833&view=rev Author: darinper Date: 2010-05-07 19:58:48 +0000 (Fri, 07 May 2010) Log Message: ----------- mpage: Initial commit Added Paths: ----------- csw/mgar/pkg/mpage/ csw/mgar/pkg/mpage/branches/ csw/mgar/pkg/mpage/tags/ csw/mgar/pkg/mpage/trunk/ csw/mgar/pkg/mpage/trunk/Makefile csw/mgar/pkg/mpage/trunk/checksums csw/mgar/pkg/mpage/trunk/files/ csw/mgar/pkg/mpage/trunk/files/Makefile.patch Property changes on: csw/mgar/pkg/mpage/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/mpage/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpage/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mpage/trunk/Makefile 2010-05-07 19:58:48 UTC (rev 9833) @@ -0,0 +1,36 @@ +# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +GARNAME = mpage +GARVERSION = 2.5.6 +CATEGORIES = apps + +DESCRIPTION = Print several pages on a single sheet of paper. +define BLURB + Print several pages on a single sheet of paper. +endef + +MASTER_SITES = http://www.mesa.nl/pub/mpage/ +DISTFILES = $(GARNAME)-$(GARVERSION).tgz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +CONFIGURE_ARGS = $(DIRPATHS) + +# doesn't come with a configure script +CONFIGURE_SCRIPTS = + +PATCHFILES = Makefile.patch + +TEST_SCRIPTS = + +include gar/category.mk + +# +GARCOMPILER = GCC4 + + + Property changes on: csw/mgar/pkg/mpage/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/mpage/trunk/checksums =================================================================== --- csw/mgar/pkg/mpage/trunk/checksums (rev 0) +++ csw/mgar/pkg/mpage/trunk/checksums 2010-05-07 19:58:48 UTC (rev 9833) @@ -0,0 +1,2 @@ +c0102c2409074ea7191ce44438cd6968 Makefile.patch +489663c9246e47915cea931348e5175d mpage-2.5.6.tgz Added: csw/mgar/pkg/mpage/trunk/files/Makefile.patch =================================================================== --- csw/mgar/pkg/mpage/trunk/files/Makefile.patch (rev 0) +++ csw/mgar/pkg/mpage/trunk/files/Makefile.patch 2010-05-07 19:58:48 UTC (rev 9833) @@ -0,0 +1,45 @@ +--- files/Makefile Fri May 7 21:45:45 2010 ++++ files/Makefile.mod Fri May 7 21:41:21 2010 +@@ -39,8 +39,8 @@ + # A4 for European A4 + # See glob.c for all possibilities + # +-# PAGESIZE=Letter +-PAGESIZE=A4 ++PAGESIZE=Letter ++#PAGESIZE=A4 + + # + # Define your spooler type +@@ -50,11 +50,11 @@ + SPOOL_TYPE=BSD_SPOOLER + + # PREFIX=e:/usr # OS/2 type +-PREFIX=/usr/local ++PREFIX=/opt/csw + #PREFIX=/usr + BINDIR=$(PREFIX)/bin + LIBDIR=$(PREFIX)/share +-MANDIR=$(PREFIX)/man/man1 ++MANDIR=$(PREFIX)/share/man/man1 + + # + # A default encoding is given in encoding.h. Setting ENCODING=1 will +@@ -178,10 +178,10 @@ + # add your proper install stuff + # + install: +- if [ ! -d $(LIBDIR)/mpage ] ; then mkdir -p $(LIBDIR)/mpage ; fi +- if [ ! -d $(BINDIR) ] ; then mkdir -p $(BINDIR) ; fi +- if [ ! -d $(MANDIR) ] ; then mkdir -p $(MANDIR) ; fi +- cp mpage$(E) $(BINDIR) +- cp mpage.1 $(MANDIR) +- -cp Encodings/* $(LIBDIR)/mpage +- -chmod 644 $(LIBDIR)/mpage/* ++ if [ ! -d $(DESTDIR)$(LIBDIR)/mpage ] ; then mkdir -p $(DESTDIR)$(LIBDIR)/mpage ; fi ++ if [ ! -d $(DESTDIR)$(BINDIR) ] ; then mkdir -p $(DESTDIR)$(BINDIR) ; fi ++ if [ ! -d $(DESTDIR)$(MANDIR) ] ; then mkdir -p $(DESTDIR)$(MANDIR) ; fi ++ cp mpage$(E) $(DESTDIR)$(BINDIR) ++ cp mpage.1 $(DESTDIR)$(MANDIR) ++ -cp Encodings/* $(DESTDIR)$(LIBDIR)/mpage ++ -chmod 644 $(DESTDIR)$(LIBDIR)/mpage/* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat May 8 08:42:31 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 08 May 2010 06:42:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[9834] csw/mgar/gar/v2/lib/python Message-ID: Revision: 9834 http://gar.svn.sourceforge.net/gar/?rev=9834&view=rev Author: wahwah Date: 2010-05-08 06:42:31 +0000 (Sat, 08 May 2010) Log Message: ----------- mGAR v2: checkpkg, better handling of dlopen binaries (Python only for now) Modified Paths: -------------- csw/mgar/gar/v2/lib/python/dependency_checks.py csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks.py 2010-05-07 19:58:48 UTC (rev 9833) +++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2010-05-08 06:42:31 UTC (rev 9834) @@ -11,6 +11,17 @@ "Please use /opt/csw/mysql5/..."), ) +DLOPEN_LIB_LOCATIONS = ( + r'^opt/csw/lib/python/site-packages.*', +) + +def IsDlopenLib(binary_path, locations=DLOPEN_LIB_LOCATIONS): + for location in locations: + location_re = re.compile(location) + if location_re.match(binary_path): + return True + return False + def Libraries(pkg_data, error_mgr, logger, path_and_pkg_by_soname): pkgname = pkg_data["basic_stats"]["pkgname"] logger.debug("Package %s", pkgname) @@ -47,8 +58,11 @@ orphan_sonames.append((soname, binary_info["path"])) orphan_sonames = set(orphan_sonames) for soname, binary_path in orphan_sonames: + if IsDlopenLib(binary_path): + # dlopen binaries don't need RPATH and can't be analyzed this way. + continue error_mgr.ReportError( - pkgname, "soname-not-found", soname, + pkgname, "soname-not-found", "%s is needed by %s" % (soname, binary_path)) # TODO: Report orphan sonames here return required_deps Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-05-07 19:58:48 UTC (rev 9833) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-05-08 06:42:31 UTC (rev 9834) @@ -169,7 +169,7 @@ def SetCheckLibraries(pkgs_data, error_mgr, logger, messenger): - """Second versionof the library checking code. + """Second version of the library checking code. 1. Collect all the data from the FS: {"": {"/path/1": ["CSWfoo1"], "/path/2": ["CSWfoo2"]}} @@ -607,7 +607,9 @@ for bad in sorted(not_matching): logger.debug("Bad rpath: %s", bad) - error_mgr.ReportError("bad-rpath-entry", bad) + error_mgr.ReportError( + "bad-rpath-entry", + "%s %s" % (bad, binary_info["path"])) def DisabledCheckForMissingSymbols(pkgs_data, debug): @@ -673,6 +675,12 @@ "relocation bound to a symbol with STV_PROTECTED visibility" % (ldd_elem["symbol"], ldd_elem["path"])) + +def SetCheckFileCollissions(pkgs_data, error_mgr, logger, messenger): + for pkg_data in pkgs_data: + pass + + def CheckPythonPackageName(pkg_data, error_mgr, logger, messenger): """Checks for CSWpy-* and py_* package names.""" pyfile_re = re.compile(r"/opt/csw/lib/python.*/.*") @@ -698,4 +706,3 @@ "For example, %s. " "However, the catalogname doesn't start with 'py_'." % repr(example_py_file)) - Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-05-07 19:58:48 UTC (rev 9833) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-05-08 06:42:31 UTC (rev 9834) @@ -436,6 +436,36 @@ self.pkg_data = [self.pkg_data] +class TestCheckLibrariesDlopenLibs_1(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'SetCheckLibraries' + def CheckpkgTest(self): + binaries_dump_info = self.pkg_data["binaries_dump_info"] + binaries_dump_info[0]["runpath"] = [] + binaries_dump_info[0]["needed sonames"] = ["libnotfound.so"] + binaries_dump_info[0]["path"] = 'opt/csw/lib/python/site-packages/foo.so' + self.pkg_data["depends"] = tuple() + self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libnotfound.so').AndReturn({ + }) + self.pkg_data = [self.pkg_data] + + +class TestCheckLibrariesDlopenLibs_2(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'SetCheckLibraries' + def CheckpkgTest(self): + binaries_dump_info = self.pkg_data["binaries_dump_info"] + binaries_dump_info[0]["runpath"] = [] + binaries_dump_info[0]["needed sonames"] = ["libnotfound.so"] + binaries_dump_info[0]["path"] = 'opt/csw/lib/foo.so' + self.pkg_data["depends"] = tuple() + self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libnotfound.so').AndReturn({ + }) + self.error_mgr_mock.ReportError('CSWrsync', 'soname-not-found', + 'libnotfound.so is needed by opt/csw/lib/foo.so') + self.pkg_data = [self.pkg_data] + + class TestCheckVendorURL_BadUrl(CheckpkgUnitTestHelper, unittest.TestCase): FUNCTION_NAME = "CheckVendorURL" def CheckpkgTest(self): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat May 8 08:43:45 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 08 May 2010 06:43:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[9835] csw/mgar/gar/v2 Message-ID: Revision: 9835 http://gar.svn.sourceforge.net/gar/?rev=9835&view=rev Author: wahwah Date: 2010-05-08 06:43:45 +0000 (Sat, 08 May 2010) Log Message: ----------- mGAR v2: checkpkg, prep work for multiple system pkgmaps. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg csw/mgar/gar/v2/lib/python/checkpkg.py Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-05-08 06:42:31 UTC (rev 9834) +++ csw/mgar/gar/v2/bin/checkpkg 2010-05-08 06:43:45 UTC (rev 9835) @@ -58,10 +58,6 @@ readonly selfpath="$0" readonly selfargs="$@" -# always print out a warning message. (to stderr) -# exit script, if quit_on_warn set - - cleanup(){ if [[ -d "$EXTRACTDIR" ]] ; then rm -rf $EXTRACTDIR @@ -82,13 +78,6 @@ rm $SETINF* fi } -warnmsg(){ - print WARNING: $* >/dev/fd/2 - if [[ "$quit_on_warn" != "" ]] ; then - cleanup - exit 1 - fi -} # Print error message, and quit program. errmsg(){ @@ -117,9 +106,13 @@ display_help=0 SKIP_STATS_COLLECTION=0 MD5_SUMS_CATALOG_FILE="" +INSTALL_CONTENTS_FILES="/var/sadm/install/contents" -while getopts hsdNM:o: opt; do +while getopts hsdNM:o:c: opt; do case "${opt}" in + c) + INSTALL_CONTENTS_FILES="${INSTALL_CONTENTS_FILES} ${OPTARG}" + ;; s) SAVE_TAGS=1 ;; @@ -129,9 +122,6 @@ d) DEBUG=1 ;; - e) - quit_on_warn=1 - ;; h) display_help=1 ;; @@ -148,15 +138,22 @@ done shift $(( $OPTIND -1 )) -readonly SAVE_TAGS SAVED_TAGS_FILE MD5_SUMS_CATALOG_FILE +readonly INSTALL_CONTENTS_FILES +readonly MD5_SUMS_CATALOG_FILE +readonly SAVED_TAGS_FILE +readonly SAVE_TAGS +readonly SKIP_STATS_COLLECTION if [[ "${display_help}" -eq 1 ]] ; then - print 'Usage: checkpkg [options] pkg1 [pkg2 ....]' - print 'Options:' - print ' -s save error tags on disk' - print ' -d display debug messages' - print ' -e exit on warnings (soon to be obsolete)' - exit 0 + print 'Usage: checkpkg [options] pkg1 [pkg2 ....]' + print 'Options:' + print ' -c use an additional install/contents file' + print ' -s save error tags on disk' + print ' -o save tag output to file' + print ' -d display debug messages' + print ' -N skip statistics collection' + print ' -M use package md5sums from a catalog file' + exit 0 fi if [[ "${SAVE_TAGS}" -eq 1 ]]; then Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-05-08 06:42:31 UTC (rev 9834) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-05-08 06:43:45 UTC (rev 9835) @@ -113,7 +113,7 @@ #end if #if $messages #for $msg in $messages -$textwrap.fill($msg, 78, initial_indent="# ", subsequent_indent="# ") +$textwrap.fill($msg, 78, initial_indent=" * ", subsequent_indent=" ") #end for #end if #if $gar_lines @@ -206,7 +206,7 @@ CHECKPKG_DIR = ".checkpkg" SQLITE3_DBNAME_TMPL = "var-sadm-install-contents-cache-%s" - def __init__(self): + def __init__(self, system_pkgmap_files=None): """There is no need to re-parse it each time. Read it slowly the first time and cache it for later.""" @@ -218,6 +218,10 @@ self.file_mtime = None self.cache_mtime = None self.initialized = False + if not system_pkgmap_files: + self.system_pkgmap_files = [SYSTEM_PKGMAP] + else: + self.system_pkgmap_files = system_pkgmap_files def _LazyInitializeDatabase(self): if not self.initialized: @@ -236,7 +240,7 @@ self.PurgeDatabase() self.PopulateDatabase() else: - print "Building a cache of %s." % SYSTEM_PKGMAP + print "Building a cache of %s." % self.system_pkgmap_files print "The cache will be kept in %s." % self.db_path if not os.path.exists(self.checkpkg_dir): logging.debug("Creating %s", self.checkpkg_dir) @@ -279,15 +283,24 @@ egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog """ - contents_length = os.stat(SYSTEM_PKGMAP).st_size + for pkgmap_path in self.system_pkgmap_files: + self._ProcessSystemPkgmap(pkgmap_path) + self._CreateDbIndex() + self.PopulatePackagesTable() + self.SetDatabaseMtime() + self.SetDatabaseSchemaVersion() + self.conn.commit() + + def _ProcessSystemPkgmap(self, pkgmap_path): + contents_length = os.stat(pkgmap_path).st_size estimated_lines = contents_length / INSTALL_CONTENTS_AVG_LINE_LENGTH - system_pkgmap_fd = open(SYSTEM_PKGMAP, "r") + system_pkgmap_fd = open(pkgmap_path, "r") stop_re = re.compile("(%s)" % "|".join(self.STOP_PKGS)) # Creating a data structure: # soname - {: , : , ...} logging.debug("Building sqlite3 cache db of the %s file", - SYSTEM_PKGMAP) - print "Processing %s" % SYSTEM_PKGMAP + pkgmap_path) + print "Processing %s" % pkgmap_path c = self.conn.cursor() count = itertools.count() sql = "INSERT INTO systempkgmap (basename, path, line) VALUES (?, ?, ?);" @@ -304,13 +317,12 @@ pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) c.execute(sql, (pkgmap_entry_base_name, pkgmap_entry_dir, line.strip())) print "\rAll lines of %s were processed." % SYSTEM_PKGMAP + + def _CreateDbIndex(self): print "Creating the main database index." sql = "CREATE INDEX basename_idx ON systempkgmap(basename);" + c = self.conn.cursor() c.execute(sql) - self.PopulatePackagesTable() - self.SetDatabaseMtime() - self.SetDatabaseSchemaVersion() - self.conn.commit() def _ParsePkginfoLine(self, line): fields = re.split(WS_RE, line) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat May 8 08:53:03 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 08 May 2010 06:53:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[9836] csw/mgar/pkg/Makefile Message-ID: Revision: 9836 http://gar.svn.sourceforge.net/gar/?rev=9836&view=rev Author: wahwah Date: 2010-05-08 06:53:03 +0000 (Sat, 08 May 2010) Log Message: ----------- newpkgs target: Better handling of the $Id$ tag. Modified Paths: -------------- csw/mgar/pkg/Makefile Modified: csw/mgar/pkg/Makefile =================================================================== --- csw/mgar/pkg/Makefile 2010-05-08 06:43:45 UTC (rev 9835) +++ csw/mgar/pkg/Makefile 2010-05-08 06:53:03 UTC (rev 9836) @@ -64,7 +64,7 @@ newpkg-%: @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files - @(echo "# $$Id$$"; \ + @(echo '# $$Id$$'; \ echo "GARNAME = $*"; \ echo "GARVERSION = 1.0"; \ echo "CATEGORIES = category"; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat May 8 08:54:53 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 08 May 2010 06:54:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[9837] csw/mgar/pkg/file/trunk Message-ID: Revision: 9837 http://gar.svn.sourceforge.net/gar/?rev=9837&view=rev Author: wahwah Date: 2010-05-08 06:54:53 +0000 (Sat, 08 May 2010) Log Message: ----------- file: Splitting off libmagic and creating a Python extension: py_libmagic Modified Paths: -------------- csw/mgar/pkg/file/trunk/Makefile csw/mgar/pkg/file/trunk/checksums Added Paths: ----------- csw/mgar/pkg/file/trunk/files/0001-libtool-dir-used-for-linking.patch Modified: csw/mgar/pkg/file/trunk/Makefile =================================================================== --- csw/mgar/pkg/file/trunk/Makefile 2010-05-08 06:53:03 UTC (rev 9836) +++ csw/mgar/pkg/file/trunk/Makefile 2010-05-08 06:54:53 UTC (rev 9837) @@ -18,15 +18,15 @@ # These flags are not understood by Sun Studio CONFIGURE_ARGS += --disable-warnings TEST_TARGET = check -PACKAGES = CSWfile CSWlibmagic CSWpy-magic +PATCHFILES = 0001-libtool-dir-used-for-linking.patch +PACKAGES = CSWfile CSWlibmagic CSWpy-libmagic PKGFILES_CSWlibmagic = $(PKGFILES_RT) -PKGFILES_CSWpy-magic = later +PKGFILES_CSWpy-libmagic = /opt/csw/lib/python.* SPKG_DESC_CSWfile = A file type guesser SPKG_DESC_CSWlibmagic = The library behind file(1) -SPKG_DESC_CSWpy-magic = Python wrapper for libmagic -CATALOGNAME_CSWpy-magic = py_magic +SPKG_DESC_CSWpy-libmagic = Python extension for libmagic +CATALOGNAME_CSWpy-libmagic = py_libmagic RUNTIME_DEP_PKGS_CSWfile += CSWlibmagic -ARCHALL_CSWpy-magic = 1 RUNTIME_DEP_PKGS_CSWfile += CSWzlib RUNTIME_DEP_PKGS_CSWlibmagic += CSWzlib @@ -35,14 +35,19 @@ # newly built "file". IGNORE_DESTDIR = 1 +# Doesn't hurt to have this on. +DISTUTILS_DEBUG = 1 +export DISTUTILS_DEBUG + include gar/category.mk -post-build-modulated-disabled: +post-build-modulated: # This fails for a mysterious reason. Can't find libmagic (-lmagic). + # (cd $(WORKSRC)/python && python setup.py build --compiler=unix) (cd $(WORKSRC)/python && python setup.py build) @$(MAKECOOKIE) post-install-modulated: (cd $(WORKSRC)/python && \ - python setup.py install) + python setup.py install --root=$(DESTDIR) --prefix=$(prefix)) @$(MAKECOOKIE) Modified: csw/mgar/pkg/file/trunk/checksums =================================================================== --- csw/mgar/pkg/file/trunk/checksums 2010-05-08 06:53:03 UTC (rev 9836) +++ csw/mgar/pkg/file/trunk/checksums 2010-05-08 06:54:53 UTC (rev 9837) @@ -1 +1,2 @@ +80e221ff50866a635483cc4f03773d94 0001-libtool-dir-used-for-linking.patch accade81ff1cc774904b47c72c8aeea0 file-5.04.tar.gz Added: csw/mgar/pkg/file/trunk/files/0001-libtool-dir-used-for-linking.patch =================================================================== --- csw/mgar/pkg/file/trunk/files/0001-libtool-dir-used-for-linking.patch (rev 0) +++ csw/mgar/pkg/file/trunk/files/0001-libtool-dir-used-for-linking.patch 2010-05-08 06:54:53 UTC (rev 9837) @@ -0,0 +1,25 @@ +From 071f0c1b11cf21628aa3ec8c092cfd050a11e9d9 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sat, 8 May 2010 08:47:26 +0200 +Subject: [PATCH] libtool dir used for linking + +--- + python/setup.py | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/python/setup.py b/python/setup.py +index 7c86194..71074c3 100644 +--- a/python/setup.py ++++ b/python/setup.py +@@ -3,7 +3,7 @@ from distutils.core import setup, Extension + + magic_module = Extension('magic', + libraries = ['magic'], +- library_dirs = ['./','../','../src','/usr/lib/'], ++ library_dirs = ['./','../','../src','../src/.libs','/usr/lib/'], + include_dirs = ['./','../','../src','/usr/include/'], + sources = ['py_magic.c']) + +-- +1.7.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat May 8 09:39:06 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 08 May 2010 07:39:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[9839] csw/mgar/pkg/file/trunk/Makefile Message-ID: Revision: 9839 http://gar.svn.sourceforge.net/gar/?rev=9839&view=rev Author: wahwah Date: 2010-05-08 07:39:05 +0000 (Sat, 08 May 2010) Log Message: ----------- file: Adding dependencies to py_libmagic. Modified Paths: -------------- csw/mgar/pkg/file/trunk/Makefile Modified: csw/mgar/pkg/file/trunk/Makefile =================================================================== --- csw/mgar/pkg/file/trunk/Makefile 2010-05-08 07:36:45 UTC (rev 9838) +++ csw/mgar/pkg/file/trunk/Makefile 2010-05-08 07:39:05 UTC (rev 9839) @@ -29,6 +29,8 @@ RUNTIME_DEP_PKGS_CSWfile += CSWlibmagic RUNTIME_DEP_PKGS_CSWfile += CSWzlib RUNTIME_DEP_PKGS_CSWlibmagic += CSWzlib +RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWlibmagic +RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWpython # The "file" util is used during stripbin. As the newly build binary # requires libmagic which is not installed yet we must not use the This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat May 8 09:36:46 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 08 May 2010 07:36:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[9838] csw/mgar/gar/v2/lib/python/dependency_checks.py Message-ID: Revision: 9838 http://gar.svn.sourceforge.net/gar/?rev=9838&view=rev Author: wahwah Date: 2010-05-08 07:36:45 +0000 (Sat, 08 May 2010) Log Message: ----------- mGAR v2: checkpkg, automatically appending /opt/csw/lib to RPATHs of Python libraries Modified Paths: -------------- csw/mgar/gar/v2/lib/python/dependency_checks.py Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks.py 2010-05-08 06:54:53 UTC (rev 9837) +++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2010-05-08 07:36:45 UTC (rev 9838) @@ -34,7 +34,14 @@ path_list = path_and_pkg_by_soname[soname].keys() logger.debug("%s @ %s: looking for %s in %s", soname, binary_info["path"], binary_info["runpath"], path_list) - for runpath in binary_info["runpath"] + checkpkg.SYS_DEFAULT_RUNPATH: + runpath_list = binary_info["runpath"] + checkpkg.SYS_DEFAULT_RUNPATH + if IsDlopenLib(binary_info["path"]): + # This is a heuristic. Libraries in certain paths lack the RPATH setting, + # but it's not a problem since they are dlopened. + for runpath in ("/opt/csw/lib", "/opt/csw/lib/64"): + if runpath not in runpath_list: + runpath_list.append(runpath) + for runpath in runpath_list: resolved_path = checkpkg.ResolveSoname(runpath, soname, isalist, path_list) if resolved_path: logger.debug("%s needed by %s:", @@ -58,9 +65,6 @@ orphan_sonames.append((soname, binary_info["path"])) orphan_sonames = set(orphan_sonames) for soname, binary_path in orphan_sonames: - if IsDlopenLib(binary_path): - # dlopen binaries don't need RPATH and can't be analyzed this way. - continue error_mgr.ReportError( pkgname, "soname-not-found", "%s is needed by %s" % (soname, binary_path)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat May 8 09:51:11 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 08 May 2010 07:51:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[9840] csw/mgar/gar/v2/lib/python/package_checks_test.py Message-ID: Revision: 9840 http://gar.svn.sourceforge.net/gar/?rev=9840&view=rev Author: wahwah Date: 2010-05-08 07:51:11 +0000 (Sat, 08 May 2010) Log Message: ----------- mGAR v2: checkpkg, updated tests for Python shared libraries Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-05-08 07:39:05 UTC (rev 9839) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-05-08 07:51:11 UTC (rev 9840) @@ -437,16 +437,21 @@ class TestCheckLibrariesDlopenLibs_1(CheckpkgUnitTestHelper, unittest.TestCase): + """For dlopen-style shared libraries, libraries from /opt/csw/lib should be + counted as dependencies. It's only a heuristic though.""" FUNCTION_NAME = 'SetCheckLibraries' def CheckpkgTest(self): binaries_dump_info = self.pkg_data["binaries_dump_info"] binaries_dump_info[0]["runpath"] = [] - binaries_dump_info[0]["needed sonames"] = ["libnotfound.so"] + binaries_dump_info[0]["needed sonames"] = ["libbar.so"] binaries_dump_info[0]["path"] = 'opt/csw/lib/python/site-packages/foo.so' self.pkg_data["depends"] = tuple() self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] - self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libnotfound.so').AndReturn({ + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libbar.so').AndReturn({ + u'/opt/csw/lib': [u'CSWlibbar'], + u'/opt/csw/lib/sparcv9': [u'CSWlibbar'], }) + self.error_mgr_mock.ReportError('CSWrsync', 'missing-dependency', u'CSWlibbar') self.pkg_data = [self.pkg_data] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat May 8 17:59:08 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 08 May 2010 15:59:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[9841] csw/mgar/gar/v2-bwalton Message-ID: Revision: 9841 http://gar.svn.sourceforge.net/gar/?rev=9841&view=rev Author: bdwalton Date: 2010-05-08 15:59:08 +0000 (Sat, 08 May 2010) Log Message: ----------- gar/v2-bwalton: add git handling of per-modulation makepatch Modified Paths: -------------- csw/mgar/gar/v2-bwalton/gar.conf.mk csw/mgar/gar/v2-bwalton/gar.lib.mk csw/mgar/gar/v2-bwalton/gar.mk Modified: csw/mgar/gar/v2-bwalton/gar.conf.mk =================================================================== --- csw/mgar/gar/v2-bwalton/gar.conf.mk 2010-05-08 07:51:11 UTC (rev 9840) +++ csw/mgar/gar/v2-bwalton/gar.conf.mk 2010-05-08 15:59:08 UTC (rev 9841) @@ -50,6 +50,10 @@ GIT_PROXY_SCRIPT ?= $(abspath $(GARBIN))/gitproxy GIT_DEFAULT_TRACK = +refs/heads/master:refs/remotes/origin/master +# if a user always wants --signoff, for example. used in makepatch +# by default, the -v will show the diff being committed... +GIT_COMMIT_OPTS ?= -v + # For parallel builds PARALLELMODULATIONS ?= MULTITAIL ?= /opt/csw/bin/multitail Modified: csw/mgar/gar/v2-bwalton/gar.lib.mk =================================================================== --- csw/mgar/gar/v2-bwalton/gar.lib.mk 2010-05-08 07:51:11 UTC (rev 9840) +++ csw/mgar/gar/v2-bwalton/gar.lib.mk 2010-05-08 15:59:08 UTC (rev 9841) @@ -475,7 +475,6 @@ normal-patch-%: @echo " ==> Applying patch $(DOWNLOADDIR)/$*" @( if ggrep -q 'Subject:' $(abspath $(DOWNLOADDIR)/$*); then \ - echo Adding git-style patch...; \ cd $(WORKSRC); git am $(abspath $(DOWNLOADDIR)/$*); \ else \ echo Adding old-style patch...; \ Modified: csw/mgar/gar/v2-bwalton/gar.mk =================================================================== --- csw/mgar/gar/v2-bwalton/gar.mk 2010-05-08 07:51:11 UTC (rev 9840) +++ csw/mgar/gar/v2-bwalton/gar.mk 2010-05-08 15:59:08 UTC (rev 9841) @@ -144,6 +144,7 @@ define _modulate_do $(call _modulate_target,extract,$(2),$(4)) $(call _modulate_target,patch,$(2),$(4)) +$(call _modulate_target_nocookie,makepatch,$(2),$(4)) $(call _modulate_target,configure,$(2),$(4)) $(call _modulate_target_nocookie,reset-configure,$(2),$(4)) $(call _modulate_target,build,$(2),$(4)) @@ -458,25 +459,33 @@ @$(foreach COOKIEFILE,$(PATCH_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) post-patch-gitsnap: $(WORKSRC) $(PATCH_TARGETS) + @echo "Tagging top of current csw patch stack..." @( cd $(WORKSRC); git tag -am "CSW $(GARVERSION)" csw-$(GARVERSION) ) @$(MAKECOOKIE) +makepatch: $(addprefix patch-,$(MODULATIONS)) $(addprefix makepatch-,$(MODULATIONS)) + @$(DONADA) + # Allow generation of patches from modified work source. -makepatch: $(FILEDIR) - @echo Makepatch: Checking for changes in work tree... - @( cd $(WORKSRC_FIRSTMOD); \ +makepatch-modulated: $(FILEDIR) + @echo " ==> Makepatch: Looking for changes in modulation $(MODULATION)" + @( cd $(WORKSRC); \ git add -A; \ git diff --cached --quiet; \ - if test $$? -eq 0; then echo "No changes."; exit 1; fi ) - @echo Makepatch: Capturing changes... - @(cd $(WORKSRC_FIRSTMOD); \ - git commit; \ - git format-patch HEAD~1; \ - echo Add the following to your recipe and then; \ - echo rerun: gmake makesums; \ - echo PATCHFILES += 0001*; \ - mv 0001* $(abspath $(FILEDIR)) ) + if test $$? -eq 0; then \ + echo "No changes."; \ + else \ + echo "Capturing changes..."; \ + git commit $(GIT_COMMIT_OPTS) && \ + ( git format-patch csw-$(GARVERSION); \ + echo Add the following to your recipe and then; \ + echo rerun: gmake makesums; \ + echo PATCHFILES += 0001*; \ + echo "(or maybe PATCHFILES_$(MODULATION) ??)"; \ + mv 0001* $(abspath $(FILEDIR)); ) \ + fi ) + # XXX: Allow patching of pristine sources separate from ISA directories # XXX: Use makepatch on global/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun May 9 00:34:55 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 08 May 2010 22:34:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[9842] csw/mgar/gar/v2/lib/python Message-ID: Revision: 9842 http://gar.svn.sourceforge.net/gar/?rev=9842&view=rev Author: wahwah Date: 2010-05-08 22:34:55 +0000 (Sat, 08 May 2010) Log Message: ----------- mGAR v2: checkpkg, the automatic rpath appending was bollocks, this change removes it. checkpkg was doing the right thing before. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/dependency_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks.py 2010-05-08 15:59:08 UTC (rev 9841) +++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2010-05-08 22:34:55 UTC (rev 9842) @@ -15,13 +15,6 @@ r'^opt/csw/lib/python/site-packages.*', ) -def IsDlopenLib(binary_path, locations=DLOPEN_LIB_LOCATIONS): - for location in locations: - location_re = re.compile(location) - if location_re.match(binary_path): - return True - return False - def Libraries(pkg_data, error_mgr, logger, path_and_pkg_by_soname): pkgname = pkg_data["basic_stats"]["pkgname"] logger.debug("Package %s", pkgname) @@ -35,12 +28,6 @@ logger.debug("%s @ %s: looking for %s in %s", soname, binary_info["path"], binary_info["runpath"], path_list) runpath_list = binary_info["runpath"] + checkpkg.SYS_DEFAULT_RUNPATH - if IsDlopenLib(binary_info["path"]): - # This is a heuristic. Libraries in certain paths lack the RPATH setting, - # but it's not a problem since they are dlopened. - for runpath in ("/opt/csw/lib", "/opt/csw/lib/64"): - if runpath not in runpath_list: - runpath_list.append(runpath) for runpath in runpath_list: resolved_path = checkpkg.ResolveSoname(runpath, soname, isalist, path_list) if resolved_path: Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-05-08 15:59:08 UTC (rev 9841) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-05-08 22:34:55 UTC (rev 9842) @@ -451,7 +451,9 @@ u'/opt/csw/lib': [u'CSWlibbar'], u'/opt/csw/lib/sparcv9': [u'CSWlibbar'], }) - self.error_mgr_mock.ReportError('CSWrsync', 'missing-dependency', u'CSWlibbar') + self.error_mgr_mock.ReportError('CSWrsync', 'soname-not-found', + 'libbar.so is needed by ' + 'opt/csw/lib/python/site-packages/foo.so') self.pkg_data = [self.pkg_data] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun May 9 13:35:42 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 09 May 2010 11:35:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[9843] csw/mgar/pkg/cmake/trunk/Makefile Message-ID: Revision: 9843 http://gar.svn.sourceforge.net/gar/?rev=9843&view=rev Author: rthurner Date: 2010-05-09 11:35:42 +0000 (Sun, 09 May 2010) Log Message: ----------- cmake - checkpkg fixes Modified Paths: -------------- csw/mgar/pkg/cmake/trunk/Makefile Modified: csw/mgar/pkg/cmake/trunk/Makefile =================================================================== --- csw/mgar/pkg/cmake/trunk/Makefile 2010-05-08 22:34:55 UTC (rev 9842) +++ csw/mgar/pkg/cmake/trunk/Makefile 2010-05-09 11:35:42 UTC (rev 9843) @@ -16,13 +16,14 @@ SPKG_SOURCEURL = http://cmake.org/ MASTER_SITES = http://cmake.org/files/v$(RELVER)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +LICENSE = Copyright.txt PACKAGES = CSWcmake CATALOGNAME_CSWcmake = cmake SPKG_DESC_CSWcmake = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWcmake = CSWcurlrt CSWexpat CSWlibidn CSWoldaprt -RUNTIME_DEP_PKGS_CSWcmake += CSWosslrt CSWxmlrpc-c CSWzlib +RUNTIME_DEP_PKGS_CSWcmake = CSWcurlrt CSWexpat +RUNTIME_DEP_PKGS_CSWcmake += CSWzlib # We define upstream file regex so we can be notifed of # new upstream software release This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun May 9 13:37:20 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 09 May 2010 11:37:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[9844] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 9844 http://gar.svn.sourceforge.net/gar/?rev=9844&view=rev Author: rthurner Date: 2010-05-09 11:37:20 +0000 (Sun, 09 May 2010) Log Message: ----------- subversion - uses now 1.6.0_20 for compiling Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-05-09 11:35:42 UTC (rev 9843) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-05-09 11:37:20 UTC (rev 9844) @@ -48,7 +48,7 @@ CATALOGNAME_CSWsvn-contrib = subversion_contrib CATALOGNAME_CSWsvn-tools = subversion_tools RUNTIME_DEP_PKGS_CSWsvn = CSWapache2rt -RUNTIME_DEP_PKGS_CSWsvn += CSWbdb47 +RUNTIME_DEP_PKGS_CSWsvn += CSWbdb48 RUNTIME_DEP_PKGS_CSWsvn += CSWexpat RUNTIME_DEP_PKGS_CSWsvn += CSWggettextrt RUNTIME_DEP_PKGS_CSWsvn += CSWiconv @@ -150,12 +150,11 @@ PATCHFILES += 0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch SVNLIB = $(prefix)/lib/svn -JDK = /usr/jdk1.5.0_15 +JAVA_HOME = /usr/jdk1.6.0_20 -EXTRA_INC = $(JDK)/include EXTRA_INC += $(prefix)/apache2/include -EXTRA_LIB = /opt/csw/bdb47/lib +EXTRA_LIB = /opt/csw/bdb48/lib EXTRA_LIB += /opt/csw/apache2/lib EXTRA_LIB += $(SVNLIB) EXTRA_LINKER_FLAGS = -lintl -liconv @@ -180,12 +179,12 @@ CONFIGURE_ARGS = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB) CONFIGURE_ARGS += --disable-mod-activation CONFIGURE_ARGS += --disable-static -CONFIGURE_ARGS += --with-berkeley-db=db.h:/opt/csw/bdb47/include:/opt/csw/bdb47/lib:db +CONFIGURE_ARGS += --with-berkeley-db=db.h:/opt/csw/bdb48/include:/opt/csw/bdb48/lib:db CONFIGURE_ARGS += --enable-javahl CONFIGURE_ARGS += --with-apr=$(prefix)/apache2/bin/apr-config CONFIGURE_ARGS += --with-apr-util=$(prefix)/apache2/bin/apu-config CONFIGURE_ARGS += --with-apxs=$(prefix)/apache2/sbin/apxs -CONFIGURE_ARGS += --with-jdk=$(JDK) +CONFIGURE_ARGS += --with-jdk=$(JAVA_HOME) CONFIGURE_ARGS += --with-sasl=$(prefix) CONFIGURE_ARGS += --with-ssl=$(prefix) CONFIGURE_ARGS += --with-zlib=$(prefix) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From darinper at users.sourceforge.net Mon May 10 16:28:22 2010 From: darinper at users.sourceforge.net (darinper at users.sourceforge.net) Date: Mon, 10 May 2010 14:28:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[9845] csw/mgar/pkg Message-ID: Revision: 9845 http://gar.svn.sourceforge.net/gar/?rev=9845&view=rev Author: darinper Date: 2010-05-10 14:28:22 +0000 (Mon, 10 May 2010) Log Message: ----------- conserver: Initial commit Added Paths: ----------- csw/mgar/pkg/conserver/ csw/mgar/pkg/conserver/branches/ csw/mgar/pkg/conserver/tags/ csw/mgar/pkg/conserver/trunk/ csw/mgar/pkg/conserver/trunk/Makefile csw/mgar/pkg/conserver/trunk/checksums csw/mgar/pkg/conserver/trunk/files/ csw/mgar/pkg/conserver/trunk/files/cswconserver Property changes on: csw/mgar/pkg/conserver/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/conserver/trunk/Makefile =================================================================== --- csw/mgar/pkg/conserver/trunk/Makefile (rev 0) +++ csw/mgar/pkg/conserver/trunk/Makefile 2010-05-10 14:28:22 UTC (rev 9845) @@ -0,0 +1,55 @@ +# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +GARNAME = conserver +GARVERSION = 8.1.7 +CATEGORIES = apps + +DESCRIPTION = Client/Server console server software +define BLURB + Conserver is an application that allows multiple users to watch a + serial console at the same time. It can log the data, allows users + to take write-access of a console (one at a time), and has a + variety of bells and whistles to accentuate that basic + functionality. The idea is that conserver will log all your serial + traffic so you can go back and review why something crashed, look + at changes (if done on the console), or tie the console logs into a + monitoring system (just watch the logfiles it creates). With + multi-user capabilities you can work on equipment with others, + mentor, train, etc. It also does all that client-server stuff so + that, assuming you have a network connection, you can interact with + any of the equipment from home or wherever. + +endef + +MASTER_SITES = http://www.conserver.com/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-uds +CONFIGURE_ARGS += --with-libwrap +CONFIGURE_ARGS += --with-openssl +CONFIGURE_ARGS += --with-pam + +LICENSE = LICENSE + +DISTFILES += cswconserver +INITSMF = /opt/csw/etc/init.d/cswconserver + +include gar/category.mk + +RUNTIME_DEP_PKGS_CSWconserver += CSWtcpwrap +RUNTIME_DEP_PKGS_CSWconserver += CSWosslrt + +post-merge: merge-init-script + +# +merge-init-script: + ginstall -m 755 -d $(PKGROOT)/opt/csw/etc/init.d + ginstall -m 755 $(FILEDIR)/cswconserver $(PKGROOT)/opt/csw/etc/init.d/cswconserver + Property changes on: csw/mgar/pkg/conserver/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/conserver/trunk/checksums =================================================================== --- csw/mgar/pkg/conserver/trunk/checksums (rev 0) +++ csw/mgar/pkg/conserver/trunk/checksums 2010-05-10 14:28:22 UTC (rev 9845) @@ -0,0 +1,2 @@ +9796099c4fca9f751a0ff4765288f8e4 conserver-8.1.7.tar.gz +d1b417c462f745b2fc34e1519a2a1807 cswconserver Added: csw/mgar/pkg/conserver/trunk/files/cswconserver =================================================================== --- csw/mgar/pkg/conserver/trunk/files/cswconserver (rev 0) +++ csw/mgar/pkg/conserver/trunk/files/cswconserver 2010-05-10 14:28:22 UTC (rev 9845) @@ -0,0 +1,43 @@ +#!/bin/sh +# +# Startup for conserver +# + +PATH=/usr/bin:/bin:/opt/csw/bin:/opt/csw/sbin +PIDFILE="/var/run/conserver.pid" + +[ ! -f /opt/csw/etc/conserver.cf ] && exit + +signalmaster() { + sig=$1 + if [ -f "$PIDFILE" ]; then + master=`cat "$PIDFILE"` + else + master=`ps -ef | grep conserver | awk '$3 == "1"{print $2}'` + fi + [ "$master" ] && kill -$sig $master +} + +case "$1" in + 'start') + echo "Starting console server daemon" + conserver -d + ;; + + 'stop') + echo "Stopping console server daemon" + signalmaster TERM + ;; + + 'restart') + echo "Restarting console server daemon" + signalmaster HUP + ;; + + *) + echo "Usage: $0 { start | stop | restart }" + ;; + +esac +exit 0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From darinper at users.sourceforge.net Mon May 10 18:08:59 2010 From: darinper at users.sourceforge.net (darinper at users.sourceforge.net) Date: Mon, 10 May 2010 16:08:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[9846] csw/mgar/pkg Message-ID: Revision: 9846 http://gar.svn.sourceforge.net/gar/?rev=9846&view=rev Author: darinper Date: 2010-05-10 16:08:59 +0000 (Mon, 10 May 2010) Log Message: ----------- fakeroot: Initial commit Added Paths: ----------- csw/mgar/pkg/fakeroot/ csw/mgar/pkg/fakeroot/branches/ csw/mgar/pkg/fakeroot/tags/ csw/mgar/pkg/fakeroot/trunk/ csw/mgar/pkg/fakeroot/trunk/Makefile csw/mgar/pkg/fakeroot/trunk/checksums csw/mgar/pkg/fakeroot/trunk/files/ Property changes on: csw/mgar/pkg/fakeroot/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/fakeroot/trunk/Makefile =================================================================== --- csw/mgar/pkg/fakeroot/trunk/Makefile (rev 0) +++ csw/mgar/pkg/fakeroot/trunk/Makefile 2010-05-10 16:08:59 UTC (rev 9846) @@ -0,0 +1,32 @@ +# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +GARNAME = fakeroot +GARVERSION = 1.12.4 +CATEGORIES = apps + +DESCRIPTION = A fake root environment by means of LD_PRELOAD and SYSV IPC (or TCP) trickery. +define BLURB + A fake root environment by means of LD_PRELOAD and SYSV IPC (or TCP) trickery. +endef + +MASTER_SITES = http://ftp.debian.org/debian/pool/main/f/fakeroot/ +DISTFILES = $(GARNAME)_$(GARVERSION).tar.gz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_SCRIPTS = + +include gar/category.mk + +# The ACL implemenatation in fakeroot doesn't work on solaris so remove it +pre-configure-modulated: + @( cd $(WORKSRC); gsed -i -e 's%sys/acl.h%%' configure.ac; \ + autoreconf ) + @$(MAKECOOKIE) + Property changes on: csw/mgar/pkg/fakeroot/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/fakeroot/trunk/checksums =================================================================== --- csw/mgar/pkg/fakeroot/trunk/checksums (rev 0) +++ csw/mgar/pkg/fakeroot/trunk/checksums 2010-05-10 16:08:59 UTC (rev 9846) @@ -0,0 +1 @@ +aaefede2405a40c87438e7e833d69b70 fakeroot_1.12.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Tue May 11 13:43:50 2010 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Tue, 11 May 2010 11:43:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[9847] csw/mgar/pkg Message-ID: Revision: 9847 http://gar.svn.sourceforge.net/gar/?rev=9847&view=rev Author: trygvis Date: 2010-05-11 11:43:50 +0000 (Tue, 11 May 2010) Log Message: ----------- o Initial import of tmux. Added Paths: ----------- csw/mgar/pkg/tmux/ csw/mgar/pkg/tmux/branches/ csw/mgar/pkg/tmux/tags/ csw/mgar/pkg/tmux/trunk/ csw/mgar/pkg/tmux/trunk/Makefile csw/mgar/pkg/tmux/trunk/checksums csw/mgar/pkg/tmux/trunk/files/ Property changes on: csw/mgar/pkg/tmux/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/tmux/trunk/Makefile =================================================================== --- csw/mgar/pkg/tmux/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tmux/trunk/Makefile 2010-05-11 11:43:50 UTC (rev 9847) @@ -0,0 +1,24 @@ +GARNAME = tmux +GARVERSION = 1.2 +CATEGORIES = apps + +DESCRIPTION = Terminal Multiplexer + +SF_PROJ = $(GARNAME) +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +RUNTIME_DEP_PKGS_CSWtmux += CSWlibevent +BUILDDEPS = libevent_devel + +CONFIGURE_ARGS = +INSTALL_ARGS = PREFIX=/opt/csw INSTALLDIR="/opt/csw/bin/ginstall -d" INSTALLBIN="/opt/csw/bin/ginstall -m 555" INSTALLMAN="/opt/csw/bin/ginstall -m 444" + +SKIPTEST = 1 + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/tmux/trunk/checksums =================================================================== --- csw/mgar/pkg/tmux/trunk/checksums (rev 0) +++ csw/mgar/pkg/tmux/trunk/checksums 2010-05-11 11:43:50 UTC (rev 9847) @@ -0,0 +1 @@ +748fbe7bb5f86812e19bd6005ff21a5a tmux-1.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Tue May 11 14:07:26 2010 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Tue, 11 May 2010 12:07:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[9848] csw/mgar/pkg/tmux/trunk Message-ID: Revision: 9848 http://gar.svn.sourceforge.net/gar/?rev=9848&view=rev Author: trygvis Date: 2010-05-11 12:07:26 +0000 (Tue, 11 May 2010) Log Message: ----------- tmux: Patching stdint.h -> sys/inttypes.h Modified Paths: -------------- csw/mgar/pkg/tmux/trunk/Makefile csw/mgar/pkg/tmux/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tmux/trunk/files/0000-stdint.patch Modified: csw/mgar/pkg/tmux/trunk/Makefile =================================================================== --- csw/mgar/pkg/tmux/trunk/Makefile 2010-05-11 11:43:50 UTC (rev 9847) +++ csw/mgar/pkg/tmux/trunk/Makefile 2010-05-11 12:07:26 UTC (rev 9848) @@ -7,6 +7,7 @@ SF_PROJ = $(GARNAME) MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0000-stdint.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/tmux/trunk/checksums =================================================================== --- csw/mgar/pkg/tmux/trunk/checksums 2010-05-11 11:43:50 UTC (rev 9847) +++ csw/mgar/pkg/tmux/trunk/checksums 2010-05-11 12:07:26 UTC (rev 9848) @@ -1 +1,2 @@ +02d06d80759e841c396058406c25ca58 0000-stdint.patch 748fbe7bb5f86812e19bd6005ff21a5a tmux-1.2.tar.gz Added: csw/mgar/pkg/tmux/trunk/files/0000-stdint.patch =================================================================== --- csw/mgar/pkg/tmux/trunk/files/0000-stdint.patch (rev 0) +++ csw/mgar/pkg/tmux/trunk/files/0000-stdint.patch 2010-05-11 12:07:26 UTC (rev 9848) @@ -0,0 +1,75 @@ +Only in tmux-1.2-fixed: .Makefile.swp +Only in tmux-1.2-fixed: config.h +Only in tmux-1.2-fixed: config.mk +diff -r -u work/build-isa-i386/tmux-1.2/input-keys.c tmux-1.2-fixed/input-keys.c +--- work/build-isa-i386/tmux-1.2/input-keys.c 2009-12-04 23:14:47.000000000 +0100 ++++ tmux-1.2-fixed/input-keys.c 2010-05-11 14:01:19.197440406 +0200 +@@ -18,7 +18,7 @@ + + #include + +-#include ++#include + #include + #include + +diff -r -u work/build-isa-i386/tmux-1.2/input.c tmux-1.2-fixed/input.c +--- work/build-isa-i386/tmux-1.2/input.c 2010-02-08 19:32:34.000000000 +0100 ++++ tmux-1.2-fixed/input.c 2010-05-11 14:01:19.202535746 +0200 +@@ -18,7 +18,7 @@ + + #include + +-#include ++#include + #include + #include + +diff -r -u work/build-isa-i386/tmux-1.2/osdep-freebsd.c tmux-1.2-fixed/osdep-freebsd.c +--- work/build-isa-i386/tmux-1.2/osdep-freebsd.c 2009-08-09 20:00:45.000000000 +0200 ++++ tmux-1.2-fixed/osdep-freebsd.c 2010-05-11 14:01:19.190049473 +0200 +@@ -24,7 +24,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include +diff -r -u work/build-isa-i386/tmux-1.2/tmux.h tmux-1.2-fixed/tmux.h +--- work/build-isa-i386/tmux-1.2/tmux.h 2010-03-08 16:02:07.000000000 +0100 ++++ tmux-1.2-fixed/tmux.h 2010-05-11 14:01:19.191746514 +0200 +@@ -31,7 +31,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + +diff -r -u work/build-isa-i386/tmux-1.2/window.c tmux-1.2-fixed/window.c +--- work/build-isa-i386/tmux-1.2/window.c 2010-02-08 19:10:07.000000000 +0100 ++++ tmux-1.2-fixed/window.c 2010-05-11 14:01:19.186240214 +0200 +@@ -24,7 +24,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff -r -u work/build-isa-i386/tmux-1.2/xmalloc.c tmux-1.2-fixed/xmalloc.c +--- work/build-isa-i386/tmux-1.2/xmalloc.c 2009-10-29 00:12:38.000000000 +0100 ++++ tmux-1.2-fixed/xmalloc.c 2010-05-11 14:01:19.179268582 +0200 +@@ -20,7 +20,7 @@ + + #include + #include +-#include ++#include + #include + #include + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 11 15:04:00 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 11 May 2010 13:04:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[9849] csw/mgar/pkg/gnupg2/trunk/ Message-ID: Revision: 9849 http://gar.svn.sourceforge.net/gar/?rev=9849&view=rev Author: wahwah Date: 2010-05-11 13:04:00 +0000 (Tue, 11 May 2010) Log Message: ----------- gnupg2: Changing svn:externals to v2. Property Changed: ---------------- csw/mgar/pkg/gnupg2/trunk/ Property changes on: csw/mgar/pkg/gnupg2/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-checkpkg + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 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 May 11 21:51:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 11 May 2010 19:51:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[9850] csw/mgar/pkg Message-ID: Revision: 9850 http://gar.svn.sourceforge.net/gar/?rev=9850&view=rev Author: dmichelsen Date: 2010-05-11 19:51:16 +0000 (Tue, 11 May 2010) Log Message: ----------- parallel: Initial commit Added Paths: ----------- csw/mgar/pkg/parallel/ csw/mgar/pkg/parallel/branches/ csw/mgar/pkg/parallel/tags/ csw/mgar/pkg/parallel/trunk/ csw/mgar/pkg/parallel/trunk/Makefile csw/mgar/pkg/parallel/trunk/checksums csw/mgar/pkg/parallel/trunk/files/ csw/mgar/pkg/parallel/trunk/files/gpl-3.0.txt Property changes on: csw/mgar/pkg/parallel/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/parallel/trunk/Makefile =================================================================== --- csw/mgar/pkg/parallel/trunk/Makefile (rev 0) +++ csw/mgar/pkg/parallel/trunk/Makefile 2010-05-11 19:51:16 UTC (rev 9850) @@ -0,0 +1,33 @@ +# $Id$ +GARNAME = parallel +GARVERSION = 20100424 +CATEGORIES = utils + +DESCRIPTION = Shell tool for executing jobs in parallel +define BLURB + GNU parallel is a shell tool for executing jobs in parallel. A job is + typically a single command or a small script that has to be run for each + of the lines in the input. The typical input is a list of files, a list + of hosts, a list of users, or a list of tables. + If you use xargs today you will find GNU parallel very easy to use. If you + write loops in shell, you will find GNU parallel may be able to replace most + of the loops and make them run faster by running jobs in parallel. If you use + ppss or pexec you will find GNU parallel will often make the command easier to read. +endef + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES += gpl-3.0.txt + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +LICENSE = gpl-3.0.txt + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +ARCHALL = 1 + +include gar/category.mk Property changes on: csw/mgar/pkg/parallel/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/parallel/trunk/checksums =================================================================== --- csw/mgar/pkg/parallel/trunk/checksums (rev 0) +++ csw/mgar/pkg/parallel/trunk/checksums 2010-05-11 19:51:16 UTC (rev 9850) @@ -0,0 +1,2 @@ +d32239bcb673463ab874e80d47fae504 gpl-3.0.txt +7f75ec6bd43768f27aa2667a3f4ce96d parallel-20100424.tar.bz2 Added: csw/mgar/pkg/parallel/trunk/files/gpl-3.0.txt =================================================================== --- csw/mgar/pkg/parallel/trunk/files/gpl-3.0.txt (rev 0) +++ csw/mgar/pkg/parallel/trunk/files/gpl-3.0.txt 2010-05-11 19:51:16 UTC (rev 9850) @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + 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. + + + Copyright (C) + + 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 . + +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: + + Copyright (C) + 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 +. + + 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 +. 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 May 11 21:53:17 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 11 May 2010 19:53:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[9851] csw/mgar/pkg/parallel/trunk/Makefile Message-ID: Revision: 9851 http://gar.svn.sourceforge.net/gar/?rev=9851&view=rev Author: dmichelsen Date: 2010-05-11 19:53:17 +0000 (Tue, 11 May 2010) Log Message: ----------- parallel: Add vendor url Modified Paths: -------------- csw/mgar/pkg/parallel/trunk/Makefile Modified: csw/mgar/pkg/parallel/trunk/Makefile =================================================================== --- csw/mgar/pkg/parallel/trunk/Makefile 2010-05-11 19:51:16 UTC (rev 9850) +++ csw/mgar/pkg/parallel/trunk/Makefile 2010-05-11 19:53:17 UTC (rev 9851) @@ -24,6 +24,8 @@ LICENSE = gpl-3.0.txt +VENDOR_URL = http://www.gnu.org/software/parallel/ + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue May 11 22:27:48 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 11 May 2010 20:27:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[9852] csw/mgar/pkg/gnulinks/trunk/Makefile Message-ID: Revision: 9852 http://gar.svn.sourceforge.net/gar/?rev=9852&view=rev Author: bdwalton Date: 2010-05-11 20:27:48 +0000 (Tue, 11 May 2010) Log Message: ----------- gnulinks: re-add sh, text and file utils until closer to coreutils release Modified Paths: -------------- csw/mgar/pkg/gnulinks/trunk/Makefile Modified: csw/mgar/pkg/gnulinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnulinks/trunk/Makefile 2010-05-11 19:53:17 UTC (rev 9851) +++ csw/mgar/pkg/gnulinks/trunk/Makefile 2010-05-11 20:27:48 UTC (rev 9852) @@ -7,6 +7,7 @@ GLINKPKGS = CSWdiffutils CSWggettext CSWggettextrt CSWbison CSWbinutils GLINKPKGS += CSWgawk CSWgsed CSWggetopt CSWfindutils GLINKPKGS += CSWgmake CSWgpatch CSWgm4 CSWgwhois CSWgtar +GLINKPKGS += CSWgfile CSWshutils CSWtextutils BUILD_DEP_PKGS = $(GLINKPKGS) CSWpkgutil CSWbash DESCRIPTION = Creates native symlinks for GNU tools in /opt/csw/gnu This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue May 11 22:28:26 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 11 May 2010 20:28:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[9853] csw/mgar/pkg/gnulinks/trunk/Makefile Message-ID: Revision: 9853 http://gar.svn.sourceforge.net/gar/?rev=9853&view=rev Author: bdwalton Date: 2010-05-11 20:28:26 +0000 (Tue, 11 May 2010) Log Message: ----------- gnulinks: drop diffutils links Modified Paths: -------------- csw/mgar/pkg/gnulinks/trunk/Makefile Modified: csw/mgar/pkg/gnulinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnulinks/trunk/Makefile 2010-05-11 20:27:48 UTC (rev 9852) +++ csw/mgar/pkg/gnulinks/trunk/Makefile 2010-05-11 20:28:26 UTC (rev 9853) @@ -4,7 +4,7 @@ VENDOR_URL = http://opencsw.org -GLINKPKGS = CSWdiffutils CSWggettext CSWggettextrt CSWbison CSWbinutils +GLINKPKGS = CSWggettext CSWggettextrt CSWbison CSWbinutils GLINKPKGS += CSWgawk CSWgsed CSWggetopt CSWfindutils GLINKPKGS += CSWgmake CSWgpatch CSWgm4 CSWgwhois CSWgtar GLINKPKGS += CSWgfile CSWshutils CSWtextutils This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 12 10:29:37 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 12 May 2010 08:29:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[9854] csw/mgar/pkg/netsnmp/branches Message-ID: Revision: 9854 http://gar.svn.sourceforge.net/gar/?rev=9854&view=rev Author: dmichelsen Date: 2010-05-12 08:29:37 +0000 (Wed, 12 May 2010) Log Message: ----------- netsnmp: Make branch for additional Solaris 10 package to fix #4408 Modified Paths: -------------- csw/mgar/pkg/netsnmp/branches/netsnmp-5.4.2.1-bug4408/Makefile csw/mgar/pkg/netsnmp/branches/netsnmp-5.4.2.1-bug4408/checksums Added Paths: ----------- csw/mgar/pkg/netsnmp/branches/netsnmp-5.4.2.1-bug4408/ Modified: csw/mgar/pkg/netsnmp/branches/netsnmp-5.4.2.1-bug4408/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2010-05-11 20:28:26 UTC (rev 9853) +++ csw/mgar/pkg/netsnmp/branches/netsnmp-5.4.2.1-bug4408/Makefile 2010-05-12 08:29:37 UTC (rev 9854) @@ -1,5 +1,5 @@ GARNAME = netsnmp -GARVERSION = 5.5 +GARVERSION = 5.4.2.1 CATEGORIES = apps DESCRIPTION = A suite of applications used to implement SNMP @@ -30,14 +30,21 @@ UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + BUILD64 = 1 NOISAEXEC = 1 CONFIGURE_ARGS_mm-32 = --disable-embedded-perl --with-perl-modules=yes CONFIGURE_ARGS_mm-32 += --with-python-modules=yes +CONFIGURE_ARGS_mm-32 += --with-libwrap=/opt/csw/lib CONFIGURE_ARGS_mm-64 = --disable-embedded-perl --without-perl-modules CONFIGURE_ARGS_mm-64 += --without-python-modules +CONFIGURE_ARGS_mm-64 += --without-libwrap +CONFIGURE_ARGS_os-5.10 = --with-mib-modules=if-mib --enable-mfd-rewrites + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-default-snmp-version=1 CONFIGURE_ARGS += --with-sys-contact=unknown @@ -45,11 +52,14 @@ CONFIGURE_ARGS += --with-logfile=/var/log/snmpd.log CONFIGURE_ARGS += --with-persistent-directory=/opt/csw/var/net-snmp CONFIGURE_ARGS += --with-mib-modules="ucd-snmp/diskio agentx mibII/mta_sendmail" -CONFIGURE_ARGS += --with-libwrap=/opt/csw/lib CONFIGURE_ARGS += --enable-ipv6 CONFIGURE_ARGS += --with-transports="UDP TCP Unix" CONFIGURE_ARGS += $(CONFIGURE_ARGS_mm-$(MEMORYMODEL)) +CONFIGURE_ARGS += $(CONFIGURE_ARGS_os-$(GAROSREL)) +# Some tests are failing, disable for now, investigate later! +SKIPTEST ?= 1 + EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod MERGE_DIRS_isa-extra = $(libdir) @@ -59,6 +69,13 @@ CHECKPKG_OVERRIDES_CSWnetsnmp = symbol-not-found CHECKPKG_OVERRIDES_CSWnetsnmp += missing-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWnetsnmp += discouraged-path-in-pkgmap|/opt/csw/lib/python/site-packages/netsnmp/__init__.pyc +CHECKPKG_OVERRIDES_CSWnetsnmp += discouraged-path-in-pkgmap|/opt/csw/lib/python/site-packages/netsnmp/client.pyc +CHECKPKG_OVERRIDES_CSWnetsnmp += discouraged-path-in-pkgmap|/opt/csw/lib/python/site-packages/netsnmp/tests/__init__.pyc +CHECKPKG_OVERRIDES_CSWnetsnmp += discouraged-path-in-pkgmap|/opt/csw/lib/python/site-packages/netsnmp/tests/test.pyc +CHECKPKG_OVERRIDES_CSWnetsnmp += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWnetsnmp += catalogname-does-not-start-with-py_ + include gar/category.mk post-install-isa-sparcv8: Modified: csw/mgar/pkg/netsnmp/branches/netsnmp-5.4.2.1-bug4408/checksums =================================================================== --- csw/mgar/pkg/netsnmp/trunk/checksums 2010-05-11 20:28:26 UTC (rev 9853) +++ csw/mgar/pkg/netsnmp/branches/netsnmp-5.4.2.1-bug4408/checksums 2010-05-12 08:29:37 UTC (rev 9854) @@ -1,3 +1,3 @@ 5e0ec3e4d3dd363437d85eca6b91951a Makefile.in.diff -5b2551e7bd024fbbee84dca22a5f13a1 net-snmp-5.5.tar.gz +984932520143f0c8bf7b7ce1fc9e1da1 net-snmp-5.4.2.1.tar.gz c64f189decc111ba83c28f135bf96a9b perl_makefiles.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Wed May 12 11:28:44 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 12 May 2010 09:28:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[9855] csw/mgar/pkg/netsnmp/tags/netsnmp-5.4.2.1/Makefile Message-ID: Revision: 9855 http://gar.svn.sourceforge.net/gar/?rev=9855&view=rev Author: hson Date: 2010-05-12 09:28:44 +0000 (Wed, 12 May 2010) Log Message: ----------- netsnmp: Add configure options for hopefully building a release with Counter64 support Modified Paths: -------------- csw/mgar/pkg/netsnmp/tags/netsnmp-5.4.2.1/Makefile Modified: csw/mgar/pkg/netsnmp/tags/netsnmp-5.4.2.1/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/tags/netsnmp-5.4.2.1/Makefile 2010-05-12 08:29:37 UTC (rev 9854) +++ csw/mgar/pkg/netsnmp/tags/netsnmp-5.4.2.1/Makefile 2010-05-12 09:28:44 UTC (rev 9855) @@ -29,6 +29,9 @@ RUNTIME_DEP_PKGS_CSWnetsnmp-py += CSWnetsnmp CSWpython PKGFILES_CSWnetsnmp-py = $(libdir)/python.* +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=12694 UPSTREAM_USE_SF = 1 @@ -43,7 +46,8 @@ CONFIGURE_ARGS += --with-sys-location=unknown CONFIGURE_ARGS += --with-logfile=/var/log/snmpd.log CONFIGURE_ARGS += --with-persistent-directory=/opt/csw/var/net-snmp -CONFIGURE_ARGS += '--with-mib-modules=ucd-snmp/diskio agentx mibII/mta_sendmail' +CONFIGURE_ARGS += '--with-mib-modules=ucd-snmp/diskio agentx mibII/mta_sendmail if-mib' +CONFIGURE_ARGS += '--enable-mfd-rewrites' CONFIGURE_ARGS += '--with-libwrap=/opt/csw/lib' CONFIGURE_ARGS += '--enable-ipv6' CONFIGURE_ARGS += '--with-transports=UDP TCP Unix' @@ -59,7 +63,8 @@ #LD_OPTIONS = #EXTRA_COMMON_EXPORTS = LD_OPTIONS -EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod +EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc +EXTRA_MERGE_EXCLUDE_FILES += .*/perllocal.pod #TEST_TARGET = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 12 15:07:53 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 12 May 2010 13:07:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[9856] csw/mgar/pkg/tmux/trunk Message-ID: Revision: 9856 http://gar.svn.sourceforge.net/gar/?rev=9856&view=rev Author: dmichelsen Date: 2010-05-12 13:07:53 +0000 (Wed, 12 May 2010) Log Message: ----------- tmux: Add patches Modified Paths: -------------- csw/mgar/pkg/tmux/trunk/Makefile csw/mgar/pkg/tmux/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tmux/trunk/files/0001-old-style-patch-0000-stdint.patch csw/mgar/pkg/tmux/trunk/files/0002-Fix-one-more-inttypes.h.patch csw/mgar/pkg/tmux/trunk/files/0003-Add-definitions-for-CMSG_SPACE.patch csw/mgar/pkg/tmux/trunk/files/0004-Add-substitues-form-setenv-and-unsetenv.patch csw/mgar/pkg/tmux/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/tmux/trunk/files/0000-stdint.patch Modified: csw/mgar/pkg/tmux/trunk/Makefile =================================================================== --- csw/mgar/pkg/tmux/trunk/Makefile 2010-05-12 09:28:44 UTC (rev 9855) +++ csw/mgar/pkg/tmux/trunk/Makefile 2010-05-12 13:07:53 UTC (rev 9856) @@ -7,17 +7,26 @@ SF_PROJ = $(GARNAME) MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PATCHFILES = 0000-stdint.patch +DISTFILES += COPYING +PATCHFILES = 0001-old-style-patch-0000-stdint.patch +PATCHFILES += 0002-Fix-one-more-inttypes.h.patch +PATCHFILES += 0003-Add-definitions-for-CMSG_SPACE.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz -RUNTIME_DEP_PKGS_CSWtmux += CSWlibevent -BUILDDEPS = libevent_devel +RUNTIME_DEP_PKGS = CSWlibevent +BUILD_DEP_PKGS = CSWlibevent-devel CONFIGURE_ARGS = -INSTALL_ARGS = PREFIX=/opt/csw INSTALLDIR="/opt/csw/bin/ginstall -d" INSTALLBIN="/opt/csw/bin/ginstall -m 555" INSTALLMAN="/opt/csw/bin/ginstall -m 444" +EXTRA_CPPFLAGS = -D__inline=inline + +INSTALL_ARGS = PREFIX=/opt/csw +INSTALL_ARGS += INSTALLDIR="/opt/csw/bin/ginstall -d" +INSTALL_ARGS += INSTALLBIN="/opt/csw/bin/ginstall -m 555" +INSTALL_ARGS += INSTALLMAN="/opt/csw/bin/ginstall -m 444" + SKIPTEST = 1 include gar/category.mk Modified: csw/mgar/pkg/tmux/trunk/checksums =================================================================== --- csw/mgar/pkg/tmux/trunk/checksums 2010-05-12 09:28:44 UTC (rev 9855) +++ csw/mgar/pkg/tmux/trunk/checksums 2010-05-12 13:07:53 UTC (rev 9856) @@ -1,2 +1,4 @@ -02d06d80759e841c396058406c25ca58 0000-stdint.patch +eb2b06cbb9c101e1687caf727e747c68 0001-old-style-patch-0000-stdint.patch +3a7d0d4c2610a3c0fb418d1db40be856 0002-Fix-one-more-inttypes.h.patch +53b2c368d0e3746fe4c36c4e1a1bc81b 0003-Add-definitions-for-CMSG_SPACE.patch 748fbe7bb5f86812e19bd6005ff21a5a tmux-1.2.tar.gz Deleted: csw/mgar/pkg/tmux/trunk/files/0000-stdint.patch =================================================================== --- csw/mgar/pkg/tmux/trunk/files/0000-stdint.patch 2010-05-12 09:28:44 UTC (rev 9855) +++ csw/mgar/pkg/tmux/trunk/files/0000-stdint.patch 2010-05-12 13:07:53 UTC (rev 9856) @@ -1,75 +0,0 @@ -Only in tmux-1.2-fixed: .Makefile.swp -Only in tmux-1.2-fixed: config.h -Only in tmux-1.2-fixed: config.mk -diff -r -u work/build-isa-i386/tmux-1.2/input-keys.c tmux-1.2-fixed/input-keys.c ---- work/build-isa-i386/tmux-1.2/input-keys.c 2009-12-04 23:14:47.000000000 +0100 -+++ tmux-1.2-fixed/input-keys.c 2010-05-11 14:01:19.197440406 +0200 -@@ -18,7 +18,7 @@ - - #include - --#include -+#include - #include - #include - -diff -r -u work/build-isa-i386/tmux-1.2/input.c tmux-1.2-fixed/input.c ---- work/build-isa-i386/tmux-1.2/input.c 2010-02-08 19:32:34.000000000 +0100 -+++ tmux-1.2-fixed/input.c 2010-05-11 14:01:19.202535746 +0200 -@@ -18,7 +18,7 @@ - - #include - --#include -+#include - #include - #include - -diff -r -u work/build-isa-i386/tmux-1.2/osdep-freebsd.c tmux-1.2-fixed/osdep-freebsd.c ---- work/build-isa-i386/tmux-1.2/osdep-freebsd.c 2009-08-09 20:00:45.000000000 +0200 -+++ tmux-1.2-fixed/osdep-freebsd.c 2010-05-11 14:01:19.190049473 +0200 -@@ -24,7 +24,7 @@ - - #include - #include --#include -+#include - #include - #include - #include -diff -r -u work/build-isa-i386/tmux-1.2/tmux.h tmux-1.2-fixed/tmux.h ---- work/build-isa-i386/tmux-1.2/tmux.h 2010-03-08 16:02:07.000000000 +0100 -+++ tmux-1.2-fixed/tmux.h 2010-05-11 14:01:19.191746514 +0200 -@@ -31,7 +31,7 @@ - #include - #include - #include --#include -+#include - #include - #include - -diff -r -u work/build-isa-i386/tmux-1.2/window.c tmux-1.2-fixed/window.c ---- work/build-isa-i386/tmux-1.2/window.c 2010-02-08 19:10:07.000000000 +0100 -+++ tmux-1.2-fixed/window.c 2010-05-11 14:01:19.186240214 +0200 -@@ -24,7 +24,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -diff -r -u work/build-isa-i386/tmux-1.2/xmalloc.c tmux-1.2-fixed/xmalloc.c ---- work/build-isa-i386/tmux-1.2/xmalloc.c 2009-10-29 00:12:38.000000000 +0100 -+++ tmux-1.2-fixed/xmalloc.c 2010-05-11 14:01:19.179268582 +0200 -@@ -20,7 +20,7 @@ - - #include - #include --#include -+#include - #include - #include - Copied: csw/mgar/pkg/tmux/trunk/files/0001-old-style-patch-0000-stdint.patch (from rev 9853, csw/mgar/pkg/tmux/trunk/files/0000-stdint.patch) =================================================================== --- csw/mgar/pkg/tmux/trunk/files/0001-old-style-patch-0000-stdint.patch (rev 0) +++ csw/mgar/pkg/tmux/trunk/files/0001-old-style-patch-0000-stdint.patch 2010-05-12 13:07:53 UTC (rev 9856) @@ -0,0 +1,95 @@ +From aa5dc9009a7a677c50d1205b69bbcd6191e3adf3 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 12 May 2010 10:21:45 +0200 +Subject: [PATCH 1/3] old style patch: 0000-stdint.patch + +--- + input-keys.c | 2 +- + input.c | 2 +- + osdep-freebsd.c | 2 +- + tmux.h | 2 +- + window.c | 2 +- + xmalloc.c | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/input-keys.c b/input-keys.c +index 1e2b18e..afcecaa 100644 +--- a/input-keys.c ++++ b/input-keys.c +@@ -18,7 +18,7 @@ + + #include + +-#include ++#include + #include + #include + +diff --git a/input.c b/input.c +index 0928195..180bb96 100644 +--- a/input.c ++++ b/input.c +@@ -18,7 +18,7 @@ + + #include + +-#include ++#include + #include + #include + +diff --git a/osdep-freebsd.c b/osdep-freebsd.c +index ddd865e..4dad659 100644 +--- a/osdep-freebsd.c ++++ b/osdep-freebsd.c +@@ -24,7 +24,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/tmux.h b/tmux.h +index 1f7c010..918aba5 100644 +--- a/tmux.h ++++ b/tmux.h +@@ -31,7 +31,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + +diff --git a/window.c b/window.c +index 8629943..a8668db 100644 +--- a/window.c ++++ b/window.c +@@ -24,7 +24,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/xmalloc.c b/xmalloc.c +index e9f96a1..96b59f7 100644 +--- a/xmalloc.c ++++ b/xmalloc.c +@@ -20,7 +20,7 @@ + + #include + #include +-#include ++#include + #include + #include + +-- +1.7.0 + Added: csw/mgar/pkg/tmux/trunk/files/0002-Fix-one-more-inttypes.h.patch =================================================================== --- csw/mgar/pkg/tmux/trunk/files/0002-Fix-one-more-inttypes.h.patch (rev 0) +++ csw/mgar/pkg/tmux/trunk/files/0002-Fix-one-more-inttypes.h.patch 2010-05-12 13:07:53 UTC (rev 9856) @@ -0,0 +1,25 @@ +From e64811a62b8fefe02d0fbc6c406e629c35d93f7a Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 12 May 2010 14:38:28 +0200 +Subject: [PATCH 2/3] Fix one more inttypes.h + +--- + compat/asprintf.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/compat/asprintf.c b/compat/asprintf.c +index cb5282b..66b73d5 100644 +--- a/compat/asprintf.c ++++ b/compat/asprintf.c +@@ -18,7 +18,7 @@ + + #include + #include +-#include ++#include + #include + + #include "tmux.h" +-- +1.7.0 + Added: csw/mgar/pkg/tmux/trunk/files/0003-Add-definitions-for-CMSG_SPACE.patch =================================================================== --- csw/mgar/pkg/tmux/trunk/files/0003-Add-definitions-for-CMSG_SPACE.patch (rev 0) +++ csw/mgar/pkg/tmux/trunk/files/0003-Add-definitions-for-CMSG_SPACE.patch 2010-05-12 13:07:53 UTC (rev 9856) @@ -0,0 +1,66 @@ +From b60fa77597ce86a19c9fc45b658e193498956268 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 12 May 2010 14:39:14 +0200 +Subject: [PATCH 3/3] Add definitions for CMSG_SPACE + +--- + compat/imsg-buffer.c | 1 + + compat/imsg.c | 1 + + compat/solaris-compat.h | 21 +++++++++++++++++++++ + 3 files changed, 23 insertions(+), 0 deletions(-) + create mode 100644 compat/solaris-compat.h + +diff --git a/compat/imsg-buffer.c b/compat/imsg-buffer.c +index 7baaa42..8da71f8 100644 +--- a/compat/imsg-buffer.c ++++ b/compat/imsg-buffer.c +@@ -27,6 +27,7 @@ + #include + + #include "tmux.h" ++#include "compat/solaris-compat.h" + + int buf_realloc(struct buf *, size_t); + void buf_enqueue(struct msgbuf *, struct buf *); +diff --git a/compat/imsg.c b/compat/imsg.c +index 1bc6062..f209fe0 100644 +--- a/compat/imsg.c ++++ b/compat/imsg.c +@@ -27,6 +27,7 @@ + #include + + #include "tmux.h" ++#include "compat/solaris-compat.h" + + int imsg_get_fd(struct imsgbuf *); + +diff --git a/compat/solaris-compat.h b/compat/solaris-compat.h +new file mode 100644 +index 0000000..57bbb51 +--- /dev/null ++++ b/compat/solaris-compat.h +@@ -0,0 +1,21 @@ ++/* ++ * CMS_SPACE etc. definitions for Solaris from ++ * http://mailman.videolan.org/pipermail/vlc-devel/2006-May/024402.html ++ */ ++ ++#ifndef CMSG_ALIGN ++# ifdef __sun__ ++# define CMSG_ALIGN _CMSG_DATA_ALIGN ++# else ++# define CMSG_ALIGN(len) (((len)+sizeof(long)-1) & ~(sizeof(long)-1)) ++# endif ++#endif ++ ++#ifndef CMSG_SPACE ++# define CMSG_SPACE(len) (CMSG_ALIGN(sizeof(struct cmsghdr))+CMSG_ALIGN(len)) ++#endif ++ ++#ifndef CMSG_LEN ++# define CMSG_LEN(len) (CMSG_ALIGN(sizeof(struct cmsghdr))+(len)) ++#endif ++ +-- +1.7.0 + Added: csw/mgar/pkg/tmux/trunk/files/0004-Add-substitues-form-setenv-and-unsetenv.patch =================================================================== --- csw/mgar/pkg/tmux/trunk/files/0004-Add-substitues-form-setenv-and-unsetenv.patch (rev 0) +++ csw/mgar/pkg/tmux/trunk/files/0004-Add-substitues-form-setenv-and-unsetenv.patch 2010-05-12 13:07:53 UTC (rev 9856) @@ -0,0 +1,41 @@ +From 245b536b83117992d5cb13b766d592497b448a7c Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 12 May 2010 15:04:26 +0200 +Subject: [PATCH 4/4] Add substitues form setenv and unsetenv + +--- + window.c | 18 ++++++++++++++++++ + 1 files changed, 18 insertions(+), 0 deletions(-) + +diff --git a/window.c b/window.c +index a8668db..d28efc9 100644 +--- a/window.c ++++ b/window.c +@@ -32,6 +32,24 @@ + + #include "tmux.h" + ++#ifdef __sun ++void setenv(char *n, char *v, int x) { ++ char buf[256]; ++ snprintf(buf,sizeof(buf),"%s=%s",n,v); ++ putenv(buf); ++} ++ ++void unsetenv(char *env_name) { ++ extern char **environ; ++ char **cc; ++ int l; ++ l=strlen(env_name); ++ for (cc=environ;*cc!=NULL;cc++) { ++ if (strncmp(env_name,*cc,l)==0 && ((*cc)[l]=='='||(*cc)[l]=='\0')) break; ++ } for (; *cc != NULL; cc++) *cc=cc[1]; ++} ++#endif ++ + /* + * Each window is attached to a number of panes, each of which is a pty. This + * file contains code to handle them. +-- +1.7.0 + Added: csw/mgar/pkg/tmux/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/tmux/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/tmux/trunk/files/COPYING 2010-05-12 13:07:53 UTC (rev 9856) @@ -0,0 +1,8 @@ +This file and the CHANGES, FAQ and TODO files are licensed under the ISC +license. Files under examples/ remain copyright their authors unless otherwise +stated in the file but permission has been received to distribute them with +tmux. All other files have a license and copyright notice at their +start. Please contact me with any queries. + +-- Nicholas Marriott + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 12 15:12:18 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 12 May 2010 13:12:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[9857] csw/mgar/pkg/tmux/trunk/checksums Message-ID: Revision: 9857 http://gar.svn.sourceforge.net/gar/?rev=9857&view=rev Author: dmichelsen Date: 2010-05-12 13:12:18 +0000 (Wed, 12 May 2010) Log Message: ----------- tmux: Fix checksums Modified Paths: -------------- csw/mgar/pkg/tmux/trunk/checksums Modified: csw/mgar/pkg/tmux/trunk/checksums =================================================================== --- csw/mgar/pkg/tmux/trunk/checksums 2010-05-12 13:07:53 UTC (rev 9856) +++ csw/mgar/pkg/tmux/trunk/checksums 2010-05-12 13:12:18 UTC (rev 9857) @@ -1,4 +1,5 @@ eb2b06cbb9c101e1687caf727e747c68 0001-old-style-patch-0000-stdint.patch 3a7d0d4c2610a3c0fb418d1db40be856 0002-Fix-one-more-inttypes.h.patch 53b2c368d0e3746fe4c36c4e1a1bc81b 0003-Add-definitions-for-CMSG_SPACE.patch +8ad333c4590c5ed45f1b4d0218ede7a7 COPYING 748fbe7bb5f86812e19bd6005ff21a5a tmux-1.2.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 Wed May 12 15:23:00 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 12 May 2010 13:23:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[9858] csw/mgar/pkg/tmux/trunk Message-ID: Revision: 9858 http://gar.svn.sourceforge.net/gar/?rev=9858&view=rev Author: dmichelsen Date: 2010-05-12 13:23:00 +0000 (Wed, 12 May 2010) Log Message: ----------- tmux: Add missing patch Modified Paths: -------------- csw/mgar/pkg/tmux/trunk/Makefile csw/mgar/pkg/tmux/trunk/checksums Modified: csw/mgar/pkg/tmux/trunk/Makefile =================================================================== --- csw/mgar/pkg/tmux/trunk/Makefile 2010-05-12 13:12:18 UTC (rev 9857) +++ csw/mgar/pkg/tmux/trunk/Makefile 2010-05-12 13:23:00 UTC (rev 9858) @@ -11,6 +11,7 @@ PATCHFILES = 0001-old-style-patch-0000-stdint.patch PATCHFILES += 0002-Fix-one-more-inttypes.h.patch PATCHFILES += 0003-Add-definitions-for-CMSG_SPACE.patch +PATCHFILES += 0004-Add-substitues-form-setenv-and-unsetenv.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/tmux/trunk/checksums =================================================================== --- csw/mgar/pkg/tmux/trunk/checksums 2010-05-12 13:12:18 UTC (rev 9857) +++ csw/mgar/pkg/tmux/trunk/checksums 2010-05-12 13:23:00 UTC (rev 9858) @@ -1,5 +1,6 @@ eb2b06cbb9c101e1687caf727e747c68 0001-old-style-patch-0000-stdint.patch 3a7d0d4c2610a3c0fb418d1db40be856 0002-Fix-one-more-inttypes.h.patch 53b2c368d0e3746fe4c36c4e1a1bc81b 0003-Add-definitions-for-CMSG_SPACE.patch +38c74d4589266a545299f5df25ec7aaf 0004-Add-substitues-form-setenv-and-unsetenv.patch 8ad333c4590c5ed45f1b4d0218ede7a7 COPYING 748fbe7bb5f86812e19bd6005ff21a5a tmux-1.2.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 May 13 11:37:03 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 13 May 2010 09:37:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[9859] csw/mgar/pkg/bdb50/trunk/Makefile Message-ID: Revision: 9859 http://gar.svn.sourceforge.net/gar/?rev=9859&view=rev Author: rthurner Date: 2010-05-13 09:37:03 +0000 (Thu, 13 May 2010) Log Message: ----------- bdb50 - adjust java version. now the configure test passes Modified Paths: -------------- csw/mgar/pkg/bdb50/trunk/Makefile Modified: csw/mgar/pkg/bdb50/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb50/trunk/Makefile 2010-05-12 13:23:00 UTC (rev 9858) +++ csw/mgar/pkg/bdb50/trunk/Makefile 2010-05-13 09:37:03 UTC (rev 9859) @@ -83,7 +83,9 @@ LIBS += -lnsl export LIBS -PATH := /usr/jdk1.6.0_07/bin:$(PATH) +JAVA_HOME := /usr/jdk1.6.0_20 +export JAVA_HOME +PATH := $(JAVA_HOME)/bin:$(PATH) export PATH configure-dist: 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 May 13 21:05:12 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 13 May 2010 19:05:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[9860] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 9860 http://gar.svn.sourceforge.net/gar/?rev=9860&view=rev Author: rthurner Date: 2010-05-13 19:05:12 +0000 (Thu, 13 May 2010) Log Message: ----------- subversion - ruby currently does not build ... Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-05-13 09:37:03 UTC (rev 9859) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-05-13 19:05:12 UTC (rev 9860) @@ -203,16 +203,10 @@ # tail -f $(WORKSRC)/tests.log | grep merge_tests.py TEST_TARGET = check -# Overrides -CHECKPKG_OVERRIDES_CSWap2svn = symbol-not-found -CHECKPKG_OVERRIDES_CSWrbsvn = symbol-not-found -CHECKPKG_OVERRIDES_CSWsvn = symbol-not-found|libsvn_ra-1.so.0.0.0 -CHECKPKG_OVERRIDES_CSWpythonsvn = symbol-not-found -CHECKPKG_OVERRIDES_CSWpmsvn = symbol-not-found - include gar/category.mk -BINDING_LANGS = java perl python ruby +#BINDING_LANGS = java perl python ruby +BINDING_LANGS = java perl python BINDING_TARGETS = $(addprefix svn-,$(BINDING_LANGS)) PI_DEPENDS += copy-apache-templates 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 May 14 07:37:00 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 14 May 2010 05:37:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[9861] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 9861 http://gar.svn.sourceforge.net/gar/?rev=9861&view=rev Author: rthurner Date: 2010-05-14 05:37:00 +0000 (Fri, 14 May 2010) Log Message: ----------- mercurial - hg-1.5.3 bugfix release Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile csw/mgar/pkg/mercurial/trunk/checksums Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2010-05-13 19:05:12 UTC (rev 9860) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2010-05-14 05:37:00 UTC (rev 9861) @@ -1,5 +1,5 @@ GARNAME = mercurial -GARVERSION = 1.5.2 +GARVERSION = 1.5.3 CATEGORIES = python DESCRIPTION = Fast, lightweight Source Control Management system Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2010-05-13 19:05:12 UTC (rev 9860) +++ csw/mgar/pkg/mercurial/trunk/checksums 2010-05-14 05:37:00 UTC (rev 9861) @@ -1 +1 @@ -deafaaf017fc3c8a9deef39e566aec80 mercurial-1.5.2.tar.gz +0969b8109f1b5a9c4debf985cca938f9 mercurial-1.5.3.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 Fri May 14 10:34:19 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 14 May 2010 08:34:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[9862] csw/mgar/pkg/pca/trunk Message-ID: Revision: 9862 http://gar.svn.sourceforge.net/gar/?rev=9862&view=rev Author: dmichelsen Date: 2010-05-14 08:34:19 +0000 (Fri, 14 May 2010) Log Message: ----------- pca: Update to 20100514-01 Modified Paths: -------------- csw/mgar/pkg/pca/trunk/Makefile csw/mgar/pkg/pca/trunk/checksums csw/mgar/pkg/pca/trunk/files/0002-Add-etc-opt-csw-as-config-location.patch Modified: csw/mgar/pkg/pca/trunk/Makefile =================================================================== --- csw/mgar/pkg/pca/trunk/Makefile 2010-05-14 05:37:00 UTC (rev 9861) +++ csw/mgar/pkg/pca/trunk/Makefile 2010-05-14 08:34:19 UTC (rev 9862) @@ -1,5 +1,5 @@ GARNAME = pca -GARVERSION = 20100309-02 +GARVERSION = 20100514-01 CATEGORIES = utils DESCRIPTION = Patch Check Advanced Modified: csw/mgar/pkg/pca/trunk/checksums =================================================================== --- csw/mgar/pkg/pca/trunk/checksums 2010-05-14 05:37:00 UTC (rev 9861) +++ csw/mgar/pkg/pca/trunk/checksums 2010-05-14 08:34:19 UTC (rev 9862) @@ -1,5 +1,5 @@ 4376789925fa9002d0567d739f717748 0001-prefer-opencsw-perl.diff -78c76967d20b4c9c69acacd7417527e1 0002-Add-etc-opt-csw-as-config-location.patch +9313d0d787ca4ff125d220e03431648c 0002-Add-etc-opt-csw-as-config-location.patch 6f2f2376eba0a788795dd43d68ad32d1 COPYING -24822dfe6352f7b86f412fc46f883ab4 pca-20100309-02 +5af9e18e8f664360a22e7be6607e10d6 pca-20100514-01 12de68ff8f67b4bb8b095e5646402208 pca.conf Modified: csw/mgar/pkg/pca/trunk/files/0002-Add-etc-opt-csw-as-config-location.patch =================================================================== --- csw/mgar/pkg/pca/trunk/files/0002-Add-etc-opt-csw-as-config-location.patch 2010-05-14 05:37:00 UTC (rev 9861) +++ csw/mgar/pkg/pca/trunk/files/0002-Add-etc-opt-csw-as-config-location.patch 2010-05-14 08:34:19 UTC (rev 9862) @@ -1,30 +1,30 @@ -From 00323f9c9023a24b559f59938bc5258caf74501e Mon Sep 17 00:00:00 2001 +From 3cca02001f6e24683cfe890f642dd240d171656b Mon Sep 17 00:00:00 2001 From: Dagobert Michelsen -Date: Fri, 15 Jan 2010 17:41:19 +0100 -Subject: [PATCH] Add /etc/opt/csw as config location +Date: Fri, 14 May 2010 10:30:11 +0200 +Subject: [PATCH 2/2] Add /etc/opt/csw as config location --- pca | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/pca b/pca -index b0206f9..45140f1 100644 +index 7788971..512dc4d 100644 --- a/pca +++ b/pca -@@ -2394,11 +2394,13 @@ sub parse_args { +@@ -2432,11 +2432,13 @@ sub parse_args { if ($o{proxy}) { push (@conf, dirname($0)."/../etc/pca-proxy.conf"); push (@conf, "/etc/pca-proxy.conf"); + push (@conf, "/etc/opt/csw/pca-proxy.conf"); - push (@conf, "pca-proxy.conf"); + push (@conf, "./pca-proxy.conf"); } else { push (@conf, dirname($0)."/pca.conf"); push (@conf, dirname($0)."/../etc/pca.conf"); push (@conf, "/etc/pca.conf"); -+ push (@conf, "/etc/opt/csw/pca.conf"); ++ push (@conf, "/etc/opt/csw/pca-proxy.conf"); $ENV{HOME} && push (@conf, $ENV{HOME}."/.pca"); - push (@conf, "pca.conf"); + push (@conf, "./pca.conf"); } -- -1.6.6 +1.7.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 Fri May 14 10:38:34 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 14 May 2010 08:38:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[9863] csw/mgar/pkg/cpan/GD/trunk/Makefile Message-ID: Revision: 9863 http://gar.svn.sourceforge.net/gar/?rev=9863&view=rev Author: dmichelsen Date: 2010-05-14 08:38:34 +0000 (Fri, 14 May 2010) Log Message: ----------- cpan/GD: Depend on Openwin libXpm Modified Paths: -------------- csw/mgar/pkg/cpan/GD/trunk/Makefile Modified: csw/mgar/pkg/cpan/GD/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/GD/trunk/Makefile 2010-05-14 08:34:19 UTC (rev 9862) +++ csw/mgar/pkg/cpan/GD/trunk/Makefile 2010-05-14 08:38:34 UTC (rev 9863) @@ -21,13 +21,17 @@ LICENSE = LICENSE DEP_PKGS = CSWftype2 CSWgd CSWiconv CSWjpeg CSWpng -DEP_PKGS += CSWxpm CSWzlib CSWfconfig +DEP_PKGS += CSWzlib CSWfconfig +# Make sure we bind against Openwin libXpm +NOISALIST = 1 +EXTRA_LIB = /usr/openwin/lib + CONFIGURE_ARGS = lib_gd_path $(libdir) CONFIGURE_ARGS += lib_ft_path $(libdir) CONFIGURE_ARGS += lib_png_path $(libdir) CONFIGURE_ARGS += lib_jpeg_path $(libdir) -CONFIGURE_ARGS += lib_xpm_path $(libdir) +CONFIGURE_ARGS += lib_xpm_path /usr/openwin/lib CONFIGURE_ARGS += lib_zlib_path $(libdir) # Don't use hardcoded -Wformat=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 Fri May 14 12:29:31 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 14 May 2010 10:29:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[9864] csw/mgar/pkg/libarchive/trunk Message-ID: Revision: 9864 http://gar.svn.sourceforge.net/gar/?rev=9864&view=rev Author: dmichelsen Date: 2010-05-14 10:29:31 +0000 (Fri, 14 May 2010) Log Message: ----------- libarchive: Add patch Modified Paths: -------------- csw/mgar/pkg/libarchive/trunk/Makefile csw/mgar/pkg/libarchive/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libarchive/trunk/files/0001-Check-against-gids-0-and-1-for-root-on-Solaris.patch Modified: csw/mgar/pkg/libarchive/trunk/Makefile =================================================================== --- csw/mgar/pkg/libarchive/trunk/Makefile 2010-05-14 08:38:34 UTC (rev 9863) +++ csw/mgar/pkg/libarchive/trunk/Makefile 2010-05-14 10:29:31 UTC (rev 9864) @@ -10,6 +10,10 @@ MASTER_SITES = $(GOOGLE_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# This is already in trunk from r2347: +# +PATCHFILES = 0001-Check-against-gids-0-and-1-for-root-on-Solaris.patch + # File name regex to get notifications about upstream software releases UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/libarchive/trunk/checksums =================================================================== --- csw/mgar/pkg/libarchive/trunk/checksums 2010-05-14 08:38:34 UTC (rev 9863) +++ csw/mgar/pkg/libarchive/trunk/checksums 2010-05-14 10:29:31 UTC (rev 9864) @@ -1 +1,2 @@ +9539f1e6273764c7d7f798876c198a83 0001-Check-against-gids-0-and-1-for-root-on-Solaris.patch fe8d917e101d4b37580124030842a1d0 libarchive-2.8.3.tar.gz Added: csw/mgar/pkg/libarchive/trunk/files/0001-Check-against-gids-0-and-1-for-root-on-Solaris.patch =================================================================== --- csw/mgar/pkg/libarchive/trunk/files/0001-Check-against-gids-0-and-1-for-root-on-Solaris.patch (rev 0) +++ csw/mgar/pkg/libarchive/trunk/files/0001-Check-against-gids-0-and-1-for-root-on-Solaris.patch 2010-05-14 10:29:31 UTC (rev 9864) @@ -0,0 +1,31 @@ +From 9c1bc0a961436ef420f1b379f58309db7ce43d60 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 14 May 2010 12:01:53 +0200 +Subject: [PATCH] Check against gids 0 and 1 for root on Solaris + +--- + cpio/test/test_owner_parse.c | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) + +diff --git a/cpio/test/test_owner_parse.c b/cpio/test/test_owner_parse.c +index 9875e91..a3ebccd 100644 +--- a/cpio/test/test_owner_parse.c ++++ b/cpio/test/test_owner_parse.c +@@ -30,8 +30,14 @@ __FBSDID("$FreeBSD$"); + + #if !defined(_WIN32) + #define ROOT "root" ++#if defined(__sun) ++static int root_uids[] = { 0 }; ++/* Solaris 9 has gid 1 (=other) */ ++static int root_gids[] = { 0, 1 }; ++#else + static int root_uids[] = { 0 }; + static int root_gids[] = { 0 }; ++#endif + #elif defined(__CYGWIN__) + /* On cygwin, the Administrator user most likely exists (unless + * it has been renamed or is in a non-English localization), but +-- +1.7.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 Fri May 14 15:18:55 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 14 May 2010 13:18:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[9865] csw/mgar/pkg/tmux/trunk Message-ID: Revision: 9865 http://gar.svn.sourceforge.net/gar/?rev=9865&view=rev Author: dmichelsen Date: 2010-05-14 13:18:55 +0000 (Fri, 14 May 2010) Log Message: ----------- tmux: Restructure patches to conform SF bug #3000435 Modified Paths: -------------- csw/mgar/pkg/tmux/trunk/Makefile csw/mgar/pkg/tmux/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tmux/trunk/files/0001-Add-Solaris-fixes.patch Removed Paths: ------------- csw/mgar/pkg/tmux/trunk/files/0003-Add-definitions-for-CMSG_SPACE.patch csw/mgar/pkg/tmux/trunk/files/0004-Add-substitues-form-setenv-and-unsetenv.patch Modified: csw/mgar/pkg/tmux/trunk/Makefile =================================================================== --- csw/mgar/pkg/tmux/trunk/Makefile 2010-05-14 10:29:31 UTC (rev 9864) +++ csw/mgar/pkg/tmux/trunk/Makefile 2010-05-14 13:18:55 UTC (rev 9865) @@ -10,8 +10,7 @@ DISTFILES += COPYING PATCHFILES = 0001-old-style-patch-0000-stdint.patch PATCHFILES += 0002-Fix-one-more-inttypes.h.patch -PATCHFILES += 0003-Add-definitions-for-CMSG_SPACE.patch -PATCHFILES += 0004-Add-substitues-form-setenv-and-unsetenv.patch +PATCHFILES += 0001-Add-Solaris-fixes.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/tmux/trunk/checksums =================================================================== --- csw/mgar/pkg/tmux/trunk/checksums 2010-05-14 10:29:31 UTC (rev 9864) +++ csw/mgar/pkg/tmux/trunk/checksums 2010-05-14 13:18:55 UTC (rev 9865) @@ -1,6 +1,5 @@ +13c90823861d90f79620de09cd5ff0a5 0001-Add-Solaris-fixes.patch eb2b06cbb9c101e1687caf727e747c68 0001-old-style-patch-0000-stdint.patch 3a7d0d4c2610a3c0fb418d1db40be856 0002-Fix-one-more-inttypes.h.patch -53b2c368d0e3746fe4c36c4e1a1bc81b 0003-Add-definitions-for-CMSG_SPACE.patch -38c74d4589266a545299f5df25ec7aaf 0004-Add-substitues-form-setenv-and-unsetenv.patch 8ad333c4590c5ed45f1b4d0218ede7a7 COPYING 748fbe7bb5f86812e19bd6005ff21a5a tmux-1.2.tar.gz Added: csw/mgar/pkg/tmux/trunk/files/0001-Add-Solaris-fixes.patch =================================================================== --- csw/mgar/pkg/tmux/trunk/files/0001-Add-Solaris-fixes.patch (rev 0) +++ csw/mgar/pkg/tmux/trunk/files/0001-Add-Solaris-fixes.patch 2010-05-14 13:18:55 UTC (rev 9865) @@ -0,0 +1,114 @@ +From cc90c6fa3786e7ef68ef87fd8a8c84e32149f38c Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 14 May 2010 15:05:03 +0200 +Subject: [PATCH] Add Solaris fixes + +--- + compat.h | 22 ++++++++++++++++++++++ + compat/setenv.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ + configure | 3 ++- + 3 files changed, 70 insertions(+), 1 deletions(-) + create mode 100644 compat/setenv.c + +diff --git a/compat.h b/compat.h +index b7a1d58..321b0ac 100644 +--- a/compat.h ++++ b/compat.h +@@ -92,6 +92,28 @@ typedef uint64_t u_int64_t; + (struct cmsghdr *)NULL) + #endif + ++/* ++ * CMSG_ALIGN, CMS_SPACE and CMSG_LEN definitions are missing on Solaris. ++ * The substitutes have been taken from ++ * http://mailman.videolan.org/pipermail/vlc-devel/2006-May/024402.html ++ */ ++ ++#ifndef CMSG_ALIGN ++# ifdef __sun__ ++# define CMSG_ALIGN _CMSG_DATA_ALIGN ++# else ++# define CMSG_ALIGN(len) (((len)+sizeof(long)-1) & ~(sizeof(long)-1)) ++# endif ++#endif ++ ++#ifndef CMSG_SPACE ++# define CMSG_SPACE(len) (CMSG_ALIGN(sizeof(struct cmsghdr))+CMSG_ALIGN(len)) ++#endif ++ ++#ifndef CMSG_LEN ++# define CMSG_LEN(len) (CMSG_ALIGN(sizeof(struct cmsghdr))+(len)) ++#endif ++ + #ifndef INFTIM + #define INFTIM -1 + #endif +diff --git a/compat/setenv.c b/compat/setenv.c +new file mode 100644 +index 0000000..1b3d2fd +--- /dev/null ++++ b/compat/setenv.c +@@ -0,0 +1,46 @@ ++/* $Id$ /* ++ ++/* ++ * Copyright (c) 2004 Nicholas Marriott ++ * ++ * Permission to use, copy, modify, and distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES ++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER ++ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING ++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#include ++ ++#include "tmux.h" ++ ++void ++setenv(char *n, char *v, int x) ++{ ++ char buf[256]; ++ ++ snprintf(buf, sizeof(buf), "%s=%s", n, v); ++ putenv(buf); ++} ++ ++void ++unsetenv(char *env_name) ++{ ++ extern char **environ; ++ char **cc; ++ int l; ++ ++ l = strlen(env_name); ++ for (cc=environ; *cc != NULL; cc++) { ++ if (strncmp(env_name, *cc, l) == 0 && ((*cc)[l] == '=' || (*cc)[l] == '\0')) ++ break; ++ } ++ for (; *cc != NULL; cc++) ++ *cc = cc[1]; ++ } +diff --git a/configure b/configure +index 5d3c3b1..8f30560 100755 +--- a/configure ++++ b/configure +@@ -164,7 +164,8 @@ SRCS+= osdep-sunos.c \ + compat/vis.c \ + compat/unvis.c \ + compat/imsg-buffer.c \ +- compat/imsg.c ++ compat/imsg.c \ ++ compat/setenv.c + EOF + ;; + # ------------------------------------------------------------------------------ +-- +1.7.0 + Deleted: csw/mgar/pkg/tmux/trunk/files/0003-Add-definitions-for-CMSG_SPACE.patch =================================================================== --- csw/mgar/pkg/tmux/trunk/files/0003-Add-definitions-for-CMSG_SPACE.patch 2010-05-14 10:29:31 UTC (rev 9864) +++ csw/mgar/pkg/tmux/trunk/files/0003-Add-definitions-for-CMSG_SPACE.patch 2010-05-14 13:18:55 UTC (rev 9865) @@ -1,66 +0,0 @@ -From b60fa77597ce86a19c9fc45b658e193498956268 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 12 May 2010 14:39:14 +0200 -Subject: [PATCH 3/3] Add definitions for CMSG_SPACE - ---- - compat/imsg-buffer.c | 1 + - compat/imsg.c | 1 + - compat/solaris-compat.h | 21 +++++++++++++++++++++ - 3 files changed, 23 insertions(+), 0 deletions(-) - create mode 100644 compat/solaris-compat.h - -diff --git a/compat/imsg-buffer.c b/compat/imsg-buffer.c -index 7baaa42..8da71f8 100644 ---- a/compat/imsg-buffer.c -+++ b/compat/imsg-buffer.c -@@ -27,6 +27,7 @@ - #include - - #include "tmux.h" -+#include "compat/solaris-compat.h" - - int buf_realloc(struct buf *, size_t); - void buf_enqueue(struct msgbuf *, struct buf *); -diff --git a/compat/imsg.c b/compat/imsg.c -index 1bc6062..f209fe0 100644 ---- a/compat/imsg.c -+++ b/compat/imsg.c -@@ -27,6 +27,7 @@ - #include - - #include "tmux.h" -+#include "compat/solaris-compat.h" - - int imsg_get_fd(struct imsgbuf *); - -diff --git a/compat/solaris-compat.h b/compat/solaris-compat.h -new file mode 100644 -index 0000000..57bbb51 ---- /dev/null -+++ b/compat/solaris-compat.h -@@ -0,0 +1,21 @@ -+/* -+ * CMS_SPACE etc. definitions for Solaris from -+ * http://mailman.videolan.org/pipermail/vlc-devel/2006-May/024402.html -+ */ -+ -+#ifndef CMSG_ALIGN -+# ifdef __sun__ -+# define CMSG_ALIGN _CMSG_DATA_ALIGN -+# else -+# define CMSG_ALIGN(len) (((len)+sizeof(long)-1) & ~(sizeof(long)-1)) -+# endif -+#endif -+ -+#ifndef CMSG_SPACE -+# define CMSG_SPACE(len) (CMSG_ALIGN(sizeof(struct cmsghdr))+CMSG_ALIGN(len)) -+#endif -+ -+#ifndef CMSG_LEN -+# define CMSG_LEN(len) (CMSG_ALIGN(sizeof(struct cmsghdr))+(len)) -+#endif -+ --- -1.7.0 - Deleted: csw/mgar/pkg/tmux/trunk/files/0004-Add-substitues-form-setenv-and-unsetenv.patch =================================================================== --- csw/mgar/pkg/tmux/trunk/files/0004-Add-substitues-form-setenv-and-unsetenv.patch 2010-05-14 10:29:31 UTC (rev 9864) +++ csw/mgar/pkg/tmux/trunk/files/0004-Add-substitues-form-setenv-and-unsetenv.patch 2010-05-14 13:18:55 UTC (rev 9865) @@ -1,41 +0,0 @@ -From 245b536b83117992d5cb13b766d592497b448a7c Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 12 May 2010 15:04:26 +0200 -Subject: [PATCH 4/4] Add substitues form setenv and unsetenv - ---- - window.c | 18 ++++++++++++++++++ - 1 files changed, 18 insertions(+), 0 deletions(-) - -diff --git a/window.c b/window.c -index a8668db..d28efc9 100644 ---- a/window.c -+++ b/window.c -@@ -32,6 +32,24 @@ - - #include "tmux.h" - -+#ifdef __sun -+void setenv(char *n, char *v, int x) { -+ char buf[256]; -+ snprintf(buf,sizeof(buf),"%s=%s",n,v); -+ putenv(buf); -+} -+ -+void unsetenv(char *env_name) { -+ extern char **environ; -+ char **cc; -+ int l; -+ l=strlen(env_name); -+ for (cc=environ;*cc!=NULL;cc++) { -+ if (strncmp(env_name,*cc,l)==0 && ((*cc)[l]=='='||(*cc)[l]=='\0')) break; -+ } for (; *cc != NULL; cc++) *cc=cc[1]; -+} -+#endif -+ - /* - * Each window is attached to a number of panes, each of which is a pty. This - * file contains code to handle them. --- -1.7.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 Fri May 14 16:31:45 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 14 May 2010 14:31:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[9866] csw/mgar/pkg/cpan/GD/trunk/Makefile Message-ID: Revision: 9866 http://gar.svn.sourceforge.net/gar/?rev=9866&view=rev Author: dmichelsen Date: 2010-05-14 14:31:44 +0000 (Fri, 14 May 2010) Log Message: ----------- cpan/GD: Rebuild to force linkage to OpenCSW X11 Modified Paths: -------------- csw/mgar/pkg/cpan/GD/trunk/Makefile Modified: csw/mgar/pkg/cpan/GD/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/GD/trunk/Makefile 2010-05-14 13:18:55 UTC (rev 9865) +++ csw/mgar/pkg/cpan/GD/trunk/Makefile 2010-05-14 14:31:44 UTC (rev 9866) @@ -21,12 +21,9 @@ LICENSE = LICENSE DEP_PKGS = CSWftype2 CSWgd CSWiconv CSWjpeg CSWpng -DEP_PKGS += CSWzlib CSWfconfig +DEP_PKGS += CSWzlib CSWlibxpm CSWlibx11 CSWfconfig -# Make sure we bind against Openwin libXpm -NOISALIST = 1 -EXTRA_LIB = /usr/openwin/lib - +# These don't actually do anything as the pathes are already confgured CONFIGURE_ARGS = lib_gd_path $(libdir) CONFIGURE_ARGS += lib_ft_path $(libdir) CONFIGURE_ARGS += lib_png_path $(libdir) @@ -34,9 +31,13 @@ CONFIGURE_ARGS += lib_xpm_path /usr/openwin/lib CONFIGURE_ARGS += lib_zlib_path $(libdir) +NOISALIST = 1 +EXTRA_LIB = $(prefix)/X11/lib + +BUILD_OVERRIDE_VARS = CCFLAGS LD # Don't use hardcoded -Wformat=0 -BUILD_OVERRIDE_DIRS = CCFLAGS +BUILD_OVERRIDE_VAR_CCFLAGS = +# Force hardcode binding to OpenCSW X11 +BUILD_OVERRIDE_VAR_LD = $(CC) -L$(prefix)/X11/lib -CHECKPKG_OVERRIDES_CSWpmgd += linked-against-discouraged-library|GD.so|libX11.so.4 - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Fri May 14 19:56:52 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Fri, 14 May 2010 17:56:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[9867] csw/mgar/pkg Message-ID: Revision: 9867 http://gar.svn.sourceforge.net/gar/?rev=9867&view=rev Author: theferret Date: 2010-05-14 17:56:52 +0000 (Fri, 14 May 2010) Log Message: ----------- sunx11_devel: Initial commit Added Paths: ----------- csw/mgar/pkg/sunx11_devel/ csw/mgar/pkg/sunx11_devel/branches/ csw/mgar/pkg/sunx11_devel/tags/ csw/mgar/pkg/sunx11_devel/trunk/ csw/mgar/pkg/sunx11_devel/trunk/Makefile csw/mgar/pkg/sunx11_devel/trunk/Makefile.orig csw/mgar/pkg/sunx11_devel/trunk/Xregion.h csw/mgar/pkg/sunx11_devel/trunk/copyright csw/mgar/pkg/sunx11_devel/trunk/depend csw/mgar/pkg/sunx11_devel/trunk/pkginfo csw/mgar/pkg/sunx11_devel/trunk/prototype csw/mgar/pkg/sunx11_devel/trunk/render.h csw/mgar/pkg/sunx11_devel/trunk/renderproto.h csw/mgar/pkg/sunx11_devel/trunk/renderproto.pc csw/mgar/pkg/sunx11_devel/trunk/x11.pc Property changes on: csw/mgar/pkg/sunx11_devel/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/sunx11_devel/trunk/Makefile =================================================================== --- csw/mgar/pkg/sunx11_devel/trunk/Makefile (rev 0) +++ csw/mgar/pkg/sunx11_devel/trunk/Makefile 2010-05-14 17:56:52 UTC (rev 9867) @@ -0,0 +1,10 @@ +package: $(STDFILE) $(FILES) + createpkg -b `pwd` + touch package + +clean: + rm *.pkg.gz + +STDFILES=pkginfo copyright prototype + +FILES=renderproto.h render.h Xregion.h x11.pc Property changes on: csw/mgar/pkg/sunx11_devel/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/sunx11_devel/trunk/Makefile.orig =================================================================== --- csw/mgar/pkg/sunx11_devel/trunk/Makefile.orig (rev 0) +++ csw/mgar/pkg/sunx11_devel/trunk/Makefile.orig 2010-05-14 17:56:52 UTC (rev 9867) @@ -0,0 +1,23 @@ +# $Id: Makefile 9836 2010-05-08 06:53:03Z wahwah $ +GARNAME = sunx11_devel +GARVERSION = 1.0 +CATEGORIES = category + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/sunx11_devel/trunk/Xregion.h =================================================================== --- csw/mgar/pkg/sunx11_devel/trunk/Xregion.h (rev 0) +++ csw/mgar/pkg/sunx11_devel/trunk/Xregion.h 2010-05-14 17:56:52 UTC (rev 9867) @@ -0,0 +1,190 @@ +/* $Xorg: region.h,v 1.4 2001/02/09 02:03:40 xorgcvs Exp $ */ +/************************************************************************ + +Copyright 1987, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + + +Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. + + All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Digital not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. + +DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR +ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + +************************************************************************/ + +#ifndef _XREGION_H +#define _XREGION_H + +typedef struct { + short x1, x2, y1, y2; +} Box, BOX, BoxRec, *BoxPtr; + +typedef struct { + short x, y, width, height; +}RECTANGLE, RectangleRec, *RectanglePtr; + +#define TRUE 1 +#define FALSE 0 +#define MAXSHORT 32767 +#define MINSHORT -MAXSHORT +#ifndef MAX +#define MAX(a,b) (((a) > (b)) ? (a) : (b)) +#endif +#ifndef MIN +#define MIN(a,b) (((a) < (b)) ? (a) : (b)) +#endif + + +/* + * clip region + */ + +typedef struct _XRegion { + long size; + long numRects; + BOX *rects; + BOX extents; +} REGION; + +/* Xutil.h contains the declaration: + * typedef struct _XRegion *Region; + */ + +/* 1 if two BOXs overlap. + * 0 if two BOXs do not overlap. + * Remember, x2 and y2 are not in the region + */ +#define EXTENTCHECK(r1, r2) \ + ((r1)->x2 > (r2)->x1 && \ + (r1)->x1 < (r2)->x2 && \ + (r1)->y2 > (r2)->y1 && \ + (r1)->y1 < (r2)->y2) + +/* + * update region extents + */ +#define EXTENTS(r,idRect){\ + if((r)->x1 < (idRect)->extents.x1)\ + (idRect)->extents.x1 = (r)->x1;\ + if((r)->y1 < (idRect)->extents.y1)\ + (idRect)->extents.y1 = (r)->y1;\ + if((r)->x2 > (idRect)->extents.x2)\ + (idRect)->extents.x2 = (r)->x2;\ + if((r)->y2 > (idRect)->extents.y2)\ + (idRect)->extents.y2 = (r)->y2;\ + } + +/* + * Check to see if there is enough memory in the present region. + */ +#define MEMCHECK(reg, rect, firstrect){\ + if ((reg)->numRects >= ((reg)->size - 1)){\ + (firstrect) = (BOX *) Xrealloc \ + ((char *)(firstrect), (unsigned) (2 * (sizeof(BOX)) * ((reg)->size)));\ + if ((firstrect) == 0)\ + return(0);\ + (reg)->size *= 2;\ + (rect) = &(firstrect)[(reg)->numRects];\ + }\ + } + +/* this routine checks to see if the previous rectangle is the same + * or subsumes the new rectangle to add. + */ + +#define CHECK_PREVIOUS(Reg, R, Rx1, Ry1, Rx2, Ry2)\ + (!(((Reg)->numRects > 0)&&\ + ((R-1)->y1 == (Ry1)) &&\ + ((R-1)->y2 == (Ry2)) &&\ + ((R-1)->x1 <= (Rx1)) &&\ + ((R-1)->x2 >= (Rx2)))) + +/* add a rectangle to the given Region */ +#define ADDRECT(reg, r, rx1, ry1, rx2, ry2){\ + if (((rx1) < (rx2)) && ((ry1) < (ry2)) &&\ + CHECK_PREVIOUS((reg), (r), (rx1), (ry1), (rx2), (ry2))){\ + (r)->x1 = (rx1);\ + (r)->y1 = (ry1);\ + (r)->x2 = (rx2);\ + (r)->y2 = (ry2);\ + EXTENTS((r), (reg));\ + (reg)->numRects++;\ + (r)++;\ + }\ + } + + + +/* add a rectangle to the given Region */ +#define ADDRECTNOX(reg, r, rx1, ry1, rx2, ry2){\ + if ((rx1 < rx2) && (ry1 < ry2) &&\ + CHECK_PREVIOUS((reg), (r), (rx1), (ry1), (rx2), (ry2))){\ + (r)->x1 = (rx1);\ + (r)->y1 = (ry1);\ + (r)->x2 = (rx2);\ + (r)->y2 = (ry2);\ + (reg)->numRects++;\ + (r)++;\ + }\ + } + +#define EMPTY_REGION(pReg) pReg->numRects = 0 + +#define REGION_NOT_EMPTY(pReg) pReg->numRects + +#define INBOX(r, x, y) \ + ( ( ((r).x2 > x)) && \ + ( ((r).x1 <= x)) && \ + ( ((r).y2 > y)) && \ + ( ((r).y1 <= y)) ) + +/* + * number of points to buffer before sending them off + * to scanlines() : Must be an even number + */ +#define NUMPTSTOBUFFER 200 + +/* + * used to allocate buffers for points and link + * the buffers together + */ +typedef struct _POINTBLOCK { + XPoint pts[NUMPTSTOBUFFER]; + struct _POINTBLOCK *next; +} POINTBLOCK; + +#endif Added: csw/mgar/pkg/sunx11_devel/trunk/copyright =================================================================== --- csw/mgar/pkg/sunx11_devel/trunk/copyright (rev 0) +++ csw/mgar/pkg/sunx11_devel/trunk/copyright 2010-05-14 17:56:52 UTC (rev 9867) @@ -0,0 +1,2 @@ +Some files in this package (the .h files) are copyright by xorg. +Other files may be freely copied and modified as desired Added: csw/mgar/pkg/sunx11_devel/trunk/depend =================================================================== --- csw/mgar/pkg/sunx11_devel/trunk/depend (rev 0) +++ csw/mgar/pkg/sunx11_devel/trunk/depend 2010-05-14 17:56:52 UTC (rev 9867) @@ -0,0 +1 @@ +P CSWcommon Added: csw/mgar/pkg/sunx11_devel/trunk/pkginfo =================================================================== --- csw/mgar/pkg/sunx11_devel/trunk/pkginfo (rev 0) +++ csw/mgar/pkg/sunx11_devel/trunk/pkginfo 2010-05-14 17:56:52 UTC (rev 9867) @@ -0,0 +1,8 @@ +PKG=CSWsunx11devel +ARCH=all +NAME=sunx11_devel - CSW utility layer for compiling software with Sun X11 libs +VERSION=1.0,REV=2010.05.14 +CATEGORY=application +VENDOR=http://www.opencsw.org/ packaged for CSW by Philip Brown +HOTLINE=http://www.opencsw.org/bugtrack/ +EMAIL=phil at opencsw.org Added: csw/mgar/pkg/sunx11_devel/trunk/prototype =================================================================== --- csw/mgar/pkg/sunx11_devel/trunk/prototype (rev 0) +++ csw/mgar/pkg/sunx11_devel/trunk/prototype 2010-05-14 17:56:52 UTC (rev 9867) @@ -0,0 +1,11 @@ +i pkginfo +i depend +i copyright +d none /opt/csw/include/X11 0755 root bin +d none /opt/csw/include/X11/extensions 0755 root bin +d none /opt/csw/lib/pkgconfig 0755 root bin +f none /opt/csw/include/X11/Xregion.h=Xregion.h 0644 root bin +f none /opt/csw/include/X11/extensions/render.h=render.h 0644 root bin +f none /opt/csw/include/X11/extensions/renderproto.h=renderproto.h 0644 root bin +f none /opt/csw/pkgconfig/x11.pc=x11.pc 0644 root bin +f none /opt/csw/pkgconfig/renderproto.pc=renderproto.pc 0644 root bin Added: csw/mgar/pkg/sunx11_devel/trunk/render.h =================================================================== --- csw/mgar/pkg/sunx11_devel/trunk/render.h (rev 0) +++ csw/mgar/pkg/sunx11_devel/trunk/render.h 2010-05-14 17:56:52 UTC (rev 9867) @@ -0,0 +1,210 @@ +/* + * $XFree86: xc/include/extensions/render.h,v 1.10 2002/11/06 22:47:49 keithp Exp $ + * + * Copyright ? 2000 SuSE, Inc. + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of SuSE not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. SuSE makes no representations about the + * suitability of this software for any purpose. It is provided "as is" + * without express or implied warranty. + * + * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE + * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Author: Keith Packard, SuSE, Inc. + */ + +#ifndef _RENDER_H_ +#define _RENDER_H_ + +typedef XID Glyph; +typedef XID GlyphSet; +typedef XID Picture; +typedef XID PictFormat; + +#define RENDER_NAME "RENDER" +#define RENDER_MAJOR 0 +#define RENDER_MINOR 11 + +#define X_RenderQueryVersion 0 +#define X_RenderQueryPictFormats 1 +#define X_RenderQueryPictIndexValues 2 /* 0.7 */ +#define X_RenderQueryDithers 3 +#define X_RenderCreatePicture 4 +#define X_RenderChangePicture 5 +#define X_RenderSetPictureClipRectangles 6 +#define X_RenderFreePicture 7 +#define X_RenderComposite 8 +#define X_RenderScale 9 +#define X_RenderTrapezoids 10 +#define X_RenderTriangles 11 +#define X_RenderTriStrip 12 +#define X_RenderTriFan 13 +#define X_RenderColorTrapezoids 14 +#define X_RenderColorTriangles 15 +/* #define X_RenderTransform 16 */ +#define X_RenderCreateGlyphSet 17 +#define X_RenderReferenceGlyphSet 18 +#define X_RenderFreeGlyphSet 19 +#define X_RenderAddGlyphs 20 +#define X_RenderAddGlyphsFromPicture 21 +#define X_RenderFreeGlyphs 22 +#define X_RenderCompositeGlyphs8 23 +#define X_RenderCompositeGlyphs16 24 +#define X_RenderCompositeGlyphs32 25 +#define X_RenderFillRectangles 26 +/* 0.5 */ +#define X_RenderCreateCursor 27 +/* 0.6 */ +#define X_RenderSetPictureTransform 28 +#define X_RenderQueryFilters 29 +#define X_RenderSetPictureFilter 30 +/* 0.8 */ +#define X_RenderCreateAnimCursor 31 +/* 0.9 */ +#define X_RenderAddTraps 32 +/* 0.10 */ +#define X_RenderCreateSolidFill 33 +#define X_RenderCreateLinearGradient 34 +#define X_RenderCreateRadialGradient 35 +#define X_RenderCreateConicalGradient 36 +#define RenderNumberRequests (X_RenderCreateConicalGradient+1) + +#define BadPictFormat 0 +#define BadPicture 1 +#define BadPictOp 2 +#define BadGlyphSet 3 +#define BadGlyph 4 +#define RenderNumberErrors (BadGlyph+1) + +#define PictTypeIndexed 0 +#define PictTypeDirect 1 + +#define PictOpMinimum 0 +#define PictOpClear 0 +#define PictOpSrc 1 +#define PictOpDst 2 +#define PictOpOver 3 +#define PictOpOverReverse 4 +#define PictOpIn 5 +#define PictOpInReverse 6 +#define PictOpOut 7 +#define PictOpOutReverse 8 +#define PictOpAtop 9 +#define PictOpAtopReverse 10 +#define PictOpXor 11 +#define PictOpAdd 12 +#define PictOpSaturate 13 +#define PictOpMaximum 13 + +/* + * Operators only available in version 0.2 + */ +#define PictOpDisjointMinimum 0x10 +#define PictOpDisjointClear 0x10 +#define PictOpDisjointSrc 0x11 +#define PictOpDisjointDst 0x12 +#define PictOpDisjointOver 0x13 +#define PictOpDisjointOverReverse 0x14 +#define PictOpDisjointIn 0x15 +#define PictOpDisjointInReverse 0x16 +#define PictOpDisjointOut 0x17 +#define PictOpDisjointOutReverse 0x18 +#define PictOpDisjointAtop 0x19 +#define PictOpDisjointAtopReverse 0x1a +#define PictOpDisjointXor 0x1b +#define PictOpDisjointMaximum 0x1b + +#define PictOpConjointMinimum 0x20 +#define PictOpConjointClear 0x20 +#define PictOpConjointSrc 0x21 +#define PictOpConjointDst 0x22 +#define PictOpConjointOver 0x23 +#define PictOpConjointOverReverse 0x24 +#define PictOpConjointIn 0x25 +#define PictOpConjointInReverse 0x26 +#define PictOpConjointOut 0x27 +#define PictOpConjointOutReverse 0x28 +#define PictOpConjointAtop 0x29 +#define PictOpConjointAtopReverse 0x2a +#define PictOpConjointXor 0x2b +#define PictOpConjointMaximum 0x2b + +/* + * Operators only available in version 0.11 + */ +#define PictOpBlendMinimum 0x30 +#define PictOpMultiply 0x30 +#define PictOpScreen 0x31 +#define PictOpOverlay 0x32 +#define PictOpDarken 0x33 +#define PictOpLighten 0x34 +#define PictOpColorDodge 0x35 +#define PictOpColorBurn 0x36 +#define PictOpHardLight 0x37 +#define PictOpSoftLight 0x38 +#define PictOpDifference 0x39 +#define PictOpExclusion 0x3a +#define PictOpHSLHue 0x3b +#define PictOpHSLSaturation 0x3c +#define PictOpHSLColor 0x3d +#define PictOpHSLLuminosity 0x3e +#define PictOpBlendMaximum 0x3e + +#define PolyEdgeSharp 0 +#define PolyEdgeSmooth 1 + +#define PolyModePrecise 0 +#define PolyModeImprecise 1 + +#define CPRepeat (1 << 0) +#define CPAlphaMap (1 << 1) +#define CPAlphaXOrigin (1 << 2) +#define CPAlphaYOrigin (1 << 3) +#define CPClipXOrigin (1 << 4) +#define CPClipYOrigin (1 << 5) +#define CPClipMask (1 << 6) +#define CPGraphicsExposure (1 << 7) +#define CPSubwindowMode (1 << 8) +#define CPPolyEdge (1 << 9) +#define CPPolyMode (1 << 10) +#define CPDither (1 << 11) +#define CPComponentAlpha (1 << 12) +#define CPLastBit 12 + +/* Filters included in 0.6 */ +#define FilterNearest "nearest" +#define FilterBilinear "bilinear" +/* Filters included in 0.10 */ +#define FilterConvolution "convolution" + +#define FilterFast "fast" +#define FilterGood "good" +#define FilterBest "best" + +#define FilterAliasNone -1 + +/* Subpixel orders included in 0.6 */ +#define SubPixelUnknown 0 +#define SubPixelHorizontalRGB 1 +#define SubPixelHorizontalBGR 2 +#define SubPixelVerticalRGB 3 +#define SubPixelVerticalBGR 4 +#define SubPixelNone 5 + +/* Extended repeat attributes included in 0.10 */ +#define RepeatNone 0 +#define RepeatNormal 1 +#define RepeatPad 2 +#define RepeatReflect 3 + +#endif /* _RENDER_H_ */ Added: csw/mgar/pkg/sunx11_devel/trunk/renderproto.h =================================================================== --- csw/mgar/pkg/sunx11_devel/trunk/renderproto.h (rev 0) +++ csw/mgar/pkg/sunx11_devel/trunk/renderproto.h 2010-05-14 17:56:52 UTC (rev 9867) @@ -0,0 +1,663 @@ +/* + * $XFree86: xc/include/extensions/renderproto.h,v 1.12 2002/09/26 02:56:48 keithp Exp $ + * + * Copyright ? 2000 SuSE, Inc. + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of SuSE not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. SuSE makes no representations about the + * suitability of this software for any purpose. It is provided "as is" + * without express or implied warranty. + * + * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE + * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Author: Keith Packard, SuSE, Inc. + */ + +#ifndef _XRENDERP_H_ +#define _XRENDERP_H_ + +#include +#include + +#define Window CARD32 +#define Drawable CARD32 +#define Font CARD32 +#define Pixmap CARD32 +#define Cursor CARD32 +#define Colormap CARD32 +#define GContext CARD32 +#define Atom CARD32 +#define VisualID CARD32 +#define Time CARD32 +#define KeyCode CARD8 +#define KeySym CARD32 + +#define Picture CARD32 +#define PictFormat CARD32 +#define Fixed INT32 +#define Glyphset CARD32 + +/* + * data structures + */ + +typedef struct { + CARD16 red B16; + CARD16 redMask B16; + CARD16 green B16; + CARD16 greenMask B16; + CARD16 blue B16; + CARD16 blueMask B16; + CARD16 alpha B16; + CARD16 alphaMask B16; +} xDirectFormat; + +#define sz_xDirectFormat 16 + +typedef struct { + PictFormat id B32; + CARD8 type; + CARD8 depth; + CARD16 pad1 B16; + xDirectFormat direct; + Colormap colormap; +} xPictFormInfo; + +#define sz_xPictFormInfo 28 + +typedef struct { + VisualID visual; + PictFormat format; +} xPictVisual; + +#define sz_xPictVisual 8 + +typedef struct { + CARD8 depth; + CARD8 pad1; + CARD16 nPictVisuals B16; + CARD32 pad2 B32; +} xPictDepth; + +#define sz_xPictDepth 8 + +typedef struct { + CARD32 nDepth B32; + PictFormat fallback B32; +} xPictScreen; + +#define sz_xPictScreen 8 + +typedef struct { + CARD32 pixel B32; + CARD16 red B16; + CARD16 green B16; + CARD16 blue B16; + CARD16 alpha B16; +} xIndexValue; + +#define sz_xIndexValue 12 + +typedef struct { + CARD16 red B16; + CARD16 green B16; + CARD16 blue B16; + CARD16 alpha B16; +} xRenderColor; + +#define sz_xRenderColor 8 + +typedef struct { + Fixed x B32; + Fixed y B32; +} xPointFixed; + +#define sz_xPointFixed 8 + +typedef struct { + xPointFixed p1; + xPointFixed p2; +} xLineFixed; + +#define sz_xLineFixed 16 + +typedef struct { + xPointFixed p1, p2, p3; +} xTriangle; + +#define sz_xTriangle 24 + +typedef struct { + Fixed top B32; + Fixed bottom B32; + xLineFixed left; + xLineFixed right; +} xTrapezoid; + +#define sz_xTrapezoid 40 + +typedef struct { + CARD16 width B16; + CARD16 height B16; + INT16 x B16; + INT16 y B16; + INT16 xOff B16; + INT16 yOff B16; +} xGlyphInfo; + +#define sz_xGlyphInfo 12 + +typedef struct { + CARD8 len; + CARD8 pad1; + CARD16 pad2; + INT16 deltax; + INT16 deltay; +} xGlyphElt; + +#define sz_xGlyphElt 8 + +typedef struct { + Fixed l, r, y; +} xSpanFix; + +#define sz_xSpanFix 12 + +typedef struct { + xSpanFix top, bot; +} xTrap; + +#define sz_xTrap 24 + +/* + * requests and replies + */ +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + CARD32 majorVersion B32; + CARD32 minorVersion B32; +} xRenderQueryVersionReq; + +#define sz_xRenderQueryVersionReq 12 + +typedef struct { + BYTE type; /* X_Reply */ + BYTE pad1; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD32 majorVersion B32; + CARD32 minorVersion B32; + CARD32 pad2 B32; + CARD32 pad3 B32; + CARD32 pad4 B32; + CARD32 pad5 B32; +} xRenderQueryVersionReply; + +#define sz_xRenderQueryVersionReply 32 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; +} xRenderQueryPictFormatsReq; + +#define sz_xRenderQueryPictFormatsReq 4 + +typedef struct { + BYTE type; /* X_Reply */ + BYTE pad1; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD32 numFormats B32; + CARD32 numScreens B32; + CARD32 numDepths B32; + CARD32 numVisuals B32; + CARD32 numSubpixel B32; /* Version 0.6 */ + CARD32 pad5 B32; +} xRenderQueryPictFormatsReply; + +#define sz_xRenderQueryPictFormatsReply 32 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + PictFormat format B32; +} xRenderQueryPictIndexValuesReq; + +#define sz_xRenderQueryPictIndexValuesReq 8 + +typedef struct { + BYTE type; /* X_Reply */ + BYTE pad1; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD32 numIndexValues; + CARD32 pad2 B32; + CARD32 pad3 B32; + CARD32 pad4 B32; + CARD32 pad5 B32; + CARD32 pad6 B32; +} xRenderQueryPictIndexValuesReply; + +#define sz_xRenderQueryPictIndexValuesReply 32 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Picture pid B32; + Drawable drawable B32; + PictFormat format B32; + CARD32 mask B32; +} xRenderCreatePictureReq; + +#define sz_xRenderCreatePictureReq 20 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Picture picture B32; + CARD32 mask B32; +} xRenderChangePictureReq; + +#define sz_xRenderChangePictureReq 12 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Picture picture B32; + INT16 xOrigin B16; + INT16 yOrigin B16; +} xRenderSetPictureClipRectanglesReq; + +#define sz_xRenderSetPictureClipRectanglesReq 12 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Picture picture B32; +} xRenderFreePictureReq; + +#define sz_xRenderFreePictureReq 8 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + CARD8 op; + CARD8 pad1; + CARD16 pad2 B16; + Picture src B32; + Picture mask B32; + Picture dst B32; + INT16 xSrc B16; + INT16 ySrc B16; + INT16 xMask B16; + INT16 yMask B16; + INT16 xDst B16; + INT16 yDst B16; + CARD16 width B16; + CARD16 height B16; +} xRenderCompositeReq; + +#define sz_xRenderCompositeReq 36 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Picture src B32; + Picture dst B32; + CARD32 colorScale B32; + CARD32 alphaScale B32; + INT16 xSrc B16; + INT16 ySrc B16; + INT16 xDst B16; + INT16 yDst B16; + CARD16 width B16; + CARD16 height B16; +} xRenderScaleReq; + +#define sz_xRenderScaleReq 32 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + CARD8 op; + CARD8 pad1; + CARD16 pad2 B16; + Picture src B32; + Picture dst B32; + PictFormat maskFormat B32; + INT16 xSrc B16; + INT16 ySrc B16; +} xRenderTrapezoidsReq; + +#define sz_xRenderTrapezoidsReq 24 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + CARD8 op; + CARD8 pad1; + CARD16 pad2 B16; + Picture src B32; + Picture dst B32; + PictFormat maskFormat B32; + INT16 xSrc B16; + INT16 ySrc B16; +} xRenderTrianglesReq; + +#define sz_xRenderTrianglesReq 24 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + CARD8 op; + CARD8 pad1; + CARD16 pad2 B16; + Picture src B32; + Picture dst B32; + PictFormat maskFormat B32; + INT16 xSrc B16; + INT16 ySrc B16; +} xRenderTriStripReq; + +#define sz_xRenderTriStripReq 24 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + CARD8 op; + CARD8 pad1; + CARD16 pad2 B16; + Picture src B32; + Picture dst B32; + PictFormat maskFormat B32; + INT16 xSrc B16; + INT16 ySrc B16; +} xRenderTriFanReq; + +#define sz_xRenderTriFanReq 24 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Glyphset gsid B32; + PictFormat format B32; +} xRenderCreateGlyphSetReq; + +#define sz_xRenderCreateGlyphSetReq 12 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Glyphset gsid B32; + Glyphset existing B32; +} xRenderReferenceGlyphSetReq; + +#define sz_xRenderReferenceGlyphSetReq 24 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Glyphset glyphset B32; +} xRenderFreeGlyphSetReq; + +#define sz_xRenderFreeGlyphSetReq 8 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Glyphset glyphset B32; + CARD32 nglyphs; +} xRenderAddGlyphsReq; + +#define sz_xRenderAddGlyphsReq 12 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Glyphset glyphset B32; +} xRenderFreeGlyphsReq; + +#define sz_xRenderFreeGlyphsReq 8 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + CARD8 op; + CARD8 pad1; + CARD16 pad2 B16; + Picture src B32; + Picture dst B32; + PictFormat maskFormat B32; + Glyphset glyphset B32; + INT16 xSrc B16; + INT16 ySrc B16; +} xRenderCompositeGlyphsReq, xRenderCompositeGlyphs8Req, +xRenderCompositeGlyphs16Req, xRenderCompositeGlyphs32Req; + +#define sz_xRenderCompositeGlyphs8Req 28 +#define sz_xRenderCompositeGlyphs16Req 28 +#define sz_xRenderCompositeGlyphs32Req 28 + +/* 0.1 and higher */ + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + CARD8 op; + CARD8 pad1; + CARD16 pad2 B16; + Picture dst B32; + xRenderColor color; +} xRenderFillRectanglesReq; + +#define sz_xRenderFillRectanglesReq 20 + +/* 0.5 and higher */ + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Cursor cid B32; + Picture src B32; + CARD16 x B16; + CARD16 y B16; +} xRenderCreateCursorReq; + +#define sz_xRenderCreateCursorReq 16 + +/* 0.6 and higher */ + +/* + * This can't use an array because 32-bit values may be in bitfields + */ +typedef struct { + Fixed matrix11 B32; + Fixed matrix12 B32; + Fixed matrix13 B32; + Fixed matrix21 B32; + Fixed matrix22 B32; + Fixed matrix23 B32; + Fixed matrix31 B32; + Fixed matrix32 B32; + Fixed matrix33 B32; +} xRenderTransform; + +#define sz_xRenderTransform 36 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Picture picture B32; + xRenderTransform transform; +} xRenderSetPictureTransformReq; + +#define sz_xRenderSetPictureTransformReq 44 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Drawable drawable B32; +} xRenderQueryFiltersReq; + +#define sz_xRenderQueryFiltersReq 8 + +typedef struct { + BYTE type; /* X_Reply */ + BYTE pad1; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD32 numAliases B32; /* LISTofCARD16 */ + CARD32 numFilters B32; /* LISTofSTRING8 */ + CARD32 pad2 B32; + CARD32 pad3 B32; + CARD32 pad4 B32; + CARD32 pad5 B32; +} xRenderQueryFiltersReply; + +#define sz_xRenderQueryFiltersReply 32 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Picture picture B32; + CARD16 nbytes B16; /* number of bytes in name */ + CARD16 pad B16; +} xRenderSetPictureFilterReq; + +#define sz_xRenderSetPictureFilterReq 12 + +/* 0.8 and higher */ + +typedef struct { + Cursor cursor B32; + CARD32 delay B32; +} xAnimCursorElt; + +#define sz_xAnimCursorElt 8 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Cursor cid B32; +} xRenderCreateAnimCursorReq; + +#define sz_xRenderCreateAnimCursorReq 8 + +/* 0.9 and higher */ + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Picture picture; + INT16 xOff B16; + INT16 yOff B16; +} xRenderAddTrapsReq; + +#define sz_xRenderAddTrapsReq 12 + +/* 0.10 and higher */ + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Picture pid B32; + xRenderColor color; +} xRenderCreateSolidFillReq; + +#define sz_xRenderCreateSolidFillReq 16 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Picture pid B32; + xPointFixed p1; + xPointFixed p2; + CARD32 nStops; +} xRenderCreateLinearGradientReq; + +#define sz_xRenderCreateLinearGradientReq 28 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Picture pid B32; + xPointFixed inner; + xPointFixed outer; + Fixed inner_radius; + Fixed outer_radius; + CARD32 nStops; +} xRenderCreateRadialGradientReq; + +#define sz_xRenderCreateRadialGradientReq 36 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Picture pid B32; + xPointFixed center; + Fixed angle; /* in degrees */ + CARD32 nStops; +} xRenderCreateConicalGradientReq; + +#define sz_xRenderCreateConicalGradientReq 24 + +#undef Window +#undef Drawable +#undef Font +#undef Pixmap +#undef Cursor +#undef Colormap +#undef GContext +#undef Atom +#undef VisualID +#undef Time +#undef KeyCode +#undef KeySym + +#undef Picture +#undef PictFormat +#undef Fixed +#undef Glyphset + +#endif /* _XRENDERP_H_ */ Added: csw/mgar/pkg/sunx11_devel/trunk/renderproto.pc =================================================================== --- csw/mgar/pkg/sunx11_devel/trunk/renderproto.pc (rev 0) +++ csw/mgar/pkg/sunx11_devel/trunk/renderproto.pc 2010-05-14 17:56:52 UTC (rev 9867) @@ -0,0 +1,9 @@ +prefix=/opt/csw +exec_prefix=/opt/csw +libdir=/opt/csw/lib +includedir=/opt/csw/include + +Name: RenderProto +Description: Render extension headers from X11R7.5 +Version: 0.11 +Cflags: -I${includedir} Added: csw/mgar/pkg/sunx11_devel/trunk/x11.pc =================================================================== --- csw/mgar/pkg/sunx11_devel/trunk/x11.pc (rev 0) +++ csw/mgar/pkg/sunx11_devel/trunk/x11.pc 2010-05-14 17:56:52 UTC (rev 9867) @@ -0,0 +1,17 @@ +prefix=/opt/csw +exec_prefix=/opt/csw +libdir=/opt/csw/lib +includedir=/opt/csw/include + +xthreadlib= + +Name: X11 +Description: X Library compile flags for use with Sun X11 +Version: 1.3.2 +#Requires: xproto kbproto +#Requires.private: xcb >= 1.1.92 +# See tips for this stuff at: +# https://developer.mozilla.org/En/Developer_Guide/Build_Instructions/Solaris_Prerequisites +Cflags: -I${includedir} -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DXTHREADS -DXUSE_MTSAFE_API +Libs: -L${libdir} -lX11 +Libs.private: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Fri May 14 20:45:54 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Fri, 14 May 2010 18:45:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[9868] csw/mgar/pkg/alternatives Message-ID: Revision: 9868 http://gar.svn.sourceforge.net/gar/?rev=9868&view=rev Author: theferret Date: 2010-05-14 18:45:54 +0000 (Fri, 14 May 2010) Log Message: ----------- alternatives: commited my overhaul into svn Modified Paths: -------------- csw/mgar/pkg/alternatives/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/alternatives/branches/Makefile csw/mgar/pkg/alternatives/branches/checksums csw/mgar/pkg/alternatives/branches/files/ csw/mgar/pkg/alternatives/trunk/alternatives csw/mgar/pkg/alternatives/trunk/copyright csw/mgar/pkg/alternatives/trunk/i.cswalternatives csw/mgar/pkg/alternatives/trunk/pkginfo csw/mgar/pkg/alternatives/trunk/prototype csw/mgar/pkg/alternatives/trunk/r.cswalternatives Removed Paths: ------------- csw/mgar/pkg/alternatives/trunk/checksums csw/mgar/pkg/alternatives/trunk/files/ Copied: csw/mgar/pkg/alternatives/branches/Makefile (from rev 9789, csw/mgar/pkg/alternatives/trunk/Makefile) =================================================================== --- csw/mgar/pkg/alternatives/branches/Makefile (rev 0) +++ csw/mgar/pkg/alternatives/branches/Makefile 2010-05-14 18:45:54 UTC (rev 9868) @@ -0,0 +1,41 @@ +# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +GARNAME = alternatives +GARVERSION = 1.0 +CATEGORIES = utils + +DESCRIPTION = Alternatives implementation specific to OpenCSW +define BLURB +endef + +MASTER_SITES = +DISTFILES = alternatives alternatives.8 +DISTFILES += CSWalternatives.i.cswalternatives +DISTFILES += CSWalternatives.r.cswalternatives +DISTFILES += LICENSE-2.0.txt + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +LICENSE = LICENSE-2.0.txt + +VENDOR_URL = http://wiki.opencsw.org/project-alternatives + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = custom +TEST_SCRIPTS = + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKDIR)/alternatives $(DESTDIR)$(bindir) + ginstall -d $(DESTDIR)$(mandir)/man8 + ginstall $(WORKDIR)/alternatives.1 $(DESTDIR)$(mandir)/man8 + ginstall -d $(DESTDIR)/etc/opt/csw/alternatives + ginstall -d $(DESTDIR)/etc/opt/csw/preserve/CSWalternatives/alternatives + ginstall -d $(DESTDIR)/var/opt/csw/alternatives + ginstall -d $(DESTDIR)/usr/sadm/install/scripts + ginstall $(WORKDIR)/CSWalternatives.i.cswalternatives $(DESTDIR)/usr/sadm/install/scripts/i.cswalternatives + ginstall $(WORKDIR)/CSWalternatives.r.cswalternatives $(DESTDIR)/usr/sadm/install/scripts/r.cswalternatives + @$(MAKECOOKIE) Copied: csw/mgar/pkg/alternatives/branches/checksums (from rev 9789, csw/mgar/pkg/alternatives/trunk/checksums) =================================================================== --- csw/mgar/pkg/alternatives/branches/checksums (rev 0) +++ csw/mgar/pkg/alternatives/branches/checksums 2010-05-14 18:45:54 UTC (rev 9868) @@ -0,0 +1,5 @@ +5e7b546021e5606165c34f154b70bc7b CSWalternatives.i.cswalternatives +b610f50080c8ffe65037bb9891316935 CSWalternatives.r.cswalternatives +3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt +d41d8cd98f00b204e9800998ecf8427e alternatives +d41d8cd98f00b204e9800998ecf8427e alternatives.8 Modified: csw/mgar/pkg/alternatives/trunk/Makefile =================================================================== --- csw/mgar/pkg/alternatives/trunk/Makefile 2010-05-14 17:56:52 UTC (rev 9867) +++ csw/mgar/pkg/alternatives/trunk/Makefile 2010-05-14 18:45:54 UTC (rev 9868) @@ -1,41 +1,6 @@ -# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ -GARNAME = alternatives -GARVERSION = 1.0 -CATEGORIES = utils +package: alternatives + createpkg -b `pwd` + touch package -DESCRIPTION = Alternatives implementation specific to OpenCSW -define BLURB -endef - -MASTER_SITES = -DISTFILES = alternatives alternatives.8 -DISTFILES += CSWalternatives.i.cswalternatives -DISTFILES += CSWalternatives.r.cswalternatives -DISTFILES += LICENSE-2.0.txt - -# File name regex to get notifications about upstream software releases -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - -LICENSE = LICENSE-2.0.txt - -VENDOR_URL = http://wiki.opencsw.org/project-alternatives - -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = -INSTALL_SCRIPTS = custom -TEST_SCRIPTS = - -include gar/category.mk - -install-custom: - ginstall -d $(DESTDIR)$(bindir) - ginstall $(WORKDIR)/alternatives $(DESTDIR)$(bindir) - ginstall -d $(DESTDIR)$(mandir)/man8 - ginstall $(WORKDIR)/alternatives.1 $(DESTDIR)$(mandir)/man8 - ginstall -d $(DESTDIR)/etc/opt/csw/alternatives - ginstall -d $(DESTDIR)/etc/opt/csw/preserve/CSWalternatives/alternatives - ginstall -d $(DESTDIR)/var/opt/csw/alternatives - ginstall -d $(DESTDIR)/usr/sadm/install/scripts - ginstall $(WORKDIR)/CSWalternatives.i.cswalternatives $(DESTDIR)/usr/sadm/install/scripts/i.cswalternatives - ginstall $(WORKDIR)/CSWalternatives.r.cswalternatives $(DESTDIR)/usr/sadm/install/scripts/r.cswalternatives - @$(MAKECOOKIE) +clean: + rm *.pkg.gz Added: csw/mgar/pkg/alternatives/trunk/alternatives =================================================================== --- csw/mgar/pkg/alternatives/trunk/alternatives (rev 0) +++ csw/mgar/pkg/alternatives/trunk/alternatives 2010-05-14 18:45:54 UTC (rev 9868) @@ -0,0 +1,311 @@ +#!/bin/ksh -p + +# ksh high-level implentation of linux style "alternatives". +# Author: Philip Brown, phil at bolthole.com, 2010 +# @(#) alternatives 1.6@(#) + +PRIORITIESDIR=/opt/csw/share/alternatives +MANUALDIR=/etc/opt/etc/alternatives #manual override location +AWK=nawk +DEBUG=${DEBUG:-/bin/true} + +function usage { + prog=`basename $0` + print "Usage for $prog :" + print " $prog --display {name}" + print " $prog --auto {name}" + print " $prog --set {name} {/full/path}" + # --config interactive chooser, not implemented at this time + print " " + print " The following are provided for compatibility, but do not work" + print " in exactly the same way as linux variants" + print " See usage function code for more information." + print " $prog --install {/full/path/name} {name} {#priority}" + print " $prog --remove {name} {/full/path}" + +# I dont want to bloat up the usage message, so here's a little more doc +# +# This program is a lightweight 'workalike' to the linux alternatives prog. +# It is written with OpenCSW in mind, and is specificaly tailored for +# our needs. You may find it useful in other fields, but be aware that +# its primary purpose is to be simple, and flexible. NOT an exact clone. +# Part of its flexibility comes from the fact that it is configuration-file +# driven, NOT internal-database-driven +# The --install and --remove flags, while (hopefully) provided as +# a convenience, do NOT install, or remove, anything. +# Priorities are driven by configuration files delivered by our packages. +# They get delivered to /opt/csw, which keeps things NFS friendly. +# Things only get "installed" or "removed" on a per-SVR4 package basis +# normally. (although technically, it would be possible to drop in your +# own config file in either $PRIORITIESDIR or $MANUALDIR, and then +# have things integrate with your own custom non-packaged software). +# +# There is NO ERROR CHECKING, or saving state of prior actions, +# other than the --set comand. +# It is up to individual implementers to make sure that everyone providing +# an alternative for {name}, all have the same "slaves" +# (when I actualy support "slave" links, anyway) + +} + + +# Usage: find_highest_prio {name} +# search through all conf files for {name} +# print out the highest priority match. or, potentially nothing. +function find_highest_prio { + if [[ "$1" == "" ]] ; then + print INTERNAL ERROR: find_highest_prio called with no args + return + fi + # I hate using cat, but its the only way to avoid nawk throwing a fit. + cat $PRIORITIESDIR/* $MANUALDIR/* 2>/dev/null | + $AWK ' BEGIN {save=""} + $2 == "'$1'" {if($4 > highest){ + save=$0; + highest=$4 + } + } + + END {print save} + ' +} + +if [[ $# -lt 1 ]] ; then + print error: need an argument + usage + exit 1 +fi + + +############################################################ +# Start of subroutine area + +# Usage: print_alternatives shortname +# This prints only the INSTALLED alternatives lines, not manual settings +# Prints in priority-sorted order +function print_alternatives { + if [[ $# != 1 ]] ; then print ERROR print_alternatives needs an arg; fi + cat $PRIORITIESDIR/* 2>/dev/null| + nawk '$2 == "'$1'" {print}' | sort -nr +3 +} +# prints ONLY the manually set alternatives line, if present +function print_manual_set { + if [[ $# != 1 ]] ; then print ERROR print_manual_set needs an arg; fi + + if [[ -f $MANUALDIR/$1 ]] ; then + nawk '$2 == "'$1'" {print}' $MANUALDIR/$1 + else + return 1 + fi +} + +function fileerr_exit { + print Debug: potentially should check to see if /opt/csw is + print specifically read-only, or we're in jumpstart, or something + print before returning a bad status exit, perhaps + exit 1 +} + +# Called only by set_alternative. +# args: {target} {shortname} {implementation-path} +# Split out, because one "alternatives" line may have multiple "slave" links +function set_link { + $DEBUG set_link called with: $1 $2 $3 + if [[ $# -lt 3 ]] ; then + print ERROR: set_link needs 3 arguments + return 1 + fi + + if [[ -h $1 ]] ; then + linktarget=`ls -l $1 | nawk '{print $NF}'` + if [[ "$linktarget" == "$3 ]] ; then + $DEBUG $1 already linked to $3 + return 0 + fi + + $DEBUG removing symlink $1 + /bin/rm -f $1 + if [[ $? -ne 0 ]] ; then + $DEBUG permission to remove $1 failed + filerr_exit + fi + fi + if [[ ! -f $1 ]] ; then + $DEBUG linking $1 to $3 + ln -s $3 $1 + if [[ $? -ne 0 ]] ; then + $DEBUG permission to create symlink for $1 failed + filerr_exit + fi + return 0 + else + print ERROR: $1 exists, and is not symlink. + print Not installing $3 as $1 + return 1 + fi + + ## Note to self: check existing, and dont attempt to + ## update if already set how we want it? + ## Also, dont crash if /opt/csw is read-only. + ## Just politely print warning, and exit cleanly. + ## At least if running from jumpstart environment? + ## ALSO, be paranoid and dont remove a "real" file, if + ## one already exists in the target space. + ## only a symlink +} +# set_alternative: mostly internal function. +# Usage: set_alternative {shortname} [ignore-path] +# Goes and checks both standard configs, and manual config, for best fit. +# +# 2nd arg is used for being called through --remove/--ignore +# +function set_alternative { + typeset line + if [[ $# -lt 1 ]] ; then print ERROR set_alternative needs an arg; exit 1;fi + + + line=`print_manual_set $1` + ## Design choice: deliberately leave in manual choice, + ## even if --remove of that alternative is used. + ## That way makes it easier to implement pkgrm for us. + if [[ "$2" != "" ]] ; then + echo $line | grep " $2 " >/dev/null + if [[ $? -eq 0 ]] ; then + $DEBUG Note: manual choice is currently $line + fi + fi + + + if [[ "$line" = "" ]] ; then + if [[ "$2" != "" ]] ; then + line=`print_alternatives $1| + nawk ' $3 != "'$2'" {print}' |head -1` + else + line=`print_alternatives $1|head -1` + fi + fi + if [[ "$line" = "" ]] ; then + print "No alternatives found for $1" + return 0; + fi + set $line + set_link $1 $2 $3 + shift 4 + while [[ "$1" != "" ]] ; do + set_link $1 $2 $3 + shift 3 + done + +} + +function revert_to_auto { + case $1 in + */*) + print Error: need short name for --auto + exit 1 + ;; + esac + if [[ -f "$MANUALDIR/$1" ]] ; then + $DEBUG removing manual setting for $1 + rm "$MANUALDIR/$1" + else + $DEBUG no manual setting for $1 found + fi + set_alternative $1 +} + +# Usage: set_manual_prio shortname /full/path +function set_manual_prio { + case $1 in + */*) + print Error: need short name as first arg for --set + exit 1 + ;; + esac + + check=`egrep -l "^[^ ]* $1 $2 " $PRIORITIESDIR/*` + if [[ "$check" == "" ]] ; then + print Error: no installed match found for $1 $2 + exit 1 + fi + # Note: target file may have more than one line in it!! + + $DEBUG found match for $1: $check + rm -f $MANUALDIR/$1 + ln -s $check $MANUALDIR/$1 + + set_alternative $1 + +} + + + +function display_choices { + case $1 in + */*) + print Error: need short name as arg for --display + exit 1 + ;; + esac + + if [[ -f $MANUALDIR/$1 ]] ; then + print Manual mode for $1 set. Paths are: + print_manual_set $1 + fi + print Installed alternatives for $1 are: + print_alternatives $1 +} + + +############################################################ +# Return to "main" area below + +## Comment on --remove arg: +## It does not actually **remove* registration of alternative. +## That is left for pkgrm. +## What it does do, is reset link, while ignoring the specified alternative. +## So for strict purposes, it would better be called "--ignore-and-set" +## Left in original flag, but dual-implemented as --ignore +## + +if [[ "$1" == "--remove" ]] ; then + $DEBUG Note: --remove is really only a temporary --ignore + $DEBUG You must rm or pkgrm the appropriate file in $PRIORITIESDIR to remove +fi + + + +case $1 in + --install) + shift + print "(Note: ignoring arguments for --install except for '$2')" + $DEBUG "(Using files in $PRIORITIESDIR)" + set_alternative $2 + ;; + --remove|--ignore) #args = shortname /local/path + shift + print "(Note: ignoring arguments for --remove except for '$1')" + $DEBUG "(Using files in $PRIORITIESDIR)" + set_alternative $1 $2 + ;; + --auto) + shift + revert_to_auto $1 + ;; + --display) + shift + display_choices $1 + ;; + --set) + shift + set_manual_prio $1 $2 + ;; + *) + print -- $1 is not a recognized command. + usage + + exit 1 + ;; +esac + + Property changes on: csw/mgar/pkg/alternatives/trunk/alternatives ___________________________________________________________________ Added: svn:executable + * Deleted: csw/mgar/pkg/alternatives/trunk/checksums =================================================================== --- csw/mgar/pkg/alternatives/trunk/checksums 2010-05-14 17:56:52 UTC (rev 9867) +++ csw/mgar/pkg/alternatives/trunk/checksums 2010-05-14 18:45:54 UTC (rev 9868) @@ -1,5 +0,0 @@ -5e7b546021e5606165c34f154b70bc7b CSWalternatives.i.cswalternatives -b610f50080c8ffe65037bb9891316935 CSWalternatives.r.cswalternatives -3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt -d41d8cd98f00b204e9800998ecf8427e alternatives -d41d8cd98f00b204e9800998ecf8427e alternatives.8 Added: csw/mgar/pkg/alternatives/trunk/copyright =================================================================== --- csw/mgar/pkg/alternatives/trunk/copyright (rev 0) +++ csw/mgar/pkg/alternatives/trunk/copyright 2010-05-14 18:45:54 UTC (rev 9868) @@ -0,0 +1,2 @@ +Scripts in this package are copyright Dagobert Michelsen and Philip Brown +They may be freely used and copied as part of this package. Added: csw/mgar/pkg/alternatives/trunk/i.cswalternatives =================================================================== --- csw/mgar/pkg/alternatives/trunk/i.cswalternatives (rev 0) +++ csw/mgar/pkg/alternatives/trunk/i.cswalternatives 2010-05-14 18:45:54 UTC (rev 9868) @@ -0,0 +1,52 @@ +#!/bin/sh +# +# i.cswalternatives - Class action script for +# registering applications in alternatives +# +# Written and maintained by Dagobert Michelsen +# +# 2010-02-11 Initial release + +: ${PKG_INSTALL_ROOT:=/} + +while read src dest; do + /usr/bin/cp $src $dest || exit 2 + + cat $dest | while read C; do + set -- $C + + ALTLINK="$1" + ALTNAME="$2" + ALTPATH="$3" + ALTPRIO="$4" + + echo "Registering '$ALTNAME' alternative $ALTPATH ..." + + ARGS="--install $ALTLINK $ALTNAME $ALTPATH $ALTPRIO" + shift; shift; shift; shift + + while [ $# -gt 0 ]; do + ARGS="$ARGS --slave $1 $2 $3" + shift; shift; shift + done + + if [ ! -x ${PKG_INSTALL_ROOT}/opt/csw/sbin/alternatives ]; then + echo "ERROR: /opt/csw/sbin/alternatives could not be found" >&2 + exit 2 + fi + + chroot ${PKG_INSTALL_ROOT} /opt/csw/sbin/alternatives $ARGS + + # Redo previous manual selection if this is an upgrade + if /usr/bin/test -L "${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/${PKG}/alternatives/$ALTNAME"; then + CHOICE=`/usr/bin/perl -e 'print readlink $ARGV[0]' "${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/${PKG}/alternatives/$ALTNAME"` + if [ "${CHOICE}" = "$ALTPATH" ]; then + echo "Applying previous manual selection ${CHOICE} ..." + chroot ${PKG_INSTALL_ROOT} /opt/csw/sbin/alternatives --set $ALTNAME ${CHOICE} + rm -f ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/${PKG}/alternatives/$ALTNAME + fi + fi + done +done + +exit 0 Added: csw/mgar/pkg/alternatives/trunk/pkginfo =================================================================== --- csw/mgar/pkg/alternatives/trunk/pkginfo (rev 0) +++ csw/mgar/pkg/alternatives/trunk/pkginfo 2010-05-14 18:45:54 UTC (rev 9868) @@ -0,0 +1,8 @@ +PKG=CSWalternatives +NAME=alternatives - an implementation of linux-style alternatives choice mgr +VERSION=1.0,REV=2009.10.04 +CATEGORY=system +VENDOR=http://www.opencsw.org written and packaged for CSW by Philip Brown +EMAIL=phil at opencsw.org +HOTLINE=http://www.opencsw.org/bugtrack/ +PSTAMP=cswalternatives v1.0 Added: csw/mgar/pkg/alternatives/trunk/prototype =================================================================== --- csw/mgar/pkg/alternatives/trunk/prototype (rev 0) +++ csw/mgar/pkg/alternatives/trunk/prototype 2010-05-14 18:45:54 UTC (rev 9868) @@ -0,0 +1,5 @@ +i pkginfo +i copyright +f none /usr/sadm/install/scripts/i.cswalternatives=i.cswalternatives 0755 root bin +f none /usr/sadm/install/scripts/r.cswalternatives=r.cswalternatives 0755 root bin +f none /opt/csw/sbin/alternatives=alternatives Added: csw/mgar/pkg/alternatives/trunk/r.cswalternatives =================================================================== --- csw/mgar/pkg/alternatives/trunk/r.cswalternatives (rev 0) +++ csw/mgar/pkg/alternatives/trunk/r.cswalternatives 2010-05-14 18:45:54 UTC (rev 9868) @@ -0,0 +1,42 @@ +#!/bin/sh +# +# r.cswalternatives - Class action script for +# registering applications in alternatives +# +# Written and maintained by Dagobert Michelsen +# +# 2010-02-11 Initial release + +: ${PKG_INSTALL_ROOT:=/} + +while read dest; do + cat $dest | while read C; do + set -- $C + + # If we are in manual mode and the selected item is about to be removed + # make sure to remember the selection for next install to be reset. + + if egrep '^manual$' ${PKG_INSTALL_ROOT}/var/opt/csw/alternatives/$2 >/dev/null 2>&1; then + CHOICE="`perl -e 'print readlink $ARGV[0]' ${PKG_INSTALL_ROOT}/etc/opt/csw/alternatives/$2`" + if [ "$3" = "${CHOICE}" ]; then + echo "Preserving '$2' manual choice ${CHOICE} ..." + mkdir -p ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/${PKG}/alternatives + rm -f ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/${PKG}/alternatives/$2 + ln -s "${CHOICE}" ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/${PKG}/alternatives/$2 + fi + fi + + echo "Unregistering '$2' alternative $3 ..." + + if [ -x ${PKG_INSTALL_ROOT}/opt/csw/sbin/alternatives ]; then + chroot ${PKG_INSTALL_ROOT} /opt/csw/sbin/alternatives --remove $2 $3 + else + echo "ERROR: /opt/csw/sbin/alternatives could not be found" >&2 + exit 2 + fi + done + + rm -f $dest +done + +exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Fri May 14 23:13:47 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Fri, 14 May 2010 21:13:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[9869] csw/mgar/pkg Message-ID: Revision: 9869 http://gar.svn.sourceforge.net/gar/?rev=9869&view=rev Author: theferret Date: 2010-05-14 21:13:47 +0000 (Fri, 14 May 2010) Log Message: ----------- Added a set of templates, to simplify adding programs into svn, "Phil-style" Added Paths: ----------- csw/mgar/pkg/TEMPLATES/ csw/mgar/pkg/TEMPLATES/createpkg/ csw/mgar/pkg/TEMPLATES/createpkg/Makefile csw/mgar/pkg/TEMPLATES/createpkg/Makefile.reloc csw/mgar/pkg/TEMPLATES/createpkg/copy_template csw/mgar/pkg/TEMPLATES/createpkg/generate_pkginfo csw/mgar/pkg/TEMPLATES/createpkg/pkginfo csw/mgar/pkg/TEMPLATES/createpkg/prototype Added: csw/mgar/pkg/TEMPLATES/createpkg/Makefile =================================================================== --- csw/mgar/pkg/TEMPLATES/createpkg/Makefile (rev 0) +++ csw/mgar/pkg/TEMPLATES/createpkg/Makefile 2010-05-14 21:13:47 UTC (rev 9869) @@ -0,0 +1,26 @@ +#This Makefile originally generated from a template under +# pkg/TEMPLATES/createpkg + +#Uncomment one of these definitions. The -b invokation, +# is suitable for use with small packages, where you want to have a few files +# in your top level src directory. It is also suitable for +# "relocateable" packages. see the createpkg docs for more details. +#CREATEPKG=createpkg -b `pwd` +#CREATEPKG=createpkg -r . +CREATEPKG=createpkg -r `pwd`/cswstage + +package: $(STDFILE) $(FILES) + $(CREATEPKG) + touch package + +build: + ./configure --prefix=/opt/csw + $(MAKE) + cswstage + +clean: + rm *.pkg.gz + +STDFILES=pkginfo copyright prototype + +FILES=YourFilesHere Added: csw/mgar/pkg/TEMPLATES/createpkg/Makefile.reloc =================================================================== --- csw/mgar/pkg/TEMPLATES/createpkg/Makefile.reloc (rev 0) +++ csw/mgar/pkg/TEMPLATES/createpkg/Makefile.reloc 2010-05-14 21:13:47 UTC (rev 9869) @@ -0,0 +1,21 @@ +#This Makefile originally generated from a template under +# pkg/TEMPLATES/createpkg + +#Uncomment one of these definitions. The -b invokation, +# is suitable for use with small packages, where you want to have a few files +# in your top level src directory. It is also suitable for +# "relocateable" packages. see the createpkg docs for more details. +CREATEPKG=createpkg -b `pwd` +#CREATEPKG=createpkg -r . +#CREATEPKG=createpkg -r `pwd`/cswstage + +package: $(STDFILE) $(FILES) + $(CREATEPKG) + touch package + +clean: + rm *.pkg.gz + +STDFILES=pkginfo copyright prototype + +FILES=YourFilesHere Added: csw/mgar/pkg/TEMPLATES/createpkg/copy_template =================================================================== --- csw/mgar/pkg/TEMPLATES/createpkg/copy_template (rev 0) +++ csw/mgar/pkg/TEMPLATES/createpkg/copy_template 2010-05-14 21:13:47 UTC (rev 9869) @@ -0,0 +1,55 @@ +#!/bin/ksh -p + +# This script is meant to be called with a current directory of +# the top level. Or basically, whereever you want the template stuff +# to be copied INTO. + +SVN="echo FAKEsvn " +SVN="svn" + +function usage { + print Usage: $0 new-software-name + print This script creates a new subdir in subversion for the named + print software, and populates it with a barebones set of templates + print It will create it under your current directory + + exit 1 +} + +case $1 in + ""|-*) + usage + ;; +esac + + +template_dir=`dirname $0` +DESTDIR=$1/trunk + + +mkdir -p $DESTDIR + +$SVN info >/dev/null +if [[ $? -ne 0 ]] ; then + print ERROR: expected to be within subversion tree somewhere + print cannot continue + exit 1 +fi + +$SVN add $DESTDIR +cp $template_dir/Makefile* $DESTDIR +cp $template_dir/prototype* $DESTDIR +$template_dir/generate_pkginfo >$DESTDIR/pkginfo + +print "" +print Created directory $1 locally, and in subversion +print Things you still need to do: +print "" +print " * Edit the pkginfo file fully" +print " * Create an appropriate copyright file" +print " * Choose ONE of the Makefiles, and remove the other" +print " * Edit the Makefile to have any required extra flags, etc" +print " * Fill in the rest of the prototype file" + +print "" +print " (and dont forget to check everything in when you are done!)" Property changes on: csw/mgar/pkg/TEMPLATES/createpkg/copy_template ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/TEMPLATES/createpkg/generate_pkginfo =================================================================== --- csw/mgar/pkg/TEMPLATES/createpkg/generate_pkginfo (rev 0) +++ csw/mgar/pkg/TEMPLATES/createpkg/generate_pkginfo 2010-05-14 21:13:47 UTC (rev 9869) @@ -0,0 +1,15 @@ +#!/bin/ksh -p + +if [[ "$1" == "" ]] ; then print ERROR: need name of software; exit 1;fi +FULLNAME=`getent passwd $USER|nawk -F: '{print $5}'` + + +print PKG=CSW$1 +print NAME=CSW$1 - description goes here +print VERSION=1.0,REV=`date '+%Y.%m.%d'` +print CATEGORY=application +print VENDOR=http://www.opencsw.org/ packaged for CSW by $FULLNAME +print HOTLINE=http://www.opencsw.org/bugtrack/ +print EMAIL=$USER at opencsw.org + + Property changes on: csw/mgar/pkg/TEMPLATES/createpkg/generate_pkginfo ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/TEMPLATES/createpkg/pkginfo =================================================================== --- csw/mgar/pkg/TEMPLATES/createpkg/pkginfo (rev 0) +++ csw/mgar/pkg/TEMPLATES/createpkg/pkginfo 2010-05-14 21:13:47 UTC (rev 9869) @@ -0,0 +1,7 @@ +PKG=CSWTNAME +NAME=CSWTNAME - description goes here +VERSION=1.0,REV=2010.05.14 +CATEGORY=application +VENDOR=http://www.opencsw.org/ packaged for CSW by Philip Brown +HOTLINE=http://www.opencsw.org/bugtrack/ +EMAIL=phil at opencsw.org Added: csw/mgar/pkg/TEMPLATES/createpkg/prototype =================================================================== --- csw/mgar/pkg/TEMPLATES/createpkg/prototype (rev 0) +++ csw/mgar/pkg/TEMPLATES/createpkg/prototype 2010-05-14 21:13:47 UTC (rev 9869) @@ -0,0 +1,3 @@ +i pkginfo +i depend +i copyright This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Fri May 14 23:51:24 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Fri, 14 May 2010 21:51:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[9870] csw/mgar/pkg/TEMPLATES/createpkg/copy_template Message-ID: Revision: 9870 http://gar.svn.sourceforge.net/gar/?rev=9870&view=rev Author: theferret Date: 2010-05-14 21:51:24 +0000 (Fri, 14 May 2010) Log Message: ----------- fixed bug Modified Paths: -------------- csw/mgar/pkg/TEMPLATES/createpkg/copy_template Modified: csw/mgar/pkg/TEMPLATES/createpkg/copy_template =================================================================== --- csw/mgar/pkg/TEMPLATES/createpkg/copy_template 2010-05-14 21:13:47 UTC (rev 9869) +++ csw/mgar/pkg/TEMPLATES/createpkg/copy_template 2010-05-14 21:51:24 UTC (rev 9870) @@ -4,7 +4,7 @@ # the top level. Or basically, whereever you want the template stuff # to be copied INTO. -SVN="echo FAKEsvn " +#SVN="echo FAKEsvn " SVN="svn" function usage { @@ -36,7 +36,10 @@ exit 1 fi -$SVN add $DESTDIR +# Note that apparently you cannot "skip a directory". you must +# add the highest-level directory first +$SVN add $1 + cp $template_dir/Makefile* $DESTDIR cp $template_dir/prototype* $DESTDIR $template_dir/generate_pkginfo >$DESTDIR/pkginfo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Fri May 14 23:53:21 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Fri, 14 May 2010 21:53:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[9871] csw/mgar/pkg/Makefile Message-ID: Revision: 9871 http://gar.svn.sourceforge.net/gar/?rev=9871&view=rev Author: theferret Date: 2010-05-14 21:53:21 +0000 (Fri, 14 May 2010) Log Message: ----------- Added createpkg-% target that makes use of TEMPLATES/createpkg Modified Paths: -------------- csw/mgar/pkg/Makefile Modified: csw/mgar/pkg/Makefile =================================================================== --- csw/mgar/pkg/Makefile 2010-05-14 21:51:24 UTC (rev 9870) +++ csw/mgar/pkg/Makefile 2010-05-14 21:53:21 UTC (rev 9871) @@ -9,6 +9,10 @@ # This contains all directories containing packages SUBDIRS = cpan xfce + +MY_SVN_DIR=$(shell svn info | awk -F: '$$1=="URL"{print $$2":"$$3}' ) + + FILTER_DIRS = CVS/ default: @@ -101,3 +105,12 @@ @echo @echo "Your package is set up for editing at $*/trunk" + +TEMPLATES/createpkg: + @echo Checking out TEMPLATES directory... + svn --ignore-externals co $(MY_SVN_DIR)/TEMPLATES + + +createpkg-%: TEMPLATES/createpkg + @TEMPLATES/createpkg/copy_template $* + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Fri May 14 23:56:18 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Fri, 14 May 2010 21:56:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[9872] csw/mgar/pkg Message-ID: Revision: 9872 http://gar.svn.sourceforge.net/gar/?rev=9872&view=rev Author: theferret Date: 2010-05-14 21:56:18 +0000 (Fri, 14 May 2010) Log Message: ----------- Initial framework for this pkg Added Paths: ----------- csw/mgar/pkg/isaexec/ csw/mgar/pkg/isaexec/trunk/ csw/mgar/pkg/isaexec/trunk/Makefile csw/mgar/pkg/isaexec/trunk/pkginfo csw/mgar/pkg/isaexec/trunk/prototype Added: csw/mgar/pkg/isaexec/trunk/Makefile =================================================================== --- csw/mgar/pkg/isaexec/trunk/Makefile (rev 0) +++ csw/mgar/pkg/isaexec/trunk/Makefile 2010-05-14 21:56:18 UTC (rev 9872) @@ -0,0 +1,26 @@ +#This Makefile originally generated from a template under +# pkg/TEMPLATES/createpkg + +#Uncomment one of these definitions. The -b invokation, +# is suitable for use with small packages, where you want to have a few files +# in your top level src directory. It is also suitable for +# "relocateable" packages. see the createpkg docs for more details. +#CREATEPKG=createpkg -b `pwd` +#CREATEPKG=createpkg -r . +CREATEPKG=createpkg -r `pwd`/cswstage + +package: $(STDFILE) $(FILES) + $(CREATEPKG) + touch package + +build: + ./configure --prefix=/opt/csw + $(MAKE) + cswstage + +clean: + rm *.pkg.gz + +STDFILES=pkginfo copyright prototype + +FILES=YourFilesHere Added: csw/mgar/pkg/isaexec/trunk/pkginfo =================================================================== --- csw/mgar/pkg/isaexec/trunk/pkginfo (rev 0) +++ csw/mgar/pkg/isaexec/trunk/pkginfo 2010-05-14 21:56:18 UTC (rev 9872) @@ -0,0 +1 @@ +ERROR: need name of software Added: csw/mgar/pkg/isaexec/trunk/prototype =================================================================== --- csw/mgar/pkg/isaexec/trunk/prototype (rev 0) +++ csw/mgar/pkg/isaexec/trunk/prototype 2010-05-14 21:56:18 UTC (rev 9872) @@ -0,0 +1,3 @@ +i pkginfo +i depend +i copyright This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Sat May 15 00:03:23 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Fri, 14 May 2010 22:03:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[9873] csw/mgar/pkg/isaexec/trunk Message-ID: Revision: 9873 http://gar.svn.sourceforge.net/gar/?rev=9873&view=rev Author: theferret Date: 2010-05-14 22:03:23 +0000 (Fri, 14 May 2010) Log Message: ----------- and here's the full working set Modified Paths: -------------- csw/mgar/pkg/isaexec/trunk/Makefile csw/mgar/pkg/isaexec/trunk/pkginfo csw/mgar/pkg/isaexec/trunk/prototype Added Paths: ----------- csw/mgar/pkg/isaexec/trunk/BUILD.NOTES csw/mgar/pkg/isaexec/trunk/copyright csw/mgar/pkg/isaexec/trunk/postinstall csw/mgar/pkg/isaexec/trunk/postremove Added: csw/mgar/pkg/isaexec/trunk/BUILD.NOTES =================================================================== --- csw/mgar/pkg/isaexec/trunk/BUILD.NOTES (rev 0) +++ csw/mgar/pkg/isaexec/trunk/BUILD.NOTES 2010-05-14 22:03:23 UTC (rev 9873) @@ -0,0 +1,12 @@ +This package doesnt need much in the way of "building". +This package is a hack around the issue that we dont have legal right +to redistribute isaexec. + +You can almost just do pkgmk! + +You can use createpkg -r . if you like though. + +but remember to rename (SunOS5.8) and uncompress it! + +Note: DO NOT COMPRESS/gzip the package! + (so gzip can use it :-) Modified: csw/mgar/pkg/isaexec/trunk/Makefile =================================================================== --- csw/mgar/pkg/isaexec/trunk/Makefile 2010-05-14 21:56:18 UTC (rev 9872) +++ csw/mgar/pkg/isaexec/trunk/Makefile 2010-05-14 22:03:23 UTC (rev 9873) @@ -11,6 +11,8 @@ package: $(STDFILE) $(FILES) $(CREATEPKG) + @echo just for isaexec, we need to UNgzip now... + gunzip *.pkg.gz touch package build: @@ -19,8 +21,8 @@ cswstage clean: - rm *.pkg.gz + rm -f *.pkg.gz package STDFILES=pkginfo copyright prototype -FILES=YourFilesHere +FILES=postinstall postremove Added: csw/mgar/pkg/isaexec/trunk/copyright =================================================================== --- csw/mgar/pkg/isaexec/trunk/copyright (rev 0) +++ csw/mgar/pkg/isaexec/trunk/copyright 2010-05-14 22:03:23 UTC (rev 9873) @@ -0,0 +1,5 @@ +This interesting packaging hack is copyrighted by Philip Brown, +phil at bolthole.com +You may copy, install, and otherwise redistribute this package as you like, +without having to pay any fee, so long as it remain unchanged, and this notice +remain intact as the copyright notice. Modified: csw/mgar/pkg/isaexec/trunk/pkginfo =================================================================== --- csw/mgar/pkg/isaexec/trunk/pkginfo 2010-05-14 21:56:18 UTC (rev 9872) +++ csw/mgar/pkg/isaexec/trunk/pkginfo 2010-05-14 22:03:23 UTC (rev 9873) @@ -1 +1,8 @@ -ERROR: need name of software +PKG=CSWisaexec +NAME=isaexec - sneaky wrapper around Sun isaexec +VERSION=0.2,REV=2009.03.26 +ARCH=all +CATEGORY=system +VENDOR=http://www.opencsw.org/ packaged for CSW by Philip Brown +HOTLINE=http://www.opencsw.org/bugtrack/ +EMAIL=phil at opencsw.org Added: csw/mgar/pkg/isaexec/trunk/postinstall =================================================================== --- csw/mgar/pkg/isaexec/trunk/postinstall (rev 0) +++ csw/mgar/pkg/isaexec/trunk/postinstall 2010-05-14 22:03:23 UTC (rev 9873) @@ -0,0 +1,22 @@ +#!/bin/sh + +# install script to copy over sun's isaexec, to +# /opt/csw/bin +# The reasons for this being: +# 1. we dont have permission to redistribute it +# 2. it has to be used via hard links +# 3. odds are, /opt/csw will be on a different filesystem than /usr/lib +# + +# Warning: Note that we may be installing to a zone, with shared +# read-only /opt/csw. + +if test -f $PKG_INSTALL_ROOT/opt/csw/bin/isaexec ; then + echo Skipping copy of isaexec since /opt/csw/bin/isaexec exists +else + echo Copying $PKG_INSTALL_ROOT/usr/lib/isaexec to $PKG_INSTALL_ROOT/opt/csw/bin/isaexec + cp -p $PKG_INSTALL_ROOT/usr/lib/isaexec $PKG_INSTALL_ROOT/opt/csw/bin/isaexec || exit 1 +fi + +installf $PKGINST /opt/csw/bin/isaexec f +installf -f $PKGINST Property changes on: csw/mgar/pkg/isaexec/trunk/postinstall ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/isaexec/trunk/postremove =================================================================== --- csw/mgar/pkg/isaexec/trunk/postremove (rev 0) +++ csw/mgar/pkg/isaexec/trunk/postremove 2010-05-14 22:03:23 UTC (rev 9873) @@ -0,0 +1,16 @@ +#!/bin/sh + +# remove script for CSW copy of sun's isaexec + +filename=`removef $PKGINST /opt/csw/bin/isaexec` + +if [ "$filename" = "" ] ; then + echo "Note: /opt/csw/bin/isaexec not clear for removal." + echo "Not removing" + exit 0 +fi + +# even if we are in a zone, just ignore failure here. +rm -f $BASEDIR/opt/csw/bin/isaexec 2>/dev/null + +removef -f $PKGINST Property changes on: csw/mgar/pkg/isaexec/trunk/postremove ___________________________________________________________________ Added: svn:executable + * Modified: csw/mgar/pkg/isaexec/trunk/prototype =================================================================== --- csw/mgar/pkg/isaexec/trunk/prototype 2010-05-14 21:56:18 UTC (rev 9872) +++ csw/mgar/pkg/isaexec/trunk/prototype 2010-05-14 22:03:23 UTC (rev 9873) @@ -1,3 +1,6 @@ i pkginfo -i depend i copyright +i postinstall +i postremove +d none /opt/csw 0755 root bin +d none /opt/csw/bin 0755 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Sat May 15 00:04:17 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Fri, 14 May 2010 22:04:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[9874] csw/mgar/pkg/TEMPLATES/createpkg Message-ID: Revision: 9874 http://gar.svn.sourceforge.net/gar/?rev=9874&view=rev Author: theferret Date: 2010-05-14 22:04:17 +0000 (Fri, 14 May 2010) Log Message: ----------- Made 'clean' target better Modified Paths: -------------- csw/mgar/pkg/TEMPLATES/createpkg/Makefile csw/mgar/pkg/TEMPLATES/createpkg/Makefile.reloc Modified: csw/mgar/pkg/TEMPLATES/createpkg/Makefile =================================================================== --- csw/mgar/pkg/TEMPLATES/createpkg/Makefile 2010-05-14 22:03:23 UTC (rev 9873) +++ csw/mgar/pkg/TEMPLATES/createpkg/Makefile 2010-05-14 22:04:17 UTC (rev 9874) @@ -19,7 +19,7 @@ cswstage clean: - rm *.pkg.gz + rm -f *.pkg.gz package STDFILES=pkginfo copyright prototype Modified: csw/mgar/pkg/TEMPLATES/createpkg/Makefile.reloc =================================================================== --- csw/mgar/pkg/TEMPLATES/createpkg/Makefile.reloc 2010-05-14 22:03:23 UTC (rev 9873) +++ csw/mgar/pkg/TEMPLATES/createpkg/Makefile.reloc 2010-05-14 22:04:17 UTC (rev 9874) @@ -14,7 +14,7 @@ touch package clean: - rm *.pkg.gz + rm -f *.pkg.gz package STDFILES=pkginfo copyright prototype This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Sat May 15 00:07:33 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Fri, 14 May 2010 22:07:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[9875] csw/mgar/pkg/sunx11_devel/trunk/Makefile Message-ID: Revision: 9875 http://gar.svn.sourceforge.net/gar/?rev=9875&view=rev Author: theferret Date: 2010-05-14 22:07:32 +0000 (Fri, 14 May 2010) Log Message: ----------- fixed 'clean' targets Modified Paths: -------------- csw/mgar/pkg/sunx11_devel/trunk/Makefile Modified: csw/mgar/pkg/sunx11_devel/trunk/Makefile =================================================================== --- csw/mgar/pkg/sunx11_devel/trunk/Makefile 2010-05-14 22:04:17 UTC (rev 9874) +++ csw/mgar/pkg/sunx11_devel/trunk/Makefile 2010-05-14 22:07:32 UTC (rev 9875) @@ -3,7 +3,7 @@ touch package clean: - rm *.pkg.gz + rm -f *.pkg.gz package STDFILES=pkginfo copyright prototype This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Sat May 15 00:07:52 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Fri, 14 May 2010 22:07:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[9876] csw/mgar/pkg/alternatives/trunk/Makefile Message-ID: Revision: 9876 http://gar.svn.sourceforge.net/gar/?rev=9876&view=rev Author: theferret Date: 2010-05-14 22:07:52 +0000 (Fri, 14 May 2010) Log Message: ----------- fixed clean target Modified Paths: -------------- csw/mgar/pkg/alternatives/trunk/Makefile Modified: csw/mgar/pkg/alternatives/trunk/Makefile =================================================================== --- csw/mgar/pkg/alternatives/trunk/Makefile 2010-05-14 22:07:32 UTC (rev 9875) +++ csw/mgar/pkg/alternatives/trunk/Makefile 2010-05-14 22:07:52 UTC (rev 9876) @@ -3,4 +3,4 @@ touch package clean: - rm *.pkg.gz + rm -f *.pkg.gz package This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Sat May 15 00:22:04 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Fri, 14 May 2010 22:22:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[9877] csw/mgar/pkg/TEMPLATES/createpkg/copy_template Message-ID: Revision: 9877 http://gar.svn.sourceforge.net/gar/?rev=9877&view=rev Author: theferret Date: 2010-05-14 22:22:04 +0000 (Fri, 14 May 2010) Log Message: ----------- minor prettiness tweak for svn syntax Modified Paths: -------------- csw/mgar/pkg/TEMPLATES/createpkg/copy_template Modified: csw/mgar/pkg/TEMPLATES/createpkg/copy_template =================================================================== --- csw/mgar/pkg/TEMPLATES/createpkg/copy_template 2010-05-14 22:07:52 UTC (rev 9876) +++ csw/mgar/pkg/TEMPLATES/createpkg/copy_template 2010-05-14 22:22:04 UTC (rev 9877) @@ -27,7 +27,6 @@ DESTDIR=$1/trunk -mkdir -p $DESTDIR $SVN info >/dev/null if [[ $? -ne 0 ]] ; then @@ -36,9 +35,7 @@ exit 1 fi -# Note that apparently you cannot "skip a directory". you must -# add the highest-level directory first -$SVN add $1 +$SVN mkdir --parents $DESTDIR cp $template_dir/Makefile* $DESTDIR cp $template_dir/prototype* $DESTDIR This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat May 15 01:11:33 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 14 May 2010 23:11:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[9878] csw/mgar/pkg/gnulinks/trunk/Makefile Message-ID: Revision: 9878 http://gar.svn.sourceforge.net/gar/?rev=9878&view=rev Author: bdwalton Date: 2010-05-14 23:11:33 +0000 (Fri, 14 May 2010) Log Message: ----------- gnulinks: re-drop gfile, shutils and textutils. Modified Paths: -------------- csw/mgar/pkg/gnulinks/trunk/Makefile Modified: csw/mgar/pkg/gnulinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnulinks/trunk/Makefile 2010-05-14 22:22:04 UTC (rev 9877) +++ csw/mgar/pkg/gnulinks/trunk/Makefile 2010-05-14 23:11:33 UTC (rev 9878) @@ -7,7 +7,6 @@ GLINKPKGS = CSWggettext CSWggettextrt CSWbison CSWbinutils GLINKPKGS += CSWgawk CSWgsed CSWggetopt CSWfindutils GLINKPKGS += CSWgmake CSWgpatch CSWgm4 CSWgwhois CSWgtar -GLINKPKGS += CSWgfile CSWshutils CSWtextutils BUILD_DEP_PKGS = $(GLINKPKGS) CSWpkgutil CSWbash DESCRIPTION = Creates native symlinks for GNU tools in /opt/csw/gnu This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat May 15 02:18:03 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 15 May 2010 00:18:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[9879] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: Revision: 9879 http://gar.svn.sourceforge.net/gar/?rev=9879&view=rev Author: bdwalton Date: 2010-05-15 00:18:03 +0000 (Sat, 15 May 2010) Log Message: ----------- cswutils: use most recent tools Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2010-05-14 23:11:33 UTC (rev 9878) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2010-05-15 00:18:03 UTC (rev 9879) @@ -9,7 +9,7 @@ endef SVNROOT = http://opencsw.svn.sourceforge.net/svnroot/opencsw/utilities/ -SVN_REV = 104 +SVN_REV = 133 MASTER_SITES = SVN_FILES = compare_pkgs.py This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat May 15 02:20:34 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 15 May 2010 00:20:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[9880] csw/mgar/pkg/cswutils/trunk/checksums Message-ID: Revision: 9880 http://gar.svn.sourceforge.net/gar/?rev=9880&view=rev Author: bdwalton Date: 2010-05-15 00:20:34 +0000 (Sat, 15 May 2010) Log Message: ----------- cswutils: update checksums Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/checksums Modified: csw/mgar/pkg/cswutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswutils/trunk/checksums 2010-05-15 00:18:03 UTC (rev 9879) +++ csw/mgar/pkg/cswutils/trunk/checksums 2010-05-15 00:20:34 UTC (rev 9880) @@ -1,7 +1,7 @@ 091b12575ebc0e45cf8c3d8b43d8b638 COPYING 59c261b5337c61ddda9146a2a97efc3d checkpkg 6ec3b6597e04714430987ccc199db3c4 checkpkg.8 -1fae82cde07f0d2eddb688a089e9de5b compare_pkgs.py-r104 +2b5e6e6219b9ad9e48bcd119bd8a5f39 compare_pkgs.py-r133 9a637f6546cc50974159a987302d91c0 cpan2pkg 93b6a811d303ce3be0050c5a7b3c8e69 createpkg a605598f30195f9ab1b29fc3944d3b31 createpkg.8 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Sat May 15 05:07:06 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Sat, 15 May 2010 03:07:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[9881] csw/mgar/pkg/alternatives Message-ID: Revision: 9881 http://gar.svn.sourceforge.net/gar/?rev=9881&view=rev Author: theferret Date: 2010-05-15 03:07:06 +0000 (Sat, 15 May 2010) Log Message: ----------- minor tweaks to svn properties Property Changed: ---------------- csw/mgar/pkg/alternatives/branches/ csw/mgar/pkg/alternatives/trunk/ Property changes on: csw/mgar/pkg/alternatives/branches ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/alternatives/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Sat May 15 05:07:59 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Sat, 15 May 2010 03:07:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[9882] csw/mgar/pkg/TEMPLATES/createpkg/copy_template Message-ID: Revision: 9882 http://gar.svn.sourceforge.net/gar/?rev=9882&view=rev Author: theferret Date: 2010-05-15 03:07:59 +0000 (Sat, 15 May 2010) Log Message: ----------- make script set ignore statuses Modified Paths: -------------- csw/mgar/pkg/TEMPLATES/createpkg/copy_template Modified: csw/mgar/pkg/TEMPLATES/createpkg/copy_template =================================================================== --- csw/mgar/pkg/TEMPLATES/createpkg/copy_template 2010-05-15 03:07:06 UTC (rev 9881) +++ csw/mgar/pkg/TEMPLATES/createpkg/copy_template 2010-05-15 03:07:59 UTC (rev 9882) @@ -37,6 +37,14 @@ $SVN mkdir --parents $DESTDIR +svn propset svn:ignore -F /dev/fd/0 $DESTDIR <$DESTDIR/pkginfo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat May 15 13:42:49 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 15 May 2010 11:42:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[9883] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 9883 http://gar.svn.sourceforge.net/gar/?rev=9883&view=rev Author: bdwalton Date: 2010-05-15 11:42:48 +0000 (Sat, 15 May 2010) Log Message: ----------- coreutils: declare incompatible packages Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2010-05-15 03:07:59 UTC (rev 9882) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2010-05-15 11:42:48 UTC (rev 9883) @@ -17,6 +17,8 @@ RUNTIME_DEP_PKGS = CSWiconv CSWggettextrt CSWlibgmp +INCOMPATIBLE_PKGS = CSWgfile CSWshutils CSWtextutils + DESCRIPTION = GNU core utilities define BLURB The GNU Core Utilities are the basic file, shell and text manipulation utilities of the GNU operating system. These are the core utilities which are expected to exist on every operating system. 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 May 15 18:06:15 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 15 May 2010 16:06:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[9884] csw/mgar/pkg/libserf/trunk Message-ID: Revision: 9884 http://gar.svn.sourceforge.net/gar/?rev=9884&view=rev Author: rthurner Date: 2010-05-15 16:06:14 +0000 (Sat, 15 May 2010) Log Message: ----------- libserf - update to serf-0.6.1 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 2010-05-15 11:42:48 UTC (rev 9883) +++ csw/mgar/pkg/libserf/trunk/Makefile 2010-05-15 16:06:14 UTC (rev 9884) @@ -1,5 +1,5 @@ GARNAME = libserf -GARVERSION = 0.3.1 +GARVERSION = 0.6.1 DISTNAME = serf-$(GARVERSION) CATEGORIES = lib Modified: csw/mgar/pkg/libserf/trunk/checksums =================================================================== --- csw/mgar/pkg/libserf/trunk/checksums 2010-05-15 11:42:48 UTC (rev 9883) +++ csw/mgar/pkg/libserf/trunk/checksums 2010-05-15 16:06:14 UTC (rev 9884) @@ -1 +1 @@ -7d211539bf698de2a79062ba314e7a3e serf-0.3.1.tar.bz2 +14267fa2b49aa3484366e713970384a5 serf-0.6.1.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 Sat May 15 20:12:14 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 15 May 2010 18:12:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[9885] csw/mgar/pkg/openldap/trunk Message-ID: Revision: 9885 http://gar.svn.sourceforge.net/gar/?rev=9885&view=rev Author: rthurner Date: 2010-05-15 18:12:13 +0000 (Sat, 15 May 2010) Log Message: ----------- openldap - upgrade to openldap-2.4.22 Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile csw/mgar/pkg/openldap/trunk/checksums Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2010-05-15 16:06:14 UTC (rev 9884) +++ csw/mgar/pkg/openldap/trunk/Makefile 2010-05-15 18:12:13 UTC (rev 9885) @@ -1,8 +1,8 @@ GARNAME = openldap -GARVERSION = 2.4.21 +GARVERSION = 2.4.22 CATEGORIES = server EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 2.3.43 2.4.21 +MODULATIONS_GARVERSION = 2.3.43 2.4.22 DESCRIPTION = Open source implementation of the Lightweight Directory Access Protocol define BLURB @@ -20,10 +20,10 @@ DISTFILES += README.CSW openldaprc DISTFILES += cswopenldap openldap.xml svc-openldap -PATCHFILES_isa-sparcv8-garversion-2.4.21 = patch-oldap-2.4.16-ntlm.diff -PATCHFILES_isa-sparcv9-garversion-2.4.21 = patch-oldap-2.4.16-ntlm.diff -PATCHFILES_isa-i386-garversion-2.4.21 = patch-oldap-2.4.16-ntlm.diff -PATCHFILES_isa-amd64-garversion-2.4.21 = patch-oldap-2.4.16-ntlm.diff +PATCHFILES_isa-sparcv8-garversion-2.4.22 = patch-oldap-2.4.16-ntlm.diff +PATCHFILES_isa-sparcv9-garversion-2.4.22 = patch-oldap-2.4.16-ntlm.diff +PATCHFILES_isa-i386-garversion-2.4.22 = patch-oldap-2.4.16-ntlm.diff +PATCHFILES_isa-amd64-garversion-2.4.22 = patch-oldap-2.4.16-ntlm.diff PATCHFILES += patch-libtool-64bit.diff DISTFILES += patch-oldap-2.4.16-ntlm.diff @@ -58,8 +58,8 @@ EXTRA_LIB_garversion-2.3.43 = $(prefix)/bdb44/lib EXTRA_INC_garversion-2.3.43 = $(prefix)/bdb44/include -EXTRA_LIB_garversion-2.4.21 = $(prefix)/bdb48/lib -EXTRA_INC_garversion-2.4.21 = $(prefix)/bdb48/include +EXTRA_LIB_garversion-2.4.22 = $(prefix)/bdb48/lib +EXTRA_INC_garversion-2.4.22 = $(prefix)/bdb48/include EXTRA_LIB = $(EXTRA_LIB_garversion-$(GARVERSION)) EXTRA_INC = $(EXTRA_INC_garversion-$(GARVERSION)) @@ -99,9 +99,9 @@ MERGE_SCRIPTS_isa-default64-garversion-2.3.43 = copy-relocated-only MERGE_DIRS_isa-default64-garversion-2.3.43 = $(libdir) -MERGE_SCRIPTS_isa-default-garversion-2.4.21 = copy-all -MERGE_SCRIPTS_isa-default64-garversion-2.4.21 = copy-relocated-only -MERGE_DIRS_isa-default64-garversion-2.4.21 = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_SCRIPTS_isa-default-garversion-2.4.22 = copy-all +MERGE_SCRIPTS_isa-default64-garversion-2.4.22 = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-2.4.22 = $(bindir) $(sbindir) $(libexecdir) $(libdir) PKGFILES_CSWoldapclient = $(bindir)/.* PKGFILES_CSWoldapclient += $(mandir)/man1/.* Modified: csw/mgar/pkg/openldap/trunk/checksums =================================================================== --- csw/mgar/pkg/openldap/trunk/checksums 2010-05-15 16:06:14 UTC (rev 9884) +++ csw/mgar/pkg/openldap/trunk/checksums 2010-05-15 18:12:13 UTC (rev 9885) @@ -2,7 +2,7 @@ 892dba5f625755be024c30ea0055fd55 README.CSW c50f5c4040139b6cf57fcc08abffbee7 cswopenldap 1b25281086eb146b8e11ebd33de086dc openldap-2.3.43.tgz -e7128c57b2bacd940e8906057c94ff26 openldap-2.4.21.tgz +ef01b52255ce8e3fbf8aa34f6fe7598b openldap-2.4.22.tgz 0e57547ad2b5fedca9f0bd4beaddfe39 openldap.xml ab2ac7519b092ce8d16124c5270bfec0 openldaprc 93dc2a04fd943c198ad00edd4d88ce65 patch-libtool-64bit.diff 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 May 15 20:21:46 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 15 May 2010 18:21:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[9886] csw/mgar/pkg/openldap/trunk/Makefile Message-ID: Revision: 9886 http://gar.svn.sourceforge.net/gar/?rev=9886&view=rev Author: rthurner Date: 2010-05-15 18:21:45 +0000 (Sat, 15 May 2010) Log Message: ----------- openldap - try to remove the checkpkg items Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2010-05-15 18:12:13 UTC (rev 9885) +++ csw/mgar/pkg/openldap/trunk/Makefile 2010-05-15 18:21:45 UTC (rev 9886) @@ -115,9 +115,9 @@ INITSMF = /opt/csw/etc/init.d/cswopenldap -CHECKPKG_OVERRIDES_CSWoldap += deprecated-library|opt/csw/libexec/amd64/openldap/back_perl-2.4.so.2.5.4|Deprecated|Berkeley|DB|location|/opt/csw/lib/libdb-4.7.so -CHECKPKG_OVERRIDES_CSWoldap += deprecated-library|opt/csw/libexec/openldap/back_perl-2.4.so.2.5.4|Deprecated|Berkeley|DB|location|/opt/csw/lib/libdb-4.7.so -CHECKPKG_OVERRIDES_CSWoldap += soname-not-found|libm.so.2 +#CHECKPKG_OVERRIDES_CSWoldap += deprecated-library|opt/csw/libexec/amd64/openldap/back_perl-2.4.so.2.5.4|Deprecated|Berkeley|DB|location|/opt/csw/lib/libdb-4.7.so +#CHECKPKG_OVERRIDES_CSWoldap += deprecated-library|opt/csw/libexec/openldap/back_perl-2.4.so.2.5.4|Deprecated|Berkeley|DB|location|/opt/csw/lib/libdb-4.7.so +#CHECKPKG_OVERRIDES_CSWoldap += soname-not-found|libm.so.2 ARCHALL_CSWoldapdevel = 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 Sat May 15 21:12:14 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 15 May 2010 19:12:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[9887] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 9887 http://gar.svn.sourceforge.net/gar/?rev=9887&view=rev Author: rthurner Date: 2010-05-15 19:12:14 +0000 (Sat, 15 May 2010) Log Message: ----------- subversion - update to svn-1.6.11 and new checkpkg. also try to switch back to sos compile in stead of gcc for ruby bindings Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-05-15 18:21:45 UTC (rev 9886) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-05-15 19:12:14 UTC (rev 9887) @@ -58,15 +58,9 @@ RUNTIME_DEP_PKGS_CSWsvn += CSWlibserf RUNTIME_DEP_PKGS_CSWsvn += CSWsqlite3rt RUNTIME_DEP_PKGS_CSWsvn += CSWzlib -RUNTIME_DEP_PKGS_CSWsvn-contrib += CSWperl -RUNTIME_DEP_PKGS_CSWsvn-contrib += CSWpython -RUNTIME_DEP_PKGS_CSWsvn-tools += CSWperl -RUNTIME_DEP_PKGS_CSWsvn-tools += CSWpython -RUNTIME_DEP_PKGS_CSWsvn-tools += CSWruby SPKG_DESC_CSWsvn-devel = Subversion Development Support CATALOGNAME_CSWsvn-devel = subversion_devel -RUNTIME_DEP_PKGS_CSWsvn-devel = CSWsvn ARCHALL_CSWsvn-devel = 1 PKGFILES_CSWsvn-devel = $(PKGFILES_DEVEL) PKGFILES_CSWsvn-devel += $(docdir)/$(CATALOGNAME_CSWsvn-devel)/changelog.CSW @@ -87,25 +81,11 @@ SPKG_DESC_CSWjavasvn = Subversion Java Language Binding CATALOGNAME_CSWjavasvn = javasvn -RUNTIME_DEP_PKGS_CSWjavasvn = CSWsvn -RUNTIME_DEP_PKGS_CSWjavasvn += CSWapache2rt -RUNTIME_DEP_PKGS_CSWjavasvn += CSWexpat -RUNTIME_DEP_PKGS_CSWjavasvn += CSWggettextrt -RUNTIME_DEP_PKGS_CSWjavasvn += CSWiconv -RUNTIME_DEP_PKGS_CSWjavasvn += CSWneon -RUNTIME_DEP_PKGS_CSWjavasvn += CSWoldaprt PKGFILES_CSWjavasvn = $(SVNLIB)/.*java.* PKGFILES_CSWjavasvn += $(docdir)/$(CATALOGNAME_CSWjavasvn)/changelog.CSW SPKG_DESC_CSWpmsvn = Subversion Perl Language Binding CATALOGNAME_CSWpmsvn = pm_subversion -RUNTIME_DEP_PKGS_CSWpmsvn = CSWsvn -RUNTIME_DEP_PKGS_CSWpmsvn += CSWperl -RUNTIME_DEP_PKGS_CSWpmsvn += CSWapache2rt -RUNTIME_DEP_PKGS_CSWpmsvn += CSWexpat -RUNTIME_DEP_PKGS_CSWpmsvn += CSWggettextrt -RUNTIME_DEP_PKGS_CSWpmsvn += CSWiconv -RUNTIME_DEP_PKGS_CSWpmsvn += CSWoldaprt PKGFILES_CSWpmsvn = $(libdir)/perl.* PKGFILES_CSWpmsvn += $(SVNLIB)/.*perl.* PKGFILES_CSWpmsvn += $(mandir)/.*swig_perl.* @@ -126,13 +106,6 @@ SPKG_DESC_CSWpythonsvn = Subversion Python Language Binding CATALOGNAME_CSWpythonsvn = pythonsvn -RUNTIME_DEP_PKGS_CSWpythonsvn = CSWsvn -RUNTIME_DEP_PKGS_CSWpythonsvn += CSWpython -RUNTIME_DEP_PKGS_CSWpythonsvn += CSWapache2rt -RUNTIME_DEP_PKGS_CSWpythonsvn += CSWexpat -RUNTIME_DEP_PKGS_CSWpythonsvn += CSWggettextrt -RUNTIME_DEP_PKGS_CSWpythonsvn += CSWiconv -RUNTIME_DEP_PKGS_CSWpythonsvn += CSWoldaprt PKGFILES_CSWpythonsvn = $(libdir)/python.* PKGFILES_CSWpythonsvn += $(SVNLIB)/.*swig_py.* PKGFILES_CSWpythonsvn += $(docdir)/$(CATALOGNAME_CSWpythonsvn)/changelog.CSW @@ -205,8 +178,7 @@ include gar/category.mk -#BINDING_LANGS = java perl python ruby -BINDING_LANGS = java perl python +BINDING_LANGS = java perl python ruby BINDING_TARGETS = $(addprefix svn-,$(BINDING_LANGS)) PI_DEPENDS += copy-apache-templates @@ -214,6 +186,18 @@ PI_DEPENDS += install-extras PI_DEPENDS += $(BINDING_TARGETS) +CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWemacscommon +CHECKPKG_OVERRIDES_CSWsvn-contrib += missing-dependency|CSWemacscommon +CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 +CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 +CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 +CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 +CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/rw7|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 +CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/v8|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 +CHECKPKG_OVERRIDES_CSWpythonsvn += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWpythonsvn += catalogname-does-not-start-with-py_ + + post-install-modulated: $(PI_DEPENDS) $(MAKECOOKIE) @@ -296,8 +280,8 @@ svn-ruby: @echo " ==> Building Ruby bindings" touch $(WORKSRC)/subversion/bindings/swig/ruby/*.c - $(BUILD_ENV) gmake -f Makefile.gcc -C $(WORKSRC) swig-rb - $(INSTALL_ENV) gmake -f Makefile.gcc -C $(WORKSRC) install-swig-rb + $(BUILD_ENV) gmake -C $(WORKSRC) swig-rb + $(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-rb @$(MAKECOOKIE) svn-java: 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 May 15 23:21:25 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 15 May 2010 21:21:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[9888] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 9888 http://gar.svn.sourceforge.net/gar/?rev=9888&view=rev Author: rthurner Date: 2010-05-15 21:21:25 +0000 (Sat, 15 May 2010) Log Message: ----------- svn-1.6.11 - checkpkg updates Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-05-15 19:12:14 UTC (rev 9887) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-05-15 21:21:25 UTC (rev 9888) @@ -67,9 +67,13 @@ PKGFILES_CSWsvn-contrib = $(docdir)/subversion/contrib.* ARCHALL_CSWsvn-contrib = 1 +RUNTIME_DEP_PKGS_CSWsvn-contrib += CSWperl CSWpython +CHECKPKG_OVERRIDES_CSWsvn-contrib += missing-dependency|CSWemacscommon PKGFILES_CSWsvn-tools = $(docdir)/subversion/tools.* ARCHALL_CSWsvn-tools = 1 +RUNTIME_DEP_PKGS_CSWsvn-tools += CSWperl CSWruby CSWpython +CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWemacscommon SPKG_DESC_CSWap2svn = Subversion Modules for Apache 2.2 CATALOGNAME_CSWap2svn = ap2_subversion @@ -83,6 +87,19 @@ CATALOGNAME_CSWjavasvn = javasvn PKGFILES_CSWjavasvn = $(SVNLIB)/.*java.* PKGFILES_CSWjavasvn += $(docdir)/$(CATALOGNAME_CSWjavasvn)/changelog.CSW +RUNTIME_DEP_PKGS_CSWjavasvn += CSWexpat CSWsvn CSWiconv CSWapache2rt +RUNTIME_DEP_PKGS_CSWjavasvn += CSWggettextrt CSWneon CSWoldaprt +CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 +CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 +CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 +CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 +CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/rw7|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 +CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/v8|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 +CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 +CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 +CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 +CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/rw7|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 +CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/v8|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 SPKG_DESC_CSWpmsvn = Subversion Perl Language Binding CATALOGNAME_CSWpmsvn = pm_subversion @@ -90,6 +107,8 @@ PKGFILES_CSWpmsvn += $(SVNLIB)/.*perl.* PKGFILES_CSWpmsvn += $(mandir)/.*swig_perl.* PKGFILES_CSWpmsvn += $(docdir)/$(CATALOGNAME_CSWpmsvn)/changelog.CSW +RUNTIME_DEP_PKGS_CSWpmsvn += CSWperl CSWexpat CSWsvn CSWiconv CSWapache2rt +RUNTIME_DEP_PKGS_CSWpmsvn += CSWggettextrt CSWoldaprt SPKG_DESC_CSWrbsvn = Subversion Ruby Language Binding CATALOGNAME_CSWrbsvn = rbsvn @@ -106,9 +125,13 @@ SPKG_DESC_CSWpythonsvn = Subversion Python Language Binding CATALOGNAME_CSWpythonsvn = pythonsvn +RUNTIME_DEP_PKGS_CSWpythonsvn = CSWexpat CSWpython CSWsvn CSWiconv +RUNTIME_DEP_PKGS_CSWpythonsvn += CSWapache2rt CSWggettextrt CSWoldaprt PKGFILES_CSWpythonsvn = $(libdir)/python.* PKGFILES_CSWpythonsvn += $(SVNLIB)/.*swig_py.* PKGFILES_CSWpythonsvn += $(docdir)/$(CATALOGNAME_CSWpythonsvn)/changelog.CSW +CHECKPKG_OVERRIDES_CSWpythonsvn += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWpythonsvn += catalogname-does-not-start-with-py_ DISTFILES += CSWsvn.checkinstall @@ -186,18 +209,6 @@ PI_DEPENDS += install-extras PI_DEPENDS += $(BINDING_TARGETS) -CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWemacscommon -CHECKPKG_OVERRIDES_CSWsvn-contrib += missing-dependency|CSWemacscommon -CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 -CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 -CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 -CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 -CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/rw7|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 -CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/v8|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 -CHECKPKG_OVERRIDES_CSWpythonsvn += pkgname-does-not-start-with-CSWpy- -CHECKPKG_OVERRIDES_CSWpythonsvn += catalogname-does-not-start-with-py_ - - post-install-modulated: $(PI_DEPENDS) $(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat May 15 23:28:50 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 15 May 2010 21:28:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[9889] csw/mgar/pkg/x11/lib/xrender/trunk/Makefile Message-ID: Revision: 9889 http://gar.svn.sourceforge.net/gar/?rev=9889&view=rev Author: bdwalton Date: 2010-05-15 21:28:50 +0000 (Sat, 15 May 2010) Log Message: ----------- xrender: initial work toward modulating for sun x11 and csw x11 Modified Paths: -------------- csw/mgar/pkg/x11/lib/xrender/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/xrender/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2010-05-15 21:21:25 UTC (rev 9888) +++ csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2010-05-15 21:28:50 UTC (rev 9889) @@ -14,6 +14,9 @@ DISTNAME = libXrender-$(GARVERSION) DISTFILES = $(DISTNAME).tar.gz +EXTRA_MODULATORS = X11 +MODULATIONS_X11 = sunwx11 cswx11 + # Legacy libraries # The idea is to have the legacy libs in /opt/csw/lib to guarantee the existing # apps will continue to work. The new lib in /opt/csw/X11/lib relies on the @@ -27,25 +30,45 @@ UFILES_REGEX = libXrender-(\d+(?:\.\d+)*).tar.gz PACKAGES = CSWlibxrender CSWlibxrenderdevel +PACKAGES += CSWcxlibxrender CSWcxlibxrenderdevel CATALOGNAME_CSWlibxrender = libxrender CATALOGNAME_CSWlibxrenderdevel = libxrender_devel +CATALOGNAME_CSWcxlibxrender = cx_libxrender +CATALOGNAME_CSWcxlibxrenderdevel = cx_libxrender_devel -BUILD_DEP_PKGS = CSWx11renderproto +BUILD_DEP_PKGS = CSWx11renderproto CSWsunx11devel RUNTIME_DEP_PKGS_CSWlibxrenderdevel = CSWlibxrender RUNTIME_DEP_PKGS_CSWlibxrender = CSWx11common CSWlibx11 SPKG_DESC_CSWlibxrender = $(DESCRIPTION) SPKG_DESC_CSWlibxrenderdevel = $(DESCRIPTION) Development Package +SPKG_DESC_CSWcxlibxrender = $(DESCRIPTION) (bound against OpenCSW X11) +SPKG_DESC_CSWcxlibxrenderdevel = $(DESCRIPTION) Development Package (bound against OpenCSW X11) PKGFILES_CSWlibxrenderdevel = $(PKGFILES_DEVEL) +MERGE_SCRIPTS_isa-default-x11-sunwx11 = copy-all +MERGE_SCRIPTS_isa-default64-x11-sunwx11 = copy-relocated-only +MERGE_DIRS_isa-default64-x11-sunwx11 = $(libdir) +MERGE_SCRIPTS_isa-default-x11-cswx11 = copy-only +MERGE_DIRS_isa-default-x11-cswx11 = $(libdir) $(includedir) +MERGE_SCRIPTS_isa-default64-x11-cswx11 = copy-relocated-only +MERGE_DIRS_isa-default64-x11-cswx11 = $(libdir) + BUILD64 = 1 NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) +STRIP_LIBTOOL = 1 + include gar/category.mk +# this needs to be after the include as it's not a ?= in the x11 +# category... +prefix_cswx11 = $(BUILD_PREFIX)/X11 +prefix = $(or $(prefix_$(X11)),$(BUILD_PREFIX)) + post-merge: ginstall -d $(PKGROOT)$(BUILD_PREFIX)/lib cp $(DOWNLOADDIR)/$(LEGACYLIB)-$(GARCH) $(PKGROOT)$(BUILD_PREFIX)/lib/$(LEGACYLIB) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Sun May 16 04:04:24 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Sun, 16 May 2010 02:04:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[9890] csw/mgar/pkg/sunx11_devel/trunk Message-ID: Revision: 9890 http://gar.svn.sourceforge.net/gar/?rev=9890&view=rev Author: theferret Date: 2010-05-16 02:04:24 +0000 (Sun, 16 May 2010) Log Message: ----------- error fix Modified Paths: -------------- csw/mgar/pkg/sunx11_devel/trunk/pkginfo csw/mgar/pkg/sunx11_devel/trunk/prototype Modified: csw/mgar/pkg/sunx11_devel/trunk/pkginfo =================================================================== --- csw/mgar/pkg/sunx11_devel/trunk/pkginfo 2010-05-15 21:28:50 UTC (rev 9889) +++ csw/mgar/pkg/sunx11_devel/trunk/pkginfo 2010-05-16 02:04:24 UTC (rev 9890) @@ -1,7 +1,7 @@ PKG=CSWsunx11devel ARCH=all NAME=sunx11_devel - CSW utility layer for compiling software with Sun X11 libs -VERSION=1.0,REV=2010.05.14 +VERSION=1.0,REV=2010.05.16 CATEGORY=application VENDOR=http://www.opencsw.org/ packaged for CSW by Philip Brown HOTLINE=http://www.opencsw.org/bugtrack/ Modified: csw/mgar/pkg/sunx11_devel/trunk/prototype =================================================================== --- csw/mgar/pkg/sunx11_devel/trunk/prototype 2010-05-15 21:28:50 UTC (rev 9889) +++ csw/mgar/pkg/sunx11_devel/trunk/prototype 2010-05-16 02:04:24 UTC (rev 9890) @@ -7,5 +7,5 @@ f none /opt/csw/include/X11/Xregion.h=Xregion.h 0644 root bin f none /opt/csw/include/X11/extensions/render.h=render.h 0644 root bin f none /opt/csw/include/X11/extensions/renderproto.h=renderproto.h 0644 root bin -f none /opt/csw/pkgconfig/x11.pc=x11.pc 0644 root bin -f none /opt/csw/pkgconfig/renderproto.pc=renderproto.pc 0644 root bin +f none /opt/csw/lib/pkgconfig/x11.pc=x11.pc 0644 root bin +f none /opt/csw/lib/pkgconfig/renderproto.pc=renderproto.pc 0644 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun May 16 13:30:43 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 16 May 2010 11:30:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9891] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 9891 http://gar.svn.sourceforge.net/gar/?rev=9891&view=rev Author: rthurner Date: 2010-05-16 11:30:43 +0000 (Sun, 16 May 2010) Log Message: ----------- apache2 - try to put the .h files into the devel package Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-05-16 02:04:24 UTC (rev 9890) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-05-16 11:30:43 UTC (rev 9891) @@ -27,7 +27,7 @@ CATALOGNAME_CSWapache2-devel = apache2_devel ARCHALL_CSWapache2-devel = 1 #PKGFILES_CSWapache2-devel = $(PKGFILES_DEVEL) -PKGFILES_CSWapache2-devel = $(APACHE_ROOT)/*.h +PKGFILES_CSWapache2-devel = $(APACHE_ROOT)/include/*.h # Contents for every package. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun May 16 14:07:13 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 16 May 2010 12:07:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[9892] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 9892 http://gar.svn.sourceforge.net/gar/?rev=9892&view=rev Author: rthurner Date: 2010-05-16 12:07:13 +0000 (Sun, 16 May 2010) Log Message: ----------- apache2 - place initfile in /opt/csw Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-05-16 11:30:43 UTC (rev 9891) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-05-16 12:07:13 UTC (rev 9892) @@ -52,7 +52,7 @@ # make sure the the /etc/opt/csw/init.d/cswapache file gets installed during # the post-install stage, and add "INITSMF = /etc/opt/csw/init.d/cswapache" to # the Makefile. -INITSMF = /etc/opt/csw/init.d/cswapache2 +INITSMF = /opt/csw/etc/init.d/cswapache2 pre-configure-modulated: (cd $(WORKDIR)/$(GARNAME)-$(GARVERSION); ./buildconf) @@ -86,8 +86,8 @@ # Copy in specialized templates copy-local-files: - @ginstall -d $(DESTDIR)/etc/opt/csw/init.d - @ginstall $(WORKDIR)/cswapache2 $(DESTDIR)/etc/opt/csw/init.d + @ginstall -d $(DESTDIR)/opt/csw/etc/init.d + @ginstall $(WORKDIR)/cswapache2 $(DESTDIR)/opt/csw/etc/init.d @ginstall $(WORKDIR)/httpd.conf.CSW $(APACHE_ROOT)/etc @ginstall $(WORKDIR)/httpd-mpm.conf.CSW $(APACHE_ROOT)/etc/extra @ginstall $(WORKDIR)/httpd-ssl.conf.CSW $(APACHE_ROOT)/etc/extra This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun May 16 17:26:41 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 16 May 2010 15:26:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[9893] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 9893 http://gar.svn.sourceforge.net/gar/?rev=9893&view=rev Author: rthurner Date: 2010-05-16 15:26:41 +0000 (Sun, 16 May 2010) Log Message: ----------- apache2 - devel package does not include files ... so remove it Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-05-16 12:07:13 UTC (rev 9892) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-05-16 15:26:41 UTC (rev 9893) @@ -18,23 +18,8 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz # The PACKAGES variable tell GAR which packages to build -PACKAGES = CSWapache2 CSWapache2-devel +PACKAGES = CSWapache2 -# Descriptions for every package -# SPKG_DESC_CSWapache2 = $(DESCRIPTION) - -SPKG_DESC_CSWapache2-devel = Apache2 Development Support -CATALOGNAME_CSWapache2-devel = apache2_devel -ARCHALL_CSWapache2-devel = 1 -#PKGFILES_CSWapache2-devel = $(PKGFILES_DEVEL) -PKGFILES_CSWapache2-devel = $(APACHE_ROOT)/include/*.h - - -# Contents for every package. -# You don't define PKGFILES_CSWapache2, it's going to be the default, -# catch-all package. -# PKGFILES_CSWapache2 = - # Standard package bits DISTFILES += CSWapache2.killproc cswapache2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun May 16 17:40:11 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 16 May 2010 15:40:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[9894] csw/mgar/pkg/neon/trunk/Makefile Message-ID: Revision: 9894 http://gar.svn.sourceforge.net/gar/?rev=9894&view=rev Author: rthurner Date: 2010-05-16 15:40:11 +0000 (Sun, 16 May 2010) Log Message: ----------- neon - checkpkg wants it this way i guess ... Modified Paths: -------------- csw/mgar/pkg/neon/trunk/Makefile Modified: csw/mgar/pkg/neon/trunk/Makefile =================================================================== --- csw/mgar/pkg/neon/trunk/Makefile 2010-05-16 15:26:41 UTC (rev 9893) +++ csw/mgar/pkg/neon/trunk/Makefile 2010-05-16 15:40:11 UTC (rev 9894) @@ -122,7 +122,8 @@ FEATURES_libneon64.27 += libneon-full.so.27.2.3 # This comes from krb5-config --libs -CHECKPKG_OVERRIDES_CSWneonfull += bad-rpath-entry|/opt/csw/lib/ +CHECKPKG_OVERRIDES_CSWneonfull += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libneon-full.so.26.0.4 +CHECKPKG_OVERRIDES_CSWneonfull += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libneon-full.so.27.2.3 CHECKPKG_OVERRIDES_CSWneon-devel += surplus-dependency|CSWneon 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 May 17 09:21:10 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 17 May 2010 07:21:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[9895] csw/mgar/pkg/pca/trunk Message-ID: Revision: 9895 http://gar.svn.sourceforge.net/gar/?rev=9895&view=rev Author: dmichelsen Date: 2010-05-17 07:21:10 +0000 (Mon, 17 May 2010) Log Message: ----------- pca: Fix pca.conf location Modified Paths: -------------- csw/mgar/pkg/pca/trunk/checksums csw/mgar/pkg/pca/trunk/files/0002-Add-etc-opt-csw-as-config-location.patch Modified: csw/mgar/pkg/pca/trunk/checksums =================================================================== --- csw/mgar/pkg/pca/trunk/checksums 2010-05-16 15:40:11 UTC (rev 9894) +++ csw/mgar/pkg/pca/trunk/checksums 2010-05-17 07:21:10 UTC (rev 9895) @@ -1,5 +1,5 @@ 4376789925fa9002d0567d739f717748 0001-prefer-opencsw-perl.diff -9313d0d787ca4ff125d220e03431648c 0002-Add-etc-opt-csw-as-config-location.patch +fc014aaacd778fd17c212d4f0f60c8fb 0002-Add-etc-opt-csw-as-config-location.patch 6f2f2376eba0a788795dd43d68ad32d1 COPYING 5af9e18e8f664360a22e7be6607e10d6 pca-20100514-01 12de68ff8f67b4bb8b095e5646402208 pca.conf Modified: csw/mgar/pkg/pca/trunk/files/0002-Add-etc-opt-csw-as-config-location.patch =================================================================== --- csw/mgar/pkg/pca/trunk/files/0002-Add-etc-opt-csw-as-config-location.patch 2010-05-16 15:40:11 UTC (rev 9894) +++ csw/mgar/pkg/pca/trunk/files/0002-Add-etc-opt-csw-as-config-location.patch 2010-05-17 07:21:10 UTC (rev 9895) @@ -21,7 +21,7 @@ push (@conf, dirname($0)."/pca.conf"); push (@conf, dirname($0)."/../etc/pca.conf"); push (@conf, "/etc/pca.conf"); -+ push (@conf, "/etc/opt/csw/pca-proxy.conf"); ++ push (@conf, "/etc/opt/csw/pca.conf"); $ENV{HOME} && push (@conf, $ENV{HOME}."/.pca"); push (@conf, "./pca.conf"); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon May 17 10:20:13 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 17 May 2010 08:20:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[9896] csw/mgar/pkg/gnupg2/trunk/Makefile Message-ID: Revision: 9896 http://gar.svn.sourceforge.net/gar/?rev=9896&view=rev Author: wahwah Date: 2010-05-17 08:20:12 +0000 (Mon, 17 May 2010) Log Message: ----------- gnupg2: Adjusted dependencies, added SKIPTEST ?= 1 for the 2.0.15 version. The next version will have fixed testing framework. Modified Paths: -------------- csw/mgar/pkg/gnupg2/trunk/Makefile Modified: csw/mgar/pkg/gnupg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg2/trunk/Makefile 2010-05-17 07:21:10 UTC (rev 9895) +++ csw/mgar/pkg/gnupg2/trunk/Makefile 2010-05-17 08:20:12 UTC (rev 9896) @@ -27,6 +27,12 @@ # made it into a release at the time of this packaging PATCHFILES = sm-libraries.patch +# There's a problem with the testing framework which makes unit tests fail for +# 2.0.15. Filed upstream as: +# https://bugs.g10code.com/gnupg/issue1214 +SKIPTEST ?= 1 +# Please remove this upon upgrade to 2.0.16. + UFILES_REGEX = (\d+(?:\.\d+)*) NOISALIST = 1 @@ -66,18 +72,22 @@ RUNTIME_DEP_PKGS_common += CSWreadline RUNTIME_DEP_PKGS_common += CSWzlib +# Not because of shared libraries. +RUNTIME_DEP_PKGS_CSWgnupg2 += CSWgnupg-agent +CHECKPKG_OVERRIDES_CSWgnupg2 += surplus-dependency|CSWgnupg-agent RUNTIME_DEP_PKGS_CSWgnupg2 += $(RUNTIME_DEP_PKGS_common) -RUNTIME_DEP_PKGS_CSWgnupg2 += CSWgnupg-agent RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibassuan -RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibidn -RUNTIME_DEP_PKGS_CSWgnupg2 += CSWosslrt -RUNTIME_DEP_PKGS_CSWgnupg-agent = CSWpinentry +# Pinentry is not because of shared libraries. +RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWpinentry +CHECKPKG_OVERRIDES_CSWgnupg-agent += surplus-dependency|CSWpinentry + RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWgcrypt RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWggettextrt RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWgpgerr RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWiconv +RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWlibassuan RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWpth RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWreadline This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon May 17 10:31:24 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 17 May 2010 08:31:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[9897] csw/mgar/gar/v2/lib/python/package_checks.py Message-ID: Revision: 9897 http://gar.svn.sourceforge.net/gar/?rev=9897&view=rev Author: wahwah Date: 2010-05-17 08:31:24 +0000 (Mon, 17 May 2010) Log Message: ----------- mGAR v2: lib/python/package_checks.py, correct a typo: CSWtexinfo Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-05-17 08:20:12 UTC (rev 9896) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-05-17 08:31:24 UTC (rev 9897) @@ -29,7 +29,7 @@ "opt/csw/info", "opt/csw/share/locale/locale.alias"], "CSWiconv": ["opt/csw/lib/charset.alias"], - "CSWtexinfp": ["opt/csw/share/info/dir"], + "CSWtexinfo": ["opt/csw/share/info/dir"], } MAX_DESCRIPTION_LENGTH = 100 LICENSE_TMPL = "/opt/csw/share/doc/%s/license" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon May 17 10:32:07 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 17 May 2010 08:32:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[9898] csw/mgar/gar/v2/lib/python/package_checks_test.py Message-ID: Revision: 9898 http://gar.svn.sourceforge.net/gar/?rev=9898&view=rev Author: wahwah Date: 2010-05-17 08:32:07 +0000 (Mon, 17 May 2010) Log Message: ----------- mGAR v2: checkpkg, a unit test for CheckDisallowedPaths Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-05-17 08:31:24 UTC (rev 9897) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-05-17 08:32:07 UTC (rev 9898) @@ -531,5 +531,24 @@ self.pkg_data["basic_stats"]["pkgname"] = "CSWpy-foo" +class TestCheckDisallowedPaths_1(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = "CheckDisallowedPaths" + def CheckpkgTest(self): + self.pkg_data["pkgmap"].append({ + "class": "none", + "group": "bin", + "line": "doesn't matter here", + "mode": '0755', + "path": "/opt/csw/man", + "type": "f", + "user": "root" + }) + self.error_mgr_mock.GetCommonPaths('sparc').AndReturn([]) + self.error_mgr_mock.ReportError( + 'disallowed-path', 'opt/csw/man', + 'This path is already provided by CSWcommon ' + 'or is not allowed for other reasons.') + + if __name__ == '__main__': unittest.main() 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 May 17 10:34:54 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 17 May 2010 08:34:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[9899] csw/mgar/pkg/tmux/branches/tmux-broken-man-location/ Message-ID: Revision: 9899 http://gar.svn.sourceforge.net/gar/?rev=9899&view=rev Author: dmichelsen Date: 2010-05-17 08:34:54 +0000 (Mon, 17 May 2010) Log Message: ----------- Make branch to reproduce checkpkg issue about not detecting broken /opt/csw/man Added Paths: ----------- csw/mgar/pkg/tmux/branches/tmux-broken-man-location/ 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 May 17 10:36:07 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 17 May 2010 08:36:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[9900] csw/mgar/pkg/tmux/trunk/Makefile Message-ID: Revision: 9900 http://gar.svn.sourceforge.net/gar/?rev=9900&view=rev Author: dmichelsen Date: 2010-05-17 08:36:07 +0000 (Mon, 17 May 2010) Log Message: ----------- tmux: Fix installation Modified Paths: -------------- csw/mgar/pkg/tmux/trunk/Makefile Modified: csw/mgar/pkg/tmux/trunk/Makefile =================================================================== --- csw/mgar/pkg/tmux/trunk/Makefile 2010-05-17 08:34:54 UTC (rev 9899) +++ csw/mgar/pkg/tmux/trunk/Makefile 2010-05-17 08:36:07 UTC (rev 9900) @@ -22,13 +22,17 @@ EXTRA_CPPFLAGS = -D__inline=inline -INSTALL_ARGS = PREFIX=/opt/csw -INSTALL_ARGS += INSTALLDIR="/opt/csw/bin/ginstall -d" -INSTALL_ARGS += INSTALLBIN="/opt/csw/bin/ginstall -m 555" -INSTALL_ARGS += INSTALLMAN="/opt/csw/bin/ginstall -m 444" - +# There is no testsuite SKIPTEST = 1 +INSTALL_SCRIPTS = custom + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) + +install-custom: + ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKSRC)/tmux $(DESTDIR)$(bindir) + ginstall -d $(DESTDIR)$(mandir)/man1 + ginstall $(WORKSRC)/tmux.1 $(DESTDIR)$(mandir)/man1 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 May 17 11:55:52 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 17 May 2010 09:55:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[9901] csw/mgar/pkg/alternatives Message-ID: Revision: 9901 http://gar.svn.sourceforge.net/gar/?rev=9901&view=rev Author: dmichelsen Date: 2010-05-17 09:55:52 +0000 (Mon, 17 May 2010) Log Message: ----------- alternatives: Give branch a name Added Paths: ----------- csw/mgar/pkg/alternatives/alternatives-gar/ Removed Paths: ------------- csw/mgar/pkg/alternatives/branches/ 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 May 17 11:56:52 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 17 May 2010 09:56:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[9902] csw/mgar/pkg/alternatives Message-ID: Revision: 9902 http://gar.svn.sourceforge.net/gar/?rev=9902&view=rev Author: dmichelsen Date: 2010-05-17 09:56:52 +0000 (Mon, 17 May 2010) Log Message: ----------- alternatives: Give branch a name Added Paths: ----------- csw/mgar/pkg/alternatives/branches/ csw/mgar/pkg/alternatives/branches/alternatives-gar/ Removed Paths: ------------- csw/mgar/pkg/alternatives/alternatives-gar/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon May 17 12:29:31 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 17 May 2010 10:29:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[9903] csw/mgar/gar/v2/lib/python Message-ID: Revision: 9903 http://gar.svn.sourceforge.net/gar/?rev=9903&view=rev Author: wahwah Date: 2010-05-17 10:29:31 +0000 (Mon, 17 May 2010) Log Message: ----------- mGAR v2: checkpkg, CheckDisallowedPaths now uses regexes. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-05-17 09:56:52 UTC (rev 9902) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-05-17 10:29:31 UTC (rev 9903) @@ -23,13 +23,13 @@ PATHS_ALLOWED_ONLY_IN = { # Leading slash must be removed. - "CSWcommon": ["opt", - "opt/csw/man", - "opt/csw/doc", - "opt/csw/info", - "opt/csw/share/locale/locale.alias"], - "CSWiconv": ["opt/csw/lib/charset.alias"], - "CSWtexinfo": ["opt/csw/share/info/dir"], + "CSWcommon": [r"opt", + r"opt/csw/man.*", + r"opt/csw/doc", + r"opt/csw/info", + r"opt/csw/share/locale/locale.alias"], + "CSWiconv": [r"opt/csw/lib/charset.alias"], + "CSWtexinfo": [r"opt/csw/share/info/dir"], } MAX_DESCRIPTION_LENGTH = 100 LICENSE_TMPL = "/opt/csw/share/doc/%s/license" @@ -536,15 +536,14 @@ paths_in_pkg.add(entry_path) for pkgname in paths_only_allowed_in: if pkgname != pkg_data["basic_stats"]["pkgname"]: - disallowed_paths = set(paths_only_allowed_in[pkgname]) - intersection = disallowed_paths.intersection(paths_in_pkg) - if intersection: - logger.debug("Bad paths found: %s", intersection) - for bad_path in intersection: - error_mgr.ReportError( - "disallowed-path", bad_path, - "This path is already provided by CSWcommon " - "or is not allowed for other reasons.") + for disallowed_path in paths_only_allowed_in[pkgname]: + disallowed_re = re.compile(r"^%s$" % disallowed_path) + for path_in_pkg in paths_in_pkg: + if disallowed_re.match(path_in_pkg): + error_mgr.ReportError( + "disallowed-path", path_in_pkg, + "This path is already provided by %s " + "or is not allowed for other reasons." % pkgname) def CheckLinkingAgainstSunX11(pkg_data, error_mgr, logger, messenger): Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-05-17 09:56:52 UTC (rev 9902) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-05-17 10:29:31 UTC (rev 9903) @@ -550,5 +550,24 @@ 'or is not allowed for other reasons.') +class TestCheckDisallowedPaths_2(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = "CheckDisallowedPaths" + def CheckpkgTest(self): + self.pkg_data["pkgmap"].append({ + "class": "none", + "group": "bin", + "line": "doesn't matter here", + "mode": '0755', + "path": "/opt/csw/man/man1/foo.1", + "type": "f", + "user": "root" + }) + self.error_mgr_mock.GetCommonPaths('sparc').AndReturn([]) + self.error_mgr_mock.ReportError( + 'disallowed-path', 'opt/csw/man/man1/foo.1', + 'This path is already provided by CSWcommon ' + 'or is not allowed for other reasons.') + + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon May 17 12:49:15 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 17 May 2010 10:49:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[9904] csw/mgar/pkg/gnupg2/trunk/Makefile Message-ID: Revision: 9904 http://gar.svn.sourceforge.net/gar/?rev=9904&view=rev Author: wahwah Date: 2010-05-17 10:49:15 +0000 (Mon, 17 May 2010) Log Message: ----------- gnugp2: CSWpth is not necessary on i386. Modified Paths: -------------- csw/mgar/pkg/gnupg2/trunk/Makefile Modified: csw/mgar/pkg/gnupg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg2/trunk/Makefile 2010-05-17 10:29:31 UTC (rev 9903) +++ csw/mgar/pkg/gnupg2/trunk/Makefile 2010-05-17 10:49:15 UTC (rev 9904) @@ -68,10 +68,12 @@ RUNTIME_DEP_PKGS_common += CSWiconv RUNTIME_DEP_PKGS_common += CSWlibksba RUNTIME_DEP_PKGS_common += CSWoldaprt -RUNTIME_DEP_PKGS_common += CSWpth RUNTIME_DEP_PKGS_common += CSWreadline RUNTIME_DEP_PKGS_common += CSWzlib +RUNTIME_DEP_PKGS_common_isa-sparcv9 += CSWpth +RUNTIME_DEP_PKGS_common += $(RUNTIME_DEP_PKGS_common_$(MODULATION)) + # Not because of shared libraries. RUNTIME_DEP_PKGS_CSWgnupg2 += CSWgnupg-agent CHECKPKG_OVERRIDES_CSWgnupg2 += surplus-dependency|CSWgnupg-agent @@ -83,12 +85,15 @@ RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWpinentry CHECKPKG_OVERRIDES_CSWgnupg-agent += surplus-dependency|CSWpinentry +RUNTIME_DEP_PKGS_CSWgnupg-agent_isa-sparcv9 += CSWpth + +RUNTIME_DEP_PKGS_CSWgnupg-agent += $(RUNTIME_DEP_PKGS_CSWgnupg-agent_$(MODULATION)) + RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWgcrypt RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWggettextrt RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWgpgerr RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWiconv RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWlibassuan -RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWpth RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWreadline This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon May 17 13:26:05 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 17 May 2010 11:26:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[9905] csw/mgar/gar/v2/lib/python/package_checks_test.py Message-ID: Revision: 9905 http://gar.svn.sourceforge.net/gar/?rev=9905&view=rev Author: wahwah Date: 2010-05-17 11:26:05 +0000 (Mon, 17 May 2010) Log Message: ----------- mGAR v2: checkpkg, updated unit test for CheckRpath. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-05-17 10:49:15 UTC (rev 9904) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-05-17 11:26:05 UTC (rev 9905) @@ -327,93 +327,98 @@ binaries_dump_info = self.pkg_data["binaries_dump_info"] binaries_dump_info[0]["runpath"] = testdata.rpaths.all_rpaths self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] - self.error_mgr_mock.ReportError('bad-rpath-entry', '$ORIGIN/..') - self.error_mgr_mock.ReportError('bad-rpath-entry', '$ORIGIN/../../../usr/lib/v9') - self.error_mgr_mock.ReportError('bad-rpath-entry', '$ORIGIN/../../usr/lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '$ORIGIN/../lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '$ORIGIN/../ure-link/lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '../../../../../dist/bin') - self.error_mgr_mock.ReportError('bad-rpath-entry', '../../../../dist/bin') - self.error_mgr_mock.ReportError('bad-rpath-entry', '../../../dist/bin') - self.error_mgr_mock.ReportError('bad-rpath-entry', '../../dist/bin') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/bin') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/export/home/buysse/build/expect-5.42.1/cswstage/opt/csw/lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/export/home/phil/build/gettext-0.14.1/gettext-tools/intl/.libs') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/export/medusa/kenmays/build/qt-x11-free-3.3.3/lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/export/medusa/kenmays/build/s_qt/qt-x11-free-3.3.3/lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/export/medusa/kenmays/build/sparc_qt/qt-x11-free-3.3.4/lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/export/medusa/kenmays/build/sparc_qt/qt-x11-free-3.3.4/plugins/designer') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/export/medusa/kenmays/build/sparc_qt/qt-x11-free-3.3.4/plugins/sqldrivers') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/home/harpchad/local/sparc/lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/lib/sparcv9') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/SUNWcluster/lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/SUNWmlib/lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/SUNWspro/lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/SUNWspro/lib/rw7') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/SUNWspro/lib/stlport4') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/SUNWspro/lib/v8') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/SUNWspro/lib/v8plus') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/SUNWspro/lib/v8plusa') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/SUNWspro/lib/v8plusb') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/SUNWspro/lib/v9') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/build/michael/synce-0.8.9-buildroot/opt/csw/lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw/$ISALIST') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw//lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw/X11/lib/') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw/bdb4/lib/') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw/lib/') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw/lib/$') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw/lib/$$ISALIST') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw/lib/-R/opt/csw/lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw/lib/\\$ISALIST') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw/lib/\\SALIST') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw/lib/sparcv8plus+vis') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw/mysql4//lib/mysql') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw/nagios/lib/\\$ISALIST') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw/openoffice.org/basis3.1/program') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw/openoffice.org/ure/lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/cw/gcc3/lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/forte8/SUNWspro/lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/forte8/SUNWspro/lib/rw7') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/forte8/SUNWspro/lib/rw7/v9') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/forte8/SUNWspro/lib/v8') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/forte8/SUNWspro/lib/v9') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/schily/lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/sfw/lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS10/SUNWspro/lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS10/SUNWspro/lib/rw7') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS10/SUNWspro/lib/v8') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS10/SUNWspro/lib/v8plus') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS11/SUNWspro/lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS11/SUNWspro/lib/rw7') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS11/SUNWspro/lib/stlport4') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS11/SUNWspro/lib/stlport4/v9') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS11/SUNWspro/lib/v8') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS11/SUNWspro/lib/v8plus') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS11/SUNWspro/lib/v9') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS8/SUNWspro/lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS8/SUNWspro/lib/rw7') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS8/SUNWspro/lib/rw7/v9') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS8/SUNWspro/lib/v8') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS8/SUNWspro/lib/v8plusa') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS8/SUNWspro/lib/v9') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio10/SUNWspro/lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio10/SUNWspro/lib/rw7') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio10/SUNWspro/lib/rw7/v9') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio10/SUNWspro/lib/stlport4') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio10/SUNWspro/lib/stlport4/v9') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio10/SUNWspro/lib/v8') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio10/SUNWspro/lib/v9') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/oracle/product/9.2.0/lib32') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/usr/X/lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/usr/local/lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/usr/local/openldap-2.3/lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/usr/sfw/lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/usr/ucblib') - self.error_mgr_mock.ReportError('bad-rpath-entry', '/usr/xpg4/lib') - self.error_mgr_mock.ReportError('bad-rpath-entry', 'RIGIN/../lib') + BAD_PATHS = [ + '$ORIGIN/..', + '$ORIGIN/../../../usr/lib/v9', + '$ORIGIN/../../usr/lib', + '$ORIGIN/../lib', + '$ORIGIN/../ure-link/lib', + '../../../../../dist/bin', + '../../../../dist/bin', + '../../../dist/bin', + '../../dist/bin', + '/bin', + '/export/home/buysse/build/expect-5.42.1/cswstage/opt/csw/lib', + '/export/home/phil/build/gettext-0.14.1/gettext-tools/intl/.libs', + '/export/medusa/kenmays/build/qt-x11-free-3.3.3/lib', + '/export/medusa/kenmays/build/s_qt/qt-x11-free-3.3.3/lib', + '/export/medusa/kenmays/build/sparc_qt/qt-x11-free-3.3.4/lib', + '/export/medusa/kenmays/build/sparc_qt/qt-x11-free-3.3.4/plugins/designer', + '/export/medusa/kenmays/build/sparc_qt/qt-x11-free-3.3.4/plugins/sqldrivers', + '/home/harpchad/local/sparc/lib', + '/lib', + '/lib/sparcv9', + '/opt/SUNWcluster/lib', + '/opt/SUNWmlib/lib', + '/opt/SUNWspro/lib', + '/opt/SUNWspro/lib/rw7', + '/opt/SUNWspro/lib/stlport4', + '/opt/SUNWspro/lib/v8', + '/opt/SUNWspro/lib/v8plus', + '/opt/SUNWspro/lib/v8plusa', + '/opt/SUNWspro/lib/v8plusb', + '/opt/SUNWspro/lib/v9', + '/opt/build/michael/synce-0.8.9-buildroot/opt/csw/lib', + '/opt/csw/$ISALIST', + '/opt/csw//lib', + '/opt/csw/X11/lib/', + '/opt/csw/bdb4/lib/', + '/opt/csw/lib/', + '/opt/csw/lib/$', + '/opt/csw/lib/$$ISALIST', + '/opt/csw/lib/-R/opt/csw/lib', + '/opt/csw/lib/\\$ISALIST', + '/opt/csw/lib/\\SALIST', + '/opt/csw/lib/sparcv8plus+vis', + '/opt/csw/mysql4//lib/mysql', + '/opt/csw/nagios/lib/\\$ISALIST', + '/opt/csw/openoffice.org/basis3.1/program', + '/opt/csw/openoffice.org/ure/lib', + '/opt/cw/gcc3/lib', + '/opt/forte8/SUNWspro/lib', + '/opt/forte8/SUNWspro/lib/rw7', + '/opt/forte8/SUNWspro/lib/rw7/v9', + '/opt/forte8/SUNWspro/lib/v8', + '/opt/forte8/SUNWspro/lib/v9', + '/opt/schily/lib', + '/opt/sfw/lib', + '/opt/studio/SOS10/SUNWspro/lib', + '/opt/studio/SOS10/SUNWspro/lib/rw7', + '/opt/studio/SOS10/SUNWspro/lib/v8', + '/opt/studio/SOS10/SUNWspro/lib/v8plus', + '/opt/studio/SOS11/SUNWspro/lib', + '/opt/studio/SOS11/SUNWspro/lib/rw7', + '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', + '/opt/studio/SOS11/SUNWspro/lib/stlport4', + '/opt/studio/SOS11/SUNWspro/lib/stlport4/v9', + '/opt/studio/SOS11/SUNWspro/lib/v8', + '/opt/studio/SOS11/SUNWspro/lib/v8plus', + '/opt/studio/SOS11/SUNWspro/lib/v9', + '/opt/studio/SOS8/SUNWspro/lib', + '/opt/studio/SOS8/SUNWspro/lib/rw7', + '/opt/studio/SOS8/SUNWspro/lib/rw7/v9', + '/opt/studio/SOS8/SUNWspro/lib/v8', + '/opt/studio/SOS8/SUNWspro/lib/v8plusa', + '/opt/studio/SOS8/SUNWspro/lib/v9', + '/opt/studio10/SUNWspro/lib', + '/opt/studio10/SUNWspro/lib/rw7', + '/opt/studio10/SUNWspro/lib/rw7/v9', + '/opt/studio10/SUNWspro/lib/stlport4', + '/opt/studio10/SUNWspro/lib/stlport4/v9', + '/opt/studio10/SUNWspro/lib/v8', + '/opt/studio10/SUNWspro/lib/v9', + '/oracle/product/9.2.0/lib32', + '/usr/X/lib', + '/usr/local/lib', + '/usr/local/openldap-2.3/lib', + '/usr/sfw/lib', + '/usr/ucblib', + '/usr/xpg4/lib', + 'RIGIN/../lib', + ] + # Calculating the parameters on the fly, it allows to write it a terse manner. + for bad_path in BAD_PATHS: + self.error_mgr_mock.ReportError('bad-rpath-entry', '%s opt/csw/bin/sparcv9/rsync' % bad_path) class TestCheckRpathBadPath(CheckpkgUnitTestHelper, unittest.TestCase): 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 May 17 14:35:57 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 17 May 2010 12:35:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[9906] csw/mgar/pkg/phpldapadmin/trunk/Makefile Message-ID: Revision: 9906 http://gar.svn.sourceforge.net/gar/?rev=9906&view=rev Author: dmichelsen Date: 2010-05-17 12:35:56 +0000 (Mon, 17 May 2010) Log Message: ----------- phpldapadmin: Remove double .CSW on config file to fix #4419 Modified Paths: -------------- csw/mgar/pkg/phpldapadmin/trunk/Makefile Modified: csw/mgar/pkg/phpldapadmin/trunk/Makefile =================================================================== --- csw/mgar/pkg/phpldapadmin/trunk/Makefile 2010-05-17 11:26:05 UTC (rev 9905) +++ csw/mgar/pkg/phpldapadmin/trunk/Makefile 2010-05-17 12:35:56 UTC (rev 9906) @@ -28,7 +28,7 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom -PRESERVECONF = $(sharedstatedir)/www/phpldapadmin/config/config.php.CSW +PRESERVECONF = $(sharedstatedir)/www/phpldapadmin/config/config.php LICENSE = LICENSE ARCHALL = 1 @@ -41,8 +41,9 @@ @ginstall -d $(DESTDIR)$(sharedstatedir)/www @cp -R $(WORKSRC) $(DESTDIR)$(sharedstatedir)/www/phpldapadmin @(cd $(DESTDIR)$(sharedstatedir)/www/phpldapadmin/config; \ - mv config.php.example config.php.CSW) + mv config.php.example config.php) @find $(DESTDIR)$(sharedstatedir) -name .cvsignore -exec rm \{\} \; + @find $(DESTDIR)$(sharedstatedir) -name .gitignore -exec rm \{\} \; @rm -rf $(DESTDIR)$(prefix)/apache2/share/htdocs/phpldapadmin @ginstall -d $(DESTDIR)$(prefix)/apache2/share/htdocs @ln -s $(sharedstatedir)/www/phpldapadmin/htdocs $(DESTDIR)$(prefix)/apache2/share/htdocs/phpldapadmin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Mon May 17 18:07:21 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Mon, 17 May 2010 16:07:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[9907] csw/mgar/pkg/alternatives/trunk/Makefile Message-ID: Revision: 9907 http://gar.svn.sourceforge.net/gar/?rev=9907&view=rev Author: theferret Date: 2010-05-17 16:07:20 +0000 (Mon, 17 May 2010) Log Message: ----------- added subversion status line Modified Paths: -------------- csw/mgar/pkg/alternatives/trunk/Makefile Modified: csw/mgar/pkg/alternatives/trunk/Makefile =================================================================== --- csw/mgar/pkg/alternatives/trunk/Makefile 2010-05-17 12:35:56 UTC (rev 9906) +++ csw/mgar/pkg/alternatives/trunk/Makefile 2010-05-17 16:07:20 UTC (rev 9907) @@ -1,4 +1,6 @@ package: alternatives + @echo Note: subversion status is: + svn status createpkg -b `pwd` touch package This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Mon May 17 18:07:49 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Mon, 17 May 2010 16:07:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[9908] csw/mgar/pkg/alternatives/trunk Message-ID: Revision: 9908 http://gar.svn.sourceforge.net/gar/?rev=9908&view=rev Author: theferret Date: 2010-05-17 16:07:48 +0000 (Mon, 17 May 2010) Log Message: ----------- alternatives: version bump Modified Paths: -------------- csw/mgar/pkg/alternatives/trunk/alternatives csw/mgar/pkg/alternatives/trunk/pkginfo Modified: csw/mgar/pkg/alternatives/trunk/alternatives =================================================================== --- csw/mgar/pkg/alternatives/trunk/alternatives 2010-05-17 16:07:20 UTC (rev 9907) +++ csw/mgar/pkg/alternatives/trunk/alternatives 2010-05-17 16:07:48 UTC (rev 9908) @@ -2,13 +2,16 @@ # ksh high-level implentation of linux style "alternatives". # Author: Philip Brown, phil at bolthole.com, 2010 -# @(#) alternatives 1.6@(#) +# @(#) alternatives 1.8@(#) PRIORITIESDIR=/opt/csw/share/alternatives MANUALDIR=/etc/opt/etc/alternatives #manual override location AWK=nawk DEBUG=${DEBUG:-/bin/true} +#echo DEBUG VERSION of $0: dont ship this +#DEBUG=echo + function usage { prog=`basename $0` print "Usage for $prog :" @@ -19,11 +22,11 @@ print " " print " The following are provided for compatibility, but do not work" print " in exactly the same way as linux variants" - print " See usage function code for more information." + print " See comments in usage function code for more information." print " $prog --install {/full/path/name} {name} {#priority}" print " $prog --remove {name} {/full/path}" -# I dont want to bloat up the usage message, so here's a little more doc +# I dont want to bloat up the usage message, so here's some more docs # # This program is a lightweight 'workalike' to the linux alternatives prog. # It is written with OpenCSW in mind, and is specificaly tailored for @@ -32,20 +35,22 @@ # Part of its flexibility comes from the fact that it is configuration-file # driven, NOT internal-database-driven # The --install and --remove flags, while (hopefully) provided as -# a convenience, do NOT install, or remove, anything. +# a convenience, do NOT install, or remove, any configuration. They just +# update symlinks, "as appropriate" +# # Priorities are driven by configuration files delivered by our packages. -# They get delivered to /opt/csw, which keeps things NFS friendly. -# Things only get "installed" or "removed" on a per-SVR4 package basis -# normally. (although technically, it would be possible to drop in your +# They get delivered to /opt/csw/share/alternatives, which keeps things +# NFS friendly. +# Thes files should only get "installed" or "removed" on a per-SVR4 package +# basis normally. (although technically, it would be possible to drop in your # own config file in either $PRIORITIESDIR or $MANUALDIR, and then # have things integrate with your own custom non-packaged software). # -# There is NO ERROR CHECKING, or saving state of prior actions, +# There is almost NO ERROR CHECKING. There is no saving state of prior actions, # other than the --set comand. -# It is up to individual implementers to make sure that everyone providing -# an alternative for {name}, all have the same "slaves" -# (when I actualy support "slave" links, anyway) - +# It is up to individual packages to make sure that everyone providing +# an alternative for {name}, all have the same "slave entries", +# if you choose to use slave entries } @@ -101,8 +106,21 @@ function fileerr_exit { print Debug: potentially should check to see if /opt/csw is - print specifically read-only, or we're in jumpstart, or something + print specifically read-only, or we are in jumpstart, or something print before returning a bad status exit, perhaps + + case `/bin/id` in + 'uid=0('*) + : + ;; + *) + echo "Hey! Try running this as root whydoncha?" + exit 1 + ;; + esac + + print If someone other than Phil is seeing this, please let him know + exit 1 } @@ -118,7 +136,7 @@ if [[ -h $1 ]] ; then linktarget=`ls -l $1 | nawk '{print $NF}'` - if [[ "$linktarget" == "$3 ]] ; then + if [[ "$linktarget" == "$3" ]] ; then $DEBUG $1 already linked to $3 return 0 fi @@ -127,7 +145,7 @@ /bin/rm -f $1 if [[ $? -ne 0 ]] ; then $DEBUG permission to remove $1 failed - filerr_exit + fileerr_exit fi fi if [[ ! -f $1 ]] ; then @@ -135,7 +153,7 @@ ln -s $3 $1 if [[ $? -ne 0 ]] ; then $DEBUG permission to create symlink for $1 failed - filerr_exit + fileerr_exit fi return 0 else @@ -153,48 +171,101 @@ ## one already exists in the target space. ## only a symlink } -# set_alternative: mostly internal function. + + +#Used for --remove. +# removes the old symlinks. +# pass in the "normal" cache file format. +# Should be called ONLY IF THERE ARE NO MORE "alternatives" installed +# or if, perhaps, the "current" alternative is the one being removed. +function rm_alternative_links { + $DEBUG rm_alternative_links called with $@ + # first one is special + if [[ -h $1 ]] ; then + rm -f $1 + fi + shift 4 + while [[ $# -ge 3 ]] ; do + rm -f $1 + shift 3 + done + +} + +# set_alternatives: mostly internal function. # Usage: set_alternative {shortname} [ignore-path] +# # Goes and checks both standard configs, and manual config, for best fit. +# Mandatory first argument, is the "shortname" of the alternative. +# Optional second argument implies "remove" mode, and needs to be +# a full path to one of the main implementations of an alternative. +# The line containing that, will then be ignored. # -# 2nd arg is used for being called through --remove/--ignore # function set_alternative { - typeset line - if [[ $# -lt 1 ]] ; then print ERROR set_alternative needs an arg; exit 1;fi + typeset shortname remove_match line + $DEBUG set_alternative called with $* + if [[ $# -lt 1 ]] ; then + print ERROR set_alternative needs an arg; exit 1; + fi - line=`print_manual_set $1` - ## Design choice: deliberately leave in manual choice, - ## even if --remove of that alternative is used. - ## That way makes it easier to implement pkgrm for us. - if [[ "$2" != "" ]] ; then - echo $line | grep " $2 " >/dev/null - if [[ $? -eq 0 ]] ; then + shortname="$1" + remove_match="$2" + + + + line=`print_manual_set $shortname` + if [[ "$line" != "" ]] ; then + set $line + if [[ "$3" = "$remove_match" ]] ; then $DEBUG Note: manual choice is currently $line + rm_alternative_links $line + line="" fi + if [[ ! -f "$3" ]] ; then + print $0 Note: manual choice set, but is invalid. + print Ignoring $3 + line="" + fi fi - if [[ "$line" = "" ]] ; then - if [[ "$2" != "" ]] ; then - line=`print_alternatives $1| - nawk ' $3 != "'$2'" {print}' |head -1` + if [[ "$remove_match" != "" ]] ; then + line=`print_alternatives $shortname| + nawk ' $3 != "'$remove_match'" {print}' | + head -1` + if [[ "$line" = "" ]] ; then + line=`print_alternatives $shortname` + set $line + if [[ $3 = "$remove_match" ]] ; then + print Removing last alternative for $shortname + rm_alternative_links $line + return 0 + fi + fi else - line=`print_alternatives $1|head -1` + line=`print_alternatives $shortname|head -1` fi fi - if [[ "$line" = "" ]] ; then - print "No alternatives found for $1" - return 0; + + + if [[ "$line" != "" ]] ; then + set $line + set_link $1 $2 $3 + shift 4 + while [[ "$1" != "" ]] ; do + set_link $1 $2 $3 + shift 3 + done + return 0 fi - set $line - set_link $1 $2 $3 - shift 4 - while [[ "$1" != "" ]] ; do - set_link $1 $2 $3 - shift 3 - done + + # If we are here, then our "database" is internally + # inconsistent...? + print $0: Error 52: should not be in this code section. + print "Inconsistency with files in $PRIORITIESDIR ?" + } @@ -269,8 +340,11 @@ ## if [[ "$1" == "--remove" ]] ; then - $DEBUG Note: --remove is really only a temporary --ignore - $DEBUG You must rm or pkgrm the appropriate file in $PRIORITIESDIR to remove + $DEBUG $0 $* + $DEBUG Note: --remove is really only temporary + $DEBUG It works like --ignore + $DEBUG You must pkgrm or rm the appropriate file in $PRIORITIESDIR + $DEBUG to remove a "registration" for an alternative fi @@ -278,8 +352,7 @@ case $1 in --install) shift - print "(Note: ignoring arguments for --install except for '$2')" - $DEBUG "(Using files in $PRIORITIESDIR)" + $DEBUG "($0 Using files in $PRIORITIESDIR)" set_alternative $2 ;; --remove|--ignore) #args = shortname /local/path Modified: csw/mgar/pkg/alternatives/trunk/pkginfo =================================================================== --- csw/mgar/pkg/alternatives/trunk/pkginfo 2010-05-17 16:07:20 UTC (rev 9907) +++ csw/mgar/pkg/alternatives/trunk/pkginfo 2010-05-17 16:07:48 UTC (rev 9908) @@ -1,6 +1,6 @@ PKG=CSWalternatives NAME=alternatives - an implementation of linux-style alternatives choice mgr -VERSION=1.0,REV=2009.10.04 +VERSION=1.0,REV=2009.10.j17 CATEGORY=system VENDOR=http://www.opencsw.org written and packaged for CSW by Philip Brown EMAIL=phil at opencsw.org This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Mon May 17 18:08:31 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Mon, 17 May 2010 16:08:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[9909] csw/mgar/pkg/alternatives/trunk/pkginfo Message-ID: Revision: 9909 http://gar.svn.sourceforge.net/gar/?rev=9909&view=rev Author: theferret Date: 2010-05-17 16:08:31 +0000 (Mon, 17 May 2010) Log Message: ----------- typo Modified Paths: -------------- csw/mgar/pkg/alternatives/trunk/pkginfo Modified: csw/mgar/pkg/alternatives/trunk/pkginfo =================================================================== --- csw/mgar/pkg/alternatives/trunk/pkginfo 2010-05-17 16:07:48 UTC (rev 9908) +++ csw/mgar/pkg/alternatives/trunk/pkginfo 2010-05-17 16:08:31 UTC (rev 9909) @@ -1,6 +1,6 @@ PKG=CSWalternatives NAME=alternatives - an implementation of linux-style alternatives choice mgr -VERSION=1.0,REV=2009.10.j17 +VERSION=1.0,REV=2009.10.17 CATEGORY=system VENDOR=http://www.opencsw.org written and packaged for CSW by Philip Brown EMAIL=phil at opencsw.org This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Mon May 17 18:10:44 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Mon, 17 May 2010 16:10:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[9910] csw/mgar/pkg/alternatives/trunk/pkginfo Message-ID: Revision: 9910 http://gar.svn.sourceforge.net/gar/?rev=9910&view=rev Author: theferret Date: 2010-05-17 16:10:44 +0000 (Mon, 17 May 2010) Log Message: ----------- alternatives: made ARCH=all Modified Paths: -------------- csw/mgar/pkg/alternatives/trunk/pkginfo Modified: csw/mgar/pkg/alternatives/trunk/pkginfo =================================================================== --- csw/mgar/pkg/alternatives/trunk/pkginfo 2010-05-17 16:08:31 UTC (rev 9909) +++ csw/mgar/pkg/alternatives/trunk/pkginfo 2010-05-17 16:10:44 UTC (rev 9910) @@ -1,4 +1,5 @@ PKG=CSWalternatives +ARCH=all NAME=alternatives - an implementation of linux-style alternatives choice mgr VERSION=1.0,REV=2009.10.17 CATEGORY=system 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 May 17 22:19:43 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 17 May 2010 20:19:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9911] csw/mgar/pkg/libserf/trunk Message-ID: Revision: 9911 http://gar.svn.sourceforge.net/gar/?rev=9911&view=rev Author: dmichelsen Date: 2010-05-17 20:19:43 +0000 (Mon, 17 May 2010) Log Message: ----------- libserf: Add patches Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile csw/mgar/pkg/libserf/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libserf/trunk/files/0001-Do-not-cast-lvalue-as-left-side-is-already-of-type-c.patch Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2010-05-17 16:10:44 UTC (rev 9910) +++ csw/mgar/pkg/libserf/trunk/Makefile 2010-05-17 20:19:43 UTC (rev 9911) @@ -14,21 +14,29 @@ MASTER_SITES = http://serf.googlecode.com/files/ DISTFILES = $(DISTNAME).tar.bz2 +PATCHFILES = 0001-Do-not-cast-lvalue-as-left-side-is-already-of-type-c.patch RUNTIME_DEP_PKGS_CSWlibserf = CSWapache2rt CSWexpat CSWiconv CSWoldaprt CSWosslrt CSWzlib # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(DISTNAME)-(\d+(?:\.\d+)*).tar.bz2 +LICENSE = LICENSE + +# Make sure the current directory comes before everything else +INCLUDE_FLAGS = -I. -I$(includedir) + +# We don't need it and if defined the test breaks +LD_OPTIONS = +EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) + CONFIGURE_ARGS = $(DIRPATHS) +# CONFIGURE_ARGS += --with-openssl=$(prefix) CONFIGURE_ARGS += --with-apr=$(prefix)/apache2/bin/apr-config CONFIGURE_ARGS += --with-apr-util=$(prefix)/apache2/bin/apu-config TEST_TARGET = check -CHECKPKG_OVERRIDES_CSWlibserf += license-missing - - include gar/category.mk #EXTRA_LDFLAGS = -R/opt/csw/bdb44/lib Modified: csw/mgar/pkg/libserf/trunk/checksums =================================================================== --- csw/mgar/pkg/libserf/trunk/checksums 2010-05-17 16:10:44 UTC (rev 9910) +++ csw/mgar/pkg/libserf/trunk/checksums 2010-05-17 20:19:43 UTC (rev 9911) @@ -1 +1,2 @@ +85656f49ab1a0a811b620f4b177d8c5a 0001-Do-not-cast-lvalue-as-left-side-is-already-of-type-c.patch 14267fa2b49aa3484366e713970384a5 serf-0.6.1.tar.bz2 Added: csw/mgar/pkg/libserf/trunk/files/0001-Do-not-cast-lvalue-as-left-side-is-already-of-type-c.patch =================================================================== --- csw/mgar/pkg/libserf/trunk/files/0001-Do-not-cast-lvalue-as-left-side-is-already-of-type-c.patch (rev 0) +++ csw/mgar/pkg/libserf/trunk/files/0001-Do-not-cast-lvalue-as-left-side-is-already-of-type-c.patch 2010-05-17 20:19:43 UTC (rev 9911) @@ -0,0 +1,25 @@ +From 6c411f42f71cab30ee81d30b142596ad331cdeb8 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 17 May 2010 22:15:13 +0200 +Subject: [PATCH] Do not cast lvalue as left side is already of type char* + +--- + outgoing.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/outgoing.c b/outgoing.c +index 11d58aa..b4b3a50 100644 +--- a/outgoing.c ++++ b/outgoing.c +@@ -470,7 +470,7 @@ static apr_status_t socket_writev(serf_connection_t *conn) + sizeof(struct iovec) * (conn->vec_len - i)); + conn->vec_len -= i; + } +- ((char *) conn->vec[0].iov_base) += conn->vec[0].iov_len - (len - written); ++ conn->vec[0].iov_base += conn->vec[0].iov_len - (len - written); + conn->vec[0].iov_len = len - written; + break; + } +-- +1.7.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Mon May 17 22:32:10 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Mon, 17 May 2010 20:32:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[9912] csw/mgar/pkg/sunx11_devel/trunk Message-ID: Revision: 9912 http://gar.svn.sourceforge.net/gar/?rev=9912&view=rev Author: theferret Date: 2010-05-17 20:32:10 +0000 (Mon, 17 May 2010) Log Message: ----------- sunx11_devel: added xproto.pc Modified Paths: -------------- csw/mgar/pkg/sunx11_devel/trunk/prototype Added Paths: ----------- csw/mgar/pkg/sunx11_devel/trunk/xproto.pc Modified: csw/mgar/pkg/sunx11_devel/trunk/prototype =================================================================== --- csw/mgar/pkg/sunx11_devel/trunk/prototype 2010-05-17 20:19:43 UTC (rev 9911) +++ csw/mgar/pkg/sunx11_devel/trunk/prototype 2010-05-17 20:32:10 UTC (rev 9912) @@ -9,3 +9,4 @@ f none /opt/csw/include/X11/extensions/renderproto.h=renderproto.h 0644 root bin f none /opt/csw/lib/pkgconfig/x11.pc=x11.pc 0644 root bin f none /opt/csw/lib/pkgconfig/renderproto.pc=renderproto.pc 0644 root bin +f none /opt/csw/lib/pkgconfig/xproto.pc=xproto.pc 0644 root bin Added: csw/mgar/pkg/sunx11_devel/trunk/xproto.pc =================================================================== --- csw/mgar/pkg/sunx11_devel/trunk/xproto.pc (rev 0) +++ csw/mgar/pkg/sunx11_devel/trunk/xproto.pc 2010-05-17 20:32:10 UTC (rev 9912) @@ -0,0 +1,10 @@ +prefix=/opt/csw +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include +includex11dir=${prefix}/include/X11 + +Name: Xproto +Description: Xproto header config, hacked for Sun X11 headers +Version: 6.6 +Cflags: -I${includedir} 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 May 17 22:57:15 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 17 May 2010 20:57:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[9913] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: Revision: 9913 http://gar.svn.sourceforge.net/gar/?rev=9913&view=rev Author: rthurner Date: 2010-05-17 20:57:14 +0000 (Mon, 17 May 2010) Log Message: ----------- serf - do not yet depend on apr Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2010-05-17 20:32:10 UTC (rev 9912) +++ csw/mgar/pkg/libserf/trunk/Makefile 2010-05-17 20:57:14 UTC (rev 9913) @@ -37,6 +37,10 @@ TEST_TARGET = check +# as long as apache does not depend on apr, serf as well +# does not depend on it +CHECKPKG_OVERRIDES_CSWlibserf += missing-dependency|CSWapr + include gar/category.mk #EXTRA_LDFLAGS = -R/opt/csw/bdb44/lib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue May 18 15:01:40 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 18 May 2010 13:01:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[9914] csw/mgar/pkg/x11/lib/xrender/trunk Message-ID: Revision: 9914 http://gar.svn.sourceforge.net/gar/?rev=9914&view=rev Author: bdwalton Date: 2010-05-18 13:01:40 +0000 (Tue, 18 May 2010) Log Message: ----------- xrender: drop legacy libs Modified Paths: -------------- csw/mgar/pkg/x11/lib/xrender/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/x11/lib/xrender/trunk/files/libXrender.so.1.2.2-i386 csw/mgar/pkg/x11/lib/xrender/trunk/files/libXrender.so.1.2.2-sparc Modified: csw/mgar/pkg/x11/lib/xrender/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2010-05-17 20:57:14 UTC (rev 9913) +++ csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2010-05-18 13:01:40 UTC (rev 9914) @@ -17,15 +17,6 @@ EXTRA_MODULATORS = X11 MODULATIONS_X11 = sunwx11 cswx11 -# Legacy libraries -# The idea is to have the legacy libs in /opt/csw/lib to guarantee the existing -# apps will continue to work. The new lib in /opt/csw/X11/lib relies on the -# OpenCSW-specific X11 libs, whereas the existing one in /opt/csw/lib links -# against the Sun X11. -LEGACYLIB = libXrender.so.1.2.2 -DISTFILES += $(LEGACYLIB)-i386 -DISTFILES += $(LEGACYLIB)-sparc - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = libXrender-(\d+(?:\.\d+)*).tar.gz @@ -68,10 +59,3 @@ # category... prefix_cswx11 = $(BUILD_PREFIX)/X11 prefix = $(or $(prefix_$(X11)),$(BUILD_PREFIX)) - -post-merge: - ginstall -d $(PKGROOT)$(BUILD_PREFIX)/lib - cp $(DOWNLOADDIR)/$(LEGACYLIB)-$(GARCH) $(PKGROOT)$(BUILD_PREFIX)/lib/$(LEGACYLIB) - gln -s $(LEGACYLIB) $(PKGROOT)$(BUILD_PREFIX)/lib/libXrender.so.1 - gln -s $(LEGACYLIB) $(PKGROOT)$(BUILD_PREFIX)/lib/libXrender.so - @$(MAKECOOKIE) Deleted: csw/mgar/pkg/x11/lib/xrender/trunk/files/libXrender.so.1.2.2-i386 =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/x11/lib/xrender/trunk/files/libXrender.so.1.2.2-sparc =================================================================== (Binary files differ) 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 May 18 17:44:10 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 18 May 2010 15:44:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[9915] csw/mgar/gar/v2/categories/x11/category.mk Message-ID: Revision: 9915 http://gar.svn.sourceforge.net/gar/?rev=9915&view=rev Author: dmichelsen Date: 2010-05-18 15:44:10 +0000 (Tue, 18 May 2010) Log Message: ----------- mGAR v2: Allow overwriting of prefix even for 'x11' class Modified Paths: -------------- csw/mgar/gar/v2/categories/x11/category.mk Modified: csw/mgar/gar/v2/categories/x11/category.mk =================================================================== --- csw/mgar/gar/v2/categories/x11/category.mk 2010-05-18 13:01:40 UTC (rev 9914) +++ csw/mgar/gar/v2/categories/x11/category.mk 2010-05-18 15:44:10 UTC (rev 9915) @@ -21,7 +21,7 @@ GREP = ggrep _CATEGORY_COMMON_EXPORTS = GREP -prefix = $(BUILD_PREFIX)/X11 +prefix ?= $(BUILD_PREFIX)/X11 # No tests scripts, thus there is no "gmake test" target TEST_SCRIPTS = 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 May 18 17:45:14 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 18 May 2010 15:45:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[9916] csw/mgar/pkg/x11/lib/xrender/trunk/Makefile Message-ID: Revision: 9916 http://gar.svn.sourceforge.net/gar/?rev=9916&view=rev Author: dmichelsen Date: 2010-05-18 15:45:14 +0000 (Tue, 18 May 2010) Log Message: ----------- x11/lib/xrender: Fixes for cswx11/sunwx11 Modified Paths: -------------- csw/mgar/pkg/x11/lib/xrender/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/xrender/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2010-05-18 15:44:10 UTC (rev 9915) +++ csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2010-05-18 15:45:14 UTC (rev 9916) @@ -37,8 +37,15 @@ SPKG_DESC_CSWcxlibxrender = $(DESCRIPTION) (bound against OpenCSW X11) SPKG_DESC_CSWcxlibxrenderdevel = $(DESCRIPTION) Development Package (bound against OpenCSW X11) -PKGFILES_CSWlibxrenderdevel = $(PKGFILES_DEVEL) +prefix_cswx11 = $(BUILD_PREFIX)/X11 +prefix = $(or $(prefix_$(X11)),$(BUILD_PREFIX)) +STRIP_LIBTOOL = 1 + +BUILD64 = 1 +NOISALIST = 1 +CONFIGURE_ARGS = $(DIRPATHS) + MERGE_SCRIPTS_isa-default-x11-sunwx11 = copy-all MERGE_SCRIPTS_isa-default64-x11-sunwx11 = copy-relocated-only MERGE_DIRS_isa-default64-x11-sunwx11 = $(libdir) @@ -47,15 +54,7 @@ MERGE_SCRIPTS_isa-default64-x11-cswx11 = copy-relocated-only MERGE_DIRS_isa-default64-x11-cswx11 = $(libdir) -BUILD64 = 1 -NOISALIST = 1 -CONFIGURE_ARGS = $(DIRPATHS) +PKGFILES_CSWlibxrenderdevel = $(PKGFILES_DEVEL) -STRIP_LIBTOOL = 1 - include gar/category.mk -# this needs to be after the include as it's not a ?= in the x11 -# category... -prefix_cswx11 = $(BUILD_PREFIX)/X11 -prefix = $(or $(prefix_$(X11)),$(BUILD_PREFIX)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Tue May 18 17:53:47 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Tue, 18 May 2010 15:53:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[9917] csw/mgar/pkg/alternatives/trunk Message-ID: Revision: 9917 http://gar.svn.sourceforge.net/gar/?rev=9917&view=rev Author: theferret Date: 2010-05-18 15:53:47 +0000 (Tue, 18 May 2010) Log Message: ----------- alternatives: fixed bug in prototypes file Modified Paths: -------------- csw/mgar/pkg/alternatives/trunk/pkginfo csw/mgar/pkg/alternatives/trunk/prototype Modified: csw/mgar/pkg/alternatives/trunk/pkginfo =================================================================== --- csw/mgar/pkg/alternatives/trunk/pkginfo 2010-05-18 15:45:14 UTC (rev 9916) +++ csw/mgar/pkg/alternatives/trunk/pkginfo 2010-05-18 15:53:47 UTC (rev 9917) @@ -1,7 +1,7 @@ PKG=CSWalternatives ARCH=all NAME=alternatives - an implementation of linux-style alternatives choice mgr -VERSION=1.0,REV=2009.10.17 +VERSION=1.0,REV=2009.10.18 CATEGORY=system VENDOR=http://www.opencsw.org written and packaged for CSW by Philip Brown EMAIL=phil at opencsw.org Modified: csw/mgar/pkg/alternatives/trunk/prototype =================================================================== --- csw/mgar/pkg/alternatives/trunk/prototype 2010-05-18 15:45:14 UTC (rev 9916) +++ csw/mgar/pkg/alternatives/trunk/prototype 2010-05-18 15:53:47 UTC (rev 9917) @@ -2,4 +2,4 @@ i copyright f none /usr/sadm/install/scripts/i.cswalternatives=i.cswalternatives 0755 root bin f none /usr/sadm/install/scripts/r.cswalternatives=r.cswalternatives 0755 root bin -f none /opt/csw/sbin/alternatives=alternatives +f none /opt/csw/sbin/alternatives=alternatives 0755 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue May 18 19:40:41 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 18 May 2010 17:40:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[9918] csw/mgar/pkg/x11/lib/xrender/trunk/Makefile Message-ID: Revision: 9918 http://gar.svn.sourceforge.net/gar/?rev=9918&view=rev Author: bdwalton Date: 2010-05-18 17:40:40 +0000 (Tue, 18 May 2010) Log Message: ----------- xrender: add package splitting and initial checkpkg overrides Modified Paths: -------------- csw/mgar/pkg/x11/lib/xrender/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/xrender/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2010-05-18 15:53:47 UTC (rev 9917) +++ csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2010-05-18 17:40:40 UTC (rev 9918) @@ -37,6 +37,11 @@ SPKG_DESC_CSWcxlibxrender = $(DESCRIPTION) (bound against OpenCSW X11) SPKG_DESC_CSWcxlibxrenderdevel = $(DESCRIPTION) Development Package (bound against OpenCSW X11) +PKGFILES_CSWlibxrenderdevel = /opt/csw/lib/.*\.pc /opt/csw/.*\.h +PKGFILES_CSWlibxrender = /opt/csw/lib/.* /opt/csw/share/doc/libxender/.* +PKGFILES_CSWcxlibxrenderdevel = /opt/csw/X11/.*\.pc /opt/csw/X11.*\.h +PKGFILES_CSWcxlibxrender = /opt/csw/X11/lib/.* /opt/csw/share/doc/cx_libxrender/.* + prefix_cswx11 = $(BUILD_PREFIX)/X11 prefix = $(or $(prefix_$(X11)),$(BUILD_PREFIX)) @@ -58,3 +63,8 @@ include gar/category.mk +CHECKPKG_OVERRIDES_CSWlibxrenderdevel += surplus-dependency|CSWlibxrender +CHECKPKG_OVERRIDES_CSWlibxrender += linked-against-discouraged-library|libXrender.so.1.3.0|libX11.so.4 +CHECKPKG_OVERRIDES_CSWlibxrender += linked-against-discouraged-library|libXrender.so.1.3.0|libX11.so.4 +CHECKPKG_OVERRIDES_CSWlibxrender += surplus-dependency|CSWx11common +CHECKPKG_OVERRIDES_CSWlibxrender += surplus-dependency|CSWlibx11 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue May 18 19:56:11 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 18 May 2010 17:56:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[9919] csw/mgar/pkg/x11/lib/xrender/trunk/Makefile Message-ID: Revision: 9919 http://gar.svn.sourceforge.net/gar/?rev=9919&view=rev Author: bdwalton Date: 2010-05-18 17:56:10 +0000 (Tue, 18 May 2010) Log Message: ----------- xrender: tweak deps, make checkpkg overrides precede include Modified Paths: -------------- csw/mgar/pkg/x11/lib/xrender/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/xrender/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2010-05-18 17:40:40 UTC (rev 9918) +++ csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2010-05-18 17:56:10 UTC (rev 9919) @@ -30,7 +30,8 @@ BUILD_DEP_PKGS = CSWx11renderproto CSWsunx11devel RUNTIME_DEP_PKGS_CSWlibxrenderdevel = CSWlibxrender -RUNTIME_DEP_PKGS_CSWlibxrender = CSWx11common CSWlibx11 +RUNTIME_DEP_PKGS_CSWlibxrender = CSWx11common +RUNTIME_DEP_PKGS_CSWcxlibxrender += CSWlibx11 SPKG_DESC_CSWlibxrender = $(DESCRIPTION) SPKG_DESC_CSWlibxrenderdevel = $(DESCRIPTION) Development Package @@ -61,10 +62,8 @@ PKGFILES_CSWlibxrenderdevel = $(PKGFILES_DEVEL) -include gar/category.mk - CHECKPKG_OVERRIDES_CSWlibxrenderdevel += surplus-dependency|CSWlibxrender CHECKPKG_OVERRIDES_CSWlibxrender += linked-against-discouraged-library|libXrender.so.1.3.0|libX11.so.4 CHECKPKG_OVERRIDES_CSWlibxrender += linked-against-discouraged-library|libXrender.so.1.3.0|libX11.so.4 -CHECKPKG_OVERRIDES_CSWlibxrender += surplus-dependency|CSWx11common -CHECKPKG_OVERRIDES_CSWlibxrender += surplus-dependency|CSWlibx11 + +include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue May 18 20:04:07 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 18 May 2010 18:04:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[9920] csw/mgar/pkg/x11/lib/xrender/trunk/Makefile Message-ID: Revision: 9920 http://gar.svn.sourceforge.net/gar/?rev=9920&view=rev Author: bdwalton Date: 2010-05-18 18:04:07 +0000 (Tue, 18 May 2010) Log Message: ----------- xrender: drop unnecessary dependency Modified Paths: -------------- csw/mgar/pkg/x11/lib/xrender/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/xrender/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2010-05-18 17:56:10 UTC (rev 9919) +++ csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2010-05-18 18:04:07 UTC (rev 9920) @@ -29,8 +29,8 @@ CATALOGNAME_CSWcxlibxrenderdevel = cx_libxrender_devel BUILD_DEP_PKGS = CSWx11renderproto CSWsunx11devel + RUNTIME_DEP_PKGS_CSWlibxrenderdevel = CSWlibxrender -RUNTIME_DEP_PKGS_CSWlibxrender = CSWx11common RUNTIME_DEP_PKGS_CSWcxlibxrender += CSWlibx11 SPKG_DESC_CSWlibxrender = $(DESCRIPTION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue May 18 21:32:26 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 18 May 2010 19:32:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[9921] csw/mgar/pkg/x11/lib/xrender/trunk/Makefile Message-ID: Revision: 9921 http://gar.svn.sourceforge.net/gar/?rev=9921&view=rev Author: bdwalton Date: 2010-05-18 19:32:26 +0000 (Tue, 18 May 2010) Log Message: ----------- xrender: correct pkgfiles splitting Modified Paths: -------------- csw/mgar/pkg/x11/lib/xrender/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/xrender/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2010-05-18 18:04:07 UTC (rev 9920) +++ csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2010-05-18 19:32:26 UTC (rev 9921) @@ -39,9 +39,9 @@ SPKG_DESC_CSWcxlibxrenderdevel = $(DESCRIPTION) Development Package (bound against OpenCSW X11) PKGFILES_CSWlibxrenderdevel = /opt/csw/lib/.*\.pc /opt/csw/.*\.h -PKGFILES_CSWlibxrender = /opt/csw/lib/.* /opt/csw/share/doc/libxender/.* +PKGFILES_CSWlibxrender = /opt/csw/lib/.*so.* /opt/csw/share/doc/libxender/.* PKGFILES_CSWcxlibxrenderdevel = /opt/csw/X11/.*\.pc /opt/csw/X11.*\.h -PKGFILES_CSWcxlibxrender = /opt/csw/X11/lib/.* /opt/csw/share/doc/cx_libxrender/.* +PKGFILES_CSWcxlibxrender = /opt/csw/X11/lib/.*so.* /opt/csw/share/doc/cx_libxrender/.* prefix_cswx11 = $(BUILD_PREFIX)/X11 prefix = $(or $(prefix_$(X11)),$(BUILD_PREFIX)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue May 18 22:15:13 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 18 May 2010 20:15:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[9922] csw/mgar/pkg/x11/lib/xrender/trunk/Makefile Message-ID: Revision: 9922 http://gar.svn.sourceforge.net/gar/?rev=9922&view=rev Author: bdwalton Date: 2010-05-18 20:15:12 +0000 (Tue, 18 May 2010) Log Message: ----------- xrender: make devel packages arch = all Modified Paths: -------------- csw/mgar/pkg/x11/lib/xrender/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/xrender/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2010-05-18 19:32:26 UTC (rev 9921) +++ csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2010-05-18 20:15:12 UTC (rev 9922) @@ -38,6 +38,9 @@ SPKG_DESC_CSWcxlibxrender = $(DESCRIPTION) (bound against OpenCSW X11) SPKG_DESC_CSWcxlibxrenderdevel = $(DESCRIPTION) Development Package (bound against OpenCSW X11) +ARCHALL_CSWcxlibxrenderdevel = 1 +ARCHALL_CSWlibxrenderdevel = 1 + PKGFILES_CSWlibxrenderdevel = /opt/csw/lib/.*\.pc /opt/csw/.*\.h PKGFILES_CSWlibxrender = /opt/csw/lib/.*so.* /opt/csw/share/doc/libxender/.* PKGFILES_CSWcxlibxrenderdevel = /opt/csw/X11/.*\.pc /opt/csw/X11.*\.h @@ -66,4 +69,11 @@ CHECKPKG_OVERRIDES_CSWlibxrender += linked-against-discouraged-library|libXrender.so.1.3.0|libX11.so.4 CHECKPKG_OVERRIDES_CSWlibxrender += linked-against-discouraged-library|libXrender.so.1.3.0|libX11.so.4 +CHECKPKG_OVERRIDES_CSWcxlibxrenderdevel += archall-with-arch-paths|/opt/csw/X11/lib/amd64 +CHECKPKG_OVERRIDES_CSWcxlibxrenderdevel += archall-with-arch-paths|/opt/csw/X11/lib/amd64/pkgconfig +CHECKPKG_OVERRIDES_CSWcxlibxrenderdevel += archall-with-arch-paths|/opt/csw/X11/lib/amd64/pkgconfig/xrender.pc +CHECKPKG_OVERRIDES_CSWlibxrenderdevel += archall-with-arch-paths|/opt/csw/lib/amd64/pkgconfig +CHECKPKG_OVERRIDES_CSWlibxrenderdevel += archall-with-arch-paths|/opt/csw/lib/amd64/pkgconfig +CHECKPKG_OVERRIDES_CSWlibxrenderdevel += archall-with-arch-paths|/opt/csw/lib/amd64/pkgconfig/xrender.pc + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue May 18 22:16:17 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 18 May 2010 20:16:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[9923] csw/mgar/pkg/x11/lib/xrender/trunk/Makefile Message-ID: Revision: 9923 http://gar.svn.sourceforge.net/gar/?rev=9923&view=rev Author: bdwalton Date: 2010-05-18 20:16:17 +0000 (Tue, 18 May 2010) Log Message: ----------- xrender: correct checkpkg duplicated override Modified Paths: -------------- csw/mgar/pkg/x11/lib/xrender/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/xrender/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2010-05-18 20:15:12 UTC (rev 9922) +++ csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2010-05-18 20:16:17 UTC (rev 9923) @@ -73,7 +73,6 @@ CHECKPKG_OVERRIDES_CSWcxlibxrenderdevel += archall-with-arch-paths|/opt/csw/X11/lib/amd64/pkgconfig CHECKPKG_OVERRIDES_CSWcxlibxrenderdevel += archall-with-arch-paths|/opt/csw/X11/lib/amd64/pkgconfig/xrender.pc CHECKPKG_OVERRIDES_CSWlibxrenderdevel += archall-with-arch-paths|/opt/csw/lib/amd64/pkgconfig -CHECKPKG_OVERRIDES_CSWlibxrenderdevel += archall-with-arch-paths|/opt/csw/lib/amd64/pkgconfig CHECKPKG_OVERRIDES_CSWlibxrenderdevel += archall-with-arch-paths|/opt/csw/lib/amd64/pkgconfig/xrender.pc include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue May 18 22:30:55 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 18 May 2010 20:30:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[9924] csw/mgar/pkg/x11/lib/xrender/trunk/Makefile Message-ID: Revision: 9924 http://gar.svn.sourceforge.net/gar/?rev=9924&view=rev Author: bdwalton Date: 2010-05-18 20:30:55 +0000 (Tue, 18 May 2010) Log Message: ----------- xrender: more checkpkg overrides Modified Paths: -------------- csw/mgar/pkg/x11/lib/xrender/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/xrender/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2010-05-18 20:16:17 UTC (rev 9923) +++ csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2010-05-18 20:30:55 UTC (rev 9924) @@ -75,4 +75,10 @@ CHECKPKG_OVERRIDES_CSWlibxrenderdevel += archall-with-arch-paths|/opt/csw/lib/amd64/pkgconfig CHECKPKG_OVERRIDES_CSWlibxrenderdevel += archall-with-arch-paths|/opt/csw/lib/amd64/pkgconfig/xrender.pc +CHECKPKG_OVERRIDES_CSWlibxrenderdevel += archall-with-arch-paths|/opt/csw/lib/sparcv9/pkgconfig +CHECKPKG_OVERRIDES_CSWlibxrenderdevel += archall-with-arch-paths|/opt/csw/lib/sparcv9/pkgconfig/xrender.pc +CHECKPKG_OVERRIDES_CSWcxlibxrenderdevel += archall-with-arch-paths|/opt/csw/X11/lib/sparcv9 +CHECKPKG_OVERRIDES_CSWcxlibxrenderdevel += archall-with-arch-paths|/opt/csw/X11/lib/sparcv9/pkgconfig +CHECKPKG_OVERRIDES_CSWcxlibxrenderdevel += archall-with-arch-paths|/opt/csw/X11/lib/sparcv9/pkgconfig/xrender.pc + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue May 18 22:37:55 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 18 May 2010 20:37:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[9925] csw/mgar/pkg/mbuffer/trunk Message-ID: Revision: 9925 http://gar.svn.sourceforge.net/gar/?rev=9925&view=rev Author: skayser Date: 2010-05-18 20:37:55 +0000 (Tue, 18 May 2010) Log Message: ----------- mbuffer: version bump to 20100327 Modified Paths: -------------- csw/mgar/pkg/mbuffer/trunk/Makefile csw/mgar/pkg/mbuffer/trunk/checksums csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/mbuffer/trunk/files/CSWmbuffer.gspec Modified: csw/mgar/pkg/mbuffer/trunk/Makefile =================================================================== --- csw/mgar/pkg/mbuffer/trunk/Makefile 2010-05-18 20:30:55 UTC (rev 9924) +++ csw/mgar/pkg/mbuffer/trunk/Makefile 2010-05-18 20:37:55 UTC (rev 9925) @@ -1,5 +1,5 @@ GARNAME = mbuffer -GARVERSION = 20091227 +GARVERSION = 20100327 CATEGORIES = utils DESCRIPTION = A tool for buffering data streams @@ -19,11 +19,6 @@ LICENSE = LICENSE -# The tests use background process and wait, but don't issue the wait -# in the same shell as the background processes were launched in. Fix this. -# Already submitted to upstream, maybe integrated in future versions. -PATCHFILES = 0001-Makefile-put-background-jobs-in-same-shell-as-the-wa.patch - # Required during packaging (for the "test" target) BUILD_DEP_PKGS = CSWmktemp BUILD_DEP_PKGS += CSWgcc4core @@ -43,6 +38,9 @@ # libmhash though ... EXTRA_CPPFLAGS = -D__const=const +# current9x doesn't know about libm.so.2 from the 64-bit modulated build +CHECKPKG_OVERRIDES_CSWmbuffer += soname-not-found|libm.so.2 + include gar/category.mk post-install-modulated: DOCS = ChangeLog README AUTHORS Modified: csw/mgar/pkg/mbuffer/trunk/checksums =================================================================== --- csw/mgar/pkg/mbuffer/trunk/checksums 2010-05-18 20:30:55 UTC (rev 9924) +++ csw/mgar/pkg/mbuffer/trunk/checksums 2010-05-18 20:37:55 UTC (rev 9925) @@ -1,2 +1 @@ -59fc19279af037462bd96279f5580c58 0001-Makefile-put-background-jobs-in-same-shell-as-the-wa.patch -191663396b4b1752d7104803631b9e54 mbuffer-20091227.tgz +65398a9f05cec0cd71b98e152276c02b mbuffer-20100327.tgz Deleted: csw/mgar/pkg/mbuffer/trunk/files/CSWmbuffer.gspec =================================================================== --- csw/mgar/pkg/mbuffer/trunk/files/CSWmbuffer.gspec 2010-05-18 20:30:55 UTC (rev 9924) +++ csw/mgar/pkg/mbuffer/trunk/files/CSWmbuffer.gspec 2010-05-18 20:37:55 UTC (rev 9925) @@ -1,4 +0,0 @@ -%var bitname mbuffer -%var pkgname CSWmbuffer -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Modified: csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW 2010-05-18 20:30:55 UTC (rev 9924) +++ csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW 2010-05-18 20:37:55 UTC (rev 9925) @@ -1,3 +1,9 @@ +mbuffer (20100327,REV=2010.05.18) + + * Version update to 20100327. + + -- Sebastian Kayser Tue, 18 May 2010 21:58:05 +0200 + mbuffer (20091227,REV=2010.01.06) * Updated to new upstream release 20091227 (Closes #3912, #3980). This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue May 18 22:51:58 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 18 May 2010 20:51:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[9926] csw/mgar/pkg/mbuffer/trunk Message-ID: Revision: 9926 http://gar.svn.sourceforge.net/gar/?rev=9926&view=rev Author: skayser Date: 2010-05-18 20:51:57 +0000 (Tue, 18 May 2010) Log Message: ----------- mbuffer: tweak changelogs for pkg release Modified Paths: -------------- csw/mgar/pkg/mbuffer/trunk/Makefile csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW Modified: csw/mgar/pkg/mbuffer/trunk/Makefile =================================================================== --- csw/mgar/pkg/mbuffer/trunk/Makefile 2010-05-18 20:37:55 UTC (rev 9925) +++ csw/mgar/pkg/mbuffer/trunk/Makefile 2010-05-18 20:51:57 UTC (rev 9926) @@ -41,6 +41,8 @@ # current9x doesn't know about libm.so.2 from the 64-bit modulated build CHECKPKG_OVERRIDES_CSWmbuffer += soname-not-found|libm.so.2 +EXTRA_PAX_ARGS = '-s,ChangeLog$$,changelog,p' + include gar/category.mk post-install-modulated: DOCS = ChangeLog README AUTHORS Modified: csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW 2010-05-18 20:37:55 UTC (rev 9925) +++ csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW 2010-05-18 20:51:57 UTC (rev 9926) @@ -1,6 +1,6 @@ mbuffer (20100327,REV=2010.05.18) - * Version update to 20100327. + * Version update to 20100327 (Closes #4407). -- Sebastian Kayser Tue, 18 May 2010 21:58:05 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue May 18 23:12:12 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 18 May 2010 21:12:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[9927] csw/mgar/pkg/x11/lib/xrender/trunk/Makefile Message-ID: Revision: 9927 http://gar.svn.sourceforge.net/gar/?rev=9927&view=rev Author: bdwalton Date: 2010-05-18 21:12:12 +0000 (Tue, 18 May 2010) Log Message: ----------- xrender: allow arch specific _devel due to amd64/sparcv9 paths...would need to combine isa builds Modified Paths: -------------- csw/mgar/pkg/x11/lib/xrender/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/xrender/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2010-05-18 20:51:57 UTC (rev 9926) +++ csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2010-05-18 21:12:12 UTC (rev 9927) @@ -38,9 +38,6 @@ SPKG_DESC_CSWcxlibxrender = $(DESCRIPTION) (bound against OpenCSW X11) SPKG_DESC_CSWcxlibxrenderdevel = $(DESCRIPTION) Development Package (bound against OpenCSW X11) -ARCHALL_CSWcxlibxrenderdevel = 1 -ARCHALL_CSWlibxrenderdevel = 1 - PKGFILES_CSWlibxrenderdevel = /opt/csw/lib/.*\.pc /opt/csw/.*\.h PKGFILES_CSWlibxrender = /opt/csw/lib/.*so.* /opt/csw/share/doc/libxender/.* PKGFILES_CSWcxlibxrenderdevel = /opt/csw/X11/.*\.pc /opt/csw/X11.*\.h @@ -69,16 +66,4 @@ CHECKPKG_OVERRIDES_CSWlibxrender += linked-against-discouraged-library|libXrender.so.1.3.0|libX11.so.4 CHECKPKG_OVERRIDES_CSWlibxrender += linked-against-discouraged-library|libXrender.so.1.3.0|libX11.so.4 -CHECKPKG_OVERRIDES_CSWcxlibxrenderdevel += archall-with-arch-paths|/opt/csw/X11/lib/amd64 -CHECKPKG_OVERRIDES_CSWcxlibxrenderdevel += archall-with-arch-paths|/opt/csw/X11/lib/amd64/pkgconfig -CHECKPKG_OVERRIDES_CSWcxlibxrenderdevel += archall-with-arch-paths|/opt/csw/X11/lib/amd64/pkgconfig/xrender.pc -CHECKPKG_OVERRIDES_CSWlibxrenderdevel += archall-with-arch-paths|/opt/csw/lib/amd64/pkgconfig -CHECKPKG_OVERRIDES_CSWlibxrenderdevel += archall-with-arch-paths|/opt/csw/lib/amd64/pkgconfig/xrender.pc - -CHECKPKG_OVERRIDES_CSWlibxrenderdevel += archall-with-arch-paths|/opt/csw/lib/sparcv9/pkgconfig -CHECKPKG_OVERRIDES_CSWlibxrenderdevel += archall-with-arch-paths|/opt/csw/lib/sparcv9/pkgconfig/xrender.pc -CHECKPKG_OVERRIDES_CSWcxlibxrenderdevel += archall-with-arch-paths|/opt/csw/X11/lib/sparcv9 -CHECKPKG_OVERRIDES_CSWcxlibxrenderdevel += archall-with-arch-paths|/opt/csw/X11/lib/sparcv9/pkgconfig -CHECKPKG_OVERRIDES_CSWcxlibxrenderdevel += archall-with-arch-paths|/opt/csw/X11/lib/sparcv9/pkgconfig/xrender.pc - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed May 19 04:15:21 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 19 May 2010 02:15:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[9928] csw/mgar/gar/v2-bwalton/gar.mk Message-ID: Revision: 9928 http://gar.svn.sourceforge.net/gar/?rev=9928&view=rev Author: bdwalton Date: 2010-05-19 02:15:21 +0000 (Wed, 19 May 2010) Log Message: ----------- gar/v2-bwalton: only run post-patch-gitsnap if !global modulation; do not depend on worksrc for post-patch-gitsnap Modified Paths: -------------- csw/mgar/gar/v2-bwalton/gar.mk Modified: csw/mgar/gar/v2-bwalton/gar.mk =================================================================== --- csw/mgar/gar/v2-bwalton/gar.mk 2010-05-18 21:12:12 UTC (rev 9927) +++ csw/mgar/gar/v2-bwalton/gar.mk 2010-05-19 02:15:21 UTC (rev 9928) @@ -450,7 +450,7 @@ patch: pre-patch $(addprefix patch-,$(MODULATIONS)) post-patch @$(DONADA) -patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) post-patch-gitsnap post-patch-$(MODULATION) post-patch-modulated +patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) $(if $(filter global,$(MODULATION)),,post-patch-gitsnap) post-patch-$(MODULATION) post-patch-modulated @$(DONADA) # returns true if patch has completed successfully, false @@ -458,7 +458,7 @@ patch-p: @$(foreach COOKIEFILE,$(PATCH_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) -post-patch-gitsnap: $(WORKSRC) $(PATCH_TARGETS) +post-patch-gitsnap: $(PATCH_TARGETS) @echo "Tagging top of current csw patch stack..." @( cd $(WORKSRC); git tag -am "CSW $(GARVERSION)" csw-$(GARVERSION) ) @$(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 Wed May 19 11:13:54 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 19 May 2010 09:13:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[9929] csw/mgar/pkg/libsigcpp/trunk/Makefile Message-ID: Revision: 9929 http://gar.svn.sourceforge.net/gar/?rev=9929&view=rev Author: dmichelsen Date: 2010-05-19 09:13:53 +0000 (Wed, 19 May 2010) Log Message: ----------- libsigcpp: Fix runpath issue Modified Paths: -------------- csw/mgar/pkg/libsigcpp/trunk/Makefile Modified: csw/mgar/pkg/libsigcpp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsigcpp/trunk/Makefile 2010-05-19 02:15:21 UTC (rev 9928) +++ csw/mgar/pkg/libsigcpp/trunk/Makefile 2010-05-19 09:13:53 UTC (rev 9929) @@ -13,27 +13,28 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# 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 = CSWlibsigc++ PACKAGES += CSWlibsigc++devel SPKG_DESC_CSWlibsigc++ = Typesafe signal and callback system for C++ SPKG_DESC_CSWlibsigc++devel = Header files and docs for libsigc++ -PKGFILES_CSWlibsigc++devel = /opt/csw/share/.* -PKGFILES_CSWlibsigc++devel += /opt/csw/include/.* -PKGFILES_CSWlibsigc++devel += /opt/csw/lib/pkgconfig/.* -PKGFILES_CSWlibsigc++devel += /opt/csw/lib/sigc\+\+-2.0/include/.* - CATALOGNAME_CSWlibsigc++= libsigc++ CATALOGNAME_CSWlibsigc++devel = libsigc++_devel +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) --disable-static -BUILD64 = 1 -NOISAEXEC = 1 + TEST_TARGET = check +PKGFILES_CSWlibsigc++devel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibsigc++devel += $(docdir)/.* +PKGFILES_CSWlibsigc++devel += .*\.h +PKGFILES_CSWlibsigc++devel += $(sharedstatedir)/.* + include gar/category.mk + PATH := /opt/csw/gnu:$(PATH) + +post-configure-modulated: + perl -pi -e 's,\|-xarch=,|-norunpath|-xarch=,' $(WORKSRC)/libtool + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed May 19 12:04:10 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 19 May 2010 10:04:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[9930] csw/mgar/gar/v2 Message-ID: Revision: 9930 http://gar.svn.sourceforge.net/gar/?rev=9930&view=rev Author: wahwah Date: 2010-05-19 10:04:10 +0000 (Wed, 19 May 2010) Log Message: ----------- mGAR v2: checkpkg, whole catalog run fixes wrt to the catalog changes (needs to match two variants of lines). Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg_collect_stats.py csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/lib/python/opencsw_test.py Modified: csw/mgar/gar/v2/bin/checkpkg_collect_stats.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg_collect_stats.py 2010-05-19 09:13:53 UTC (rev 9929) +++ csw/mgar/gar/v2/bin/checkpkg_collect_stats.py 2010-05-19 10:04:10 UTC (rev 9930) @@ -47,7 +47,10 @@ md5s_by_basename = catalog.GetDataByBasename() for pkg in packages: basename = os.path.basename(pkg.pkg_path) - pkg.md5sum = md5s_by_basename[basename]["md5sum"] + # It might be the case that a file is present on disk, but missing from + # the catalog file. + if basename in md5s_by_basename: + pkg.md5sum = md5s_by_basename[basename]["md5sum"] stats_list = [checkpkg.PackageStats(pkg) for pkg in packages] md5s_by_basename = None # To free memory catalog = None # To free memory Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-05-19 09:13:53 UTC (rev 9929) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-05-19 10:04:10 UTC (rev 9930) @@ -92,6 +92,10 @@ pass +class CatalogLineParseError(Error): + pass + + def ParsePackageFileName(p): if p.endswith(".gz"): p = p[:-3] @@ -1052,46 +1056,81 @@ def __init__(self, file_name): self.file_name = file_name - self.by_basename = {} - self.catalog_data = [] + self.by_basename = None + self.catalog_data = None - def _GetCatalogData(self, fd): - cline_re_str = ( - r"^" - r"(?P\S+)" - r"\s+" - r"(?P\S+)" - r"\s+" - r"(?P\S+)" - r"\s+" - r"(?P\S+)" - r"\s+" - r"(?P\S+)" - r"\s+" - r"(?P\S+)" - r"\s+" - r"(?P\S+)" - r"\s+" - r"(?P\S+)$" - ) - cline_re = re.compile(cline_re_str) - for line in fd: + def _ParseCatalogLine(self, line): + cline_re_str_list = [ + ( + r"^" + # tmux + r"(?P\S+)" + r"\s+" + # 1.2,REV=2010.05.17 + r"(?P\S+)" + r"\s+" + # CSWtmux + r"(?P\S+)" + r"\s+" + # tmux-1.2,REV=2010.05.17-SunOS5.9-sparc-CSW.pkg.gz + r"(?P\S+)" + r"\s+" + # 145351cf6186fdcadcd169b66387f72f + r"(?P\S+)" + r"\s+" + # 214091 + r"(?P\S+)" + r"\s+" + # CSWcommon|CSWlibevent + r"(?P\S+)" + r"\s+" + # none + r"(?P\S+)" + # An optional empty field. + r"(" + r"\s+" + # none\n' + r"(?P\S+)" + r")?" + r"$" + ), + ] + cline_re_list = [re.compile(x) for x in cline_re_str_list] + matched = False + d = None + for cline_re in cline_re_list: m = cline_re.match(line) if m: d = m.groupdict() - self.catalog_data.append(d) - else: - logging.debug("%s did not match the regex", repr(line)) + matched = True + if not d: + raise CatalogLineParseError("Parsed %s data is empty" % repr(line)) + if not matched: + raise CatalogLineParseError("No regexes matched %s" % repr(line)) + return d + def _GetCatalogData(self, fd): + catalog_data = [] + for line in fd: + try: + parsed = self._ParseCatalogLine(line) + catalog_data.append(parsed) + except CatalogLineParseError, e: + logging.error("Could not parse %s, %s", repr(line), e) + return catalog_data + def GetCatalogData(self): if not self.catalog_data: fd = open(self.file_name, "r") - self._GetCatalogData(fd) + self.catalog_data = self._GetCatalogData(fd) return self.catalog_data def GetDataByBasename(self): if not self.by_basename: + self.by_basename = {} cd = self.GetCatalogData() for d in cd: + if "file_basename" not in d: + logging.error("%s is missing the file_basename field", d) self.by_basename[d["file_basename"]] = d return self.by_basename Modified: csw/mgar/gar/v2/lib/python/opencsw_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw_test.py 2010-05-19 09:13:53 UTC (rev 9929) +++ csw/mgar/gar/v2/lib/python/opencsw_test.py 2010-05-19 10:04:10 UTC (rev 9930) @@ -394,6 +394,28 @@ searchList=[submitpkg_data]) self.assertTrue(re.search(r"new package", unicode(t)), unicode(t)) +class OpencswCatalogUnitTest(unittest.TestCase): + def test_ParseCatalogLine_1(self): + line = ( + 'tmux 1.2,REV=2010.05.17 CSWtmux ' + 'tmux-1.2,REV=2010.05.17-SunOS5.9-sparc-CSW.pkg.gz ' + '145351cf6186fdcadcd169b66387f72f 214091 ' + 'CSWcommon|CSWlibevent none none\n') + oc = opencsw.OpencswCatalog(None) + parsed = oc._ParseCatalogLine(line) + expected = {'catalogname': 'tmux', + 'deps': 'CSWcommon|CSWlibevent', + 'file_basename': 'tmux-1.2,REV=2010.05.17-SunOS5.9-sparc-CSW.pkg.gz', + 'md5sum': '145351cf6186fdcadcd169b66387f72f', + 'none_thing_1': 'none', + 'none_thing_2': 'none', + 'pkgname': 'CSWtmux', + 'size': '214091', + 'version': '1.2,REV=2010.05.17'} + self.assertEquals(expected, parsed) + + + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu May 20 02:12:44 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 20 May 2010 00:12:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[9931] csw/mgar/pkg/x11/lib/xrender/trunk/Makefile Message-ID: Revision: 9931 http://gar.svn.sourceforge.net/gar/?rev=9931&view=rev Author: bdwalton Date: 2010-05-20 00:12:44 +0000 (Thu, 20 May 2010) Log Message: ----------- xrender: kill the devel packages; kill the devel files for cx_libxrender Modified Paths: -------------- csw/mgar/pkg/x11/lib/xrender/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/xrender/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2010-05-19 10:04:10 UTC (rev 9930) +++ csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2010-05-20 00:12:44 UTC (rev 9931) @@ -20,13 +20,10 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = libXrender-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWlibxrender CSWlibxrenderdevel -PACKAGES += CSWcxlibxrender CSWcxlibxrenderdevel +PACKAGES = CSWlibxrender CSWcxlibxrender -CATALOGNAME_CSWlibxrender = libxrender -CATALOGNAME_CSWlibxrenderdevel = libxrender_devel -CATALOGNAME_CSWcxlibxrender = cx_libxrender -CATALOGNAME_CSWcxlibxrenderdevel = cx_libxrender_devel +CATALOGNAME_CSWlibxrender = libxrender +CATALOGNAME_CSWcxlibxrender = cx_libxrender BUILD_DEP_PKGS = CSWx11renderproto CSWsunx11devel @@ -34,14 +31,10 @@ RUNTIME_DEP_PKGS_CSWcxlibxrender += CSWlibx11 SPKG_DESC_CSWlibxrender = $(DESCRIPTION) -SPKG_DESC_CSWlibxrenderdevel = $(DESCRIPTION) Development Package SPKG_DESC_CSWcxlibxrender = $(DESCRIPTION) (bound against OpenCSW X11) -SPKG_DESC_CSWcxlibxrenderdevel = $(DESCRIPTION) Development Package (bound against OpenCSW X11) -PKGFILES_CSWlibxrenderdevel = /opt/csw/lib/.*\.pc /opt/csw/.*\.h -PKGFILES_CSWlibxrender = /opt/csw/lib/.*so.* /opt/csw/share/doc/libxender/.* -PKGFILES_CSWcxlibxrenderdevel = /opt/csw/X11/.*\.pc /opt/csw/X11.*\.h -PKGFILES_CSWcxlibxrender = /opt/csw/X11/lib/.*so.* /opt/csw/share/doc/cx_libxrender/.* +PKGFILES_CSWlibxrender = /opt/csw/lib/.* /opt/csw/include/.* +PKGFILES_CSWcxlibxrender = /opt/csw/X11/.* /opt/csw/share/doc/cx.* prefix_cswx11 = $(BUILD_PREFIX)/X11 prefix = $(or $(prefix_$(X11)),$(BUILD_PREFIX)) @@ -60,10 +53,18 @@ MERGE_SCRIPTS_isa-default64-x11-cswx11 = copy-relocated-only MERGE_DIRS_isa-default64-x11-cswx11 = $(libdir) -PKGFILES_CSWlibxrenderdevel = $(PKGFILES_DEVEL) - CHECKPKG_OVERRIDES_CSWlibxrenderdevel += surplus-dependency|CSWlibxrender CHECKPKG_OVERRIDES_CSWlibxrender += linked-against-discouraged-library|libXrender.so.1.3.0|libX11.so.4 CHECKPKG_OVERRIDES_CSWlibxrender += linked-against-discouraged-library|libXrender.so.1.3.0|libX11.so.4 include gar/category.mk + +# if we're doing the cx version (/opt/csw/X11), then kill the devel bits that +# are shipped with x11_xrenderproto +post-install-modulated: + @( cd $(DESTDIR)/opt/csw/; \ + if [ -d X11/include ]; then \ + rm -rf X11/include; \ + find . -name pkgconfig -type d | xargs rm -rf; \ + fi ) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu May 20 02:34:17 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 20 May 2010 00:34:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[9932] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 9932 http://gar.svn.sourceforge.net/gar/?rev=9932&view=rev Author: bdwalton Date: 2010-05-20 00:34:17 +0000 (Thu, 20 May 2010) Log Message: ----------- coreutils: prototype filter to ensure gsu delivered setuid Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2010-05-20 00:12:44 UTC (rev 9931) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2010-05-20 00:34:17 UTC (rev 9932) @@ -45,6 +45,8 @@ # required for eaccess and not picked up automatically. EXTRA_LDFLAGS = -lgen +PROTOTYPE_FILTER = awk '$$$$3 == "/opt/csw/bin/gsu" { $$$$4 = "4555" }; { print }' + ifneq ($(GARVERSION), 8.4) TEST_TARGET = check else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu May 20 12:44:22 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 20 May 2010 10:44:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[9933] csw/mgar/pkg Message-ID: Revision: 9933 http://gar.svn.sourceforge.net/gar/?rev=9933&view=rev Author: wahwah Date: 2010-05-20 10:44:22 +0000 (Thu, 20 May 2010) Log Message: ----------- libxpm: A reroll with Sun X11 library, as requested by Phil. Modified Paths: -------------- csw/mgar/pkg/libxpm/trunk/Makefile csw/mgar/pkg/libxpm/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libxpm/ Modified: csw/mgar/pkg/libxpm/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-05-10 16:08:59 UTC (rev 9846) +++ csw/mgar/pkg/libxpm/trunk/Makefile 2010-05-20 10:44:22 UTC (rev 9933) @@ -2,184 +2,59 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = libxpm +GARVERSION = 3.5.8 +CATEGORIES = x11 + +DESCRIPTION = X11 pixmap library define BLURB - + LibXpm provides support and common operation for the XPM pixmap format, + which is commonly used in legacy X applications. XPM is an extension of + the monochrome XBM bitmap. endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true -#include gar/category.mk +MASTER_SITES = $(X11_LIB_MASTER_SITE) +DISTNAME = libXpm-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.bz2 + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +# CSWxpm is the legacy library +PACKAGES = CSWlibxpm CSWlibxpmdevel CSWxpm + +CATALOGNAME_CSWlibxpm = libxpm +CATALOGNAME_CSWlibxpmdevel = libxpm_devel + +SPKG_DESC_CSWlibxpm = X11 pixmap library +SPKG_DESC_CSWlibxpmdevel = X11 pixmap library development files + +BUILD_DEP_PKGS += CSWx11xproto +BUILD_DEP_PKGS += CSWlibx11devel + +RUNTIME_DEP_PKGS_CSWlibxpm += CSWggettextrt +RUNTIME_DEP_PKGS_CSWxpm += CSWggettextrt + +PKGFILES_CSWlibxpmdevel += $(PKGFILES_DEVEL) +PKGFILES_CSWlibxpm += $(PKGFILES_RT) + +BUILD64 = 1 +NOISAEXEC = 1 +EXTRA_BUILD_ISAS = sparcv8plus+vis +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --disable-silent-rules + +PATCHFILES = 0001-Forcing-lintl-on-cxpm.patch + +# We don't want optimized binaries, optimized libs are sufficient + MERGE_DIRS_isa-sparcv9 = $(libdir) +MERGE_DIRS_isa-sparcv8plus+vis = $(libdir) + MERGE_DIRS_isa-amd64 = $(libdir) + +# Reset the prefix set by the x11 category +prefix = /opt/csw + +include gar/category.mk + +post-install-modulated: + ln -s libXpm.so.4.11.0 $(DESTDIR)$(libdir)/libXpm.so.4.11 + @$(MAKECOOKIE) Modified: csw/mgar/pkg/libxpm/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-05-10 16:08:59 UTC (rev 9846) +++ csw/mgar/pkg/libxpm/trunk/checksums 2010-05-20 10:44:22 UTC (rev 9933) @@ -0,0 +1,2 @@ +01c1dabedefdf03ada47a8e4e6d62bad 0001-Forcing-lintl-on-cxpm.patch +38e58e72d476a74298a59052fde185a3 libXpm-3.5.8.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu May 20 12:45:13 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 20 May 2010 10:45:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[9934] csw/mgar/pkg/libxpm/trunk/files/ 0001-Forcing-lintl-on-cxpm.patch Message-ID: Revision: 9934 http://gar.svn.sourceforge.net/gar/?rev=9934&view=rev Author: wahwah Date: 2010-05-20 10:45:13 +0000 (Thu, 20 May 2010) Log Message: ----------- libxpm: Adding the -lintl patch Added Paths: ----------- csw/mgar/pkg/libxpm/trunk/files/0001-Forcing-lintl-on-cxpm.patch Added: csw/mgar/pkg/libxpm/trunk/files/0001-Forcing-lintl-on-cxpm.patch =================================================================== --- csw/mgar/pkg/libxpm/trunk/files/0001-Forcing-lintl-on-cxpm.patch (rev 0) +++ csw/mgar/pkg/libxpm/trunk/files/0001-Forcing-lintl-on-cxpm.patch 2010-05-20 10:45:13 UTC (rev 9934) @@ -0,0 +1,25 @@ +From caa3df9aa2cf9a4e6f7defa95960a95fc76ce826 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Thu, 20 May 2010 12:24:12 +0200 +Subject: [PATCH] Forcing -lintl on cxpm + +--- + cxpm/Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/cxpm/Makefile.in b/cxpm/Makefile.in +index 1ca210f..f830ed7 100644 +--- a/cxpm/Makefile.in ++++ b/cxpm/Makefile.in +@@ -52,7 +52,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" + PROGRAMS = $(bin_PROGRAMS) + am_cxpm_OBJECTS = cxpm.$(OBJEXT) + cxpm_OBJECTS = $(am_cxpm_OBJECTS) +-cxpm_LDADD = $(LDADD) ++cxpm_LDADD = $(LDADD) -lintl + AM_V_lt = $(am__v_lt_$(V)) + am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) + am__v_lt_0 = --silent +-- +1.7.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu May 20 13:06:54 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 20 May 2010 11:06:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[9935] csw/mgar/gar/v2/lib/python Message-ID: Revision: 9935 http://gar.svn.sourceforge.net/gar/?rev=9935&view=rev Author: wahwah Date: 2010-05-20 11:06:53 +0000 (Thu, 20 May 2010) Log Message: ----------- mGAR v2: No longer throw an error about libX11.so.4 Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-05-20 10:45:13 UTC (rev 9934) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-05-20 11:06:53 UTC (rev 9935) @@ -715,11 +715,15 @@ It wraps access to the /var/sadm/install/contents cache. """ - def __init__(self, system_pkgmap=None): + def __init__(self, system_pkgmap=None, lines_dict=None): self.system_pkgmap = system_pkgmap if not self.system_pkgmap: self.system_pkgmap = SystemPkgmap() self.common_paths = {} + if lines_dict: + self.lines_dict = lines_dict + else: + self.lines_dict = {} def GetPkgmapLineByBasename(self, basename): """Proxies calls to self.system_pkgmap.""" @@ -734,6 +738,16 @@ def GetInstalledPackages(self): return self.system_pkgmap.GetInstalledPackages() + def _GetPathsForArch(self, arch): + if not arch in self.lines_dict: + file_name = os.path.join( + os.path.dirname(__file__), "..", "..", "etc", "commondirs-%s" % arch) + logging.debug("opening %s", file_name) + f = open(file_name, "r") + self.lines_dict[arch] = f.read().splitlines() + f.close() + return self.lines_dict[arch] + def GetCommonPaths(self, arch): """Returns a list of paths for architecture, from gar/etc/commondirs*.""" # TODO: If this was cached, it would save a significant amount of time. @@ -744,12 +758,7 @@ archs = [arch] lines = [] for arch in archs: - file_name = os.path.join( - os.path.dirname(__file__), "..", "..", "etc", "commondirs-%s" % arch) - logging.debug("opening %s", file_name) - f = open(file_name, "r") - lines.extend(f.read().splitlines()) - f.close() + lines.extend(self._GetPathsForArch(arch)) return lines Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-05-20 10:45:13 UTC (rev 9934) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-05-20 11:06:53 UTC (rev 9935) @@ -48,7 +48,11 @@ MAX_PKGNAME_LENGTH = 20 ARCH_LIST = ["sparc", "i386", "all"] VERSION_RE = r".*,REV=(20[01][0-9]\.[0-9][0-9]\.[0-9][0-9]).*" -DO_NOT_LINK_AGAINST_THESE_SONAMES = set(["libX11.so.4"]) + +# At some point, it was used to prevent people from linking against +# libX11.so.4, but due to issues with 3D acceleration. +DO_NOT_LINK_AGAINST_THESE_SONAMES = set([]) + DISCOURAGED_FILE_PATTERNS = ( r"\.py[co]$", r"/lib\w+\.l?a$", Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-05-20 10:45:13 UTC (rev 9934) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-05-20 11:06:53 UTC (rev 9935) @@ -268,8 +268,9 @@ 'soname': 'libImlib2.so.1', 'soname_guessed': False, }) - self.error_mgr_mock.ReportError('linked-against-discouraged-library', - 'libImlib2.so.1.4.2 libX11.so.4') + # This no longer should throw an error. + # self.error_mgr_mock.ReportError('linked-against-discouraged-library', + # 'libImlib2.so.1.4.2 libX11.so.4') class TestSetCheckSharedLibraryConsistency2_1(CheckpkgUnitTestHelper, unittest.TestCase): FUNCTION_NAME = 'SetCheckLibraries' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu May 20 13:24:15 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 20 May 2010 11:24:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[9936] csw/mgar/pkg/libxpm/trunk/Makefile Message-ID: Revision: 9936 http://gar.svn.sourceforge.net/gar/?rev=9936&view=rev Author: wahwah Date: 2010-05-20 11:24:15 +0000 (Thu, 20 May 2010) Log Message: ----------- libxpm: CSWlibxpm depends on gettext only on sparc. Modified Paths: -------------- csw/mgar/pkg/libxpm/trunk/Makefile Modified: csw/mgar/pkg/libxpm/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxpm/trunk/Makefile 2010-05-20 11:06:53 UTC (rev 9935) +++ csw/mgar/pkg/libxpm/trunk/Makefile 2010-05-20 11:24:15 UTC (rev 9936) @@ -31,9 +31,11 @@ BUILD_DEP_PKGS += CSWx11xproto BUILD_DEP_PKGS += CSWlibx11devel -RUNTIME_DEP_PKGS_CSWlibxpm += CSWggettextrt -RUNTIME_DEP_PKGS_CSWxpm += CSWggettextrt +RUNTIME_DEP_PKGS_CSWlibxpm_sparc += CSWggettextrt +RUNTIME_DEP_PKGS_CSWxpm += CSWggettextrt +RUNTIME_DEP_PKGS_CSWlibxpm += $(RUNTIME_DEP_PKGS_CSWlibxpm_$(GARCH)) + PKGFILES_CSWlibxpmdevel += $(PKGFILES_DEVEL) PKGFILES_CSWlibxpm += $(PKGFILES_RT) 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 May 20 16:01:30 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 20 May 2010 14:01:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[9938] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 9938 http://gar.svn.sourceforge.net/gar/?rev=9938&view=rev Author: bonivart Date: 2010-05-20 14:01:30 +0000 (Thu, 20 May 2010) Log Message: ----------- clamav: update to 0.96.1 Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile csw/mgar/pkg/clamav/trunk/checksums Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2010-05-20 14:01:10 UTC (rev 9937) +++ csw/mgar/pkg/clamav/trunk/Makefile 2010-05-20 14:01:30 UTC (rev 9938) @@ -1,5 +1,5 @@ GARNAME = clamav -GARVERSION = 0.96 +GARVERSION = 0.96.1 #DISTNAME = $(GARNAME)-devel-latest CATEGORIES = apps @@ -33,6 +33,10 @@ PATCHFILES = CSWclamav.freshclam.conf.p PATCHFILES += CSWclamav.clamd.conf.p +#BUILD64 = 1 +#PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +#PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + #GARCOMPILER = GCC4 # Seems to be a compiler bug forcing us to use -xO2 instead of -xO3 @@ -49,8 +53,7 @@ CONFIGURE_ARGS += --localstatedir=/var/opt/csw/$(GARNAME) CONFIGURE_ARGS += --sysconfdir=$(sysconfdir) CONFIGURE_ARGS += --enable-milter -#CONFIGURE_ARGS += --enable-llvm -CONFIGURE_ARGS += --disable-llvm +#CONFIGURE_ARGS += --disable-llvm #CONFIGURE_ARGS += --enable-check CONFIGURE_ARGS += --enable-clamdtop Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2010-05-20 14:01:10 UTC (rev 9937) +++ csw/mgar/pkg/clamav/trunk/checksums 2010-05-20 14:01:30 UTC (rev 9938) @@ -1,3 +1,3 @@ a3238ed54a098b66a8e3e9f8bb0ca399 CSWclamav.clamd.conf.p 6c37b881661bf28741bb69045a642790 CSWclamav.freshclam.conf.p -28ac7bec4cc03627a8e2d6e8647ee661 clamav-0.96.tar.gz +38e7870db6e9ad0e569518499a6f3651 clamav-0.96.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Thu May 20 16:01:10 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 20 May 2010 14:01:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[9937] csw/mgar/pkg/libtorrent/trunk Message-ID: Revision: 9937 http://gar.svn.sourceforge.net/gar/?rev=9937&view=rev Author: janholzh Date: 2010-05-20 14:01:10 +0000 (Thu, 20 May 2010) Log Message: ----------- libtorrent: make that thing build Modified Paths: -------------- csw/mgar/pkg/libtorrent/trunk/Makefile csw/mgar/pkg/libtorrent/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libtorrent/trunk/files/more-UNUSED.patch csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-01-madvise.diff csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-03-dh-generate.diff csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-04-sunpro.diff csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-05-tracker-usable.diff csw/mgar/pkg/libtorrent/trunk/files/work-around-UNUSED.patch Modified: csw/mgar/pkg/libtorrent/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtorrent/trunk/Makefile 2010-05-20 11:24:15 UTC (rev 9936) +++ csw/mgar/pkg/libtorrent/trunk/Makefile 2010-05-20 14:01:10 UTC (rev 9937) @@ -16,10 +16,44 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# 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 = +#Patches mostly from http://cr.opensolaris.org/~alz/bittorrent/raw_files/new/usr/src/lib/libtorrent/ -CONFIGURE_ARGS = $(DIRPATHS) +PATCHFILES = rlibtorrent-04-sunpro.diff rlibtorrent-01-madvise.diff rlibtorrent-03-dh-generate.diff +PATCHFILES += rlibtorrent-05-tracker-usable.diff work-around-UNUSED.patch more-UNUSED.patch + +RUNTIME_DEP_PKGS_CSWlibtorrent += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibtorrent += CSWlibsigc++rt + +PACKAGES = CSWlibtorrent +PACKAGES += CSWlibtorrentdevel +SPKG_DESC_CSWlibtorrent = BitTorrent library written in C++ for *nix +SPKG_DESC_CSWlibtorrentdevel = Header files for libtorrent + +CATALOGNAME_CSWlibtorrent= libtorrent +CATALOGNAME_CSWlibtorrentdevel = libtorrent_devel + +PKGFILES_CSWlibtorrentdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibtorrentdevel += $(docdir)/.* +PKGFILES_CSWlibtorrentdevel += .*\.h +PKGFILES_CSWlibtorrentdevel += $(sharedstatedir)/.* + +#No 64bit build until libsigc++ is 64bit too +#BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) --enable-shared --disable-static --disable-libtool-lock --disable-debug +TEST_TARGET = check + include gar/category.mk + +pre-configure-modulated: +# cd $(WORKSRC) && aclocal-1.10 -I./scripts -I. && autoheader \ +# && libtoolize --automake --copy --force && automake-1.10 && autoconf + cd $(WORKSRC) && aclocal-1.10 -I scripts && \ + automake-1.10 --gnu && autoconf + + $(MAKECOOKIE) + + +post-configure-modulated: + perl -pi -e 's,\|-xarch=,|-norunpath|-xarch=,' $(WORKSRC)/libtool + @$(MAKECOOKIE) Modified: csw/mgar/pkg/libtorrent/trunk/checksums =================================================================== --- csw/mgar/pkg/libtorrent/trunk/checksums 2010-05-20 11:24:15 UTC (rev 9936) +++ csw/mgar/pkg/libtorrent/trunk/checksums 2010-05-20 14:01:10 UTC (rev 9937) @@ -1 +1,7 @@ 037499ed708aaf72988cee60e5a8d96b libtorrent-0.12.6.tar.gz +373bec9d71c3cad06c669e26857ef14b more-UNUSED.patch +eb30844ace9f064a8fca5212f5a99fef rlibtorrent-01-madvise.diff +f2f3738edcbc8d7ccfa14e784f3af9c6 rlibtorrent-03-dh-generate.diff +c13befd35c91a36f78151accdc70c62c rlibtorrent-04-sunpro.diff +0d1545bbc1e7c9f5d4de059c855b0f81 rlibtorrent-05-tracker-usable.diff +9c0cccb56d3a03eeb14739d811259187 work-around-UNUSED.patch Added: csw/mgar/pkg/libtorrent/trunk/files/more-UNUSED.patch =================================================================== --- csw/mgar/pkg/libtorrent/trunk/files/more-UNUSED.patch (rev 0) +++ csw/mgar/pkg/libtorrent/trunk/files/more-UNUSED.patch 2010-05-20 14:01:10 UTC (rev 9937) @@ -0,0 +1,25 @@ +From 9f0bae87a21f0256f1848b8d8f74d90e533ae4d6 Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter +Date: Thu, 20 May 2010 12:43:55 +0200 +Subject: [PATCH] more-UNUSED + +--- + src/torrent/resume.cc | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/src/torrent/resume.cc b/src/torrent/resume.cc +index dd53f71..5480220 100644 +--- a/src/torrent/resume.cc ++++ b/src/torrent/resume.cc +@@ -58,6 +58,8 @@ + + #include "resume.h" + ++#define __UNUSED ++ + namespace torrent { + + void +-- +1.7.1 + Added: csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-01-madvise.diff =================================================================== --- csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-01-madvise.diff (rev 0) +++ csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-01-madvise.diff 2010-05-20 14:01:10 UTC (rev 9937) @@ -0,0 +1,30 @@ +--- libtorrent-0.12.2.orig/src/data/memory_chunk.cc (revision 1060) ++++ libtorrent-0.12.2/src/data/memory_chunk.cc (working copy) +@@ -41,6 +41,16 @@ + #include + #include + #include ++#if defined(__sun) && defined(__SVR4) ++/* Ugly hack to make this compile on Solaris with g++. See ++ * http://www.opensolaris.org/jive/thread.jspa?threadID=21035&tstart=0 ++ */ ++#if (_POSIX_C_SOURCE > 2) || defined(_XPG4_2) ++extern "C" { ++extern int madvise(caddr_t, size_t, int); ++} ++#endif ++#endif + #include + + #include "torrent/exceptions.h" +--- libtorrent-0.12.2.orig/scripts/common.m4 2008-05-07 08:19:12.000000000 -0400 ++++ libtorrent-0.12.2/scripts/common.m4 2008-06-23 17:04:24.567475080 -0400 +@@ -170,7 +170,7 @@ + AC_COMPILE_IFELSE( + [[#include + #include +- void f() { static char test[1024]; madvise((void *)test, sizeof(test), MADV_NORMAL); } ++ void f() { static char test[1024]; madvise((char *)test, sizeof(test), MADV_NORMAL); } + ]], + [ + AC_MSG_RESULT(yes) Added: csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-03-dh-generate.diff =================================================================== --- csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-03-dh-generate.diff (rev 0) +++ csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-03-dh-generate.diff 2010-05-20 14:01:10 UTC (rev 9937) @@ -0,0 +1,93 @@ +--- libtorrent-0.12.2.orig/src/utils/diffie_hellman.cc Wed May 7 12:19:12 2008 ++++ libtorrent-0.12.2/src/utils/diffie_hellman.cc Sun Jun 15 10:51:31 2008 +@@ -47,6 +47,80 @@ + + namespace torrent { + ++static int generate_key(DH *dh) ++ { ++ int ok=0; ++ int generate_new_key=0; ++ unsigned l; ++ BN_CTX *ctx; ++ BN_MONT_CTX *mont=NULL; ++ BIGNUM *pub_key=NULL,*priv_key=NULL; ++ ++ ctx = BN_CTX_new(); ++ if (ctx == NULL) goto err; ++ ++ if (dh->priv_key == NULL) ++ { ++ priv_key=BN_new(); ++ if (priv_key == NULL) goto err; ++ generate_new_key=1; ++ } ++ else ++ priv_key=dh->priv_key; ++ ++ if (dh->pub_key == NULL) ++ { ++ pub_key=BN_new(); ++ if (pub_key == NULL) goto err; ++ } ++ else ++ pub_key=dh->pub_key; ++ ++ ++ if (dh->flags & DH_FLAG_CACHE_MONT_P) ++ { ++ mont = BN_MONT_CTX_set_locked((BN_MONT_CTX **)(&dh->method_mont_p), ++ CRYPTO_LOCK_DH, dh->p, ctx); ++ if (!mont) ++ goto err; ++ } ++ ++ if (generate_new_key) ++ { ++ l = dh->length ? dh->length : BN_num_bits(dh->p)-1; /* secret exponent length */ ++ if (!BN_rand(priv_key, l, 0, 0)) ++ if (!BN_pseudo_rand(priv_key, l, 0, 0)) goto err; ++ } ++ ++ { ++ BIGNUM local_prk; ++ BIGNUM *prk; ++ ++ if ((dh->flags & DH_FLAG_NO_EXP_CONSTTIME) == 0) ++ { ++ BN_init(&local_prk); ++ prk = &local_prk; ++ BN_with_flags(prk, priv_key, BN_FLG_EXP_CONSTTIME); ++ } ++ else ++ prk = priv_key; ++ ++ if (!dh->meth->bn_mod_exp(dh, pub_key, dh->g, prk, dh->p, ctx, mont)) goto err; ++ } ++ ++ dh->pub_key=pub_key; ++ dh->priv_key=priv_key; ++ ok=1; ++err: ++ if (ok != 1) { ++ } ++ ++ if ((pub_key != NULL) && (dh->pub_key == NULL)) BN_free(pub_key); ++ if ((priv_key != NULL) && (dh->priv_key == NULL)) BN_free(priv_key); ++ BN_CTX_free(ctx); ++ return(ok); ++} ++ + DiffieHellman::DiffieHellman(const unsigned char *prime, int primeLength, + const unsigned char *generator, int generatorLength) : + m_secret(NULL) { +@@ -56,7 +130,8 @@ + m_dh->p = BN_bin2bn(prime, primeLength, NULL); + m_dh->g = BN_bin2bn(generator, generatorLength, NULL); + +- DH_generate_key(m_dh); ++ if (!generate_key(m_dh)) ++ throw internal_error("Unable to generate encryption key."); + #else + throw internal_error("Compiled without encryption support."); + #endif Added: csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-04-sunpro.diff =================================================================== --- csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-04-sunpro.diff (rev 0) +++ csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-04-sunpro.diff 2010-05-20 14:01:10 UTC (rev 9937) @@ -0,0 +1,887 @@ +--- rtorrent-0.8.2.orig/rak/string_manip.h 2008-05-07 08:19:12.000000000 -0400 ++++ rtorrent-0.8.2/rak/string_manip.h 2008-06-25 02:14:10.028329996 -0400 +@@ -62,7 +62,7 @@ + + template + Sequence trim_end(const Sequence& seq) { +- if (seq.empty() || !std::isspace(*(--seq.end()))) ++ if (seq.empty() || !std::isspace(*(seq.end()-1))) + return seq; + + typename Sequence::size_type pos = seq.size(); +@@ -93,7 +93,7 @@ + + template + Sequence trim_end_classic(const Sequence& seq) { +- if (seq.empty() || !std::isspace(*(--seq.end()), std::locale::classic())) ++ if (seq.empty() || !std::isspace(*(seq.end()-1), std::locale::classic())) + return seq; + + typename Sequence::size_type pos = seq.size(); +--- libtorrent-0.12.2.orig/rak/path.h 2008-05-07 08:19:12.000000000 -0400 ++++ libtorrent-0.12.2/rak/path.h 2008-06-25 01:57:52.656513911 -0400 +@@ -42,6 +42,7 @@ + + #include + #include ++#include + + namespace rak { + +@@ -91,7 +92,7 @@ + if (home == NULL) + return first; + +- first += strlcpy(first, home, std::distance(first, last)); ++ first += strlcpy(first, home, last-first); + + if (first > last) + return last; +@@ -99,7 +100,7 @@ + src++; + } + +- return std::max(first + strlcpy(first, src, std::distance(first, last)), last); ++ return std::max(first + strlcpy(first, src, last-first), last); + } + + } +--- rtorrent-0.8.2.orig/rak/unordered_vector.h 2008-05-07 08:19:12.000000000 -0400 ++++ rtorrent-0.8.2/rak/unordered_vector.h 2008-06-25 02:29:35.381434005 -0400 +@@ -90,7 +90,7 @@ + unordered_vector<_Tp>::insert(iterator position, const value_type& x) { + Base::push_back(x); + +- return --end(); ++ return end()-1; + } + + template +--- rtorrent-0.8.2.orig/rak/socket_address.h 2008-05-07 08:19:12.000000000 -0400 ++++ rtorrent-0.8.2/rak/socket_address.h 2008-06-25 01:58:48.126132462 -0400 +@@ -50,6 +50,7 @@ + #include + #include + #include ++#include + #include + #include + #include +--- rtorrent-0.8.2.orig/rak/regex.h 2008-05-07 08:19:12.000000000 -0400 ++++ rtorrent-0.8.2/rak/regex.h 2008-06-25 02:10:05.332867456 -0400 +@@ -75,7 +75,7 @@ + std::list paths; + paths.push_front(0); + +- for (std::string::const_iterator itrText = ++text.begin(), lastText = text.end(); itrText != lastText; ++itrText) { ++ for (std::string::const_iterator itrText = text.begin()+1, lastText = text.end(); itrText != lastText; ++itrText) { + + for (std::list::iterator itrPaths = paths.begin(), lastPaths = paths.end(); itrPaths != lastPaths; ) { + +--- rtorrent-0.8.2.orig/rak/algorithm.h 2008-05-07 08:19:12.000000000 -0400 ++++ rtorrent-0.8.2/rak/algorithm.h 2008-06-25 17:27:39.728352000 -0400 +@@ -40,6 +40,63 @@ + #include + #include + ++#ifdef _RWSTD_NO_CLASS_PARTIAL_SPEC ++namespace std { ++ template struct iterator_traits ++ { ++ typedef typename Iterator::value_type value_type; ++ typedef typename Iterator::difference_type difference_type; ++ typedef typename Iterator::pointer pointer; ++ typedef typename Iterator::reference reference; ++ typedef typename Iterator::iterator_category iterator_category; ++ }; ++ template struct iterator_traits ++ { ++ typedef T value_type; ++ typedef ptrdiff_t difference_type; ++ typedef T* pointer; ++ typedef T& reference; ++ typedef random_access_iterator_tag iterator_category; ++ }; ++ template struct iterator_traits ++ { ++ typedef T value_type; ++ typedef ptrdiff_t difference_type; ++ typedef const T* pointer; ++ typedef const T& reference; ++ typedef random_access_iterator_tag iterator_category; ++ }; ++ ++ template ++ inline typename iterator_traits::difference_type ++ distance (ForwardIterator first, ForwardIterator last) ++ { ++ typename iterator_traits::difference_type n = 0; ++ __distance(first, last, n, ++ iterator_traits::iterator_category()); ++ return n; ++ } ++ ++ template ++ inline typename iterator_traits::difference_type ++ count (InputIterator first, InputIterator last, const T& value) ++ { ++ typename iterator_traits::difference_type n = 0; ++ count(first, last, value, n); ++ return n; ++ } ++ ++ template ++ inline typename iterator_traits::difference_type ++ count_if (InputIterator first, InputIterator last, Predicate pred) ++ { ++ typename iterator_traits::difference_type n = 0; ++ count_if(first, last, pred, n); ++ return n; ++ } ++} ++#endif ++ + namespace rak { + + template +--- libtorrent-0.12.2.orig/src/download/choke_manager.cc 2008-05-07 08:19:13.000000000 -0400 ++++ libtorrent-0.12.2/src/download/choke_manager.cc 2008-06-24 13:40:32.322166472 -0400 +@@ -41,8 +41,10 @@ + #include + #include + ++#include "rak/algorithm.h" + #include "protocol/peer_connection_base.h" + #include "torrent/peer/connection_list.h" ++#include "resource_manager.h" + + #include "choke_manager.h" + #include "choke_manager_node.h" +@@ -261,7 +263,7 @@ + rak::less(i * ChokeManager::order_base + (ChokeManager::order_base - 1), + rak::mem_ref(&ChokeManager::value_type::second))); + +- if (std::distance(target[i].second, target[i + 1].second) != 0) ++ if (target[i].second != target[i + 1].second) + weightTotal += weights[i]; + } + +--- libtorrent-0.12.2.orig/src/download/delegator.cc 2008-05-07 08:19:13.000000000 -0400 ++++ libtorrent-0.12.2/src/download/delegator.cc 2008-06-24 13:42:52.016431294 -0400 +@@ -46,7 +46,9 @@ + #include "torrent/data/block.h" + #include "torrent/data/block_list.h" + #include "torrent/data/block_transfer.h" ++#include "torrent/data/file_list.h" + #include "protocol/peer_chunks.h" ++#include "download/chunk_selector.h" + + #include "delegator.h" + +--- libtorrent-0.12.2.orig/src/download/download_constructor.cc 2008-05-07 08:19:13.000000000 -0400 ++++ libtorrent-0.12.2/src/download/download_constructor.cc 2008-06-24 14:56:59.728556042 -0400 +@@ -317,7 +317,7 @@ + Path p; + p.set_encoding(enc); + +- std::transform(plist.begin(), plist.end(), std::back_inserter(p), std::mem_fun_ref(&Object::as_string)); ++ std::transform(((Object::list_type&)plist).begin(), ((Object::list_type&)plist).end(), std::back_inserter(p), std::mem_fun_ref(&Object::as_string)); + + return p; + } +--- libtorrent-0.12.2.orig/src/download/download_info.h 2008-05-07 08:19:13.000000000 -0400 ++++ libtorrent-0.12.2/src/download/download_info.h 2008-06-28 00:07:50.060545422 -0400 +@@ -186,10 +186,13 @@ + }; + + // Move somewhere else. ++#if defined(__APPLE__) || defined(__SUNPRO_CC) ++#pragma pack(1) ++#endif + struct SocketAddressCompact { +- SocketAddressCompact() {} +- SocketAddressCompact(uint32_t a, uint16_t p) : addr(a), port(p) {} +- SocketAddressCompact(const rak::socket_address_inet* sa) : addr(sa->address_n()), port(sa->port_n()) {} ++ //SocketAddressCompact() {} ++ //SocketAddressCompact(uint32_t a, uint16_t p) : addr(a), port(p) {} ++ //SocketAddressCompact(const rak::socket_address_inet* sa) : addr(sa->address_n()), port(sa->port_n()) {} + + operator rak::socket_address () const { + rak::socket_address sa; +@@ -205,6 +208,9 @@ + + const char* c_str() const { return reinterpret_cast(this); } + } __attribute__ ((packed)); ++#if defined(__APPLE__) || defined(__SUNPRO_CC) ++#pragma pack() ++#endif + + } + +--- libtorrent-0.12.2.orig/src/download/download_main.cc 2008-05-07 08:19:13.000000000 -0400 ++++ libtorrent-0.12.2/src/download/download_main.cc 2008-06-28 16:05:20.725211632 -0400 +@@ -356,8 +356,13 @@ + PeerConnectionBase* pcb = (*itr)->m_ptr(); + const rak::socket_address* sa = rak::socket_address::cast_from(pcb->peer_info()->socket_address()); + +- if (pcb->peer_info()->listen_port() != 0 && sa->family() == rak::socket_address::af_inet) +- current.push_back(SocketAddressCompact(sa->sa_inet()->address_n(), pcb->peer_info()->listen_port())); ++ if (pcb->peer_info()->listen_port() != 0 && sa->family() == rak::socket_address::af_inet) { ++ SocketAddressCompact s = { ++ sa->sa_inet()->address_n(), ++ pcb->peer_info()->listen_port() ++ }; ++ current.push_back(s); ++ } + + if (!pcb->extensions()->is_remote_supported(ProtocolExtension::UT_PEX)) + continue; +--- libtorrent-0.12.2.orig/src/dht/dht_router.cc 2008-05-07 08:19:12.000000000 -0400 ++++ libtorrent-0.12.2/src/dht/dht_router.cc 2008-06-24 13:22:15.691370259 -0400 +@@ -88,7 +88,7 @@ + } + + set_bucket(new DhtBucket(zero_id, ones_id)); +- m_routingTable.insert(std::make_pair(bucket()->id_range_end(), bucket())); ++ m_routingTable.insert(DhtBucketList::value_type(bucket()->id_range_end(), bucket())); + + if (cache.has_key("nodes")) { + const Object::map_type& nodes = cache.get_key_map("nodes"); +@@ -163,12 +163,12 @@ + if (!create) + return NULL; + +- std::pair res = m_trackers.insert(std::make_pair(hash, new DhtTracker())); ++ std::pair res = m_trackers.insert(std::make_pair(hash, new DhtTracker())); + + if (!res.second) + throw internal_error("DhtRouter::get_tracker did not actually insert tracker."); + +- return res.first.tracker(); ++ return (*res.first).second; + } + + bool +@@ -552,7 +552,7 @@ + throw internal_error("DhtRouter::split_bucket router ID ended up in wrong bucket."); + + // Insert new bucket with iterator hint = just before current bucket. +- DhtBucketList::iterator other = m_routingTable.insert(itr, std::make_pair(newBucket->id_range_end(), newBucket)); ++ DhtBucketList::iterator other = m_routingTable.insert(itr, DhtBucketList::value_type(newBucket->id_range_end(), newBucket)); + + // Check that the bucket we're not adding the node to isn't empty. + if (other->second->is_in_range(node->id())) { +--- libtorrent-0.12.2.orig/src/dht/dht_router.h 2008-05-07 08:19:12.000000000 -0400 ++++ libtorrent-0.12.2/src/dht/dht_router.h 2008-06-24 13:05:12.790210488 -0400 +@@ -137,7 +137,7 @@ + // Maximum number of potential contacts to keep until bootstrap complete. + static const unsigned int num_bootstrap_contacts = 64; + +- typedef std::map DhtBucketList; ++ typedef std::map DhtBucketList; + + DhtBucketList::iterator find_bucket(const HashString& id); + +--- libtorrent-0.12.2.orig/src/dht/dht_server.h 2008-05-07 08:19:12.000000000 -0400 ++++ libtorrent-0.12.2/src/dht/dht_server.h 2008-06-28 00:08:34.254158759 -0400 +@@ -108,6 +108,9 @@ + + typedef std::deque packet_queue; + ++#if defined(__APPLE__) || defined(__SUNPRO_CC) ++#pragma pack(1) ++#endif + struct compact_node_info { + char _id[20]; + SocketAddressCompact _addr; +@@ -115,6 +118,9 @@ + HashString& id() { return *HashString::cast_from(_id); } + rak::socket_address address() { return rak::socket_address(_addr); } + } __attribute__ ((packed)); ++#if defined(__APPLE__) || defined(__SUNPRO_CC) ++#pragma pack() ++#endif + typedef std::list node_info_list; + + // Pending transactions. +--- libtorrent-0.12.2.orig/src/dht/dht_transaction.cc 2008-05-07 08:19:12.000000000 -0400 ++++ libtorrent-0.12.2/src/dht/dht_transaction.cc 2008-06-24 13:33:28.590473835 -0400 +@@ -68,7 +68,7 @@ + if (m_concurrency != 3) + throw internal_error("DhtSearch::~DhtSearch with invalid concurrency limit."); + +- for (accessor itr = begin(); itr != end(); ++itr) ++ for (accessor itr = begin(); static_cast(itr) != end(); ++itr) + delete itr.node(); + } + +@@ -141,7 +141,7 @@ + // We're done if we can't find any more nodes to contact. + m_next = end(); + +- for (accessor itr = base_type::begin(); itr != end(); ) { ++ for (accessor itr = base_type::begin(); static_cast(itr) != end(); ) { + // If we have all we need, delete current node unless it is + // currently being contacted. + if (!itr.node()->is_active() && needClosest <= 0 && (!itr.node()->is_good() || needGood <= 0)) { +@@ -264,7 +264,7 @@ + void + DhtTransactionPacket::build_buffer(const Object& data) { + char buffer[1500]; // If the message would exceed an Ethernet frame, something went very wrong. +- object_buffer_t result = object_write_bencode_c(object_write_to_buffer, NULL, std::make_pair(buffer, buffer + sizeof(buffer)), &data); ++ object_buffer_t result = object_write_bencode_c(object_write_to_buffer, NULL, std::make_pair((char*)buffer, buffer + sizeof(buffer)), &data); + + m_length = result.second - buffer; + m_data = new char[m_length]; +--- libtorrent-0.12.2.orig/src/dht/dht_bucket.cc 2008-05-07 08:19:12.000000000 -0400 ++++ libtorrent-0.12.2/src/dht/dht_bucket.cc 2008-06-24 02:41:04.089051646 -0400 +@@ -36,6 +36,7 @@ + + #include "config.h" + ++#include "rak/algorithm.h" + #include "torrent/exceptions.h" + + #include "dht_bucket.h" +--- libtorrent-0.12.2.orig/src/dht/dht_node.cc 2008-05-07 08:19:12.000000000 -0400 ++++ libtorrent-0.12.2/src/dht/dht_node.cc 2008-06-28 15:57:24.639449987 -0400 +@@ -77,7 +77,10 @@ + DhtNode::store_compact(char* buffer) const { + HashString::cast_from(buffer)->assign(data()); + +- SocketAddressCompact sa(address()->sa_inet()); ++ SocketAddressCompact sa = { ++ m_socketAddress.sa_inet()->address_n(), ++ m_socketAddress.sa_inet()->port_n() ++ }; + std::memcpy(buffer + 20, sa.c_str(), 6); + + return buffer + 26; +--- libtorrent-0.12.2.orig/src/dht/dht_server.cc 2008-05-07 08:19:12.000000000 -0400 ++++ libtorrent-0.12.2/src/dht/dht_server.cc 2008-06-24 13:24:40.374916857 -0400 +@@ -582,7 +582,7 @@ + } + + // We know where to insert it, so pass that as hint. +- insertItr = m_transactions.insert(insertItr, std::make_pair(transaction->key(id), transaction)); ++ insertItr = m_transactions.insert(insertItr, transaction_map::value_type(transaction->key(id), transaction)); + + create_query(insertItr, id, transaction->address(), priority); + +--- libtorrent-0.12.2.orig/src/dht/dht_tracker.cc 2008-05-07 08:19:12.000000000 -0400 ++++ libtorrent-0.12.2/src/dht/dht_tracker.cc 2008-06-28 16:03:29.929469325 -0400 +@@ -47,7 +47,7 @@ + if (port == 0) + return; + +- SocketAddressCompact compact(addr, port); ++ SocketAddressCompact compact = { addr, port }; + + unsigned int oldest = 0; + uint32_t minSeen = ~uint32_t(); +--- libtorrent-0.12.2.orig/src/protocol/extensions.cc 2008-05-07 08:19:12.000000000 -0400 ++++ libtorrent-0.12.2/src/protocol/extensions.cc 2008-06-24 15:01:20.887800483 -0400 +@@ -119,7 +119,7 @@ + message.insert_key("reqq", 2048); // maximum request queue size + + char buffer[1024]; +- object_buffer_t result = object_write_bencode_c(object_write_to_buffer, NULL, std::make_pair(buffer, buffer + sizeof(buffer)), &message); ++ object_buffer_t result = object_write_bencode_c(object_write_to_buffer, NULL, std::make_pair((char*)buffer, buffer + sizeof(buffer)), &message); + + int length = result.second - buffer; + char* copy = new char[length]; +--- libtorrent-0.12.2.orig/src/protocol/peer_connection_leech.cc 2008-05-07 08:19:12.000000000 -0400 ++++ libtorrent-0.12.2/src/protocol/peer_connection_leech.cc 2008-06-24 15:19:28.492038823 -0400 +@@ -697,7 +697,9 @@ + } + } + ++#ifndef __SUNPRO_CC + template<> ++#endif + void + PeerConnection::offer_chunk() { + // If bytes left to send in this chunk minus bytes about to be sent is zero, +@@ -718,7 +720,9 @@ + m_data.bytesLeft = m_download->file_list()->chunk_index_size(index); + } + ++#ifndef __SUNPRO_CC + template<> ++#endif + bool + PeerConnection::should_upload() { + // For initial seeding, check if chunk is well seeded now, and if so +--- libtorrent-0.12.2.orig/src/protocol/handshake_manager.cc 2008-05-07 08:19:12.000000000 -0400 ++++ libtorrent-0.12.2/src/protocol/handshake_manager.cc 2008-06-24 15:11:50.179786185 -0400 +@@ -37,6 +37,7 @@ + #include "config.h" + + #include ++#include + + #include "torrent/exceptions.h" + #include "torrent/error.h" +--- libtorrent-0.12.2.orig/src/protocol/handshake.cc 2008-05-07 08:19:12.000000000 -0400 ++++ libtorrent-0.12.2/src/protocol/handshake.cc 2008-06-24 15:05:32.683533289 -0400 +@@ -36,8 +36,10 @@ + + #include "config.h" + ++#include "rak/algorithm.h" + #include "download/download_info.h" + #include "download/download_main.h" ++#include "download/download_manager.h" + #include "net/throttle_list.h" + #include "torrent/dht_manager.h" + #include "torrent/exceptions.h" +@@ -324,14 +326,16 @@ + return false; + } + ++ uint32_t len = std::distance(m_readBuffer.position(), itr); ++ + if (m_incoming) { + // We've found HASH('req1' + S), skip that and go on reading the + // SKEY hash. +- m_readBuffer.consume(std::distance(m_readBuffer.position(), itr) + 20); ++ m_readBuffer.consume(len + 20); + m_state = READ_ENC_SKEY; + + } else { +- m_readBuffer.consume(std::distance(m_readBuffer.position(), itr)); ++ m_readBuffer.consume(len); + m_state = READ_ENC_NEGOT; + } + +@@ -935,10 +939,12 @@ + m_writeBuffer.move_end(96); + + int length = random() % enc_pad_size; +- char pad[length]; ++ char* pad = new char[length]; + + std::generate_n(pad, length, &::random); + m_writeBuffer.write_len(pad, length); ++ ++ delete pad; + } + + void +--- libtorrent-0.12.2.orig/src/data/memory_chunk.h 2008-05-07 08:19:13.000000000 -0400 ++++ libtorrent-0.12.2/src/data/memory_chunk.h 2008-06-25 21:14:31.067671826 -0400 +@@ -47,28 +47,30 @@ + // Consider information about whetever the memory maps to a file or + // not, since mincore etc can only be called on files. + +- static const int prot_exec = PROT_EXEC; +- static const int prot_read = PROT_READ; +- static const int prot_write = PROT_WRITE; +- static const int prot_none = PROT_NONE; +- static const int map_shared = MAP_SHARED; ++ enum { ++ prot_exec = PROT_EXEC, ++ prot_read = PROT_READ, ++ prot_write = PROT_WRITE, ++ prot_none = PROT_NONE, ++ map_shared = MAP_SHARED, + + #ifdef USE_MADVISE +- static const int advice_normal = MADV_NORMAL; +- static const int advice_random = MADV_RANDOM; +- static const int advice_sequential = MADV_SEQUENTIAL; +- static const int advice_willneed = MADV_WILLNEED; +- static const int advice_dontneed = MADV_DONTNEED; ++ advice_normal = MADV_NORMAL, ++ advice_random = MADV_RANDOM, ++ advice_sequential = MADV_SEQUENTIAL, ++ advice_willneed = MADV_WILLNEED, ++ advice_dontneed = MADV_DONTNEED, + #else +- static const int advice_normal = 0; +- static const int advice_random = 1; +- static const int advice_sequential = 2; +- static const int advice_willneed = 3; +- static const int advice_dontneed = 4; ++ advice_normal = 0, ++ advice_random = 1, ++ advice_sequential = 2, ++ advice_willneed = 3, ++ advice_dontneed = 4, + #endif +- static const int sync_sync = MS_SYNC; +- static const int sync_async = MS_ASYNC; +- static const int sync_invalidate = MS_INVALIDATE; ++ sync_sync = MS_SYNC, ++ sync_async = MS_ASYNC, ++ sync_invalidate = MS_INVALIDATE, ++ }; + + MemoryChunk() { clear(); } + ~MemoryChunk() { clear(); } +--- libtorrent-0.12.2.orig/src/data/chunk_list.cc 2008-06-25 01:44:37.768468000 -0400 ++++ libtorrent-0.12.2/src/data/chunk_list.cc 2008-06-25 23:55:12.466495173 -0400 +@@ -301,27 +301,18 @@ + + std::pair + ChunkList::sync_options(ChunkListNode* node, int flags) { +- // Using if statements since some linkers have problem with static +- // const int members inside the ?: operators. The compiler should +- // be optimizing this anyway. ++ int sync = MemoryChunk::sync_async; ++ bool end = true; + +- if (flags & sync_force) { ++ if (flags & sync_safe) { + +- if (flags & sync_safe) +- return std::make_pair(MemoryChunk::sync_sync, true); ++ if (flags & sync_force || node->sync_triggered()) ++ sync = MemoryChunk::sync_sync; + else +- return std::make_pair(MemoryChunk::sync_async, true); +- +- } else if (flags & sync_safe) { +- +- if (node->sync_triggered()) +- return std::make_pair(MemoryChunk::sync_sync, true); +- else +- return std::make_pair(MemoryChunk::sync_async, false); +- +- } else { +- return std::make_pair(MemoryChunk::sync_async, true); ++ end = false; + } ++ ++ return std::make_pair(sync, end); + } + + // Using a rather simple algorithm for now. This should really be more +--- libtorrent-0.12.2.orig/src/data/memory_chunk.cc 2008-06-23 17:08:43.395684068 -0400 ++++ libtorrent-0.12.2/src/data/memory_chunk.cc 2008-06-24 02:39:28.399927218 -0400 +@@ -152,11 +152,15 @@ + bool + MemoryChunk::is_incore(uint32_t offset, uint32_t length) { + uint32_t size = pages_touched(offset, length); +- char buf[size]; ++ char* buf = new char[size]; + + incore(buf, offset, length); + +- return std::find(buf, buf + size, 0) == buf + size; ++ bool ret = (std::find(buf, buf + size, 0) == buf + size); ++ ++ delete buf; ++ ++ return ret; + } + + } +--- libtorrent-0.12.2.orig/src/data/hash_torrent.cc 2008-05-07 08:19:13.000000000 -0400 ++++ libtorrent-0.12.2/src/data/hash_torrent.cc 2008-06-24 02:36:22.017033961 -0400 +@@ -38,6 +38,7 @@ + + #include "data/chunk_list.h" + #include "torrent/exceptions.h" ++#include "download/download_wrapper.h" + + #include "hash_torrent.h" + #include "hash_queue.h" +--- libtorrent-0.12.2.orig/src/data/hash_queue.cc 2008-05-07 08:19:13.000000000 -0400 ++++ libtorrent-0.12.2/src/data/hash_queue.cc 2008-06-23 19:17:24.270411715 -0400 +@@ -39,6 +39,7 @@ + #include + + #include "torrent/exceptions.h" ++#include "download/download_wrapper.h" + + #include "hash_queue.h" + #include "hash_chunk.h" +--- libtorrent-0.12.2.orig/src/data/chunk_part.cc 2008-05-07 08:19:13.000000000 -0400 ++++ libtorrent-0.12.2/src/data/chunk_part.cc 2008-06-23 19:16:19.997055043 -0400 +@@ -39,6 +39,7 @@ + #include + #include + ++#include "rak/algorithm.h" + #include "torrent/exceptions.h" + #include "chunk_part.h" + +@@ -70,11 +71,13 @@ + + int length = size() - pos; + int touched = m_chunk.pages_touched(pos, length); +- char buf[touched]; ++ char* buf = new char[touched]; + + m_chunk.incore(buf, pos, length); + + int dist = std::distance(buf, std::find(buf, buf + touched, 0)); ++ ++ delete buf; + + return std::min(dist ? (dist * m_chunk.page_size() - m_chunk.page_align()) : 0, + size() - pos); +--- libtorrent-0.12.2.orig/src/data/chunk_list.cc 2008-05-07 08:19:13.000000000 -0400 ++++ libtorrent-0.12.2/src/data/chunk_list.cc 2008-06-23 19:14:40.468978454 -0400 +@@ -38,6 +38,8 @@ + + #include "torrent/exceptions.h" + #include "torrent/chunk_manager.h" ++#include "torrent/data/file_utils.h" ++#include "download/download_wrapper.h" + + #include "chunk_list.h" + #include "chunk.h" +@@ -349,16 +351,18 @@ + bool required = std::find_if(itr, range, std::bind1st(std::mem_fun(&ChunkList::check_node), this)) != range; + dontSkip = dontSkip || required; + +- if (!required && std::distance(itr, range) < maxDistance) { ++ unsigned int l = range - itr; ++ ++ if (!required && l < maxDistance) { + // Don't sync this range. +- unsigned int l = std::min(range - itr, itr - first); ++ l = std::min(l, (unsigned int)(itr - first)); + std::swap_ranges(first, first + l, range - l); + + first += l; + + } else { + // This probably increases too fast. +- weight -= std::distance(itr, range) * std::distance(itr, range); ++ weight -= l * l; + } + + itr = range; +--- libtorrent-0.12.2.orig/src/utils/sha1.h 2008-05-07 08:19:12.000000000 -0400 ++++ libtorrent-0.12.2/src/utils/sha1.h 2008-06-24 02:34:12.101392402 -0400 +@@ -37,11 +37,10 @@ + #ifndef LIBTORRENT_HASH_COMPUTE_H + #define LIBTORRENT_HASH_COMPUTE_H + +-#include +- + #if defined USE_NSS_SHA + #include "sha_fast.h" + #elif defined USE_OPENSSL_SHA ++#include + #include + #else + #error "No SHA1 implementation selected, choose between Mozilla's NSS and OpenSSL." +--- libtorrent-0.12.2.orig/src/tracker/tracker_http.cc 2008-05-07 08:19:13.000000000 -0400 ++++ libtorrent-0.12.2/src/tracker/tracker_http.cc 2008-06-24 15:21:07.562782258 -0400 +@@ -48,6 +48,7 @@ + #include "torrent/http.h" + #include "torrent/object_stream.h" + #include "torrent/tracker_list.h" ++#include "torrent/data/file_list.h" + + #include "tracker_http.h" + +--- libtorrent-0.12.2.orig/src/tracker/tracker_manager.cc 2008-05-07 08:19:13.000000000 -0400 ++++ libtorrent-0.12.2/src/tracker/tracker_manager.cc 2008-06-24 15:23:58.547482693 -0400 +@@ -36,7 +36,9 @@ + + #include "config.h" + ++#include "rak/algorithm.h" + #include "download/download_info.h" ++#include "download/download_wrapper.h" + #include "torrent/exceptions.h" + #include "torrent/tracker.h" + #include "torrent/tracker_list.h" +--- libtorrent-0.12.2.orig/src/tracker/tracker_udp.cc 2008-05-07 08:19:13.000000000 -0400 ++++ libtorrent-0.12.2/src/tracker/tracker_udp.cc 2008-06-24 15:35:31.207275209 -0400 +@@ -45,6 +45,7 @@ + #include "torrent/connection_manager.h" + #include "torrent/poll.h" + #include "torrent/tracker_list.h" ++#include "torrent/data/file_list.h" + + #include "tracker_udp.h" + #include "manager.h" +@@ -325,7 +326,7 @@ + m_readBuffer->read_32() != m_transactionId) + return false; + +- receive_failed("Received error message: " + std::string(m_readBuffer->position(), m_readBuffer->end())); ++ receive_failed("Received error message: " + std::string((char*)m_readBuffer->position(), m_readBuffer->remaining())); + return true; + } + +--- libtorrent-0.12.2.orig/src/torrent/chunk_manager.cc 2008-05-07 08:19:13.000000000 -0400 ++++ libtorrent-0.12.2/src/torrent/chunk_manager.cc 2008-06-23 18:46:12.474491305 -0400 +@@ -112,7 +112,7 @@ + if (itr == base_type::end()) + throw internal_error("ChunkManager::erase(...) itr == base_type::end()."); + +- std::iter_swap(itr, --base_type::end()); ++ std::iter_swap(itr, base_type::end()-1); + base_type::pop_back(); + + chunkList->set_manager(NULL); +--- libtorrent-0.12.2.orig/src/torrent/peer/connection_list.cc 2008-05-07 08:19:13.000000000 -0400 ++++ libtorrent-0.12.2/src/torrent/peer/connection_list.cc 2008-06-23 18:42:38.710410872 -0400 +@@ -141,7 +141,7 @@ + // Need to do it one connection at the time to ensure that when the + // signal is emited everything is in a valid state. + while (pos != end()) +- erase(--end(), flags); ++ erase(end()-1, flags); + + m_download->info()->set_accepting_new_peers(size() < m_maxSize); + } +--- libtorrent-0.12.2.orig/src/torrent/object_stream.cc 2008-05-07 08:19:13.000000000 -0400 ++++ libtorrent-0.12.2/src/torrent/object_stream.cc 2008-06-23 22:07:52.705714634 -0400 +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + + #include "utils/sha1.h" + +@@ -233,7 +234,7 @@ + src /= 10; + } + +- object_write_bencode_c_string(output, first, 20 - std::distance(buffer, first)); ++ object_write_bencode_c_string(output, first, 20 - (first - buffer)); + } + + void +--- libtorrent-0.12.2.orig/src/torrent/download.cc 2008-05-07 08:19:13.000000000 -0400 ++++ libtorrent-0.12.2/src/torrent/download.cc 2008-06-23 18:56:21.847160292 -0400 +@@ -36,6 +36,7 @@ + + #include "config.h" + ++#include + #include + #include + #include +--- libtorrent-0.12.2.orig/src/torrent/data/file_list.cc 2008-06-23 18:17:42.415878000 -0400 ++++ libtorrent-0.12.2/src/torrent/data/file_list.cc 2008-06-23 18:21:51.029221269 -0400 +@@ -42,6 +42,7 @@ + #include + #include + #include ++#include + #include + #include + #include +--- libtorrent-0.12.2.orig/src/torrent/data/file_utils.cc 2008-06-23 18:25:06.488832000 -0400 ++++ libtorrent-0.12.2/src/torrent/data/file_utils.cc 2008-06-23 18:25:31.066012126 -0400 +@@ -60,7 +60,7 @@ + FileList::split_type* splitItr = splitList; + + unsigned int nameSize = srcPath->back().size() + suffix.size(); +- char name[nameSize + 4]; ++ char* name = new char[nameSize + 4]; + + std::memcpy(name, srcPath->back().c_str(), srcPath->back().size()); + std::memcpy(name + srcPath->back().size(), suffix.c_str(), suffix.size()); +@@ -80,6 +80,8 @@ + splitItr->second.back() = name; + } + ++ delete name; ++ + return fileList->split(position, splitList, splitItr).second; + } + +--- libtorrent-0.12.2.orig/src/torrent/data/block.cc 2008-05-07 08:19:13.000000000 -0400 ++++ libtorrent-0.12.2/src/torrent/data/block.cc 2008-06-23 17:24:05.346918013 -0400 +@@ -38,6 +38,7 @@ + + #include + #include ++#include + #include + + #include "peer/peer_info.h" +--- libtorrent-0.12.2.orig/src/torrent/data/transfer_list.cc 2008-05-07 08:19:13.000000000 -0400 ++++ libtorrent-0.12.2/src/torrent/data/transfer_list.cc 2008-06-24 15:09:29.809436919 -0400 +@@ -39,9 +39,12 @@ + #include + #include + #include ++#include + #include + + #include "data/chunk.h" ++#include "download/download_main.h" ++#include "download/chunk_selector.h" + #include "peer/peer_info.h" + + #include "block_failed.h" +--- libtorrent-0.12.2.orig/src/torrent/poll_select.cc 2008-05-07 08:19:13.000000000 -0400 ++++ libtorrent-0.12.2/src/torrent/poll_select.cc 2008-06-23 19:06:09.911597997 -0400 +@@ -37,6 +37,7 @@ + #include "config.h" + + #include ++#include + + #include + #include +--- libtorrent-0.12.2.orig/src/torrent/hash_string.h 2008-05-07 08:19:13.000000000 -0400 ++++ libtorrent-0.12.2/src/torrent/hash_string.h 2008-06-23 17:11:39.337687346 -0400 +@@ -56,8 +56,16 @@ + typedef const value_type* const_iterator; + typedef std::size_t size_type; + typedef std::ptrdiff_t difference_type; ++#ifndef __SUNPRO_CC + typedef std::reverse_iterator reverse_iterator; + typedef std::reverse_iterator const_reverse_iterator; ++#else ++ typedef std::reverse_iterator reverse_iterator; ++ ++ typedef std::reverse_iterator const_reverse_iterator; ++#endif /* SIGC_HAVE_SUN_REVERSE_ITERATOR */ + + static const size_type size_data = 20; + +--- libtorrent-0.12.2.orig/src/torrent/resume.cc 2008-05-07 08:19:13.000000000 -0400 ++++ libtorrent-0.12.2/src/torrent/resume.cc 2008-06-28 15:58:08.634117091 -0400 +@@ -310,8 +310,13 @@ + + const rak::socket_address* sa = rak::socket_address::cast_from(itr->second->socket_address()); + +- if (sa->family() == rak::socket_address::af_inet) +- peer.insert_key("inet", std::string(SocketAddressCompact(sa->sa_inet()->address_n(), htons(itr->second->listen_port())).c_str(), sizeof(SocketAddressCompact))); ++ if (sa->family() == rak::socket_address::af_inet) { ++ SocketAddressCompact s = { ++ sa->sa_inet()->address_n(), ++ htons(itr->second->listen_port()) ++ }; ++ peer.insert_key("inet", std::string(s.c_str(), sizeof(SocketAddressCompact))); ++ } + + peer.insert_key("failed", itr->second->failed_counter()); + peer.insert_key("last", itr->second->is_connected() ? cachedTime.seconds() : itr->second->last_connection()); +--- libtorrent-0.12.2.orig/src/net/throttle_list.cc 2008-05-07 08:19:12.000000000 -0400 ++++ libtorrent-0.12.2/src/net/throttle_list.cc 2008-06-24 15:00:32.453025557 -0400 +@@ -40,6 +40,8 @@ + #include + #include + ++#include "socket_base.h" ++ + #include "throttle_list.h" + #include "throttle_node.h" + +--- libtorrent-0.12.2.orig/src/net/listen.cc 2008-05-07 08:19:12.000000000 -0400 ++++ libtorrent-0.12.2/src/net/listen.cc 2008-06-24 14:59:01.383033240 -0400 +@@ -45,6 +45,7 @@ + #include "torrent/exceptions.h" + #include "torrent/connection_manager.h" + #include "torrent/poll.h" ++#include "protocol/handshake_manager.h" + + #include "listen.h" + #include "manager.h" Added: csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-05-tracker-usable.diff =================================================================== --- csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-05-tracker-usable.diff (rev 0) +++ csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-05-tracker-usable.diff 2010-05-20 14:01:10 UTC (rev 9937) @@ -0,0 +1,48 @@ +--- libtorrent-0.12.2.orig/src/torrent/tracker_list.cc 2008-07-01 22:21:49.641937000 -0400 ++++ libtorrent-0.12.2/src/torrent/tracker_list.cc 2008-07-01 22:22:08.525804085 -0400 +@@ -66,14 +66,9 @@ + return m_itr != end() && (*m_itr)->is_busy(); + } + +-// Need a custom predicate because the is_usable function is virtual. +-struct tracker_usable_t : public std::unary_function { +- bool operator () (const TrackerList::value_type& value) const { return value->is_usable(); } +-}; +- + bool + TrackerList::has_usable() const { +- return std::find_if(begin(), end(), tracker_usable_t()) != end(); ++ return find_usable(begin()) != end(); + } + + void +@@ -90,6 +85,8 @@ + + set_state(s); + m_itr = find_usable(m_itr); ++ if (m_itr == end()) ++ m_itr = find_usable(begin()); + + if (m_itr != end()) + (*m_itr)->send_state(state()); +@@ -134,18 +131,12 @@ + + TrackerList::iterator + TrackerList::find_usable(iterator itr) { +- while (itr != end() && !tracker_usable_t()(*itr)) +- ++itr; +- +- return itr; ++ return std::find_if(itr, end(), std::mem_fun(&Tracker::is_usable)); + } + + TrackerList::const_iterator + TrackerList::find_usable(const_iterator itr) const { +- while (itr != end() && !tracker_usable_t()(*itr)) +- ++itr; +- +- return itr; ++ return std::find_if(itr, end(), std::mem_fun(&Tracker::is_usable)); + } + + TrackerList::iterator Added: csw/mgar/pkg/libtorrent/trunk/files/work-around-UNUSED.patch =================================================================== --- csw/mgar/pkg/libtorrent/trunk/files/work-around-UNUSED.patch (rev 0) +++ csw/mgar/pkg/libtorrent/trunk/files/work-around-UNUSED.patch 2010-05-20 14:01:10 UTC (rev 9937) @@ -0,0 +1,53 @@ +From 5a6aaf6dd0b924c323d591986117823457bdb387 Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter +Date: Thu, 20 May 2010 10:59:04 +0200 +Subject: [PATCH] work around __UNUSED + +--- + rak/string_manip.h | 2 ++ + src/download/chunk_selector.cc | 2 ++ + src/torrent/poll_kqueue.cc | 2 ++ + 3 files changed, 6 insertions(+), 0 deletions(-) + +diff --git a/rak/string_manip.h b/rak/string_manip.h +index b3f3037..a4f1a6c 100644 +--- a/rak/string_manip.h ++++ b/rak/string_manip.h +@@ -43,6 +43,8 @@ + #include + #include + ++#define __UNUSED ++ + namespace rak { + + // Use these trim functions until n1872 is widely supported. +diff --git a/src/download/chunk_selector.cc b/src/download/chunk_selector.cc +index f814cb2..5685dc1 100644 +--- a/src/download/chunk_selector.cc ++++ b/src/download/chunk_selector.cc +@@ -46,6 +46,8 @@ + #include "chunk_selector.h" + #include "chunk_statistics.h" + ++#define __UNUSED ++ + namespace torrent { + + // Consider making statistics a part of selector. +diff --git a/src/torrent/poll_kqueue.cc b/src/torrent/poll_kqueue.cc +index 9d4d68a..94e8115 100644 +--- a/src/torrent/poll_kqueue.cc ++++ b/src/torrent/poll_kqueue.cc +@@ -53,6 +53,8 @@ + #include + #endif + ++#define __UNUSED ++ + namespace torrent { + + #ifdef USE_KQUEUE +-- +1.7.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Thu May 20 16:45:27 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 20 May 2010 14:45:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[9939] csw/mgar/pkg/transmission/trunk Message-ID: Revision: 9939 http://gar.svn.sourceforge.net/gar/?rev=9939&view=rev Author: janholzh Date: 2010-05-20 14:45:27 +0000 (Thu, 20 May 2010) Log Message: ----------- transmission: update to 1.93 Modified Paths: -------------- csw/mgar/pkg/transmission/trunk/Makefile csw/mgar/pkg/transmission/trunk/checksums Modified: csw/mgar/pkg/transmission/trunk/Makefile =================================================================== --- csw/mgar/pkg/transmission/trunk/Makefile 2010-05-20 14:01:30 UTC (rev 9938) +++ csw/mgar/pkg/transmission/trunk/Makefile 2010-05-20 14:45:27 UTC (rev 9939) @@ -1,5 +1,5 @@ GARNAME = transmission -GARVERSION = 1.92 +GARVERSION = 1.93 CATEGORIES = net DESCRIPTION = Fast, easy, and free multi-platform BitTorrent client @@ -29,7 +29,7 @@ RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWlibcairo RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWlibdbus RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWlibevent -RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWlibxext +#RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWlibxext RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWosslrt RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWpango RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWzlib @@ -62,11 +62,13 @@ EXTRA_LIB = /opt/csw/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -CONFIGURE_ARGS = $(DIRPATHS) --enable-gtk +CONFIGURE_ARGS = $(DIRPATHS) --enable-gtk --disable-silent-rules STRIP_LIBTOOL = 1 TEST_TARGET = check -CHECKPKG_OVERRIDES_CSWtransmissiongtk2 += symbol-not-found|transmission +CHECKPKG_OVERRIDES_CSWtransmissiongtk2 += surplus-dependency|CSWtransmission +CHECKPKG_OVERRIDES_CSWtransmissiongtk2 += surplus-dependency|CSWdbus + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/transmission/trunk/checksums =================================================================== --- csw/mgar/pkg/transmission/trunk/checksums 2010-05-20 14:01:30 UTC (rev 9938) +++ csw/mgar/pkg/transmission/trunk/checksums 2010-05-20 14:45:27 UTC (rev 9939) @@ -1,2 +1,2 @@ cbdb5cfaf24b68727042c3828b252534 icons-makefile.patch -561357621331f294c87f78e22783a283 transmission-1.92.tar.bz2 +f68358d03e46bec5704bbaa894990152 transmission-1.93.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu May 20 18:26:17 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 20 May 2010 16:26:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[9940] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 9940 http://gar.svn.sourceforge.net/gar/?rev=9940&view=rev Author: wahwah Date: 2010-05-20 16:26:17 +0000 (Thu, 20 May 2010) Log Message: ----------- cswclassutils: cswcrontab overhaul. It works now\! Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/checksums csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcrontab csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcrontab Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2010-05-20 14:45:27 UTC (rev 9939) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2010-05-20 16:26:17 UTC (rev 9940) @@ -1,6 +1,6 @@ 48a97af56d55bc90ce90303228ed8cc3 COPYING 9846081f8109dc9149dc026b89fbf137 CSWcswclassutils.i.cswcpsampleconf -9a6f5ad4919b78e4083491edcd86db0c CSWcswclassutils.i.cswcrontab +c3f8655f3a4c3898af79960d8668e6c3 CSWcswclassutils.i.cswcrontab 5e2ae2c6bd828061f86d84f09087b06a CSWcswclassutils.i.cswetcservices 4a0971d15bc02e7496f876336c68ddf4 CSWcswclassutils.i.cswinetd 6abb13158fee906870d1d68dc0fae6f3 CSWcswclassutils.i.cswinitsmf @@ -9,9 +9,9 @@ 0fc6128391af4c9aebf72b84755532cb CSWcswclassutils.i.cswpreserveconf 9018419febe06c12e89d66cc76e7261f CSWcswclassutils.i.cswpycompile 4f816acb06e8f95add6faf8607859da2 CSWcswclassutils.i.cswtexinfo -5071bfb677bcdeda35ccdb9cd6f56f34 CSWcswclassutils.i.cswusergroup +e906a50bc2d82e341f78d582f32ecb88 CSWcswclassutils.i.cswusergroup d278a28a6f901c4ff5f07c583b4cff3d CSWcswclassutils.r.cswcpsampleconf -a204ca80139dd1d79e1a3af3e8bad7cb CSWcswclassutils.r.cswcrontab +cab36ddd88277add693740a36b199efb CSWcswclassutils.r.cswcrontab d60261ddc46e2cc83ecbbfc586a7e686 CSWcswclassutils.r.cswetcservices 9039ea60ad4c3f8994205fb242a49a72 CSWcswclassutils.r.cswinetd 791db9c2f6685aca67043820d260fc60 CSWcswclassutils.r.cswinitsmf Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcrontab =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcrontab 2010-05-20 14:45:27 UTC (rev 9939) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcrontab 2010-05-20 16:26:17 UTC (rev 9940) @@ -3,14 +3,59 @@ # i.cswcrontab - Class action script # for registration of crontab entries # -# Written and maintained by Dagobert Michelsen +# Written and maintained by Dagobert Michelsen +# Rewritten and unmaintained by Maciej Blizi?ski # -# set DEBUG to any value to enable trace output -DEBUG= +set -e +set -u +if [ -r ${PKG_INSTALL_ROOT:-}/opt/csw/etc/csw.conf ] ; then + . ${PKG_INSTALL_ROOT:-}/opt/csw/etc/csw.conf +fi +if [ -r ${PKG_INSTALL_ROOT:-}/etc/opt/csw/csw.conf ] ; then + . ${PKG_INSTALL_ROOT:-}/etc/opt/csw/csw.conf +fi echo "Installing class ..." +if [ -z "${PKGINST}" ]; then + echo 'PKGINST is empty!' +fi + +crontab_tag="Added by cswcrontab for" +readonly crontab_tag + +remove_cron_lines() { + # Removed marked lines from a file. + # states: 1: reading a line, switching to 2 if matches + # 2: removing a line + cron_id="$1" + cron_file="$2" + state=1 + rm -f "${cron_file}" + touch "${cron_file}" + while read LINE; do + if [ ${state} -eq 1 ]; then + if echo "${LINE}" | grep "^# ${crontab_tag} ${cron_id}\$" >/dev/null; then + state=2 + continue + fi + if [ ${state} -eq 2 ]; then + echo >/dev/null # ...since /bin/sh doesn't understand negation + state=1 + else + echo "${LINE}" >> "${cron_file}" + fi + fi + done +} + +debug() { + if [ -n "${classutils_debug:-}" ]; then + echo >&2 "DEBUG: $*" + fi +} + while read src dest; do echo $dest @@ -23,28 +68,27 @@ TMPFILE=/tmp/cswcrontab.${PKGINST}.$$ umask 600 - /usr/bin/crontab -l ${USERNAME} | /usr/bin/grep -v "# Added by ${PKGINST}\$" > ${TMPFILE} + /usr/bin/crontab -l ${USERNAME} | remove_cron_lines "${PKGINST}" "${TMPFILE}" - if [ -n "$DEBUG" ]; then - echo "DEBUG: Contents of ${TMPFILE} after removing old lines from this package:" >&2 + debug "Contents of ${TMPFILE} after removing old lines from this package:" + if [ -n "${classutils_debug:-}" ]; then cat ${TMPFILE} >&2 fi - cat $dest | while read LINE; do - echo "${LINE} % Added by ${PKGINST}" >> ${TMPFILE} - if [ -n "$DEBUG" ]; then - echo "DEBUG: Adding '${LINE} % Added by ${PKGINST}' to the end of the crontab" >&2 - fi - done + while read LINE; do + echo "# ${crontab_tag} ${PKGINST}" >> ${TMPFILE} + echo "${LINE}" >> ${TMPFILE} + debug "Adding '${LINE}' to the end of the crontab" + done < $dest - if [ -n "$DEBUG" ]; then - echo "DEBUG: Installing crontab for user '${USERNAME}'" >&2 - cat ${TMPFILE} >&2 + if [ -n "${classutils_debug:-}" ]; then + debug "Installing crontab for user '${USERNAME}'" + cat "${TMPFILE}" >&2 fi - su ${USERNAME} /usr/bin/crontab ${TMPFILE} - rm -f ${TMPFILE} - + su ${USERNAME} -c "/usr/bin/crontab \"${TMPFILE}\"" + rm -f "${TMPFILE}" + done exit 0 Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcrontab =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcrontab 2010-05-20 14:45:27 UTC (rev 9939) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcrontab 2010-05-20 16:26:17 UTC (rev 9940) @@ -3,12 +3,61 @@ # r.cswcrontab - Class action script # for registration of crontab entries # -# Written and maintained by Dagobert Michelsen +# Written and maintained by Dagobert Michelsen +# Rewritten and unmaintained by Maciej Blizi?ski # +set -e +set -u + +if [ -r ${PKG_INSTALL_ROOT:-}/opt/csw/etc/csw.conf ] ; then + . ${PKG_INSTALL_ROOT:-}/opt/csw/etc/csw.conf +fi +if [ -r ${PKG_INSTALL_ROOT:-}/etc/opt/csw/csw.conf ] ; then + . ${PKG_INSTALL_ROOT:-}/etc/opt/csw/csw.conf +fi echo "Removing class ..." +if [ -z "${PKGINST}" ]; then + echo 'PKGINST is empty!' +fi + +crontab_tag="Added by cswcrontab for" +readonly crontab_tag + +remove_cron_lines() { + # Removed marked lines from a file. + # states: 1: reading a line, switching to 2 if matches + # 2: removing a line + cron_id="$1" + cron_file="$2" + state=1 + rm -f "${cron_file}" + touch "${cron_file}" + while read LINE; do + if [ ${state} -eq 1 ]; then + if echo "${LINE}" | grep "^# ${crontab_tag} ${cron_id}\$" >/dev/null; then + state=2 + continue + fi + if [ ${state} -eq 2 ]; then + echo >/dev/null # ...since /bin/sh doesn't understand negation + state=1 + else + echo "${LINE}" >> "${cron_file}" + fi + fi + done +} + +debug() { + if [ -n "${classutils_debug:-}" ]; then + echo >&2 "DEBUG: $*" + fi +} + while read dest; do + echo $dest rm -f $dest @@ -16,18 +65,17 @@ TMPFILE=/tmp/cswcrontab.${PKGINST}.$$ umask 600 + /usr/bin/crontab -l ${USERNAME} | remove_cron_lines "${PKGINST}" "${TMPFILE}" - echo "The following lines will be removed from the crontab of the user '${USERNAME}':" - /usr/bin/crontab -l ${USERNAME} | /usr/bin/grep "# Added by ${PKGINST}\$" - /usr/bin/crontab -l ${USERNAME} | /usr/bin/grep -v "# Added by ${PKGINST}\$" > ${TMPFILE} - - if [ -n "$DEBUG" ]; then - echo "DEBUG: Installing crontab for user '${USERNAME}'" >&2 - cat ${TMPFILE} >&2 + if [ -n "${classutils_debug:-}" ]; then + debug "Installing crontab for user '${USERNAME}'" + cat "${TMPFILE}" >&2 fi - su ${USERNAME} /usr/bin/crontab ${TMPFILE} - rm -f ${TMPFILE} - + su ${USERNAME} -c "/usr/bin/crontab \"${TMPFILE}\"" + rm -f "${TMPFILE}" + done + +exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu May 20 18:35:25 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 20 May 2010 16:35:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[9941] csw/mgar/pkg/puppet/branches/puppet-0.25.x Message-ID: Revision: 9941 http://gar.svn.sourceforge.net/gar/?rev=9941&view=rev Author: wahwah Date: 2010-05-20 16:35:25 +0000 (Thu, 20 May 2010) Log Message: ----------- puppet-0.25.x: Upgrade to 0.25.5, and using cron istead of SMF (running via SMF sucks) Modified Paths: -------------- csw/mgar/pkg/puppet/branches/puppet-0.25.x/Makefile csw/mgar/pkg/puppet/branches/puppet-0.25.x/checksums Added Paths: ----------- csw/mgar/pkg/puppet/branches/puppet-0.25.x/files/CSWpuppet.cron.root Modified: csw/mgar/pkg/puppet/branches/puppet-0.25.x/Makefile =================================================================== --- csw/mgar/pkg/puppet/branches/puppet-0.25.x/Makefile 2010-05-20 16:26:17 UTC (rev 9940) +++ csw/mgar/pkg/puppet/branches/puppet-0.25.x/Makefile 2010-05-20 16:35:25 UTC (rev 9941) @@ -7,7 +7,7 @@ # [1] http://garylaw.net/packages/puppet-build.sh GARNAME = puppet -GARVERSION = 0.25.4 +GARVERSION = 0.25.5 CATEGORIES = apps define BLURB @@ -22,17 +22,29 @@ MASTER_SITES = http://reductivelabs.com/downloads/puppet/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += cswpuppetd cswpuppetmasterd cswusergroup +DISTFILES += cswpuppetd +DISTFILES += cswpuppetmasterd +DISTFILES += cswusergroup +DISTFILES += CSWpuppet.cron.root UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_SOURCEURL = http://reductivelabs.com/products/puppet/ +SPKG_SOURCEURL = http://www.puppetlabs.com/ -INITSMF = $(sysconfdir)/init\.d/cswpuppetd -INITSMF += $(sysconfdir)/init\.d/cswpuppetmasterd +# Handy when doing multiple updates per day. Adds hours and minutes to the +# timestamp. +GARFLAVOR = DBG + +# Disabling SMF support for puppetd. There are problems with it. It's a +# better choice to run it from cron. +# INITSMF = $(sysconfdir)/init\.d/cswpuppetd +INITSMF += $(prefix)/etc/init\.d/cswpuppetmasterd USERGROUP = $(sysconfdir)/pkg/puppet/cswusergroup +CHECKPKG_OVERRIDES_CSWpuppet += init-file-missing-cswinitsmf-class|/opt/csw/etc/init.d/cswpuppetd|class=none + # Creating a separate package CSWpuppetmaster so that the cswpuppetmaster # service isn't started upon the installation of CSWpuppet. -PACKAGES = CSWpuppet CSWpuppetmaster +PACKAGES += CSWpuppetmaster +PACKAGES += CSWpuppet SPKG_DESC_CSWpuppet = System configuration management tool, client daemon SPKG_DESC_CSWpuppetmaster = System configuration management tool, server @@ -42,7 +54,7 @@ RUNTIME_DEP_PKGS_CSWpuppetmaster += CSWpuppet RUNTIME_DEP_PKGS_CSWpuppetmaster += CSWruby -PKGFILES_CSWpuppetmaster = $(sysconfdir)/init\.d/cswpuppetmasterd +PKGFILES_CSWpuppetmaster = $(prefix)/etc/init\.d/cswpuppetmasterd PKGFILES_CSWpuppetmaster += $(sbindir)/puppetmasterd PKGFILES_CSWpuppetmaster += $(mandir)/man8/puppetmasterd.8 PKGFILES_CSWpuppetmaster += $(libdir)/.*/puppet/application/puppetmasterd.rb @@ -60,18 +72,26 @@ PATCHFILES = 0001-pkgutil-support.patch PATCHFILES += 0002-Using-the-single-option-of-pkgutil.patch -CHECKPKG_OVERRIDES_CSWpuppet += surplus-dependency|CSWfacter +CHECKPKG_OVERRIDES_CSWpuppet += surplus-dependency|CSWfacter CHECKPKG_OVERRIDES_CSWpuppetmaster += surplus-dependency|CSWpuppet +CRONDIR = $(sysconfdir)/pkg/CSWpuppet/crontabs +CRONTABS = $(CRONDIR)/root + include gar/category.mk install-puppet: ginstall -m 755 -d $(DESTDIR) ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/puppet ginstall -m 755 -d $(DESTDIR)$(localstatedir)/puppet/run - ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/init.d - ginstall -m 755 $(FILEDIR)/cswpuppetd $(DESTDIR)$(sysconfdir)/init.d - ginstall -m 755 $(FILEDIR)/cswpuppetmasterd $(DESTDIR)$(sysconfdir)/init.d + ginstall -m 755 -d $(DESTDIR)$(prefix)/etc/init.d + # $(sysconfdir)/pkg//crontabs + ginstall -m 755 -d $(DESTDIR)$(CRONDIR) + ginstall -m 644 \ + $(FILEDIR)/CSWpuppet.cron.root \ + $(DESTDIR)$(CRONDIR)/root + ginstall -m 755 $(FILEDIR)/cswpuppetd $(DESTDIR)$(prefix)/etc/init.d + ginstall -m 755 $(FILEDIR)/cswpuppetmasterd $(DESTDIR)$(prefix)/etc/init.d (cd $(WORKSRC) && \ gsed -e "s|/var/puppet|/var/opt/csw/puppet|g" -i ./lib/puppet/defaults.rb; \ gsed -e "s|/etc/puppet|/etc/opt/csw/puppet|g" -i ./lib/puppet/defaults.rb; \ Modified: csw/mgar/pkg/puppet/branches/puppet-0.25.x/checksums =================================================================== --- csw/mgar/pkg/puppet/branches/puppet-0.25.x/checksums 2010-05-20 16:26:17 UTC (rev 9940) +++ csw/mgar/pkg/puppet/branches/puppet-0.25.x/checksums 2010-05-20 16:35:25 UTC (rev 9941) @@ -1,6 +1,7 @@ abaa404420106f9f28e9e1218b4e365b 0001-pkgutil-support.patch 9c27c0cdca051eae986b56b91ef889ca 0002-Using-the-single-option-of-pkgutil.patch +a2e6cf46cc564d1b70ddaf90eec1349d CSWpuppet.cron.root 0af8b2be6a2c9ecc6bb4a1878fcbefec cswpuppetd aba2c79e589b9bd1c881a22aa663a213 cswpuppetmasterd 3ab0d4f9801075bc78b68b766b496fc7 cswusergroup -69c97019fda5620f9f45f6ad64407e3b puppet-0.25.4.tar.gz +2988385801c967f7262cdf08640c9e07 puppet-0.25.5.tar.gz Added: csw/mgar/pkg/puppet/branches/puppet-0.25.x/files/CSWpuppet.cron.root =================================================================== --- csw/mgar/pkg/puppet/branches/puppet-0.25.x/files/CSWpuppet.cron.root (rev 0) +++ csw/mgar/pkg/puppet/branches/puppet-0.25.x/files/CSWpuppet.cron.root 2010-05-20 16:35:25 UTC (rev 9941) @@ -0,0 +1 @@ +30 * * * * /opt/csw/bin/puppetd --no-daemon This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Fri May 21 01:24:32 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Thu, 20 May 2010 23:24:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[9942] csw/mgar/pkg/alternatives/trunk/pkginfo Message-ID: Revision: 9942 http://gar.svn.sourceforge.net/gar/?rev=9942&view=rev Author: theferret Date: 2010-05-20 23:24:32 +0000 (Thu, 20 May 2010) Log Message: ----------- alternatives: fixed date Modified Paths: -------------- csw/mgar/pkg/alternatives/trunk/pkginfo Modified: csw/mgar/pkg/alternatives/trunk/pkginfo =================================================================== --- csw/mgar/pkg/alternatives/trunk/pkginfo 2010-05-20 16:35:25 UTC (rev 9941) +++ csw/mgar/pkg/alternatives/trunk/pkginfo 2010-05-20 23:24:32 UTC (rev 9942) @@ -1,7 +1,7 @@ PKG=CSWalternatives ARCH=all NAME=alternatives - an implementation of linux-style alternatives choice mgr -VERSION=1.0,REV=2009.10.18 +VERSION=1.0,REV=2010.10.18 CATEGORY=system VENDOR=http://www.opencsw.org written and packaged for CSW by Philip Brown EMAIL=phil at opencsw.org 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 May 21 10:23:06 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 21 May 2010 08:23:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[9943] csw/mgar/pkg/cswclassutils/trunk/Makefile Message-ID: Revision: 9943 http://gar.svn.sourceforge.net/gar/?rev=9943&view=rev Author: bonivart Date: 2010-05-21 08:23:06 +0000 (Fri, 21 May 2010) Log Message: ----------- cswclassutils: updated crontab cas Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-05-20 23:24:32 UTC (rev 9942) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-05-21 08:23:06 UTC (rev 9943) @@ -1,7 +1,7 @@ # $Id$ GARNAME = cswclassutils -GARVERSION = 1.35 +GARVERSION = 1.36 CATEGORIES = utils DESCRIPTION = CSW class action utilities 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 May 21 10:37:09 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 21 May 2010 08:37:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[9944] csw/mgar/pkg/ncurses/trunk/Makefile Message-ID: Revision: 9944 http://gar.svn.sourceforge.net/gar/?rev=9944&view=rev Author: dmichelsen Date: 2010-05-21 08:37:09 +0000 (Fri, 21 May 2010) Log Message: ----------- ncurses: Move lines around Modified Paths: -------------- csw/mgar/pkg/ncurses/trunk/Makefile Modified: csw/mgar/pkg/ncurses/trunk/Makefile =================================================================== --- csw/mgar/pkg/ncurses/trunk/Makefile 2010-05-21 08:23:06 UTC (rev 9943) +++ csw/mgar/pkg/ncurses/trunk/Makefile 2010-05-21 08:37:09 UTC (rev 9944) @@ -20,11 +20,11 @@ PATCHFILES = patch-xcode.diff LICENSE = README + PACKAGES = CSWncurses CSWterminfo + SPKG_DESC_CSWncurses = A free software emulation of curses SPKG_DESC_CSWterminfo = Database of terminal information, part of ncurses -PKGFILES_CSWterminfo = $(datadir)/terminfo.* -ARCHALL_CSWterminfo = 1 SPKG_SOURCEURL = http://www.gnu.org/software/ncurses/ncurses.html @@ -75,6 +75,9 @@ RUNTIME_DEP_PKGS_CSWncurses = CSWterminfo +ARCHALL_CSWterminfo = 1 +PKGFILES_CSWterminfo = $(datadir)/terminfo.* + include gar/category.mk LDFLAGS := $(filter-out -L%,$(LDFLAGS)) 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 May 21 12:59:08 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 21 May 2010 10:59:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[9945] csw/mgar/pkg/ncurses/trunk/Makefile Message-ID: Revision: 9945 http://gar.svn.sourceforge.net/gar/?rev=9945&view=rev Author: dmichelsen Date: 2010-05-21 10:59:08 +0000 (Fri, 21 May 2010) Log Message: ----------- ncurses: Add checkpkg override Modified Paths: -------------- csw/mgar/pkg/ncurses/trunk/Makefile Modified: csw/mgar/pkg/ncurses/trunk/Makefile =================================================================== --- csw/mgar/pkg/ncurses/trunk/Makefile 2010-05-21 08:37:09 UTC (rev 9944) +++ csw/mgar/pkg/ncurses/trunk/Makefile 2010-05-21 10:59:08 UTC (rev 9945) @@ -78,6 +78,8 @@ ARCHALL_CSWterminfo = 1 PKGFILES_CSWterminfo = $(datadir)/terminfo.* +CHECKPKG_OVERRIDES_CSWncurses += surplus-dependency|CSWterminfo + include gar/category.mk LDFLAGS := $(filter-out -L%,$(LDFLAGS)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri May 21 14:38:47 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 21 May 2010 12:38:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[9946] csw/mgar/pkg/cswclassutils/trunk/files Message-ID: Revision: 9946 http://gar.svn.sourceforge.net/gar/?rev=9946&view=rev Author: wahwah Date: 2010-05-21 12:38:46 +0000 (Fri, 21 May 2010) Log Message: ----------- cswclassutils: Experimenting with HeadURL Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcrontab csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcrontab Property Changed: ---------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcrontab csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcrontab Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcrontab =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcrontab 2010-05-21 10:59:08 UTC (rev 9945) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcrontab 2010-05-21 12:38:46 UTC (rev 9946) @@ -1,11 +1,12 @@ #!/bin/sh # +# $HeadURL$ +# # i.cswcrontab - Class action script # for registration of crontab entries # # Written and maintained by Dagobert Michelsen # Rewritten and unmaintained by Maciej Blizi?ski -# set -e set -u Property changes on: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcrontab ___________________________________________________________________ Added: svn:keywords + HeadURL Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcrontab =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcrontab 2010-05-21 10:59:08 UTC (rev 9945) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcrontab 2010-05-21 12:38:46 UTC (rev 9946) @@ -1,11 +1,12 @@ #!/bin/sh # +# $HeadURL$ +# # r.cswcrontab - Class action script # for registration of crontab entries # # Written and maintained by Dagobert Michelsen # Rewritten and unmaintained by Maciej Blizi?ski -# set -e set -u Property changes on: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcrontab ___________________________________________________________________ Added: svn:keywords + HeadURL This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri May 21 14:40:18 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 21 May 2010 12:40:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[9947] csw/mgar/pkg/cswclassutils/trunk/checksums Message-ID: Revision: 9947 http://gar.svn.sourceforge.net/gar/?rev=9947&view=rev Author: wahwah Date: 2010-05-21 12:40:18 +0000 (Fri, 21 May 2010) Log Message: ----------- cswclassutils: HeadURL: adding checksums. From now on, the HeadURL will not change (unless files are moved), so it won't require double checkins the way the Id tag does. Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/checksums Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2010-05-21 12:38:46 UTC (rev 9946) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2010-05-21 12:40:18 UTC (rev 9947) @@ -1,6 +1,6 @@ 48a97af56d55bc90ce90303228ed8cc3 COPYING 9846081f8109dc9149dc026b89fbf137 CSWcswclassutils.i.cswcpsampleconf -c3f8655f3a4c3898af79960d8668e6c3 CSWcswclassutils.i.cswcrontab +efd19a09c355319c7d649885e4f9f76e CSWcswclassutils.i.cswcrontab 5e2ae2c6bd828061f86d84f09087b06a CSWcswclassutils.i.cswetcservices 4a0971d15bc02e7496f876336c68ddf4 CSWcswclassutils.i.cswinetd 6abb13158fee906870d1d68dc0fae6f3 CSWcswclassutils.i.cswinitsmf @@ -11,7 +11,7 @@ 4f816acb06e8f95add6faf8607859da2 CSWcswclassutils.i.cswtexinfo e906a50bc2d82e341f78d582f32ecb88 CSWcswclassutils.i.cswusergroup d278a28a6f901c4ff5f07c583b4cff3d CSWcswclassutils.r.cswcpsampleconf -cab36ddd88277add693740a36b199efb CSWcswclassutils.r.cswcrontab +f988248725a4607110a13820a005b72f CSWcswclassutils.r.cswcrontab d60261ddc46e2cc83ecbbfc586a7e686 CSWcswclassutils.r.cswetcservices 9039ea60ad4c3f8994205fb242a49a72 CSWcswclassutils.r.cswinetd 791db9c2f6685aca67043820d260fc60 CSWcswclassutils.r.cswinitsmf 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 May 21 15:53:08 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 21 May 2010 13:53:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[9948] csw/mgar/pkg/libtasn1/trunk Message-ID: Revision: 9948 http://gar.svn.sourceforge.net/gar/?rev=9948&view=rev Author: dmichelsen Date: 2010-05-21 13:53:07 +0000 (Fri, 21 May 2010) Log Message: ----------- libtasn1: Update to 2.7 Modified Paths: -------------- csw/mgar/pkg/libtasn1/trunk/Makefile csw/mgar/pkg/libtasn1/trunk/checksums Modified: csw/mgar/pkg/libtasn1/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtasn1/trunk/Makefile 2010-05-21 12:40:18 UTC (rev 9947) +++ csw/mgar/pkg/libtasn1/trunk/Makefile 2010-05-21 13:53:07 UTC (rev 9948) @@ -1,5 +1,5 @@ GARNAME = libtasn1 -GARVERSION = 2.6 +GARVERSION = 2.7 CATEGORIES = lib DESCRIPTION = GNU ASN1 library Modified: csw/mgar/pkg/libtasn1/trunk/checksums =================================================================== --- csw/mgar/pkg/libtasn1/trunk/checksums 2010-05-21 12:40:18 UTC (rev 9947) +++ csw/mgar/pkg/libtasn1/trunk/checksums 2010-05-21 13:53:07 UTC (rev 9948) @@ -1 +1 @@ -d410671e13038324336917ceed7470a5 libtasn1-2.6.tar.gz +fade9f961ec7084dd91a9ba409ba7ab1 libtasn1-2.7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Fri May 21 18:43:59 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Fri, 21 May 2010 16:43:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[9949] csw/mgar/pkg/alternatives/trunk/pkginfo Message-ID: Revision: 9949 http://gar.svn.sourceforge.net/gar/?rev=9949&view=rev Author: theferret Date: 2010-05-21 16:43:59 +0000 (Fri, 21 May 2010) Log Message: ----------- alternatives: fixed date again Modified Paths: -------------- csw/mgar/pkg/alternatives/trunk/pkginfo Modified: csw/mgar/pkg/alternatives/trunk/pkginfo =================================================================== --- csw/mgar/pkg/alternatives/trunk/pkginfo 2010-05-21 13:53:07 UTC (rev 9948) +++ csw/mgar/pkg/alternatives/trunk/pkginfo 2010-05-21 16:43:59 UTC (rev 9949) @@ -1,7 +1,7 @@ PKG=CSWalternatives ARCH=all NAME=alternatives - an implementation of linux-style alternatives choice mgr -VERSION=1.0,REV=2010.10.18 +VERSION=1.0,REV=2010.05.21 CATEGORY=system VENDOR=http://www.opencsw.org written and packaged for CSW by Philip Brown EMAIL=phil at opencsw.org This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Fri May 21 22:55:13 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Fri, 21 May 2010 20:55:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[9950] csw/mgar/pkg/sunx11_devel/trunk Message-ID: Revision: 9950 http://gar.svn.sourceforge.net/gar/?rev=9950&view=rev Author: theferret Date: 2010-05-21 20:55:13 +0000 (Fri, 21 May 2010) Log Message: ----------- sunx11_devel: added in extra x*.pc files Modified Paths: -------------- csw/mgar/pkg/sunx11_devel/trunk/pkginfo csw/mgar/pkg/sunx11_devel/trunk/prototype Added Paths: ----------- csw/mgar/pkg/sunx11_devel/trunk/xext.pc csw/mgar/pkg/sunx11_devel/trunk/xextproto.pc csw/mgar/pkg/sunx11_devel/trunk/xt.pc Modified: csw/mgar/pkg/sunx11_devel/trunk/pkginfo =================================================================== --- csw/mgar/pkg/sunx11_devel/trunk/pkginfo 2010-05-21 16:43:59 UTC (rev 9949) +++ csw/mgar/pkg/sunx11_devel/trunk/pkginfo 2010-05-21 20:55:13 UTC (rev 9950) @@ -1,7 +1,7 @@ PKG=CSWsunx11devel ARCH=all NAME=sunx11_devel - CSW utility layer for compiling software with Sun X11 libs -VERSION=1.0,REV=2010.05.16 +VERSION=1.0,REV=2010.05.21 CATEGORY=application VENDOR=http://www.opencsw.org/ packaged for CSW by Philip Brown HOTLINE=http://www.opencsw.org/bugtrack/ Modified: csw/mgar/pkg/sunx11_devel/trunk/prototype =================================================================== --- csw/mgar/pkg/sunx11_devel/trunk/prototype 2010-05-21 16:43:59 UTC (rev 9949) +++ csw/mgar/pkg/sunx11_devel/trunk/prototype 2010-05-21 20:55:13 UTC (rev 9950) @@ -10,3 +10,7 @@ f none /opt/csw/lib/pkgconfig/x11.pc=x11.pc 0644 root bin f none /opt/csw/lib/pkgconfig/renderproto.pc=renderproto.pc 0644 root bin f none /opt/csw/lib/pkgconfig/xproto.pc=xproto.pc 0644 root bin +f none /opt/csw/lib/pkgconfig/xt.pc=xt.pc 0644 root bin +f none /opt/csw/lib/pkgconfig/xext.pc=xext.pc 0644 root bin +f none /opt/csw/lib/pkgconfig/xextproto.pc=xextproto.pc 0644 root bin + Added: csw/mgar/pkg/sunx11_devel/trunk/xext.pc =================================================================== --- csw/mgar/pkg/sunx11_devel/trunk/xext.pc (rev 0) +++ csw/mgar/pkg/sunx11_devel/trunk/xext.pc 2010-05-21 20:55:13 UTC (rev 9950) @@ -0,0 +1,12 @@ +prefix=/opt/csw +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include +includex11dir=${prefix}/include/X11 + +Name: Xext +Description: Misc X Extension Library +Version: 6.6 +Requires: x11 +Cflags: -I${includedir} +Libs: -L${libdir} -lXext Added: csw/mgar/pkg/sunx11_devel/trunk/xextproto.pc =================================================================== --- csw/mgar/pkg/sunx11_devel/trunk/xextproto.pc (rev 0) +++ csw/mgar/pkg/sunx11_devel/trunk/xextproto.pc 2010-05-21 20:55:13 UTC (rev 9950) @@ -0,0 +1,11 @@ +prefix=/opt/csw +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include +includex11dir=${prefix}/include/X11 + +Name: XExtProto +Description: X Extention Library headers +Version: 6.6 +Requires: x11 +Cflags: -I${includedir} Added: csw/mgar/pkg/sunx11_devel/trunk/xt.pc =================================================================== --- csw/mgar/pkg/sunx11_devel/trunk/xt.pc (rev 0) +++ csw/mgar/pkg/sunx11_devel/trunk/xt.pc 2010-05-21 20:55:13 UTC (rev 9950) @@ -0,0 +1,12 @@ +prefix=/opt/csw +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include +includex11dir=${prefix}/include/X11 + +Name: Xt +Description: XToolkit library, hacked for Sun X11 +Version: 6.6 +Requires: xproto x11 +Cflags: -I${includedir} +Libs: -L${libdir} -lXt 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 May 22 13:49:43 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 22 May 2010 11:49:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9951] csw/mgar/pkg/lzip/trunk Message-ID: Revision: 9951 http://gar.svn.sourceforge.net/gar/?rev=9951&view=rev Author: rthurner Date: 2010-05-22 11:49:43 +0000 (Sat, 22 May 2010) Log Message: ----------- lzip - upgrade to lzip-1.10 Modified Paths: -------------- csw/mgar/pkg/lzip/trunk/Makefile csw/mgar/pkg/lzip/trunk/checksums Modified: csw/mgar/pkg/lzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzip/trunk/Makefile 2010-05-21 20:55:13 UTC (rev 9950) +++ csw/mgar/pkg/lzip/trunk/Makefile 2010-05-22 11:49:43 UTC (rev 9951) @@ -1,5 +1,5 @@ GARNAME = lzip -GARVERSION = 1.9 +GARVERSION = 1.10 CATEGORIES = utils DESCRIPTION = A lossless data compressor based on the LZMA algorithm Modified: csw/mgar/pkg/lzip/trunk/checksums =================================================================== --- csw/mgar/pkg/lzip/trunk/checksums 2010-05-21 20:55:13 UTC (rev 9950) +++ csw/mgar/pkg/lzip/trunk/checksums 2010-05-22 11:49:43 UTC (rev 9951) @@ -1,4 +1,4 @@ c88ba40a011ff3bb3fb1a36a1d5d1832 0001-Make-configure-use-bash.patch b9048c2b7eb8974a7cd9d6486aaa4d4a 0002-Use-inttypes-instead-of-stdint.patch 095a3aafd43cbd99dd12c78e7cc336c0 0003-Make-testsuite-use-ucb-echo.patch -9e1d7f4db5b953e9f75b8500ebe0d4c0 lzip-1.9.tar.gz +84879f20450a69a94e125a67f4724d12 lzip-1.10.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 Sat May 22 13:51:53 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 22 May 2010 11:51:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[9952] csw/mgar/pkg/lzlib/trunk Message-ID: Revision: 9952 http://gar.svn.sourceforge.net/gar/?rev=9952&view=rev Author: rthurner Date: 2010-05-22 11:51:53 +0000 (Sat, 22 May 2010) Log Message: ----------- lzlib - upgrade to lzlib-1.0 Modified Paths: -------------- csw/mgar/pkg/lzlib/trunk/Makefile csw/mgar/pkg/lzlib/trunk/checksums Modified: csw/mgar/pkg/lzlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzlib/trunk/Makefile 2010-05-22 11:49:43 UTC (rev 9951) +++ csw/mgar/pkg/lzlib/trunk/Makefile 2010-05-22 11:51:53 UTC (rev 9952) @@ -1,5 +1,5 @@ GARNAME = lzlib -GARVERSION = 0.9 +GARVERSION = 1.0 CATEGORIES = lib DESCRIPTION = A lossless data compression library based on the LZMA algorithm Modified: csw/mgar/pkg/lzlib/trunk/checksums =================================================================== --- csw/mgar/pkg/lzlib/trunk/checksums 2010-05-22 11:49:43 UTC (rev 9951) +++ csw/mgar/pkg/lzlib/trunk/checksums 2010-05-22 11:51:53 UTC (rev 9952) @@ -2,4 +2,4 @@ ae8e904a8c07f7533b94eaf8bfb2075d 0001-Remove-Linux-specific-stuff-add-Solaris-specific-stu.patch fe24dd11cfece198006a781133fb13fa 0002-Change-linker-flags-for-shared-libs-to-be-Sun-Studio.patch dcb22fb244b8d124742cad9ddd18985a 0002-Use-ucb-echo-as-it-only-understands-n.patch -65382168a05975e550f5381f99efc0c6 lzlib-0.9.tar.gz +39bfe00964a03be95d51ebbe9104b337 lzlib-1.0.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 Sat May 22 13:53:46 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 22 May 2010 11:53:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[9953] csw/mgar/pkg/plzip/trunk Message-ID: Revision: 9953 http://gar.svn.sourceforge.net/gar/?rev=9953&view=rev Author: rthurner Date: 2010-05-22 11:53:46 +0000 (Sat, 22 May 2010) Log Message: ----------- plzip - upgrade to plzip-0.6 Modified Paths: -------------- csw/mgar/pkg/plzip/trunk/Makefile csw/mgar/pkg/plzip/trunk/checksums Modified: csw/mgar/pkg/plzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/plzip/trunk/Makefile 2010-05-22 11:51:53 UTC (rev 9952) +++ csw/mgar/pkg/plzip/trunk/Makefile 2010-05-22 11:53:46 UTC (rev 9953) @@ -1,5 +1,5 @@ GARNAME = plzip -GARVERSION = 0.5 +GARVERSION = 0.6 CATEGORIES = utils DESCRIPTION = plzip is a lossless data compressor based on the LZMA algorithm. Modified: csw/mgar/pkg/plzip/trunk/checksums =================================================================== --- csw/mgar/pkg/plzip/trunk/checksums 2010-05-22 11:51:53 UTC (rev 9952) +++ csw/mgar/pkg/plzip/trunk/checksums 2010-05-22 11:53:46 UTC (rev 9953) @@ -1,3 +1,3 @@ ac5eb1a5daa65a55d37b6bcde4c58fe7 0001-Use-inttypes-instead-of-stdint.patch 690e11a488625fbb1f99e0ea411e28d4 0002-Use-ucb-echo.patch -f32bd13e94afc29c6d7f2ff770845cf1 plzip-0.5.tar.gz +f452029b1e8232cbe837f4437613e1ed plzip-0.6.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 Sat May 22 14:39:16 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 22 May 2010 12:39:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[9954] csw/mgar/pkg/lzip/trunk/Makefile Message-ID: Revision: 9954 http://gar.svn.sourceforge.net/gar/?rev=9954&view=rev Author: rthurner Date: 2010-05-22 12:39:15 +0000 (Sat, 22 May 2010) Log Message: ----------- lzip - prevent compiling the rpath Modified Paths: -------------- csw/mgar/pkg/lzip/trunk/Makefile Modified: csw/mgar/pkg/lzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzip/trunk/Makefile 2010-05-22 11:53:46 UTC (rev 9953) +++ csw/mgar/pkg/lzip/trunk/Makefile 2010-05-22 12:39:15 UTC (rev 9954) @@ -28,7 +28,7 @@ CONFIGURE_ARGS += CXX="$(CXX)" CONFIGURE_ARGS += CPPFLAGS="$(CPPFLAGS)" CONFIGURE_ARGS += CXXFLAGS="$(CXXFLAGS)" -CONFIGURE_ARGS += LDFLAGS="$(LDFLAGS)" +CONFIGURE_ARGS += LDFLAGS="$(LDFLAGS) -norunpath" TEST_TARGET = check 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 May 22 14:41:29 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 22 May 2010 12:41:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[9955] csw/mgar/pkg/lzlib/trunk/Makefile Message-ID: Revision: 9955 http://gar.svn.sourceforge.net/gar/?rev=9955&view=rev Author: rthurner Date: 2010-05-22 12:41:28 +0000 (Sat, 22 May 2010) Log Message: ----------- lzlib - prevent default sunstudio rpath Modified Paths: -------------- csw/mgar/pkg/lzlib/trunk/Makefile Modified: csw/mgar/pkg/lzlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzlib/trunk/Makefile 2010-05-22 12:39:15 UTC (rev 9954) +++ csw/mgar/pkg/lzlib/trunk/Makefile 2010-05-22 12:41:28 UTC (rev 9955) @@ -31,7 +31,7 @@ CONFIGURE_ARGS += CXX="$(CXX)" CONFIGURE_ARGS += CPPFLAGS="$(CPPFLAGS)" CONFIGURE_ARGS += CXXFLAGS="$(CXXFLAGS)" -CONFIGURE_ARGS += LDFLAGS="$(LDFLAGS)" +CONFIGURE_ARGS += LDFLAGS="$(LDFLAGS) -norunpath" TEST_TARGET = check 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 May 22 23:36:19 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 22 May 2010 21:36:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[9956] csw/mgar/pkg/libidn/trunk Message-ID: Revision: 9956 http://gar.svn.sourceforge.net/gar/?rev=9956&view=rev Author: dmichelsen Date: 2010-05-22 21:36:19 +0000 (Sat, 22 May 2010) Log Message: ----------- libidn: Update to 1.19 Modified Paths: -------------- csw/mgar/pkg/libidn/trunk/Makefile csw/mgar/pkg/libidn/trunk/checksums Modified: csw/mgar/pkg/libidn/trunk/Makefile =================================================================== --- csw/mgar/pkg/libidn/trunk/Makefile 2010-05-22 12:41:28 UTC (rev 9955) +++ csw/mgar/pkg/libidn/trunk/Makefile 2010-05-22 21:36:19 UTC (rev 9956) @@ -1,5 +1,5 @@ GARNAME = libidn -GARVERSION = 1.18 +GARVERSION = 1.19 CATEGORIES = lib DESCRIPTION = GNU IDN Library @@ -31,4 +31,6 @@ TEST_TARGET = check +CHECKPKG_OVERRIDES_CSWlibidn += missing-dependency|CSWemacscommon + include gar/category.mk Modified: csw/mgar/pkg/libidn/trunk/checksums =================================================================== --- csw/mgar/pkg/libidn/trunk/checksums 2010-05-22 12:41:28 UTC (rev 9955) +++ csw/mgar/pkg/libidn/trunk/checksums 2010-05-22 21:36:19 UTC (rev 9956) @@ -1 +1 @@ -66f115347439f56386f37a3ad92c1da2 libidn-1.18.tar.gz +a45142126d28162014c995f969bdb5a8 libidn-1.19.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 Sun May 23 13:03:16 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 23 May 2010 11:03:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[9957] csw/mgar/pkg/lzlib/trunk/Makefile Message-ID: Revision: 9957 http://gar.svn.sourceforge.net/gar/?rev=9957&view=rev Author: rthurner Date: 2010-05-23 11:03:16 +0000 (Sun, 23 May 2010) Log Message: ----------- lzlib - this should be now in gar Modified Paths: -------------- csw/mgar/pkg/lzlib/trunk/Makefile Modified: csw/mgar/pkg/lzlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzlib/trunk/Makefile 2010-05-22 21:36:19 UTC (rev 9956) +++ csw/mgar/pkg/lzlib/trunk/Makefile 2010-05-23 11:03:16 UTC (rev 9957) @@ -31,7 +31,7 @@ CONFIGURE_ARGS += CXX="$(CXX)" CONFIGURE_ARGS += CPPFLAGS="$(CPPFLAGS)" CONFIGURE_ARGS += CXXFLAGS="$(CXXFLAGS)" -CONFIGURE_ARGS += LDFLAGS="$(LDFLAGS) -norunpath" +CONFIGURE_ARGS += LDFLAGS="$(LDFLAGS)" TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun May 23 13:08:35 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 23 May 2010 11:08:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[9958] csw/mgar/pkg/lzip/trunk/Makefile Message-ID: Revision: 9958 http://gar.svn.sourceforge.net/gar/?rev=9958&view=rev Author: rthurner Date: 2010-05-23 11:08:35 +0000 (Sun, 23 May 2010) Log Message: ----------- lzip - this should be now in gar Modified Paths: -------------- csw/mgar/pkg/lzip/trunk/Makefile Modified: csw/mgar/pkg/lzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzip/trunk/Makefile 2010-05-23 11:03:16 UTC (rev 9957) +++ csw/mgar/pkg/lzip/trunk/Makefile 2010-05-23 11:08:35 UTC (rev 9958) @@ -28,7 +28,7 @@ CONFIGURE_ARGS += CXX="$(CXX)" CONFIGURE_ARGS += CPPFLAGS="$(CPPFLAGS)" CONFIGURE_ARGS += CXXFLAGS="$(CXXFLAGS)" -CONFIGURE_ARGS += LDFLAGS="$(LDFLAGS) -norunpath" +CONFIGURE_ARGS += LDFLAGS="$(LDFLAGS)" TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun May 23 13:09:21 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 23 May 2010 11:09:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[9959] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 9959 http://gar.svn.sourceforge.net/gar/?rev=9959&view=rev Author: rthurner Date: 2010-05-23 11:09:21 +0000 (Sun, 23 May 2010) Log Message: ----------- gar - add norunpath also to linker flags Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2010-05-23 11:08:35 UTC (rev 9958) +++ csw/mgar/gar/v2/gar.conf.mk 2010-05-23 11:09:21 UTC (rev 9959) @@ -482,9 +482,9 @@ SOS12U1_AS_FLAGS ?= $(EXTRA_SOS12U1_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS) GCC3_LD_FLAGS ?= -L$(GCC3_CC_HOME)/lib/$(MM_LIBDIR) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) GCC4_LD_FLAGS ?= -L$(GCC4_CC_HOME)/lib/$(MM_LIBDIR) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) - SOS11_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) - SOS12_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) - SOS12U1_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) + SOS11_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -norunpath + SOS12_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -norunpath + SOS12U1_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -norunpath # Compiler version GCC3_CC_VERSION = $(shell $(GCC3_CC) -v 2>&1| ggrep version) 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 May 24 14:12:23 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 24 May 2010 12:12:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[9960] csw/mgar/pkg/mod_jk/trunk Message-ID: Revision: 9960 http://gar.svn.sourceforge.net/gar/?rev=9960&view=rev Author: rthurner Date: 2010-05-24 12:12:22 +0000 (Mon, 24 May 2010) Log Message: ----------- mod_jk - update to 1.2.30 and gar-v2 Modified Paths: -------------- csw/mgar/pkg/mod_jk/trunk/Makefile csw/mgar/pkg/mod_jk/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/mod_jk/trunk/ Property changes on: csw/mgar/pkg/mod_jk/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/mod_jk/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_jk/trunk/Makefile 2010-05-23 11:09:21 UTC (rev 9959) +++ csw/mgar/pkg/mod_jk/trunk/Makefile 2010-05-24 12:12:22 UTC (rev 9960) @@ -1,5 +1,5 @@ GARNAME = tomcat-connectors -GARVERSION = 1.2.25 +GARVERSION = 1.2.30 CATEGORIES = server DESCRIPTION = AJP connector module for Apache 2 Modified: csw/mgar/pkg/mod_jk/trunk/checksums =================================================================== --- csw/mgar/pkg/mod_jk/trunk/checksums 2010-05-23 11:09:21 UTC (rev 9959) +++ csw/mgar/pkg/mod_jk/trunk/checksums 2010-05-24 12:12:22 UTC (rev 9960) @@ -1,13 +1,13 @@ -4f614130c85f86d8d3359a03230db8a3 download/tomcat-connectors-1.2.25-src.tar.gz -da3c0df06571efa952998e637ca10cde download/CSWap2modjk.gspec -1815c09dc59d4a769e20c0f2361c4656 download/CSWap2modjk.depend -36e88e72dcc7970ad5d95944f1d9600a download/CSWap2modjk.prototype -f4781a01cc678a752a800198918e5687 download/CSWap2modjk.postinstall -5eb4612d15fdf4fd8498d97c79ed8e4b download/CSWap2modjk.preremove -0dd379f20ceb32fc77bb3a9bf045097f download/CSWap2modjk.space -43136ccdd67533557a2e4953249f755f download/httpd-jk.conf.CSW -7824a6e972faae3d9ec7b06a47b70105 download/workers.properties -b69613899d749ba2a40d1acbbbe13ba9 download/workers.properties.minimal -594aca8f50b11134fd3396e348bd2f12 download/uriworkermap.properties -25c3855d2af69021dfc63e9d4b1ed78a download/install.diff -7c6ff5425f542ec5eb80954f8a470519 download/logging.diff +1815c09dc59d4a769e20c0f2361c4656 CSWap2modjk.depend +da3c0df06571efa952998e637ca10cde CSWap2modjk.gspec +f4781a01cc678a752a800198918e5687 CSWap2modjk.postinstall +5eb4612d15fdf4fd8498d97c79ed8e4b CSWap2modjk.preremove +a0994b400fb225bffa325b5cd53a08a2 CSWap2modjk.prototype +0dd379f20ceb32fc77bb3a9bf045097f CSWap2modjk.space +43136ccdd67533557a2e4953249f755f httpd-jk.conf.CSW +25c3855d2af69021dfc63e9d4b1ed78a install.diff +7c6ff5425f542ec5eb80954f8a470519 logging.diff +e6504ce44628ca18deaa503cbc77f545 tomcat-connectors-1.2.30-src.tar.gz +594aca8f50b11134fd3396e348bd2f12 uriworkermap.properties +7824a6e972faae3d9ec7b06a47b70105 workers.properties +b69613899d749ba2a40d1acbbbe13ba9 workers.properties.minimal This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon May 24 16:17:46 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 24 May 2010 14:17:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[9961] csw/mgar/pkg/gnupg2/trunk/Makefile Message-ID: Revision: 9961 http://gar.svn.sourceforge.net/gar/?rev=9961&view=rev Author: wahwah Date: 2010-05-24 14:17:46 +0000 (Mon, 24 May 2010) Log Message: ----------- gnupg2: You can't add a dependency for a modulation, what was I thinking? Using $(GARCH) for the dependency. This makes the dependencies different on sparcv and x86 architectures. Modified Paths: -------------- csw/mgar/pkg/gnupg2/trunk/Makefile Modified: csw/mgar/pkg/gnupg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg2/trunk/Makefile 2010-05-24 12:12:22 UTC (rev 9960) +++ csw/mgar/pkg/gnupg2/trunk/Makefile 2010-05-24 14:17:46 UTC (rev 9961) @@ -71,8 +71,8 @@ RUNTIME_DEP_PKGS_common += CSWreadline RUNTIME_DEP_PKGS_common += CSWzlib -RUNTIME_DEP_PKGS_common_isa-sparcv9 += CSWpth -RUNTIME_DEP_PKGS_common += $(RUNTIME_DEP_PKGS_common_$(MODULATION)) +RUNTIME_DEP_PKGS_common_sparc += CSWpth +RUNTIME_DEP_PKGS_common += $(RUNTIME_DEP_PKGS_common_$(GARCH)) # Not because of shared libraries. RUNTIME_DEP_PKGS_CSWgnupg2 += CSWgnupg-agent @@ -85,9 +85,9 @@ RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWpinentry CHECKPKG_OVERRIDES_CSWgnupg-agent += surplus-dependency|CSWpinentry -RUNTIME_DEP_PKGS_CSWgnupg-agent_isa-sparcv9 += CSWpth +RUNTIME_DEP_PKGS_CSWgnupg-agent_sparc += CSWpth -RUNTIME_DEP_PKGS_CSWgnupg-agent += $(RUNTIME_DEP_PKGS_CSWgnupg-agent_$(MODULATION)) +RUNTIME_DEP_PKGS_CSWgnupg-agent += $(RUNTIME_DEP_PKGS_CSWgnupg-agent_$(GARCH)) RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWgcrypt RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWggettextrt 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 May 24 19:14:53 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 24 May 2010 17:14:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[9962] csw/mgar/pkg/clzip/trunk Message-ID: Revision: 9962 http://gar.svn.sourceforge.net/gar/?rev=9962&view=rev Author: rthurner Date: 2010-05-24 17:14:52 +0000 (Mon, 24 May 2010) Log Message: ----------- clzip - echo -n not used any more Modified Paths: -------------- csw/mgar/pkg/clzip/trunk/Makefile csw/mgar/pkg/clzip/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/clzip/trunk/files/0004-Use-ucb-echo-for-n.patch Modified: csw/mgar/pkg/clzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/clzip/trunk/Makefile 2010-05-24 14:17:46 UTC (rev 9961) +++ csw/mgar/pkg/clzip/trunk/Makefile 2010-05-24 17:14:52 UTC (rev 9962) @@ -1,5 +1,5 @@ GARNAME = clzip -GARVERSION = 1.0-rc2 +GARVERSION = 1.0 CATEGORIES = utils DESCRIPTION = a lossless data compressor based on the LZMA algorithm @@ -11,10 +11,7 @@ PATCHFILES = 0001-Do-not-use-gcc-CFLAGS.patch PATCHFILES += 0002-Do-not-use-gcc-CFLAGS.patch PATCHFILES += 0003-Use-inttypes-instead-of-stdint.patch -PATCHFILES += 0004-Use-ucb-echo-for-n.patch -SPKG_VERSION = $(subst -,,$(GARVERSION)) - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/clzip/trunk/checksums =================================================================== --- csw/mgar/pkg/clzip/trunk/checksums 2010-05-24 14:17:46 UTC (rev 9961) +++ csw/mgar/pkg/clzip/trunk/checksums 2010-05-24 17:14:52 UTC (rev 9962) @@ -2,4 +2,4 @@ 3db9d95c5cac0ee16f762e3c65ce3336 0002-Do-not-use-gcc-CFLAGS.patch 2a1badc5ef23643659843f9a557afb13 0003-Use-inttypes-instead-of-stdint.patch 782315357fca676b888181ee0992e5ba 0004-Use-ucb-echo-for-n.patch -94c29caf7ded781280b4b0261bbf1b80 clzip-1.0-rc2.tar.gz +9f49b257e9da5e65471531866fb50336 clzip-1.0.tar.gz Deleted: csw/mgar/pkg/clzip/trunk/files/0004-Use-ucb-echo-for-n.patch =================================================================== --- csw/mgar/pkg/clzip/trunk/files/0004-Use-ucb-echo-for-n.patch 2010-05-24 14:17:46 UTC (rev 9961) +++ csw/mgar/pkg/clzip/trunk/files/0004-Use-ucb-echo-for-n.patch 2010-05-24 17:14:52 UTC (rev 9962) @@ -1,27 +0,0 @@ -From ebbffb3199cc4f9cd1fd0a429f3eac19a4570f06 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Fri, 26 Feb 2010 22:35:01 +0100 -Subject: [PATCH 4/4] Use ucb echo for -n - ---- - testsuite/check.sh | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/testsuite/check.sh b/testsuite/check.sh -index a57224d..77eb0ec 100755 ---- a/testsuite/check.sh -+++ b/testsuite/check.sh -@@ -5,6 +5,10 @@ - # This script is free software: you have unlimited permission - # to copy, distribute and modify it. - -+# Only ucb echo has -n -+PATH=/usr/ucb:$PATH -+export PATH -+ - LC_ALL=C - export LC_ALL - objdir=`pwd` --- -1.6.6 - 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 May 24 19:16:10 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 24 May 2010 17:16:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[9963] csw/mgar/pkg/clzip/trunk/checksums Message-ID: Revision: 9963 http://gar.svn.sourceforge.net/gar/?rev=9963&view=rev Author: rthurner Date: 2010-05-24 17:16:10 +0000 (Mon, 24 May 2010) Log Message: ----------- clzip - echo -n not used any more Modified Paths: -------------- csw/mgar/pkg/clzip/trunk/checksums Modified: csw/mgar/pkg/clzip/trunk/checksums =================================================================== --- csw/mgar/pkg/clzip/trunk/checksums 2010-05-24 17:14:52 UTC (rev 9962) +++ csw/mgar/pkg/clzip/trunk/checksums 2010-05-24 17:16:10 UTC (rev 9963) @@ -1,5 +1,4 @@ 11dfe47b102267e6c070699b0a92b741 0001-Do-not-use-gcc-CFLAGS.patch 3db9d95c5cac0ee16f762e3c65ce3336 0002-Do-not-use-gcc-CFLAGS.patch 2a1badc5ef23643659843f9a557afb13 0003-Use-inttypes-instead-of-stdint.patch -782315357fca676b888181ee0992e5ba 0004-Use-ucb-echo-for-n.patch 9f49b257e9da5e65471531866fb50336 clzip-1.0.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 Mon May 24 20:34:10 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 24 May 2010 18:34:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[9964] csw/mgar/pkg Message-ID: Revision: 9964 http://gar.svn.sourceforge.net/gar/?rev=9964&view=rev Author: rthurner Date: 2010-05-24 18:34:10 +0000 (Mon, 24 May 2010) Log Message: ----------- ccache - v3.0-pre Added Paths: ----------- csw/mgar/pkg/ccache/ csw/mgar/pkg/ccache/branches/ csw/mgar/pkg/ccache/tags/ csw/mgar/pkg/ccache/trunk/ csw/mgar/pkg/ccache/trunk/Makefile csw/mgar/pkg/ccache/trunk/checksums csw/mgar/pkg/ccache/trunk/files/ Property changes on: csw/mgar/pkg/ccache/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/ccache/trunk/Makefile =================================================================== --- csw/mgar/pkg/ccache/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ccache/trunk/Makefile 2010-05-24 18:34:10 UTC (rev 9964) @@ -0,0 +1,24 @@ +# $Id$ +GARNAME = ccache +GARVERSION = 3.0pre1 +CATEGORIES = utils + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = http://samba.org/ftp/ccache/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +SPKG_VERSION = $(subst p,,$(GARVERSION)) + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Property changes on: csw/mgar/pkg/ccache/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/ccache/trunk/checksums =================================================================== --- csw/mgar/pkg/ccache/trunk/checksums (rev 0) +++ csw/mgar/pkg/ccache/trunk/checksums 2010-05-24 18:34:10 UTC (rev 9964) @@ -0,0 +1 @@ +003eb4ea05325bec177267b9e894635c ccache-3.0pre1.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 Tue May 25 14:44:22 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 25 May 2010 12:44:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[9965] csw/mgar/pkg Message-ID: Revision: 9965 http://gar.svn.sourceforge.net/gar/?rev=9965&view=rev Author: bonivart Date: 2010-05-25 12:44:21 +0000 (Tue, 25 May 2010) Log Message: ----------- policydweight: initial commit Added Paths: ----------- csw/mgar/pkg/policyd-weight/ csw/mgar/pkg/policyd-weight/branches/ csw/mgar/pkg/policyd-weight/tags/ csw/mgar/pkg/policyd-weight/trunk/ csw/mgar/pkg/policyd-weight/trunk/Makefile csw/mgar/pkg/policyd-weight/trunk/checksums csw/mgar/pkg/policyd-weight/trunk/files/ csw/mgar/pkg/policyd-weight/trunk/files/cswusergroup csw/mgar/pkg/policyd-weight/trunk/files/policyd-weight.init Property changes on: csw/mgar/pkg/policyd-weight/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/policyd-weight/trunk/Makefile =================================================================== --- csw/mgar/pkg/policyd-weight/trunk/Makefile (rev 0) +++ csw/mgar/pkg/policyd-weight/trunk/Makefile 2010-05-25 12:44:21 UTC (rev 9965) @@ -0,0 +1,55 @@ +GARNAME = policyd-weight +GARVERSION = 0.1.14 +CATEGORIES = net + +DESCRIPTION = Policy daemon for the Postfix MTA (2.1 and later) +define BLURB + Policy daemon for the Postfix MTA (2.1 and later) intended to eliminate + forged envelope senders and HELOs (i.e. in bogus mails) +endef + +MASTER_SITES = http://www.policyd-weight.org/releases/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +ARCHALL = 1 + +CATALOGNAME = policydweight + +RUNTIME_DEP_PKGS = CSWperl CSWpmnetdns + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +INITSMF = /opt/csw/etc/init.d/csw$(GARNAME) +USERGROUP = /etc/opt/csw/pkg/CSW$(GARNAME)/cswusergroup +SAMPLECONF = /etc/opt/csw/postfix//policyd-weight.conf + +CHECKPKG_OVERRIDES += surplus-dependency|CSWperl +CHECKPKG_OVERRIDES += surplus-dependency|CSWpmnetdns + +include gar/category.mk + +install-custom: + @echo " ==> Installing $(GARNAME) (custom)" + @ginstall -m 755 -d $(DESTDIR)/opt/csw/etc/init.d + @ginstall -m 755 $(FILEDIR)/$(GARNAME).init $(DESTDIR)/opt/csw/etc/init.d/csw$(GARNAME) + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/postfix + @ginstall -m 644 $(WORKSRC)/policyd-weight.conf.sample $(DESTDIR)/etc/opt/csw/postfix/policyd-weight.conf + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSW$(GARNAME) + @ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSW$(GARNAME)/cswusergroup + @ginstall -m 755 -d $(DESTDIR)$(sbindir) + @ginstall -m 755 $(WORKSRC)/$(GARNAME) $(DESTDIR)$(sbindir) + @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 444 $(WORKSRC)/changes.txt $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 444 $(WORKSRC)/documentation.txt $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 755 $(WORKSRC)/todo.txt $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 755 -d $(DESTDIR)$(mandir)/man5 + @ginstall -m 755 $(WORKSRC)/man/man5/policyd-weight.conf.5 $(DESTDIR)$(mandir)/man5 + @ginstall -m 755 -d $(DESTDIR)$(mandir)/man8 + @ginstall -m 755 $(WORKSRC)/man/man8/policyd-weight.8 $(DESTDIR)$(mandir)/man8 + @$(MAKECOOKIE) Added: csw/mgar/pkg/policyd-weight/trunk/checksums =================================================================== --- csw/mgar/pkg/policyd-weight/trunk/checksums (rev 0) +++ csw/mgar/pkg/policyd-weight/trunk/checksums 2010-05-25 12:44:21 UTC (rev 9965) @@ -0,0 +1 @@ +fb4829a57c8b805fe981ee949a145042 policyd-weight-0.1.14.tar.gz Added: csw/mgar/pkg/policyd-weight/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/policyd-weight/trunk/files/cswusergroup (rev 0) +++ csw/mgar/pkg/policyd-weight/trunk/files/cswusergroup 2010-05-25 12:44:21 UTC (rev 9965) @@ -0,0 +1 @@ +polw:polw:CSW policyd-weight:/var/opt/csw/policyd-weight:/bin/false:::NP Added: csw/mgar/pkg/policyd-weight/trunk/files/policyd-weight.init =================================================================== --- csw/mgar/pkg/policyd-weight/trunk/files/policyd-weight.init (rev 0) +++ csw/mgar/pkg/policyd-weight/trunk/files/policyd-weight.init 2010-05-25 12:44:21 UTC (rev 9965) @@ -0,0 +1,52 @@ +#!/sbin/sh + +#RC_KLEV 0,1,2,S +#RC_SLEV 3 + +# rc-script for CSWpolicyd-weight +# Peter Bonivart, 2010-05-25 + +# Source SMF includes +[ -r /lib/svc/share/smf_include.sh ] && . /lib/svc/share/smf_include.sh + +# Source config file +[ -r /etc/opt/csw/postfix/policyd-weight.conf ] && . /etc/opt/csw/postfix/policyd-weight.conf + +SERVICE=policyd-weight +PATH=$PATH:/usr/bin:/opt/csw/bin + +ZONE= # used for initialization, do not change + +case "$1" in + start) + echo "Starting $SERVICE ..." + /opt/csw/sbin/policyd-weight -f /etc/opt/csw/postfix/policyd-weight.conf + ;; + stop) + echo "Stopping $SERVICE ..." + if [ -x /usr/bin/zonename ]; then + if [ "`/usr/bin/zonename`" = "global" ]; then + ZONE="-z global" + fi + fi + pkill $ZONE -x $SERVICE + ;; + restart) + echo "Restarting $SERVICE ... " + $0 stop + echo "Waiting for $SERVICE to stop: \c" + while ( pgrep $SERVICE > /dev/null ) + do + echo ".\c" + sleep 1 + done + echo + sleep 1 + $0 start + ;; + *) + echo "Usage: `basename $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 bonivart at users.sourceforge.net Tue May 25 14:55:58 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 25 May 2010 12:55:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[9966] csw/mgar/pkg/policyd-weight/trunk/Makefile Message-ID: Revision: 9966 http://gar.svn.sourceforge.net/gar/?rev=9966&view=rev Author: bonivart Date: 2010-05-25 12:55:58 +0000 (Tue, 25 May 2010) Log Message: ----------- policydweight: fix Makefile bug Modified Paths: -------------- csw/mgar/pkg/policyd-weight/trunk/Makefile Modified: csw/mgar/pkg/policyd-weight/trunk/Makefile =================================================================== --- csw/mgar/pkg/policyd-weight/trunk/Makefile 2010-05-25 12:44:21 UTC (rev 9965) +++ csw/mgar/pkg/policyd-weight/trunk/Makefile 2010-05-25 12:55:58 UTC (rev 9966) @@ -27,7 +27,7 @@ INITSMF = /opt/csw/etc/init.d/csw$(GARNAME) USERGROUP = /etc/opt/csw/pkg/CSW$(GARNAME)/cswusergroup -SAMPLECONF = /etc/opt/csw/postfix//policyd-weight.conf +SAMPLECONF = /etc/opt/csw/postfix/policyd-weight.conf CHECKPKG_OVERRIDES += surplus-dependency|CSWperl CHECKPKG_OVERRIDES += surplus-dependency|CSWpmnetdns 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 May 25 16:09:40 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 25 May 2010 14:09:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[9967] csw/mgar/pkg/balance/trunk Message-ID: Revision: 9967 http://gar.svn.sourceforge.net/gar/?rev=9967&view=rev Author: dmichelsen Date: 2010-05-25 14:09:40 +0000 (Tue, 25 May 2010) Log Message: ----------- balance: Update to 3.52 Modified Paths: -------------- csw/mgar/pkg/balance/trunk/Makefile csw/mgar/pkg/balance/trunk/checksums Added Paths: ----------- csw/mgar/pkg/balance/trunk/files/0001-Adjust-Makefile-for-Solaris.patch Removed Paths: ------------- csw/mgar/pkg/balance/trunk/files/0001-Adjust-Makefile.patch Modified: csw/mgar/pkg/balance/trunk/Makefile =================================================================== --- csw/mgar/pkg/balance/trunk/Makefile 2010-05-25 12:55:58 UTC (rev 9966) +++ csw/mgar/pkg/balance/trunk/Makefile 2010-05-25 14:09:40 UTC (rev 9967) @@ -1,5 +1,5 @@ GARNAME = balance -GARVERSION = 3.42 +GARVERSION = 3.52 CATEGORIES = net DESCRIPTION = A TCP proxy and load balancer @@ -11,7 +11,7 @@ MASTER_SITES = http://www.inlab.de/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PATCHFILES = 0001-Adjust-Makefile.patch +PATCHFILES = 0001-Adjust-Makefile-for-Solaris.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/balance/trunk/checksums =================================================================== --- csw/mgar/pkg/balance/trunk/checksums 2010-05-25 12:55:58 UTC (rev 9966) +++ csw/mgar/pkg/balance/trunk/checksums 2010-05-25 14:09:40 UTC (rev 9967) @@ -1,2 +1,2 @@ -dff93af413acf3cfe6e54f9f8ec99327 0001-Adjust-Makefile.patch -24bc4063e8af298471d7d0a2ac7462a6 balance-3.42.tar.gz +0f6d56db33fa85a6627c6d1f724c0ec1 0001-Adjust-Makefile-for-Solaris.patch +dd43b243290471536b7689382b7bb8d4 balance-3.52.tar.gz Copied: csw/mgar/pkg/balance/trunk/files/0001-Adjust-Makefile-for-Solaris.patch (from rev 9964, csw/mgar/pkg/balance/trunk/files/0001-Adjust-Makefile.patch) =================================================================== --- csw/mgar/pkg/balance/trunk/files/0001-Adjust-Makefile-for-Solaris.patch (rev 0) +++ csw/mgar/pkg/balance/trunk/files/0001-Adjust-Makefile-for-Solaris.patch 2010-05-25 14:09:40 UTC (rev 9967) @@ -0,0 +1,65 @@ +From 93c7b9720fa37dc44df91ed7ea26ff5c91ac40cf Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 25 May 2010 16:02:44 +0200 +Subject: [PATCH] Adjust Makefile for Solaris + +--- + Makefile | 21 ++++++++++++--------- + 1 files changed, 12 insertions(+), 9 deletions(-) + +diff --git a/Makefile b/Makefile +index 05c4ca5..a1ba163 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,26 +1,27 @@ + # $Id: Makefile,v 1.9 2010/02/14 18:36:56 t Exp t $ + + #CFLAGS=-g -I. +-CFLAGS=-O2 -Wall -Wstrict-prototypes -Wuninitialized ++# CFLAGS=-O2 -Wall -Wstrict-prototypes -Wuninitialized + + # uncomment for any OS other than Cygwin + BALANCE=balance + ROOT=root + INSTALL=install +-BINDIR=/usr/sbin +-MANDIR=${BINDIR}/../man/man1 ++# BINDIR=/usr/sbin ++# MANDIR=${BINDIR}/../man/man1 + + # uncomment for Solaris: +-# LIBRARIES=-lsocket -lnsl +-# INSTALL=/usr/ucb/install +-# BINDIR=/usr/local/libexec ++LIBRARIES=-lsocket -lnsl ++INSTALL=/usr/ucb/install ++BINDIR=/opt/csw/sbin ++MANDIR=/opt/csw/share/man/man1 + + # uncomment for Cygwin: + # LIBRARIES=-L/usr/local/lib -lcygipc + # BALANCE=balance.exe + # ROOT=Administrators + +-CC=gcc ++# CC=gcc + RELEASE=3.52 + + all: balance +@@ -48,9 +49,11 @@ clean: + rm -f $(BALANCE) *.o balance.ps balance.pdf + + install: +- $(INSTALL) -o $(ROOT) -g $(ROOT) -m 755 $(BALANCE) \ ++ $(INSTALL) -d $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 755 $(BALANCE) \ + $(DESTDIR)$(BINDIR)/$(BALANCE) +- $(INSTALL) -o $(ROOT) -g $(ROOT) -m 755 balance.1 \ ++ $(INSTALL) -d $(DESTDIR)$(MANDIR) ++ $(INSTALL) -m 755 balance.1 \ + $(DESTDIR)$(MANDIR) + mkdir -p $(DESTDIR)/var/run/balance + chmod 1777 $(DESTDIR)/var/run/balance +-- +1.7.1 + Deleted: csw/mgar/pkg/balance/trunk/files/0001-Adjust-Makefile.patch =================================================================== --- csw/mgar/pkg/balance/trunk/files/0001-Adjust-Makefile.patch 2010-05-25 12:55:58 UTC (rev 9966) +++ csw/mgar/pkg/balance/trunk/files/0001-Adjust-Makefile.patch 2010-05-25 14:09:40 UTC (rev 9967) @@ -1,65 +0,0 @@ -From f39ca105749c5c407c8e0ff6d53ed0a1fee12470 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Fri, 6 Nov 2009 16:33:53 +0100 -Subject: [PATCH] Adjust Makefile - ---- - Makefile | 20 ++++++++++++-------- - 1 files changed, 12 insertions(+), 8 deletions(-) - -diff --git a/Makefile b/Makefile -index 90a4b47..3c549ce 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,26 +1,28 @@ - # $Id: Makefile,v 1.45 2008/04/08 17:39:08 tommy Exp $ - - #CFLAGS=-g -I. --CFLAGS=-O2 -Wall -Wstrict-prototypes -Wuninitialized -+# CFLAGS=-O2 -Wall -Wstrict-prototypes -Wuninitialized - - # uncomment for any OS other than Cygwin - BALANCE=balance - ROOT=root - INSTALL=install --BINDIR=/usr/sbin --MANDIR=${BINDIR}/../man/man1 -+# BINDIR=/usr/sbin -+# MANDIR=${BINDIR}/../man/man1 - - # uncomment for Solaris --# LIBRARIES=-lsocket -lnsl --# INSTALL=/usr/ucb/install -+LIBRARIES=-lsocket -lnsl -+INSTALL=/usr/ucb/install - # BINDIR=/usr/local/libexec -+BINDIR=/opt/csw/sbin -+MANDIR=/opt/csw/share/man/man1 - - # uncomment for Cygwin - # LIBRARIES=-L/usr/local/lib -lcygipc - # BALANCE=balance.exe - # ROOT=Administrators - --CC=gcc -+# CC=gcc - RELEASE=3.42 - - all: balance -@@ -48,9 +50,11 @@ clean: - rm -f $(BALANCE) *.o balance.ps balance.pdf - - install: -- $(INSTALL) -o $(ROOT) -g $(ROOT) -m 755 $(BALANCE) \ -+ $(INSTALL) -d $(DESTDIR)$(BINDIR) -+ $(INSTALL) -m 755 $(BALANCE) \ - $(DESTDIR)$(BINDIR)/$(BALANCE) -- $(INSTALL) -o $(ROOT) -g $(ROOT) -m 755 balance.1 \ -+ $(INSTALL) -d $(DESTDIR)$(MANDIR) -+ $(INSTALL) -m 755 balance.1 \ - $(DESTDIR)$(MANDIR) - mkdir -p $(DESTDIR)/var/run/balance - chmod 1777 $(DESTDIR)/var/run/balance --- -1.6.5.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 Tue May 25 16:39:46 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 25 May 2010 14:39:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[9968] csw/mgar/pkg/balance/trunk/Makefile Message-ID: Revision: 9968 http://gar.svn.sourceforge.net/gar/?rev=9968&view=rev Author: dmichelsen Date: 2010-05-25 14:39:46 +0000 (Tue, 25 May 2010) Log Message: ----------- balance: Add VENDOR_URL Modified Paths: -------------- csw/mgar/pkg/balance/trunk/Makefile Modified: csw/mgar/pkg/balance/trunk/Makefile =================================================================== --- csw/mgar/pkg/balance/trunk/Makefile 2010-05-25 14:09:40 UTC (rev 9967) +++ csw/mgar/pkg/balance/trunk/Makefile 2010-05-25 14:39:46 UTC (rev 9968) @@ -16,6 +16,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +VENDOR_URL = http://www.inlab.de/balance.html + CONFIGURE_SCRIPTS = TEST_SCRIPTS = 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 May 25 16:54:26 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 25 May 2010 14:54:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[9969] csw/mgar/pkg/glib2/trunk Message-ID: Revision: 9969 http://gar.svn.sourceforge.net/gar/?rev=9969&view=rev Author: dmichelsen Date: 2010-05-25 14:54:26 +0000 (Tue, 25 May 2010) Log Message: ----------- glib2: Update to 2.25.7, needs updated dbus first Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile csw/mgar/pkg/glib2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/glib2/trunk/files/0001-Make-sure-we-have-the-include-for-major-minor.patch Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2010-05-25 14:39:46 UTC (rev 9968) +++ csw/mgar/pkg/glib2/trunk/Makefile 2010-05-25 14:54:26 UTC (rev 9969) @@ -1,5 +1,5 @@ GARNAME = glib -GARVERSION = 2.23.5 +GARVERSION = 2.25.7 CATEGORIES = lib DESCRIPTION = The GLib library of C routines. @@ -27,8 +27,14 @@ # Bug reported upstream: # https://bugzilla.gnome.org/show_bug.cgi?id=612300 -PATCHFILES += 0001-Use-G_STRFUNC-instead-of-explicit-gcc-only-__PRETTY_.patch +# PATCHFILES += 0001-Use-G_STRFUNC-instead-of-explicit-gcc-only-__PRETTY_.patch +PATCHFILES += 0001-Make-sure-we-have-the-include-for-major-minor.patch + +# We don't need it and if defined the test breaks +LD_OPTIONS = +EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libiconv=gnu CONFIGURE_ARGS += --enable-static @@ -48,9 +54,7 @@ RUNTIME_DEP_PKGS_CSWglib2devel += CSWpython RUNTIME_DEP_PKGS_CSWglib2devel += CSWzlib -#TEST_TARGET = check -TEST_TARGET = -SKIPTEST ?= 0 +TEST_TARGET = check #provided by iconv MERGE_EXCLUDE_FILES = .*/charset.alias Modified: csw/mgar/pkg/glib2/trunk/checksums =================================================================== --- csw/mgar/pkg/glib2/trunk/checksums 2010-05-25 14:39:46 UTC (rev 9968) +++ csw/mgar/pkg/glib2/trunk/checksums 2010-05-25 14:54:26 UTC (rev 9969) @@ -1,6 +1,5 @@ -a87638e0505b6ff29efd8130450003c5 0001-Use-G_STRFUNC-instead-of-explicit-gcc-only-__PRETTY_.patch 9f66027a275eb34d80a68ec8927bf66e CMSG_LEN.patch f1f3c182f64be06ab57d8b01016af074 FIXED_STR.patch -f249a94e8da086fd5d6e24dd4c1a1324 glib-2.23.5.tar.bz2 +ac4867b9450f8bf5f1075336a32a1a88 glib-2.25.7.tar.bz2 8f683820d9ecab1abd9dbe81997ab9eb glib-typedetect.patch bb2fb8eef43c995fea6c08563487ace6 gsize.patch Added: csw/mgar/pkg/glib2/trunk/files/0001-Make-sure-we-have-the-include-for-major-minor.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0001-Make-sure-we-have-the-include-for-major-minor.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/0001-Make-sure-we-have-the-include-for-major-minor.patch 2010-05-25 14:54:26 UTC (rev 9969) @@ -0,0 +1,28 @@ +From 475c9fd0ca749f581c59260b8efe87633b083d0a Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 25 May 2010 16:12:45 +0200 +Subject: [PATCH] Make sure we have the include for major()/minor() + +--- + gio/gdbusmessage.c | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c +index eabe171..bb8cad1 100644 +--- a/gio/gdbusmessage.c ++++ b/gio/gdbusmessage.c +@@ -30,6 +30,11 @@ + #include + #endif + ++#ifdef __sun ++/* For defines of major() and minor() */ ++#include ++#endif ++ + #include "gdbusutils.h" + #include "gdbusmessage.h" + #include "gdbuserror.h" +-- +1.7.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue May 25 19:40:34 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 25 May 2010 17:40:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[9970] csw/mgar/pkg/xterm/trunk/Makefile Message-ID: Revision: 9970 http://gar.svn.sourceforge.net/gar/?rev=9970&view=rev Author: skayser Date: 2010-05-25 17:40:34 +0000 (Tue, 25 May 2010) Log Message: ----------- xterm: go back to vanilla X11 now that we have Xrender again Modified Paths: -------------- csw/mgar/pkg/xterm/trunk/Makefile Modified: csw/mgar/pkg/xterm/trunk/Makefile =================================================================== --- csw/mgar/pkg/xterm/trunk/Makefile 2010-05-25 14:54:26 UTC (rev 9969) +++ csw/mgar/pkg/xterm/trunk/Makefile 2010-05-25 17:40:34 UTC (rev 9970) @@ -46,41 +46,23 @@ CONFIGURE_ARGS += --enable-warnings CONFIGURE_ARGS += --enable-wide-chars CONFIGURE_ARGS += --program-suffix=86 --with-xterm-symlink + +# Specify freetype linker flags, otherwise /opt/csw/X11/bin/xft-config is used CONFIGURE_ARGS += --with-freetype-cflags="-I$(includedir)/freetype2" +CONFIGURE_ARGS += --with-freetype-libs="-lXft -lfontconfig -lfreetype" #GARFLAVOR = DBG CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) CONFIGURE_ARGS_DBG = --enable-trace --enable-warnings -# Notes on CSW X11 libs: -# Through CSW freetype, xterm depends on Xrender and Xft. Starting with -# -# libxrender-0.9.4,REV=2009.06.11 -# libxft2-2.1.13,REV=2009.06.15 -# -# these libs moved to the CSW X11 libs prefix (/opt/csw/X11). Accordingly, -# we need to build against these X11 libs, otherwise ./configure bails out -# when verifying the linkage to freetype. This unfortunatel drags a pile -# of other CSW X11 libs with it ... o_O ... -CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include -CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) - -# Xt app-default files need to go where Xt looks for them (one of -# $(prefix)/X11/{etc,share,lib}/X11/app-defaults) -CONFIGURE_ARGS += --with-app-defaults=$(prefix)/X11/etc/X11/app-defaults - -# Make sure to runtime link the same way that we link edited -# * xterm link edit order is (-L/-R): X11/lib/, lib/ -# * LD_OPTIONS would prepend (-R): lib/ -# -> libs like libXft might be runtime linked from lib/ instead of X11/lib/ -LD_OPTIONS = -EXTRA_LINKER_FLAGS = $(filter-out %ISALIST, $(RUNPATH_LINKER_FLAGS)) - # luit comes with snv_85 # http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6662431 #CONFIGURE_ARGS += --enable-luit +# xterm doesn't rely on optimized libs, fasten startup +NOISALIST = 1 + include gar/category.mk # ./configure needs to find xft-config This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue May 25 20:00:17 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 25 May 2010 18:00:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[9971] csw/mgar/pkg/xterm/trunk/Makefile Message-ID: Revision: 9971 http://gar.svn.sourceforge.net/gar/?rev=9971&view=rev Author: skayser Date: 2010-05-25 18:00:16 +0000 (Tue, 25 May 2010) Log Message: ----------- xterm: get rid of surplus deps after going back to vanilla X11 Modified Paths: -------------- csw/mgar/pkg/xterm/trunk/Makefile Modified: csw/mgar/pkg/xterm/trunk/Makefile =================================================================== --- csw/mgar/pkg/xterm/trunk/Makefile 2010-05-25 17:40:34 UTC (rev 9970) +++ csw/mgar/pkg/xterm/trunk/Makefile 2010-05-25 18:00:16 UTC (rev 9971) @@ -23,11 +23,6 @@ RUNTIME_DEP_PKGS = CSWfconfig RUNTIME_DEP_PKGS += CSWlibxft2 -RUNTIME_DEP_PKGS += CSWlibice -RUNTIME_DEP_PKGS += CSWlibx11 -RUNTIME_DEP_PKGS += CSWlibxaw -RUNTIME_DEP_PKGS += CSWlibxmu -RUNTIME_DEP_PKGS += CSWlibxt # xterm Makefile doesn't have a test target TEST_TARGET = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue May 25 21:01:56 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 25 May 2010 19:01:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[9972] csw/mgar/pkg/xterm/trunk/files Message-ID: Revision: 9972 http://gar.svn.sourceforge.net/gar/?rev=9972&view=rev Author: skayser Date: 2010-05-25 19:01:56 +0000 (Tue, 25 May 2010) Log Message: ----------- xterm: update changelog.CSW and README.CSW for release Modified Paths: -------------- csw/mgar/pkg/xterm/trunk/files/README.CSW csw/mgar/pkg/xterm/trunk/files/changelog.CSW Modified: csw/mgar/pkg/xterm/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/xterm/trunk/files/README.CSW 2010-05-25 18:00:16 UTC (rev 9971) +++ csw/mgar/pkg/xterm/trunk/files/README.CSW 2010-05-25 19:01:56 UTC (rev 9972) @@ -1,14 +1,37 @@ -$TERM, ncurses and how to make xterm display colors ---------------------------------------------------- +$TERM, ncurses/terminfo and how to make xterm display colors +------------------------------------------------------------ -The xterm distributed with Solaris is a basic xterm (xterm-r6), whereas this -is a current xterm and supports a wider range of terminal capabilites. -To keep CSWncurses compatible with the Solaris xterm, TERM=xterm refers -to the basic xterm-r6 capabilities, which unfortunately also defeats -color support in some ncurses-based applications. +The xterm distributed with Solaris is a basic xterm (xterm-r6), whereas the +xterm distributed by OpenCSW is a current xterm and supports a wider range of +terminal capabilites. Both terminals, per default, identify as TERM=xterm. -To make full use of the capabilities of this xterm (including color-support) -set TERM=xterm-new. You might then however experience problems when -SSH'ing to machines where xterm-new isn't known to terminfo ("terminal not -fully functional" messages). That's the main reason TERM=xterm-new hasn't -been compiled in as a default by the way. +To stay compatible with the Solaris xterm, CSW's terminfo treats TERM=xterm as +a basic xterm-r6, which unfortunately also defeats color support in some +ncurses-based applications. + +If you have CSW's ncurses/terminfo installed and want to make full use of the +capabilities of this xterm (including color-support) set + + TERMINFO=/opt/csw/share/terminfo + TERM=xterm-new + +As a side effect, you might notice problems when SSH'ing to machines where +xterm-new isn't known to terminfo ("terminal not fully functional" messages). +That's the main reason TERM=xterm-new hasn't been compiled in as a default for +CSW's xterm in the first place. + + +Note: X resource files in /opt/csw/lib/X11/app-defaults +------------------------------------------------------- + +Although this package delivers some X resource files in +/opt/csw/lib/X11/app-defaults/ this folder is not evaluated by the +Solaris libXt per default. + +Either treat them as example files and copy and paste what you need into +your system / personal X resource files or set XFILESEARCHPATH / +XUSERFILESEARCHPATH to honor this directory. + + http://www.faqs.org/faqs/x-faq/part2/section-22.html + + Modified: csw/mgar/pkg/xterm/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/xterm/trunk/files/changelog.CSW 2010-05-25 18:00:16 UTC (rev 9971) +++ csw/mgar/pkg/xterm/trunk/files/changelog.CSW 2010-05-25 19:01:56 UTC (rev 9972) @@ -1,3 +1,11 @@ +xterm (258,REV=2010.05.25) + + * Updated to 258. (Fixes #4186) + * Reverted to Sun's X11 now that libXft and libXrender are available + as Sun X11 versions again. + + -- Sebastian Kayser Tue, 25 May 2010 20:49:18 +0200 + xterm (251,REV=2009.11.23) * Updated to 251. (Fixes #3937, #3856) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed May 26 00:35:41 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 25 May 2010 22:35:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[9973] csw/mgar/pkg Message-ID: Revision: 9973 http://gar.svn.sourceforge.net/gar/?rev=9973&view=rev Author: skayser Date: 2010-05-25 22:35:41 +0000 (Tue, 25 May 2010) Log Message: ----------- pyboto: initial commit Added Paths: ----------- csw/mgar/pkg/pyboto/ csw/mgar/pkg/pyboto/branches/ csw/mgar/pkg/pyboto/tags/ csw/mgar/pkg/pyboto/trunk/ csw/mgar/pkg/pyboto/trunk/Makefile csw/mgar/pkg/pyboto/trunk/checksums csw/mgar/pkg/pyboto/trunk/files/ Property changes on: csw/mgar/pkg/pyboto/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/pyboto/trunk/Makefile =================================================================== --- csw/mgar/pkg/pyboto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pyboto/trunk/Makefile 2010-05-25 22:35:41 UTC (rev 9973) @@ -0,0 +1,21 @@ +GARNAME = pyboto +GARVERSION = 1.9b +CATEGORIES = python + +DESCRIPTION = Python interfaces to Amazon Web Services +define BLURB + An integrated interface to current and future infrastructural services + offered by Amazon Web Services. The goal of boto is to provide a very + simple, easy to use, lightweight wrapper around the Amazon services. +endef + +VENDOR_URL = http://code.google.com/p/boto/ +MASTER_SITES = $(GOOGLE_MIRROR) +GOOGLE_PROJECT = boto +DISTNAME = $(GOOGLE_PROJECT)-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz +UFILES_REGEX = $(GOOGLE_PROJECT)-(\d+(?:\.\d+)*).tar.gz + +ARCHALL = 1 + +include gar/category.mk Property changes on: csw/mgar/pkg/pyboto/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/pyboto/trunk/checksums =================================================================== --- csw/mgar/pkg/pyboto/trunk/checksums (rev 0) +++ csw/mgar/pkg/pyboto/trunk/checksums 2010-05-25 22:35:41 UTC (rev 9973) @@ -0,0 +1 @@ +4fc2fd7b70a971b1363f8465aafe7091 boto-1.9b.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed May 26 00:42:04 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 25 May 2010 22:42:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[9974] csw/mgar/pkg/pyboto/trunk/Makefile Message-ID: Revision: 9974 http://gar.svn.sourceforge.net/gar/?rev=9974&view=rev Author: skayser Date: 2010-05-25 22:42:04 +0000 (Tue, 25 May 2010) Log Message: ----------- pyboto: adjust pkg names, add license Modified Paths: -------------- csw/mgar/pkg/pyboto/trunk/Makefile Modified: csw/mgar/pkg/pyboto/trunk/Makefile =================================================================== --- csw/mgar/pkg/pyboto/trunk/Makefile 2010-05-25 22:35:41 UTC (rev 9973) +++ csw/mgar/pkg/pyboto/trunk/Makefile 2010-05-25 22:42:04 UTC (rev 9974) @@ -9,6 +9,9 @@ simple, easy to use, lightweight wrapper around the Amazon services. endef +PACKAGES = CSWpy-boto +CATALOGNAME = py_boto + VENDOR_URL = http://code.google.com/p/boto/ MASTER_SITES = $(GOOGLE_MIRROR) GOOGLE_PROJECT = boto @@ -16,6 +19,7 @@ DISTFILES = $(DISTNAME).tar.gz UFILES_REGEX = $(GOOGLE_PROJECT)-(\d+(?:\.\d+)*).tar.gz +LICENSE = files/COPYING ARCHALL = 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed May 26 00:43:59 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 25 May 2010 22:43:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[9975] csw/mgar/pkg/pyboto/trunk Message-ID: Revision: 9975 http://gar.svn.sourceforge.net/gar/?rev=9975&view=rev Author: skayser Date: 2010-05-25 22:43:59 +0000 (Tue, 25 May 2010) Log Message: ----------- pyboto: add changelog.CSW Modified Paths: -------------- csw/mgar/pkg/pyboto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/pyboto/trunk/files/changelog.CSW Modified: csw/mgar/pkg/pyboto/trunk/Makefile =================================================================== --- csw/mgar/pkg/pyboto/trunk/Makefile 2010-05-25 22:42:04 UTC (rev 9974) +++ csw/mgar/pkg/pyboto/trunk/Makefile 2010-05-25 22:43:59 UTC (rev 9975) @@ -23,3 +23,10 @@ ARCHALL = 1 include gar/category.mk + +# Install changelog.CSW +post-merge: $(foreach P,$(_PKG_SPECS),install-changelog-$P) +install-changelog-%: + ginstall -D $(FILEDIR)/changelog.CSW \ + $(PKGROOT)$(docdir)/$(call catalogname,$*)/changelog.CSW + @$(MAKECOOKIE) Added: csw/mgar/pkg/pyboto/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/pyboto/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/pyboto/trunk/files/changelog.CSW 2010-05-25 22:43:59 UTC (rev 9975) @@ -0,0 +1,5 @@ +py_boto (1.9b,REV=2010.05.26) + + * Initial release. + + -- Sebastian Kayser Wed, 26 May 2010 00:43:13 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed May 26 00:46:40 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 25 May 2010 22:46:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[9976] csw/mgar/pkg/pyboto/trunk/files/COPYING Message-ID: Revision: 9976 http://gar.svn.sourceforge.net/gar/?rev=9976&view=rev Author: skayser Date: 2010-05-25 22:46:39 +0000 (Tue, 25 May 2010) Log Message: ----------- pyboto: add license Added Paths: ----------- csw/mgar/pkg/pyboto/trunk/files/COPYING Added: csw/mgar/pkg/pyboto/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/pyboto/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/pyboto/trunk/files/COPYING 2010-05-25 22:46:39 UTC (rev 9976) @@ -0,0 +1,21 @@ +The MIT License + +Copyright (c) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed May 26 09:43:00 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 26 May 2010 07:43:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[9977] csw/mgar/pkg/pyboto/trunk/Makefile Message-ID: Revision: 9977 http://gar.svn.sourceforge.net/gar/?rev=9977&view=rev Author: skayser Date: 2010-05-26 07:43:00 +0000 (Wed, 26 May 2010) Log Message: ----------- pyboto: add README Modified Paths: -------------- csw/mgar/pkg/pyboto/trunk/Makefile Modified: csw/mgar/pkg/pyboto/trunk/Makefile =================================================================== --- csw/mgar/pkg/pyboto/trunk/Makefile 2010-05-25 22:46:39 UTC (rev 9976) +++ csw/mgar/pkg/pyboto/trunk/Makefile 2010-05-26 07:43:00 UTC (rev 9977) @@ -24,6 +24,11 @@ include gar/category.mk +post-install-modulated: + ginstall -D $(WORKSRC)/README \ + $(DESTDIR)$(docdir)/$(CATALOGNAME)/README + @$(MAKECOOKIE) + # Install changelog.CSW post-merge: $(foreach P,$(_PKG_SPECS),install-changelog-$P) install-changelog-%: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed May 26 09:45:37 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 26 May 2010 07:45:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[9978] csw/mgar/pkg/pyboto/trunk/files/changelog.CSW Message-ID: Revision: 9978 http://gar.svn.sourceforge.net/gar/?rev=9978&view=rev Author: skayser Date: 2010-05-26 07:45:37 +0000 (Wed, 26 May 2010) Log Message: ----------- pyboto: update changelog Modified Paths: -------------- csw/mgar/pkg/pyboto/trunk/files/changelog.CSW Modified: csw/mgar/pkg/pyboto/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/pyboto/trunk/files/changelog.CSW 2010-05-26 07:43:00 UTC (rev 9977) +++ csw/mgar/pkg/pyboto/trunk/files/changelog.CSW 2010-05-26 07:45:37 UTC (rev 9978) @@ -2,4 +2,4 @@ * Initial release. - -- Sebastian Kayser Wed, 26 May 2010 00:43:13 +0200 + -- Sebastian Kayser Wed, 26 May 2010 09:44:57 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 26 10:21:15 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 26 May 2010 08:21:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[9979] csw/mgar/pkg/help2man/trunk Message-ID: Revision: 9979 http://gar.svn.sourceforge.net/gar/?rev=9979&view=rev Author: dmichelsen Date: 2010-05-26 08:21:15 +0000 (Wed, 26 May 2010) Log Message: ----------- help2man: Update to 1.38.2 Modified Paths: -------------- csw/mgar/pkg/help2man/trunk/Makefile csw/mgar/pkg/help2man/trunk/checksums Modified: csw/mgar/pkg/help2man/trunk/Makefile =================================================================== --- csw/mgar/pkg/help2man/trunk/Makefile 2010-05-26 07:45:37 UTC (rev 9978) +++ csw/mgar/pkg/help2man/trunk/Makefile 2010-05-26 08:21:15 UTC (rev 9979) @@ -1,5 +1,5 @@ GARNAME = help2man -GARVERSION = 1.38.1 +GARVERSION = 1.38.2 CATEGORIES = devel DESCRIPTION = A tool for automatically generating simple manual pages from program output Modified: csw/mgar/pkg/help2man/trunk/checksums =================================================================== --- csw/mgar/pkg/help2man/trunk/checksums 2010-05-26 07:45:37 UTC (rev 9978) +++ csw/mgar/pkg/help2man/trunk/checksums 2010-05-26 08:21:15 UTC (rev 9979) @@ -1 +1 @@ -32435397b2668b8cb3920aa18b87bec5 help2man-1.38.1.tar.gz +426671c6fe79e5ef2233303367eab5a6 help2man-1.38.2.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 Wed May 26 11:15:13 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 26 May 2010 09:15:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[9980] csw/mgar/pkg/memconf/trunk Message-ID: Revision: 9980 http://gar.svn.sourceforge.net/gar/?rev=9980&view=rev Author: bonivart Date: 2010-05-26 09:15:12 +0000 (Wed, 26 May 2010) Log Message: ----------- memconf: update to 2.14 Modified Paths: -------------- csw/mgar/pkg/memconf/trunk/Makefile csw/mgar/pkg/memconf/trunk/checksums Modified: csw/mgar/pkg/memconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/memconf/trunk/Makefile 2010-05-26 08:21:15 UTC (rev 9979) +++ csw/mgar/pkg/memconf/trunk/Makefile 2010-05-26 09:15:12 UTC (rev 9980) @@ -1,5 +1,5 @@ GARNAME = memconf -GARVERSION = 2.13 +GARVERSION = 2.14 CATEGORIES = utils DESCRIPTION = Perl script that displays memory modules installed Modified: csw/mgar/pkg/memconf/trunk/checksums =================================================================== --- csw/mgar/pkg/memconf/trunk/checksums 2010-05-26 08:21:15 UTC (rev 9979) +++ csw/mgar/pkg/memconf/trunk/checksums 2010-05-26 09:15:12 UTC (rev 9980) @@ -1,3 +1,3 @@ 818efbe29da417ad462e3f6345690c3d COPYING -ff3f49496c54bba509801800e3e154b9 memconf.gz -d850cd562037cd972be81a86efb8566b memconf.man +4775f1b4a94f6ec3a7090f77087bff86 memconf.gz +89a4eb8e7e3e7b41f8a91b3a719948be memconf.man This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 26 12:39:27 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 26 May 2010 10:39:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[9981] csw/mgar/pkg/pbzip2/trunk Message-ID: Revision: 9981 http://gar.svn.sourceforge.net/gar/?rev=9981&view=rev Author: dmichelsen Date: 2010-05-26 10:39:27 +0000 (Wed, 26 May 2010) Log Message: ----------- pbzip2: Update to 1.1.1 and fix -norunpath Modified Paths: -------------- csw/mgar/pkg/pbzip2/trunk/Makefile csw/mgar/pkg/pbzip2/trunk/checksums Modified: csw/mgar/pkg/pbzip2/trunk/Makefile =================================================================== --- csw/mgar/pkg/pbzip2/trunk/Makefile 2010-05-26 09:15:12 UTC (rev 9980) +++ csw/mgar/pkg/pbzip2/trunk/Makefile 2010-05-26 10:39:27 UTC (rev 9981) @@ -1,5 +1,5 @@ GARNAME = pbzip2 -GARVERSION = 1.1.0 +GARVERSION = 1.1.1 CATEGORIES = utils DESCRIPTION = Parallel BZIP2 Data Compression Software @@ -38,7 +38,7 @@ include gar/category.mk pre-build-modulated: - @gsed -i'' 's,-pthread,-I$(includedir) -L$(libdir),g;s,g++,$(CXX),;s,-O2,-fast $(CFLAGS),' $(WORKSRC)/Makefile + @gsed -i'' 's,-lpthread,-norunpath -lpthread,g;s,-pthread,-I$(includedir) -L$(libdir),g;s,g++,$(CXX),;s,-O2,-fast $(filter-out -xnorunpath,$(CFLAGS)),' $(WORKSRC)/Makefile install-custom: [ ! -d "$(DESTDIR)$(mandir)/man1" ] && \ Modified: csw/mgar/pkg/pbzip2/trunk/checksums =================================================================== --- csw/mgar/pkg/pbzip2/trunk/checksums 2010-05-26 09:15:12 UTC (rev 9980) +++ csw/mgar/pkg/pbzip2/trunk/checksums 2010-05-26 10:39:27 UTC (rev 9981) @@ -1 +1 @@ -39cfc2e8c810391b571246e798f7c73a pbzip2-1.1.0.tar.gz +b354422759da7113da366aad1876ed5d pbzip2-1.1.1.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 Wed May 26 12:47:52 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 26 May 2010 10:47:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[9982] csw/mgar/pkg Message-ID: Revision: 9982 http://gar.svn.sourceforge.net/gar/?rev=9982&view=rev Author: dmichelsen Date: 2010-05-26 10:47:52 +0000 (Wed, 26 May 2010) Log Message: ----------- mawk: Initial commit Added Paths: ----------- csw/mgar/pkg/mawk/ csw/mgar/pkg/mawk/branches/ csw/mgar/pkg/mawk/tags/ csw/mgar/pkg/mawk/trunk/ csw/mgar/pkg/mawk/trunk/Makefile csw/mgar/pkg/mawk/trunk/checksums csw/mgar/pkg/mawk/trunk/files/ Property changes on: csw/mgar/pkg/mawk/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/mawk/trunk/Makefile =================================================================== --- csw/mgar/pkg/mawk/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mawk/trunk/Makefile 2010-05-26 10:47:52 UTC (rev 9982) @@ -0,0 +1,20 @@ +# $Id$ +GARNAME = mawk +GARVERSION = 1.3.4 +CATEGORIES = utils + +DESCRIPTION = Fast, bytecode-based AWK +define BLURB +endef + +MASTER_SITES = ftp://invisible-island.net/mawk/ +DISTFILES = $(GARNAME)-$(GARVERSION).tgz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +VENDOR_URL = http://invisible-island.net/mawk/mawk.html + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Property changes on: csw/mgar/pkg/mawk/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/mawk/trunk/checksums =================================================================== --- csw/mgar/pkg/mawk/trunk/checksums (rev 0) +++ csw/mgar/pkg/mawk/trunk/checksums 2010-05-26 10:47:52 UTC (rev 9982) @@ -0,0 +1 @@ +b1d27324ae80302452d0fa0c98447b65 mawk-1.3.4.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 Wed May 26 14:13:11 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 26 May 2010 12:13:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[9983] csw/mgar/pkg Message-ID: Revision: 9983 http://gar.svn.sourceforge.net/gar/?rev=9983&view=rev Author: dmichelsen Date: 2010-05-26 12:13:11 +0000 (Wed, 26 May 2010) Log Message: ----------- squidguard: Initial commit, still needs a lot of work Added Paths: ----------- csw/mgar/pkg/squidguard/ csw/mgar/pkg/squidguard/branches/ csw/mgar/pkg/squidguard/tags/ csw/mgar/pkg/squidguard/trunk/ csw/mgar/pkg/squidguard/trunk/Makefile csw/mgar/pkg/squidguard/trunk/checksums csw/mgar/pkg/squidguard/trunk/files/ Property changes on: csw/mgar/pkg/squidguard/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/squidguard/trunk/Makefile =================================================================== --- csw/mgar/pkg/squidguard/trunk/Makefile (rev 0) +++ csw/mgar/pkg/squidguard/trunk/Makefile 2010-05-26 12:13:11 UTC (rev 9983) @@ -0,0 +1,29 @@ +# $Id$ +GARNAME = squidguard +GARVERSION = 1.4 +CATEGORIES = net + +DESCRIPTION = URL redirector used to use blacklists with the proxysoftware Squid +define BLURB +endef + +MASTER_SITES = http://squidguard.org/Downloads/ +MASTER_SITES += http://squidguard.org/Downloads/Patches/1.4/ +DISTNAME = squidGuard-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz + +# These files do patch the source, but they are not in "patch-format" +DISTFILES += squidGuard-1.4-patch-20091015.tar.gz +DISTFILES += squidGuard-1.4-patch-20091019.tar.gz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +VENDOR_URL = http://squidguard.org/ + +EXTRA_LIB = $(prefix)/bdb48/lib + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-db=$(prefix)/bdb48 + +include gar/category.mk Property changes on: csw/mgar/pkg/squidguard/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/squidguard/trunk/checksums =================================================================== --- csw/mgar/pkg/squidguard/trunk/checksums (rev 0) +++ csw/mgar/pkg/squidguard/trunk/checksums 2010-05-26 12:13:11 UTC (rev 9983) @@ -0,0 +1,3 @@ +de093757070c6fb706ceaf543f70ef54 squidGuard-1.4-patch-20091015.tar.gz +d82e650959803cac7bf885aefe091d52 squidGuard-1.4-patch-20091019.tar.gz +de834150998c1386c30feae196f16b06 squidGuard-1.4.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 Wed May 26 14:24:32 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 26 May 2010 12:24:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[9984] csw/mgar/pkg/netsnmp/branches/netsnmp-5.4.2. 1-bug4408/Makefile Message-ID: Revision: 9984 http://gar.svn.sourceforge.net/gar/?rev=9984&view=rev Author: dmichelsen Date: 2010-05-26 12:24:32 +0000 (Wed, 26 May 2010) Log Message: ----------- netsnmp/branch-bug-4408: Add comment on disabling the testsuite for test 59 Modified Paths: -------------- csw/mgar/pkg/netsnmp/branches/netsnmp-5.4.2.1-bug4408/Makefile Modified: csw/mgar/pkg/netsnmp/branches/netsnmp-5.4.2.1-bug4408/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/branches/netsnmp-5.4.2.1-bug4408/Makefile 2010-05-26 12:13:11 UTC (rev 9983) +++ csw/mgar/pkg/netsnmp/branches/netsnmp-5.4.2.1-bug4408/Makefile 2010-05-26 12:24:32 UTC (rev 9984) @@ -33,6 +33,10 @@ PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +# We must use the same compiler as Perl was compiled with or the compile +# flags will not be properly recognized +GARCOMPILER = SOS11 + BUILD64 = 1 NOISAEXEC = 1 @@ -57,7 +61,8 @@ CONFIGURE_ARGS += $(CONFIGURE_ARGS_mm-$(MEMORYMODEL)) CONFIGURE_ARGS += $(CONFIGURE_ARGS_os-$(GAROSREL)) -# Some tests are failing, disable for now, investigate later! +# Disable testsuite until this is fixed: +# https://sourceforge.net/tracker/?func=detail&aid=3007318&group_id=12694&atid=112694 SKIPTEST ?= 1 EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 26 14:26:13 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 26 May 2010 12:26:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[9985] csw/mgar/pkg/netsnmp/trunk/Makefile Message-ID: Revision: 9985 http://gar.svn.sourceforge.net/gar/?rev=9985&view=rev Author: dmichelsen Date: 2010-05-26 12:26:13 +0000 (Wed, 26 May 2010) Log Message: ----------- netsnmp: Disable testsuite until bug is fixed Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2010-05-26 12:24:32 UTC (rev 9984) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2010-05-26 12:26:13 UTC (rev 9985) @@ -50,6 +50,10 @@ CONFIGURE_ARGS += --with-transports="UDP TCP Unix" CONFIGURE_ARGS += $(CONFIGURE_ARGS_mm-$(MEMORYMODEL)) +# Disable testsuite until this has been fixed or /tmp will fill up: +# https://sourceforge.net/tracker/?func=detail&aid=3006962&group_id=12694&atid=112694 +SKIPTEST ?= 1 + EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod MERGE_DIRS_isa-extra = $(libdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 26 14:29:53 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 26 May 2010 12:29:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[9986] csw/mgar/pkg/libsigcpp/trunk Message-ID: Revision: 9986 http://gar.svn.sourceforge.net/gar/?rev=9986&view=rev Author: dmichelsen Date: 2010-05-26 12:29:53 +0000 (Wed, 26 May 2010) Log Message: ----------- libsigcpp: Add Sun Studio feature patch Modified Paths: -------------- csw/mgar/pkg/libsigcpp/trunk/Makefile csw/mgar/pkg/libsigcpp/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libsigcpp/trunk/files/0001-Comment-out-define-as-we-are-on-Sun-Studio.patch Modified: csw/mgar/pkg/libsigcpp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsigcpp/trunk/Makefile 2010-05-26 12:26:13 UTC (rev 9985) +++ csw/mgar/pkg/libsigcpp/trunk/Makefile 2010-05-26 12:29:53 UTC (rev 9986) @@ -10,6 +10,8 @@ MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Comment-out-define-as-we-are-on-Sun-Studio.patch + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -36,5 +38,6 @@ PATH := /opt/csw/gnu:$(PATH) post-configure-modulated: + @# Make sure libtool keeps -norunpath during linking perl -pi -e 's,\|-xarch=,|-norunpath|-xarch=,' $(WORKSRC)/libtool @$(MAKECOOKIE) Modified: csw/mgar/pkg/libsigcpp/trunk/checksums =================================================================== --- csw/mgar/pkg/libsigcpp/trunk/checksums 2010-05-26 12:26:13 UTC (rev 9985) +++ csw/mgar/pkg/libsigcpp/trunk/checksums 2010-05-26 12:29:53 UTC (rev 9986) @@ -1 +1,2 @@ +9ed819b9adb3e17c536d4749b85c253f 0001-Comment-out-define-as-we-are-on-Sun-Studio.patch 48afe53ba0e3958f6ac5f072afed1c53 libsigc++-2.2.7.tar.gz Added: csw/mgar/pkg/libsigcpp/trunk/files/0001-Comment-out-define-as-we-are-on-Sun-Studio.patch =================================================================== --- csw/mgar/pkg/libsigcpp/trunk/files/0001-Comment-out-define-as-we-are-on-Sun-Studio.patch (rev 0) +++ csw/mgar/pkg/libsigcpp/trunk/files/0001-Comment-out-define-as-we-are-on-Sun-Studio.patch 2010-05-26 12:29:53 UTC (rev 9986) @@ -0,0 +1,25 @@ +From db7e603d9531ce0ade0d71479997579d62242534 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 26 May 2010 14:10:20 +0200 +Subject: [PATCH] Comment out define as we are on Sun Studio + +--- + sigc++/signal.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/sigc++/signal.h b/sigc++/signal.h +index 9e81ed0..c273ce0 100644 +--- a/sigc++/signal.h ++++ b/sigc++/signal.h +@@ -18,7 +18,7 @@ + //Compilers, such as older versions of SUN Forte C++, that do not allow this also often + //do not allow a typedef to have the same name as a class in the typedef's definition. + //For Sun Forte CC 5.7 (SUN Workshop 10), comment this out to fix the build. +- #define SIGC_TYPEDEF_REDEFINE_ALLOWED 1 ++ //define SIGC_TYPEDEF_REDEFINE_ALLOWED 1 + #endif + + namespace sigc { +-- +1.7.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 Wed May 26 14:40:59 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 26 May 2010 12:40:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[9987] csw/mgar/pkg/policyd-weight/trunk Message-ID: Revision: 9987 http://gar.svn.sourceforge.net/gar/?rev=9987&view=rev Author: bonivart Date: 2010-05-26 12:40:59 +0000 (Wed, 26 May 2010) Log Message: ----------- policyd-weight: fix init script, use 0.1.15 source, move conf file Modified Paths: -------------- csw/mgar/pkg/policyd-weight/trunk/Makefile csw/mgar/pkg/policyd-weight/trunk/checksums csw/mgar/pkg/policyd-weight/trunk/files/policyd-weight.init Modified: csw/mgar/pkg/policyd-weight/trunk/Makefile =================================================================== --- csw/mgar/pkg/policyd-weight/trunk/Makefile 2010-05-26 12:29:53 UTC (rev 9986) +++ csw/mgar/pkg/policyd-weight/trunk/Makefile 2010-05-26 12:40:59 UTC (rev 9987) @@ -1,6 +1,7 @@ GARNAME = policyd-weight -GARVERSION = 0.1.14 +GARVERSION = 0.1.15 CATEGORIES = net +WORKSRC = $(WORKDIR) DESCRIPTION = Policy daemon for the Postfix MTA (2.1 and later) define BLURB @@ -8,8 +9,16 @@ forged envelope senders and HELOs (i.e. in bogus mails) endef -MASTER_SITES = http://www.policyd-weight.org/releases/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +MASTER_SITES = http://www.policyd-weight.org/releases/ +MASTER_SITES += http://www.policyd-weight.org/ +DISTFILES += $(GARNAME)-devel +DISTFILES += $(GARNAME).conf.sample +DISTFILES += $(GARNAME).8 +DISTFILES += $(GARNAME).conf.5 +DISTFILES += documentation.txt +DISTFILES += todo.txt +DISTFILES += changes.txt +DISTFILES += COPYING ARCHALL = 1 @@ -27,7 +36,7 @@ INITSMF = /opt/csw/etc/init.d/csw$(GARNAME) USERGROUP = /etc/opt/csw/pkg/CSW$(GARNAME)/cswusergroup -SAMPLECONF = /etc/opt/csw/postfix/policyd-weight.conf +SAMPLECONF = /etc/opt/csw/policyd-weight.conf CHECKPKG_OVERRIDES += surplus-dependency|CSWperl CHECKPKG_OVERRIDES += surplus-dependency|CSWpmnetdns @@ -38,18 +47,18 @@ @echo " ==> Installing $(GARNAME) (custom)" @ginstall -m 755 -d $(DESTDIR)/opt/csw/etc/init.d @ginstall -m 755 $(FILEDIR)/$(GARNAME).init $(DESTDIR)/opt/csw/etc/init.d/csw$(GARNAME) - @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/postfix - @ginstall -m 644 $(WORKSRC)/policyd-weight.conf.sample $(DESTDIR)/etc/opt/csw/postfix/policyd-weight.conf + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw + @ginstall -m 644 $(WORKSRC)/policyd-weight.conf.sample $(DESTDIR)/etc/opt/csw/policyd-weight.conf @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSW$(GARNAME) @ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSW$(GARNAME)/cswusergroup @ginstall -m 755 -d $(DESTDIR)$(sbindir) - @ginstall -m 755 $(WORKSRC)/$(GARNAME) $(DESTDIR)$(sbindir) - @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 444 $(WORKSRC)/changes.txt $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 444 $(WORKSRC)/documentation.txt $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 755 $(WORKSRC)/todo.txt $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 755 $(WORKSRC)/$(GARNAME)-devel $(DESTDIR)$(sbindir)/$(GARNAME) + @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(CATALOGNAME) + @ginstall -m 444 $(WORKSRC)/changes.txt $(DESTDIR)$(docdir)/$(CATALOGNAME) + @ginstall -m 444 $(WORKSRC)/documentation.txt $(DESTDIR)$(docdir)/$(CATALOGNAME) + @ginstall -m 755 $(WORKSRC)/todo.txt $(DESTDIR)$(docdir)/$(CATALOGNAME) @ginstall -m 755 -d $(DESTDIR)$(mandir)/man5 - @ginstall -m 755 $(WORKSRC)/man/man5/policyd-weight.conf.5 $(DESTDIR)$(mandir)/man5 + @ginstall -m 755 $(WORKSRC)/policyd-weight.conf.5 $(DESTDIR)$(mandir)/man5 @ginstall -m 755 -d $(DESTDIR)$(mandir)/man8 - @ginstall -m 755 $(WORKSRC)/man/man8/policyd-weight.8 $(DESTDIR)$(mandir)/man8 + @ginstall -m 755 $(WORKSRC)/policyd-weight.8 $(DESTDIR)$(mandir)/man8 @$(MAKECOOKIE) Modified: csw/mgar/pkg/policyd-weight/trunk/checksums =================================================================== --- csw/mgar/pkg/policyd-weight/trunk/checksums 2010-05-26 12:29:53 UTC (rev 9986) +++ csw/mgar/pkg/policyd-weight/trunk/checksums 2010-05-26 12:40:59 UTC (rev 9987) @@ -1 +1,8 @@ -fb4829a57c8b805fe981ee949a145042 policyd-weight-0.1.14.tar.gz +608826974d5644ee7967a713fa72cf36 COPYING +f50762cfa92b54f474df96541cc5679d changes.txt +ec5ca49feba2eab047a5da16143fe6cb documentation.txt +0aa05a54758f39b6f910a616e8139a30 policyd-weight-devel +792ae8f214bcb109e40dfeaba79e6e90 policyd-weight.8 +98a66135c59c484290d06654dac93584 policyd-weight.conf.5 +b0ce437f3640023831554fc989d87477 policyd-weight.conf.sample +53afc640bd8b88efb59519db358d6163 todo.txt Modified: csw/mgar/pkg/policyd-weight/trunk/files/policyd-weight.init =================================================================== --- csw/mgar/pkg/policyd-weight/trunk/files/policyd-weight.init 2010-05-26 12:29:53 UTC (rev 9986) +++ csw/mgar/pkg/policyd-weight/trunk/files/policyd-weight.init 2010-05-26 12:40:59 UTC (rev 9987) @@ -9,9 +9,6 @@ # Source SMF includes [ -r /lib/svc/share/smf_include.sh ] && . /lib/svc/share/smf_include.sh -# Source config file -[ -r /etc/opt/csw/postfix/policyd-weight.conf ] && . /etc/opt/csw/postfix/policyd-weight.conf - SERVICE=policyd-weight PATH=$PATH:/usr/bin:/opt/csw/bin @@ -20,7 +17,7 @@ case "$1" in start) echo "Starting $SERVICE ..." - /opt/csw/sbin/policyd-weight -f /etc/opt/csw/postfix/policyd-weight.conf + [ -r /etc/opt/csw/policyd-weight.conf ] && /opt/csw/sbin/policyd-weight -f /etc/opt/csw/policyd-weight.conf || /opt/csw/sbin/policyd-weight ;; stop) echo "Stopping $SERVICE ..." 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 May 26 14:52:21 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 26 May 2010 12:52:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[9988] csw/mgar/pkg/policyd-weight/trunk/Makefile Message-ID: Revision: 9988 http://gar.svn.sourceforge.net/gar/?rev=9988&view=rev Author: bonivart Date: 2010-05-26 12:52:20 +0000 (Wed, 26 May 2010) Log Message: ----------- policyd-weight: fix some perms Modified Paths: -------------- csw/mgar/pkg/policyd-weight/trunk/Makefile Modified: csw/mgar/pkg/policyd-weight/trunk/Makefile =================================================================== --- csw/mgar/pkg/policyd-weight/trunk/Makefile 2010-05-26 12:40:59 UTC (rev 9987) +++ csw/mgar/pkg/policyd-weight/trunk/Makefile 2010-05-26 12:52:20 UTC (rev 9988) @@ -56,9 +56,9 @@ @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(CATALOGNAME) @ginstall -m 444 $(WORKSRC)/changes.txt $(DESTDIR)$(docdir)/$(CATALOGNAME) @ginstall -m 444 $(WORKSRC)/documentation.txt $(DESTDIR)$(docdir)/$(CATALOGNAME) - @ginstall -m 755 $(WORKSRC)/todo.txt $(DESTDIR)$(docdir)/$(CATALOGNAME) + @ginstall -m 444 $(WORKSRC)/todo.txt $(DESTDIR)$(docdir)/$(CATALOGNAME) @ginstall -m 755 -d $(DESTDIR)$(mandir)/man5 - @ginstall -m 755 $(WORKSRC)/policyd-weight.conf.5 $(DESTDIR)$(mandir)/man5 + @ginstall -m 644 $(WORKSRC)/policyd-weight.conf.5 $(DESTDIR)$(mandir)/man5 @ginstall -m 755 -d $(DESTDIR)$(mandir)/man8 - @ginstall -m 755 $(WORKSRC)/policyd-weight.8 $(DESTDIR)$(mandir)/man8 + @ginstall -m 644 $(WORKSRC)/policyd-weight.8 $(DESTDIR)$(mandir)/man8 @$(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 Wed May 26 15:45:36 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 26 May 2010 13:45:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[9989] csw/mgar/pkg/nmap/trunk Message-ID: Revision: 9989 http://gar.svn.sourceforge.net/gar/?rev=9989&view=rev Author: dmichelsen Date: 2010-05-26 13:45:35 +0000 (Wed, 26 May 2010) Log Message: ----------- nmap: Move to 5.21 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/nmap/trunk/Makefile csw/mgar/pkg/nmap/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/nmap/trunk/ Property changes on: csw/mgar/pkg/nmap/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/nmap/trunk/Makefile =================================================================== --- csw/mgar/pkg/nmap/trunk/Makefile 2010-05-26 12:52:20 UTC (rev 9988) +++ csw/mgar/pkg/nmap/trunk/Makefile 2010-05-26 13:45:35 UTC (rev 9989) @@ -1,5 +1,5 @@ GARNAME = nmap -GARVERSION = 3.50 +GARVERSION = 5.21 CATEGORIES = net DESCRIPTION = A network exploration tool and security/port scanner @@ -14,33 +14,31 @@ Sharp Zaurus and the iPAQ. endef -MASTER_SITES = http://download.insecure.org/nmap/dist/ +MASTER_SITES = http://nmap.org/dist/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 # Compile against gtk+-2.0 (2.4.0) -PATCHFILES = gtk20.diff +# PATCHFILES = gtk20.diff -DEPENDS += lib/gtk2 - CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-libpcre=included -CONFIGURE_ARGS += --with-libpcap=$(DESTDIR)$(prefix) -CONFIGURE_ARGS += --with-openssl=$(DESTDIR)$(prefix) +CONFIGURE_ARGS += --with-libpcre=$(prefix) +CONFIGURE_ARGS += --with-libpcap=$(prefix) +CONFIGURE_ARGS += --with-openssl=$(prefix) -nmapdatadir=$(datadir)/nmap +#nmapdatadir=$(datadir)/nmap -INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir sbindir mandir -INSTALL_OVERRIDE_DIRS += nmapdatadir deskdir +#INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir sbindir mandir +#INSTALL_OVERRIDE_DIRS += nmapdatadir deskdir # No test suite for nmap TEST_SCRIPTS = include gar/category.mk -pre-configure: - @( cd $(WORKSRC) ; autoconf ) - @( cd $(WORKSRC)/nmapfe ; autoconf ) - @$(MAKECOOKIE) +#pre-configure: +# @( cd $(WORKSRC) ; autoconf ) +# @( cd $(WORKSRC)/nmapfe ; autoconf ) +# @$(MAKECOOKIE) Modified: csw/mgar/pkg/nmap/trunk/checksums =================================================================== --- csw/mgar/pkg/nmap/trunk/checksums 2010-05-26 12:52:20 UTC (rev 9988) +++ csw/mgar/pkg/nmap/trunk/checksums 2010-05-26 13:45:35 UTC (rev 9989) @@ -1,2 +1 @@ -b4363f445a7c502cf314ae88ab71ec6c download/nmap-3.50.tar.bz2 -b4d37054620413623336425726a85701 download/gtk20.diff +f77fa51d89ab27d35e5cd87bb086b858 nmap-5.21.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 Wed May 26 16:34:36 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 26 May 2010 14:34:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[9990] csw/mgar/pkg/libsigcpp/trunk/Makefile Message-ID: Revision: 9990 http://gar.svn.sourceforge.net/gar/?rev=9990&view=rev Author: dmichelsen Date: 2010-05-26 14:34:36 +0000 (Wed, 26 May 2010) Log Message: ----------- libsigcpp: Add dependency from base to devel Modified Paths: -------------- csw/mgar/pkg/libsigcpp/trunk/Makefile Modified: csw/mgar/pkg/libsigcpp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsigcpp/trunk/Makefile 2010-05-26 13:45:35 UTC (rev 9989) +++ csw/mgar/pkg/libsigcpp/trunk/Makefile 2010-05-26 14:34:36 UTC (rev 9990) @@ -15,14 +15,16 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWlibsigc++ -PACKAGES += CSWlibsigc++devel -SPKG_DESC_CSWlibsigc++ = Typesafe signal and callback system for C++ +PACKAGES = CSWlibsigc++ CSWlibsigc++devel + +SPKG_DESC_CSWlibsigc++ = Typesafe signal and callback system for C++ SPKG_DESC_CSWlibsigc++devel = Header files and docs for libsigc++ -CATALOGNAME_CSWlibsigc++= libsigc++ +CATALOGNAME_CSWlibsigc++ = libsigc++ CATALOGNAME_CSWlibsigc++devel = libsigc++_devel +RUNTIME_DEP_PKGS_CSWlibsigc++devel = CSWlibsigc++ + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) --disable-static @@ -33,6 +35,8 @@ PKGFILES_CSWlibsigc++devel += .*\.h PKGFILES_CSWlibsigc++devel += $(sharedstatedir)/.* +CHECKPKG_OVERRIDES_CSWlibsigc++devel += surplus-dependency|CSWlibsigc++ + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 26 16:56:21 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 26 May 2010 14:56:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[9991] csw/mgar/pkg/libtorrent/trunk Message-ID: Revision: 9991 http://gar.svn.sourceforge.net/gar/?rev=9991&view=rev Author: dmichelsen Date: 2010-05-26 14:56:20 +0000 (Wed, 26 May 2010) Log Message: ----------- libtorrent: Enable 64 bit and shuffle things around Modified Paths: -------------- csw/mgar/pkg/libtorrent/trunk/Makefile csw/mgar/pkg/libtorrent/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libtorrent/trunk/files/0001-Ignore-__UNUSED.patch Removed Paths: ------------- csw/mgar/pkg/libtorrent/trunk/files/more-UNUSED.patch csw/mgar/pkg/libtorrent/trunk/files/work-around-UNUSED.patch Modified: csw/mgar/pkg/libtorrent/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtorrent/trunk/Makefile 2010-05-26 14:34:36 UTC (rev 9990) +++ csw/mgar/pkg/libtorrent/trunk/Makefile 2010-05-26 14:56:20 UTC (rev 9991) @@ -16,30 +16,30 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -#Patches mostly from http://cr.opensolaris.org/~alz/bittorrent/raw_files/new/usr/src/lib/libtorrent/ - +# Patches from http://cr.opensolaris.org/~alz/bittorrent/raw_files/new/usr/src/lib/libtorrent/ PATCHFILES = rlibtorrent-04-sunpro.diff rlibtorrent-01-madvise.diff rlibtorrent-03-dh-generate.diff -PATCHFILES += rlibtorrent-05-tracker-usable.diff work-around-UNUSED.patch more-UNUSED.patch +PATCHFILES += rlibtorrent-05-tracker-usable.diff +PATCHFILES += 0001-Ignore-__UNUSED.patch -RUNTIME_DEP_PKGS_CSWlibtorrent += CSWosslrt -RUNTIME_DEP_PKGS_CSWlibtorrent += CSWlibsigc++rt +BUILD_DEP_pkgs = CSWossldevel CSWlibsigc++devel -PACKAGES = CSWlibtorrent -PACKAGES += CSWlibtorrentdevel -SPKG_DESC_CSWlibtorrent = BitTorrent library written in C++ for *nix -SPKG_DESC_CSWlibtorrentdevel = Header files for libtorrent +PACKAGES = CSWlibtorrent CSWlibtorrentdevel -CATALOGNAME_CSWlibtorrent= libtorrent +CATALOGNAME_CSWlibtorrent = libtorrent CATALOGNAME_CSWlibtorrentdevel = libtorrent_devel +SPKG_DESC_CSWlibtorrent = BitTorrent library written in C++ for *nix +SPKG_DESC_CSWlibtorrentdevel = Development files for libtorrent + +RUNTIME_DEP_PKGS_CSWlibtorrent = CSWosslrt CSWlibsigc++ + PKGFILES_CSWlibtorrentdevel = $(PKGFILES_DEVEL) PKGFILES_CSWlibtorrentdevel += $(docdir)/.* PKGFILES_CSWlibtorrentdevel += .*\.h PKGFILES_CSWlibtorrentdevel += $(sharedstatedir)/.* -#No 64bit build until libsigc++ is 64bit too -#BUILD64 = 1 +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) --enable-shared --disable-static --disable-libtool-lock --disable-debug TEST_TARGET = check Modified: csw/mgar/pkg/libtorrent/trunk/checksums =================================================================== --- csw/mgar/pkg/libtorrent/trunk/checksums 2010-05-26 14:34:36 UTC (rev 9990) +++ csw/mgar/pkg/libtorrent/trunk/checksums 2010-05-26 14:56:20 UTC (rev 9991) @@ -1,7 +1,6 @@ +a60c38bec6f1f18c6055894b15e3cb82 0001-Ignore-__UNUSED.patch 037499ed708aaf72988cee60e5a8d96b libtorrent-0.12.6.tar.gz -373bec9d71c3cad06c669e26857ef14b more-UNUSED.patch eb30844ace9f064a8fca5212f5a99fef rlibtorrent-01-madvise.diff f2f3738edcbc8d7ccfa14e784f3af9c6 rlibtorrent-03-dh-generate.diff c13befd35c91a36f78151accdc70c62c rlibtorrent-04-sunpro.diff 0d1545bbc1e7c9f5d4de059c855b0f81 rlibtorrent-05-tracker-usable.diff -9c0cccb56d3a03eeb14739d811259187 work-around-UNUSED.patch Copied: csw/mgar/pkg/libtorrent/trunk/files/0001-Ignore-__UNUSED.patch (from rev 9976, csw/mgar/pkg/libtorrent/trunk/files/work-around-UNUSED.patch) =================================================================== --- csw/mgar/pkg/libtorrent/trunk/files/0001-Ignore-__UNUSED.patch (rev 0) +++ csw/mgar/pkg/libtorrent/trunk/files/0001-Ignore-__UNUSED.patch 2010-05-26 14:56:20 UTC (rev 9991) @@ -0,0 +1,67 @@ +From 6772f16c668c4e8567087d4c5fe2a4c9433a733e Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 26 May 2010 15:37:18 +0200 +Subject: [PATCH] Ignore __UNUSED + +--- + rak/string_manip.h | 2 ++ + src/download/chunk_selector.cc | 2 ++ + src/torrent/poll_kqueue.cc | 2 ++ + src/torrent/resume.cc | 2 ++ + 4 files changed, 8 insertions(+), 0 deletions(-) + +diff --git a/rak/string_manip.h b/rak/string_manip.h +index 4fb2554..9d66e96 100644 +--- a/rak/string_manip.h ++++ b/rak/string_manip.h +@@ -43,6 +43,8 @@ + #include + #include + ++#define __UNUSED ++ + namespace rak { + + // Use these trim functions until n1872 is widely supported. +diff --git a/src/download/chunk_selector.cc b/src/download/chunk_selector.cc +index d3c956b..7f2df87 100644 +--- a/src/download/chunk_selector.cc ++++ b/src/download/chunk_selector.cc +@@ -46,6 +46,8 @@ + #include "chunk_selector.h" + #include "chunk_statistics.h" + ++#define __UNUSED ++ + namespace torrent { + + // Consider making statistics a part of selector. +diff --git a/src/torrent/poll_kqueue.cc b/src/torrent/poll_kqueue.cc +index 0375b91..1ade627 100644 +--- a/src/torrent/poll_kqueue.cc ++++ b/src/torrent/poll_kqueue.cc +@@ -56,6 +56,8 @@ + + #include + ++#define __UNUSED ++ + namespace torrent { + + #ifdef USE_KQUEUE +diff --git a/src/torrent/resume.cc b/src/torrent/resume.cc +index a728830..59c7cf6 100644 +--- a/src/torrent/resume.cc ++++ b/src/torrent/resume.cc +@@ -58,6 +58,8 @@ + + #include "resume.h" + ++#define __UNUSED ++ + namespace torrent { + + void +-- +1.7.0 + Deleted: csw/mgar/pkg/libtorrent/trunk/files/more-UNUSED.patch =================================================================== --- csw/mgar/pkg/libtorrent/trunk/files/more-UNUSED.patch 2010-05-26 14:34:36 UTC (rev 9990) +++ csw/mgar/pkg/libtorrent/trunk/files/more-UNUSED.patch 2010-05-26 14:56:20 UTC (rev 9991) @@ -1,25 +0,0 @@ -From 9f0bae87a21f0256f1848b8d8f74d90e533ae4d6 Mon Sep 17 00:00:00 2001 -From: Jan Holzhueter -Date: Thu, 20 May 2010 12:43:55 +0200 -Subject: [PATCH] more-UNUSED - ---- - src/torrent/resume.cc | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/src/torrent/resume.cc b/src/torrent/resume.cc -index dd53f71..5480220 100644 ---- a/src/torrent/resume.cc -+++ b/src/torrent/resume.cc -@@ -58,6 +58,8 @@ - - #include "resume.h" - -+#define __UNUSED -+ - namespace torrent { - - void --- -1.7.1 - Deleted: csw/mgar/pkg/libtorrent/trunk/files/work-around-UNUSED.patch =================================================================== --- csw/mgar/pkg/libtorrent/trunk/files/work-around-UNUSED.patch 2010-05-26 14:34:36 UTC (rev 9990) +++ csw/mgar/pkg/libtorrent/trunk/files/work-around-UNUSED.patch 2010-05-26 14:56:20 UTC (rev 9991) @@ -1,53 +0,0 @@ -From 5a6aaf6dd0b924c323d591986117823457bdb387 Mon Sep 17 00:00:00 2001 -From: Jan Holzhueter -Date: Thu, 20 May 2010 10:59:04 +0200 -Subject: [PATCH] work around __UNUSED - ---- - rak/string_manip.h | 2 ++ - src/download/chunk_selector.cc | 2 ++ - src/torrent/poll_kqueue.cc | 2 ++ - 3 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/rak/string_manip.h b/rak/string_manip.h -index b3f3037..a4f1a6c 100644 ---- a/rak/string_manip.h -+++ b/rak/string_manip.h -@@ -43,6 +43,8 @@ - #include - #include - -+#define __UNUSED -+ - namespace rak { - - // Use these trim functions until n1872 is widely supported. -diff --git a/src/download/chunk_selector.cc b/src/download/chunk_selector.cc -index f814cb2..5685dc1 100644 ---- a/src/download/chunk_selector.cc -+++ b/src/download/chunk_selector.cc -@@ -46,6 +46,8 @@ - #include "chunk_selector.h" - #include "chunk_statistics.h" - -+#define __UNUSED -+ - namespace torrent { - - // Consider making statistics a part of selector. -diff --git a/src/torrent/poll_kqueue.cc b/src/torrent/poll_kqueue.cc -index 9d4d68a..94e8115 100644 ---- a/src/torrent/poll_kqueue.cc -+++ b/src/torrent/poll_kqueue.cc -@@ -53,6 +53,8 @@ - #include - #endif - -+#define __UNUSED -+ - namespace torrent { - - #ifdef USE_KQUEUE --- -1.7.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 Wed May 26 16:56:49 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 26 May 2010 14:56:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[9992] csw/mgar/pkg/policyd-weight/trunk Message-ID: Revision: 9992 http://gar.svn.sourceforge.net/gar/?rev=9992&view=rev Author: bonivart Date: 2010-05-26 14:56:48 +0000 (Wed, 26 May 2010) Log Message: ----------- policyd-weight: fix init script, provide sample conf only Modified Paths: -------------- csw/mgar/pkg/policyd-weight/trunk/Makefile csw/mgar/pkg/policyd-weight/trunk/files/policyd-weight.init Modified: csw/mgar/pkg/policyd-weight/trunk/Makefile =================================================================== --- csw/mgar/pkg/policyd-weight/trunk/Makefile 2010-05-26 14:56:20 UTC (rev 9991) +++ csw/mgar/pkg/policyd-weight/trunk/Makefile 2010-05-26 14:56:48 UTC (rev 9992) @@ -36,7 +36,6 @@ INITSMF = /opt/csw/etc/init.d/csw$(GARNAME) USERGROUP = /etc/opt/csw/pkg/CSW$(GARNAME)/cswusergroup -SAMPLECONF = /etc/opt/csw/policyd-weight.conf CHECKPKG_OVERRIDES += surplus-dependency|CSWperl CHECKPKG_OVERRIDES += surplus-dependency|CSWpmnetdns @@ -48,7 +47,7 @@ @ginstall -m 755 -d $(DESTDIR)/opt/csw/etc/init.d @ginstall -m 755 $(FILEDIR)/$(GARNAME).init $(DESTDIR)/opt/csw/etc/init.d/csw$(GARNAME) @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw - @ginstall -m 644 $(WORKSRC)/policyd-weight.conf.sample $(DESTDIR)/etc/opt/csw/policyd-weight.conf + @ginstall -m 644 $(WORKSRC)/policyd-weight.conf.sample $(DESTDIR)/etc/opt/csw/ @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSW$(GARNAME) @ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSW$(GARNAME)/cswusergroup @ginstall -m 755 -d $(DESTDIR)$(sbindir) Modified: csw/mgar/pkg/policyd-weight/trunk/files/policyd-weight.init =================================================================== --- csw/mgar/pkg/policyd-weight/trunk/files/policyd-weight.init 2010-05-26 14:56:20 UTC (rev 9991) +++ csw/mgar/pkg/policyd-weight/trunk/files/policyd-weight.init 2010-05-26 14:56:48 UTC (rev 9992) @@ -4,20 +4,20 @@ #RC_SLEV 3 # rc-script for CSWpolicyd-weight -# Peter Bonivart, 2010-05-25 +# Peter Bonivart, 2010-05-26 # Source SMF includes [ -r /lib/svc/share/smf_include.sh ] && . /lib/svc/share/smf_include.sh SERVICE=policyd-weight -PATH=$PATH:/usr/bin:/opt/csw/bin +PATH=/opt/csw/bin:/opt/csw/sbin:/usr/bin:/usr/sbin ZONE= # used for initialization, do not change case "$1" in start) echo "Starting $SERVICE ..." - [ -r /etc/opt/csw/policyd-weight.conf ] && /opt/csw/sbin/policyd-weight -f /etc/opt/csw/policyd-weight.conf || /opt/csw/sbin/policyd-weight + [ -r /etc/opt/csw/policyd-weight.conf ] && /opt/csw/sbin/policyd-weight -f /etc/opt/csw/policyd-weight.conf start || /opt/csw/sbin/policyd-weight start ;; stop) echo "Stopping $SERVICE ..." 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 May 26 17:06:48 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 26 May 2010 15:06:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[9993] csw/mgar/pkg/policyd-weight/trunk/files/ policyd-weight.init Message-ID: Revision: 9993 http://gar.svn.sourceforge.net/gar/?rev=9993&view=rev Author: bonivart Date: 2010-05-26 15:06:48 +0000 (Wed, 26 May 2010) Log Message: ----------- policyd-weigh: fix init script Modified Paths: -------------- csw/mgar/pkg/policyd-weight/trunk/files/policyd-weight.init Modified: csw/mgar/pkg/policyd-weight/trunk/files/policyd-weight.init =================================================================== --- csw/mgar/pkg/policyd-weight/trunk/files/policyd-weight.init 2010-05-26 14:56:48 UTC (rev 9992) +++ csw/mgar/pkg/policyd-weight/trunk/files/policyd-weight.init 2010-05-26 15:06:48 UTC (rev 9993) @@ -11,6 +11,7 @@ SERVICE=policyd-weight PATH=/opt/csw/bin:/opt/csw/sbin:/usr/bin:/usr/sbin +export PATH ZONE= # used for initialization, do not change This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 26 17:25:11 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 26 May 2010 15:25:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[9994] csw/mgar/pkg/libtorrent/trunk/Makefile Message-ID: Revision: 9994 http://gar.svn.sourceforge.net/gar/?rev=9994&view=rev Author: dmichelsen Date: 2010-05-26 15:25:11 +0000 (Wed, 26 May 2010) Log Message: ----------- libtorrent: Add runtime dep for devel package Modified Paths: -------------- csw/mgar/pkg/libtorrent/trunk/Makefile Modified: csw/mgar/pkg/libtorrent/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtorrent/trunk/Makefile 2010-05-26 15:06:48 UTC (rev 9993) +++ csw/mgar/pkg/libtorrent/trunk/Makefile 2010-05-26 15:25:11 UTC (rev 9994) @@ -32,7 +32,8 @@ SPKG_DESC_CSWlibtorrent = BitTorrent library written in C++ for *nix SPKG_DESC_CSWlibtorrentdevel = Development files for libtorrent -RUNTIME_DEP_PKGS_CSWlibtorrent = CSWosslrt CSWlibsigc++ +RUNTIME_DEP_PKGS_CSWlibtorrent = CSWosslrt CSWlibsigc++ +RUNTIME_DEP_PKGS_CSWlibtorrentdevel = CSWlibtorrent PKGFILES_CSWlibtorrentdevel = $(PKGFILES_DEVEL) PKGFILES_CSWlibtorrentdevel += $(docdir)/.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 26 17:31:17 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 26 May 2010 15:31:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[9995] csw/mgar/pkg/libtorrent/trunk/Makefile Message-ID: Revision: 9995 http://gar.svn.sourceforge.net/gar/?rev=9995&view=rev Author: dmichelsen Date: 2010-05-26 15:31:17 +0000 (Wed, 26 May 2010) Log Message: ----------- libtorrent: Add override Modified Paths: -------------- csw/mgar/pkg/libtorrent/trunk/Makefile Modified: csw/mgar/pkg/libtorrent/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtorrent/trunk/Makefile 2010-05-26 15:25:11 UTC (rev 9994) +++ csw/mgar/pkg/libtorrent/trunk/Makefile 2010-05-26 15:31:17 UTC (rev 9995) @@ -35,14 +35,17 @@ RUNTIME_DEP_PKGS_CSWlibtorrent = CSWosslrt CSWlibsigc++ RUNTIME_DEP_PKGS_CSWlibtorrentdevel = CSWlibtorrent +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) --enable-shared --disable-static --disable-libtool-lock --disable-debug + +TEST_TARGET = check + PKGFILES_CSWlibtorrentdevel = $(PKGFILES_DEVEL) PKGFILES_CSWlibtorrentdevel += $(docdir)/.* PKGFILES_CSWlibtorrentdevel += .*\.h PKGFILES_CSWlibtorrentdevel += $(sharedstatedir)/.* -BUILD64 = 1 -CONFIGURE_ARGS = $(DIRPATHS) --enable-shared --disable-static --disable-libtool-lock --disable-debug -TEST_TARGET = check +CHECKPKG_OVERRIDES_CSWlibtorrentdevel += surplus-dependency|CSWlibtorrent 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 Wed May 26 18:01:02 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 26 May 2010 16:01:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[9996] csw/mgar/pkg/rtorrent/trunk Message-ID: Revision: 9996 http://gar.svn.sourceforge.net/gar/?rev=9996&view=rev Author: dmichelsen Date: 2010-05-26 16:01:01 +0000 (Wed, 26 May 2010) Log Message: ----------- rtorrent: Add patches from jh Modified Paths: -------------- csw/mgar/pkg/rtorrent/trunk/Makefile csw/mgar/pkg/rtorrent/trunk/checksums Added Paths: ----------- csw/mgar/pkg/rtorrent/trunk/files/0001-build-fixes.patch csw/mgar/pkg/rtorrent/trunk/files/0001-curl_get.patch csw/mgar/pkg/rtorrent/trunk/files/0001-more-build-fixes.patch csw/mgar/pkg/rtorrent/trunk/files/0001-more-build-fixes2.patch csw/mgar/pkg/rtorrent/trunk/files/0001-scgi_task.cc.patch csw/mgar/pkg/rtorrent/trunk/files/rtorrent-01-solaris.diff csw/mgar/pkg/rtorrent/trunk/files/rtorrent-02-event-ports.diff csw/mgar/pkg/rtorrent/trunk/files/rtorrent-03-curl-event.diff csw/mgar/pkg/rtorrent/trunk/files/rtorrent-04-sunpro.diff csw/mgar/pkg/rtorrent/trunk/files/rtorrent-05-sunpro-crash.diff csw/mgar/pkg/rtorrent/trunk/files/scratch.patch csw/mgar/pkg/rtorrent/trunk/files/work-around-UNUSED.patch Modified: csw/mgar/pkg/rtorrent/trunk/Makefile =================================================================== --- csw/mgar/pkg/rtorrent/trunk/Makefile 2010-05-26 15:31:17 UTC (rev 9995) +++ csw/mgar/pkg/rtorrent/trunk/Makefile 2010-05-26 16:01:01 UTC (rev 9996) @@ -2,26 +2,36 @@ GARVERSION = 0.8.6 CATEGORIES = apps -DESCRIPTION = BitTorrent client. +DESCRIPTION = Client for Unix, based on libtorrent define BLURB - BitTorrent library written in C++ for *nix, with a focus on high performance and good code. - The library differentiates itself from other implementations by transfering directly from - file pages to the network stack. On high-bandwidth connections it is able to seed at 3 times - the speed of the official client. endef MASTER_SITES = http://libtorrent.rakshasa.no/downloads/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -RUNTIME_DEP_PKGS = CSWlibtorrent - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# 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 = +# Patches mostly from http://cr.opensolaris.org/~alz/bittorrent/raw_files/new/usr/src/cmd/rtorrent/ +PATCHFILES = rtorrent-01-solaris.diff 0001-curl_get.patch rtorrent-04-sunpro.diff +PATCHFILES += 0001-scgi_task.cc.patch rtorrent-05-sunpro-crash.diff work-around-UNUSED.patch 0001-build-fixes.patch +PATCHFILES += 0001-more-build-fixes.patch 0001-more-build-fixes2.patch -CONFIGURE_ARGS = $(DIRPATHS) +EXTRA_CXXFLAGS = -D_RWSTD_ALLOCATOR -mt +EXTRA_LDFLAGS = -Wl,-zignore -Wl,-zcombreloc -Wl,-Bdirect +CONFIGURE_ARGS = $(DIRPATHS) --disable-debug +TEST_TARGET = check + include gar/category.mk + +pre-configure-modulated: + cd $(WORKSRC) && aclocal-1.10 -I scripts && \ + automake-1.10 --gnu && autoconf + + $(MAKECOOKIE) + + +#post-configure-modulated: +# perl -pi -e 's,\|-xarch=,|-norunpath|-xarch=,' $(WORKSRC)/libtool +# @$(MAKECOOKIE) Modified: csw/mgar/pkg/rtorrent/trunk/checksums =================================================================== --- csw/mgar/pkg/rtorrent/trunk/checksums 2010-05-26 15:31:17 UTC (rev 9995) +++ csw/mgar/pkg/rtorrent/trunk/checksums 2010-05-26 16:01:01 UTC (rev 9996) @@ -1 +1,10 @@ +5fc8cb994a9878260814dd91cecb2bc4 0001-build-fixes.patch +22451ae5516b8a5895152f2bff431879 0001-curl_get.patch +04aee1b334f244111c1c17a60eda827d 0001-more-build-fixes.patch +dbff5b0805244cf116e6c8a943e798eb 0001-more-build-fixes2.patch +7490ec79bf9ab3fbc440af8798813da4 0001-scgi_task.cc.patch b804c45c01c40312926bcea6b55bb084 rtorrent-0.8.6.tar.gz +b6545f8cb3978a2a9c7d08e69c261a2e rtorrent-01-solaris.diff +9c15ff7d338b93bb14ceef55e50e35da rtorrent-04-sunpro.diff +c9eb081ca192b5c4c222e6f0a6d5b2ae rtorrent-05-sunpro-crash.diff +373359da311cec3fe678ea55df5354c3 work-around-UNUSED.patch Added: csw/mgar/pkg/rtorrent/trunk/files/0001-build-fixes.patch =================================================================== --- csw/mgar/pkg/rtorrent/trunk/files/0001-build-fixes.patch (rev 0) +++ csw/mgar/pkg/rtorrent/trunk/files/0001-build-fixes.patch 2010-05-26 16:01:01 UTC (rev 9996) @@ -0,0 +1,107 @@ +From 425fc5065dd4cc6f0b450ce7864f437eace4e82c Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter +Date: Mon, 24 May 2010 13:41:29 +0200 +Subject: [PATCH] build-fixes + +--- + src/core/download_list.cc | 1 + + src/core/poll_manager.cc | 1 + + src/display/attributes.h | 2 +- + src/display/window_file_list.cc | 3 ++- + src/input/bindings.h | 2 +- + src/input/input_event.cc | 2 +- + src/rpc/command_function.cc | 1 + + 7 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/src/core/download_list.cc b/src/core/download_list.cc +index 551f873..52bac0e 100644 +--- a/src/core/download_list.cc ++++ b/src/core/download_list.cc +@@ -37,6 +37,7 @@ + #include "config.h" + + #include ++#include + #include + #include + #include +diff --git a/src/core/poll_manager.cc b/src/core/poll_manager.cc +index 90df840..458fef5 100644 +--- a/src/core/poll_manager.cc ++++ b/src/core/poll_manager.cc +@@ -37,6 +37,7 @@ + #include "config.h" + + #include ++#include + #include + + #include "globals.h" +diff --git a/src/display/attributes.h b/src/display/attributes.h +index a4dcfa5..67245af 100644 +--- a/src/display/attributes.h ++++ b/src/display/attributes.h +@@ -39,7 +39,7 @@ + + #include + #include +-#include ++#include + + // Let us hail the creators of curses for being idiots. The only + // clever move they made was in the naming. +diff --git a/src/display/window_file_list.cc b/src/display/window_file_list.cc +index 540f493..9596f49 100644 +--- a/src/display/window_file_list.cc ++++ b/src/display/window_file_list.cc +@@ -61,7 +61,8 @@ WindowFileList::WindowFileList(const ui::ElementFileList* element) : + // taking into account that some characters may be occupying two screen positions. + std::wstring + wstring_width(const std::string& i_str, int width) { +- wchar_t result[width + 1]; ++ //wchar_t result[width + 1]; ++ wchar_t* result = new wchar_t[width + 1]; + size_t length = std::mbstowcs(result, i_str.c_str(), width); + + // If not valid UTF-8 encoding, at least copy the printable characters. +diff --git a/src/input/bindings.h b/src/input/bindings.h +index 8b200db..657a513 100644 +--- a/src/input/bindings.h ++++ b/src/input/bindings.h +@@ -38,7 +38,7 @@ + #define RTORRENT_INPUT_BINDINGS_H + + #include +-#include ++#include + #include + + namespace input { +diff --git a/src/input/input_event.cc b/src/input/input_event.cc +index ce3078a..300269e 100644 +--- a/src/input/input_event.cc ++++ b/src/input/input_event.cc +@@ -36,7 +36,7 @@ + + #include "config.h" + +-#include ++#include + #define NCURSES_ERR -1 + + #include "input_event.h" +diff --git a/src/rpc/command_function.cc b/src/rpc/command_function.cc +index 7f3c331..febca80 100644 +--- a/src/rpc/command_function.cc ++++ b/src/rpc/command_function.cc +@@ -37,6 +37,7 @@ + #include "config.h" + + #include ++#include + #include + #include + +-- +1.7.0 + Added: csw/mgar/pkg/rtorrent/trunk/files/0001-curl_get.patch =================================================================== --- csw/mgar/pkg/rtorrent/trunk/files/0001-curl_get.patch (rev 0) +++ csw/mgar/pkg/rtorrent/trunk/files/0001-curl_get.patch 2010-05-26 16:01:01 UTC (rev 9996) @@ -0,0 +1,25 @@ +From 2f43d953cfe749e381cf0d011d37c7177dc25151 Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter +Date: Sun, 23 May 2010 14:10:27 +0200 +Subject: [PATCH] curl_get + +--- + src/core/curl_get.cc | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/core/curl_get.cc b/src/core/curl_get.cc +index f0767b7..5c4b73c 100644 +--- a/src/core/curl_get.cc ++++ b/src/core/curl_get.cc +@@ -88,7 +88,7 @@ CurlGet::start() { + curl_easy_setopt(m_handle, CURLOPT_NOSIGNAL, (long)1); + curl_easy_setopt(m_handle, CURLOPT_FOLLOWLOCATION, (long)1); + curl_easy_setopt(m_handle, CURLOPT_MAXREDIRS, (long)5); +- curl_easy_setopt(m_handle, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4); ++ curl_easy_setopt(m_handle, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_WHATEVER); + curl_easy_setopt(m_handle, CURLOPT_ENCODING, ""); + + m_stack->add_get(this); +-- +1.7.0 + Added: csw/mgar/pkg/rtorrent/trunk/files/0001-more-build-fixes.patch =================================================================== --- csw/mgar/pkg/rtorrent/trunk/files/0001-more-build-fixes.patch (rev 0) +++ csw/mgar/pkg/rtorrent/trunk/files/0001-more-build-fixes.patch 2010-05-26 16:01:01 UTC (rev 9996) @@ -0,0 +1,25 @@ +From 73b5cea8f2d71900227058ad3a222c8b98b628bf Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter +Date: Mon, 24 May 2010 13:55:39 +0200 +Subject: [PATCH] more-build-fixes + +--- + src/input/text_input.cc | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/input/text_input.cc b/src/input/text_input.cc +index 7e19e86..3e74af8 100644 +--- a/src/input/text_input.cc ++++ b/src/input/text_input.cc +@@ -36,7 +36,7 @@ + + #include "config.h" + +-#include ++#include + + #include "text_input.h" + +-- +1.7.0 + Added: csw/mgar/pkg/rtorrent/trunk/files/0001-more-build-fixes2.patch =================================================================== --- csw/mgar/pkg/rtorrent/trunk/files/0001-more-build-fixes2.patch (rev 0) +++ csw/mgar/pkg/rtorrent/trunk/files/0001-more-build-fixes2.patch 2010-05-26 16:01:01 UTC (rev 9996) @@ -0,0 +1,25 @@ +From 8be94bd57ea757706b5bf61eb62852a67fe85b52 Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter +Date: Mon, 24 May 2010 15:21:55 +0200 +Subject: [PATCH] more-build-fixes2 + +--- + src/command_download.cc | 1 + + src/rpc/xmlrpc.cc | 1 + + 2 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/src/rpc/xmlrpc.cc b/src/rpc/xmlrpc.cc +index ba527c6..c81184e 100644 +--- a/src/rpc/xmlrpc.cc ++++ b/src/rpc/xmlrpc.cc +@@ -46,6 +46,7 @@ + + #include "xmlrpc.h" + #include "parse_commands.h" ++#define __UNUSED + + namespace rpc { + +-- +1.7.0 + Added: csw/mgar/pkg/rtorrent/trunk/files/0001-scgi_task.cc.patch =================================================================== --- csw/mgar/pkg/rtorrent/trunk/files/0001-scgi_task.cc.patch (rev 0) +++ csw/mgar/pkg/rtorrent/trunk/files/0001-scgi_task.cc.patch 2010-05-26 16:01:01 UTC (rev 9996) @@ -0,0 +1,50 @@ +From 3038e30d0be6df9dd3e3afb36220e5ca97e3c7e7 Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter +Date: Sun, 23 May 2010 14:31:01 +0200 +Subject: [PATCH] scgi_task.cc + +--- + src/rpc/scgi_task.cc | 12 ++++++------ + 1 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/rpc/scgi_task.cc b/src/rpc/scgi_task.cc +index 4f78335..bfed679 100644 +--- a/src/rpc/scgi_task.cc ++++ b/src/rpc/scgi_task.cc +@@ -156,19 +156,19 @@ SCgiTask::event_read() { + } else if ((unsigned int)contentSize <= default_buffer_size) { + m_bufferSize = contentSize; + +- std::memmove(m_buffer, m_body, std::distance(m_body, m_position)); +- m_position = m_buffer + std::distance(m_body, m_position); ++ std::memmove(m_buffer, m_body, m_position - m_body); ++ m_position = m_buffer + (m_position - m_body); + m_body = m_buffer; + + } else { +- realloc_buffer((m_bufferSize = contentSize) + 1, m_body, std::distance(m_body, m_position)); ++ realloc_buffer((m_bufferSize = contentSize) + 1, m_body, m_position - m_body); + +- m_position = m_buffer + std::distance(m_body, m_position); ++ m_position = m_buffer + (m_position - m_body); + m_body = m_buffer; + } + } + +- if ((unsigned int)std::distance(m_buffer, m_position) != m_bufferSize) ++ if ((unsigned int)(m_position - m_buffer) != m_bufferSize) + return; + + this_thread->poll()->remove_read(this); +@@ -182,7 +182,7 @@ SCgiTask::event_read() { + } + + // Close if the call failed, else stay open to write back data. +- if (!m_parent->receive_call(this, m_body, m_bufferSize - std::distance(m_buffer, m_body))) ++ if (!m_parent->receive_call(this, m_body, m_bufferSize - (m_body - m_buffer))) + close(); + + return; +-- +1.7.0 + Added: csw/mgar/pkg/rtorrent/trunk/files/rtorrent-01-solaris.diff =================================================================== --- csw/mgar/pkg/rtorrent/trunk/files/rtorrent-01-solaris.diff (rev 0) +++ csw/mgar/pkg/rtorrent/trunk/files/rtorrent-01-solaris.diff 2010-05-26 16:01:01 UTC (rev 9996) @@ -0,0 +1,119 @@ +--- rtorrent-0.8.2/src/input/input_event.cc.orig 2008-05-10 18:44:08.970350312 +1200 ++++ rtorrent-0.8.2/src/input/input_event.cc 2008-05-10 18:44:41.438283333 +1200 +@@ -37,6 +37,7 @@ + #include "config.h" + + #include ++#define NCURSES_ERR -1 + + #include "input_event.h" + +@@ -58,7 +59,7 @@ + InputEvent::event_read() { + int c; + +- while ((c = getch()) != ERR) ++ while ((c = getch()) != NCURSES_ERR) + m_slotPressed(c); + } + +--- rtorrent-0.8.2/src/input/path_input.cc.orig 2008-05-08 00:19:11.000000000 +1200 ++++ rtorrent-0.8.2/src/input/path_input.cc 2008-05-10 18:46:38.159258850 +1200 +@@ -42,7 +42,8 @@ + #include + + #include +-#include ++#include ++#include + + #include "path_input.h" + +@@ -71,9 +72,12 @@ + } + + struct _transform_filename { ++ struct stat s; + void operator () (utils::directory_entry& entry) { +- if (entry.d_type == DT_DIR) ++ stat(entry.d_name.c_str(), &s); ++ if (s.st_mode & S_IFDIR) { + entry.d_name += '/'; ++ } + } + }; + +--- rtorrent-0.8.2/src/utils/directory.h.orig 2008-05-08 00:19:11.000000000 +1200 ++++ rtorrent-0.8.2/src/utils/directory.h 2008-05-10 18:40:49.485871875 +1200 +@@ -48,9 +48,7 @@ + bool is_file() const { return true; } + + // The name and types should match POSIX. +- uint32_t d_fileno; + uint32_t d_reclen; +- uint8_t d_type; + + std::string d_name; + }; +--- rtorrent-0.8.2/src/utils/directory.cc.orig 2008-05-08 00:19:11.000000000 +1200 ++++ rtorrent-0.8.2/src/utils/directory.cc 2008-05-10 18:40:49.485525951 +1200 +@@ -76,9 +76,7 @@ + + iterator itr = base_type::insert(end(), value_type()); + +- itr->d_fileno = entry->d_fileno; + itr->d_reclen = entry->d_reclen; +- itr->d_type = entry->d_type; + + #ifdef DIRENT_NAMLEN_EXISTS_FOOBAR + itr->d_name = std::string(entry->d_name, entry->d_name + entry->d_namlen); +--- rtorrent-0.8.2/src/signal_handler.h.orig 2008-05-08 00:19:11.000000000 +1200 ++++ rtorrent-0.8.2/src/signal_handler.h 2008-05-10 18:40:49.485083889 +1200 +@@ -37,7 +37,7 @@ + #ifndef RTORRENT_SIGNAL_HANDLER_H + #define RTORRENT_SIGNAL_HANDLER_H + +-#include ++#include + #include + + class SignalHandler { +--- rtorrent-0.8.2/src/rpc/scgi.cc.orig 2008-05-08 00:19:10.000000000 +1200 ++++ rtorrent-0.8.2/src/rpc/scgi.cc 2008-05-10 18:40:49.457064063 +1200 +@@ -88,7 +88,7 @@ + char buffer[sizeof(sockaddr_un) + filename.size()]; + sockaddr_un* sa = reinterpret_cast(buffer); + +- sa->sun_family = AF_LOCAL; ++ sa->sun_family = AF_UNIX; + std::memcpy(sa->sun_path, filename.c_str(), filename.size() + 1); + + if (!get_fd().open_local()) +--- rtorrent-0.8.2.orig/src/main.cc 2008-07-01 16:49:14.445080000 -0400 ++++ rtorrent-0.8.2/src/main.cc 2008-07-02 10:37:19.052279890 -0400 +@@ -44,7 +44,13 @@ + #include + #include + #include ++#include + ++#if defined(__sun) && defined(__SVR4) ++#include ++#include ++#endif ++ + #ifdef USE_EXECINFO + #include + #endif +@@ -165,6 +170,11 @@ + SignalHandler::set_handler(SIGSEGV, sigc::bind(sigc::ptr_fun(&do_panic), SIGSEGV)); + SignalHandler::set_handler(SIGBUS, sigc::bind(sigc::ptr_fun(&do_panic), SIGBUS)); + SignalHandler::set_handler(SIGFPE, sigc::bind(sigc::ptr_fun(&do_panic), SIGFPE)); ++ SignalHandler::set_handler(SIGABRT, sigc::bind(sigc::ptr_fun(&do_panic), SIGABRT)); ++ ++#if defined(__sun) && defined(__SVR4) ++ enable_extended_FILE_stdio(-1, SIGABRT); ++#endif + + control->core()->initialize_first(); + Added: csw/mgar/pkg/rtorrent/trunk/files/rtorrent-02-event-ports.diff =================================================================== --- csw/mgar/pkg/rtorrent/trunk/files/rtorrent-02-event-ports.diff (rev 0) +++ csw/mgar/pkg/rtorrent/trunk/files/rtorrent-02-event-ports.diff 2010-05-26 16:01:01 UTC (rev 9996) @@ -0,0 +1,222 @@ +diff -urN rtorrent-0.8.2.orig/src/core/Makefile.am rtorrent-0.8.2/src/core/Makefile.am +--- rtorrent-0.8.2.orig/src/core/Makefile.am 2008-05-07 08:19:11.000000000 -0400 ++++ rtorrent-0.8.2/src/core/Makefile.am 2008-05-24 04:58:48.995508910 -0400 +@@ -26,6 +26,8 @@ + poll_manager.h \ + poll_manager_epoll.cc \ + poll_manager_epoll.h \ ++ poll_manager_ports.cc \ ++ poll_manager_ports.h \ + poll_manager_kqueue.cc \ + poll_manager_kqueue.h \ + poll_manager_select.cc \ +diff -urN rtorrent-0.8.2.orig/src/core/manager.cc rtorrent-0.8.2/src/core/manager.cc +--- rtorrent-0.8.2.orig/src/core/manager.cc 2008-05-07 08:19:11.000000000 -0400 ++++ rtorrent-0.8.2/src/core/manager.cc 2008-05-24 04:58:48.996596707 -0400 +@@ -69,6 +69,7 @@ + #include "manager.h" + #include "poll_manager_epoll.h" + #include "poll_manager_kqueue.h" ++#include "poll_manager_ports.h" + #include "poll_manager_select.h" + #include "view.h" + +@@ -189,6 +190,9 @@ + if ((m_pollManager = PollManagerEPoll::create(sysconf(_SC_OPEN_MAX))) != NULL) + m_logImportant.push_front("Using 'epoll' based polling."); + ++ else if ((m_pollManager = PollManagerPorts::create(sysconf(_SC_OPEN_MAX))) != NULL) ++ m_logImportant.push_front("Using 'ports' based polling."); ++ + else if ((m_pollManager = PollManagerKQueue::create(sysconf(_SC_OPEN_MAX))) != NULL) + m_logImportant.push_front("Using 'kqueue' based polling."); + +diff -urN rtorrent-0.8.2.orig/src/core/poll_manager_ports.cc rtorrent-0.8.2/src/core/poll_manager_ports.cc +--- rtorrent-0.8.2.orig/src/core/poll_manager_ports.cc 1969-12-31 19:00:00.000000000 -0500 ++++ rtorrent-0.8.2/src/core/poll_manager_ports.cc 2008-05-10 19:04:07.000000000 -0400 +@@ -0,0 +1,118 @@ ++// rTorrent - BitTorrent client ++// Copyright (C) 2005-2007, Jari Sundell ++// ++// 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 ++// ++// In addition, as a special exception, the copyright holders give ++// permission to link the code of portions of this program with the ++// OpenSSL library under certain conditions as described in each ++// individual source file, and distribute linked combinations ++// including the two. ++// ++// You must obey the GNU General Public License in all respects for ++// all of the code used other than OpenSSL. If you modify file(s) ++// with this exception, you may extend this exception to your version ++// of the file(s), but you are not obligated to do so. If you do not ++// wish to do so, delete this exception statement from your version. ++// If you delete this exception statement from all source files in the ++// program, then also delete it here. ++// ++// Contact: Jari Sundell ++// ++// Skomakerveien 33 ++// 3185 Skoppum, NORWAY ++ ++#include "config.h" ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "poll_manager_ports.h" ++ ++namespace core { ++ ++PollManagerPorts* ++PollManagerPorts::create(int maxOpenSockets) { ++ torrent::PollPorts* p = torrent::PollPorts::create(maxOpenSockets); ++ ++ if (p == NULL) ++ return NULL; ++ else ++ return new PollManagerPorts(p); ++} ++ ++PollManagerPorts::~PollManagerPorts() { ++} ++ ++void ++PollManagerPorts::poll(rak::timer timeout) { ++ // Add 1ms to ensure we don't idle loop due to the lack of ++ // resolution. ++ torrent::perform(); ++ timeout = std::min(timeout, rak::timer(torrent::next_timeout())) + 1000; ++ ++ if (!m_httpStack.empty()) { ++ // When we're using libcurl we need to use select, but as this is ++ // inefficient we try avoiding it whenever possible. ++#if defined USE_VARIABLE_FDSET ++ std::memset(m_readSet, 0, m_setSize); ++ std::memset(m_writeSet, 0, m_setSize); ++ std::memset(m_errorSet, 0, m_setSize); ++#else ++ FD_ZERO(m_readSet); ++ FD_ZERO(m_writeSet); ++ FD_ZERO(m_errorSet); ++#endif ++ FD_SET(static_cast(m_poll)->file_descriptor(), m_readSet); ++ ++ unsigned int maxFd = std::max((unsigned int)static_cast(m_poll)->file_descriptor(), ++ m_httpStack.fdset(m_readSet, m_writeSet, m_errorSet)); ++ ++ timeval t = timeout.tval(); ++ ++ if (select(maxFd + 1, m_readSet, m_writeSet, m_errorSet, &t) == -1) { ++ std::cerr << "error from select\n"; ++ return check_error(); ++ } ++ m_httpStack.perform(); ++ ++ if (!FD_ISSET(static_cast(m_poll)->file_descriptor(), m_readSet)) { ++ // Need to call perform here so that scheduled task get done ++ // even if there's no socket events outside of the http stuff. ++ torrent::perform(); ++ return; ++ } ++ ++ // Clear the timeout since we've already used it in the select call. ++ timeout = rak::timer(); ++ } ++ ++ // Yes, below is how much code really *should* have been in this ++ // function. ;) ++ ++ if (static_cast(m_poll)->poll((timeout.usec() + 999) / 1000) == -1) { ++ std::cerr << "error from ports poll\n"; ++ return check_error(); ++ } ++ torrent::perform(); ++ static_cast(m_poll)->perform(); ++} ++ ++} +diff -urN rtorrent-0.8.2.orig/src/core/poll_manager_ports.h rtorrent-0.8.2/src/core/poll_manager_ports.h +--- rtorrent-0.8.2.orig/src/core/poll_manager_ports.h 1969-12-31 19:00:00.000000000 -0500 ++++ rtorrent-0.8.2/src/core/poll_manager_ports.h 2008-05-10 19:04:07.000000000 -0400 +@@ -0,0 +1,63 @@ ++// rTorrent - BitTorrent client ++// Copyright (C) 2005-2007, Jari Sundell ++// ++// 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 ++// ++// In addition, as a special exception, the copyright holders give ++// permission to link the code of portions of this program with the ++// OpenSSL library under certain conditions as described in each ++// individual source file, and distribute linked combinations ++// including the two. ++// ++// You must obey the GNU General Public License in all respects for ++// all of the code used other than OpenSSL. If you modify file(s) ++// with this exception, you may extend this exception to your version ++// of the file(s), but you are not obligated to do so. If you do not ++// wish to do so, delete this exception statement from your version. ++// If you delete this exception statement from all source files in the ++// program, then also delete it here. ++// ++// Contact: Jari Sundell ++// ++// Skomakerveien 33 ++// 3185 Skoppum, NORWAY ++ ++#ifndef RTORRENT_CORE_POLL_MANAGER_PORTS_H ++#define RTORRENT_CORE_POLL_MANAGER_PORTS_H ++ ++#include "poll_manager.h" ++ ++namespace torrent { ++ class PollPorts; ++} ++ ++namespace core { ++ ++class PollManagerPorts : public PollManager { ++public: ++ static PollManagerPorts* create(int maxOpenSockets); ++ ~PollManagerPorts(); ++ ++ torrent::Poll* get_torrent_poll(); ++ ++ void poll(rak::timer timeout); ++ ++private: ++ PollManagerPorts(torrent::Poll* p) : PollManager(p) {} ++}; ++ ++} ++ ++#endif Added: csw/mgar/pkg/rtorrent/trunk/files/rtorrent-03-curl-event.diff =================================================================== --- csw/mgar/pkg/rtorrent/trunk/files/rtorrent-03-curl-event.diff (rev 0) +++ csw/mgar/pkg/rtorrent/trunk/files/rtorrent-03-curl-event.diff 2010-05-26 16:01:01 UTC (rev 9996) @@ -0,0 +1,490 @@ +diff -urN rtorrent-0.8.2.orig/src/core/curl_event.cc rtorrent-0.8.2/src/core/curl_event.cc +--- rtorrent-0.8.2.orig/src/core/curl_event.cc 1969-12-31 19:00:00.000000000 -0500 ++++ rtorrent-0.8.2/src/core/curl_event.cc 2008-06-10 14:40:41.403064000 -0400 +@@ -0,0 +1,63 @@ ++// libTorrent - BitTorrent library ++// Copyright (C) 2008 Albert Lee ++// ++// 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 ++// ++// In addition, as a special exception, the copyright holders give ++// permission to link the code of portions of this program with the ++// OpenSSL library under certain conditions as described in each ++// individual source file, and distribute linked combinations ++// including the two. ++// ++// You must obey the GNU General Public License in all respects for ++// all of the code used other than OpenSSL. If you modify file(s) ++// with this exception, you may extend this exception to your version ++// of the file(s), but you are not obligated to do so. If you do not ++// wish to do so, delete this exception statement from your version. ++// If you delete this exception statement from all source files in the ++// program, then also delete it here. ++// ++// Contact: Jari Sundell ++// ++// Skomakerveien 33 ++// 3185 Skoppum, NORWAY ++ ++#include "config.h" ++ ++#include ++ ++#include "rak/functional.h" ++ ++#include "curl_event.h" ++#include "curl_stack.h" ++ ++namespace core { ++ ++void ++CurlEvent::event_read() { ++ m_stack->perform(m_fileDesc); ++} ++ ++void ++CurlEvent::event_write() { ++ m_stack->perform(m_fileDesc); ++} ++ ++void ++CurlEvent::event_error() { ++ m_stack->perform(m_fileDesc); ++} ++ ++} +diff -urN rtorrent-0.8.2.orig/src/core/curl_event.h rtorrent-0.8.2/src/core/curl_event.h +--- rtorrent-0.8.2.orig/src/core/curl_event.h 1969-12-31 19:00:00.000000000 -0500 ++++ rtorrent-0.8.2/src/core/curl_event.h 2008-06-10 14:37:59.758119000 -0400 +@@ -0,0 +1,61 @@ ++// libTorrent - BitTorrent library ++// Copyright (C) 2008 Albert Lee ++// ++// 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 ++// ++// In addition, as a special exception, the copyright holders give ++// permission to link the code of portions of this program with the ++// OpenSSL library under certain conditions as described in each ++// individual source file, and distribute linked combinations ++// including the two. ++// ++// You must obey the GNU General Public License in all respects for ++// all of the code used other than OpenSSL. If you modify file(s) ++// with this exception, you may extend this exception to your version ++// of the file(s), but you are not obligated to do so. If you do not ++// wish to do so, delete this exception statement from your version. ++// If you delete this exception statement from all source files in the ++// program, then also delete it here. ++// ++// Contact: Jari Sundell ++// ++// Skomakerveien 33 ++// 3185 Skoppum, NORWAY ++ ++#ifndef RTORRENT_CORE_CURL_EVENT_H ++#define RTORRENT_CORE_CURL_EVENT_H ++ ++#include ++ ++namespace core { ++ ++class CurlStack; ++ ++class CurlEvent : public torrent::Event { ++public: ++ CurlEvent(CurlStack* s, int fd) : m_stack(s) { m_fileDesc = fd; } ++ virtual ~CurlEvent() {} ++ ++ virtual void event_read(); ++ virtual void event_write(); ++ virtual void event_error(); ++ ++protected: ++ CurlStack* m_stack; ++}; ++ ++} ++ ++#endif +diff -urN rtorrent-0.8.2.orig/src/core/curl_stack.cc rtorrent-0.8.2/src/core/curl_stack.cc +--- rtorrent-0.8.2.orig/src/core/curl_stack.cc 2008-05-07 08:19:11.000000000 -0400 ++++ rtorrent-0.8.2/src/core/curl_stack.cc 2008-06-10 14:32:12.992249000 -0400 +@@ -44,13 +44,77 @@ + #include "rak/functional.h" + #include "curl_get.h" + #include "curl_stack.h" ++#include "curl_event.h" ++ ++#include "poll_manager.h" + + namespace core { + +-CurlStack::CurlStack() : ++#if LIBCURL_VERSION_NUM >= 0x071000 ++static void timer_callback(curl_socket_t socket, int action, void* event_data) ++{ ++ CurlStack* s = static_cast(event_data); ++ CURLM* handle = (CURLM*)(s->handle()); ++ CURLMcode rc; ++ int count; ++ ++ while (CURLM_CALL_MULTI_PERFORM == (rc = curl_multi_socket(handle, CURL_SOCKET_TIMEOUT, &count))); ++} ++#endif ++ ++static int socket_callback(CURL *easy, curl_socket_t socket, int action, void* socket_data, void* assign_data) ++{ ++ CurlStack* stack = static_cast(socket_data); ++ torrent::Event* event = static_cast(assign_data); ++ torrent::Poll* poll = stack->poll(); ++ ++ if (!event) { ++ event = new CurlEvent(stack, socket); ++ curl_multi_assign((CURLM*)(stack->handle()), socket, event); ++ if (socket > poll->open_max()) ++ throw torrent::internal_error("Socket too large for " + poll->open_max()); ++ poll->open(event); ++ } else { ++ poll->remove_read(event); ++ poll->remove_write(event); ++ poll->remove_error(event); ++ } ++ ++ switch (action) { ++ case CURL_POLL_NONE: ++ break; ++ case CURL_POLL_IN: ++ poll->insert_read(event); ++ break; ++ case CURL_POLL_OUT: ++ poll->insert_write(event); ++ break; ++ case CURL_POLL_INOUT: ++ poll->insert_read(event); ++ poll->insert_write(event); ++ break; ++ case CURL_POLL_REMOVE: ++ poll->close(event); ++ delete event; ++ break; ++ default: ++ throw torrent::internal_error("socket_callback(...) called with unsupported action"); ++ } ++ ++ return 0; ++} ++ ++CurlStack::CurlStack(torrent::Poll* poll) : + m_handle((void*)curl_multi_init()), ++ m_poll(poll), + m_active(0), + m_maxActive(32) { ++ curl_multi_setopt(m_handle, CURLMOPT_SOCKETDATA, this); ++ curl_multi_setopt(m_handle, CURLMOPT_SOCKETFUNCTION, socket_callback); ++#if LIBCURL_VERSION_NUM >= 0x071000 ++ curl_multi_setopt(m_handle, CURLMOPT_TIMERDATA, this); ++ curl_multi_setopt(m_handle, CURLMOPT_TIMERFUNCTION, timer_callback); ++#endif + } + + CurlStack::~CurlStack() { +@@ -66,35 +130,59 @@ + } + + void +-CurlStack::perform() { ++CurlStack::process() { ++ int t; ++ CURLMsg* msg; ++ ++ while ((msg = curl_multi_info_read((CURLM*)m_handle, &t)) != NULL) { ++ if (msg->msg != CURLMSG_DONE) ++ throw torrent::internal_error("CurlStack::process() msg->msg != CURLMSG_DONE."); ++ ++ iterator itr = std::find_if(begin(), end(), rak::equal(msg->easy_handle, std::mem_fun(&CurlGet::handle))); ++ ++ if (itr == end()) ++ throw torrent::internal_error("Could not find CurlGet with the right easy_handle."); ++ ++ if (msg->data.result == CURLE_OK) ++ (*itr)->signal_done().emit(); ++ else ++ (*itr)->signal_failed().emit(curl_easy_strerror(msg->data.result)); ++ } ++} ++ ++void ++CurlStack::perform(curl_socket_t sockfd) { + CURLMcode code; + + do { + int count; +- code = curl_multi_perform((CURLM*)m_handle, &count); ++ code = curl_multi_socket((CURLM*)m_handle, sockfd, &count); + + if (code > 0) +- throw torrent::internal_error("Error calling curl_multi_perform."); ++ throw torrent::internal_error("Error calling curl_multi_socket."); + + if ((unsigned int)count != size()) { + // Done with some handles. +- int t; +- CURLMsg* msg; ++ process(); ++ } + +- while ((msg = curl_multi_info_read((CURLM*)m_handle, &t)) != NULL) { +- if (msg->msg != CURLMSG_DONE) +- throw torrent::internal_error("CurlStack::perform() msg->msg != CURLMSG_DONE."); ++ } while (code == CURLM_CALL_MULTI_PERFORM); ++} + +- iterator itr = std::find_if(begin(), end(), rak::equal(msg->easy_handle, std::mem_fun(&CurlGet::handle))); ++void ++CurlStack::perform() { ++ CURLMcode code; + +- if (itr == end()) +- throw torrent::internal_error("Could not find CurlGet with the right easy_handle."); +- +- if (msg->data.result == CURLE_OK) +- (*itr)->signal_done().emit(); +- else +- (*itr)->signal_failed().emit(curl_easy_strerror(msg->data.result)); +- } ++ do { ++ int count; ++ code = curl_multi_perform((CURLM*)m_handle, &count); ++ ++ if (code > 0) ++ throw torrent::internal_error("Error calling curl_multi_perform."); ++ ++ if ((unsigned int)count != size()) { ++ // Done with some handles. ++ process(); + } + + } while (code == CURLM_CALL_MULTI_PERFORM); +diff -urN rtorrent-0.8.2.orig/src/core/curl_stack.h rtorrent-0.8.2/src/core/curl_stack.h +--- rtorrent-0.8.2.orig/src/core/curl_stack.h 2008-05-07 08:19:11.000000000 -0400 ++++ rtorrent-0.8.2/src/core/curl_stack.h 2008-06-10 13:54:21.695024000 -0400 +@@ -40,11 +40,19 @@ + #include + #include + #include ++#include ++ ++class torrent::Poll; + + namespace core { + + class CurlGet; + ++#if LIBCURL_VERSION_NUM >= 0x071000 ++static void timer_callback(curl_socket_t socket, int action, void* event_data); ++#endif ++static int socket_callback(CURL *easy, curl_socket_t socket, int action, void* socket_data, void* assign_data); ++ + // By using a deque instead of vector we allow for cheaper removal of + // the oldest elements, those that will be first in the in the + // deque. +@@ -76,16 +84,19 @@ + using base_type::size; + using base_type::empty; + +- CurlStack(); ++ CurlStack(torrent::Poll* poll); + ~CurlStack(); + + CurlGet* new_object(); + ++ void perform(curl_socket_t sockfd); + void perform(); + + // TODO: Set fd_set's only once? + unsigned int fdset(fd_set* readfds, fd_set* writefds, fd_set* exceptfds); + ++ void* handle() { return m_handle; } ++ torrent::Poll* poll() { return m_poll; } + unsigned int active() const { return m_active; } + unsigned int max_active() const { return m_maxActive; } + void set_max_active(unsigned int a) { m_maxActive = a; } +@@ -111,12 +122,14 @@ + protected: + void add_get(CurlGet* get); + void remove_get(CurlGet* get); ++ void process(); + + private: + CurlStack(const CurlStack&); + void operator = (const CurlStack&); + + void* m_handle; ++ torrent::Poll* m_poll; + + unsigned int m_active; + unsigned int m_maxActive; +diff -urN rtorrent-0.8.2.orig/src/core/Makefile.am rtorrent-0.8.2/src/core/Makefile.am +--- rtorrent-0.8.2.orig/src/core/Makefile.am 2008-06-10 15:13:49.786345331 -0400 ++++ rtorrent-0.8.2/src/core/Makefile.am 2008-06-10 02:25:32.809721000 -0400 +@@ -1,6 +1,8 @@ + noinst_LIBRARIES = libsub_core.a + + libsub_core_a_SOURCES = \ ++ curl_event.cc \ ++ curl_event.h \ + curl_get.cc \ + curl_get.h \ + curl_stack.cc \ +diff -urN rtorrent-0.8.2.orig/src/core/poll_manager_epoll.cc rtorrent-0.8.2/src/core/poll_manager_epoll.cc +--- rtorrent-0.8.2.orig/src/core/poll_manager_epoll.cc 2008-05-07 08:19:11.000000000 -0400 ++++ rtorrent-0.8.2/src/core/poll_manager_epoll.cc 2008-06-10 14:17:27.568558000 -0400 +@@ -67,6 +67,7 @@ + torrent::perform(); + timeout = std::min(timeout, rak::timer(torrent::next_timeout())) + 1000; + ++#if 0 + if (!m_httpStack.empty()) { + // When we're using libcurl we need to use select, but as this is + // inefficient we try avoiding it whenever possible. +@@ -101,6 +102,7 @@ + // Clear the timeout since we've already used it in the select call. + timeout = rak::timer(); + } ++#endif + + // Yes, below is how much code really *should* have been in this + // function. ;) +diff -urN rtorrent-0.8.2.orig/src/core/poll_manager_kqueue.cc rtorrent-0.8.2/src/core/poll_manager_kqueue.cc +--- rtorrent-0.8.2.orig/src/core/poll_manager_kqueue.cc 2008-05-07 08:19:11.000000000 -0400 ++++ rtorrent-0.8.2/src/core/poll_manager_kqueue.cc 2008-06-10 14:17:31.672907000 -0400 +@@ -68,6 +68,7 @@ + torrent::perform(); + timeout = std::min(timeout, rak::timer(torrent::next_timeout())) + 1000; + ++#if 0 + if (!m_httpStack.empty()) { + // When we're using libcurl we need to use select, but as this is + // inefficient we try avoiding it whenever possible. +@@ -102,6 +103,7 @@ + // Clear the timeout since we've already used it in the select call. + timeout = rak::timer(); + } ++#endif + + // Yes, below is how much code really *should* have been in this + // function. ;) +diff -urN rtorrent-0.8.2.orig/src/core/poll_manager_ports.cc rtorrent-0.8.2/src/core/poll_manager_ports.cc +--- rtorrent-0.8.2.orig/src/core/poll_manager_ports.cc 2008-06-10 15:13:49.790288665 -0400 ++++ rtorrent-0.8.2/src/core/poll_manager_ports.cc 2008-06-10 14:31:09.552278000 -0400 +@@ -68,6 +68,7 @@ + torrent::perform(); + timeout = std::min(timeout, rak::timer(torrent::next_timeout())) + 1000; + ++#if 0 + if (!m_httpStack.empty()) { + // When we're using libcurl we need to use select, but as this is + // inefficient we try avoiding it whenever possible. +@@ -103,6 +104,7 @@ + // Clear the timeout since we've already used it in the select call. + timeout = rak::timer(); + } ++#endif + + // Yes, below is how much code really *should* have been in this + // function. ;) +diff -urN rtorrent-0.8.2.orig/src/core/poll_manager_select.cc rtorrent-0.8.2/src/core/poll_manager_select.cc +--- rtorrent-0.8.2.orig/src/core/poll_manager_select.cc 2008-05-07 08:19:11.000000000 -0400 ++++ rtorrent-0.8.2/src/core/poll_manager_select.cc 2008-06-10 02:37:17.419878000 -0400 +@@ -77,16 +77,16 @@ + + unsigned int maxFd = static_cast(m_poll)->fdset(m_readSet, m_writeSet, m_errorSet); + +- if (!m_httpStack.empty()) +- maxFd = std::max(maxFd, m_httpStack.fdset(m_readSet, m_writeSet, m_errorSet)); ++ if (!m_httpStack->empty()) ++ maxFd = std::max(maxFd, m_httpStack->fdset(m_readSet, m_writeSet, m_errorSet)); + + timeval t = timeout.tval(); + + if (select(maxFd + 1, m_readSet, m_writeSet, m_errorSet, &t) == -1) + return check_error(); + +- if (!m_httpStack.empty()) +- m_httpStack.perform(); ++ if (!m_httpStack->empty()) ++ m_httpStack->perform(); + + torrent::perform(); + static_cast(m_poll)->perform(m_readSet, m_writeSet, m_errorSet); +diff -urN rtorrent-0.8.2.orig/src/core/poll_manager.cc rtorrent-0.8.2/src/core/poll_manager.cc +--- rtorrent-0.8.2.orig/src/core/poll_manager.cc 2008-05-07 08:19:11.000000000 -0400 ++++ rtorrent-0.8.2/src/core/poll_manager.cc 2008-06-10 02:35:35.523377000 -0400 +@@ -44,7 +44,8 @@ + namespace core { + + PollManager::PollManager(torrent::Poll* poll) : +- m_poll(poll) { ++ m_poll(poll), ++ m_httpStack(new CurlStack(poll)) { + + if (m_poll == NULL) + throw std::logic_error("PollManager::PollManager(...) received poll == NULL"); +@@ -74,10 +75,11 @@ + + // Call this so curl has valid fd_set pointers if curl_multi_perform + // is called before it gets set when polling. +- m_httpStack.fdset(m_readSet, m_writeSet, m_errorSet); ++ m_httpStack->fdset(m_readSet, m_writeSet, m_errorSet); + } + + PollManager::~PollManager() { ++ delete m_httpStack; + delete m_poll; + + #if defined USE_VARIABLE_FDSET +diff -urN rtorrent-0.8.2.orig/src/core/poll_manager.h rtorrent-0.8.2/src/core/poll_manager.h +--- rtorrent-0.8.2.orig/src/core/poll_manager.h 2008-05-07 08:19:11.000000000 -0400 ++++ rtorrent-0.8.2/src/core/poll_manager.h 2008-06-10 02:34:57.898088000 -0400 +@@ -58,7 +58,7 @@ + + unsigned int get_open_max() const { return m_poll->open_max(); } + +- CurlStack* get_http_stack() { return &m_httpStack; } ++ CurlStack* get_http_stack() { return m_httpStack; } + torrent::Poll* get_torrent_poll() { return m_poll; } + + virtual void poll(rak::timer timeout) = 0; +@@ -70,7 +70,7 @@ + void check_error(); + + torrent::Poll* m_poll; +- CurlStack m_httpStack; ++ CurlStack* m_httpStack; + + unsigned int m_setSize; + fd_set* m_readSet; Added: csw/mgar/pkg/rtorrent/trunk/files/rtorrent-04-sunpro.diff =================================================================== --- csw/mgar/pkg/rtorrent/trunk/files/rtorrent-04-sunpro.diff (rev 0) +++ csw/mgar/pkg/rtorrent/trunk/files/rtorrent-04-sunpro.diff 2010-05-26 16:01:01 UTC (rev 9996) @@ -0,0 +1,652 @@ +--- rtorrent-0.8.2.orig/rak/string_manip.h 2008-05-07 08:19:12.000000000 -0400 ++++ rtorrent-0.8.2/rak/string_manip.h 2008-06-25 02:14:10.028329996 -0400 +@@ -62,7 +62,7 @@ + + template + Sequence trim_end(const Sequence& seq) { +- if (seq.empty() || !std::isspace(*(--seq.end()))) ++ if (seq.empty() || !std::isspace(*(seq.end()-1))) + return seq; + + typename Sequence::size_type pos = seq.size(); +@@ -93,7 +93,7 @@ + + template + Sequence trim_end_classic(const Sequence& seq) { +- if (seq.empty() || !std::isspace(*(--seq.end()), std::locale::classic())) ++ if (seq.empty() || !std::isspace(*(seq.end()-1), std::locale::classic())) + return seq; + + typename Sequence::size_type pos = seq.size(); +--- rtorrent-0.8.2.orig/rak/path.h 2008-05-07 08:19:12.000000000 -0400 ++++ rtorrent-0.8.2/rak/path.h 2008-06-25 01:57:52.656513911 -0400 +@@ -42,6 +42,7 @@ + + #include + #include ++#include + + namespace rak { + +@@ -91,7 +92,7 @@ + if (home == NULL) + return first; + +- first += strlcpy(first, home, std::distance(first, last)); ++ first += strlcpy(first, home, last-first); + + if (first > last) + return last; +@@ -99,7 +100,7 @@ + src++; + } + +- return std::min(first + strlcpy(first, src, std::distance(first, last)), last); ++ return std::min(first + strlcpy(first, src, last-first), last); + } + + } +--- rtorrent-0.8.2.orig/rak/unordered_vector.h 2008-05-07 08:19:12.000000000 -0400 ++++ rtorrent-0.8.2/rak/unordered_vector.h 2008-06-25 02:29:35.381434005 -0400 +@@ -90,7 +90,7 @@ + unordered_vector<_Tp>::insert(iterator position, const value_type& x) { + Base::push_back(x); + +- return --end(); ++ return end()-1; + } + + template +--- rtorrent-0.8.2.orig/rak/socket_address.h 2008-05-07 08:19:12.000000000 -0400 ++++ rtorrent-0.8.2/rak/socket_address.h 2008-06-25 01:58:48.126132462 -0400 +@@ -50,6 +50,7 @@ + #include + #include + #include ++#include + #include + #include + #include +--- rtorrent-0.8.2.orig/rak/regex.h 2008-05-07 08:19:12.000000000 -0400 ++++ rtorrent-0.8.2/rak/regex.h 2008-06-25 02:10:05.332867456 -0400 +@@ -75,7 +75,7 @@ + std::list paths; + paths.push_front(0); + +- for (std::string::const_iterator itrText = ++text.begin(), lastText = text.end(); itrText != lastText; ++itrText) { ++ for (std::string::const_iterator itrText = text.begin()+1, lastText = text.end(); itrText != lastText; ++itrText) { + + for (std::list::iterator itrPaths = paths.begin(), lastPaths = paths.end(); itrPaths != lastPaths; ) { + +--- rtorrent-0.8.2.orig/rak/algorithm.h 2008-05-07 08:19:12.000000000 -0400 ++++ rtorrent-0.8.2/rak/algorithm.h 2008-06-25 17:27:39.728352000 -0400 +@@ -40,6 +40,63 @@ + #include + #include + ++#ifdef _RWSTD_NO_CLASS_PARTIAL_SPEC ++namespace std { ++ template struct iterator_traits ++ { ++ typedef typename Iterator::value_type value_type; ++ typedef typename Iterator::difference_type difference_type; ++ typedef typename Iterator::pointer pointer; ++ typedef typename Iterator::reference reference; ++ typedef typename Iterator::iterator_category iterator_category; ++ }; ++ template struct iterator_traits ++ { ++ typedef T value_type; ++ typedef ptrdiff_t difference_type; ++ typedef T* pointer; ++ typedef T& reference; ++ typedef random_access_iterator_tag iterator_category; ++ }; ++ template struct iterator_traits ++ { ++ typedef T value_type; ++ typedef ptrdiff_t difference_type; ++ typedef const T* pointer; ++ typedef const T& reference; ++ typedef random_access_iterator_tag iterator_category; ++ }; ++ ++ template ++ inline typename iterator_traits::difference_type ++ distance (ForwardIterator first, ForwardIterator last) ++ { ++ typename iterator_traits::difference_type n = 0; ++ __distance(first, last, n, ++ iterator_traits::iterator_category()); ++ return n; ++ } ++ ++ template ++ inline typename iterator_traits::difference_type ++ count (InputIterator first, InputIterator last, const T& value) ++ { ++ typename iterator_traits::difference_type n = 0; ++ count(first, last, value, n); ++ return n; ++ } ++ ++ template ++ inline typename iterator_traits::difference_type ++ count_if (InputIterator first, InputIterator last, Predicate pred) ++ { ++ typename iterator_traits::difference_type n = 0; ++ count_if(first, last, pred, n); ++ return n; ++ } ++} ++#endif ++ + namespace rak { + + template +--- rtorrent-0.8.2.orig/src/command_file.cc 2008-05-07 08:19:11.000000000 -0400 ++++ rtorrent-0.8.2/src/command_file.cc 2008-06-25 18:06:51.985365949 -0400 +@@ -64,7 +64,7 @@ + torrent::Object resultRaw(*file->path()->begin()); + torrent::Object::string_type& result = resultRaw.as_string(); + +- for (torrent::Path::const_iterator itr = ++file->path()->begin(), last = file->path()->end(); itr != last; itr++) ++ for (torrent::Path::const_iterator itr = (file->path()->begin())+1, last = file->path()->end(); itr != last; itr++) + result += '/' + *itr; + + return resultRaw; +--- rtorrent-0.8.2.orig/src/display/window_download_list.cc 2008-05-07 08:19:11.000000000 -0400 ++++ rtorrent-0.8.2/src/display/window_download_list.cc 2008-06-25 03:05:03.087916943 -0400 +@@ -90,9 +90,9 @@ + ++range.second; + + int pos = 1; ++ char* buffer = new char[m_canvas->width() + 1]; + + while (range.first != range.second) { +- char buffer[m_canvas->width() + 1]; + char* position; + char* last = buffer + m_canvas->width() - 2 + 1; + +@@ -107,6 +107,8 @@ + + ++range.first; + } ++ ++ delete buffer; + } + + } +--- rtorrent-0.8.2.orig/src/display/window_text.cc 2008-05-07 08:19:11.000000000 -0400 ++++ rtorrent-0.8.2/src/display/window_text.cc 2008-06-25 03:18:19.930779231 -0400 +@@ -93,8 +93,9 @@ + if (m_canvas->height() == 0) + return; + ++ char* buffer = new char[m_canvas->width() + 1]; ++ + if (m_errorHandler != NULL && m_target.second == NULL) { +- char buffer[m_canvas->width() + 1]; + + Canvas::attributes_list attributes; + attributes.push_back(Attributes(buffer, Attributes::a_normal, Attributes::color_default)); +@@ -102,6 +103,9 @@ + char* last = m_errorHandler->print(buffer, buffer + m_canvas->width(), &attributes, m_target); + + m_canvas->print_attributes(0, position, buffer, last, &attributes); ++ ++ delete buffer; ++ + return; + } + +@@ -109,8 +113,6 @@ + if (*itr == NULL) + continue; + +- char buffer[m_canvas->width() + 1]; +- + Canvas::attributes_list attributes; + attributes.push_back(Attributes(buffer, Attributes::a_normal, Attributes::color_default)); + +@@ -118,6 +120,8 @@ + + m_canvas->print_attributes(0, position, buffer, last, &attributes); + } ++ ++ delete buffer; + } + + } +--- rtorrent-0.8.2.orig/src/display/frame.h 2008-05-07 08:19:11.000000000 -0400 ++++ rtorrent-0.8.2/src/display/frame.h 2008-06-25 02:47:06.518734587 -0400 +@@ -92,9 +92,9 @@ + + Window* window() const { return m_window; } + +- Frame* frame(size_type idx) { return m_container[idx]; } ++ Frame* frame(size_type idx) { return m_container.frames[idx]; } + +- size_type container_size() const { return m_containerSize; } ++ size_type container_size() const { return m_container.size; } + void set_container_size(size_type size); + + void initialize_window(Window* window); +@@ -120,13 +120,14 @@ + uint32_t m_width; + uint32_t m_height; + ++ typedef struct { ++ size_type size; ++ Frame* frames[max_size]; ++ } container_t; ++ + union { + Window* m_window; +- +- struct { +- size_type m_containerSize; +- Frame* m_container[max_size]; +- }; ++ container_t m_container; + }; + }; + +--- rtorrent-0.8.2.orig/src/display/text_element_string.cc 2008-05-07 08:19:11.000000000 -0400 ++++ rtorrent-0.8.2/src/display/text_element_string.cc 2008-06-25 02:57:08.521853302 -0400 +@@ -36,6 +36,7 @@ + + #include "config.h" + ++#include + #include + + #include "rpc/parse_commands.h" +@@ -52,17 +52,21 @@ + return first; + + if (m_flags & flag_escape_hex) { +- char buffer[last - first]; ++ char* buffer = new char[last - first]; + char* bufferLast = copy_string(buffer, buffer + (last - first), target); + + first = rak::transform_hex(buffer, bufferLast, first, last); + ++ delete buffer; ++ + } else if (m_flags & flag_escape_html) { +- char buffer[last - first]; ++ char* buffer = new char[last - first]; + char* bufferLast = copy_string(buffer, buffer + (last - first), target); + + first = rak::copy_escape_html(buffer, bufferLast, first, last); + ++ delete buffer; ++ + } else { + first = copy_string(first, last, target); + } +--- rtorrent-0.8.2.orig/src/display/window.h 2008-05-07 08:19:11.000000000 -0400 ++++ rtorrent-0.8.2/src/display/window.h 2008-06-26 00:42:49.975992333 -0400 +@@ -41,6 +41,7 @@ + #include + + #include "canvas.h" ++#include "manager.h" + #include "globals.h" + + namespace display { +--- rtorrent-0.8.2.orig/src/display/window_statusbar.cc 2008-05-07 08:19:11.000000000 -0400 ++++ rtorrent-0.8.2/src/display/window_statusbar.cc 2008-06-25 03:15:15.445557476 -0400 +@@ -53,7 +53,7 @@ + m_canvas->erase(); + + // TODO: Make a buffer with size = get_width? +- char buffer[m_canvas->width() + 1]; ++ char* buffer = new char[m_canvas->width() + 1]; + char* position; + char* last = buffer + m_canvas->width(); + +@@ -68,6 +68,8 @@ + } + + m_lastTick = control->tick(); ++ ++ delete buffer; + } + + } +--- rtorrent-0.8.2.orig/src/display/window_file_list.cc 2008-05-07 08:19:11.000000000 -0400 ++++ rtorrent-0.8.2/src/display/window_file_list.cc 2008-06-25 03:08:33.655012018 -0400 +@@ -84,7 +84,7 @@ + if (fl->size_files() == 0 || m_canvas->height() < 2) + return; + +- iterator entries[m_canvas->height() - 1]; ++ iterator* entries = new iterator[m_canvas->height() - 1]; + + unsigned int last = 0; + +@@ -179,6 +181,8 @@ + pos++; + first = (first + 1) % (m_canvas->height() - 1); + } ++ ++ delete entries; + } + + int +--- rtorrent-0.8.2.orig/src/display/window_log.cc 2008-05-07 08:19:11.000000000 -0400 ++++ rtorrent-0.8.2/src/display/window_log.cc 2008-06-25 03:13:37.195603865 -0400 +@@ -37,6 +37,7 @@ + #include "config.h" + + #include ++#include + + #include "canvas.h" + #include "utils.h" +--- rtorrent-0.8.2.orig/src/display/frame.cc 2008-05-07 08:19:11.000000000 -0400 ++++ rtorrent-0.8.2/src/display/frame.cc 2008-06-25 02:51:41.636803977 -0400 +@@ -41,6 +41,8 @@ + #include + #include + ++#include "manager.h" ++ + #include "frame.h" + #include "window.h" + +@@ -63,8 +65,8 @@ + + case TYPE_ROW: + case TYPE_COLUMN: +- for (size_type i = 0; i < m_containerSize; ++i) +- if (m_container[i]->is_width_dynamic()) ++ for (size_type i = 0; i < m_container.size; ++i) ++ if (m_container.frames[i]->is_width_dynamic()) + return true; + + return false; +@@ -81,8 +83,8 @@ + + case TYPE_ROW: + case TYPE_COLUMN: +- for (size_type i = 0; i < m_containerSize; ++i) +- if (m_container[i]->is_height_dynamic()) ++ for (size_type i = 0; i < m_container.size; ++i) ++ if (m_container.frames[i]->is_height_dynamic()) + return true; + + return false; +@@ -99,8 +101,8 @@ + case TYPE_WINDOW: return m_window->is_active() && m_window->is_left(); + + case TYPE_COLUMN: +- for (size_type i = 0; i < m_containerSize; ++i) +- if (m_container[i]->has_left_frame()) ++ for (size_type i = 0; i < m_container.size; ++i) ++ if (m_container.frames[i]->has_left_frame()) + return true; + + return false; +@@ -117,8 +119,8 @@ + case TYPE_WINDOW: return m_window->is_active() && m_window->is_bottom(); + + case TYPE_ROW: +- for (size_type i = 0; i < m_containerSize; ++i) +- if (m_container[i]->has_bottom_frame()) ++ for (size_type i = 0; i < m_container.size; ++i) ++ if (m_container.frames[i]->has_bottom_frame()) + return true; + + return false; +@@ -145,8 +147,8 @@ + { + bounds_type accum(0, 0, 0, 0); + +- for (size_type i = 0; i < m_containerSize; ++i) { +- bounds_type p = m_container[i]->preferred_size(); ++ for (size_type i = 0; i < m_container.size; ++i) { ++ bounds_type p = m_container.frames[i]->preferred_size(); + + accum.minWidth += p.minWidth; + accum.minHeight += p.minHeight; +@@ -174,13 +176,13 @@ + if ((m_type != TYPE_ROW && m_type != TYPE_COLUMN) || size >= max_size) + throw torrent::internal_error("Frame::set_container_size(...) Bad state."); + +- while (m_containerSize > size) { +- delete m_container[--m_containerSize]; +- m_container[m_containerSize] = NULL; ++ while (m_container.size > size) { ++ delete m_container.frames[--m_container.size]; ++ m_container.frames[m_container.size] = NULL; + } + +- while (m_containerSize < size) { +- m_container[m_containerSize++] = new Frame(); ++ while (m_container.size < size) { ++ m_container.frames[m_container.size++] = new Frame(); + } + } + +@@ -202,10 +204,10 @@ + throw torrent::internal_error("Frame::initialize_container(...) size >= max_size."); + + m_type = TYPE_ROW; +- m_containerSize = size; ++ m_container.size = size; + +- for (size_type i = 0; i < m_containerSize; ++i) +- m_container[i] = new Frame(); ++ for (size_type i = 0; i < m_container.size; ++i) ++ m_container.frames[i] = new Frame(); + } + + void +@@ -217,10 +219,10 @@ + throw torrent::internal_error("Frame::initialize_container(...) size >= max_size."); + + m_type = TYPE_COLUMN; +- m_containerSize = size; ++ m_container.size = size; + +- for (size_type i = 0; i < m_containerSize; ++i) +- m_container[i] = new Frame(); ++ for (size_type i = 0; i < m_container.size; ++i) ++ m_container.frames[i] = new Frame(); + } + + void +@@ -234,9 +236,9 @@ + + case TYPE_ROW: + case TYPE_COLUMN: +- for (size_type i = 0; i < m_containerSize; ++i) { +- m_container[i]->clear(); +- delete m_container[i]; ++ for (size_type i = 0; i < m_container.size; ++i) { ++ m_container.frames[i]->clear(); ++ delete m_container.frames[i]; + } + break; + +@@ -261,7 +263,7 @@ + + case TYPE_ROW: + case TYPE_COLUMN: +- for (Frame **itr = m_container, **last = m_container + m_containerSize; itr != last; ++itr) ++ for (Frame **itr = m_container.frames, **last = m_container.frames + m_container.size; itr != last; ++itr) + (*itr)->refresh(); + + break; +@@ -282,7 +284,7 @@ + + case TYPE_ROW: + case TYPE_COLUMN: +- for (Frame **itr = m_container, **last = m_container + m_containerSize; itr != last; ++itr) ++ for (Frame **itr = m_container.frames, **last = m_container.frames + m_container.size; itr != last; ++itr) + (*itr)->redraw(); + + break; +@@ -343,7 +345,7 @@ + + int remaining = height; + +- for (Frame **itr = m_container, **last = m_container + m_containerSize; itr != last; ++itr) { ++ for (Frame **itr = m_container.frames, **last = m_container.frames + m_container.size; itr != last; ++itr) { + bounds_type bounds = (*itr)->preferred_size(); + + if ((*itr)->is_height_dynamic()) { +@@ -391,7 +393,7 @@ + // the frame is too small, it will set the remaining windows to zero + // extent which will flag them as offscreen. + +- for (Frame **itr = m_container, **last = m_container + m_containerSize; itr != last; ++itr) { ++ for (Frame **itr = m_container.frames, **last = m_container.frames + m_container.size; itr != last; ++itr) { + // If there is any remaining space, check if we want to shift + // the subsequent frames to the other side of this frame. + if (remaining > 0 && (*itr)->has_bottom_frame()) { +@@ -417,7 +419,7 @@ + + int remaining = width; + +- for (Frame **itr = m_container, **last = m_container + m_containerSize; itr != last; ++itr) { ++ for (Frame **itr = m_container.frames, **last = m_container.frames + m_container.size; itr != last; ++itr) { + bounds_type bounds = (*itr)->preferred_size(); + + if ((*itr)->is_width_dynamic()) { +@@ -465,7 +469,7 @@ + // the frame is too small, it will set the remaining windows to zero + // extent which will flag them as offscreen. + +- for (Frame **itr = m_container, **last = m_container + m_containerSize; itr != last; ++itr) { ++ for (Frame **itr = m_container.frames, **last = m_container.frames + m_container.size; itr != last; ++itr) { + // If there is any remaining space, check if we want to shift + // the subsequent frames to the other side of this frame. + if (remaining > 0 && (*itr)->has_left_frame()) { +--- rtorrent-0.8.2.orig/src/display/window_download_statusbar.cc 2008-05-07 08:19:11.000000000 -0400 ++++ rtorrent-0.8.2/src/display/window_download_statusbar.cc 2008-06-25 03:05:11.110750771 -0400 +@@ -61,7 +61,7 @@ + + m_canvas->erase(); + +- char buffer[m_canvas->width()]; ++ char* buffer = new char[m_canvas->width()]; + char* position; + char* last = buffer + m_canvas->width() - 2; + +@@ -88,6 +88,8 @@ + m_download->tracker_list()->has_active() ? 'C' : ' ', + (int)(m_download->download()->tracker_list()->time_next_connection()), + buffer); ++ ++ delete buffer; + } + + } + +--- rtorrent-0.8.2.orig/src/core/view.cc 2008-05-07 08:19:11.000000000 -0400 ++++ rtorrent-0.8.2/src/core/view.cc 2008-06-25 02:28:36.651635274 -0400 +@@ -38,6 +38,7 @@ + + #include + #include ++#include + #include + #include + #include +--- rtorrent-0.8.2.orig/src/core/manager.cc 2008-06-25 01:44:38.134154000 -0400 ++++ rtorrent-0.8.2/src/core/manager.cc 2008-06-25 02:08:43.144712661 -0400 +@@ -352,19 +352,25 @@ + int port; + rak::address_info* ai; + +- char buf[addr.length() + 1]; ++ char* buf = new char[addr.length() + 1]; + + int err = std::sscanf(addr.c_str(), "%[^:]:%i", buf, &port); + +- if (err <= 0) ++ if (err <= 0) { ++ delete buf; + throw torrent::input_error("Could not parse proxy address."); ++ } + + if (err == 1) + port = 80; + +- if ((err = rak::address_info::get_address_info(buf, PF_INET, SOCK_STREAM, &ai)) != 0) ++ if ((err = rak::address_info::get_address_info(buf, PF_INET, SOCK_STREAM, &ai)) != 0) { ++ delete buf; + throw torrent::input_error("Could not set proxy address: " + std::string(rak::address_info::strerror(err)) + "."); +- ++ } ++ ++ delete buf; ++ + try { + + ai->address()->set_port(port); +--- rtorrent-0.8.2.orig/src/rpc/parse.cc 2008-05-07 08:19:10.000000000 -0400 ++++ rtorrent-0.8.2/src/rpc/parse.cc 2008-06-25 17:30:55.775246860 -0400 +@@ -37,6 +37,7 @@ + #include "config.h" + + #include ++#include + #include + #include + +--- rtorrent-0.8.2.orig/src/rpc/xmlrpc.cc 2008-05-07 08:19:10.000000000 -0400 ++++ rtorrent-0.8.2/src/rpc/xmlrpc.cc 2008-06-25 17:54:04.404987582 -0400 +@@ -477,7 +477,8 @@ + xmlrpc_env_init(&localEnv); + + xmlrpc_registry_add_method_w_doc(&localEnv, (xmlrpc_registry*)m_registry, NULL, name, +- &xmlrpc_call_command, const_cast(name), parm, doc); ++ (const xmlrpc_method)(&xmlrpc_call_command), ++ const_cast(name), parm, doc); + + if (localEnv.fault_occurred) + throw torrent::internal_error("Fault occured while inserting xmlrpc call."); +--- rtorrent-0.8.2.orig/src/rpc/scgi.cc 2008-06-25 01:44:38.128033000 -0400 ++++ rtorrent-0.8.2/src/rpc/scgi.cc 2008-06-25 17:32:13.998638901 -0400 +@@ -85,7 +85,7 @@ + if (filename.empty() || filename.size() > 4096) + throw torrent::resource_error("Invalid filename length."); + +- char buffer[sizeof(sockaddr_un) + filename.size()]; ++ char* buffer = new char[sizeof(sockaddr_un) + filename.size()]; + sockaddr_un* sa = reinterpret_cast(buffer); + + sa->sun_family = AF_UNIX; +@@ -96,6 +96,7 @@ + + open(sa, offsetof(struct sockaddr_un, sun_path) + filename.size() + 1); + m_path = filename; ++ delete buffer; + } + + void +--- rtorrent-0.8.2.orig/src/rpc/scgi_task.cc 2008-05-07 08:19:10.000000000 -0400 ++++ rtorrent-0.8.2/src/rpc/scgi_task.cc 2008-06-25 17:41:41.493886588 -0400 +@@ -134,7 +134,7 @@ + if (current == m_buffer || *current != ':' || headerSize < 17 || headerSize > max_header_size) + goto event_read_failed; + +- if (std::distance(++current, m_position) < headerSize + 1) ++ if (m_position - (++current) < headerSize + 1) + return; + + if (std::memcmp(current, "CONTENT_LENGTH", 15) != 0) +@@ -147,7 +147,7 @@ + goto event_read_failed; + + m_body = current + headerSize + 1; +- headerSize = std::distance(m_buffer, m_body); ++ headerSize = m_body - m_buffer; + + if ((unsigned int)(contentSize + headerSize) < m_bufferSize) { + m_bufferSize = contentSize + headerSize; Added: csw/mgar/pkg/rtorrent/trunk/files/rtorrent-05-sunpro-crash.diff =================================================================== --- csw/mgar/pkg/rtorrent/trunk/files/rtorrent-05-sunpro-crash.diff (rev 0) +++ csw/mgar/pkg/rtorrent/trunk/files/rtorrent-05-sunpro-crash.diff 2010-05-26 16:01:01 UTC (rev 9996) @@ -0,0 +1,52 @@ +--- rtorrent-0.8.2.orig/src/ui/download_list.cc 2008-05-07 08:19:11.000000000 -0400 ++++ rtorrent-0.8.2/src/ui/download_list.cc 2008-06-27 21:16:40.822674954 -0400 +@@ -234,7 +234,7 @@ + + input::PathInput* input = new input::PathInput; + +- const char* title; ++ std::string title; + + switch (type) { + case INPUT_LOAD_DEFAULT: +--- rtorrent-0.8.2.orig/src/display/window_input.cc 2008-05-07 08:19:11.000000000 -0400 ++++ rtorrent-0.8.2/src/display/window_input.cc 2008-06-27 21:12:27.929764942 -0400 +@@ -43,6 +43,11 @@ + + namespace display { + ++WindowInput::WindowInput() : ++ Window(new Canvas, 0, 0, 1, extent_full, 1), ++ m_input(NULL), ++ m_focus(false) {} ++ + void + WindowInput::redraw() { + m_canvas->erase(); +--- rtorrent-0.8.2.orig/src/display/window_input.h 2008-05-07 08:19:11.000000000 -0400 ++++ rtorrent-0.8.2/src/display/window_input.h 2008-06-27 20:40:35.526518241 -0400 +@@ -49,10 +49,7 @@ + + class WindowInput : public Window { + public: +- WindowInput() : +- Window(new Canvas, 0, 0, 1, extent_full, 1), +- m_input(NULL), +- m_focus(false) {} ++ WindowInput(); + + input::TextInput* input() { return m_input; } + void set_input(input::TextInput* input) { m_input = input; } +--- rtorrent-0.8.2.orig/src/core/manager.cc 2008-06-26 00:37:03.743465000 -0400 ++++ rtorrent-0.8.2/src/core/manager.cc 2008-06-26 22:13:52.331952728 -0400 +@@ -219,7 +219,9 @@ + m_downloadList->slot_map_insert()["1_connect_logs"] = "d.initialize_logs="; + m_downloadList->slot_map_erase()["9_delete_tied"] = "d.delete_tied="; + +- torrent::connection_manager()->set_signal_handshake_log(sigc::mem_fun(this, &Manager::handshake_log)); ++ torrent::ConnectionManager::signal_handshake_type& s = torrent::connection_manager()->signal_handshake_log(); ++ s.connect(sigc::mem_fun(this, &Manager::handshake_log)); ++ //torrent::connection_manager()->set_signal_handshake_log(sigc::mem_fun(this, &Manager::handshake_log)); + } + + void Added: csw/mgar/pkg/rtorrent/trunk/files/scratch.patch =================================================================== --- csw/mgar/pkg/rtorrent/trunk/files/scratch.patch (rev 0) +++ csw/mgar/pkg/rtorrent/trunk/files/scratch.patch 2010-05-26 16:01:01 UTC (rev 9996) @@ -0,0 +1,64 @@ +--- rtorrent-0.8.2.orig/src/core/scheduler.cc 2008-05-07 08:19:11.000000000 -0400 ++++ rtorrent-0.8.2/src/core/scheduler.cc 2008-06-25 02:19:20.043037414 -0400 +@@ -37,6 +37,7 @@ + #include "config.h" + + #include ++#include + #include + #include + +--- rtorrent-0.8.2.orig/src/rpc/scgi_task.cc 2008-05-07 08:19:10.000000000 -0400 ++++ rtorrent-0.8.2/src/rpc/scgi_task.cc 2008-06-25 17:41:41.493886588 -0400 +@@ -134,7 +134,7 @@ + if (current == m_buffer || *current != ':' || headerSize < 17 || headerSize > max_header_size) + goto event_read_failed; + +- if (std::distance(++current, m_position) < headerSize + 1) ++ if (m_position - (++current) < headerSize + 1) + return; + + if (std::memcmp(current, "CONTENT_LENGTH", 15) != 0) +@@ -147,7 +147,7 @@ + goto event_read_failed; + + m_body = current + headerSize + 1; +- headerSize = std::distance(m_buffer, m_body); ++ headerSize = m_body - m_buffer; + + if ((unsigned int)(contentSize + headerSize) < m_bufferSize) { + m_bufferSize = contentSize + headerSize; +@@ -155,26 +155,26 @@ + } else if ((unsigned int)contentSize <= default_buffer_size) { + m_bufferSize = contentSize; + +- std::memmove(m_buffer, m_body, std::distance(m_body, m_position)); +- m_position = m_buffer + std::distance(m_body, m_position); ++ std::memmove(m_buffer, m_body, m_position - m_body); ++ m_position = m_buffer + (m_position - m_body); + m_body = m_buffer; + + } else { +- realloc_buffer((m_bufferSize = contentSize) + 1, m_body, std::distance(m_body, m_position)); ++ realloc_buffer((m_bufferSize = contentSize) + 1, m_body, m_position - m_body); + +- m_position = m_buffer + std::distance(m_body, m_position); ++ m_position = m_buffer + (m_position - m_body); + m_body = m_buffer; + } + } + +- if ((unsigned int)std::distance(m_buffer, m_position) != m_bufferSize) ++ if ((unsigned int)(m_position - m_buffer) != m_bufferSize) + return; + + control->poll()->remove_read(this); + control->poll()->insert_write(this); + + // Close if the call failed, else stay open to write back data. +- if (!m_parent->receive_call(this, m_body, m_bufferSize - std::distance(m_buffer, m_body))) ++ if (!m_parent->receive_call(this, m_body, m_bufferSize - (m_body - m_buffer))) + close(); + + return; + Added: csw/mgar/pkg/rtorrent/trunk/files/work-around-UNUSED.patch =================================================================== --- csw/mgar/pkg/rtorrent/trunk/files/work-around-UNUSED.patch (rev 0) +++ csw/mgar/pkg/rtorrent/trunk/files/work-around-UNUSED.patch 2010-05-26 16:01:01 UTC (rev 9996) @@ -0,0 +1,25 @@ +From 5a6aaf6dd0b924c323d591986117823457bdb387 Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter +Date: Thu, 20 May 2010 10:59:04 +0200 +Subject: [PATCH] work around __UNUSED + +--- + rak/string_manip.h | 2 ++ + 3 files changed, 6 insertions(+), 0 deletions(-) + +diff --git a/rak/string_manip.h b/rak/string_manip.h +index b3f3037..a4f1a6c 100644 +--- a/rak/string_manip.h ++++ b/rak/string_manip.h +@@ -43,6 +43,8 @@ + #include + #include + ++#define __UNUSED ++ + namespace rak { + + // Use these trim functions until n1872 is widely supported. +-- +1.7.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Wed May 26 19:06:28 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Wed, 26 May 2010 17:06:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[9997] csw/mgar/pkg/TEMPLATES/createpkg Message-ID: Revision: 9997 http://gar.svn.sourceforge.net/gar/?rev=9997&view=rev Author: theferret Date: 2010-05-26 17:06:27 +0000 (Wed, 26 May 2010) Log Message: ----------- TEMPLATES/createpkg: improvements.... Modified Paths: -------------- csw/mgar/pkg/TEMPLATES/createpkg/Makefile csw/mgar/pkg/TEMPLATES/createpkg/copy_template Modified: csw/mgar/pkg/TEMPLATES/createpkg/Makefile =================================================================== --- csw/mgar/pkg/TEMPLATES/createpkg/Makefile 2010-05-26 16:01:01 UTC (rev 9996) +++ csw/mgar/pkg/TEMPLATES/createpkg/Makefile 2010-05-26 17:06:27 UTC (rev 9997) @@ -6,21 +6,30 @@ # in your top level src directory. It is also suitable for # "relocateable" packages. see the createpkg docs for more details. #CREATEPKG=createpkg -b `pwd` -#CREATEPKG=createpkg -r . -CREATEPKG=createpkg -r `pwd`/cswstage + +BUILDDIR=build/* + +CREATEPKG=createpkg -r `pwd`/build/*/cswstage + + +STDFILES=pkginfo copyright prototype +FILES= + package: $(STDFILE) $(FILES) $(CREATEPKG) - touch package + build: - ./configure --prefix=/opt/csw - $(MAKE) - cswstage + (cd $(BUILDDIR) ; \ + test -f ../../patchfile.preconf && \ + gpatch -p0 <../../patchfile.preconf ; \ + ./configure --prefix=/opt/csw ; \ + test -f ../../patchfile.postconf && \ + gpatch -p0 <../../patchfile.postconf ; \ + $(MAKE) ; \ + cswstage ) clean: rm -f *.pkg.gz package -STDFILES=pkginfo copyright prototype - -FILES=YourFilesHere Modified: csw/mgar/pkg/TEMPLATES/createpkg/copy_template =================================================================== --- csw/mgar/pkg/TEMPLATES/createpkg/copy_template 2010-05-26 16:01:01 UTC (rev 9996) +++ csw/mgar/pkg/TEMPLATES/createpkg/copy_template 2010-05-26 17:06:27 UTC (rev 9997) @@ -28,8 +28,8 @@ -$SVN info >/dev/null -if [[ $? -ne 0 ]] ; then +MY_SVN_DIR=`svn info| awk '$1=="URL:"{print $2}'` +if [[ "$MY_SVN_DIR" == "" ]] ; then print ERROR: expected to be within subversion tree somewhere print cannot continue exit 1 @@ -42,12 +42,14 @@ download work cswstage +build EOF cp $template_dir/Makefile* $DESTDIR cp $template_dir/prototype* $DESTDIR $template_dir/generate_pkginfo >$DESTDIR/pkginfo +print "OPENCSW_REPOSITORY=$MY_SVN_DIR/$DESTDIR" >>$DESTDIR/pkginfo print "" print Created directory $1 locally, and in subversion This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Wed May 26 19:13:24 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Wed, 26 May 2010 17:13:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[9998] csw/mgar/pkg Message-ID: Revision: 9998 http://gar.svn.sourceforge.net/gar/?rev=9998&view=rev Author: theferret Date: 2010-05-26 17:13:24 +0000 (Wed, 26 May 2010) Log Message: ----------- xpm hand-hack package Added Paths: ----------- csw/mgar/pkg/xpm/ csw/mgar/pkg/xpm/trunk/ csw/mgar/pkg/xpm/trunk/Makefile csw/mgar/pkg/xpm/trunk/patchfile.postconf csw/mgar/pkg/xpm/trunk/pkginfo Property changes on: csw/mgar/pkg/xpm/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work cswstage build Added: csw/mgar/pkg/xpm/trunk/Makefile =================================================================== --- csw/mgar/pkg/xpm/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xpm/trunk/Makefile 2010-05-26 17:13:24 UTC (rev 9998) @@ -0,0 +1,35 @@ +#This Makefile originally generated from a template under +# pkg/TEMPLATES/createpkg + +#Uncomment one of these definitions. The -b invokation, +# is suitable for use with small packages, where you want to have a few files +# in your top level src directory. It is also suitable for +# "relocateable" packages. see the createpkg docs for more details. +#CREATEPKG=createpkg -b `pwd` + + +BUILDDIR=build/* + +CREATEPKG=createpkg -r `pwd`/build/*/cswstage + + +STDFILES=pkginfo copyright prototype +FILES= + +package: $(STDFILE) $(FILES) + $(CREATEPKG) + + +build: + (cd $(BUILDDIR) ; \ + test -f ../../patchfile.preconf && \ + gpatch -p0 <../../patchfile.preconf ; \ + ./configure --prefix=/opt/csw ; \ + test -f ../../patchfile.postconf && \ + gpatch -p0 <../../patchfile.postconf ; \ + $(MAKE) ; \ + cswstage ) + +clean: + rm -f *.pkg.gz package + Added: csw/mgar/pkg/xpm/trunk/patchfile.postconf =================================================================== --- csw/mgar/pkg/xpm/trunk/patchfile.postconf (rev 0) +++ csw/mgar/pkg/xpm/trunk/patchfile.postconf 2010-05-26 17:13:24 UTC (rev 9998) @@ -0,0 +1,11 @@ +--- config.h.orig Wed May 26 10:09:02 2010 ++++ config.h Wed May 26 10:08:51 2010 +@@ -71,7 +71,7 @@ + #define STDC_HEADERS 1 + + /* Define to 1 if you want to use the gettext() function. */ +-#define USE_GETTEXT 1 ++/*#define USE_GETTEXT 1*/ + + /* Version number of package */ + #define VERSION "3.5.8" Added: csw/mgar/pkg/xpm/trunk/pkginfo =================================================================== --- csw/mgar/pkg/xpm/trunk/pkginfo (rev 0) +++ csw/mgar/pkg/xpm/trunk/pkginfo 2010-05-26 17:13:24 UTC (rev 9998) @@ -0,0 +1,9 @@ +PKG=CSWxpm +ARCH=sparc +NAME=xpm - X11 pixmap library +VERSION=3.5.8,REV=2010.05.24 +CATEGORY=application +VENDOR=http://mirrors.usc.edu/ packaged for CSW by Philip Brown +HOTLINE=http://www.opencsw.org/bugtrack/ +EMAIL=phil at opencsw.org +OPENCSW_REPOSITORY=https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/xpm/trunk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Wed May 26 19:15:35 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Wed, 26 May 2010 17:15:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[9999] csw/mgar/pkg/xpm/trunk/README Message-ID: Revision: 9999 http://gar.svn.sourceforge.net/gar/?rev=9999&view=rev Author: theferret Date: 2010-05-26 17:15:35 +0000 (Wed, 26 May 2010) Log Message: ----------- xpm: added README file Added Paths: ----------- csw/mgar/pkg/xpm/trunk/README Added: csw/mgar/pkg/xpm/trunk/README =================================================================== --- csw/mgar/pkg/xpm/trunk/README (rev 0) +++ csw/mgar/pkg/xpm/trunk/README 2010-05-26 17:15:35 UTC (rev 9999) @@ -0,0 +1,13 @@ +This is the first time Phil is doing an actual "needs compiling" +package in svn. + +Current build methodology theory is as follows: + +mkdir build +(extract source tarfile under there) +(come back to this location) +make + +and it should just All Magically Work. + +But this is only theory. i have to test it now :) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Wed May 26 19:26:48 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Wed, 26 May 2010 17:26:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[10000] csw/mgar/pkg/ccache/trunk/Makefile Message-ID: Revision: 10000 http://gar.svn.sourceforge.net/gar/?rev=10000&view=rev Author: rthurner Date: 2010-05-26 17:26:48 +0000 (Wed, 26 May 2010) Log Message: ----------- ccache - define extensions Modified Paths: -------------- csw/mgar/pkg/ccache/trunk/Makefile Modified: csw/mgar/pkg/ccache/trunk/Makefile =================================================================== --- csw/mgar/pkg/ccache/trunk/Makefile 2010-05-26 17:15:35 UTC (rev 9999) +++ csw/mgar/pkg/ccache/trunk/Makefile 2010-05-26 17:26:48 UTC (rev 10000) @@ -20,5 +20,6 @@ # UPSTREAM_MASTER_SITES = CONFIGURE_ARGS = $(DIRPATHS) +EXTRA_CFLAGS = -D__EXTENSIONS__ include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Wed May 26 20:46:13 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Wed, 26 May 2010 18:46:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[10001] csw/mgar/pkg/xpm/trunk Message-ID: Revision: 10001 http://gar.svn.sourceforge.net/gar/?rev=10001&view=rev Author: theferret Date: 2010-05-26 18:46:13 +0000 (Wed, 26 May 2010) Log Message: ----------- xpm: standard pkg stuffs. Plus Makefile tweaks Modified Paths: -------------- csw/mgar/pkg/xpm/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/xpm/trunk/copyright csw/mgar/pkg/xpm/trunk/depend csw/mgar/pkg/xpm/trunk/prototype Modified: csw/mgar/pkg/xpm/trunk/Makefile =================================================================== --- csw/mgar/pkg/xpm/trunk/Makefile 2010-05-26 17:26:48 UTC (rev 10000) +++ csw/mgar/pkg/xpm/trunk/Makefile 2010-05-26 18:46:13 UTC (rev 10001) @@ -1,35 +1,57 @@ #This Makefile originally generated from a template under # pkg/TEMPLATES/createpkg +# You will most likely have to use GNU make to use it. + #Uncomment one of these definitions. The -b invokation, # is suitable for use with small packages, where you want to have a few files # in your top level src directory. It is also suitable for # "relocateable" packages. see the createpkg docs for more details. #CREATEPKG=createpkg -b `pwd` +CREATEPKG=createpkg -r `pwd`/build/*/cswstage BUILDDIR=build/* -CREATEPKG=createpkg -r `pwd`/build/*/cswstage STDFILES=pkginfo copyright prototype FILES= -package: $(STDFILE) $(FILES) - $(CREATEPKG) +all: build -build: +build: build/.config.done (cd $(BUILDDIR) ; \ + $(MAKE) ; \ + stagepkg ) + + +# dummy target for configure +build/.config.done: + (cd $(BUILDDIR) ; \ test -f ../../patchfile.preconf && \ gpatch -p0 <../../patchfile.preconf ; \ - ./configure --prefix=/opt/csw ; \ + ./configure --prefix=/opt/csw --enable-static=no ; \ test -f ../../patchfile.postconf && \ - gpatch -p0 <../../patchfile.postconf ; \ - $(MAKE) ; \ - cswstage ) + gpatch -p0 <../../patchfile.postconf ) + touch build/.config.done -clean: + +# I tried depending this on $(BUILDDIR)/config.log but that didnt stick +configure: build/.config.done + +package: $(STDFILE) $(FILES) build + $(CREATEPKG) + + + +pkgclean: rm -f *.pkg.gz package +clean: pkgclean + cd $(BUILDDIR) && make clean + +reallyclean: clean + rm -f $BUILDDIR/config.log $BUILDDIR/config.cache $BUILDDIR/config.status + rm -f build/.config.done Added: csw/mgar/pkg/xpm/trunk/copyright =================================================================== --- csw/mgar/pkg/xpm/trunk/copyright (rev 0) +++ csw/mgar/pkg/xpm/trunk/copyright 2010-05-26 18:46:13 UTC (rev 10001) @@ -0,0 +1,31 @@ +/* + * Copyright (C) 1989-95 GROUPE BULL + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * GROUPE BULL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the name of GROUPE BULL shall not be + * used in advertising or otherwise to promote the sale, use or other dealings + * in this Software without prior written authorization from GROUPE BULL. + */ + +Arnaud LE HORS BULL Research FRANCE -- Koala Project + (XPM - X PixMap format version 2 & 3) + Internet: lehors at sophia.inria.fr +Surface Mail: Arnaud LE HORS, INRIA - Sophia Antipolis, + 2004, route des Lucioles, 06565 Valbonne Cedex -- FRANCE + Voice phone: (33) 93.65.77.71, Fax: (33) 93 65 77 66, Telex: 97 00 50 F Added: csw/mgar/pkg/xpm/trunk/depend =================================================================== --- csw/mgar/pkg/xpm/trunk/depend (rev 0) +++ csw/mgar/pkg/xpm/trunk/depend 2010-05-26 18:46:13 UTC (rev 10001) @@ -0,0 +1 @@ +P CSWcommon Added: csw/mgar/pkg/xpm/trunk/prototype =================================================================== --- csw/mgar/pkg/xpm/trunk/prototype (rev 0) +++ csw/mgar/pkg/xpm/trunk/prototype 2010-05-26 18:46:13 UTC (rev 10001) @@ -0,0 +1,20 @@ +i pkginfo +i copyright +i depend +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/cxpm.1 0644 root bin +f none /opt/csw/share/man/man1/sxpm.1 0644 root bin +d none /opt/csw/bin 0755 root bin +f none /opt/csw/bin/sxpm 0755 root bin +f none /opt/csw/bin/cxpm 0755 root bin +d none /opt/csw/include 0755 root bin +d none /opt/csw/include/X11 0755 root bin +f none /opt/csw/include/X11/xpm.h 0644 root bin +d none /opt/csw/lib 0755 root bin +f none /opt/csw/lib/libXpm.so.4.11.0 0755 root bin +s none /opt/csw/lib/libXpm.so.4=libXpm.so.4.11.0 +s none /opt/csw/lib/libXpm.so=libXpm.so.4.11.0 +d none /opt/csw/lib/pkgconfig 0755 root bin +f none /opt/csw/lib/pkgconfig/xpm.pc 0644 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Wed May 26 21:21:41 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Wed, 26 May 2010 19:21:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[10002] csw/mgar/pkg/TEMPLATES/createpkg Message-ID: Revision: 10002 http://gar.svn.sourceforge.net/gar/?rev=10002&view=rev Author: theferret Date: 2010-05-26 19:21:41 +0000 (Wed, 26 May 2010) Log Message: ----------- TEMPLATES/createpkg: added a nice README, and updated copy prog for it. Modified Paths: -------------- csw/mgar/pkg/TEMPLATES/createpkg/copy_template csw/mgar/pkg/TEMPLATES/createpkg/prototype Added Paths: ----------- csw/mgar/pkg/TEMPLATES/createpkg/README Added: csw/mgar/pkg/TEMPLATES/createpkg/README =================================================================== --- csw/mgar/pkg/TEMPLATES/createpkg/README (rev 0) +++ csw/mgar/pkg/TEMPLATES/createpkg/README 2010-05-26 19:21:41 UTC (rev 10002) @@ -0,0 +1,47 @@ +This is a README for the "createpkg" style templates in the +OpenCSW subversion tree. It gets copied to a brand new directory, when it +is created with "make createpkg-softwarenamehere" + +Instructions: + +the first thing you should do, is + + svn status + +with this, you will notice that no files in the directory are actually checked +into subversion yet. You should edit (or remove) the files as you deem +apropriate, and then + + svn add filename(s) + +the ones you want to keep in the repository. + +If you are doing a general-case binary build package, then you will next need +to do the following: + +1. Set up your environment variables as appropriate, and/or + set the appropriate variables in Makefile + +2. mkdir build + +3. extract the source tree of whatever you are building, in the build dir. + +4. make + +You also have a choice of some optional subtargets, such as + make {configure,build,package,clean,reallyclean} + +If you wish a patch set to be applied to the source before configure, create +a file called "patchfile.preconf" and put them there. + +If you wish a patch set to be applied to the source AFTER configure, but +before compiling (for example, to hand-hack config.h) create a file called +"patchfile.postconf" + + +DONT FORGET to update all fields in the pkginfo file, and also to create +appropriate copyright, depend and prototype files. +If you dont know what to put into +the prototype file, an initial build will most likely bomb out, after creating +one for you in build/*/cswstage/prototype. + Modified: csw/mgar/pkg/TEMPLATES/createpkg/copy_template =================================================================== --- csw/mgar/pkg/TEMPLATES/createpkg/copy_template 2010-05-26 18:46:13 UTC (rev 10001) +++ csw/mgar/pkg/TEMPLATES/createpkg/copy_template 2010-05-26 19:21:41 UTC (rev 10002) @@ -47,6 +47,7 @@ cp $template_dir/Makefile* $DESTDIR +cp $template_dir/README* $DESTDIR cp $template_dir/prototype* $DESTDIR $template_dir/generate_pkginfo >$DESTDIR/pkginfo print "OPENCSW_REPOSITORY=$MY_SVN_DIR/$DESTDIR" >>$DESTDIR/pkginfo Modified: csw/mgar/pkg/TEMPLATES/createpkg/prototype =================================================================== --- csw/mgar/pkg/TEMPLATES/createpkg/prototype 2010-05-26 18:46:13 UTC (rev 10001) +++ csw/mgar/pkg/TEMPLATES/createpkg/prototype 2010-05-26 19:21:41 UTC (rev 10002) @@ -1,3 +1,4 @@ i pkginfo i depend i copyright +f none /some/file/here 0755 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Wed May 26 21:50:18 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Wed, 26 May 2010 19:50:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[10003] csw/mgar/pkg/TEMPLATES/createpkg/Makefile Message-ID: Revision: 10003 http://gar.svn.sourceforge.net/gar/?rev=10003&view=rev Author: theferret Date: 2010-05-26 19:50:18 +0000 (Wed, 26 May 2010) Log Message: ----------- TEMPLATES/createpkg/Makefile update Modified Paths: -------------- csw/mgar/pkg/TEMPLATES/createpkg/Makefile Modified: csw/mgar/pkg/TEMPLATES/createpkg/Makefile =================================================================== --- csw/mgar/pkg/TEMPLATES/createpkg/Makefile 2010-05-26 19:21:41 UTC (rev 10002) +++ csw/mgar/pkg/TEMPLATES/createpkg/Makefile 2010-05-26 19:50:18 UTC (rev 10003) @@ -1,35 +1,57 @@ #This Makefile originally generated from a template under # pkg/TEMPLATES/createpkg +# You will most likely have to use GNU make to use it. + #Uncomment one of these definitions. The -b invokation, # is suitable for use with small packages, where you want to have a few files # in your top level src directory. It is also suitable for # "relocateable" packages. see the createpkg docs for more details. #CREATEPKG=createpkg -b `pwd` +CREATEPKG=createpkg -r `pwd`/build/*/cswstage BUILDDIR=build/* -CREATEPKG=createpkg -r `pwd`/build/*/cswstage STDFILES=pkginfo copyright prototype FILES= -package: $(STDFILE) $(FILES) - $(CREATEPKG) +all: build package -build: +build: build/.config.done (cd $(BUILDDIR) ; \ + $(MAKE) ; \ + stagepkg ) + + +# dummy target for configure +build/.config.done: + (cd $(BUILDDIR) ; \ test -f ../../patchfile.preconf && \ gpatch -p0 <../../patchfile.preconf ; \ - ./configure --prefix=/opt/csw ; \ + ./configure --prefix=/opt/csw --enable-static=no ; \ test -f ../../patchfile.postconf && \ - gpatch -p0 <../../patchfile.postconf ; \ - $(MAKE) ; \ - cswstage ) + gpatch -p0 <../../patchfile.postconf ) + touch build/.config.done -clean: + +# I tried depending this on $(BUILDDIR)/config.log but that didnt stick +configure: build/.config.done + +package: $(STDFILE) $(FILES) build + $(CREATEPKG) + + + +pkgclean: rm -f *.pkg.gz package +clean: pkgclean + cd $(BUILDDIR) && make clean + +reallyclean: clean + rm -f $BUILDDIR/config.log $BUILDDIR/config.cache $BUILDDIR/config.status + rm -f build/.config.done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 26 22:22:40 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 26 May 2010 20:22:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[10004] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 10004 http://gar.svn.sourceforge.net/gar/?rev=10004&view=rev Author: dmichelsen Date: 2010-05-26 20:22:40 +0000 (Wed, 26 May 2010) Log Message: ----------- subversion: Make sure we include bdb48 headers first Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-05-26 19:50:18 UTC (rev 10003) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-05-26 20:22:40 UTC (rev 10004) @@ -148,6 +148,7 @@ SVNLIB = $(prefix)/lib/svn JAVA_HOME = /usr/jdk1.6.0_20 +EXTRA_INC = /opt/csw/bdb48/include EXTRA_INC += $(prefix)/apache2/include EXTRA_LIB = /opt/csw/bdb48/lib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed May 26 22:30:32 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 26 May 2010 20:30:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[10005] csw/mgar/pkg Message-ID: Revision: 10005 http://gar.svn.sourceforge.net/gar/?rev=10005&view=rev Author: skayser Date: 2010-05-26 20:30:32 +0000 (Wed, 26 May 2010) Log Message: ----------- duplicity: initial commit Added Paths: ----------- csw/mgar/pkg/duplicity/ csw/mgar/pkg/duplicity/branches/ csw/mgar/pkg/duplicity/tags/ csw/mgar/pkg/duplicity/trunk/ csw/mgar/pkg/duplicity/trunk/Makefile csw/mgar/pkg/duplicity/trunk/checksums csw/mgar/pkg/duplicity/trunk/files/ Property changes on: csw/mgar/pkg/duplicity/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/duplicity/trunk/Makefile =================================================================== --- csw/mgar/pkg/duplicity/trunk/Makefile (rev 0) +++ csw/mgar/pkg/duplicity/trunk/Makefile 2010-05-26 20:30:32 UTC (rev 10005) @@ -0,0 +1,40 @@ +GARNAME = duplicity +GARVERSION = 0.6.08b +CATEGORIES = python + +DESCRIPTION = Encrypted bandwidth-efficient backup using the rsync algorithm +define BLURB + Duplicity backs directories by producing encrypted tar-format volumes + and uploading them to a remote or local file server. Because duplicity + uses librsync, the incremental archives are space efficient and only + record the parts of files that have changed since the last backup. + Because duplicity uses GnuPG to encrypt and/or sign these archives, they + will be safe from spying and/or modification by the server. +endef + +VENDOR_URL = http://duplicity.nongnu.org/ +MASTER_SITES = http://code.launchpad.net/duplicity/0.6-series/0.6.08b/+download/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# Couldn't find a parsable 'stable' releases page +# UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +RUNTIME_DEP_PKGS = CSWpython +RUNTIME_DEP_PKGS += CSWpy-boto +RUNTIME_DEP_PKGS += CSWlibrsync +RUNTIME_DEP_PKGS += CSWgnupg +RUNTIME_DEP_PKGS += CSWncftp + +TEST_SCRIPTS = +CONFIGURE_ARGS = $(DIRPATHS) + +EXTRA_PAX_ARGS = '-s,/doc/$(GARNAME)-$(GARVERSION),/doc/$(GARNAME),p' + +include gar/category.mk + +# Clean up the docdir a bit ... I wish pax wouldn't exit after the first match. +post-merge: + ( cd $(PKGROOT)$(docdir)/$(CATALOGNAME); \ + rm REPO-README COPYING tarfile-LICENSE; \ + mv CHANGELOG changelog; \ + ) + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/duplicity/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/duplicity/trunk/checksums =================================================================== --- csw/mgar/pkg/duplicity/trunk/checksums (rev 0) +++ csw/mgar/pkg/duplicity/trunk/checksums 2010-05-26 20:30:32 UTC (rev 10005) @@ -0,0 +1 @@ +f4f4182ab71aa1de80c047bf1e4c7a04 duplicity-0.6.08b.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed May 26 22:45:42 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 26 May 2010 20:45:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[10006] csw/mgar/pkg/iperf/trunk/Makefile Message-ID: Revision: 10006 http://gar.svn.sourceforge.net/gar/?rev=10006&view=rev Author: skayser Date: 2010-05-26 20:45:42 +0000 (Wed, 26 May 2010) Log Message: ----------- iperf: cleanup, -norunpath is now automatically set GAR Modified Paths: -------------- csw/mgar/pkg/iperf/trunk/Makefile Modified: csw/mgar/pkg/iperf/trunk/Makefile =================================================================== --- csw/mgar/pkg/iperf/trunk/Makefile 2010-05-26 20:30:32 UTC (rev 10005) +++ csw/mgar/pkg/iperf/trunk/Makefile 2010-05-26 20:45:42 UTC (rev 10006) @@ -1,5 +1,4 @@ # Todo: -# # * Check sf project page for patches and threads related to CPU saturation # * Run some real world performance tests # * Submit feedback upstream: @@ -20,9 +19,14 @@ delay jitter, datagram loss. endef +VENDOR_URL = http://iperf.sourceforge.net/ MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=128336 +UPSTREAM_USE_SF = 1 + # Add some explicit language linkage declarations. # # See C++ Migration Guide, 3.11.1 "Language Linkage" @@ -37,21 +41,10 @@ # function. The linkages must therefore match." PATCHFILES = gar-base.diff -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=128336 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) -# Tell CC not to include additional directories in R*PATH, otherwise we end -# up with something like -# [11] RUNPATH /opt/csw/lib/$ISALIST:/opt/csw/lib:/opt/studio/SOS11/SUNWspro/lib/rw7:/opt/studio/SOS11/SUNWspro/lib:/opt/SUNWspro/lib:/usr/ccs/lib:/lib:/usr/lib -# [12] RPATH /opt/csw/lib/$ISALIST:/opt/csw/lib:/opt/studio/SOS11/SUNWspro/lib/rw7:/opt/studio/SOS11/SUNWspro/lib:/opt/SUNWspro/lib:/usr/ccs/lib:/lib:/usr/lib -EXTRA_CXX_FLAGS = -norunpath - include gar/category.mk # * Get rid of gcc -Walls This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed May 26 22:46:55 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 26 May 2010 20:46:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[10007] csw/mgar/pkg/duplicity/trunk/Makefile Message-ID: Revision: 10007 http://gar.svn.sourceforge.net/gar/?rev=10007&view=rev Author: skayser Date: 2010-05-26 20:46:54 +0000 (Wed, 26 May 2010) Log Message: ----------- duplicity: add checkpkg overrides Modified Paths: -------------- csw/mgar/pkg/duplicity/trunk/Makefile Modified: csw/mgar/pkg/duplicity/trunk/Makefile =================================================================== --- csw/mgar/pkg/duplicity/trunk/Makefile 2010-05-26 20:45:42 UTC (rev 10006) +++ csw/mgar/pkg/duplicity/trunk/Makefile 2010-05-26 20:46:54 UTC (rev 10007) @@ -29,6 +29,12 @@ EXTRA_PAX_ARGS = '-s,/doc/$(GARNAME)-$(GARVERSION),/doc/$(GARNAME),p' +CHECKPKG_OVERRIDES_CSWduplicity += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWduplicity += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWduplicity += surplus-dependency|CSWpy-boto +CHECKPKG_OVERRIDES_CSWduplicity += surplus-dependency|CSWgnupg +CHECKPKG_OVERRIDES_CSWduplicity += surplus-dependency|CSWncftp + include gar/category.mk # Clean up the docdir a bit ... I wish pax wouldn't exit after the first match. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed May 26 23:10:17 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 26 May 2010 21:10:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[10008] csw/mgar/pkg/iperf/trunk/Makefile Message-ID: Revision: 10008 http://gar.svn.sourceforge.net/gar/?rev=10008&view=rev Author: skayser Date: 2010-05-26 21:10:17 +0000 (Wed, 26 May 2010) Log Message: ----------- iperf: fix CFLAGS vs. LDFLAGS usage in src/Makefile.in Modified Paths: -------------- csw/mgar/pkg/iperf/trunk/Makefile Modified: csw/mgar/pkg/iperf/trunk/Makefile =================================================================== --- csw/mgar/pkg/iperf/trunk/Makefile 2010-05-26 20:46:54 UTC (rev 10007) +++ csw/mgar/pkg/iperf/trunk/Makefile 2010-05-26 21:10:17 UTC (rev 10008) @@ -1,10 +1,12 @@ # Todo: +# * Investigate 'redefined' warning messages for int types like INT64_MIN # * Check sf project page for patches and threads related to CPU saturation # * Run some real world performance tests # * Submit feedback upstream: # - Add AC_CHECK_FUNC or AC_SEARCH_LIBS for sched_yield() so that we get -lrt # - Use PTHREAD_{LIBS,CFLAGS} to amend CFLAGS so that we get -lpthreads # - Submit language linkage declarations patch for review +# - iperf_LDFLAGS: use LDFLAGS instead of CFLAGS # * Add changelog.CSW # GARNAME = iperf @@ -50,11 +52,14 @@ # * Get rid of gcc -Walls # * LIBS: Append -lrt for sched_yield() # * LIBS: Append -lpthread (upstream should use $PTHREAD_{LIBS,CFLAGS} instead +# * Use LDFLAGS for iperf_LDFLAGS instead of CFLAGS *sigh* pre-configure-modulated: - @perl -pi -e 's|-Wall||; s|\@LIBS\@|\@LIBS\@ -lrt -lpthread|' \ + perl -pi -e 's|-Wall||; s|\@LIBS\@|\@LIBS\@ -lrt -lpthread|' \ $(WORKSRC)/Makefile.in \ $(WORKSRC)/compat/Makefile.in \ $(WORKSRC)/src/Makefile.in + gsed -i 's,^iperf_LDFLAGS = @CFLAGS@,iperf_LDFLAGS = @LDFLAGS@,' \ + $(WORKSRC)/src/Makefile.in @$(MAKECOOKIE) post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed May 26 23:13:35 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 26 May 2010 21:13:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[10009] csw/mgar/pkg/iperf/trunk/Makefile Message-ID: Revision: 10009 http://gar.svn.sourceforge.net/gar/?rev=10009&view=rev Author: skayser Date: 2010-05-26 21:13:35 +0000 (Wed, 26 May 2010) Log Message: ----------- iperf: fix extra docs handling Modified Paths: -------------- csw/mgar/pkg/iperf/trunk/Makefile Modified: csw/mgar/pkg/iperf/trunk/Makefile =================================================================== --- csw/mgar/pkg/iperf/trunk/Makefile 2010-05-26 21:10:17 UTC (rev 10008) +++ csw/mgar/pkg/iperf/trunk/Makefile 2010-05-26 21:13:35 UTC (rev 10009) @@ -47,6 +47,8 @@ CONFIGURE_ARGS = $(DIRPATHS) +EXTRA_PAX_ARGS = '-s,ChangeLog,changelog,p' + include gar/category.mk # * Get rid of gcc -Walls @@ -62,8 +64,9 @@ $(WORKSRC)/src/Makefile.in @$(MAKECOOKIE) +post-install-modulated: DOCS = ChangeLog AUTHORS post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME) post-install-modulated: - @ginstall -d $(DOCDEST) - @(cd $(WORKSRC) && cp Changelog AUTHORS $(DOCDEST)) + ginstall -d $(DOCDEST) + cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed May 26 23:18:03 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 26 May 2010 21:18:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[10010] csw/mgar/pkg/duplicity/trunk/Makefile Message-ID: Revision: 10010 http://gar.svn.sourceforge.net/gar/?rev=10010&view=rev Author: skayser Date: 2010-05-26 21:18:03 +0000 (Wed, 26 May 2010) Log Message: ----------- duplicity: avoid double CSWpython dep Modified Paths: -------------- csw/mgar/pkg/duplicity/trunk/Makefile Modified: csw/mgar/pkg/duplicity/trunk/Makefile =================================================================== --- csw/mgar/pkg/duplicity/trunk/Makefile 2010-05-26 21:13:35 UTC (rev 10009) +++ csw/mgar/pkg/duplicity/trunk/Makefile 2010-05-26 21:18:03 UTC (rev 10010) @@ -18,8 +18,7 @@ # Couldn't find a parsable 'stable' releases page # UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -RUNTIME_DEP_PKGS = CSWpython -RUNTIME_DEP_PKGS += CSWpy-boto +RUNTIME_DEP_PKGS = CSWpy-boto RUNTIME_DEP_PKGS += CSWlibrsync RUNTIME_DEP_PKGS += CSWgnupg RUNTIME_DEP_PKGS += CSWncftp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Wed May 26 23:26:24 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Wed, 26 May 2010 21:26:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[10011] csw/mgar/pkg/TEMPLATES/createpkg/copy_template Message-ID: Revision: 10011 http://gar.svn.sourceforge.net/gar/?rev=10011&view=rev Author: theferret Date: 2010-05-26 21:26:24 +0000 (Wed, 26 May 2010) Log Message: ----------- TEMPLATES/createpkg/copy_template: fix bug Modified Paths: -------------- csw/mgar/pkg/TEMPLATES/createpkg/copy_template Modified: csw/mgar/pkg/TEMPLATES/createpkg/copy_template =================================================================== --- csw/mgar/pkg/TEMPLATES/createpkg/copy_template 2010-05-26 21:18:03 UTC (rev 10010) +++ csw/mgar/pkg/TEMPLATES/createpkg/copy_template 2010-05-26 21:26:24 UTC (rev 10011) @@ -49,7 +49,7 @@ cp $template_dir/Makefile* $DESTDIR cp $template_dir/README* $DESTDIR cp $template_dir/prototype* $DESTDIR -$template_dir/generate_pkginfo >$DESTDIR/pkginfo +$template_dir/generate_pkginfo $1 >$DESTDIR/pkginfo print "OPENCSW_REPOSITORY=$MY_SVN_DIR/$DESTDIR" >>$DESTDIR/pkginfo print "" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu May 27 04:09:28 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 27 May 2010 02:09:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[10012] csw/mgar/gar/v2 Message-ID: Revision: 10012 http://gar.svn.sourceforge.net/gar/?rev=10012&view=rev Author: bdwalton Date: 2010-05-27 02:09:28 +0000 (Thu, 27 May 2010) Log Message: ----------- gar/v2: integrate v2-bwalton to add git based makepatch support Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.lib.mk csw/mgar/gar/v2/gar.mk Property Changed: ---------------- csw/mgar/gar/v2/ csw/mgar/gar/v2/pkglib/csw/depend Property changes on: csw/mgar/gar/v2 ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 + /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-bwalton:9784-10011 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2010-05-26 21:26:24 UTC (rev 10011) +++ csw/mgar/gar/v2/gar.conf.mk 2010-05-27 02:09:28 UTC (rev 10012) @@ -50,6 +50,10 @@ GIT_PROXY_SCRIPT ?= $(abspath $(GARBIN))/gitproxy GIT_DEFAULT_TRACK = +refs/heads/master:refs/remotes/origin/master +# if a user always wants --signoff, for example. used in makepatch +# by default, the -v will show the diff being committed... +GIT_COMMIT_OPTS ?= -v + # For parallel builds PARALLELMODULATIONS ?= MULTITAIL ?= /opt/csw/bin/multitail @@ -184,10 +188,11 @@ DEF_BASE_PKGS += CSWpython DEF_BASE_PKGS += CSWtextutils DEF_BASE_PKGS += CSWwget +DEF_BASE_PKGS += CSWgit ifdef GIT_REPOS # netcat and bash are for the gitproxy script. -DEF_BASE_PKGS += CSWgit CSWnetcat +DEF_BASE_PKGS += CSWnetcat endif PREREQUISITE_BASE_PKGS ?= $(DEF_BASE_PKGS) Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2010-05-26 21:26:24 UTC (rev 10011) +++ csw/mgar/gar/v2/gar.lib.mk 2010-05-27 02:09:28 UTC (rev 10012) @@ -236,7 +236,7 @@ echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ fi; \ fi - + check-upstream: FILES2CHECK = $(call files2check) check-upstream: @if [ -n '$(FILES2CHECK)' ]; then \ @@ -471,24 +471,19 @@ @gzip -dc $(DOWNLOADDIR)/$* | $(GARPATCH) @$(MAKECOOKIE) -# apply normal patches +# apply normal patches (git format-patch output or old-style diff -r) normal-patch-%: @echo " ==> Applying patch $(DOWNLOADDIR)/$*" - $(GARPATCH) < $(DOWNLOADDIR)/$* + @( if ggrep -q 'Subject:' $(abspath $(DOWNLOADDIR)/$*); then \ + cd $(WORKSRC); git am $(abspath $(DOWNLOADDIR)/$*); \ + else \ + echo Adding old-style patch...; \ + $(GARPATCH) < $(DOWNLOADDIR)/$*; \ + cd $(WORKSRC); git add -A; \ + git commit -am "old style patch: $*"; \ + fi ) @$(MAKECOOKIE) -# This is used by makepatch -%/gar-base.diff: - @echo " ==> Creating patch $@" - @EXTRACTDIR=$(SCRATCHDIR) COOKIEDIR=$(SCRATCHDIR)-$(COOKIEDIR) $(MAKE) extract - @PATCHDIR=$(SCRATCHDIR)/$(BASEWORKSRC) COOKIEDIR=$(SCRATCHDIR)-$(COOKIEDIR) $(MAKE) patch - @mv $(SCRATCHDIR)/$(BASEWORKSRC) $(WORKSRC_FIRSTMOD).orig - @( cd $(WORKDIR_FIRSTMOD); \ - if gdiff --speed-large-files --minimal -Nru $(BASEWORKSRC).orig $(BASEWORKSRC) > gar-base.diff; then :; else \ - cd $(CURDIR); \ - mv -f $(WORKDIR_FIRSTMOD)/gar-base.diff $@; \ - fi ) - ### PATCH FILE TYPE MAPPINGS ### # These rules specify which of the above patch action rules to use for a given # file extension. Often support for a given patch format can be handled by Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2010-05-26 21:26:24 UTC (rev 10011) +++ csw/mgar/gar/v2/gar.mk 2010-05-27 02:09:28 UTC (rev 10012) @@ -1,4 +1,3 @@ - # # $Id$ # @@ -145,6 +144,7 @@ define _modulate_do $(call _modulate_target,extract,$(2),$(4)) $(call _modulate_target,patch,$(2),$(4)) +$(call _modulate_target_nocookie,makepatch,$(2),$(4)) $(call _modulate_target,configure,$(2),$(4)) $(call _modulate_target_nocookie,reset-configure,$(2),$(4)) $(call _modulate_target,build,$(2),$(4)) @@ -380,7 +380,7 @@ # We call an additional extract-modulated without resetting any variables so # a complete unpacked set goes to the global dir for packaging (like gspec) -extract: checksum $(COOKIEDIR) pre-extract extract-modulated $(addprefix extract-,$(MODULATIONS)) post-extract +extract: checksum $(COOKIEDIR) pre-extract pre-extract-git-check extract-modulated $(addprefix extract-,$(MODULATIONS)) post-extract @$(DONADA) extract-global: $(if $(filter global,$(MODULATION)),extract-modulated) @@ -390,9 +390,48 @@ extract-modulated: checksum-modulated $(EXTRACTDIR) $(COOKIEDIR) \ $(addprefix dep-$(GARDIR)/,$(EXTRACTDEPS)) \ announce-modulation \ - pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS) post-extract-$(MODULATION) post-extract-modulated + pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS) $(if $(filter global,$(MODULATION)),,post-extract-gitsnap) post-extract-$(MODULATION) post-extract-modulated @$(DONADA) +pre-extract-git-check: + @( if [ ! -f $(HOME)/.gitconfig ]; then \ + name=`getent passwd $$USER | awk -F: '{print $$5}'`; \ + echo "===================================================="; \ + echo "You need to create a basic ~/.gitconfig."; \ + echo "Try: "; \ + echo " git config --global user.email $$USER at opencsw.org"; \ + echo " git config --global user.name \"$$name\""; \ + echo "===================================================="; \ + exit 1; \ + else \ + g_email=`git config --global user.email`; \ + g_name=`git config --global user.name`; \ + email=$$USER at opencsw.org; \ + name=`getent passwd $$USER | awk -F: '{print $$5}'`; \ + if [ -z "$$g_email" ]; then \ + echo "==================================================="; \ + echo "Your ~/.gitconfig doesn't define user.email. Try:"; \ + echo " git config --global user.email $$email"; \ + echo "==================================================="; \ + exit 1; \ + elif [ -z "$$g_name" ]; then \ + echo "==================================================="; \ + echo "Your ~/.gitconfig doesn't define user.name. Try:"; \ + echo " git config --global user.name '$$name'"; \ + echo "==================================================="; \ + exit 1; \ + fi; \ + fi ) + @$(MAKECOOKIE) + +post-extract-gitsnap: $(EXTRACT_TARGETS) + @echo ' ==> Snapshotting extracted source tree with git' + @( cd $(WORKSRC); git init; git add .; \ + git commit -m "Upstream $(GARVERSION)"; \ + git tag -am "Upstream $(GARVERSION)" upstream-$(GARVERSION); \ + git checkout -b csw ) + @$(MAKECOOKIE) + # returns true if extract has completed successfully, false # otherwise extract-p: @@ -411,7 +450,7 @@ patch: pre-patch $(addprefix patch-,$(MODULATIONS)) post-patch @$(DONADA) -patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) post-patch-$(MODULATION) post-patch-modulated +patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) $(if $(filter global,$(MODULATION)),,post-patch-gitsnap) post-patch-$(MODULATION) post-patch-modulated @$(DONADA) # returns true if patch has completed successfully, false @@ -419,12 +458,34 @@ patch-p: @$(foreach COOKIEFILE,$(PATCH_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) -# makepatch - Grab the upstream source and diff against $(WORKSRC). Since -# diff returns 1 if there are differences, we remove the patch -# file on "success". Goofy diff. -makepatch: $(SCRATCHDIR) $(FILEDIR) $(FILEDIR)/gar-base.diff - $(DONADA) +post-patch-gitsnap: $(PATCH_TARGETS) + @echo "Tagging top of current csw patch stack..." + @( cd $(WORKSRC); git tag -am "CSW $(GARVERSION)" csw-$(GARVERSION) ) + @$(MAKECOOKIE) +makepatch: $(addprefix patch-,$(MODULATIONS)) $(addprefix makepatch-,$(MODULATIONS)) + @$(DONADA) + +# Allow generation of patches from modified work source. +makepatch-modulated: $(FILEDIR) + @echo " ==> Makepatch: Looking for changes in modulation $(MODULATION)" + @( cd $(WORKSRC); \ + git add -A; \ + git diff --cached --quiet; \ + if test $$? -eq 0; then \ + echo "No changes."; \ + else \ + echo "Capturing changes..."; \ + git commit $(GIT_COMMIT_OPTS) && \ + ( git format-patch csw-$(GARVERSION); \ + echo Add the following to your recipe and then; \ + echo rerun: gmake makesums; \ + echo PATCHFILES += 0001*; \ + echo "(or maybe PATCHFILES_$(MODULATION) ??)"; \ + mv 0001* $(abspath $(FILEDIR)); ) \ + fi ) + + # XXX: Allow patching of pristine sources separate from ISA directories # XXX: Use makepatch on global/ Property changes on: csw/mgar/gar/v2/pkglib/csw/depend ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2/pkglib/csw/depend:4936-6678 /csw/mgar/gar/v2-checkpkg/pkglib/csw/depend:7722-7855 /csw/mgar/gar/v2-checkpkg-stats/pkglib/csw/depend:8454-8649 /csw/mgar/gar/v2-collapsed-modulations/pkglib/csw/depend:6895 /csw/mgar/gar/v2-dirpackage/pkglib/csw/depend:8125-8180 /csw/mgar/gar/v2-skayser/pkglib/csw/depend:6087-6132 + /csw/mgar/gar/v2/pkglib/csw/depend:4936-6678 /csw/mgar/gar/v2-bwalton/pkglib/csw/depend:9784-10011 /csw/mgar/gar/v2-checkpkg/pkglib/csw/depend:7722-7855 /csw/mgar/gar/v2-checkpkg-stats/pkglib/csw/depend:8454-8649 /csw/mgar/gar/v2-collapsed-modulations/pkglib/csw/depend:6895 /csw/mgar/gar/v2-dirpackage/pkglib/csw/depend:8125-8180 /csw/mgar/gar/v2-skayser/pkglib/csw/depend:6087-6132 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu May 27 05:23:49 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 27 May 2010 03:23:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[10013] csw/mgar/pkg/libxslt/trunk Message-ID: Revision: 10013 http://gar.svn.sourceforge.net/gar/?rev=10013&view=rev Author: bdwalton Date: 2010-05-27 03:23:49 +0000 (Thu, 27 May 2010) Log Message: ----------- libxslt: version bump Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile csw/mgar/pkg/libxslt/trunk/checksums Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2010-05-27 02:09:28 UTC (rev 10012) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2010-05-27 03:23:49 UTC (rev 10013) @@ -1,5 +1,5 @@ GARNAME = libxslt -GARVERSION = 1.1.24 +GARVERSION = 1.1.26 CATEGORIES = lib DESCRIPTION = XSLT engine for the XML Toolkit Modified: csw/mgar/pkg/libxslt/trunk/checksums =================================================================== --- csw/mgar/pkg/libxslt/trunk/checksums 2010-05-27 02:09:28 UTC (rev 10012) +++ csw/mgar/pkg/libxslt/trunk/checksums 2010-05-27 03:23:49 UTC (rev 10013) @@ -1,2 +1,2 @@ -967047de707d0f20d7fa3b0d0916fdd9 download/fix-segfault-in-debug.patch -e83ec5d27fc4c10c6f612879bea9a153 download/libxslt-1.1.24.tar.gz +967047de707d0f20d7fa3b0d0916fdd9 fix-segfault-in-debug.patch +e61d0364a30146aaa3001296f853b2b9 libxslt-1.1.26.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 Thu May 27 09:30:25 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 27 May 2010 07:30:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[10014] csw/mgar/pkg/bind/trunk Message-ID: Revision: 10014 http://gar.svn.sourceforge.net/gar/?rev=10014&view=rev Author: bonivart Date: 2010-05-27 07:30:25 +0000 (Thu, 27 May 2010) Log Message: ----------- bind: update to 9.7.0-P2 Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bind/trunk/checksums Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2010-05-27 03:23:49 UTC (rev 10013) +++ csw/mgar/pkg/bind/trunk/Makefile 2010-05-27 07:30:25 UTC (rev 10014) @@ -3,7 +3,7 @@ GARNAME = bind GARVERSION = 9.7.0 -RELEASE = P1 +RELEASE = P2 DISTVERSION = $(GARVERSION)-$(RELEASE) SPKG_VERSION = $(GARVERSION)$(RELEASE) DISTNAME = $(GARNAME)-$(GARVERSION)-$(RELEASE) Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2010-05-27 03:23:49 UTC (rev 10013) +++ csw/mgar/pkg/bind/trunk/checksums 2010-05-27 07:30:25 UTC (rev 10014) @@ -1,2 +1,2 @@ dbbc839888d11d22aad3ccb65942d2e5 CSWbindchroot.postinstall -78e3e38c6252e41ded1afa1aeb183622 bind-9.7.0-P1.tar.gz +47fc341901f00c1d815bef12ab4533de bind-9.7.0-P2.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 May 27 10:01:12 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 27 May 2010 08:01:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[10015] csw/mgar/pkg/gdb/trunk Message-ID: Revision: 10015 http://gar.svn.sourceforge.net/gar/?rev=10015&view=rev Author: dmichelsen Date: 2010-05-27 08:01:12 +0000 (Thu, 27 May 2010) Log Message: ----------- gdb: Add patches from sfw Modified Paths: -------------- csw/mgar/pkg/gdb/trunk/Makefile csw/mgar/pkg/gdb/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gdb/trunk/files/gdb.auxv.patch csw/mgar/pkg/gdb/trunk/files/gdb.solib-svr4.patch Modified: csw/mgar/pkg/gdb/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdb/trunk/Makefile 2010-05-27 07:30:25 UTC (rev 10014) +++ csw/mgar/pkg/gdb/trunk/Makefile 2010-05-27 08:01:12 UTC (rev 10015) @@ -9,6 +9,10 @@ MASTER_SITES = http://ftp.gnu.org/gnu/gdb/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +# Patches from http://cvs.opensolaris.org/source/xref/sfw/usr/src/cmd/gdb/ +PATCHFILES = gdb.auxv.patch +PATCHFILES += gdb.solib-svr4.patch + SPKG_SOURCEURL = http://www.gnu.org/software/gdb # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/gdb/trunk/checksums =================================================================== --- csw/mgar/pkg/gdb/trunk/checksums 2010-05-27 07:30:25 UTC (rev 10014) +++ csw/mgar/pkg/gdb/trunk/checksums 2010-05-27 08:01:12 UTC (rev 10015) @@ -1 +1,3 @@ -c9da266b884fb8fa54df786dfaadbc7a download/gdb-6.8.tar.bz2 +c9da266b884fb8fa54df786dfaadbc7a gdb-6.8.tar.bz2 +0e2918ca6429132ec762588dc722f6d0 gdb.auxv.patch +d10a6f2ec5eaced8a9ae908b2d5e1d3e gdb.solib-svr4.patch Added: csw/mgar/pkg/gdb/trunk/files/gdb.auxv.patch =================================================================== --- csw/mgar/pkg/gdb/trunk/files/gdb.auxv.patch (rev 0) +++ csw/mgar/pkg/gdb/trunk/files/gdb.auxv.patch 2010-05-27 08:01:12 UTC (rev 10015) @@ -0,0 +1,81 @@ +--- gdb-6.8/gdb/auxv.c.orig Sun Aug 2 13:51:23 2009 ++++ gdb-6.8/gdb/auxv.c Sun Aug 2 13:51:46 2009 +@@ -52,9 +52,21 @@ + int fd; + LONGEST n; + ++ /* ++ * Solaris pads auxv for 32 bit process out to 64 bits when being read ++ * by a 64 bit process. gdb expects a 32 bit auxv for 32 bit processes. ++ * We'll remove the padding here. ++ */ ++ int solaris_64_32 = TYPE_LENGTH (builtin_type_void_data_ptr) == 4 && sizeof (void *) == 8; ++ + gdb_assert (object == TARGET_OBJECT_AUXV); + gdb_assert (readbuf || writebuf); + ++ /* ++ * Adjust offest for the 64/32 case. ++ */ ++ if (solaris_64_32) offset *= 2; ++ + pathname = xstrprintf ("/proc/%d/auxv", PIDGET (inferior_ptid)); + fd = open (pathname, writebuf != NULL ? O_WRONLY : O_RDONLY); + xfree (pathname); +@@ -64,10 +76,54 @@ + if (offset != (ULONGEST) 0 + && lseek (fd, (off_t) offset, SEEK_SET) != (off_t) offset) + n = -1; +- else if (readbuf != NULL) ++ else if (readbuf != NULL) { + n = read (fd, readbuf, len); +- else ++ /* ++ * Remove the padding for the 64/32 case. ++ */ ++ if (solaris_64_32) { ++ /* ++ * Solaris pads auxv for 32 bit process out to 64 bits when being read ++ * by a 64 bit process. gdb expects a 32 bit auxv for 32 bit processes. ++ */ ++ unsigned *from, *to; ++ gdb_assert (n % 4 == 0); ++ from = to = (unsigned *)readbuf; ++ while (from < (unsigned *)(readbuf + n)) { ++ /* ++ * The type is always in the first 4 bytes followed by 4 bytes ++ * of padding on both SPARC and x86. ++ */ ++ *to++ = *from; ++ from += 2; ++ /* ++ * The value is before the padding on Intel and after on SPARC. ++ */ ++ switch (gdbarch_byte_order (current_gdbarch)) { ++ case BFD_ENDIAN_LITTLE: ++ *to++ = *from; ++ gdb_assert (*(from + 1) == 0); ++ break; ++ case BFD_ENDIAN_BIG: ++ gdb_assert (*from == 0); ++ *to++ = *(from + 1); ++ break; ++ default: gdb_assert (0); ++ } ++ from += 2; ++ } ++ /* ++ * Adjust the length for the 64/32 case. ++ */ ++ n /= 2; ++ } ++ } else { ++ /* ++ * Does gdb ever write to auxv? ++ */ ++ gdb_assert (!writebuf); + n = write (fd, writebuf, len); ++ } + + (void) close (fd); + Added: csw/mgar/pkg/gdb/trunk/files/gdb.solib-svr4.patch =================================================================== --- csw/mgar/pkg/gdb/trunk/files/gdb.solib-svr4.patch (rev 0) +++ csw/mgar/pkg/gdb/trunk/files/gdb.solib-svr4.patch 2010-05-27 08:01:12 UTC (rev 10015) @@ -0,0 +1,15 @@ +--- gdb-6.8/gdb/solib-svr4.c.orig Fri Jul 10 12:25:23 2009 ++++ gdb-6.8/gdb/solib-svr4.c Fri Jul 10 12:25:34 2009 +@@ -1649,6 +1649,12 @@ + if (strcmp (gdb->so_original_name, "/usr/lib/ld.so.1") == 0 + && strcmp (inferior->so_original_name, "/lib/ld.so.1") == 0) + return 1; ++ if (strcmp (gdb->so_original_name, "/usr/lib/amd64/ld.so.1") == 0 ++ && strcmp (inferior->so_original_name, "/lib/amd64/ld.so.1") == 0) ++ return 1; ++ if (strcmp (gdb->so_original_name, "/usr/lib/sparcv9/ld.so.1") == 0 ++ && strcmp (inferior->so_original_name, "/lib/sparcv9/ld.so.1") == 0) ++ return 1; + + return 0; + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu May 27 11:00:52 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 27 May 2010 09:00:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[10016] csw/mgar/pkg/iperf/trunk Message-ID: Revision: 10016 http://gar.svn.sourceforge.net/gar/?rev=10016&view=rev Author: skayser Date: 2010-05-27 09:00:52 +0000 (Thu, 27 May 2010) Log Message: ----------- iperf: prepare for package release Modified Paths: -------------- csw/mgar/pkg/iperf/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/iperf/trunk/files/changelog.CSW Modified: csw/mgar/pkg/iperf/trunk/Makefile =================================================================== --- csw/mgar/pkg/iperf/trunk/Makefile 2010-05-27 08:01:12 UTC (rev 10015) +++ csw/mgar/pkg/iperf/trunk/Makefile 2010-05-27 09:00:52 UTC (rev 10016) @@ -1,13 +1,10 @@ # Todo: -# * Investigate 'redefined' warning messages for int types like INT64_MIN -# * Check sf project page for patches and threads related to CPU saturation -# * Run some real world performance tests # * Submit feedback upstream: # - Add AC_CHECK_FUNC or AC_SEARCH_LIBS for sched_yield() so that we get -lrt # - Use PTHREAD_{LIBS,CFLAGS} to amend CFLAGS so that we get -lpthreads # - Submit language linkage declarations patch for review # - iperf_LDFLAGS: use LDFLAGS instead of CFLAGS -# * Add changelog.CSW +# * #ifndef INT*_{MIN,MAX} in include/iperf-int.h to avoid redefined warnings # GARNAME = iperf GARVERSION = 2.0.4 @@ -70,3 +67,10 @@ ginstall -d $(DOCDEST) cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) @$(MAKECOOKIE) + +# Install changelog.CSW +post-merge: $(foreach P,$(_PKG_SPECS),install-changelog-$P) +install-changelog-%: + ginstall -D $(FILEDIR)/changelog.CSW \ + $(PKGROOT)$(docdir)/$(call catalogname,$*)/changelog.CSW + @$(MAKECOOKIE) Added: csw/mgar/pkg/iperf/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/iperf/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/iperf/trunk/files/changelog.CSW 2010-05-27 09:00:52 UTC (rev 10016) @@ -0,0 +1,5 @@ +iperf (2.0.4,REV=2010.05.27) + + * Initial release. + + -- Sebastian Kayser Thu, 27 May 2010 10:53:36 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu May 27 16:06:33 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 27 May 2010 14:06:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[10018] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 10018 http://gar.svn.sourceforge.net/gar/?rev=10018&view=rev Author: bdwalton Date: 2010-05-27 14:06:33 +0000 (Thu, 27 May 2010) Log Message: ----------- gar/v2: add robustness to git/makepatch when no extracted sources Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2010-05-27 13:51:42 UTC (rev 10017) +++ csw/mgar/gar/v2/gar.mk 2010-05-27 14:06:33 UTC (rev 10018) @@ -425,11 +425,13 @@ @$(MAKECOOKIE) post-extract-gitsnap: $(EXTRACT_TARGETS) - @echo ' ==> Snapshotting extracted source tree with git' - @( cd $(WORKSRC); git init; git add .; \ + @( if [ -d "$(WORKSRC)" ]; then \ + echo ' ==> Snapshotting extracted source tree with git'; \ + cd $(WORKSRC); git init; git add .; \ git commit -m "Upstream $(GARVERSION)"; \ git tag -am "Upstream $(GARVERSION)" upstream-$(GARVERSION); \ - git checkout -b csw ) + git checkout -b csw; \ + fi ) @$(MAKECOOKIE) # returns true if extract has completed successfully, false @@ -459,8 +461,12 @@ @$(foreach COOKIEFILE,$(PATCH_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) post-patch-gitsnap: $(PATCH_TARGETS) - @echo "Tagging top of current csw patch stack..." - @( cd $(WORKSRC); git tag -am "CSW $(GARVERSION)" csw-$(GARVERSION) ) + + @( if [ -d "$(WORKSRC)/.git" ]; then \ + echo "Tagging top of current csw patch stack..."; \ + cd $(WORKSRC); \ + git tag -am "CSW $(GARVERSION)" csw-$(GARVERSION); \ + fi ) @$(MAKECOOKIE) makepatch: $(addprefix patch-,$(MODULATIONS)) $(addprefix makepatch-,$(MODULATIONS)) @@ -468,8 +474,9 @@ # Allow generation of patches from modified work source. makepatch-modulated: $(FILEDIR) - @echo " ==> Makepatch: Looking for changes in modulation $(MODULATION)" - @( cd $(WORKSRC); \ + @( if [ -d "$(WORKSRC)/.git" ]; then \ + echo " ==> Makepatch: Looking for changes in modulation $(MODULATION)"; \ + cd $(WORKSRC); \ git add -A; \ git diff --cached --quiet; \ if test $$? -eq 0; then \ @@ -483,9 +490,11 @@ echo PATCHFILES += 0001*; \ echo "(or maybe PATCHFILES_$(MODULATION) ??)"; \ mv 0001* $(abspath $(FILEDIR)); ) \ - fi ) + fi; \ + else \ + echo "No extracted sources so we can't create patches..."; \ + fi ) - # XXX: Allow patching of pristine sources separate from ISA directories # XXX: Use makepatch on global/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu May 27 15:51:42 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 27 May 2010 13:51:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[10017] csw/mgar/gar/v2-bwalton/gar.mk Message-ID: Revision: 10017 http://gar.svn.sourceforge.net/gar/?rev=10017&view=rev Author: bdwalton Date: 2010-05-27 13:51:42 +0000 (Thu, 27 May 2010) Log Message: ----------- gar/v2: make makepatch git stuff robust against recipes with no extracted sources Modified Paths: -------------- csw/mgar/gar/v2-bwalton/gar.mk Modified: csw/mgar/gar/v2-bwalton/gar.mk =================================================================== --- csw/mgar/gar/v2-bwalton/gar.mk 2010-05-27 09:00:52 UTC (rev 10016) +++ csw/mgar/gar/v2-bwalton/gar.mk 2010-05-27 13:51:42 UTC (rev 10017) @@ -425,11 +425,13 @@ @$(MAKECOOKIE) post-extract-gitsnap: $(EXTRACT_TARGETS) - @echo ' ==> Snapshotting extracted source tree with git' - @( cd $(WORKSRC); git init; git add .; \ + @( if [ -d "$(WORKSRC)" ]; then \ + echo ' ==> Snapshotting extracted source tree with git'; \ + cd $(WORKSRC); git init; git add .; \ git commit -m "Upstream $(GARVERSION)"; \ git tag -am "Upstream $(GARVERSION)" upstream-$(GARVERSION); \ - git checkout -b csw ) + git checkout -b csw; \ + fi ) @$(MAKECOOKIE) # returns true if extract has completed successfully, false @@ -459,8 +461,12 @@ @$(foreach COOKIEFILE,$(PATCH_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) post-patch-gitsnap: $(PATCH_TARGETS) - @echo "Tagging top of current csw patch stack..." - @( cd $(WORKSRC); git tag -am "CSW $(GARVERSION)" csw-$(GARVERSION) ) + + @( if [ -d "$(WORKSRC)/.git" ]; then \ + echo "Tagging top of current csw patch stack..."; \ + cd $(WORKSRC); \ + git tag -am "CSW $(GARVERSION)" csw-$(GARVERSION); \ + fi ) @$(MAKECOOKIE) makepatch: $(addprefix patch-,$(MODULATIONS)) $(addprefix makepatch-,$(MODULATIONS)) @@ -468,8 +474,9 @@ # Allow generation of patches from modified work source. makepatch-modulated: $(FILEDIR) - @echo " ==> Makepatch: Looking for changes in modulation $(MODULATION)" - @( cd $(WORKSRC); \ + @( if [ -d "$(WORKSRC)/.git" ]; then \ + echo " ==> Makepatch: Looking for changes in modulation $(MODULATION)"; \ + cd $(WORKSRC); \ git add -A; \ git diff --cached --quiet; \ if test $$? -eq 0; then \ @@ -483,9 +490,11 @@ echo PATCHFILES += 0001*; \ echo "(or maybe PATCHFILES_$(MODULATION) ??)"; \ mv 0001* $(abspath $(FILEDIR)); ) \ - fi ) + fi; \ + else \ + echo "No extracted sources so we can't create patches..."; \ + fi ) - # XXX: Allow patching of pristine sources separate from ISA directories # XXX: Use makepatch on global/ 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 May 27 16:11:04 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 27 May 2010 14:11:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[10019] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 10019 http://gar.svn.sourceforge.net/gar/?rev=10019&view=rev Author: bonivart Date: 2010-05-27 14:11:03 +0000 (Thu, 27 May 2010) Log Message: ----------- cswclassutils: fix i.cswinetd bug Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/checksums csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-05-27 14:06:33 UTC (rev 10018) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-05-27 14:11:03 UTC (rev 10019) @@ -1,7 +1,7 @@ # $Id$ GARNAME = cswclassutils -GARVERSION = 1.36 +GARVERSION = 1.37 CATEGORIES = utils DESCRIPTION = CSW class action utilities Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2010-05-27 14:06:33 UTC (rev 10018) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2010-05-27 14:11:03 UTC (rev 10019) @@ -1,8 +1,8 @@ 48a97af56d55bc90ce90303228ed8cc3 COPYING 9846081f8109dc9149dc026b89fbf137 CSWcswclassutils.i.cswcpsampleconf -efd19a09c355319c7d649885e4f9f76e CSWcswclassutils.i.cswcrontab +25f1f5a680a6dc118d2c54333703974f CSWcswclassutils.i.cswcrontab 5e2ae2c6bd828061f86d84f09087b06a CSWcswclassutils.i.cswetcservices -4a0971d15bc02e7496f876336c68ddf4 CSWcswclassutils.i.cswinetd +5617480b81dd62c8c99c817e252164cb CSWcswclassutils.i.cswinetd 6abb13158fee906870d1d68dc0fae6f3 CSWcswclassutils.i.cswinitsmf a667515489aafc81d41159765faf698f CSWcswclassutils.i.cswmigrateconf 8ab721535d43dcef702538d394e7a2ce CSWcswclassutils.i.cswpostmsg @@ -11,7 +11,7 @@ 4f816acb06e8f95add6faf8607859da2 CSWcswclassutils.i.cswtexinfo e906a50bc2d82e341f78d582f32ecb88 CSWcswclassutils.i.cswusergroup d278a28a6f901c4ff5f07c583b4cff3d CSWcswclassutils.r.cswcpsampleconf -f988248725a4607110a13820a005b72f CSWcswclassutils.r.cswcrontab +b452d4e6b95df03b6b00c6e980bb1004 CSWcswclassutils.r.cswcrontab d60261ddc46e2cc83ecbbfc586a7e686 CSWcswclassutils.r.cswetcservices 9039ea60ad4c3f8994205fb242a49a72 CSWcswclassutils.r.cswinetd 791db9c2f6685aca67043820d260fc60 CSWcswclassutils.r.cswinitsmf Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd 2010-05-27 14:06:33 UTC (rev 10018) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd 2010-05-27 14:11:03 UTC (rev 10019) @@ -59,7 +59,7 @@ # we won't register with inetd if the service name isn't registered # in the global services file. exists=`awk "\\\$1 == \"$svcname\" {print \"found\" }" /etc/services` - if [ "$exists" == "found" ]; then + if [ "$exists" = "found" ]; then if [ -n "$DEBUG" ]; then echo "Installing inetd service:" echo "$inetdsvc" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu May 27 16:11:25 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 27 May 2010 14:11:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[10020] csw/mgar/pkg/colormake/trunk/ Message-ID: Revision: 10020 http://gar.svn.sourceforge.net/gar/?rev=10020&view=rev Author: bdwalton Date: 2010-05-27 14:11:25 +0000 (Thu, 27 May 2010) Log Message: ----------- colormake: switch back to gar/v2 Property Changed: ---------------- csw/mgar/pkg/colormake/trunk/ Property changes on: csw/mgar/pkg/colormake/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-bwalton + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Thu May 27 23:04:55 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Thu, 27 May 2010 21:04:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[10021] csw/mgar/pkg/xpm/trunk/prototype.i386 Message-ID: Revision: 10021 http://gar.svn.sourceforge.net/gar/?rev=10021&view=rev Author: theferret Date: 2010-05-27 21:04:55 +0000 (Thu, 27 May 2010) Log Message: ----------- xpm: added file Added Paths: ----------- csw/mgar/pkg/xpm/trunk/prototype.i386 Copied: csw/mgar/pkg/xpm/trunk/prototype.i386 (from rev 10001, csw/mgar/pkg/xpm/trunk/prototype) =================================================================== --- csw/mgar/pkg/xpm/trunk/prototype.i386 (rev 0) +++ csw/mgar/pkg/xpm/trunk/prototype.i386 2010-05-27 21:04:55 UTC (rev 10021) @@ -0,0 +1,20 @@ +i pkginfo +i copyright +i depend +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/cxpm.1 0644 root bin +f none /opt/csw/share/man/man1/sxpm.1 0644 root bin +d none /opt/csw/bin 0755 root bin +f none /opt/csw/bin/sxpm 0755 root bin +f none /opt/csw/bin/cxpm 0755 root bin +d none /opt/csw/include 0755 root bin +d none /opt/csw/include/X11 0755 root bin +f none /opt/csw/include/X11/xpm.h 0644 root bin +d none /opt/csw/lib 0755 root bin +f none /opt/csw/lib/libXpm.so.4.11.0 0755 root bin +s none /opt/csw/lib/libXpm.so.4=libXpm.so.4.11.0 +s none /opt/csw/lib/libXpm.so=libXpm.so.4.11.0 +d none /opt/csw/lib/pkgconfig 0755 root bin +f none /opt/csw/lib/pkgconfig/xpm.pc 0644 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Thu May 27 23:05:47 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Thu, 27 May 2010 21:05:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[10022] csw/mgar/pkg/xpm/trunk Message-ID: Revision: 10022 http://gar.svn.sourceforge.net/gar/?rev=10022&view=rev Author: theferret Date: 2010-05-27 21:05:47 +0000 (Thu, 27 May 2010) Log Message: ----------- xpm: tweaked prototypes some more Added Paths: ----------- csw/mgar/pkg/xpm/trunk/prototype.sparc Removed Paths: ------------- csw/mgar/pkg/xpm/trunk/prototype Deleted: csw/mgar/pkg/xpm/trunk/prototype =================================================================== --- csw/mgar/pkg/xpm/trunk/prototype 2010-05-27 21:04:55 UTC (rev 10021) +++ csw/mgar/pkg/xpm/trunk/prototype 2010-05-27 21:05:47 UTC (rev 10022) @@ -1,20 +0,0 @@ -i pkginfo -i copyright -i depend -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/cxpm.1 0644 root bin -f none /opt/csw/share/man/man1/sxpm.1 0644 root bin -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/sxpm 0755 root bin -f none /opt/csw/bin/cxpm 0755 root bin -d none /opt/csw/include 0755 root bin -d none /opt/csw/include/X11 0755 root bin -f none /opt/csw/include/X11/xpm.h 0644 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libXpm.so.4.11.0 0755 root bin -s none /opt/csw/lib/libXpm.so.4=libXpm.so.4.11.0 -s none /opt/csw/lib/libXpm.so=libXpm.so.4.11.0 -d none /opt/csw/lib/pkgconfig 0755 root bin -f none /opt/csw/lib/pkgconfig/xpm.pc 0644 root bin Added: csw/mgar/pkg/xpm/trunk/prototype.sparc =================================================================== --- csw/mgar/pkg/xpm/trunk/prototype.sparc (rev 0) +++ csw/mgar/pkg/xpm/trunk/prototype.sparc 2010-05-27 21:05:47 UTC (rev 10022) @@ -0,0 +1,25 @@ +i pkginfo +i copyright +i depend +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/cxpm.1 0644 root bin +f none /opt/csw/share/man/man1/sxpm.1 0644 root bin +d none /opt/csw/bin 0755 root bin +f none /opt/csw/bin/sxpm 0755 root bin +f none /opt/csw/bin/cxpm 0755 root bin +d none /opt/csw/include 0755 root bin +d none /opt/csw/include/X11 0755 root bin +f none /opt/csw/include/X11/xpm.h 0644 root bin +d none /opt/csw/lib 0755 root bin +f none /opt/csw/lib/libXpm.so.4.11.0 0755 root bin +s none /opt/csw/lib/libXpm.so.4=libXpm.so.4.11.0 +s none /opt/csw/lib/libXpm.so=libXpm.so.4.11.0 +d none /opt/csw/lib/pkgconfig 0755 root bin +f none /opt/csw/lib/pkgconfig/xpm.pc 0644 root bin +f none /opt/csw/lib/sparcv9/libXpm.so.4.11.0 0755 root bin +s none /opt/csw/lib/sparcv9/libXpm.so.4=libXpm.so.4.11.0 +s none /opt/csw/lib/sparcv9/libXpm.so=libXpm.so.4.11.0 +d none /opt/csw/lib/sparcv9/pkgconfig 0755 root bin +f none /opt/csw/lib/sparcv9/pkgconfig/xpm.pc 0644 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Thu May 27 23:16:55 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Thu, 27 May 2010 21:16:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[10023] csw/mgar/pkg/gawk/trunk/checksums Message-ID: Revision: 10023 http://gar.svn.sourceforge.net/gar/?rev=10023&view=rev Author: theferret Date: 2010-05-27 21:16:55 +0000 (Thu, 27 May 2010) Log Message: ----------- gawk: svn nightmare Removed Paths: ------------- csw/mgar/pkg/gawk/trunk/checksums Deleted: csw/mgar/pkg/gawk/trunk/checksums =================================================================== --- csw/mgar/pkg/gawk/trunk/checksums 2010-05-27 21:05:47 UTC (rev 10022) +++ csw/mgar/pkg/gawk/trunk/checksums 2010-05-27 21:16:55 UTC (rev 10023) @@ -1 +0,0 @@ -b637b454005f9e72a9a8eecfacd07ca0 download/gawk-3.1.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Thu May 27 23:17:29 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Thu, 27 May 2010 21:17:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[10024] csw/mgar/pkg/gawk/trunk/Makefile Message-ID: Revision: 10024 http://gar.svn.sourceforge.net/gar/?rev=10024&view=rev Author: theferret Date: 2010-05-27 21:17:29 +0000 (Thu, 27 May 2010) Log Message: ----------- gawk: Makefile Modified Paths: -------------- csw/mgar/pkg/gawk/trunk/Makefile Modified: csw/mgar/pkg/gawk/trunk/Makefile =================================================================== --- csw/mgar/pkg/gawk/trunk/Makefile 2010-05-27 21:16:55 UTC (rev 10023) +++ csw/mgar/pkg/gawk/trunk/Makefile 2010-05-27 21:17:29 UTC (rev 10024) @@ -1,25 +1,57 @@ -GARNAME = gawk -GARVERSION = 3.1.3 -CATEGORIES = utils +#This Makefile originally generated from a template under +# pkg/TEMPLATES/createpkg +# You will most likely have to use GNU make to use it. -DESCRIPTION = A pattern scanning and processing language. -define BLURB - The awk utility interprets a special-purpose programming language that makes it - possible to handle simple data-reformatting jobs with just a few lines of code. -endef -MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +#Uncomment one of these definitions. The -b invokation, +# is suitable for use with small packages, where you want to have a few files +# in your top level src directory. It is also suitable for +# "relocateable" packages. see the createpkg docs for more details. +#CREATEPKG=createpkg -b `pwd` +CREATEPKG=createpkg -r `pwd`/build/*/cswstage -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -CONFIGURE_ARGS = $(DIRPATHS) +BUILDDIR=build/* -INSTALL_ARGS = $(foreach VAR, bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir infodir mandir includedir,$(VAR)=$($(VAR))) -include gar/category.mk -post-install: - (cd $(DESTDIR)$(bindir); ln -sf gawk awk) - $(MAKECOOKIE) +STDFILES=pkginfo copyright prototype +FILES= + +all: build package + + +build: build/.config.done + (cd $(BUILDDIR) ; \ + $(MAKE) ; \ + stagepkg ) + + +# dummy target for configure +build/.config.done: + (cd $(BUILDDIR) ; \ + test -f ../../patchfile.preconf && \ + gpatch -p0 <../../patchfile.preconf ; \ + ./configure --prefix=/opt/csw --enable-static=no ; \ + test -f ../../patchfile.postconf && \ + gpatch -p0 <../../patchfile.postconf ) + touch build/.config.done + + +# I tried depending this on $(BUILDDIR)/config.log but that didnt stick +configure: build/.config.done + +package: $(STDFILE) $(FILES) build + $(CREATEPKG) + + + +pkgclean: + rm -f *.pkg.gz package + +clean: pkgclean + cd $(BUILDDIR) && make clean + +reallyclean: clean + rm -f $BUILDDIR/config.log $BUILDDIR/config.cache $BUILDDIR/config.status + rm -f build/.config.done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Thu May 27 23:35:14 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Thu, 27 May 2010 21:35:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[10025] csw/mgar/pkg/TEMPLATES/createpkg/Makefile Message-ID: Revision: 10025 http://gar.svn.sourceforge.net/gar/?rev=10025&view=rev Author: theferret Date: 2010-05-27 21:35:14 +0000 (Thu, 27 May 2010) Log Message: ----------- TEMPLATES/createpkg Modified Paths: -------------- csw/mgar/pkg/TEMPLATES/createpkg/Makefile Modified: csw/mgar/pkg/TEMPLATES/createpkg/Makefile =================================================================== --- csw/mgar/pkg/TEMPLATES/createpkg/Makefile 2010-05-27 21:17:29 UTC (rev 10024) +++ csw/mgar/pkg/TEMPLATES/createpkg/Makefile 2010-05-27 21:35:14 UTC (rev 10025) @@ -29,12 +29,15 @@ # dummy target for configure build/.config.done: + @echo Configuring with: + @echo CC=$(CC) $(CFLAGS) + @echo CXX=$(CXX) $(CXXFLAGS) (cd $(BUILDDIR) ; \ test -f ../../patchfile.preconf && \ gpatch -p0 <../../patchfile.preconf ; \ - ./configure --prefix=/opt/csw --enable-static=no ; \ - test -f ../../patchfile.postconf && \ - gpatch -p0 <../../patchfile.postconf ) + ./configure --prefix=/opt/csw ; \ + if test -f ../../patchfile.postconf ; then \ + gpatch -p0 <../../patchfile.postconf ; fi) touch build/.config.done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Thu May 27 23:55:12 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Thu, 27 May 2010 21:55:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[10026] csw/mgar/pkg/gawk/trunk Message-ID: Revision: 10026 http://gar.svn.sourceforge.net/gar/?rev=10026&view=rev Author: theferret Date: 2010-05-27 21:55:12 +0000 (Thu, 27 May 2010) Log Message: ----------- gawk: make it work now Modified Paths: -------------- csw/mgar/pkg/gawk/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gawk/trunk/README csw/mgar/pkg/gawk/trunk/copyright csw/mgar/pkg/gawk/trunk/depend csw/mgar/pkg/gawk/trunk/pkginfo csw/mgar/pkg/gawk/trunk/prototype Modified: csw/mgar/pkg/gawk/trunk/Makefile =================================================================== --- csw/mgar/pkg/gawk/trunk/Makefile 2010-05-27 21:35:14 UTC (rev 10025) +++ csw/mgar/pkg/gawk/trunk/Makefile 2010-05-27 21:55:12 UTC (rev 10026) @@ -29,12 +29,15 @@ # dummy target for configure build/.config.done: + @echo Configuring with: + @echo CC=$(CC) $(CFLAGS) + @echo CXX=$(CXX) $(CXXFLAGS) (cd $(BUILDDIR) ; \ test -f ../../patchfile.preconf && \ gpatch -p0 <../../patchfile.preconf ; \ - ./configure --prefix=/opt/csw --enable-static=no ; \ - test -f ../../patchfile.postconf && \ - gpatch -p0 <../../patchfile.postconf ) + ./configure --prefix=/opt/csw ; \ + if test -f ../../patchfile.postconf ; then \ + gpatch -p0 <../../patchfile.postconf ; fi) touch build/.config.done @@ -42,10 +45,10 @@ configure: build/.config.done package: $(STDFILE) $(FILES) build + cp build/gawk*/COPYING `echo build/gawk*/cswstage/opt/csw/share/awk`/COPYING.gawk $(CREATEPKG) - pkgclean: rm -f *.pkg.gz package Added: csw/mgar/pkg/gawk/trunk/README =================================================================== --- csw/mgar/pkg/gawk/trunk/README (rev 0) +++ csw/mgar/pkg/gawk/trunk/README 2010-05-27 21:55:12 UTC (rev 10026) @@ -0,0 +1,14 @@ +Fine-tuning notes on gawk building: + +if [ `uname -p` = i386 ] ; then +CC=cc CFLAGS='-xstrconst -fast -xarch=386' ./configure --prefix=/opt/csw +else +CC=cc CFLAGS='-xstrconst -fast -xarch=v8' ./configure --prefix=/opt/csw +fi + + +# do NOT use --program-prefix=g +# For prototype fixups: +# change gawk-3.x.x if appropriate +# remove info/dir line +# change awk=gawk symlink to be for /opt/csw/gnu Added: csw/mgar/pkg/gawk/trunk/copyright =================================================================== --- csw/mgar/pkg/gawk/trunk/copyright (rev 0) +++ csw/mgar/pkg/gawk/trunk/copyright 2010-05-27 21:55:12 UTC (rev 10026) @@ -0,0 +1,2 @@ +Look in /opt/csw/share/awk/COPYING.gawk for copyright. +(GPL) Added: csw/mgar/pkg/gawk/trunk/depend =================================================================== --- csw/mgar/pkg/gawk/trunk/depend (rev 0) +++ csw/mgar/pkg/gawk/trunk/depend 2010-05-27 21:55:12 UTC (rev 10026) @@ -0,0 +1,3 @@ +P CSWggettextrt +P CSWlibsigsegv +P CSWcswclassutils Added: csw/mgar/pkg/gawk/trunk/pkginfo =================================================================== --- csw/mgar/pkg/gawk/trunk/pkginfo (rev 0) +++ csw/mgar/pkg/gawk/trunk/pkginfo 2010-05-27 21:55:12 UTC (rev 10026) @@ -0,0 +1,10 @@ +PKG=CSWgawk +NAME=gawk - GNU AWK +VERSION=3.1.8,REV=2010.05.26 +ARCH=i386 +CATEGORY=system +VENDOR=http://ftp.gnu.org/pub/gnu/gawk packaged for CSW by Philip Brown +HOTLINE=http://www.opencsw.org/bugtrack/ +EMAIL=phil at opencsw.org +OPENCSW_REPOSITORY=https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/gawk/trunk +CLASSES=none cswtexinfo Added: csw/mgar/pkg/gawk/trunk/prototype =================================================================== --- csw/mgar/pkg/gawk/trunk/prototype (rev 0) +++ csw/mgar/pkg/gawk/trunk/prototype 2010-05-27 21:55:12 UTC (rev 10026) @@ -0,0 +1,105 @@ +i pkginfo +i copyright +i depend +d none /opt/csw/libexec 0755 root bin +d none /opt/csw/libexec/awk 0755 root bin +f none /opt/csw/libexec/awk/pwcat 0755 root bin +f none /opt/csw/libexec/awk/grcat 0755 root bin +d none /opt/csw/share 0755 root bin +d none /opt/csw/share/info 0755 root bin +f cswtexinfo /opt/csw/share/info/gawk.info 0644 root bin +f cswtexinfo /opt/csw/share/info/gawkinet.info 0644 root bin +d none /opt/csw/share/awk 0755 root bin +f none /opt/csw/share/awk/COPYING.gawk 0644 root bin +f none /opt/csw/share/awk/ftrans.awk 0644 root bin +f none /opt/csw/share/awk/ord.awk 0644 root bin +f none /opt/csw/share/awk/nextfile.awk 0644 root bin +f none /opt/csw/share/awk/bits2str.awk 0644 root bin +f none /opt/csw/share/awk/ctime.awk 0644 root bin +f none /opt/csw/share/awk/gettime.awk 0644 root bin +f none /opt/csw/share/awk/rewind.awk 0644 root bin +f none /opt/csw/share/awk/cliff_rand.awk 0644 root bin +f none /opt/csw/share/awk/zerofile.awk 0644 root bin +f none /opt/csw/share/awk/libintl.awk 0644 root bin +f none /opt/csw/share/awk/readable.awk 0644 root bin +f none /opt/csw/share/awk/round.awk 0644 root bin +f none /opt/csw/share/awk/group.awk 0644 root bin +f none /opt/csw/share/awk/join.awk 0644 root bin +f none /opt/csw/share/awk/getopt.awk 0644 root bin +f none /opt/csw/share/awk/assert.awk 0644 root bin +f none /opt/csw/share/awk/noassign.awk 0644 root bin +f none /opt/csw/share/awk/strtonum.awk 0644 root bin +f none /opt/csw/share/awk/passwd.awk 0644 root bin +d none /opt/csw/share/locale 0755 root bin +d none /opt/csw/share/locale/rw 0755 root bin +d none /opt/csw/share/locale/rw/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/rw/LC_MESSAGES/gawk.mo 0644 root bin +d none /opt/csw/share/locale/zh_CN 0755 root bin +d none /opt/csw/share/locale/zh_CN/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/zh_CN/LC_MESSAGES/gawk.mo 0644 root bin +d none /opt/csw/share/locale/he 0755 root bin +d none /opt/csw/share/locale/he/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/he/LC_MESSAGES/gawk.mo 0644 root bin +d none /opt/csw/share/locale/fr 0755 root bin +d none /opt/csw/share/locale/fr/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/fr/LC_MESSAGES/gawk.mo 0644 root bin +d none /opt/csw/share/locale/nl 0755 root bin +d none /opt/csw/share/locale/nl/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/nl/LC_MESSAGES/gawk.mo 0644 root bin +d none /opt/csw/share/locale/ga 0755 root bin +d none /opt/csw/share/locale/ga/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ga/LC_MESSAGES/gawk.mo 0644 root bin +d none /opt/csw/share/locale/es 0755 root bin +d none /opt/csw/share/locale/es/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/es/LC_MESSAGES/gawk.mo 0644 root bin +d none /opt/csw/share/locale/pl 0755 root bin +d none /opt/csw/share/locale/pl/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/pl/LC_MESSAGES/gawk.mo 0644 root bin +d none /opt/csw/share/locale/ro 0755 root bin +d none /opt/csw/share/locale/ro/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ro/LC_MESSAGES/gawk.mo 0644 root bin +d none /opt/csw/share/locale/it 0755 root bin +d none /opt/csw/share/locale/it/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/it/LC_MESSAGES/gawk.mo 0644 root bin +d none /opt/csw/share/locale/pt_BR 0755 root bin +d none /opt/csw/share/locale/pt_BR/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/pt_BR/LC_MESSAGES/gawk.mo 0644 root bin +d none /opt/csw/share/locale/ca 0755 root bin +d none /opt/csw/share/locale/ca/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ca/LC_MESSAGES/gawk.mo 0644 root bin +d none /opt/csw/share/locale/tr 0755 root bin +d none /opt/csw/share/locale/tr/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/tr/LC_MESSAGES/gawk.mo 0644 root bin +d none /opt/csw/share/locale/da 0755 root bin +d none /opt/csw/share/locale/da/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/da/LC_MESSAGES/gawk.mo 0644 root bin +d none /opt/csw/share/locale/ja 0755 root bin +d none /opt/csw/share/locale/ja/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ja/LC_MESSAGES/gawk.mo 0644 root bin +d none /opt/csw/share/locale/de 0755 root bin +d none /opt/csw/share/locale/de/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/de/LC_MESSAGES/gawk.mo 0644 root bin +d none /opt/csw/share/locale/vi 0755 root bin +d none /opt/csw/share/locale/vi/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/vi/LC_MESSAGES/gawk.mo 0644 root bin +d none /opt/csw/share/locale/ast 0755 root bin +d none /opt/csw/share/locale/ast/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ast/LC_MESSAGES/gawk.mo 0644 root bin +d none /opt/csw/share/locale/sv 0755 root bin +d none /opt/csw/share/locale/sv/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/sv/LC_MESSAGES/gawk.mo 0644 root bin +d none /opt/csw/share/locale/id 0755 root bin +d none /opt/csw/share/locale/id/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/id/LC_MESSAGES/gawk.mo 0644 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/pgawk.1 0644 root bin +l none /opt/csw/share/man/man1/gawk.1=pgawk.1 +f none /opt/csw/share/man/man1/igawk.1 0644 root bin +d none /opt/csw/bin 0755 root bin +f none /opt/csw/bin/pgawk-3.1.8 0755 root bin +s none /opt/csw/gnu/awk=../bin/gawk +f none /opt/csw/bin/igawk 0755 root bin +f none /opt/csw/bin/gawk-3.1.8 0755 root bin +l none /opt/csw/bin/gawk=gawk-3.1.8 +l none /opt/csw/bin/pgawk=pgawk-3.1.8 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Fri May 28 00:26:45 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Thu, 27 May 2010 22:26:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[10027] csw/mgar/pkg/xpm/trunk Message-ID: Revision: 10027 http://gar.svn.sourceforge.net/gar/?rev=10027&view=rev Author: theferret Date: 2010-05-27 22:26:45 +0000 (Thu, 27 May 2010) Log Message: ----------- xpm: adds for sparcv9 build Modified Paths: -------------- csw/mgar/pkg/xpm/trunk/Makefile csw/mgar/pkg/xpm/trunk/README csw/mgar/pkg/xpm/trunk/prototype.sparc Modified: csw/mgar/pkg/xpm/trunk/Makefile =================================================================== --- csw/mgar/pkg/xpm/trunk/Makefile 2010-05-27 21:55:12 UTC (rev 10026) +++ csw/mgar/pkg/xpm/trunk/Makefile 2010-05-27 22:26:45 UTC (rev 10027) @@ -11,10 +11,14 @@ CREATEPKG=createpkg -r `pwd`/build/*/cswstage -BUILDDIR=build/* +BUILDDIR=build/libXpm* +## hax for sparcv9 +RAWLIB=libXpm.so.4.11.0 +XPM_PC=build/libXpm-3.5.8/cswstage/opt/csw/lib/pkgconfig/xpm.pc + STDFILES=pkginfo copyright prototype FILES= @@ -27,6 +31,21 @@ stagepkg ) +sparcv9: + (cd $(BUILDDIR)/src ; \ + gmake clean; \ + gmake CFLAGS='-xstrconst -fast -xarch=v9' \ + LDFLAGS='-R/opt/csw/lib/sparcv9 -L/opt/csw/lib/sparcv9' ; \ + strip .libs/$(RAWLIB); \ + cp .libs/$(RAWLIB) ../cswstage ; cd .. ;\ + sed 's:libdir=.*:/opt/csw/lib/sparcv9:' xpm.pc>cswstage/xpm.pc.sparcv9 ; \ + echo sparcv9 build done ) + +hack: + ( cd $(BUILDDIR) ; \ + sed 's:libdir=.*:/opt/csw/lib/sparcv9:' xpm.pc>cswstage/xpm.pc.sparcv9 ) + + # dummy target for configure build/.config.done: (cd $(BUILDDIR) ; \ @@ -41,7 +60,8 @@ # I tried depending this on $(BUILDDIR)/config.log but that didnt stick configure: build/.config.done -package: $(STDFILE) $(FILES) build +package: $(STDFILE) $(FILES) + @echo Building package for `uname -p` $(CREATEPKG) Modified: csw/mgar/pkg/xpm/trunk/README =================================================================== --- csw/mgar/pkg/xpm/trunk/README 2010-05-27 21:55:12 UTC (rev 10026) +++ csw/mgar/pkg/xpm/trunk/README 2010-05-27 22:26:45 UTC (rev 10027) @@ -1,13 +1,15 @@ -This is the first time Phil is doing an actual "needs compiling" -package in svn. +Current build methodology for libXpm is as follows: -Current build methodology theory is as follows: - mkdir build (extract source tarfile under there) -(come back to this location) -make +come back to this location) + make + make package and it should just All Magically Work. +except for sparc, where you have to do -But this is only theory. i have to test it now :) +make +make sparcv9 +make package + Modified: csw/mgar/pkg/xpm/trunk/prototype.sparc =================================================================== --- csw/mgar/pkg/xpm/trunk/prototype.sparc 2010-05-27 21:55:12 UTC (rev 10026) +++ csw/mgar/pkg/xpm/trunk/prototype.sparc 2010-05-27 22:26:45 UTC (rev 10027) @@ -18,8 +18,8 @@ s none /opt/csw/lib/libXpm.so=libXpm.so.4.11.0 d none /opt/csw/lib/pkgconfig 0755 root bin f none /opt/csw/lib/pkgconfig/xpm.pc 0644 root bin -f none /opt/csw/lib/sparcv9/libXpm.so.4.11.0 0755 root bin +f none /opt/csw/lib/sparcv9/libXpm.so.4.11.0=libXpm.so.4.11.0 0755 root bin s none /opt/csw/lib/sparcv9/libXpm.so.4=libXpm.so.4.11.0 s none /opt/csw/lib/sparcv9/libXpm.so=libXpm.so.4.11.0 d none /opt/csw/lib/sparcv9/pkgconfig 0755 root bin -f none /opt/csw/lib/sparcv9/pkgconfig/xpm.pc 0644 root bin +f none /opt/csw/lib/sparcv9/pkgconfig/xpm.pc=xpm.pc.sparcv9 0644 root bin 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 May 28 06:04:36 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 28 May 2010 04:04:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[10028] csw/mgar/pkg/openldap/trunk/Makefile Message-ID: Revision: 10028 http://gar.svn.sourceforge.net/gar/?rev=10028&view=rev Author: rthurner Date: 2010-05-28 04:04:36 +0000 (Fri, 28 May 2010) Log Message: ----------- openldap - remove references to old bdb, and comments Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2010-05-27 22:26:45 UTC (rev 10027) +++ csw/mgar/pkg/openldap/trunk/Makefile 2010-05-28 04:04:36 UTC (rev 10028) @@ -43,7 +43,7 @@ SPKG_DESC_CSWoldapdevel = OpenLDAP development support SPKG_DESC_CSWoldaprt = OpenLDAP runtime libraries -RUNTIME_DEP_PKGS_CSWoldap = CSWbdb CSWbdb48 CSWlibnet CSWlibtoolrt +RUNTIME_DEP_PKGS_CSWoldap = CSWbdb48 CSWlibnet CSWlibtoolrt RUNTIME_DEP_PKGS_CSWoldap += CSWosslrt CSWsasl CSWtcpwrap CSWunixodbc RUNTIME_DEP_PKGS_CSWoldap += CSWlibicu CSWperl RUNTIME_DEP_PKGS_CSWoldapclient = CSWlibnet CSWosslrt CSWsasl @@ -115,10 +115,6 @@ INITSMF = /opt/csw/etc/init.d/cswopenldap -#CHECKPKG_OVERRIDES_CSWoldap += deprecated-library|opt/csw/libexec/amd64/openldap/back_perl-2.4.so.2.5.4|Deprecated|Berkeley|DB|location|/opt/csw/lib/libdb-4.7.so -#CHECKPKG_OVERRIDES_CSWoldap += deprecated-library|opt/csw/libexec/openldap/back_perl-2.4.so.2.5.4|Deprecated|Berkeley|DB|location|/opt/csw/lib/libdb-4.7.so -#CHECKPKG_OVERRIDES_CSWoldap += soname-not-found|libm.so.2 - ARCHALL_CSWoldapdevel = 1 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 May 28 06:32:35 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 28 May 2010 04:32:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[10029] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 10029 http://gar.svn.sourceforge.net/gar/?rev=10029&view=rev Author: rthurner Date: 2010-05-28 04:32:35 +0000 (Fri, 28 May 2010) Log Message: ----------- svn - remove bdb direct references as now the old bdb is not any more in /opt/csw Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-05-28 04:04:36 UTC (rev 10028) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-05-28 04:32:35 UTC (rev 10029) @@ -148,10 +148,8 @@ SVNLIB = $(prefix)/lib/svn JAVA_HOME = /usr/jdk1.6.0_20 -EXTRA_INC = /opt/csw/bdb48/include EXTRA_INC += $(prefix)/apache2/include -EXTRA_LIB = /opt/csw/bdb48/lib EXTRA_LIB += /opt/csw/apache2/lib EXTRA_LIB += $(SVNLIB) EXTRA_LINKER_FLAGS = -lintl -liconv This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri May 28 16:36:46 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 28 May 2010 14:36:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[10030] csw/mgar/gar/v2/lib/python Message-ID: Revision: 10030 http://gar.svn.sourceforge.net/gar/?rev=10030&view=rev Author: wahwah Date: 2010-05-28 14:36:46 +0000 (Fri, 28 May 2010) Log Message: ----------- mGAR v2: Devel packages shouldn't be ARCHALL = 1 Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-05-28 04:32:35 UTC (rev 10029) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-05-28 14:36:46 UTC (rev 10030) @@ -48,6 +48,10 @@ MAX_PKGNAME_LENGTH = 20 ARCH_LIST = ["sparc", "i386", "all"] VERSION_RE = r".*,REV=(20[01][0-9]\.[0-9][0-9]\.[0-9][0-9]).*" +# Pkgnames matching these regexes must not be ARCHALL = 1 +ARCH_SPECIFIC_PKGNAMES_RE_LIST = [ + re.compile(r".*dev(el)?$"), +] # At some point, it was used to prevent people from linking against # libX11.so.4, but due to issues with 3D acceleration. @@ -361,6 +365,10 @@ "archall-with-binaries", binary, "package contains binary %s" % binary)) + for pkgname_re in ARCH_SPECIFIC_PKGNAMES_RE_LIST: + if pkgname_re.match(pkgname): + reasons_to_be_arch_specific.append(( + "archall-devel-package", None, None)) if arch == "all": for tag, param, desc in reasons_to_be_arch_specific: error_mgr.ReportError(tag, param, desc) Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-05-28 04:32:35 UTC (rev 10029) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-05-28 14:36:46 UTC (rev 10030) @@ -223,17 +223,26 @@ 'srv4-filename-architecture-mismatch', 'pkginfo=i386 filename=rsync-3.0.7,REV=2010.02.17-SunOS5.8-sparc-CSW.pkg.gz') -class TestCheckArchitectureVsContents(CheckpkgUnitTestHelper, unittest.TestCase): +class TestCheckArchitectureVsContents_Devel_1(CheckpkgUnitTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckArchitectureVsContents' def CheckpkgTest(self): - # TODO: Update this. - # self.pkg_data["pkgmap"] = self.LoadData("example-1-pkgmap") - # self.pkg_data["binaries"] = [] - # self.pkg_data["pkginfo"] = self.LoadData("example-1-pkginfo") - # errors = pc.CheckArchitectureVsContents(self.pkg_data_2, False) - # self.failIf(errors) - pass + self.pkg_data["binaries"] = [] + self.pkg_data["binaries_dump_info"] = [] + self.pkg_data["pkgmap"] = [] + self.pkg_data["basic_stats"]["pkgname"] = "CSWfoo_devel" + self.pkg_data["pkginfo"]["ARCH"] = "all" + self.error_mgr_mock.ReportError('archall-devel-package', None, None) +class TestCheckArchitectureVsContents_Devel_2(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckArchitectureVsContents' + def CheckpkgTest(self): + self.pkg_data["binaries"] = [] + self.pkg_data["binaries_dump_info"] = [] + self.pkg_data["pkgmap"] = [] + self.pkg_data["basic_stats"]["pkgname"] = "CSWfoodev" + self.pkg_data["pkginfo"]["ARCH"] = "all" + self.error_mgr_mock.ReportError('archall-devel-package', None, None) + class TestCheckFileNameSanity(CheckpkgUnitTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckFileNameSanity' def CheckpkgTest(self): 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 May 28 19:05:25 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 28 May 2010 17:05:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[10031] csw/mgar/pkg/libsigcpp/trunk/Makefile Message-ID: Revision: 10031 http://gar.svn.sourceforge.net/gar/?rev=10031&view=rev Author: dmichelsen Date: 2010-05-28 17:05:24 +0000 (Fri, 28 May 2010) Log Message: ----------- libsigcpp: Add incompatible package CSWsigc++ Modified Paths: -------------- csw/mgar/pkg/libsigcpp/trunk/Makefile Modified: csw/mgar/pkg/libsigcpp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsigcpp/trunk/Makefile 2010-05-28 14:36:46 UTC (rev 10030) +++ csw/mgar/pkg/libsigcpp/trunk/Makefile 2010-05-28 17:05:24 UTC (rev 10031) @@ -23,6 +23,8 @@ CATALOGNAME_CSWlibsigc++ = libsigc++ CATALOGNAME_CSWlibsigc++devel = libsigc++_devel +# CSWsigc++ is the previous package name +INCOMPATIBLE_PKGS_CSWlibsigc++ = CSWsigc++ RUNTIME_DEP_PKGS_CSWlibsigc++devel = CSWlibsigc++ BUILD64 = 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 Sat May 29 14:17:23 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 29 May 2010 12:17:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[10032] csw/mgar/pkg/sharutils/trunk Message-ID: Revision: 10032 http://gar.svn.sourceforge.net/gar/?rev=10032&view=rev Author: rthurner Date: 2010-05-29 12:17:23 +0000 (Sat, 29 May 2010) Log Message: ----------- sharutils - upgrade to 4.9 Modified Paths: -------------- csw/mgar/pkg/sharutils/trunk/Makefile csw/mgar/pkg/sharutils/trunk/checksums Modified: csw/mgar/pkg/sharutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/sharutils/trunk/Makefile 2010-05-28 17:05:24 UTC (rev 10031) +++ csw/mgar/pkg/sharutils/trunk/Makefile 2010-05-29 12:17:23 UTC (rev 10032) @@ -3,13 +3,13 @@ # $Id$ GARNAME = sharutils -GARVERSION = 4.6.3 +GARVERSION = 4.9 CATEGORIES = utils DESCRIPTION = makes so-called shell archives out of many files define BLURB endef SPKG_SOURCEURL = http://www.gnu.org/software/sharutils/ -MASTER_SITES = ftp://ftp.gnu.org/gnu/sharutils/REL-$(GARVERSION)/ +MASTER_SITES = ftp://ftp.gnu.org/gnu/sharutils/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz TEST_TARGET = check Modified: csw/mgar/pkg/sharutils/trunk/checksums =================================================================== --- csw/mgar/pkg/sharutils/trunk/checksums 2010-05-28 17:05:24 UTC (rev 10031) +++ csw/mgar/pkg/sharutils/trunk/checksums 2010-05-29 12:17:23 UTC (rev 10032) @@ -1,2 +1,2 @@ -74127a560e59be6dfa8b59993eb0ca91 sharutils-4.6.3.tar.gz +c40c7b6e2180ed57060393efc3234130 sharutils-4.9.tar.gz 528eb43a02b3208d5ff7d9ff43ed0c2f sun-sed.patch 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 May 29 15:39:44 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 29 May 2010 13:39:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[10033] csw/mgar/pkg Message-ID: Revision: 10033 http://gar.svn.sourceforge.net/gar/?rev=10033&view=rev Author: rthurner Date: 2010-05-29 13:39:43 +0000 (Sat, 29 May 2010) Log Message: ----------- gnuplot: gar-v2 initial Added Paths: ----------- csw/mgar/pkg/gnuplot/ csw/mgar/pkg/gnuplot/branches/ csw/mgar/pkg/gnuplot/tags/ csw/mgar/pkg/gnuplot/trunk/ csw/mgar/pkg/gnuplot/trunk/Makefile csw/mgar/pkg/gnuplot/trunk/checksums csw/mgar/pkg/gnuplot/trunk/files/ Property changes on: csw/mgar/pkg/gnuplot/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/gnuplot/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnuplot/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gnuplot/trunk/Makefile 2010-05-29 13:39:43 UTC (rev 10033) @@ -0,0 +1,16 @@ +GARNAME = gnuplot +GARVERSION = 4.4.0 +CATEGORIES = utils + +DESCRIPTION = The Gnuplot Plotting Utility +define BLURB + The Gnuplot Plotting Utility. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +include gar/category.mk Property changes on: csw/mgar/pkg/gnuplot/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/gnuplot/trunk/checksums =================================================================== --- csw/mgar/pkg/gnuplot/trunk/checksums (rev 0) +++ csw/mgar/pkg/gnuplot/trunk/checksums 2010-05-29 13:39:43 UTC (rev 10033) @@ -0,0 +1 @@ +e708665bd512153ad5c35252fe499059 gnuplot-4.4.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 Sat May 29 22:19:25 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 29 May 2010 20:19:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[10034] csw/mgar/pkg/sysstat/trunk Message-ID: Revision: 10034 http://gar.svn.sourceforge.net/gar/?rev=10034&view=rev Author: dmichelsen Date: 2010-05-29 20:19:24 +0000 (Sat, 29 May 2010) Log Message: ----------- sysstat: Update to 20100528 Modified Paths: -------------- csw/mgar/pkg/sysstat/trunk/Makefile csw/mgar/pkg/sysstat/trunk/checksums Modified: csw/mgar/pkg/sysstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/sysstat/trunk/Makefile 2010-05-29 13:39:43 UTC (rev 10033) +++ csw/mgar/pkg/sysstat/trunk/Makefile 2010-05-29 20:19:24 UTC (rev 10034) @@ -1,5 +1,5 @@ GARNAME = sysstat -GARVERSION = 20100315 +GARVERSION = 20100528 CATEGORIES = utils DESCRIPTION = Key system statistics at a glance Modified: csw/mgar/pkg/sysstat/trunk/checksums =================================================================== --- csw/mgar/pkg/sysstat/trunk/checksums 2010-05-29 13:39:43 UTC (rev 10033) +++ csw/mgar/pkg/sysstat/trunk/checksums 2010-05-29 20:19:24 UTC (rev 10034) @@ -1,2 +1,2 @@ 7a7f0f67bb68484b56375d4a922fb63f patch-onlyisaexec-sysstatd.diff -8a5d9095ac0648f41333bb60e3d9f5ee sysstat-20100315.tgz +b721313f486f03ae60f7329a0fb54940 sysstat-20100528.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 May 29 22:23:39 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 29 May 2010 20:23:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[10035] csw/mgar/pkg/sysstat/trunk/Makefile Message-ID: Revision: 10035 http://gar.svn.sourceforge.net/gar/?rev=10035&view=rev Author: dmichelsen Date: 2010-05-29 20:23:39 +0000 (Sat, 29 May 2010) Log Message: ----------- sysstat: Add override Modified Paths: -------------- csw/mgar/pkg/sysstat/trunk/Makefile Modified: csw/mgar/pkg/sysstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/sysstat/trunk/Makefile 2010-05-29 20:19:24 UTC (rev 10034) +++ csw/mgar/pkg/sysstat/trunk/Makefile 2010-05-29 20:23:39 UTC (rev 10035) @@ -60,6 +60,8 @@ PROTOTYPE_FILES_makesuid = .*/sysstatd PROTOTYPE_PERMS_makesuid = 4755 +CHECKPKG_OVERRIDES_CSWsysstat += soname-not-found|libm.so.2|is|needed|by|opt/csw/sbin/amd64/sysstatd + include gar/category.mk # We don't have a autoconf-style configure. The configure script 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 May 29 22:33:35 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 29 May 2010 20:33:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[10036] csw/mgar/pkg/wdiff/trunk Message-ID: Revision: 10036 http://gar.svn.sourceforge.net/gar/?rev=10036&view=rev Author: dmichelsen Date: 2010-05-29 20:33:34 +0000 (Sat, 29 May 2010) Log Message: ----------- wdiff: Update to 0.6.2 Modified Paths: -------------- csw/mgar/pkg/wdiff/trunk/Makefile csw/mgar/pkg/wdiff/trunk/checksums Modified: csw/mgar/pkg/wdiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/wdiff/trunk/Makefile 2010-05-29 20:23:39 UTC (rev 10035) +++ csw/mgar/pkg/wdiff/trunk/Makefile 2010-05-29 20:33:34 UTC (rev 10036) @@ -1,6 +1,6 @@ # : Makefile 9089 2010-03-11 08:34:46Z wahwah $ GARNAME = wdiff -GARVERSION = 0.6.1 +GARVERSION = 0.6.2 CATEGORIES = utils DESCRIPTION = A front end to diff for comparing files on a word per word basis @@ -13,6 +13,8 @@ # File name regex to get notifications about upstream software releases UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +VENDOR_URL = http://www.gnu.org/software/wdiff/ + DEP_PKGS = CSWggettextrt CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/wdiff/trunk/checksums =================================================================== --- csw/mgar/pkg/wdiff/trunk/checksums 2010-05-29 20:23:39 UTC (rev 10035) +++ csw/mgar/pkg/wdiff/trunk/checksums 2010-05-29 20:33:34 UTC (rev 10036) @@ -1 +1 @@ -cb8ed3569f9c020edbfbc145df6ba602 wdiff-0.6.1.tar.gz +bf8474129a47b3a002af969a77612593 wdiff-0.6.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Sun May 30 01:30:46 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Sat, 29 May 2010 23:30:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[10037] csw/mgar/pkg/TEMPLATES/createpkg/generate_pkginfo Message-ID: Revision: 10037 http://gar.svn.sourceforge.net/gar/?rev=10037&view=rev Author: theferret Date: 2010-05-29 23:30:46 +0000 (Sat, 29 May 2010) Log Message: ----------- createpkg/generate_pkginfo Modified Paths: -------------- csw/mgar/pkg/TEMPLATES/createpkg/generate_pkginfo Modified: csw/mgar/pkg/TEMPLATES/createpkg/generate_pkginfo =================================================================== --- csw/mgar/pkg/TEMPLATES/createpkg/generate_pkginfo 2010-05-29 20:33:34 UTC (rev 10036) +++ csw/mgar/pkg/TEMPLATES/createpkg/generate_pkginfo 2010-05-29 23:30:46 UTC (rev 10037) @@ -5,10 +5,10 @@ print PKG=CSW$1 -print NAME=CSW$1 - description goes here +print NAME=$1 - description goes here print VERSION=1.0,REV=`date '+%Y.%m.%d'` print CATEGORY=application -print VENDOR=http://www.opencsw.org/ packaged for CSW by $FULLNAME +print VENDOR=http://www.SOURCE-URL/ packaged for CSW by $FULLNAME print HOTLINE=http://www.opencsw.org/bugtrack/ print EMAIL=$USER at opencsw.org This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Sun May 30 02:01:38 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Sun, 30 May 2010 00:01:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[10038] csw/mgar/pkg/xpm/trunk/Makefile Message-ID: Revision: 10038 http://gar.svn.sourceforge.net/gar/?rev=10038&view=rev Author: theferret Date: 2010-05-30 00:01:38 +0000 (Sun, 30 May 2010) Log Message: ----------- xpm: minor Makefile tweak Modified Paths: -------------- csw/mgar/pkg/xpm/trunk/Makefile Modified: csw/mgar/pkg/xpm/trunk/Makefile =================================================================== --- csw/mgar/pkg/xpm/trunk/Makefile 2010-05-29 23:30:46 UTC (rev 10037) +++ csw/mgar/pkg/xpm/trunk/Makefile 2010-05-30 00:01:38 UTC (rev 10038) @@ -34,7 +34,7 @@ sparcv9: (cd $(BUILDDIR)/src ; \ gmake clean; \ - gmake CFLAGS='-xstrconst -fast -xarch=v9' \ + LD_OPTIONS="" gmake CFLAGS='-xstrconst -fast -xarch=v9' \ LDFLAGS='-R/opt/csw/lib/sparcv9 -L/opt/csw/lib/sparcv9' ; \ strip .libs/$(RAWLIB); \ cp .libs/$(RAWLIB) ../cswstage ; cd .. ;\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Sun May 30 02:07:08 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Sun, 30 May 2010 00:07:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[10039] csw/mgar/pkg/TEMPLATES/createpkg/Makefile.sparcv9 Message-ID: Revision: 10039 http://gar.svn.sourceforge.net/gar/?rev=10039&view=rev Author: theferret Date: 2010-05-30 00:07:08 +0000 (Sun, 30 May 2010) Log Message: ----------- TEMPLATES/createpkg: added new Makefile Added Paths: ----------- csw/mgar/pkg/TEMPLATES/createpkg/Makefile.sparcv9 Added: csw/mgar/pkg/TEMPLATES/createpkg/Makefile.sparcv9 =================================================================== --- csw/mgar/pkg/TEMPLATES/createpkg/Makefile.sparcv9 (rev 0) +++ csw/mgar/pkg/TEMPLATES/createpkg/Makefile.sparcv9 2010-05-30 00:07:08 UTC (rev 10039) @@ -0,0 +1,85 @@ +#This Makefile originally generated from a template under +# pkg/TEMPLATES/createpkg +# You will most likely have to use GNU make to use it. +# This is one specifically hacked to make building sparcv9 packages +# easier. +# +# Steps to use: +# +# 1. put your normal prototype as prototype.i386 +# 2. copy to prototype.sparc and edit as appropriate +# 3. search for "XXX" and replace with appropriate string +# +# 4. build your package with: +# "make", "make sparcv9", "make package" + + +#Uncomment one of these definitions. The -b invokation, +# is suitable for use with small packages, where you want to have a few files +# in your top level src directory. It is also suitable for +# "relocateable" packages. see the createpkg docs for more details. +#CREATEPKG=createpkg -b `pwd` +CREATEPKG=createpkg -r `pwd`/build/*/cswstage + +## hax for sparcv9 +RAWLIB=libXXX.so.#.#.# + + +BUILDDIR=build/* + + + +STDFILES=pkginfo copyright prototype +FILES= + +all: build + + +build: build/.config.done + (cd $(BUILDDIR) ; \ + $(MAKE) ; \ + stagepkg ) + + +# dummy target for configure +build/.config.done: + @echo Configuring with: + @echo CC=$(CC) $(CFLAGS) + @echo CXX=$(CXX) $(CXXFLAGS) + (cd $(BUILDDIR) ; \ + test -f ../../patchfile.preconf && \ + gpatch -p0 <../../patchfile.preconf ; \ + ./configure --prefix=/opt/csw --disable-static ; \ + if test -f ../../patchfile.postconf ; then \ + gpatch -p0 <../../patchfile.postconf ; fi) + touch build/.config.done + + +# I tried depending this on $(BUILDDIR)/config.log but that didnt stick +configure: build/.config.done + +sparcv9: + (cd $(BUILDDIR)/src ; \ + gmake clean; \ + LD_OPTIONS="" gmake CFLAGS='-xstrconst -fast -xarch=v9' \ + LDFLAGS='-R/opt/csw/lib/sparcv9 -L/opt/csw/lib/sparcv9' ; \ + strip .libs/$(RAWLIB); \ + cp .libs/$(RAWLIB) ../cswstage ; cd .. ;\ + sed 's:libdir=.*:/opt/csw/lib/sparcv9:' XXX.pc>cswstage/XXX.pc.sparcv9 ; \ + echo sparcv9 build done ) + + +package: $(STDFILE) $(FILES) + $(CREATEPKG) + + + +pkgclean: + rm -f *.pkg.gz package + +clean: pkgclean + cd $(BUILDDIR) && make clean + +reallyclean: clean + rm -f $BUILDDIR/config.log $BUILDDIR/config.cache $BUILDDIR/config.status + rm -f build/.config.done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Sun May 30 02:13:13 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Sun, 30 May 2010 00:13:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[10040] csw/mgar/pkg Message-ID: Revision: 10040 http://gar.svn.sourceforge.net/gar/?rev=10040&view=rev Author: theferret Date: 2010-05-30 00:13:13 +0000 (Sun, 30 May 2010) Log Message: ----------- libxft2: quick relocation under /opt/csw instead of /opt/csw/X11 Added Paths: ----------- csw/mgar/pkg/libxft2/ csw/mgar/pkg/libxft2/trunk/ csw/mgar/pkg/libxft2/trunk/Makefile csw/mgar/pkg/libxft2/trunk/README csw/mgar/pkg/libxft2/trunk/copyright csw/mgar/pkg/libxft2/trunk/depend csw/mgar/pkg/libxft2/trunk/pkginfo csw/mgar/pkg/libxft2/trunk/prototype.i386 csw/mgar/pkg/libxft2/trunk/prototype.sparc Property changes on: csw/mgar/pkg/libxft2/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work cswstage build Added: csw/mgar/pkg/libxft2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxft2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libxft2/trunk/Makefile 2010-05-30 00:13:13 UTC (rev 10040) @@ -0,0 +1,85 @@ +#This Makefile originally generated from a template under +# pkg/TEMPLATES/createpkg +# You will most likely have to use GNU make to use it. +# This is one specifically hacked to make building sparcv9 packages +# easier. +# +# Steps to use: +# +# 1. put your normal prototype as prototype.i386 +# 2. copy to prototype.sparc and edit as appropriate +# 3. search for "XXX" and replace with appropriate string +# +# 4. build your package with: +# "make", "make sparcv9", "make package" + + +#Uncomment one of these definitions. The -b invokation, +# is suitable for use with small packages, where you want to have a few files +# in your top level src directory. It is also suitable for +# "relocateable" packages. see the createpkg docs for more details. +#CREATEPKG=createpkg -b `pwd` +CREATEPKG=createpkg -r `pwd`/build/*/cswstage + +## hax for sparcv9 +RAWLIB=libXft.so.2.1.13 + + +BUILDDIR=build/* + + + +STDFILES=pkginfo copyright prototype +FILES= + +all: build + + +build: build/.config.done + (cd $(BUILDDIR) ; \ + $(MAKE) ; \ + stagepkg ) + + +# dummy target for configure +build/.config.done: + @echo Configuring with: + @echo CC=$(CC) $(CFLAGS) + @echo CXX=$(CXX) $(CXXFLAGS) + (cd $(BUILDDIR) ; \ + test -f ../../patchfile.preconf && \ + gpatch -p0 <../../patchfile.preconf ; \ + ./configure --prefix=/opt/csw --disable-static ; \ + if test -f ../../patchfile.postconf ; then \ + gpatch -p0 <../../patchfile.postconf ; fi) + touch build/.config.done + + +# I tried depending this on $(BUILDDIR)/config.log but that didnt stick +configure: build/.config.done + +sparcv9: + (cd $(BUILDDIR)/src ; \ + gmake clean; \ + LD_OPTIONS="" gmake CFLAGS='-xstrconst -fast -xarch=v9' \ + LDFLAGS='-R/opt/csw/lib/sparcv9 -L/opt/csw/lib/sparcv9' ; \ + strip .libs/$(RAWLIB); \ + cp .libs/$(RAWLIB) ../cswstage ; cd .. ;\ + sed 's:libdir=.*:/opt/csw/lib/sparcv9:' xft.pc>cswstage/xft.pc.sparcv9 ; \ + echo sparcv9 build done ) + + +package: $(STDFILE) $(FILES) + $(CREATEPKG) + + + +pkgclean: + rm -f *.pkg.gz package + +clean: pkgclean + cd $(BUILDDIR) && make clean + +reallyclean: clean + rm -f $BUILDDIR/config.log $BUILDDIR/config.cache $BUILDDIR/config.status + rm -f build/.config.done Added: csw/mgar/pkg/libxft2/trunk/README =================================================================== --- csw/mgar/pkg/libxft2/trunk/README (rev 0) +++ csw/mgar/pkg/libxft2/trunk/README 2010-05-30 00:13:13 UTC (rev 10040) @@ -0,0 +1,5 @@ +This is a "Phil quickie special", because William is rather busy right now. + + +nothing special here. just extract libxft2 in build, then type "make" here. + Added: csw/mgar/pkg/libxft2/trunk/copyright =================================================================== --- csw/mgar/pkg/libxft2/trunk/copyright (rev 0) +++ csw/mgar/pkg/libxft2/trunk/copyright 2010-05-30 00:13:13 UTC (rev 10040) @@ -0,0 +1,21 @@ + +Copyright ? 2001,2003 Keith Packard + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Keith Packard not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Keith Packard makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + Added: csw/mgar/pkg/libxft2/trunk/depend =================================================================== --- csw/mgar/pkg/libxft2/trunk/depend (rev 0) +++ csw/mgar/pkg/libxft2/trunk/depend 2010-05-30 00:13:13 UTC (rev 10040) @@ -0,0 +1,4 @@ +P CSWcommon +P CSWftype2 +P CSWfconfig +P CSWlibxrender Added: csw/mgar/pkg/libxft2/trunk/pkginfo =================================================================== --- csw/mgar/pkg/libxft2/trunk/pkginfo (rev 0) +++ csw/mgar/pkg/libxft2/trunk/pkginfo 2010-05-30 00:13:13 UTC (rev 10040) @@ -0,0 +1,8 @@ +PKG=CSWlibxft2 +NAME=libxft2 - A client-side font API for X applications +VERSION=2.1.14,REV=2010.05.30 +CATEGORY=application +VENDOR=http://xorg.freedesktop.org/releases/X11R7.5/src/lib/ packaged for CSW by Philip Brown +HOTLINE=http://www.opencsw.org/bugtrack/ +EMAIL=phil at opencsw.org +OPENCSW_REPOSITORY=https://gar.svn.sf.net/svnroot/gar/csw/mgar/pkg/libxft2/trunk Added: csw/mgar/pkg/libxft2/trunk/prototype.i386 =================================================================== --- csw/mgar/pkg/libxft2/trunk/prototype.i386 (rev 0) +++ csw/mgar/pkg/libxft2/trunk/prototype.i386 2010-05-30 00:13:13 UTC (rev 10040) @@ -0,0 +1,22 @@ +i pkginfo +i copyright +i depend +d none /opt/csw/bin 0755 root bin +f none /opt/csw/bin/xft-config 0755 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/xft-config.1 0644 root bin +d none /opt/csw/share/man/man3 0755 root bin +f none /opt/csw/share/man/man3/Xft.3 0644 root bin +d none /opt/csw/lib 0755 root bin +s none /opt/csw/lib/libXft.so=libXft.so.2.1.13 +d none /opt/csw/lib/pkgconfig 0755 root bin +f none /opt/csw/lib/pkgconfig/xft.pc 0644 root bin +s none /opt/csw/lib/libXft.so.2=libXft.so.2.1.13 +f none /opt/csw/lib/libXft.so.2.1.13 0755 root bin +d none /opt/csw/include 0755 root bin +d none /opt/csw/include/X11 0755 root bin +d none /opt/csw/include/X11/Xft 0755 root bin +f none /opt/csw/include/X11/Xft/XftCompat.h 0644 root bin +f none /opt/csw/include/X11/Xft/Xft.h 0644 root bin Added: csw/mgar/pkg/libxft2/trunk/prototype.sparc =================================================================== --- csw/mgar/pkg/libxft2/trunk/prototype.sparc (rev 0) +++ csw/mgar/pkg/libxft2/trunk/prototype.sparc 2010-05-30 00:13:13 UTC (rev 10040) @@ -0,0 +1,27 @@ +i pkginfo +i copyright +i depend +d none /opt/csw/bin 0755 root bin +f none /opt/csw/bin/xft-config 0755 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/xft-config.1 0644 root bin +d none /opt/csw/share/man/man3 0755 root bin +f none /opt/csw/share/man/man3/Xft.3 0644 root bin +d none /opt/csw/lib 0755 root bin +d none /opt/csw/lib/pkgconfig 0755 root bin +f none /opt/csw/lib/pkgconfig/xft.pc 0644 root bin +s none /opt/csw/lib/libXft.so=libXft.so.2.1.13 +s none /opt/csw/lib/libXft.so.2=libXft.so.2.1.13 +f none /opt/csw/lib/libXft.so.2.1.13 0755 root bin +d none /opt/csw/include 0755 root bin +d none /opt/csw/include/X11 0755 root bin +d none /opt/csw/include/X11/Xft 0755 root bin +f none /opt/csw/include/X11/Xft/XftCompat.h 0644 root bin +f none /opt/csw/include/X11/Xft/Xft.h 0644 root bin +d none /opt/csw/lib/sparcv9/pkgconfig 0755 root bin +f none /opt/csw/lib/sparcv9/pkgconfig/xft.pc=xft.pc.sparcv9 0644 root bin +s none /opt/csw/lib/sparcv9/libXft.so=lib/sparcv9Xft.so.2.1.13 +s none /opt/csw/lib/sparcv9/libXft.so.2=lib/sparcv9Xft.so.2.1.13 +f none /opt/csw/lib/sparcv9/libXft.so.2.1.13=libXft.so.2.1.13 0755 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Sun May 30 23:35:51 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Sun, 30 May 2010 21:35:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[10041] csw/mgar/pkg Message-ID: Revision: 10041 http://gar.svn.sourceforge.net/gar/?rev=10041&view=rev Author: theferret Date: 2010-05-30 21:35:51 +0000 (Sun, 30 May 2010) Log Message: ----------- libpango: new directory for quickie rebuild Added Paths: ----------- csw/mgar/pkg/libpango/ csw/mgar/pkg/libpango/trunk/ csw/mgar/pkg/libpango/trunk/Makefile csw/mgar/pkg/libpango/trunk/README csw/mgar/pkg/libpango/trunk/copyright csw/mgar/pkg/libpango/trunk/depend csw/mgar/pkg/libpango/trunk/pkginfo csw/mgar/pkg/libpango/trunk/prototype.i386 csw/mgar/pkg/libpango/trunk/prototype.sparc Property changes on: csw/mgar/pkg/libpango/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work cswstage build Added: csw/mgar/pkg/libpango/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpango/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libpango/trunk/Makefile 2010-05-30 21:35:51 UTC (rev 10041) @@ -0,0 +1,94 @@ +#This Makefile originally generated from a template under +# pkg/TEMPLATES/createpkg +# -- THis is actually from the "build sparcv9" Makefile, +# but I cant get v9 build working... + +# So rest of this file is a bit of a hack on a hack. + +# You will most likely have to use GNU make to use it. +# This is one specifically hacked to make building sparcv9 packages +# easier. +# +# Steps to use: +# +# 1. put your normal prototype as prototype.i386 +# 2. copy to prototype.sparc and edit as appropriate +# 3. search for "XXX" and replace with appropriate string +# +# 4. build your package with: +# "make", "make sparcv9", "make package" + + +#Uncomment one of these definitions. The -b invokation, +# is suitable for use with small packages, where you want to have a few files +# in your top level src directory. It is also suitable for +# "relocateable" packages. see the createpkg docs for more details. +#CREATEPKG=createpkg -b `pwd` +CREATEPKG=createpkg -r `pwd`/build/*/cswstage + +## hax for sparcv9 +#### THis is more complicated than my regular sparcv9 hack, +# so had to make a custom hack. + + +BUILDDIR=build/* + + + +STDFILES=pkginfo copyright prototype +FILES= + +all: build package + + +build: build/.config.done + (cd $(BUILDDIR) ; \ + $(MAKE) ; \ + stagepkg ; cp COPYING cswstage/.) + + +# dummy target for configure +build/.config.done: + @echo Configuring with: + @echo CC=$(CC) $(CFLAGS) + @echo CXX=$(CXX) $(CXXFLAGS) + (cd $(BUILDDIR) ; \ + test -f ../../patchfile.preconf && \ + gpatch -p0 <../../patchfile.preconf ; \ + ./configure --prefix=/opt/csw --disable-static ; \ + if test -f ../../patchfile.postconf ; then \ + gpatch -p0 <../../patchfile.postconf ; fi) + touch build/.config.done + + +# I tried depending this on $(BUILDDIR)/config.log but that didnt stick +configure: build/.config.done + +sparcv9: + (cd $(BUILDDIR) ; \ + gmake clean; \ + LD_OPTIONS="" gmake CFLAGS='-xstrconst -fast -xarch=v9 -mt' \ + CXXFLAGS='-fast -xarch=v9 -mt' \ + LDFLAGS='-R/opt/csw/lib/sparcv9 -L/opt/csw/lib/sparcv9' ;\ + cd pango ;\ + cp `find .libs -type f -name 'lib*.so*'` ../cswstage ;\ + cd .. ;\ + for f in *.pc ; do sed 's:libdir=.*:/opt/csw/lib/sparcv9:' $$f>cswstage/$$f.sparcv9 ; \ + done ;\ + echo sparcv9 build done ) + + +package: $(STDFILE) $(FILES) + $(CREATEPKG) + + + +pkgclean: + rm -f *.pkg.gz package + +clean: pkgclean + cd $(BUILDDIR) && make clean + +reallyclean: clean + rm -f $BUILDDIR/config.log $BUILDDIR/config.cache $BUILDDIR/config.status + rm -f build/.config.done Added: csw/mgar/pkg/libpango/trunk/README =================================================================== --- csw/mgar/pkg/libpango/trunk/README (rev 0) +++ csw/mgar/pkg/libpango/trunk/README 2010-05-30 21:35:51 UTC (rev 10041) @@ -0,0 +1,11 @@ +This is a "quickie" redo of pango, for our X11 recompile project +( http://wiki.opencsw.org/project-x11-reloaded ) + +It unfortunately does not have 64bit support, because Phil had + issues when trying to get that to work right. some kind of complaints from + glib.h includes or some such. + +Normally, this would delay release of the package. but since our X11 +is in dire straits, higher priority is given to "Fix X11 for 95% + of everyone" vs "hold this until 64bit is fixed". + Added: csw/mgar/pkg/libpango/trunk/copyright =================================================================== --- csw/mgar/pkg/libpango/trunk/copyright (rev 0) +++ csw/mgar/pkg/libpango/trunk/copyright 2010-05-30 21:35:51 UTC (rev 10041) @@ -0,0 +1,2 @@ +See /opt/csw/share/gtk-doc/COPYING.pango for full copyright text. +(GPL) Added: csw/mgar/pkg/libpango/trunk/depend =================================================================== --- csw/mgar/pkg/libpango/trunk/depend (rev 0) +++ csw/mgar/pkg/libpango/trunk/depend 2010-05-30 21:35:51 UTC (rev 10041) @@ -0,0 +1,7 @@ +P CSWggettextrt +P CSWlibxrender +P CSWfconfig +P CSWftype2 +P CSWglib2 +P CSWlibxft2 +P CSWlibcairo Added: csw/mgar/pkg/libpango/trunk/pkginfo =================================================================== --- csw/mgar/pkg/libpango/trunk/pkginfo (rev 0) +++ csw/mgar/pkg/libpango/trunk/pkginfo 2010-05-30 21:35:51 UTC (rev 10041) @@ -0,0 +1,8 @@ +PKG=CSWpango +NAME=libpango - A framework for the layout and rendering of international text +VERSION=1.26.2,REV=2010.05.30 +CATEGORY=application +VENDOR=http://ftp.gnome.org/pub/GNOME/sources/pango packaged for CSW by Philip Brown +HOTLINE=http://www.opencsw.org/bugtrack/ +EMAIL=phil at opencsw.org +OPENCSW_REPOSITORY=https://gar.svn.sf.net/svnroot/gar/csw/mgar/pkg/libpango/trunk Added: csw/mgar/pkg/libpango/trunk/prototype.i386 =================================================================== --- csw/mgar/pkg/libpango/trunk/prototype.i386 (rev 0) +++ csw/mgar/pkg/libpango/trunk/prototype.i386 2010-05-30 21:35:51 UTC (rev 10041) @@ -0,0 +1,164 @@ +i pkginfo +i copyright +i depend +d none /opt/csw/bin 0755 root bin +f none /opt/csw/bin/pango-view 0755 root bin +f none /opt/csw/bin/pango-querymodules 0755 root bin +d none /opt/csw/etc 0755 root bin +d none /opt/csw/etc/pango 0755 root bin +f none /opt/csw/etc/pango/pangox.aliases 0644 root bin +d none /opt/csw/include 0755 root bin +d none /opt/csw/include/pango-1.0 0755 root bin +d none /opt/csw/include/pango-1.0/pango 0755 root bin +f none /opt/csw/include/pango-1.0/pango/pango-script.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-glyph-item.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-glyph.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-types.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-break.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-gravity.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-item.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-features.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-utils.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-enum-types.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-bidi-type.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-attributes.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pangox.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-language.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pangoxft.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-tabs.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pangofc-font.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-coverage.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pangofc-decoder.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pangoft2.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-renderer.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-layout.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-context.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-ot.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pangocairo.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-modules.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-engine.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pangoxft-render.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-fontmap.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-font.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pangofc-fontmap.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-fontset.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-matrix.h 0644 root bin +d none /opt/csw/lib 0755 root bin +s none /opt/csw/lib/libpangoxft-1.0.so.0=libpangoxft-1.0.so.0.2600.2 +f none /opt/csw/lib/libpangoxft-1.0.so.0.2600.2 0755 root bin +f none /opt/csw/lib/libpangocairo-1.0.so.0.2600.2 0755 root bin +s none /opt/csw/lib/libpango-1.0.so=libpango-1.0.so.0.2600.2 +s none /opt/csw/lib/libpangox-1.0.so.0=libpangox-1.0.so.0.2600.2 +f none /opt/csw/lib/libpangox-1.0.so.0.2600.2 0755 root bin +s none /opt/csw/lib/libpangoxft-1.0.so=libpangoxft-1.0.so.0.2600.2 +s none /opt/csw/lib/libpangoft2-1.0.so.0=libpangoft2-1.0.so.0.2600.2 +f none /opt/csw/lib/libpango-1.0.so.0.2600.2 0755 root bin +s none /opt/csw/lib/libpangox-1.0.so=libpangox-1.0.so.0.2600.2 +s none /opt/csw/lib/libpangocairo-1.0.so=libpangocairo-1.0.so.0.2600.2 +s none /opt/csw/lib/libpangoft2-1.0.so=libpangoft2-1.0.so.0.2600.2 +s none /opt/csw/lib/libpangocairo-1.0.so.0=libpangocairo-1.0.so.0.2600.2 +d none /opt/csw/lib/pango 0755 root bin +d none /opt/csw/lib/pango/1.6.0 0755 root bin +d none /opt/csw/lib/pango/1.6.0/modules 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-hangul-fc.so 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-thai-fc.la 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-hebrew-fc.la 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-arabic-lang.la 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-basic-fc.la 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-tibetan-fc.la 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-tibetan-fc.so 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-arabic-lang.so 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-basic-fc.so 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-thai-fc.so 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-hebrew-fc.so 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-hangul-fc.la 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-arabic-fc.so 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-indic-fc.so 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-basic-x.so 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-khmer-fc.la 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-indic-lang.so 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-syriac-fc.la 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-basic-x.la 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-indic-lang.la 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-syriac-fc.so 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-khmer-fc.so 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-arabic-fc.la 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-indic-fc.la 0755 root bin +d none /opt/csw/lib/pkgconfig 0755 root bin +f none /opt/csw/lib/pkgconfig/pangocairo.pc 0644 root bin +f none /opt/csw/lib/pkgconfig/pangoft2.pc 0644 root bin +f none /opt/csw/lib/pkgconfig/pango.pc 0644 root bin +f none /opt/csw/lib/pkgconfig/pangox.pc 0644 root bin +f none /opt/csw/lib/pkgconfig/pangoxft.pc 0644 root bin +f none /opt/csw/lib/libpangoft2-1.0.so.0.2600.2 0755 root bin +s none /opt/csw/lib/libpango-1.0.so.0=libpango-1.0.so.0.2600.2 +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/pango-querymodules.1 0644 root bin +f none /opt/csw/share/man/man1/pango-view.1 0644 root bin +d none /opt/csw/share/gtk-doc 0755 root bin +f none /opt/csw/share/gtk-doc/COPYING.pango=COPYING 0644 root bin +d none /opt/csw/share/gtk-doc/html 0755 root bin +d none /opt/csw/share/gtk-doc/html/pango 0755 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-OpenType-Font-Handling.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Modules.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Miscellaneous-Utilities.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Layout-Objects.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.26.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Text-Processing.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.22.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index.sgml 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.6.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.2.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/style.css 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Bidirectional-Text.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Xft-Fonts-and-Rendering.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Text-Attributes.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/rendering.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Version-Checking.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/PangoMarkupFormat.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Tab-Stops.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/PangoFcDecoder.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/rotated-text.png 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/left.png 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-X-Fonts-and-Rendering.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Vertical-Text.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.16.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Glyph-Storage.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-ATSUI-Fonts.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Engines.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-querymodules.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-all.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-FreeType-Fonts-and-Rendering.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/PangoRenderer.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.12.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/PangoEngineLang.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-deprecated.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/PangoFcFontMap.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/home.png 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.18.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Cairo-Rendering.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango.devhelp 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.14.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Coverage-Maps.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/up.png 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/PangoEngineShape.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Fonts.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.10.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/PangoFcFont.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Win32-Fonts-and-Rendering.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/lowlevel.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.24.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango.devhelp2 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/tools.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.20.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.8.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.4.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-hierarchy.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/layout.gif 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Scripts-and-Languages.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/right.png 0644 root bin Added: csw/mgar/pkg/libpango/trunk/prototype.sparc =================================================================== --- csw/mgar/pkg/libpango/trunk/prototype.sparc (rev 0) +++ csw/mgar/pkg/libpango/trunk/prototype.sparc 2010-05-30 21:35:51 UTC (rev 10041) @@ -0,0 +1,164 @@ +i pkginfo +i copyright +i depend +d none /opt/csw/bin 0755 root bin +f none /opt/csw/bin/pango-view 0755 root bin +f none /opt/csw/bin/pango-querymodules 0755 root bin +d none /opt/csw/etc 0755 root bin +d none /opt/csw/etc/pango 0755 root bin +f none /opt/csw/etc/pango/pangox.aliases 0644 root bin +d none /opt/csw/include 0755 root bin +d none /opt/csw/include/pango-1.0 0755 root bin +d none /opt/csw/include/pango-1.0/pango 0755 root bin +f none /opt/csw/include/pango-1.0/pango/pango-script.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-glyph-item.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-glyph.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-types.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-break.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-gravity.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-item.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-features.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-utils.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-enum-types.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-bidi-type.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-attributes.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pangox.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-language.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pangoxft.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-tabs.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pangofc-font.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-coverage.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pangofc-decoder.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pangoft2.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-renderer.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-layout.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-context.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-ot.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pangocairo.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-modules.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-engine.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pangoxft-render.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-fontmap.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-font.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pangofc-fontmap.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-fontset.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-matrix.h 0644 root bin +d none /opt/csw/lib 0755 root bin +s none /opt/csw/lib/libpangoxft-1.0.so.0=libpangoxft-1.0.so.0.2600.2 +f none /opt/csw/lib/libpangoxft-1.0.so.0.2600.2 0755 root bin +f none /opt/csw/lib/libpangocairo-1.0.so.0.2600.2 0755 root bin +s none /opt/csw/lib/libpango-1.0.so=libpango-1.0.so.0.2600.2 +s none /opt/csw/lib/libpangox-1.0.so.0=libpangox-1.0.so.0.2600.2 +f none /opt/csw/lib/libpangox-1.0.so.0.2600.2 0755 root bin +s none /opt/csw/lib/libpangoxft-1.0.so=libpangoxft-1.0.so.0.2600.2 +s none /opt/csw/lib/libpangoft2-1.0.so.0=libpangoft2-1.0.so.0.2600.2 +f none /opt/csw/lib/libpango-1.0.so.0.2600.2 0755 root bin +s none /opt/csw/lib/libpangox-1.0.so=libpangox-1.0.so.0.2600.2 +s none /opt/csw/lib/libpangocairo-1.0.so=libpangocairo-1.0.so.0.2600.2 +s none /opt/csw/lib/libpangoft2-1.0.so=libpangoft2-1.0.so.0.2600.2 +s none /opt/csw/lib/libpangocairo-1.0.so.0=libpangocairo-1.0.so.0.2600.2 +d none /opt/csw/lib/pango 0755 root bin +d none /opt/csw/lib/pango/1.6.0 0755 root bin +d none /opt/csw/lib/pango/1.6.0/modules 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-hangul-fc.so 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-thai-fc.la 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-hebrew-fc.la 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-arabic-lang.la 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-basic-fc.la 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-tibetan-fc.la 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-tibetan-fc.so 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-arabic-lang.so 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-basic-fc.so 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-thai-fc.so 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-hebrew-fc.so 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-hangul-fc.la 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-arabic-fc.so 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-indic-fc.so 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-basic-x.so 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-khmer-fc.la 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-indic-lang.so 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-syriac-fc.la 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-basic-x.la 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-indic-lang.la 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-syriac-fc.so 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-khmer-fc.so 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-arabic-fc.la 0755 root bin +f none /opt/csw/lib/pango/1.6.0/modules/pango-indic-fc.la 0755 root bin +d none /opt/csw/lib/pkgconfig 0755 root bin +f none /opt/csw/lib/pkgconfig/pangocairo.pc 0644 root bin +f none /opt/csw/lib/pkgconfig/pangoft2.pc 0644 root bin +f none /opt/csw/lib/pkgconfig/pango.pc 0644 root bin +f none /opt/csw/lib/pkgconfig/pangox.pc 0644 root bin +f none /opt/csw/lib/pkgconfig/pangoxft.pc 0644 root bin +f none /opt/csw/lib/libpangoft2-1.0.so.0.2600.2 0755 root bin +s none /opt/csw/lib/libpango-1.0.so.0=libpango-1.0.so.0.2600.2 +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/pango-querymodules.1 0644 root bin +f none /opt/csw/share/man/man1/pango-view.1 0644 root bin +d none /opt/csw/share/gtk-doc 0755 root bin +f none /opt/csw/share/gtk-doc/COPYING.pango=COPYING 0644 root bin +d none /opt/csw/share/gtk-doc/html 0755 root bin +d none /opt/csw/share/gtk-doc/html/pango 0755 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-OpenType-Font-Handling.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Modules.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Miscellaneous-Utilities.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Layout-Objects.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.26.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Text-Processing.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.22.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index.sgml 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.6.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.2.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/style.css 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Bidirectional-Text.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Xft-Fonts-and-Rendering.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Text-Attributes.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/rendering.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Version-Checking.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/PangoMarkupFormat.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Tab-Stops.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/PangoFcDecoder.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/rotated-text.png 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/left.png 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-X-Fonts-and-Rendering.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Vertical-Text.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.16.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Glyph-Storage.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-ATSUI-Fonts.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Engines.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-querymodules.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-all.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-FreeType-Fonts-and-Rendering.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/PangoRenderer.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.12.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/PangoEngineLang.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-deprecated.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/PangoFcFontMap.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/home.png 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.18.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Cairo-Rendering.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango.devhelp 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.14.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Coverage-Maps.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/up.png 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/PangoEngineShape.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Fonts.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.10.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/PangoFcFont.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Win32-Fonts-and-Rendering.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/lowlevel.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.24.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango.devhelp2 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/tools.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.20.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.8.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.4.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-hierarchy.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/layout.gif 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Scripts-and-Languages.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/right.png 0644 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Sun May 30 23:40:40 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Sun, 30 May 2010 21:40:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[10042] csw/mgar/pkg/libpango/trunk/patchfile.preconf Message-ID: Revision: 10042 http://gar.svn.sourceforge.net/gar/?rev=10042&view=rev Author: theferret Date: 2010-05-30 21:40:40 +0000 (Sun, 30 May 2010) Log Message: ----------- libpango: added patchfile.preconf Added Paths: ----------- csw/mgar/pkg/libpango/trunk/patchfile.preconf Added: csw/mgar/pkg/libpango/trunk/patchfile.preconf =================================================================== --- csw/mgar/pkg/libpango/trunk/patchfile.preconf (rev 0) +++ csw/mgar/pkg/libpango/trunk/patchfile.preconf 2010-05-30 21:40:40 UTC (rev 10042) @@ -0,0 +1,25 @@ +--- configure.orig Sun May 30 22:48:47 2010 ++++ configure Sun May 30 22:49:02 2010 +@@ -6105,7 +6105,7 @@ + + + # Make sure we don't link to libstdc++ (needs de-gcc-fication) +-CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions" ++CXXFLAGS="$CXXFLAGS" + + + # +--- ./pango/opentype/hb-common.h.orig Sun May 30 22:43:55 2010 ++++ ./pango/opentype/hb-common.h Sun May 30 22:47:35 2010 +@@ -27,7 +27,11 @@ + #ifndef HB_COMMON_H + #define HB_COMMON_H + ++#ifdef __SVR4 ++#include ++#else + #include ++#endif + + # ifdef __cplusplus + # define HB_BEGIN_DECLS extern "C" { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Mon May 31 00:21:02 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Sun, 30 May 2010 22:21:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[10043] csw/mgar/pkg/libpango/trunk/Makefile Message-ID: Revision: 10043 http://gar.svn.sourceforge.net/gar/?rev=10043&view=rev Author: theferret Date: 2010-05-30 22:21:02 +0000 (Sun, 30 May 2010) Log Message: ----------- libpango: Makefile twewak Modified Paths: -------------- csw/mgar/pkg/libpango/trunk/Makefile Modified: csw/mgar/pkg/libpango/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpango/trunk/Makefile 2010-05-30 21:40:40 UTC (rev 10042) +++ csw/mgar/pkg/libpango/trunk/Makefile 2010-05-30 22:21:02 UTC (rev 10043) @@ -44,7 +44,7 @@ build: build/.config.done (cd $(BUILDDIR) ; \ $(MAKE) ; \ - stagepkg ; cp COPYING cswstage/.) + MAKE=$(MAKE) stagepkg ; cp COPYING cswstage/.) # dummy target for configure This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Mon May 31 05:00:34 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Mon, 31 May 2010 03:00:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[10044] csw/mgar/pkg/libpango/trunk/postinstall Message-ID: Revision: 10044 http://gar.svn.sourceforge.net/gar/?rev=10044&view=rev Author: theferret Date: 2010-05-31 03:00:33 +0000 (Mon, 31 May 2010) Log Message: ----------- libpango: added in postinstall Added Paths: ----------- csw/mgar/pkg/libpango/trunk/postinstall Added: csw/mgar/pkg/libpango/trunk/postinstall =================================================================== --- csw/mgar/pkg/libpango/trunk/postinstall (rev 0) +++ csw/mgar/pkg/libpango/trunk/postinstall 2010-05-31 03:00:33 UTC (rev 10044) @@ -0,0 +1,19 @@ +#!/bin/sh + +umask 0022 + +if [ "$PKG_ROOT_DIR" = "" ] ; then PKG_ROOT_DIR=/ ; fi + +echo 'Updating pango.modules...' +test -x ${PKG_ROOT_DIR}/opt/csw/bin/pango-querymodules && \ + chroot "${PKG_ROOT_DIR}" /opt/csw/bin/pango-querymodules >"${PKG_ROOT_DIR}"/opt/csw/etc/pango/pango.modules && + chroot "${PKG_ROOT_DIR}" /usr/sbin/installf CSWpango /opt/csw/etc/pango/pango.modules f 0644 root bin +test -x ${PKG_ROOT_DIR}/opt/csw/bin/sparcv9/pango-querymodules && \ + chroot "${PKG_ROOT_DIR}" /opt/csw/bin/sparcv9/pango-querymodules >"${PKG_ROOT_DIR}"/opt/csw/etc/64/pango/pango.modules && + chroot "${PKG_ROOT_DIR}" /usr/sbin/installf CSWpango /opt/csw/etc/64/pango/pango.modules f 0644 root bin +test -x ${PKG_ROOT_DIR}/opt/csw/bin/amd64/pango-querymodules && \ + chroot "${PKG_ROOT_DIR}" /opt/csw/bin/amd64/pango-querymodules >"${PKG_ROOT_DIR}"/opt/csw/etc/64/pango/pango.modules && + chroot "${PKG_ROOT_DIR}" /usr/sbin/installf CSWpango /opt/csw/etc/64/pango/pango.modules f 0644 root bin + +chroot "${PKG_ROOT_DIR}" /usr/sbin/installf -f CSWpango +/bin/true This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Mon May 31 05:03:52 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Mon, 31 May 2010 03:03:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[10045] csw/mgar/pkg/libpango/trunk Message-ID: Revision: 10045 http://gar.svn.sourceforge.net/gar/?rev=10045&view=rev Author: theferret Date: 2010-05-31 03:03:52 +0000 (Mon, 31 May 2010) Log Message: ----------- libpango: added postinstall Modified Paths: -------------- csw/mgar/pkg/libpango/trunk/prototype.i386 csw/mgar/pkg/libpango/trunk/prototype.sparc Modified: csw/mgar/pkg/libpango/trunk/prototype.i386 =================================================================== --- csw/mgar/pkg/libpango/trunk/prototype.i386 2010-05-31 03:00:33 UTC (rev 10044) +++ csw/mgar/pkg/libpango/trunk/prototype.i386 2010-05-31 03:03:52 UTC (rev 10045) @@ -1,6 +1,7 @@ i pkginfo i copyright i depend +i postinstall d none /opt/csw/bin 0755 root bin f none /opt/csw/bin/pango-view 0755 root bin f none /opt/csw/bin/pango-querymodules 0755 root bin Modified: csw/mgar/pkg/libpango/trunk/prototype.sparc =================================================================== --- csw/mgar/pkg/libpango/trunk/prototype.sparc 2010-05-31 03:00:33 UTC (rev 10044) +++ csw/mgar/pkg/libpango/trunk/prototype.sparc 2010-05-31 03:03:52 UTC (rev 10045) @@ -1,6 +1,7 @@ i pkginfo i copyright i depend +i postinstall d none /opt/csw/bin 0755 root bin f none /opt/csw/bin/pango-view 0755 root bin f none /opt/csw/bin/pango-querymodules 0755 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Mon May 31 07:37:08 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Mon, 31 May 2010 05:37:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[10046] csw/mgar/pkg/libpango/trunk Message-ID: Revision: 10046 http://gar.svn.sourceforge.net/gar/?rev=10046&view=rev Author: theferret Date: 2010-05-31 05:37:08 +0000 (Mon, 31 May 2010) Log Message: ----------- libpango: added subdir devel Added Paths: ----------- csw/mgar/pkg/libpango/trunk/devel/ csw/mgar/pkg/libpango/trunk/devel/copyright csw/mgar/pkg/libpango/trunk/devel/depend csw/mgar/pkg/libpango/trunk/devel/pkginfo csw/mgar/pkg/libpango/trunk/devel/prototype Added: csw/mgar/pkg/libpango/trunk/devel/copyright =================================================================== --- csw/mgar/pkg/libpango/trunk/devel/copyright (rev 0) +++ csw/mgar/pkg/libpango/trunk/devel/copyright 2010-05-31 05:37:08 UTC (rev 10046) @@ -0,0 +1,4 @@ +This package should never be shipped separatedly, but always as an ajunct +to CSWpango, which contains the license file in +/opt/csw/share/gtk-doc/COPYING.pango + Added: csw/mgar/pkg/libpango/trunk/devel/depend =================================================================== --- csw/mgar/pkg/libpango/trunk/devel/depend (rev 0) +++ csw/mgar/pkg/libpango/trunk/devel/depend 2010-05-31 05:37:08 UTC (rev 10046) @@ -0,0 +1 @@ +P CSWpango Added: csw/mgar/pkg/libpango/trunk/devel/pkginfo =================================================================== --- csw/mgar/pkg/libpango/trunk/devel/pkginfo (rev 0) +++ csw/mgar/pkg/libpango/trunk/devel/pkginfo 2010-05-31 05:37:08 UTC (rev 10046) @@ -0,0 +1,8 @@ +PKG=CSWpangodevel +NAME=libpango_devel - Pango Developer Files +VERSION=1.26.2,REV=2010.05.30 +CATEGORY=application +VENDOR=http://ftp.gnome.org/pub/GNOME/sources/pango packaged for CSW by Philip Brown +HOTLINE=http://www.opencsw.org/bugtrack/ +EMAIL=phil at opencsw.org +OPENCSW_REPOSITORY=https://gar.svn.sf.net/svnroot/gar/csw/mgar/pkg/libpango/trunk Added: csw/mgar/pkg/libpango/trunk/devel/prototype =================================================================== --- csw/mgar/pkg/libpango/trunk/devel/prototype (rev 0) +++ csw/mgar/pkg/libpango/trunk/devel/prototype 2010-05-31 05:37:08 UTC (rev 10046) @@ -0,0 +1,46 @@ +i pkginfo +i copyright +i depend +d none /opt/csw/include 0755 root bin +d none /opt/csw/include/pango-1.0 0755 root bin +d none /opt/csw/include/pango-1.0/pango 0755 root bin +f none /opt/csw/include/pango-1.0/pango/pango-script.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-glyph-item.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-glyph.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-types.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-break.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-gravity.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-item.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-features.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-utils.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-enum-types.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-bidi-type.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-attributes.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pangox.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-language.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pangoxft.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-tabs.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pangofc-font.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-coverage.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pangofc-decoder.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pangoft2.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-renderer.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-layout.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-context.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-ot.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pangocairo.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-modules.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-engine.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pangoxft-render.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-fontmap.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-font.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pangofc-fontmap.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-fontset.h 0644 root bin +f none /opt/csw/include/pango-1.0/pango/pango-matrix.h 0644 root bin +d none /opt/csw/lib/pkgconfig 0755 root bin +f none /opt/csw/lib/pkgconfig/pangocairo.pc 0644 root bin +f none /opt/csw/lib/pkgconfig/pangoft2.pc 0644 root bin +f none /opt/csw/lib/pkgconfig/pango.pc 0644 root bin +f none /opt/csw/lib/pkgconfig/pangox.pc 0644 root bin +f none /opt/csw/lib/pkgconfig/pangoxft.pc 0644 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Mon May 31 07:39:31 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Mon, 31 May 2010 05:39:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[10047] csw/mgar/pkg/libpango/trunk/Makefile Message-ID: Revision: 10047 http://gar.svn.sourceforge.net/gar/?rev=10047&view=rev Author: theferret Date: 2010-05-31 05:39:31 +0000 (Mon, 31 May 2010) Log Message: ----------- libpango: Makefile tweaks Modified Paths: -------------- csw/mgar/pkg/libpango/trunk/Makefile Modified: csw/mgar/pkg/libpango/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpango/trunk/Makefile 2010-05-31 05:37:08 UTC (rev 10046) +++ csw/mgar/pkg/libpango/trunk/Makefile 2010-05-31 05:39:31 UTC (rev 10047) @@ -19,12 +19,6 @@ # "make", "make sparcv9", "make package" -#Uncomment one of these definitions. The -b invokation, -# is suitable for use with small packages, where you want to have a few files -# in your top level src directory. It is also suitable for -# "relocateable" packages. see the createpkg docs for more details. -#CREATEPKG=createpkg -b `pwd` -CREATEPKG=createpkg -r `pwd`/build/*/cswstage ## hax for sparcv9 #### THis is more complicated than my regular sparcv9 hack, @@ -79,10 +73,12 @@ package: $(STDFILE) $(FILES) - $(CREATEPKG) + createpkg -r `pwd`/build/*/cswstage + cd devel; createpkg -r `pwd`/../build/*/cswstage + mv devel/*.pkg.gz . + - pkgclean: rm -f *.pkg.gz package This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Mon May 31 08:14:50 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Mon, 31 May 2010 06:14:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[10048] csw/mgar/pkg/libpango/trunk Message-ID: Revision: 10048 http://gar.svn.sourceforge.net/gar/?rev=10048&view=rev Author: theferret Date: 2010-05-31 06:14:50 +0000 (Mon, 31 May 2010) Log Message: ----------- libpango: split off another subdir/package for docs Modified Paths: -------------- csw/mgar/pkg/libpango/trunk/Makefile csw/mgar/pkg/libpango/trunk/README csw/mgar/pkg/libpango/trunk/prototype.i386 csw/mgar/pkg/libpango/trunk/prototype.sparc Added Paths: ----------- csw/mgar/pkg/libpango/trunk/doc/ csw/mgar/pkg/libpango/trunk/doc/copyright csw/mgar/pkg/libpango/trunk/doc/depend csw/mgar/pkg/libpango/trunk/doc/pkginfo csw/mgar/pkg/libpango/trunk/doc/prototype Modified: csw/mgar/pkg/libpango/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpango/trunk/Makefile 2010-05-31 05:39:31 UTC (rev 10047) +++ csw/mgar/pkg/libpango/trunk/Makefile 2010-05-31 06:14:50 UTC (rev 10048) @@ -74,8 +74,9 @@ package: $(STDFILE) $(FILES) createpkg -r `pwd`/build/*/cswstage - cd devel; createpkg -r `pwd`/../build/*/cswstage - mv devel/*.pkg.gz . + cd devel; createpkg -r `pwd`/../build/*/cswstage; cd .. + cd docj; createpkg -r `pwd`/../build/*/cswstage; cd .. + mv */*.pkg.gz . Modified: csw/mgar/pkg/libpango/trunk/README =================================================================== --- csw/mgar/pkg/libpango/trunk/README 2010-05-31 05:39:31 UTC (rev 10047) +++ csw/mgar/pkg/libpango/trunk/README 2010-05-31 06:14:50 UTC (rev 10048) @@ -9,3 +9,8 @@ is in dire straits, higher priority is given to "Fix X11 for 95% of everyone" vs "hold this until 64bit is fixed". + +include and pkgconfig files get split out into _devel. (see subdir) +htmldoc gets split into _doc. +everything else stays in top level. + Added: csw/mgar/pkg/libpango/trunk/doc/copyright =================================================================== --- csw/mgar/pkg/libpango/trunk/doc/copyright (rev 0) +++ csw/mgar/pkg/libpango/trunk/doc/copyright 2010-05-31 06:14:50 UTC (rev 10048) @@ -0,0 +1,4 @@ +This package should never be shipped separatedly, but always as an ajunct +to CSWpango, which contains the license file in +/opt/csw/share/gtk-doc/COPYING.pango + Added: csw/mgar/pkg/libpango/trunk/doc/depend =================================================================== --- csw/mgar/pkg/libpango/trunk/doc/depend (rev 0) +++ csw/mgar/pkg/libpango/trunk/doc/depend 2010-05-31 06:14:50 UTC (rev 10048) @@ -0,0 +1 @@ +P CSWpango Added: csw/mgar/pkg/libpango/trunk/doc/pkginfo =================================================================== --- csw/mgar/pkg/libpango/trunk/doc/pkginfo (rev 0) +++ csw/mgar/pkg/libpango/trunk/doc/pkginfo 2010-05-31 06:14:50 UTC (rev 10048) @@ -0,0 +1,8 @@ +PKG=CSWpangodoc +NAME=libpango_doc - Pango HTML Documentation +VERSION=1.26.2,REV=2010.05.30 +CATEGORY=application +VENDOR=http://ftp.gnome.org/pub/GNOME/sources/pango packaged for CSW by Philip Brown +HOTLINE=http://www.opencsw.org/bugtrack/ +EMAIL=phil at opencsw.org +OPENCSW_REPOSITORY=https://gar.svn.sf.net/svnroot/gar/csw/mgar/pkg/libpango/trunk Added: csw/mgar/pkg/libpango/trunk/doc/prototype =================================================================== --- csw/mgar/pkg/libpango/trunk/doc/prototype (rev 0) +++ csw/mgar/pkg/libpango/trunk/doc/prototype 2010-05-31 06:14:50 UTC (rev 10048) @@ -0,0 +1,66 @@ +i pkginfo +i copyright +i depend +d none /opt/csw/share/gtk-doc 0755 root bin +d none /opt/csw/share/gtk-doc/html 0755 root bin +d none /opt/csw/share/gtk-doc/html/pango 0755 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-OpenType-Font-Handling.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Modules.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Miscellaneous-Utilities.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Layout-Objects.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.26.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Text-Processing.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.22.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index.sgml 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.6.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.2.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/style.css 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Bidirectional-Text.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Xft-Fonts-and-Rendering.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Text-Attributes.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/rendering.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Version-Checking.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/PangoMarkupFormat.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Tab-Stops.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/PangoFcDecoder.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/rotated-text.png 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/left.png 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-X-Fonts-and-Rendering.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Vertical-Text.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.16.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Glyph-Storage.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-ATSUI-Fonts.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Engines.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-querymodules.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-all.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-FreeType-Fonts-and-Rendering.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/PangoRenderer.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.12.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/PangoEngineLang.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-deprecated.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/PangoFcFontMap.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/home.png 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.18.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Cairo-Rendering.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango.devhelp 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.14.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Coverage-Maps.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/up.png 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/PangoEngineShape.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Fonts.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.10.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/PangoFcFont.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Win32-Fonts-and-Rendering.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/lowlevel.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.24.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango.devhelp2 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/tools.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.20.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.8.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/index-1.4.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-hierarchy.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/layout.gif 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/pango-Scripts-and-Languages.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/pango/right.png 0644 root bin Modified: csw/mgar/pkg/libpango/trunk/prototype.i386 =================================================================== --- csw/mgar/pkg/libpango/trunk/prototype.i386 2010-05-31 05:39:31 UTC (rev 10047) +++ csw/mgar/pkg/libpango/trunk/prototype.i386 2010-05-31 06:14:50 UTC (rev 10048) @@ -8,43 +8,6 @@ d none /opt/csw/etc 0755 root bin d none /opt/csw/etc/pango 0755 root bin f none /opt/csw/etc/pango/pangox.aliases 0644 root bin -d none /opt/csw/include 0755 root bin -d none /opt/csw/include/pango-1.0 0755 root bin -d none /opt/csw/include/pango-1.0/pango 0755 root bin -f none /opt/csw/include/pango-1.0/pango/pango-script.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-glyph-item.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-glyph.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-types.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-break.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-gravity.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-item.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-features.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-utils.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-enum-types.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-bidi-type.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-attributes.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pangox.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-language.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pangoxft.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-tabs.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pangofc-font.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-coverage.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pangofc-decoder.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pangoft2.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-renderer.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-layout.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-context.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-ot.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pangocairo.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-modules.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-engine.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pangoxft-render.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-fontmap.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-font.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pangofc-fontmap.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-fontset.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-matrix.h 0644 root bin d none /opt/csw/lib 0755 root bin s none /opt/csw/lib/libpangoxft-1.0.so.0=libpangoxft-1.0.so.0.2600.2 f none /opt/csw/lib/libpangoxft-1.0.so.0.2600.2 0755 root bin @@ -86,12 +49,6 @@ f none /opt/csw/lib/pango/1.6.0/modules/pango-khmer-fc.so 0755 root bin f none /opt/csw/lib/pango/1.6.0/modules/pango-arabic-fc.la 0755 root bin f none /opt/csw/lib/pango/1.6.0/modules/pango-indic-fc.la 0755 root bin -d none /opt/csw/lib/pkgconfig 0755 root bin -f none /opt/csw/lib/pkgconfig/pangocairo.pc 0644 root bin -f none /opt/csw/lib/pkgconfig/pangoft2.pc 0644 root bin -f none /opt/csw/lib/pkgconfig/pango.pc 0644 root bin -f none /opt/csw/lib/pkgconfig/pangox.pc 0644 root bin -f none /opt/csw/lib/pkgconfig/pangoxft.pc 0644 root bin f none /opt/csw/lib/libpangoft2-1.0.so.0.2600.2 0755 root bin s none /opt/csw/lib/libpango-1.0.so.0=libpango-1.0.so.0.2600.2 d none /opt/csw/share 0755 root bin @@ -101,65 +58,3 @@ f none /opt/csw/share/man/man1/pango-view.1 0644 root bin d none /opt/csw/share/gtk-doc 0755 root bin f none /opt/csw/share/gtk-doc/COPYING.pango=COPYING 0644 root bin -d none /opt/csw/share/gtk-doc/html 0755 root bin -d none /opt/csw/share/gtk-doc/html/pango 0755 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-OpenType-Font-Handling.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Modules.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Miscellaneous-Utilities.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Layout-Objects.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-1.26.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Text-Processing.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-1.22.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index.sgml 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-1.6.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-1.2.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/style.css 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Bidirectional-Text.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Xft-Fonts-and-Rendering.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Text-Attributes.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/rendering.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Version-Checking.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/PangoMarkupFormat.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Tab-Stops.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/PangoFcDecoder.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/rotated-text.png 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/left.png 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-X-Fonts-and-Rendering.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Vertical-Text.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-1.16.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Glyph-Storage.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-ATSUI-Fonts.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Engines.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-querymodules.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-all.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-FreeType-Fonts-and-Rendering.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/PangoRenderer.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-1.12.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/PangoEngineLang.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-deprecated.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/PangoFcFontMap.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/home.png 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-1.18.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Cairo-Rendering.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango.devhelp 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-1.14.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Coverage-Maps.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/up.png 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/PangoEngineShape.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Fonts.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-1.10.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/PangoFcFont.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Win32-Fonts-and-Rendering.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/lowlevel.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-1.24.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango.devhelp2 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/tools.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-1.20.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-1.8.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-1.4.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-hierarchy.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/layout.gif 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Scripts-and-Languages.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/right.png 0644 root bin Modified: csw/mgar/pkg/libpango/trunk/prototype.sparc =================================================================== --- csw/mgar/pkg/libpango/trunk/prototype.sparc 2010-05-31 05:39:31 UTC (rev 10047) +++ csw/mgar/pkg/libpango/trunk/prototype.sparc 2010-05-31 06:14:50 UTC (rev 10048) @@ -8,43 +8,6 @@ d none /opt/csw/etc 0755 root bin d none /opt/csw/etc/pango 0755 root bin f none /opt/csw/etc/pango/pangox.aliases 0644 root bin -d none /opt/csw/include 0755 root bin -d none /opt/csw/include/pango-1.0 0755 root bin -d none /opt/csw/include/pango-1.0/pango 0755 root bin -f none /opt/csw/include/pango-1.0/pango/pango-script.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-glyph-item.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-glyph.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-types.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-break.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-gravity.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-item.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-features.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-utils.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-enum-types.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-bidi-type.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-attributes.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pangox.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-language.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pangoxft.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-tabs.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pangofc-font.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-coverage.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pangofc-decoder.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pangoft2.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-renderer.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-layout.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-context.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-ot.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pangocairo.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-modules.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-engine.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pangoxft-render.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-fontmap.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-font.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pangofc-fontmap.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-fontset.h 0644 root bin -f none /opt/csw/include/pango-1.0/pango/pango-matrix.h 0644 root bin d none /opt/csw/lib 0755 root bin s none /opt/csw/lib/libpangoxft-1.0.so.0=libpangoxft-1.0.so.0.2600.2 f none /opt/csw/lib/libpangoxft-1.0.so.0.2600.2 0755 root bin @@ -86,12 +49,6 @@ f none /opt/csw/lib/pango/1.6.0/modules/pango-khmer-fc.so 0755 root bin f none /opt/csw/lib/pango/1.6.0/modules/pango-arabic-fc.la 0755 root bin f none /opt/csw/lib/pango/1.6.0/modules/pango-indic-fc.la 0755 root bin -d none /opt/csw/lib/pkgconfig 0755 root bin -f none /opt/csw/lib/pkgconfig/pangocairo.pc 0644 root bin -f none /opt/csw/lib/pkgconfig/pangoft2.pc 0644 root bin -f none /opt/csw/lib/pkgconfig/pango.pc 0644 root bin -f none /opt/csw/lib/pkgconfig/pangox.pc 0644 root bin -f none /opt/csw/lib/pkgconfig/pangoxft.pc 0644 root bin f none /opt/csw/lib/libpangoft2-1.0.so.0.2600.2 0755 root bin s none /opt/csw/lib/libpango-1.0.so.0=libpango-1.0.so.0.2600.2 d none /opt/csw/share 0755 root bin @@ -101,65 +58,3 @@ f none /opt/csw/share/man/man1/pango-view.1 0644 root bin d none /opt/csw/share/gtk-doc 0755 root bin f none /opt/csw/share/gtk-doc/COPYING.pango=COPYING 0644 root bin -d none /opt/csw/share/gtk-doc/html 0755 root bin -d none /opt/csw/share/gtk-doc/html/pango 0755 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-OpenType-Font-Handling.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Modules.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Miscellaneous-Utilities.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Layout-Objects.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-1.26.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Text-Processing.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-1.22.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index.sgml 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-1.6.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-1.2.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/style.css 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Bidirectional-Text.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Xft-Fonts-and-Rendering.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Text-Attributes.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/rendering.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Version-Checking.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/PangoMarkupFormat.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Tab-Stops.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/PangoFcDecoder.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/rotated-text.png 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/left.png 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-X-Fonts-and-Rendering.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Vertical-Text.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-1.16.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Glyph-Storage.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-ATSUI-Fonts.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Engines.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-querymodules.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-all.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-FreeType-Fonts-and-Rendering.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/PangoRenderer.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-1.12.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/PangoEngineLang.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-deprecated.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/PangoFcFontMap.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/home.png 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-1.18.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Cairo-Rendering.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango.devhelp 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-1.14.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Coverage-Maps.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/up.png 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/PangoEngineShape.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Fonts.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-1.10.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/PangoFcFont.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Win32-Fonts-and-Rendering.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/lowlevel.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-1.24.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango.devhelp2 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/tools.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-1.20.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-1.8.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/index-1.4.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-hierarchy.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/layout.gif 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/pango-Scripts-and-Languages.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/pango/right.png 0644 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Mon May 31 08:16:45 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Mon, 31 May 2010 06:16:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[10049] csw/mgar/pkg/libpango/trunk/Makefile Message-ID: Revision: 10049 http://gar.svn.sourceforge.net/gar/?rev=10049&view=rev Author: theferret Date: 2010-05-31 06:16:45 +0000 (Mon, 31 May 2010) Log Message: ----------- libpango: fix typo Modified Paths: -------------- csw/mgar/pkg/libpango/trunk/Makefile Modified: csw/mgar/pkg/libpango/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpango/trunk/Makefile 2010-05-31 06:14:50 UTC (rev 10048) +++ csw/mgar/pkg/libpango/trunk/Makefile 2010-05-31 06:16:45 UTC (rev 10049) @@ -75,7 +75,7 @@ package: $(STDFILE) $(FILES) createpkg -r `pwd`/build/*/cswstage cd devel; createpkg -r `pwd`/../build/*/cswstage; cd .. - cd docj; createpkg -r `pwd`/../build/*/cswstage; cd .. + cd doc; createpkg -r `pwd`/../build/*/cswstage; cd .. mv */*.pkg.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 Mon May 31 15:28:21 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 31 May 2010 13:28:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[10050] csw/mgar/pkg/gd/branches Message-ID: Revision: 10050 http://gar.svn.sourceforge.net/gar/?rev=10050&view=rev Author: dmichelsen Date: 2010-05-31 13:28:21 +0000 (Mon, 31 May 2010) Log Message: ----------- gd/x11-reloaded: Rebuild against SUNW x11 Modified Paths: -------------- csw/mgar/pkg/gd/branches/gd-x11-reloaded/Makefile Added Paths: ----------- csw/mgar/pkg/gd/branches/gd-x11-reloaded/ Removed Paths: ------------- csw/mgar/pkg/gd/branches/gd-x11-reloaded/files/Makefile.diff csw/mgar/pkg/gd/branches/gd-x11-reloaded/files/fixme.sh Modified: csw/mgar/pkg/gd/branches/gd-x11-reloaded/Makefile =================================================================== --- csw/mgar/pkg/gd/trunk/Makefile 2010-05-31 06:16:45 UTC (rev 10049) +++ csw/mgar/pkg/gd/branches/gd-x11-reloaded/Makefile 2010-05-31 13:28:21 UTC (rev 10050) @@ -16,24 +16,16 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 PACKAGES = CSWgd -CATALOGNAME_CSWgd = gd -SPKG_DESC_CSWgd = $(DESCRIPTION) +CATALOGNAME = gd -#PATCHFILES = Makefile.diff +RUNTIME_DEP_PKGS_CSWgd = CSWfconfig CSWftype2 CSWiconv +RUNTIME_DEP_PKGS_CSWgd += CSWjpeg CSWpng CSWxpm CSWzlib -RUNTIME_DEP_PKGS_CSWgd = CSWexpat CSWfconfig CSWftype2 CSWiconv -RUNTIME_DEP_PKGS_CSWgd += CSWjpeg CSWpng CSWxpm CSWzlib CSWlibx11 -RUNTIME_DEP_PKGS_CSWgd += CSWlibxpm - UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 BUILD64 = 1 STRIP_LIBTOOL = 1 -EXTRA_INC = $(prefix)/X11/include -EXTRA_LIB = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libiconv-prefix=$(prefix) CONFIGURE_ARGS += --with-png=$(prefix) @@ -43,14 +35,11 @@ CONFIGURE_ARGS += --with-xpm=$(prefix) CONFIGURE_ARGS += --disable-fast-install -## There are no tests for this -TEST_SCRIPTS = skip +# There are no tests for this +TEST_SCRIPTS = include gar/category.mk -test-skip: - $(DONADA) - pre-configure-modulated: grm -f $(WORKSRC)/config/ltmain.sh gcp /opt/csw/share/libtool/config/ltmain.sh $(WORKSRC)/config/ltmain.sh Deleted: csw/mgar/pkg/gd/branches/gd-x11-reloaded/files/Makefile.diff =================================================================== --- csw/mgar/pkg/gd/trunk/files/Makefile.diff 2010-05-31 06:16:45 UTC (rev 10049) +++ csw/mgar/pkg/gd/branches/gd-x11-reloaded/files/Makefile.diff 2010-05-31 13:28:21 UTC (rev 10050) @@ -1,10 +0,0 @@ ---- gd-2.0.35/Makefile.in.orig 2009-02-20 16:42:35.992955622 -0600 -+++ gd-2.0.35/Makefile.in 2009-02-20 16:42:39.401892868 -0600 -@@ -399,6 +399,7 @@ - cd $(top_srcdir) && $(AUTOHEADER) - rm -f stamp-h1 -+ @$(srcdir)../fixme.sh $(srcdir) - touch $@ - - distclean-hdr: - -rm -f config.h stamp-h1 Deleted: csw/mgar/pkg/gd/branches/gd-x11-reloaded/files/fixme.sh =================================================================== --- csw/mgar/pkg/gd/trunk/files/fixme.sh 2010-05-31 06:16:45 UTC (rev 10049) +++ csw/mgar/pkg/gd/branches/gd-x11-reloaded/files/fixme.sh 2010-05-31 13:28:21 UTC (rev 10050) @@ -1,52 +0,0 @@ -#!/bin/bash -#################################################### -# -# fixme.sh -# Intended to remove the use of libtool's -# pseudo-libraries for opencsw builds. -# -# Author: Mike Watters mwatters_at_opencsw.org -# Initial Version: 0.1 -# -#################################################### - -umask 0022 -PATH=/opt/csw/bin - -if [ $# -ne 1 ]; then - gecho "USAGE: $(basename $0) WORKSRC" - exit 1 -fi -BASEPATH=$1 - -## Fix Makefiles -for mk in $(gfind ${BASEPATH} -name Makefile -print); do - gcp ${mk} ${mk}.orig - LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \ - gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/") - - for file in ${LT_FILES}; do - LIB_NAME=$(ggrep 'dlname=' ${file} | \ - gsed -e "s/.*'\(.*\)'/\1/" \ - -e "s/^lib//" \ - -e "s/\.so.*$//") - fixpath=$(gecho $file |gsed 's/\//\\\//g') - gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new - gmv Makefile.new ${mk} - done -done - -## Fix libtool Script -for lt in $(gfind ${BASEPATH} -name libtool -print); do - gcp ${lt} ${lt}.orig - gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new - gmv ${lt}.new ${lt} -done - -LTMAIN=$(gfind ${BASEPATH} -name ltmain.sh -print) -gcp ${LTMAIN} ${LTMAIN}.orig -if [ -f ${LTMAIN} ]; then - gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new - gmv ${LTMAIN}.new ${LTMAIN} -fi - 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 May 31 15:52:35 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 31 May 2010 13:52:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[10051] csw/mgar/pkg/gd/branches/gd-x11-reloaded/Makefile Message-ID: Revision: 10051 http://gar.svn.sourceforge.net/gar/?rev=10051&view=rev Author: dmichelsen Date: 2010-05-31 13:52:35 +0000 (Mon, 31 May 2010) Log Message: ----------- gd/x11-reloaded: Fix amd64 Modified Paths: -------------- csw/mgar/pkg/gd/branches/gd-x11-reloaded/Makefile Modified: csw/mgar/pkg/gd/branches/gd-x11-reloaded/Makefile =================================================================== --- csw/mgar/pkg/gd/branches/gd-x11-reloaded/Makefile 2010-05-31 13:28:21 UTC (rev 10050) +++ csw/mgar/pkg/gd/branches/gd-x11-reloaded/Makefile 2010-05-31 13:52:35 UTC (rev 10051) @@ -38,6 +38,11 @@ # There are no tests for this TEST_SCRIPTS = +MERGE_SCRIPTS_isa-extra = copy-relocated-only copy-config-only +MERGE_DIRS_isa-extra = $(libdir) + +CHECKPKG_OVERRIDES_CSWgd += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libgd.so.2.0.0 + include gar/category.mk pre-configure-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Mon May 31 17:42:37 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Mon, 31 May 2010 15:42:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[10052] csw/mgar/pkg/gawk/trunk/prototype Message-ID: Revision: 10052 http://gar.svn.sourceforge.net/gar/?rev=10052&view=rev Author: theferret Date: 2010-05-31 15:42:37 +0000 (Mon, 31 May 2010) Log Message: ----------- gawk: added line to prototype Modified Paths: -------------- csw/mgar/pkg/gawk/trunk/prototype Modified: csw/mgar/pkg/gawk/trunk/prototype =================================================================== --- csw/mgar/pkg/gawk/trunk/prototype 2010-05-31 13:52:35 UTC (rev 10051) +++ csw/mgar/pkg/gawk/trunk/prototype 2010-05-31 15:42:37 UTC (rev 10052) @@ -98,6 +98,7 @@ f none /opt/csw/share/man/man1/igawk.1 0644 root bin d none /opt/csw/bin 0755 root bin f none /opt/csw/bin/pgawk-3.1.8 0755 root bin +d none /opt/csw/gnu 0755 root bin s none /opt/csw/gnu/awk=../bin/gawk f none /opt/csw/bin/igawk 0755 root bin f none /opt/csw/bin/gawk-3.1.8 0755 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Mon May 31 17:43:08 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Mon, 31 May 2010 15:43:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[10053] csw/mgar/pkg/gawk/trunk/ Message-ID: Revision: 10053 http://gar.svn.sourceforge.net/gar/?rev=10053&view=rev Author: theferret Date: 2010-05-31 15:43:08 +0000 (Mon, 31 May 2010) Log Message: ----------- gawk: silly tweak Property Changed: ---------------- csw/mgar/pkg/gawk/trunk/ Property changes on: csw/mgar/pkg/gawk/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Mon May 31 17:44:19 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Mon, 31 May 2010 15:44:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[10054] csw/mgar/pkg/gawk/trunk/pkginfo Message-ID: Revision: 10054 http://gar.svn.sourceforge.net/gar/?rev=10054&view=rev Author: theferret Date: 2010-05-31 15:44:19 +0000 (Mon, 31 May 2010) Log Message: ----------- gawk: tweakie Modified Paths: -------------- csw/mgar/pkg/gawk/trunk/pkginfo Modified: csw/mgar/pkg/gawk/trunk/pkginfo =================================================================== --- csw/mgar/pkg/gawk/trunk/pkginfo 2010-05-31 15:43:08 UTC (rev 10053) +++ csw/mgar/pkg/gawk/trunk/pkginfo 2010-05-31 15:44:19 UTC (rev 10054) @@ -1,6 +1,6 @@ PKG=CSWgawk NAME=gawk - GNU AWK -VERSION=3.1.8,REV=2010.05.26 +VERSION=3.1.8,REV=2010.05.31 ARCH=i386 CATEGORY=system VENDOR=http://ftp.gnu.org/pub/gnu/gawk packaged for CSW by Philip Brown This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Mon May 31 22:47:25 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Mon, 31 May 2010 20:47:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[10055] csw/mgar/pkg/gtk2/branches Message-ID: Revision: 10055 http://gar.svn.sourceforge.net/gar/?rev=10055&view=rev Author: theferret Date: 2010-05-31 20:47:25 +0000 (Mon, 31 May 2010) Log Message: ----------- gtk2: branch stuffs Added Paths: ----------- csw/mgar/pkg/gtk2/branches/Makefile csw/mgar/pkg/gtk2/branches/README csw/mgar/pkg/gtk2/branches/depend csw/mgar/pkg/gtk2/branches/patchfile.preconf csw/mgar/pkg/gtk2/branches/pkginfo csw/mgar/pkg/gtk2/branches/postinstall csw/mgar/pkg/gtk2/branches/prototype Added: csw/mgar/pkg/gtk2/branches/Makefile =================================================================== --- csw/mgar/pkg/gtk2/branches/Makefile (rev 0) +++ csw/mgar/pkg/gtk2/branches/Makefile 2010-05-31 20:47:25 UTC (rev 10055) @@ -0,0 +1,85 @@ +#This Makefile originally generated from a template under +# pkg/TEMPLATES/createpkg +# You will most likely have to use GNU make to use it. +# This is one specifically hacked to make building sparcv9 packages +# easier. +# +# Steps to use: +# +# 1. put your normal prototype as prototype.i386 +# 2. copy to prototype.sparc and edit as appropriate +# 3. search for "XXX" and replace with appropriate string +# +# 4. build your package with: +# "make", "make sparcv9", "make package" + + +#Uncomment one of these definitions. The -b invokation, +# is suitable for use with small packages, where you want to have a few files +# in your top level src directory. It is also suitable for +# "relocateable" packages. see the createpkg docs for more details. +#CREATEPKG=createpkg -b `pwd` +CREATEPKG=createpkg -r `pwd`/build/*/cswstage + +## hax for sparcv9 +RAWLIB=libXXX.so.#.#.# + + +BUILDDIR=build/* + + + +STDFILES=pkginfo copyright prototype +FILES= + +all: build + + +build: build/.config.done + (cd $(BUILDDIR) ; \ + $(MAKE) ; \ + MAKE=$(MAKE) stagepkg ) + + +# dummy target for configure +build/.config.done: + @echo Configuring with: + @echo CC=$(CC) $(CFLAGS) + @echo CXX=$(CXX) $(CXXFLAGS) + (cd $(BUILDDIR) ; \ + test -f ../../patchfile.preconf && \ + gpatch -p0 <../../patchfile.preconf ; \ + CPPFLAGS=-I/opt/csw/include ./configure --prefix=/opt/csw --disable-static ; \ + if test -f ../../patchfile.postconf ; then \ + gpatch -p0 <../../patchfile.postconf ; fi) + test -f $(BUILDDIR)/config.status && touch build/.config.done + + +# I tried depending this on $(BUILDDIR)/config.log but that didnt stick +configure: build/.config.done + +sparcv9: + (cd $(BUILDDIR)/src ; \ + gmake clean; \ + LD_OPTIONS="" gmake CFLAGS='-xstrconst -fast -xarch=v9' \ + LDFLAGS='-R/opt/csw/lib/sparcv9 -L/opt/csw/lib/sparcv9' ; \ + strip .libs/$(RAWLIB); \ + cp .libs/$(RAWLIB) ../cswstage ; cd .. ;\ + sed 's:libdir=.*:/opt/csw/lib/sparcv9:' XXX.pc>cswstage/XXX.pc.sparcv9 ; \ + echo sparcv9 build done ) + + +package: $(STDFILE) $(FILES) + $(CREATEPKG) + + + +pkgclean: + rm -f *.pkg.gz package + +clean: pkgclean + cd $(BUILDDIR) && make clean + +reallyclean: clean + rm -f $BUILDDIR/config.log $BUILDDIR/config.cache $BUILDDIR/config.status + rm -f build/.config.done Added: csw/mgar/pkg/gtk2/branches/README =================================================================== --- csw/mgar/pkg/gtk2/branches/README (rev 0) +++ csw/mgar/pkg/gtk2/branches/README 2010-05-31 20:47:25 UTC (rev 10055) @@ -0,0 +1,18 @@ +Quickie rebuild of our gtk packge(s), to make the CSW-X11 clean. + +notes for hand-tweaking prototype file: + +remove .la files from /opt/csw/lib, but NOT modules dir or elsewhere + + + +Fix whine about cannot find "default local directory monitor"? + but that is from libgio-2.0.so? + but actualy also triggered through libFAM failage. + erm...? + +some websites believe, +"makes me believe that it is + caused by the gtk_file_chooser* code in gtkoptions.c. Probably a + missing directory that the gtk code expects to be there." + Added: csw/mgar/pkg/gtk2/branches/depend =================================================================== --- csw/mgar/pkg/gtk2/branches/depend (rev 0) +++ csw/mgar/pkg/gtk2/branches/depend 2010-05-31 20:47:25 UTC (rev 10055) @@ -0,0 +1,15 @@ +P CSWfconfig +P CSWftype2 +P CSWggettextrt +P CSWglib2 +P CSWgnutls +P CSWjpeg +P CSWkrb5lib +P CSWlibatk +P CSWlibcairo +P CSWlibcups +P CSWlibxrender +P CSWpango +P CSWpng +P CSWtiff +P CSWzlib Added: csw/mgar/pkg/gtk2/branches/patchfile.preconf =================================================================== --- csw/mgar/pkg/gtk2/branches/patchfile.preconf (rev 0) +++ csw/mgar/pkg/gtk2/branches/patchfile.preconf 2010-05-31 20:47:25 UTC (rev 10055) @@ -0,0 +1,10 @@ +--- ./gdk/x11/gdkdnd-x11.c.orig Mon May 31 18:30:19 2010 ++++ ./gdk/x11/gdkdnd-x11.c Mon May 31 18:31:44 2010 +@@ -26,6 +26,7 @@ + + #include "config.h" + #include ++#include + #include + #include + Added: csw/mgar/pkg/gtk2/branches/pkginfo =================================================================== --- csw/mgar/pkg/gtk2/branches/pkginfo (rev 0) +++ csw/mgar/pkg/gtk2/branches/pkginfo 2010-05-31 20:47:25 UTC (rev 10055) @@ -0,0 +1,8 @@ +PKG=CSWgtk2 +NAME=gtk2 - description goes here +VERSION=2.18.9,REV=2010.05.31.philexperimental +CATEGORY=application +VENDOR=http://www.SOURCE-URL/ packaged for CSW by Philip Brown +HOTLINE=http://www.opencsw.org/bugtrack/ +EMAIL=phil at opencsw.org +OPENCSW_REPOSITORY=https://gar.svn.sf.net/svnroot/gar/csw/mgar/pkg/gtk2/branches/ Added: csw/mgar/pkg/gtk2/branches/postinstall =================================================================== --- csw/mgar/pkg/gtk2/branches/postinstall (rev 0) +++ csw/mgar/pkg/gtk2/branches/postinstall 2010-05-31 20:47:25 UTC (rev 10055) @@ -0,0 +1,26 @@ +#!/bin/sh + +umask 0022 + +if [ "$PKG_ROOT_DIR" = "" ] ; then PKG_ROOT_DIR=/ ; fi + +echo 'Updating gdk-pixbuf.loaders...' +test -x ${PKG_ROOT_DIR}/opt/csw/bin/gdk-pixbuf-query-loaders && \ + mkdir -p "${PKG_ROOT_DIR}"/opt/csw/etc/gtk-2.0 && + chroot "${PKG_ROOT_DIR}" /opt/csw/bin/gdk-pixbuf-query-loaders >"${PKG_ROOT_DIR}"/opt/csw/etc/gtk-2.0/gdk-pixbuf.loaders && + chroot "${PKG_ROOT_DIR}" /usr/sbin/installf CSWgtk2 /opt/csw/etc/gtk-2.0/gdk-pixbuf.loaders f 0644 root bin +test -x ${PKG_ROOT_DIR}/opt/csw/bin/sparcv9/gdk-pixbuf-query-loaders && \ +test -x /usr/bin/isainfo && [ "`/usr/bin/isainfo -b`" = 64 ] && + mkdir -p "${PKG_ROOT_DIR}"/opt/csw/etc/64/gtk-2.0 && + chroot "${PKG_ROOT_DIR}" /opt/csw/bin/sparcv9/gdk-pixbuf-query-loaders >"${PKG_ROOT_DIR}"/opt/csw/etc/64/gtk-2.0/gdk-pixbuf.loaders && + chroot "${PKG_ROOT_DIR}" /usr/sbin/installf CSWgtk2 /opt/csw/etc/64/gtk-2.0 d 0755 root bin && + chroot "${PKG_ROOT_DIR}" /usr/sbin/installf CSWgtk2 /opt/csw/etc/64/gtk-2.0/gdk-pixbuf.loaders f 0644 root bin +test -x ${PKG_ROOT_DIR}/opt/csw/bin/amd64/gdk-pixbuf-query-loaders && \ +test -x /usr/bin/isainfo && [ "`/usr/bin/isainfo -b`" = 64 ] && + mkdir -p "${PKG_ROOT_DIR}"/opt/csw/etc/64/gtk-2.0 && + chroot "${PKG_ROOT_DIR}" /opt/csw/bin/amd64/gdk-pixbuf-query-loaders >"${PKG_ROOT_DIR}"/opt/csw/etc/64/gtk-2.0/gdk-pixbuf.loaders && + chroot "${PKG_ROOT_DIR}" /usr/sbin/installf CSWgtk2 /opt/csw/etc/64/gtk-2.0 d 0755 root bin && + chroot "${PKG_ROOT_DIR}" /usr/sbin/installf CSWgtk2 /opt/csw/etc/64/gtk-2.0/gdk-pixbuf.loaders f 0644 root bin + +chroot "${PKG_ROOT_DIR}" /usr/sbin/installf -f CSWgtk2 +/bin/true Added: csw/mgar/pkg/gtk2/branches/prototype =================================================================== --- csw/mgar/pkg/gtk2/branches/prototype (rev 0) +++ csw/mgar/pkg/gtk2/branches/prototype 2010-05-31 20:47:25 UTC (rev 10055) @@ -0,0 +1,1529 @@ +i pkginfo +i copyright +i depend +i postinstall +d none /opt/csw/lib 0755 root bin +s none /opt/csw/lib/libgdk_pixbuf-2.0.so=libgdk_pixbuf-2.0.so.0.1800.9 +s none /opt/csw/lib/libgdk_pixbuf-2.0.so.0=libgdk_pixbuf-2.0.so.0.1800.9 +f none /opt/csw/lib/libgdk_pixbuf-2.0.so.0.1800.9 0755 root root +f none /opt/csw/lib/libgdk-x11-2.0.so.0.1800.9 0755 root root +s none /opt/csw/lib/libgtk-x11-2.0.so=libgtk-x11-2.0.so.0.1800.9 +s none /opt/csw/lib/libgdk_pixbuf_xlib-2.0.so.0=libgdk_pixbuf_xlib-2.0.so.0.1800.9 +f none /opt/csw/lib/libgdk_pixbuf_xlib-2.0.so.0.1800.9 0755 root root +s none /opt/csw/lib/libgdk-x11-2.0.so.0=libgdk-x11-2.0.so.0.1800.9 +f none /opt/csw/lib/libgtk-x11-2.0.so.0.1800.9 0755 root root +s none /opt/csw/lib/libgdk_pixbuf_xlib-2.0.so=libgdk_pixbuf_xlib-2.0.so.0.1800.9 +s none /opt/csw/lib/libgtk-x11-2.0.so.0=libgtk-x11-2.0.so.0.1800.9 +s none /opt/csw/lib/libgailutil.so.18=libgailutil.so.18.0.1 +s none /opt/csw/lib/libgailutil.so=libgailutil.so.18.0.1 +s none /opt/csw/lib/libgdk-x11-2.0.so=libgdk-x11-2.0.so.0.1800.9 +f none /opt/csw/lib/libgailutil.so.18.0.1 0755 root root +d none /opt/csw/lib/gtk-2.0 0755 root root +d none /opt/csw/lib/gtk-2.0/modules 0755 root root +f none /opt/csw/lib/gtk-2.0/modules/libferret.la 0755 root root +f none /opt/csw/lib/gtk-2.0/modules/libgail.so 0755 root root +f none /opt/csw/lib/gtk-2.0/modules/libgail.la 0755 root root +f none /opt/csw/lib/gtk-2.0/modules/libferret.so 0755 root root +d none /opt/csw/lib/gtk-2.0/2.10.0 0755 root root +d none /opt/csw/lib/gtk-2.0/2.10.0/printbackends 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-papi.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-lpr.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-papi.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-lpr.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-file.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-file.la 0755 root root +d none /opt/csw/lib/gtk-2.0/2.10.0/engines 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libpixmap.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libpixmap.so 0755 root root +d none /opt/csw/lib/gtk-2.0/2.10.0/loaders 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.la 0755 root root +d none /opt/csw/lib/gtk-2.0/2.10.0/immodules 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/immodules/im-viqr.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/immodules/im-thai.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/immodules/im-am-et.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/immodules/im-multipress.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/immodules/im-xim.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/immodules/im-cedilla.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/immodules/im-ipa.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/immodules/im-cedilla.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/immodules/im-xim.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/immodules/im-ipa.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/immodules/im-am-et.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/immodules/im-multipress.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/immodules/im-viqr.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/immodules/im-thai.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/immodules/im-ti-et.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/immodules/im-inuktitut.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/immodules/im-ti-er.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/immodules/im-inuktitut.so 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/immodules/im-ti-er.la 0755 root root +f none /opt/csw/lib/gtk-2.0/2.10.0/immodules/im-ti-et.so 0755 root root +d none /opt/csw/lib/gtk-2.0/include 0755 root root +f none /opt/csw/lib/gtk-2.0/include/gdkconfig.h 0644 root root +d none /opt/csw/lib/pkgconfig 0755 root root +f none /opt/csw/lib/pkgconfig/gtk+-unix-print-2.0.pc 0644 root root +f none /opt/csw/lib/pkgconfig/gtk+-2.0.pc 0644 root root +f none /opt/csw/lib/pkgconfig/gdk-x11-2.0.pc 0644 root root +f none /opt/csw/lib/pkgconfig/gtk+-x11-2.0.pc 0644 root root +f none /opt/csw/lib/pkgconfig/gail.pc 0644 root root +f none /opt/csw/lib/pkgconfig/gdk-2.0.pc 0644 root root +f none /opt/csw/lib/pkgconfig/gdk-pixbuf-2.0.pc 0644 root root +f none /opt/csw/lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc 0644 root root +d none /opt/csw/etc 0755 root root +d none /opt/csw/etc/gtk-2.0 0755 root root +f none /opt/csw/etc/gtk-2.0/im-multipress.conf 0644 root root +d none /opt/csw/bin 0755 root bin +f none /opt/csw/bin/gdk-pixbuf-csource 0755 root root +f none /opt/csw/bin/gtk-builder-convert 0755 root root +f none /opt/csw/bin/gtk-query-immodules-2.0 0755 root root +f none /opt/csw/bin/gtk-demo 0755 root root +f none /opt/csw/bin/gtk-update-icon-cache 0755 root root +f none /opt/csw/bin/gdk-pixbuf-query-loaders 0755 root root +d none /opt/csw/include 0755 root root +d none /opt/csw/include/gail-1.0 0755 root root +d none /opt/csw/include/gail-1.0/libgail-util 0755 root root +f none /opt/csw/include/gail-1.0/libgail-util/gailmisc.h 0644 root root +f none /opt/csw/include/gail-1.0/libgail-util/gail-util.h 0644 root root +f none /opt/csw/include/gail-1.0/libgail-util/gailtextutil.h 0644 root root +d none /opt/csw/include/gail-1.0/gail 0755 root root +f none /opt/csw/include/gail-1.0/gail/gailwidget.h 0644 root root +d none /opt/csw/include/gtk-unix-print-2.0 0755 root root +d none /opt/csw/include/gtk-unix-print-2.0/gtk 0755 root root +f none /opt/csw/include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h 0644 root root +f none /opt/csw/include/gtk-unix-print-2.0/gtk/gtkpagesetupunixdialog.h 0644 root root +f none /opt/csw/include/gtk-unix-print-2.0/gtk/gtkprintjob.h 0644 root root +f none /opt/csw/include/gtk-unix-print-2.0/gtk/gtkunixprint.h 0644 root root +f none /opt/csw/include/gtk-unix-print-2.0/gtk/gtkprinter.h 0644 root root +d none /opt/csw/include/gtk-2.0 0755 root root +d none /opt/csw/include/gtk-2.0/gdk 0755 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkpixbuf.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkimage.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkwindow.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkdisplay.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkproperty.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdktestutils.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkgc.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkspawn.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkpixmap.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkpango.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdk.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkvisual.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdktypes.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkcursor.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkdnd.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkcolor.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkenumtypes.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkevents.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdki18n.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkcairo.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkregion.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkkeysyms.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkx.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkfont.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkinput.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkselection.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkkeys.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkdisplaymanager.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkdrawable.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkprivate.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkrgb.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkapplaunchcontext.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk/gdkscreen.h 0644 root root +d none /opt/csw/include/gtk-2.0/gtk 0755 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkruler.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkprogress.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkbutton.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkcellrendereraccel.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkvruler.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkprivate.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktoggletoolbutton.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkdnd.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktree.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkseparatormenuitem.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktreeselection.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkseparatortoolitem.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkbox.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkactivatable.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtk.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkctree.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktooltips.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkrecentchooserwidget.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktooltip.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkbin.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkscrollbar.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktextmark.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktoolshell.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktoggleaction.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkspinbutton.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkcurve.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkactiongroup.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkpixmap.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktable.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkhscrollbar.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkcontainer.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktexttag.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtksocket.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkvolumebutton.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkrecentfilter.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkaboutdialog.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkversion.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkuimanager.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtksettings.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktreeitem.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkitem.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkitemfactory.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtknotebook.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkcellrendererpixbuf.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkmenutoolbutton.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkaccelmap.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkvseparator.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkcellrenderertoggle.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkprintoperation.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkadjustment.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkwindow.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkcellview.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkmarshal.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkbuilder.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkcelleditable.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkcolorsel.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkmenuitem.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkorientable.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktoolitem.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkrecentchooser.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkinputdialog.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkiconfactory.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkfilesel.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktextchild.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktextdisplay.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkfilefilter.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktextbuffer.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkimcontextsimple.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkdebug.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkaccelgroup.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktreestore.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkgamma.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkfontsel.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkcellrenderer.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkexpander.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkcheckbutton.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkselection.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkaccessible.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkcellrenderertext.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkrecentmanager.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkhruler.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkprogressbar.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkentry.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkcellrenderercombo.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkradiotoolbutton.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkhbox.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkfixed.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkstock.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkradioaction.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkcellrendererspin.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktoolbutton.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkcombo.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkpagesetup.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkdialog.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkimagemenuitem.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkfilechooserwidget.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkoldeditable.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkhbbox.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktoolbar.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkinvisible.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkviewport.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktreeview.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkobject.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkscalebutton.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkfontbutton.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtklist.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkcomboboxentry.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktext.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkrc.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkradiobutton.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkshow.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktreemodelfilter.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkseparator.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtksignal.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkplug.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkmisc.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkhscale.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkbbox.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkscrolledwindow.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktexttagtable.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktextiter.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtklistitem.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkassistant.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktreeviewcolumn.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkpapersize.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktreesortable.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkicontheme.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkclipboard.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkmenubar.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkprintoperationpreview.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkclist.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkstatusicon.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkmenu.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkvbbox.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktreemodel.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkmodules.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktextlayout.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkgc.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkfilechooserdialog.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkwidget.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkaccellabel.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkimmodule.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkaspectframe.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkfilechooser.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtklabel.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkvscrollbar.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkpreview.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkcolorseldialog.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkrange.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkhpaned.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkcombobox.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkentrybuffer.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktestutils.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktypebuiltins.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkcolorbutton.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkimage.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkliststore.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkbindings.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkalignment.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkiconview.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkhseparator.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkinfobar.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkrecentchooserdialog.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkbuildable.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkcalendar.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkimmulticontext.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktextview.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtksizegroup.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkstyle.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkframe.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkmenushell.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkvbox.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktypeutils.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkvscale.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkfilechooserbutton.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktextbufferrichtext.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkscale.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkrecentchoosermenu.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkenums.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkeditable.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkcellrendererprogress.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkcheckmenuitem.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkhsv.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtklinkbutton.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkentrycompletion.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkeventbox.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkaction.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktreemodelsort.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkhandlebox.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkvpaned.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkmain.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktreednd.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkprintsettings.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkpaned.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkmessagedialog.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkimcontext.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkstatusbar.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkdrawingarea.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkradiomenuitem.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkoptionmenu.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkprintcontext.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkcelllayout.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktearoffmenuitem.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktipsquery.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtktogglebutton.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtklayout.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkrecentaction.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkarrow.h 0644 root root +f none /opt/csw/include/gtk-2.0/gtk/gtkmountoperation.h 0644 root root +d none /opt/csw/include/gtk-2.0/gdk-pixbuf 0755 root root +f none /opt/csw/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h 0644 root root +d none /opt/csw/include/gtk-2.0/gdk-pixbuf-xlib 0755 root root +f none /opt/csw/include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h 0644 root root +f none /opt/csw/include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h 0644 root root +d none /opt/csw/share 0755 root bin +d none /opt/csw/share/gtk-doc 0755 root root +d none /opt/csw/share/gtk-doc/html 0755 root root +d none /opt/csw/share/gtk-doc/html/gail-libgail-util 0755 root root +f none /opt/csw/share/gtk-doc/html/gail-libgail-util/home.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gail-libgail-util/gail-libgail-util-GailTextUtil.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gail-libgail-util/up.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gail-libgail-util/style.css 0644 root root +f none /opt/csw/share/gtk-doc/html/gail-libgail-util/gail-libgail-util.devhelp 0644 root root +f none /opt/csw/share/gtk-doc/html/gail-libgail-util/gail-libgail-util.devhelp2 0644 root root +f none /opt/csw/share/gtk-doc/html/gail-libgail-util/right.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gail-libgail-util/gail-libgail-util-GailMisc.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gail-libgail-util/index.sgml 0644 root root +f none /opt/csw/share/gtk-doc/html/gail-libgail-util/index.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gail-libgail-util/libgail-util-main.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gail-libgail-util/left.png 0644 root root +d none /opt/csw/share/gtk-doc/html/gdk-pixbuf 0755 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/apas03.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-query-loaders.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf.devhelp2 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-animation.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/apa.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/rn01.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/composite.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-csource.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/style.css 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-rendering.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/api-index-full.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Module-Interface.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/home.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/api-index-deprecated.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-scaling.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-rendering.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-creating.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-inline.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/api-index-2-12.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Versioning.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/apas02.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/api-index-2-6.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/license.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/api-index-2-2.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/api-index-2-14.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/up.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/rn02.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/GdkPixbufLoader.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/api-index-2-8.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/api-index-2-10.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/api-index-2-4.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-from-drawables.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/left.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-init.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-file-saving.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/index.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/index.sgml 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-file-loading.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf.devhelp 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-rgb.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-from-drawables.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-util.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/right.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-refcounting.html 0644 root root +d none /opt/csw/share/gtk-doc/html/gtk 0755 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkRecentChooserMenu.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkAccelLabel.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-close.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkTreeModelFilter.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkHScale.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-migrating-GtkLinkButton.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/api-index-2-4.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-color-picker.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/Printing.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/filechooser.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-media-previous-ltr.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-dialog-error.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-indent-ltr.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-copy.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-yes.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkPrintJob.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-dialog-info.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-GtkPaperSize.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkRange.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-cut.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkVScrollbar.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/migrating.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkTipsQuery.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-properties.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-media-play-ltr.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkBox.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkCellRendererAccel.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/AbstractObjects.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/index.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-cdrom.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-Drag-and-Drop.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkExpander.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkCellRendererText.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkIMContext.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-select-all.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-stop.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-goto-last-rtl.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkVBox.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkTextBuffer.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkTooltips.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/chap-drawing-model.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkCellRendererCombo.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkSeparatorMenuItem.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-delete.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-Standard-Enumerations.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/assistant.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkWindowGroup.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-justify-left.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkOptionMenu.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-about.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-floppy.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-harddisk.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/recentchooserdialog.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-High-level-Printing-API.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/index.sgml 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/glossary.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/volumebutton.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkFontSelectionDialog.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-building.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-dialog-warning.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-migrating-GtkAboutDialog.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkInputDialog.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-unindent-ltr.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/window.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/style.css 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-quit.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-migrating-GtkColorButton.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkRecentChooser.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/layout-lrbt.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/DeprecatedObjects.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-spell-check.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/layout-tbrl.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-goto-first-rtl.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-undelete-ltr.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/layout-tblr.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-GtkTreeView-drag-and-drop.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-file.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/api-index-2-12.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkToggleToolButton.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkMenuItem.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-redo-rtl.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkTearoffMenuItem.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-save.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/ch01.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkColorSelection.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-italic.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/api-index-deprecated.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkFontSelection.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-Signals.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/font-button.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkListStore.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkVPaned.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/menubar.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkColorSelectionDialog.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/up.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkRadioToolButton.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkScaleButton.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkAssistant.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-jump-to-ltr.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-zoom-fit.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-zoom-in.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/combo-box-entry.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-undo-ltr.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/home.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/fontsel.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/api-index-full.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-migrating-GtkIconView.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkVButtonBox.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkVRuler.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/api-index-2-16.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkOldEditable.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/file-button.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/api-index-2-8.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkInvisible.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkRecentChooserWidget.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkTreeViewColumn.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkTable.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkCTree.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-go-down.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-find-and-replace.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-query-immodules-2.0.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/migrating-gnomeuiinfo.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkHButtonBox.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkSeparator.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkBin.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkCellLayout.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/TextWidgetObjects.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-undo-rtl.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/new-features-GtkComboBox.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/checklist-named-icons.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-network.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkLayout.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkFileChooser.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-jump-to-rtl.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/panes.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-General.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/figure-windowed-label.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkMisc.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-unindent-rtl.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkContainer.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-justify-center.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/Ornaments.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/layout-lrtb.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkItemFactory.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/pagesetupdialog.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkAlignment.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkPreview.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-undelete-rtl.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/link-button.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/figure-hierarchical-drawing.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-Themeable-Stock-Images.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkToolItem.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/entry.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/radio-group.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-goto-first-ltr.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkSettings.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/setting-the-page-flow.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkTreeModel.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkScale.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-media-pause.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkEditable.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkComboBox.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-print-warning.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkItem.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkToggleButton.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-redo-ltr.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/colorsel.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkTreeItem.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/decorating-the-assistant-pages.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk.devhelp2 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkFixed.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/list-and-tree.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-Orientable.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkSeparatorToolItem.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-goto-last-ltr.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/SelectorWidgets.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-missing-image.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkTooltip.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkCellRendererToggle.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/DisplayWidgets.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkAction.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-no.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkSpinButton.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkArrow.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkPrintSettings.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-fullscreen.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-media-record.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-migrating-checklist.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/aboutdialog.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-orientation-portrait.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkEntryBuffer.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-disconnect.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/frame.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkTextTagTable.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkProgressBar.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-strikethrough.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-dnd-multiple.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkCellView.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkDialog.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/RecentDocuments.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkRadioMenuItem.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-leave-fullscreen.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-print-preview.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkTree.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkHScrollbar.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkPlug.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-home.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/PlugSocket.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/printdialog.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkComboBoxEntry.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-indent-rtl.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtkfilechooser-new-features.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkFileChooserDialog.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-orientation-reverse-portrait.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkRecentAction.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-caps-lock-warning.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkListItem.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-media-previous-rtl.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkPrinter.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkCombo.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkRadioAction.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/accel-label.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/statusbar.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkCalendar.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-print-paused.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkRecentManager.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkCellRendererProgress.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-media-stop.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-edit.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-media-play-rtl.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-builder-convert.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkRuler.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-migrating-GtkAction.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-connect.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-convert.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-update-icon-cache.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkCheckMenuItem.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/checklist-gdkeventexpose-region.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkCellRendererSpin.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkBuilder.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-gtkfilefilter.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/ScrollingWidgets.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-x11.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkCellEditable.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-media-next-ltr.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-media-forward-rtl.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkPageSetupUnixDialog.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkTreeModelSort.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-paste.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-GtkTextIter.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkPaned.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkRecentChooserDialog.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-migrating-ClientSideWindows.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-gtkbuildable.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkEventBox.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkScrolledWindow.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-Graphics-Contexts.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkLinkButton.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/ch02.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-apply.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-new.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/check-button.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkEntry.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/scales.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkCellRenderer.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-Clipboards.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-revert-to-saved-ltr.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-media-rewind-ltr.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-migrating-entry-icons.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkDrawingArea.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-dnd.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-go-forward-rtl.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkCellRendererPixbuf.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtkrecent-chooser.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkCheckButton.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-print-report.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/MiscObjects.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkWindow.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-resources.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-go-back-rtl.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/Builder.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkPrintUnixDialog.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/combo-box.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-migrating-GtkAssistant.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-osx.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/toggle-button.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-running.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkIconView.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkGammaCurve.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkImageMenuItem.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/scrolledwindow.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkStatusbar.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkPageSetup.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/TreeWidgetObjects.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtkfilechooser-selection-modes.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-underline.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkTreeSortable.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-migrating-GtkRecentChooser.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkToolButton.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkAdjustment.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkTreeStore.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/NumericEntry.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-open.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkViewport.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkImage.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/image.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/MenusAndCombos.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkVSeparator.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/layout-rlbt.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-go-up.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-refresh.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtkfilechooser-installing-extra-widgets.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-sort-descending.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkMenu.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtkobjects.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-save-as.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/separator.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/label.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-migrating-label-links.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-Selections.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-select-color.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-find.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/layout-btrl.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-orientation-landscape.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-goto-top.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/TextWidget.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/layout-btlr.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-Testing.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-migrating-tooltips.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/spinbutton.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtkfilechooser-installing-preview.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkActionGroup.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkAspectFrame.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-zoom-100.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-justify-fill.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/icon-view.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/TreeWidget.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-migrating-GtkFileChooser.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/messagedialog.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkIMContextSimple.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-Accelerator-Maps.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/api-index-2-18.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/api-index-2-6.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-help.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkCurve.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/ui-manager.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkFileChooserWidget.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-Types.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkWidget.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkRecentFilter.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-changes-1-2.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkVolumeButton.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkProgress.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-Keyboard-Accelerators.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-index.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkFrame.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-preferences.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkFileSelection.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkToggleAction.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-windows.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-print.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkToolShell.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkTextView.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-question-index.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkActivatable.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-justify-right.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/left.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkMenuShell.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkStyle.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-add.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/progressbar.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkList.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkColorButton.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkNotebook.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/api-index-2-2.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkInfoBar.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkHSeparator.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-dialog-authentication.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkAboutDialog.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-Stock-Items.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkHPaned.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkHBox.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkPixmap.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkButtonBox.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/checklist-modifiers.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/color-button.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkLabel.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-font.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-directfb.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/multiline-text.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkHSV.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/button.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkMessageDialog.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-orientation-reverse-landscape.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-dialog-question.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/migrating-GtkCombo.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-compiling.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-directory.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-sort-ascending.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/layout-rltb.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkHRuler.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-media-rewind-rtl.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkIconTheme.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-revert-to-saved-rtl.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-execute.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkScrollbar.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkVScale.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-go-forward-ltr.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk.devhelp 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-goto-bottom.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkCList.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkFontButton.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-cancel.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-go-back-ltr.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-ok.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkTextTag.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkToolbar.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/right.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/SpecialObjects.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-print-error.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkMenuToolButton.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkSocket.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkTreeView.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/pt05.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-Bindings.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtkrecent-advanced.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/LayoutContainers.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkText.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/toolbar.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-Feature-Test-Macros.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/api-index-2-10.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-Filesystem-utilities.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkObject.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-remove.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkRadioButton.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-info.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkTextMark.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/Actions.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/WindowWidgets.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkSizeGroup.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-zoom-out.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkTreeSelection.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkAccessible.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkButton.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-migrating-GtkBuilder.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkUIManager.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-media-forward-ltr.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-media-next-rtl.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkFileChooserButton.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkEntryCompletion.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkStatusIcon.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-bold.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-clear.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkHandleBox.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/ButtonWidgets.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkIMMulticontext.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-changes-2-0.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtkbase.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-Resource-Files.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/gtk-migrating-GtkComboBox.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/api-index-2-14.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/notebook.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkPrintContext.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/GtkMenuBar.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gtk/tree-view-coordinates.png 0644 root root +d none /opt/csw/share/gtk-doc/html/gdk 0755 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk.devhelp2 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/right_tee.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/lr_angle.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/man.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/bogosity.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/sb_up_arrow.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/spraycan.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/api-index-2-18.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/dot.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/home.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/circle.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/top_side.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/cross.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/based_arrow_down.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/right_ptr.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/GdkScreen.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/api-index-2-10.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/api-index-2-6.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/style.css 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/box_spiral.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/api-index-2-14.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/star.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/bottom_right_corner.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk-Fonts.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/api-index-2-2.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gumby.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/left_tee.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/reference.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/draft_large.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/draft_small.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk-Cairo-Interaction.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk-Bitmaps-and-Pixmaps.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk-Graphics-Contexts.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/GdkDisplay.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk-Visuals.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/left_ptr.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/center_ptr.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk-Pango-Interaction.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/target.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/GdkDisplayManager.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/dotbox.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/up.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/ul_angle.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/boat.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/sizing.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/fleur.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk-Drag-and-Drop.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/exchange.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/top_tee.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/hand2.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/right_side.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk-Input-Devices.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk-General.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/watch.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk-Properties-and-Atoms.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/index.sgml 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/X_cursor.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk-Cursors.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/sb_down_arrow.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk-Testing.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/coffee_mug.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk-Keyboard-Handling.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/heart.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/rightbutton.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/pirate.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/draped_box.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/index.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk-Input.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/hand1.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/tcross.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk-Event-Structures.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk-GdkRGB.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/double_arrow.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk-Colormaps-and-Colors.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/sb_left_arrow.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/rtl_logo.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/based_arrow_up.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/top_left_arrow.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk-Windows.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk-Selections.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/bottom_left_corner.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/icon.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/diamond_cross.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/pencil.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/iron_cross.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/ur_angle.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/leftbutton.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/umbrella.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/middlebutton.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/multihead.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk-Threads.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk-X-Window-System-Interaction.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk-Events.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/plus.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/mouse.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk-Pixbufs.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/bottom_side.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk-Images.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/question_arrow.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/api-index-2-8.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk-Drawing-Primitives.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/xterm.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk-Points-Rectangles-and-Regions.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/top_right_corner.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/left.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/sb_right_arrow.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/api-index-2-12.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/shuttle.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/sb_v_double_arrow.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/clock.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/top_left_corner.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/arrow.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/ll_angle.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/api-index-deprecated.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/right.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/spider.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/api-index-2-4.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gobbler.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk-Application-launching.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/rotated-text.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/crosshair.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/sailboat.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/api-index-2-16.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/left_side.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/api-index-full.html 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/trek.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/cross_reverse.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/gdk.devhelp 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/bottom_tee.png 0644 root root +f none /opt/csw/share/gtk-doc/html/gdk/sb_h_double_arrow.png 0644 root root +d none /opt/csw/share/themes 0755 root root +d none /opt/csw/share/themes/Emacs 0755 root root +d none /opt/csw/share/themes/Emacs/gtk-2.0-key 0755 root root +f none /opt/csw/share/themes/Emacs/gtk-2.0-key/gtkrc 0644 root root +d none /opt/csw/share/themes/Default 0755 root root +d none /opt/csw/share/themes/Default/gtk-2.0-key 0755 root root +f none /opt/csw/share/themes/Default/gtk-2.0-key/gtkrc 0644 root root +d none /opt/csw/share/themes/Raleigh 0755 root root +d none /opt/csw/share/themes/Raleigh/gtk-2.0 0755 root root +f none /opt/csw/share/themes/Raleigh/gtk-2.0/gtkrc 0644 root root +d none /opt/csw/share/locale 0755 root bin +d none /opt/csw/share/locale/he 0755 root root +d none /opt/csw/share/locale/he/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/he/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/he/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/fa 0755 root root +d none /opt/csw/share/locale/fa/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/fa/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/fa/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/af 0755 root root +d none /opt/csw/share/locale/af/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/af/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/af/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/ar 0755 root root +d none /opt/csw/share/locale/ar/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/ar/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/ar/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/bn 0755 root root +d none /opt/csw/share/locale/bn/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/bn/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/bn/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/nso 0755 root root +d none /opt/csw/share/locale/nso/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/nso/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/nso/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/sr at latin 0755 root root +d none /opt/csw/share/locale/sr at latin/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/sr at latin/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/sr at latin/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/be at latin 0755 root root +d none /opt/csw/share/locale/be at latin/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/be at latin/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/be at latin/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/lt 0755 root root +d none /opt/csw/share/locale/lt/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/lt/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/lt/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/rw 0755 root root +d none /opt/csw/share/locale/rw/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/rw/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/rw/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/uz 0755 root root +d none /opt/csw/share/locale/uz/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/uz/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/uz/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/ast 0755 root root +d none /opt/csw/share/locale/ast/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/ast/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/ast/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/mi 0755 root root +d none /opt/csw/share/locale/mi/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/mi/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/mi/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/cy 0755 root root +d none /opt/csw/share/locale/cy/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/cy/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/cy/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/cs 0755 root root +d none /opt/csw/share/locale/cs/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/cs/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/cs/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/xh 0755 root root +d none /opt/csw/share/locale/xh/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/xh/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/xh/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/mn 0755 root root +d none /opt/csw/share/locale/mn/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/mn/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/mn/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/nl 0755 root root +d none /opt/csw/share/locale/nl/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/nl/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/nl/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/ia 0755 root root +d none /opt/csw/share/locale/ia/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/ia/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/ia/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/fr 0755 root root +d none /opt/csw/share/locale/fr/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/fr/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/fr/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/en_GB 0755 root root +d none /opt/csw/share/locale/en_GB/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/en_GB/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/en_GB/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/tt 0755 root root +d none /opt/csw/share/locale/tt/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/tt/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/tt/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/hr 0755 root root +d none /opt/csw/share/locale/hr/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/hr/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/hr/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/si 0755 root root +d none /opt/csw/share/locale/si/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/si/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/si/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/pa 0755 root root +d none /opt/csw/share/locale/pa/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/pa/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/pa/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/et 0755 root root +d none /opt/csw/share/locale/et/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/et/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/et/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/bs 0755 root root +d none /opt/csw/share/locale/bs/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/bs/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/bs/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/mai 0755 root root +d none /opt/csw/share/locale/mai/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/mai/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/mai/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/li 0755 root root +d none /opt/csw/share/locale/li/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/li/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/li/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/kn 0755 root root +d none /opt/csw/share/locale/kn/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/kn/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/kn/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/bg 0755 root root +d none /opt/csw/share/locale/bg/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/bg/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/bg/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/gu 0755 root root +d none /opt/csw/share/locale/gu/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/gu/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/gu/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/nb 0755 root root +d none /opt/csw/share/locale/nb/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/nb/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/nb/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/ga 0755 root root +d none /opt/csw/share/locale/ga/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/ga/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/ga/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/io 0755 root root +d none /opt/csw/share/locale/io/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/io/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/io/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/pt_BR 0755 root root +d none /opt/csw/share/locale/pt_BR/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/pt_BR/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/pt_BR/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/my 0755 root root +d none /opt/csw/share/locale/my/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/my/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/my/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/dz 0755 root root +d none /opt/csw/share/locale/dz/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/dz/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/dz/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/ms 0755 root root +d none /opt/csw/share/locale/ms/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/ms/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/ms/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/ne 0755 root root +d none /opt/csw/share/locale/ne/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/ne/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/ne/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/gl 0755 root root +d none /opt/csw/share/locale/gl/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/gl/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/gl/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/pl 0755 root root +d none /opt/csw/share/locale/pl/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/pl/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/pl/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/wa 0755 root root +d none /opt/csw/share/locale/wa/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/wa/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/wa/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/es 0755 root root +d none /opt/csw/share/locale/es/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/es/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/es/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/hu 0755 root root +d none /opt/csw/share/locale/hu/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/hu/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/hu/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/or 0755 root root +d none /opt/csw/share/locale/or/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/or/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/or/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/sr at ije 0755 root root +d none /opt/csw/share/locale/sr at ije/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/sr at ije/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/sr at ije/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/ku 0755 root root +d none /opt/csw/share/locale/ku/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/ku/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/ku/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/eo 0755 root root +d none /opt/csw/share/locale/eo/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/eo/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/eo/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/ka 0755 root root +d none /opt/csw/share/locale/ka/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/ka/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/ka/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/sl 0755 root root +d none /opt/csw/share/locale/sl/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/sl/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/sl/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/tk 0755 root root +d none /opt/csw/share/locale/tk/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/tk/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/tk/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/ang 0755 root root +d none /opt/csw/share/locale/ang/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/ang/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/ang/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/ta 0755 root root +d none /opt/csw/share/locale/ta/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/ta/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/ta/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/sr 0755 root root +d none /opt/csw/share/locale/sr/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/sr/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/sr/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/hi 0755 root root +d none /opt/csw/share/locale/hi/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/hi/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/hi/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/ca 0755 root root +d none /opt/csw/share/locale/ca/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/ca/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/ca/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/ro 0755 root root +d none /opt/csw/share/locale/ro/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/ro/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/ro/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/it 0755 root root +d none /opt/csw/share/locale/it/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/it/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/it/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/is 0755 root root +d none /opt/csw/share/locale/is/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/is/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/is/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/da 0755 root root +d none /opt/csw/share/locale/da/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/da/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/da/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/tr 0755 root root +d none /opt/csw/share/locale/tr/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/tr/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/tr/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/oc 0755 root root +d none /opt/csw/share/locale/oc/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/oc/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/oc/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/am 0755 root root +d none /opt/csw/share/locale/am/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/am/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/am/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/sk 0755 root root +d none /opt/csw/share/locale/sk/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/sk/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/sk/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/as 0755 root root +d none /opt/csw/share/locale/as/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/as/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/as/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/be 0755 root root +d none /opt/csw/share/locale/be/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/be/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/be/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/en_CA 0755 root root +d none /opt/csw/share/locale/en_CA/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/en_CA/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/en_CA/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/el 0755 root root +d none /opt/csw/share/locale/el/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/el/LC_MESSAGES/gtk20-properties.mo 0644 root root +f none /opt/csw/share/locale/el/LC_MESSAGES/gtk20.mo 0644 root root +d none /opt/csw/share/locale/ps 0755 root root +d none /opt/csw/share/locale/ps/LC_MESSAGES 0755 root root +f none /opt/csw/share/locale/ps/LC_MESSAGES/gtk20.mo 0644 root root +f none /opt/csw/share/locale/ps/LC_MESSAGES/gtk20-properties.mo 0644 root root +d none /opt/csw/share/locale/zh_CN 0755 root root @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.