From wahwah at users.sourceforge.net Tue Mar 1 00:29:30 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Feb 2011 23:29:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[13498] csw/mgar/pkg/lighttpd/trunk/Makefile Message-ID: Revision: 13498 http://gar.svn.sourceforge.net/gar/?rev=13498&view=rev Author: wahwah Date: 2011-02-28 23:29:30 +0000 (Mon, 28 Feb 2011) Log Message: ----------- lighttpd: Add link to the thread on upstream forum Modified Paths: -------------- csw/mgar/pkg/lighttpd/trunk/Makefile Modified: csw/mgar/pkg/lighttpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/lighttpd/trunk/Makefile 2011-02-28 03:41:35 UTC (rev 13497) +++ csw/mgar/pkg/lighttpd/trunk/Makefile 2011-02-28 23:29:30 UTC (rev 13498) @@ -30,6 +30,9 @@ # inject the right -R flag. PATCHFILES += 0002-Force-LDFLAGS-on-mod_compress.patch +# There's a thread started on lighttpd forums about the issue: +# http://redmine.lighttpd.net/boards/2/topics/4163 + # lighttpd puts its modules under libdir, so we pass libdir as a subdirectory, # because modules are not supposed to be in /opt/csw/lib. libdir = $(prefix)/lib/lighttpd 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 Mar 1 01:39:53 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 01 Mar 2011 00:39:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[13499] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13499 http://gar.svn.sourceforge.net/gar/?rev=13499&view=rev Author: bdwalton Date: 2011-03-01 00:39:52 +0000 (Tue, 01 Mar 2011) Log Message: ----------- php5/trunk: fix the prefix used to find berkley db v4 Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-02-28 23:29:30 UTC (rev 13498) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-01 00:39:52 UTC (rev 13499) @@ -505,7 +505,7 @@ CONFIGURE_ARGS += --enable-dba=shared CONFIGURE_ARGS += --with-ndbm CONFIGURE_ARGS += --with-gdbm=$(prefix) -CONFIGURE_ARGS += --with-db4=$(prefix) +CONFIGURE_ARGS += --with-db4=$(prefix)/bdb4 CONFIGURE_ARGS += --enable-dbase=shared CONFIGURE_ARGS += --enable-dom=shared CONFIGURE_ARGS += --with-libxml-dir=$(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 Mar 1 01:58:27 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 01 Mar 2011 00:58:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[13500] csw/mgar/pkg/apache2/branches/open-bug-squash/ Makefile Message-ID: Revision: 13500 http://gar.svn.sourceforge.net/gar/?rev=13500&view=rev Author: bdwalton Date: 2011-03-01 00:58:26 +0000 (Tue, 01 Mar 2011) Log Message: ----------- apache2/branches/open-bug-squash: disable the big list of file-collision overrides as apache2c should disappear Modified Paths: -------------- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-01 00:39:52 UTC (rev 13499) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-01 00:58:26 UTC (rev 13500) @@ -212,7 +212,7 @@ #PROTOTYPE_FILTER = awk '$$$$3 == "/opt/csw/apache2/sbin/suexec" { $$$$4 = "4755" }; $$$$3 ~ /cswap2mod/ { $$$$4 = "0555" }; { print }' -include checkpkg.mak +#include checkpkg.mak 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 Mar 1 02:52:36 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 01 Mar 2011 01:52:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[13501] csw/mgar/pkg Message-ID: Revision: 13501 http://gar.svn.sourceforge.net/gar/?rev=13501&view=rev Author: bdwalton Date: 2011-03-01 01:52:35 +0000 (Tue, 01 Mar 2011) Log Message: ----------- cswhookdebug: a small set of hooks useful in debugging hooks Added Paths: ----------- csw/mgar/pkg/cswhookdebug/ csw/mgar/pkg/cswhookdebug/Makefile csw/mgar/pkg/cswhookdebug/branches/ csw/mgar/pkg/cswhookdebug/tags/ csw/mgar/pkg/cswhookdebug/trunk/ csw/mgar/pkg/cswhookdebug/trunk/Makefile csw/mgar/pkg/cswhookdebug/trunk/checksums csw/mgar/pkg/cswhookdebug/trunk/files/ Copied: csw/mgar/pkg/cswhookdebug/Makefile (from rev 13494, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/cswhookdebug/Makefile (rev 0) +++ csw/mgar/pkg/cswhookdebug/Makefile 2011-03-01 01:52:35 UTC (rev 13501) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/cswhookdebug/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/cswhookdebug/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswhookdebug/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cswhookdebug/trunk/Makefile 2011-03-01 01:52:35 UTC (rev 13501) @@ -0,0 +1,42 @@ +# $Id$ +NAME = cswhookdebug +VERSION = 1.0 +CATEGORIES = utils + +DESCRIPTION = A set of hooks to ease debugging hook callers +define BLURB +These hooks simply dump the hook name and arguments with ansi colours +to make the calling sequence visible during a package maintenance action. +endef + +VENDOR_URL = http://opencsw.org +MASTER_SITES = +DISTFILES = +ARCHALL = 1 + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +post-extract-modulated: $(WORKSRC) + cp $(FILEDIR)/gpl-3.0.txt $(WORKSRC)/COPYING + +HOOKDIR=$(DESTDIR)/etc/opt/csw/pkg-hooks +HOOKS = postinstall postupgrade postremove +HOOKS += preupgrade preinstall preremove +HOOKS += prebatchupgrade prebatchinstall prebatchremove +HOOKS += postbatchupgrade postbatchinstall postbatchremove +HOOKS += prefetch postfetch preargproc postargproc + +install-custom: + @echo Installing CSW$(NAME) files... + ( ginstall -m 0755 -d $(DESTDIR)/opt/csw/share/doc/$(NAME)/ \ + $(HOOKDIR) $(addprefix $(HOOKDIR)/,$(addsuffix .d,$(HOOKS))); \ + ginstall -m 0644 $(FILEDIR)/README $(DESTDIR)$(docdir)/$(NAME)/; \ + ginstall -m 0644 $(FILEDIR)/README $(DESTDIR)$(docdir)/$(NAME)/; \ + ginstall -m 0644 $(FILEDIR)/README \ + $(DESTDIR)/opt/csw/share/doc/$(NAME)/; \ + $(foreach H,$(HOOKS),ginstall -m 0755 $(FILEDIR)/99-CSW$(NAME)-postupgrade $(HOOKDIR)/$(H).d/99-CSW$(NAME)-$(H);) ) Property changes on: csw/mgar/pkg/cswhookdebug/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/cswhookdebug/trunk/checksums =================================================================== 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 Mar 1 02:53:43 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 01 Mar 2011 01:53:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[13502] csw/mgar/pkg/cswhookdebug/trunk/files Message-ID: Revision: 13502 http://gar.svn.sourceforge.net/gar/?rev=13502&view=rev Author: bdwalton Date: 2011-03-01 01:53:43 +0000 (Tue, 01 Mar 2011) Log Message: ----------- cswhookdebug/trunk: add the script (generic for all hooks), README and license files Added Paths: ----------- csw/mgar/pkg/cswhookdebug/trunk/files/99-CSWcswhookdebug-postupgrade csw/mgar/pkg/cswhookdebug/trunk/files/README csw/mgar/pkg/cswhookdebug/trunk/files/gpl-3.0.txt Added: csw/mgar/pkg/cswhookdebug/trunk/files/99-CSWcswhookdebug-postupgrade =================================================================== --- csw/mgar/pkg/cswhookdebug/trunk/files/99-CSWcswhookdebug-postupgrade (rev 0) +++ csw/mgar/pkg/cswhookdebug/trunk/files/99-CSWcswhookdebug-postupgrade 2011-03-01 01:53:43 UTC (rev 13502) @@ -0,0 +1,4 @@ +#!/bin/bash + +echo -e "\033[1;32m$(basename $0 | sed 's/.*-//')\033[0m: \033[1;31m$*\033[0m" + Property changes on: csw/mgar/pkg/cswhookdebug/trunk/files/99-CSWcswhookdebug-postupgrade ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/cswhookdebug/trunk/files/README =================================================================== --- csw/mgar/pkg/cswhookdebug/trunk/files/README (rev 0) +++ csw/mgar/pkg/cswhookdebug/trunk/files/README 2011-03-01 01:53:43 UTC (rev 13502) @@ -0,0 +1,13 @@ +This small package adds debugging capabilities to the hook caller (eg: +the package tool). It does nothing other than echo the hook name and +the arguments passed to stdout (with ansi colours to make them easily +visible). + +The package hook requirements are detailed here: +http://wiki.opencsw.org/package-hooks + +Currently, this is only implemented in pkgutil v1.7 or later. + +These scripts are licensed under the GPL v3. + +Ben Walton \ No newline at end of file Added: csw/mgar/pkg/cswhookdebug/trunk/files/gpl-3.0.txt =================================================================== --- csw/mgar/pkg/cswhookdebug/trunk/files/gpl-3.0.txt (rev 0) +++ csw/mgar/pkg/cswhookdebug/trunk/files/gpl-3.0.txt 2011-03-01 01:53:43 UTC (rev 13502) @@ -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 bdwalton at users.sourceforge.net Tue Mar 1 03:25:06 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 01 Mar 2011 02:25:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[13503] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13503 http://gar.svn.sourceforge.net/gar/?rev=13503&view=rev Author: bdwalton Date: 2011-03-01 02:25:06 +0000 (Tue, 01 Mar 2011) Log Message: ----------- php5/trunk: force 32-bit mysql_config and use proper prefix for mysql Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-01 01:53:43 UTC (rev 13502) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-01 02:25:06 UTC (rev 13503) @@ -540,14 +540,16 @@ CONFIGURE_ARGS += --with-mhash=shared,$(prefix) CONFIGURE_ARGS += --with-mime-magic=shared CONFIGURE_ARGS += --with-mssql=shared,$(prefix) -CONFIGURE_ARGS += --with-mysql=shared,$(prefix) -CONFIGURE_ARGS += --with-mysqli=shared,$(bindir)/mysql_config +CONFIGURE_ARGS += --with-mysql=shared,$(prefix)/mysql5 +CONFIGURE_ARGS += --with-mysqli=shared,$(prefix)/mysql5/bin/$(ISA_DEFAULT)/mysql_config CONFIGURE_ARGS += --with-ncurses=shared,$(prefix) CONFIGURE_ARGS += --with-unixODBC=shared,$(prefix) CONFIGURE_ARGS += --with-openssl=shared,$(prefix) CONFIGURE_ARGS += --enable-pcntl=shared CONFIGURE_ARGS += --enable-pdo=shared -CONFIGURE_ARGS += --with-pdo-mysql=shared,$(prefix) +# not documented, but you can pass the path to mysql_config directly +# we need the 32-bit version, so we have to force this +CONFIGURE_ARGS += --with-pdo-mysql=shared,$(prefix)/mysql5/bin/$(ISA_DEFAULT)/mysql_config CONFIGURE_ARGS += --with-zlib-dir=$(prefix) CONFIGURE_ARGS += --with-pdo-odbc=shared,unixODBC,$(prefix) CONFIGURE_ARGS += --with-pdo-pgsql=shared,$(prefix)/postgresql 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 Mar 1 03:39:02 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 01 Mar 2011 02:39:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[13504] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13504 http://gar.svn.sourceforge.net/gar/?rev=13504&view=rev Author: bdwalton Date: 2011-03-01 02:39:02 +0000 (Tue, 01 Mar 2011) Log Message: ----------- php5/trunk: force phar extension to be shared Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-01 02:25:06 UTC (rev 13503) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-01 02:39:02 UTC (rev 13504) @@ -538,6 +538,7 @@ CONFIGURE_ARGS += --enable-mbregex=shared CONFIGURE_ARGS += --with-mcrypt=shared,$(prefix) CONFIGURE_ARGS += --with-mhash=shared,$(prefix) +CONFIGURE_ARGS += --enable-phar=shared CONFIGURE_ARGS += --with-mime-magic=shared CONFIGURE_ARGS += --with-mssql=shared,$(prefix) CONFIGURE_ARGS += --with-mysql=shared,$(prefix)/mysql5 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 Mar 1 03:49:04 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 01 Mar 2011 02:49:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[13505] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13505 http://gar.svn.sourceforge.net/gar/?rev=13505&view=rev Author: bdwalton Date: 2011-03-01 02:49:04 +0000 (Tue, 01 Mar 2011) Log Message: ----------- php5/trunk: drop some deprecated configure options Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-01 02:39:02 UTC (rev 13504) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-01 02:49:04 UTC (rev 13505) @@ -487,11 +487,8 @@ CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --with-exec-dir=$(prefix)/php5/bin CONFIGURE_ARGS += --enable-cli -CONFIGURE_ARGS += --enable-fastcgi -CONFIGURE_ARGS += --enable-force-cgi-redirect CONFIGURE_ARGS += --with-mm=$(prefix) CONFIGURE_ARGS += --enable-magic-quotes -CONFIGURE_ARGS += --enable-spl=shared CONFIGURE_ARGS += --with-pcre-regex CONFIGURE_ARGS += --with-pear=shared CONFIGURE_ARGS += --with-pear=shared @@ -506,7 +503,6 @@ CONFIGURE_ARGS += --with-ndbm CONFIGURE_ARGS += --with-gdbm=$(prefix) CONFIGURE_ARGS += --with-db4=$(prefix)/bdb4 -CONFIGURE_ARGS += --enable-dbase=shared CONFIGURE_ARGS += --enable-dom=shared CONFIGURE_ARGS += --with-libxml-dir=$(prefix) CONFIGURE_ARGS += --enable-exif=shared @@ -518,7 +514,6 @@ CONFIGURE_ARGS += --with-png-dir=$(prefix) CONFIGURE_ARGS += --with-zlib-dir=$(prefix) CONFIGURE_ARGS += --with-xpm-dir=$(prefix) -CONFIGURE_ARGS += --with-ttf=$(prefix) CONFIGURE_ARGS += --with-freetype-dir=$(prefix) CONFIGURE_ARGS += --with-t1lib=$(prefix) CONFIGURE_ARGS += --enable-gd-native-ttf @@ -539,11 +534,9 @@ CONFIGURE_ARGS += --with-mcrypt=shared,$(prefix) CONFIGURE_ARGS += --with-mhash=shared,$(prefix) CONFIGURE_ARGS += --enable-phar=shared -CONFIGURE_ARGS += --with-mime-magic=shared CONFIGURE_ARGS += --with-mssql=shared,$(prefix) CONFIGURE_ARGS += --with-mysql=shared,$(prefix)/mysql5 CONFIGURE_ARGS += --with-mysqli=shared,$(prefix)/mysql5/bin/$(ISA_DEFAULT)/mysql_config -CONFIGURE_ARGS += --with-ncurses=shared,$(prefix) CONFIGURE_ARGS += --with-unixODBC=shared,$(prefix) CONFIGURE_ARGS += --with-openssl=shared,$(prefix) CONFIGURE_ARGS += --enable-pcntl=shared 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 Mar 1 10:29:37 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Mar 2011 09:29:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[13506] csw/mgar/pkg/help2man/trunk Message-ID: Revision: 13506 http://gar.svn.sourceforge.net/gar/?rev=13506&view=rev Author: dmichelsen Date: 2011-03-01 09:29:37 +0000 (Tue, 01 Mar 2011) Log Message: ----------- help2man: Update to 1.39.1 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 2011-03-01 02:49:04 UTC (rev 13505) +++ csw/mgar/pkg/help2man/trunk/Makefile 2011-03-01 09:29:37 UTC (rev 13506) @@ -1,5 +1,5 @@ NAME = help2man -VERSION = 1.38.4 +VERSION = 1.39.1 CATEGORIES = devel DESCRIPTION = A tool for automatically generating simple manual pages from program output @@ -25,4 +25,6 @@ include gar/category.mk post-install-modulated: - -perl -pi -e 's,/usr/lib,$(libdir),' $(DESTDIR)$(infodir)/help2man.info + -perl -pi -e 's,/usr/lib,$(libdir),g;' \ + -e 's,/usr/share,$(sharedstatedir),g;' \ + $(DESTDIR)$(infodir)/help2man.info Modified: csw/mgar/pkg/help2man/trunk/checksums =================================================================== --- csw/mgar/pkg/help2man/trunk/checksums 2011-03-01 02:49:04 UTC (rev 13505) +++ csw/mgar/pkg/help2man/trunk/checksums 2011-03-01 09:29:37 UTC (rev 13506) @@ -1 +1 @@ -1441847905ca8e6b7d63def44c3be01e help2man-1.38.4.tar.gz +6f60412cf70129ab096577c13d4da4c7 help2man-1.39.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 Tue Mar 1 11:36:18 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Mar 2011 10:36:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[13507] csw/mgar/pkg/memconf/trunk Message-ID: Revision: 13507 http://gar.svn.sourceforge.net/gar/?rev=13507&view=rev Author: dmichelsen Date: 2011-03-01 10:36:18 +0000 (Tue, 01 Mar 2011) Log Message: ----------- memconf: Update to 2.17 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 2011-03-01 09:29:37 UTC (rev 13506) +++ csw/mgar/pkg/memconf/trunk/Makefile 2011-03-01 10:36:18 UTC (rev 13507) @@ -1,5 +1,5 @@ NAME = memconf -VERSION = 2.16 +VERSION = 2.17 CATEGORIES = utils DESCRIPTION = Perl script that displays memory modules installed @@ -21,6 +21,9 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom +# We prepended /opt/csw/bin but keep /usr/lcoal/bin +CHECKPKG_OVERRIDES_CSWmemconf += file-with-bad-content|/usr/local|root/opt/csw/bin/memconf + include gar/category.mk WORKSRC = $(WORKDIR) @@ -31,7 +34,10 @@ @rm -rf $(DESTDIR) @ginstall -d $(DESTDIR)$(bindir) @ginstall -d $(DESTDIR)$(mandir)/man1 - @cp $(WORKSRC)/$(NAME) $(DESTDIR)$(bindir)/$(NAME) + @# Make sure /opt/csw/bin is used before /usr/local/bin, but keep /usr/local/bin anyway + @cat $(WORKSRC)/$(NAME) | \ + perl -npe 's,(:/usr/local/bin),:$(bindir)$$1,' \ + > $(DESTDIR)$(bindir)/$(NAME) @cp $(WORKSRC)/$(NAME).man $(DESTDIR)$(mandir)/man1/$(NAME).1 @chmod 755 $(DESTDIR)$(bindir)/$(NAME) @chmod 644 $(DESTDIR)$(mandir)/man1/$(NAME).1 Modified: csw/mgar/pkg/memconf/trunk/checksums =================================================================== --- csw/mgar/pkg/memconf/trunk/checksums 2011-03-01 09:29:37 UTC (rev 13506) +++ csw/mgar/pkg/memconf/trunk/checksums 2011-03-01 10:36:18 UTC (rev 13507) @@ -1,3 +1,2 @@ -818efbe29da417ad462e3f6345690c3d COPYING 53e202902c198e56d9223803e4e857be memconf.gz 5e13adbfce546b47d8cc84261c3738e2 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 Tue Mar 1 17:14:33 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Mar 2011 16:14:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[13508] csw/mgar/pkg/lighttpd/trunk Message-ID: Revision: 13508 http://gar.svn.sourceforge.net/gar/?rev=13508&view=rev Author: dmichelsen Date: 2011-03-01 16:14:33 +0000 (Tue, 01 Mar 2011) Log Message: ----------- lighttpd: Fix mod-compress and add packaging things Modified Paths: -------------- csw/mgar/pkg/lighttpd/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/lighttpd/trunk/files/0003-Ignore-ENOSYS-on-mkdir-which-happens-on-automounted-.patch Removed Paths: ------------- csw/mgar/pkg/lighttpd/trunk/files/0002-Force-LDFLAGS-on-mod_compress.patch Modified: csw/mgar/pkg/lighttpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/lighttpd/trunk/Makefile 2011-03-01 10:36:18 UTC (rev 13507) +++ csw/mgar/pkg/lighttpd/trunk/Makefile 2011-03-01 16:14:33 UTC (rev 13508) @@ -3,7 +3,7 @@ VERSION = 1.4.28 CATEGORIES = devel -DESCRIPTION = lighttpd - Security, speed, compliance, and flexibility http server +DESCRIPTION = HTTP server built for security, speed, compliance, and flexibility define BLURB Security, speed, compliance, and flexibility -- all of these describe lighttpd (pron. lighty) which is rapidly redefining efficiency of a webserver; as it is @@ -17,27 +17,37 @@ MASTER_SITES = http://download.lighttpd.net/lighttpd/releases-1.4.x/ DISTFILES = $(NAME)-$(VERSION).tar.gz -EXTRA_LIB = $(prefix)/lib -EXTRA_LDFLAGS += -lsendfile -# To fix undefined symbol 'dlopen' on Solaris 9 -EXTRA_LDFLAGS_5.9 += -ldl -EXTRA_LDFLAGS += $(EXTRA_LDFLAGS_$(GAROSREL)) - PATCHFILES += 0001-Work-around-linking-problem-buffer.c.patch -# The module compilation ignores LDFLAGS by default, let's force them to -# inject the right -R flag. -PATCHFILES += 0002-Force-LDFLAGS-on-mod_compress.patch - +# When mkdir is issued on an automounted directory like /home/ errno is +# set to ENOSYS halting recursive directory generation. This patches handles +# ENOSYS similar to EEXIST and just continues with the creation which then may +# or may not work later on. +# # There's a thread started on lighttpd forums about the issue: -# http://redmine.lighttpd.net/boards/2/topics/4163 +# http://redmine.lighttpd.net/boards/2/topics/4163 +PATCHFILES += 0003-Ignore-ENOSYS-on-mkdir-which-happens-on-automounted-.patch +PACKAGES += CSWlighttpd +CATALOGNAME_CSWlighttpd = lighttpd +SPKG_DESC_CSWlighttpd = HTTP server built for security, speed, compliance, and flexibility +RUNTIME_DEP_PKGS_CSWlighttpd += CSWlibpcre0 +RUNTIME_DEP_PKGS_CSWlighttpd += CSWbzip2 +RUNTIME_DEP_PKGS_CSWlighttpd += CSWzlib + +EXTRA_LINKER_FLAGS += -lsendfile + +# To fix undefined symbol 'dlopen' on Solaris 9 +EXTRA_LINKER_FLAGS_5.9 += -ldl +EXTRA_LINKER_FLAGS += $(EXTRA_LINKER_FLAGS_$(GAROSREL)) + # lighttpd puts its modules under libdir, so we pass libdir as a subdirectory, # because modules are not supposed to be in /opt/csw/lib. libdir = $(prefix)/lib/lighttpd CONFIGURE_ARGS = $(DIRPATHS) + # Solaris 9 does not have IPV6_V6ONLY. # IPv6 support only works on Solaris 10. CONFIGURE_ARGS_5.9 = --disable-ipv6 Deleted: csw/mgar/pkg/lighttpd/trunk/files/0002-Force-LDFLAGS-on-mod_compress.patch =================================================================== --- csw/mgar/pkg/lighttpd/trunk/files/0002-Force-LDFLAGS-on-mod_compress.patch 2011-03-01 10:36:18 UTC (rev 13507) +++ csw/mgar/pkg/lighttpd/trunk/files/0002-Force-LDFLAGS-on-mod_compress.patch 2011-03-01 16:14:33 UTC (rev 13508) @@ -1,24 +0,0 @@ -From fa3fa5796150b4c381a3b6c8b5a0dc20b26a82bd Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Sun, 27 Feb 2011 19:10:12 +0100 -Subject: [PATCH] Force LDFLAGS on mod_compress - ---- - src/Makefile.in | 2 +- - src/configparser.c | 240 +++++++++++++++++++++++----------------------- - src/mod_ssi_exprparser.c | 56 ++++++------ - 3 files changed, 148 insertions(+), 150 deletions(-) - -diff --git a/src/Makefile.in b/src/Makefile.in -index 5b7cb63..1362f2c 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -762,7 +762,7 @@ mod_access_la_SOURCES = mod_access.c - mod_access_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined - mod_access_la_LIBADD = $(common_libadd) - mod_compress_la_SOURCES = mod_compress.c --mod_compress_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_compress_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined $(LDFLAGS) - mod_compress_la_LIBADD = $(Z_LIB) $(BZ_LIB) $(common_libadd) - mod_auth_la_SOURCES = mod_auth.c http_auth_digest.c http_auth.c - mod_auth_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined Added: csw/mgar/pkg/lighttpd/trunk/files/0003-Ignore-ENOSYS-on-mkdir-which-happens-on-automounted-.patch =================================================================== --- csw/mgar/pkg/lighttpd/trunk/files/0003-Ignore-ENOSYS-on-mkdir-which-happens-on-automounted-.patch (rev 0) +++ csw/mgar/pkg/lighttpd/trunk/files/0003-Ignore-ENOSYS-on-mkdir-which-happens-on-automounted-.patch 2011-03-01 16:14:33 UTC (rev 13508) @@ -0,0 +1,43 @@ +From f34169598371696ff983dcd7b1ae38a2ef8fafdc Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 1 Mar 2011 16:12:53 +0100 +Subject: [PATCH] Ignore ENOSYS on mkdir which happens on automounted dirs + +--- + src/mod_compress.c | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/mod_compress.c b/src/mod_compress.c +index 748fc65..7e80e26 100644 +--- a/src/mod_compress.c ++++ b/src/mod_compress.c +@@ -113,7 +113,7 @@ static int mkdir_recursive(char *dir) { + while ((p = strchr(p + 1, '/')) != NULL) { + + *p = '\0'; +- if ((mkdir(dir, 0700) != 0) && (errno != EEXIST)) { ++ if ((mkdir(dir, 0700) != 0) && (errno != EEXIST) && (errno != ENOSYS)) { + *p = '/'; + return -1; + } +@@ -122,7 +122,7 @@ static int mkdir_recursive(char *dir) { + if (!*p) return 0; /* Ignore trailing slash */ + } + +- return (mkdir(dir, 0700) != 0) && (errno != EEXIST) ? -1 : 0; ++ return (mkdir(dir, 0700) != 0) && (errno != EEXIST) && (errno != ENOSYS) ? -1 : 0; + } + + /* 0 on success, -1 for error */ +@@ -135,7 +135,7 @@ static int mkdir_for_file(char *filename) { + while ((p = strchr(p + 1, '/')) != NULL) { + + *p = '\0'; +- if ((mkdir(filename, 0700) != 0) && (errno != EEXIST)) { ++ if ((mkdir(filename, 0700) != 0) && (errno != EEXIST) && (errno != ENOSYS)) { + *p = '/'; + return -1; + } +-- +1.7.3.2 + 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 Mar 1 20:58:54 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 01 Mar 2011 19:58:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[13509] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13509 http://gar.svn.sourceforge.net/gar/?rev=13509&view=rev Author: bdwalton Date: 2011-03-01 19:58:53 +0000 (Tue, 01 Mar 2011) Log Message: ----------- php5/trunk: correct spelling mistakes in the descriptions for modules Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-01 16:14:33 UTC (rev 13508) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-01 19:58:53 UTC (rev 13509) @@ -95,121 +95,121 @@ RUNTIME_DEP_PKGS_CSWphp5 += CSWlibmm CSWapache2 CATALOGNAME_CSWphp5bcmath = php5_bcmath -SPKG_DESC_CSWphp5bcmath = bcmath Extention for PHP5 +SPKG_DESC_CSWphp5bcmath = bcmath Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5bcmath = CSWphp5 CATALOGNAME_CSWphp5bz2 = php5_bz2 -SPKG_DESC_CSWphp5bz2 = bz2 Extention for PHP5 +SPKG_DESC_CSWphp5bz2 = bz2 Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5bz2 = CSWphp5 CSWbzip2 CATALOGNAME_CSWphp5calendar = php5_calendar -SPKG_DESC_CSWphp5calendar = calendar Extention for PHP5 +SPKG_DESC_CSWphp5calendar = calendar Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5calendar = CSWphp5 CATALOGNAME_CSWphp5ctype = php5_ctype -SPKG_DESC_CSWphp5ctype = ctype Extention for PHP5 +SPKG_DESC_CSWphp5ctype = ctype Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5ctype = CSWphp5 CATALOGNAME_CSWphp5curl = php5_curl -SPKG_DESC_CSWphp5curl = curl Extention for PHP5 +SPKG_DESC_CSWphp5curl = curl Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5curl = CSWphp5 CSWcurlrt CSWlibidn RUNTIME_DEP_PKGS_CSWphp5curl += CSWoldaprt CSWosslrt CSWzlib CATALOGNAME_CSWphp5dba = php5_dba -SPKG_DESC_CSWphp5dba = dba Extention for PHP5 +SPKG_DESC_CSWphp5dba = dba Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5dba = CSWphp5 CSWbdb CSWgdbm CATALOGNAME_CSWphp5dbase = php5_dbase -SPKG_DESC_CSWphp5dbase = dbase Extention for PHP5 +SPKG_DESC_CSWphp5dbase = dbase Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5dbase = CSWphp5 CATALOGNAME_CSWphp5dom = php5_dom -SPKG_DESC_CSWphp5dom = dom Extention for PHP5 +SPKG_DESC_CSWphp5dom = dom Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5dom = CSWphp5 CSWiconv CSWlibxml2 CSWzlib CATALOGNAME_CSWphp5exif = php5_exif -SPKG_DESC_CSWphp5exif = exif Extention for PHP5 +SPKG_DESC_CSWphp5exif = exif Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5exif = CSWphp5 CATALOGNAME_CSWphp5ftp = php5_ftp -SPKG_DESC_CSWphp5ftp = ftp Extention for PHP5 +SPKG_DESC_CSWphp5ftp = ftp Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5ftp = CSWphp5 CSWosslrt CATALOGNAME_CSWphp5gd = php5_gd -SPKG_DESC_CSWphp5gd = gd Extention for PHP5 +SPKG_DESC_CSWphp5gd = gd Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5gd = CSWphp5 CSWftype2 CSWgd CSWjpeg RUNTIME_DEP_PKGS_CSWphp5gd += CSWpng CSWt1lib CSWxpm CSWzlib CATALOGNAME_CSWphp5gettext = php5_gettext -SPKG_DESC_CSWphp5gettext = gettext Extention for PHP5 +SPKG_DESC_CSWphp5gettext = gettext Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5gettext = CSWphp5 CSWggettextrt CATALOGNAME_CSWphp5gmp = php5_gmp -SPKG_DESC_CSWphp5gmp = gmp Extention for PHP5 +SPKG_DESC_CSWphp5gmp = gmp Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5gmp = CSWphp5 CSWlibgmp CATALOGNAME_CSWphp5hash = php5_hash -SPKG_DESC_CSWphp5hash = hash Extention for PHP5 +SPKG_DESC_CSWphp5hash = hash Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5hash = CSWphp5 CATALOGNAME_CSWphp5iconv = php5_iconv -SPKG_DESC_CSWphp5iconv = iconv Extention for PHP5 +SPKG_DESC_CSWphp5iconv = iconv Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5iconv = CSWphp5 CSWiconv CATALOGNAME_CSWphp5imap = php5_imap -SPKG_DESC_CSWphp5imap = imap Extention for PHP5 +SPKG_DESC_CSWphp5imap = imap Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5imap = CSWphp5 CSWimaprt CSWkrb5lib CSWosslrt CATALOGNAME_CSWphp5json = php5_json -SPKG_DESC_CSWphp5json = json Extention for PHP5 +SPKG_DESC_CSWphp5json = json Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5json = CSWphp5 CATALOGNAME_CSWphp5ldap = php5_ldap -SPKG_DESC_CSWphp5ldap = ldap Extention for PHP5 +SPKG_DESC_CSWphp5ldap = ldap Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5ldap = CSWphp5 CSWoldaprt CSWsasl CATALOGNAME_CSWphp5mbstring = php5_mbstring -SPKG_DESC_CSWphp5mbstring = mbstring Extention for PHP5 +SPKG_DESC_CSWphp5mbstring = mbstring Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5mbstring = CSWphp5 CATALOGNAME_CSWphp5mcrypt = php5_mcrypt -SPKG_DESC_CSWphp5mcrypt = mcrypt Extention for PHP5 +SPKG_DESC_CSWphp5mcrypt = mcrypt Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5mcrypt = CSWphp5 CSWlibmcrypt CSWlibtoolrt CATALOGNAME_CSWphp5mhash = php5_mhash -SPKG_DESC_CSWphp5mhash = mhash Extention for PHP5 +SPKG_DESC_CSWphp5mhash = mhash Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5mhash = CSWphp5 CSWlibmhash CATALOGNAME_CSWphp5mimemagic = php5_mime_magic -SPKG_DESC_CSWphp5mimemagic = mime magic Extention for PHP5 +SPKG_DESC_CSWphp5mimemagic = mime magic Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5mimemagic = CSWphp5 CATALOGNAME_CSWphp5mssql = php5_mssql -SPKG_DESC_CSWphp5mssql = mssql Extention for PHP5 +SPKG_DESC_CSWphp5mssql = mssql Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5mssql = CSWphp5 CSWfreetds CATALOGNAME_CSWphp5mysql = php5_mysql -SPKG_DESC_CSWphp5mysql = mysql Extention for PHP5 +SPKG_DESC_CSWphp5mysql = mysql Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5mysql = CSWphp5 CSWmysql5rt CATALOGNAME_CSWphp5mysqli = php5_mysqli -SPKG_DESC_CSWphp5mysqli = mysqli Extention for PHP5 +SPKG_DESC_CSWphp5mysqli = mysqli Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5mysqli = CSWphp5 CSWmysql5rt CSWzlib CATALOGNAME_CSWphp5ncurses = php5_ncurses -SPKG_DESC_CSWphp5ncurses = ncurses Extention for PHP5 +SPKG_DESC_CSWphp5ncurses = ncurses Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5ncurses = CSWphp5 CSWncurses CATALOGNAME_CSWphp5odbc = php5_odbc -SPKG_DESC_CSWphp5odbc = odbc Extention for PHP5 +SPKG_DESC_CSWphp5odbc = odbc Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5odbc = CSWphp5 CSWunixodbc CATALOGNAME_CSWphp5openssl = php5_openssl -SPKG_DESC_CSWphp5openssl = openssl Extention for PHP5 +SPKG_DESC_CSWphp5openssl = openssl Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5openssl = CSWphp5 CSWosslrt CSWkrb5lib CATALOGNAME_CSWphp5pcntl = php5_pcntl -SPKG_DESC_CSWphp5pcntl = pcntl Extention for PHP5 +SPKG_DESC_CSWphp5pcntl = pcntl Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5pcntl = CSWphp5 CATALOGNAME_CSWphp5pdo = php5_pdo @@ -233,88 +233,88 @@ RUNTIME_DEP_PKGS_CSWphp5pdosqlite = CSWphp5 CSWphp5pdo CATALOGNAME_CSWphp5pgsql = php5_pgsql -SPKG_DESC_CSWphp5pgsql = pgsql Extention for PHP5 +SPKG_DESC_CSWphp5pgsql = pgsql Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5pgsql = CSWphp5 CSWlibpq CATALOGNAME_CSWphp5posix = php5_posix -SPKG_DESC_CSWphp5posix = posix Extention for PHP5 +SPKG_DESC_CSWphp5posix = posix Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5posix = CSWphp5 CATALOGNAME_CSWphp5pspell = php5_pspell -SPKG_DESC_CSWphp5pspell = pspell Extention for PHP5 +SPKG_DESC_CSWphp5pspell = pspell Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5pspell = CSWphp5 CSWaspell CATALOGNAME_CSWphp5readline = php5_readline -SPKG_DESC_CSWphp5readline = readline Extention for PHP5 +SPKG_DESC_CSWphp5readline = readline Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5readline = CSWphp5 CSWreadline CSWncurses CATALOGNAME_CSWphp5session = php5_session -SPKG_DESC_CSWphp5session = session Extention for PHP5 +SPKG_DESC_CSWphp5session = session Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5session = CSWphp5 CSWlibmm CATALOGNAME_CSWphp5shmop = php5_shmop -SPKG_DESC_CSWphp5shmop = shmop Extention for PHP5 +SPKG_DESC_CSWphp5shmop = shmop Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5shmop = CSWphp5 CATALOGNAME_CSWphp5snmp = php5_snmp -SPKG_DESC_CSWphp5snmp = snmp Extention for PHP5 +SPKG_DESC_CSWphp5snmp = snmp Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5snmp = CSWphp5 CSWnetsnmp CSWosslrt CSWtcpwrap CATALOGNAME_CSWphp5soap = php5_soap -SPKG_DESC_CSWphp5soap = soap Extention for PHP5 +SPKG_DESC_CSWphp5soap = soap Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5soap = CSWphp5 CSWiconv CSWlibxml2 CSWzlib CATALOGNAME_CSWphp5sockets = php5_sockets -SPKG_DESC_CSWphp5sockets = sockets Extention for PHP5 +SPKG_DESC_CSWphp5sockets = sockets Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5sockets = CSWphp5 CATALOGNAME_CSWphp5sqlite = php5_sqlite -SPKG_DESC_CSWphp5sqlite = sqlite Extention for PHP5 +SPKG_DESC_CSWphp5sqlite = sqlite Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5sqlite = CSWphp5 CSWsqlite CATALOGNAME_CSWphp5sysvmsg = php5_sysvmsg -SPKG_DESC_CSWphp5sysvmsg = sysvmsg Extention for PHP5 +SPKG_DESC_CSWphp5sysvmsg = sysvmsg Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5sysvmsg = CSWphp5 CATALOGNAME_CSWphp5sysvsem = php5_sysvsem -SPKG_DESC_CSWphp5sysvsem = sysvsem Extention for PHP5 +SPKG_DESC_CSWphp5sysvsem = sysvsem Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5sysvsem = CSWphp5 CATALOGNAME_CSWphp5sysvshm = php5_sysvshm -SPKG_DESC_CSWphp5sysvshm = sysvshm Extention for PHP5 +SPKG_DESC_CSWphp5sysvshm = sysvshm Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5sysvshm = CSWphp5 CATALOGNAME_CSWphp5tidy = php5_tidy -SPKG_DESC_CSWphp5tidy = tidy Extention for PHP5 +SPKG_DESC_CSWphp5tidy = tidy Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5tidy = CSWphp5 CSWhtmltidy CATALOGNAME_CSWphp5tokenizer = php5_tokenizer -SPKG_DESC_CSWphp5tokenizer = tokenizer Extention for PHP5 +SPKG_DESC_CSWphp5tokenizer = tokenizer Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5tokenizer = CSWphp5 CATALOGNAME_CSWphp5wddx = php5_wddx -SPKG_DESC_CSWphp5wddx = wddx Extention for PHP5 +SPKG_DESC_CSWphp5wddx = wddx Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5wddx = CSWphp5 CATALOGNAME_CSWphp5xmlreader = php5_xmlreader -SPKG_DESC_CSWphp5xmlreader = xmlreader Extention for PHP5 +SPKG_DESC_CSWphp5xmlreader = xmlreader Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5xmlreader = CSWphp5 CSWiconv CSWlibxml2 CSWzlib CATALOGNAME_CSWphp5xmlrpc = php5_xmlrpc -SPKG_DESC_CSWphp5xmlrpc = xmlrpc Extention for PHP5 +SPKG_DESC_CSWphp5xmlrpc = xmlrpc Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5xmlrpc = CSWphp5 CSWiconv CSWlibxml2 CSWzlib CSWexpat CATALOGNAME_CSWphp5xmlwriter = php5_xmlwriter -SPKG_DESC_CSWphp5xmlwriter = xmlwriter Extention for PHP5 +SPKG_DESC_CSWphp5xmlwriter = xmlwriter Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5xmlwriter = CSWphp5 CSWiconv CSWlibxml2 CSWzlib CATALOGNAME_CSWphp5xsl = php5_xsl -SPKG_DESC_CSWphp5xsl = xsl Extention for PHP5 +SPKG_DESC_CSWphp5xsl = xsl Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5xsl = CSWphp5 CSWiconv CSWlibxml2 RUNTIME_DEP_PKGS_CSWphp5xsl += CSWlibxslt CSWzlib CATALOGNAME_CSWphp5zip = php5_zip -SPKG_DESC_CSWphp5zip = zip Extention for PHP5 +SPKG_DESC_CSWphp5zip = zip Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5zip = CSWphp5 CSWzlib PKGFILES_CSWphp5devel = $(bindir)/php-config 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 Mar 1 21:18:22 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 01 Mar 2011 20:18:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[13510] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13510 http://gar.svn.sourceforge.net/gar/?rev=13510&view=rev Author: bdwalton Date: 2011-03-01 20:18:22 +0000 (Tue, 01 Mar 2011) Log Message: ----------- php5/trunk: fixup the module descriptions to have a capital letter first Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-01 19:58:53 UTC (rev 13509) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-01 20:18:22 UTC (rev 13510) @@ -95,121 +95,121 @@ RUNTIME_DEP_PKGS_CSWphp5 += CSWlibmm CSWapache2 CATALOGNAME_CSWphp5bcmath = php5_bcmath -SPKG_DESC_CSWphp5bcmath = bcmath Extension for PHP5 +SPKG_DESC_CSWphp5bcmath = The bcmath extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5bcmath = CSWphp5 CATALOGNAME_CSWphp5bz2 = php5_bz2 -SPKG_DESC_CSWphp5bz2 = bz2 Extension for PHP5 +SPKG_DESC_CSWphp5bz2 = The bz2 extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5bz2 = CSWphp5 CSWbzip2 CATALOGNAME_CSWphp5calendar = php5_calendar -SPKG_DESC_CSWphp5calendar = calendar Extension for PHP5 +SPKG_DESC_CSWphp5calendar = The calendar extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5calendar = CSWphp5 CATALOGNAME_CSWphp5ctype = php5_ctype -SPKG_DESC_CSWphp5ctype = ctype Extension for PHP5 +SPKG_DESC_CSWphp5ctype = The ctype extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5ctype = CSWphp5 CATALOGNAME_CSWphp5curl = php5_curl -SPKG_DESC_CSWphp5curl = curl Extension for PHP5 +SPKG_DESC_CSWphp5curl = The curl extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5curl = CSWphp5 CSWcurlrt CSWlibidn RUNTIME_DEP_PKGS_CSWphp5curl += CSWoldaprt CSWosslrt CSWzlib CATALOGNAME_CSWphp5dba = php5_dba -SPKG_DESC_CSWphp5dba = dba Extension for PHP5 +SPKG_DESC_CSWphp5dba = The dba extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5dba = CSWphp5 CSWbdb CSWgdbm CATALOGNAME_CSWphp5dbase = php5_dbase -SPKG_DESC_CSWphp5dbase = dbase Extension for PHP5 +SPKG_DESC_CSWphp5dbase = The dbase extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5dbase = CSWphp5 CATALOGNAME_CSWphp5dom = php5_dom -SPKG_DESC_CSWphp5dom = dom Extension for PHP5 +SPKG_DESC_CSWphp5dom = The dom extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5dom = CSWphp5 CSWiconv CSWlibxml2 CSWzlib CATALOGNAME_CSWphp5exif = php5_exif -SPKG_DESC_CSWphp5exif = exif Extension for PHP5 +SPKG_DESC_CSWphp5exif = The exif extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5exif = CSWphp5 CATALOGNAME_CSWphp5ftp = php5_ftp -SPKG_DESC_CSWphp5ftp = ftp Extension for PHP5 +SPKG_DESC_CSWphp5ftp = The ftp extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5ftp = CSWphp5 CSWosslrt CATALOGNAME_CSWphp5gd = php5_gd -SPKG_DESC_CSWphp5gd = gd Extension for PHP5 +SPKG_DESC_CSWphp5gd = The gd extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5gd = CSWphp5 CSWftype2 CSWgd CSWjpeg RUNTIME_DEP_PKGS_CSWphp5gd += CSWpng CSWt1lib CSWxpm CSWzlib CATALOGNAME_CSWphp5gettext = php5_gettext -SPKG_DESC_CSWphp5gettext = gettext Extension for PHP5 +SPKG_DESC_CSWphp5gettext = The gettext extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5gettext = CSWphp5 CSWggettextrt CATALOGNAME_CSWphp5gmp = php5_gmp -SPKG_DESC_CSWphp5gmp = gmp Extension for PHP5 +SPKG_DESC_CSWphp5gmp = The gmp extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5gmp = CSWphp5 CSWlibgmp CATALOGNAME_CSWphp5hash = php5_hash -SPKG_DESC_CSWphp5hash = hash Extension for PHP5 +SPKG_DESC_CSWphp5hash = The hash extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5hash = CSWphp5 CATALOGNAME_CSWphp5iconv = php5_iconv -SPKG_DESC_CSWphp5iconv = iconv Extension for PHP5 +SPKG_DESC_CSWphp5iconv = The iconv extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5iconv = CSWphp5 CSWiconv CATALOGNAME_CSWphp5imap = php5_imap -SPKG_DESC_CSWphp5imap = imap Extension for PHP5 +SPKG_DESC_CSWphp5imap = The imap extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5imap = CSWphp5 CSWimaprt CSWkrb5lib CSWosslrt CATALOGNAME_CSWphp5json = php5_json -SPKG_DESC_CSWphp5json = json Extension for PHP5 +SPKG_DESC_CSWphp5json = The json extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5json = CSWphp5 CATALOGNAME_CSWphp5ldap = php5_ldap -SPKG_DESC_CSWphp5ldap = ldap Extension for PHP5 +SPKG_DESC_CSWphp5ldap = The ldap extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5ldap = CSWphp5 CSWoldaprt CSWsasl CATALOGNAME_CSWphp5mbstring = php5_mbstring -SPKG_DESC_CSWphp5mbstring = mbstring Extension for PHP5 +SPKG_DESC_CSWphp5mbstring = The mbstring extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5mbstring = CSWphp5 CATALOGNAME_CSWphp5mcrypt = php5_mcrypt -SPKG_DESC_CSWphp5mcrypt = mcrypt Extension for PHP5 +SPKG_DESC_CSWphp5mcrypt = The mcrypt extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5mcrypt = CSWphp5 CSWlibmcrypt CSWlibtoolrt CATALOGNAME_CSWphp5mhash = php5_mhash -SPKG_DESC_CSWphp5mhash = mhash Extension for PHP5 +SPKG_DESC_CSWphp5mhash = The mhash extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5mhash = CSWphp5 CSWlibmhash CATALOGNAME_CSWphp5mimemagic = php5_mime_magic -SPKG_DESC_CSWphp5mimemagic = mime magic Extension for PHP5 +SPKG_DESC_CSWphp5mimemagic = The mime magic Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5mimemagic = CSWphp5 CATALOGNAME_CSWphp5mssql = php5_mssql -SPKG_DESC_CSWphp5mssql = mssql Extension for PHP5 +SPKG_DESC_CSWphp5mssql = The mssql extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5mssql = CSWphp5 CSWfreetds CATALOGNAME_CSWphp5mysql = php5_mysql -SPKG_DESC_CSWphp5mysql = mysql Extension for PHP5 +SPKG_DESC_CSWphp5mysql = The mysql extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5mysql = CSWphp5 CSWmysql5rt CATALOGNAME_CSWphp5mysqli = php5_mysqli -SPKG_DESC_CSWphp5mysqli = mysqli Extension for PHP5 +SPKG_DESC_CSWphp5mysqli = The mysqli extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5mysqli = CSWphp5 CSWmysql5rt CSWzlib CATALOGNAME_CSWphp5ncurses = php5_ncurses -SPKG_DESC_CSWphp5ncurses = ncurses Extension for PHP5 +SPKG_DESC_CSWphp5ncurses = The ncurses extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5ncurses = CSWphp5 CSWncurses CATALOGNAME_CSWphp5odbc = php5_odbc -SPKG_DESC_CSWphp5odbc = odbc Extension for PHP5 +SPKG_DESC_CSWphp5odbc = The odbc extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5odbc = CSWphp5 CSWunixodbc CATALOGNAME_CSWphp5openssl = php5_openssl -SPKG_DESC_CSWphp5openssl = openssl Extension for PHP5 +SPKG_DESC_CSWphp5openssl = The openssl extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5openssl = CSWphp5 CSWosslrt CSWkrb5lib CATALOGNAME_CSWphp5pcntl = php5_pcntl -SPKG_DESC_CSWphp5pcntl = pcntl Extension for PHP5 +SPKG_DESC_CSWphp5pcntl = The pcntl extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5pcntl = CSWphp5 CATALOGNAME_CSWphp5pdo = php5_pdo @@ -233,88 +233,88 @@ RUNTIME_DEP_PKGS_CSWphp5pdosqlite = CSWphp5 CSWphp5pdo CATALOGNAME_CSWphp5pgsql = php5_pgsql -SPKG_DESC_CSWphp5pgsql = pgsql Extension for PHP5 +SPKG_DESC_CSWphp5pgsql = The pgsql extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5pgsql = CSWphp5 CSWlibpq CATALOGNAME_CSWphp5posix = php5_posix -SPKG_DESC_CSWphp5posix = posix Extension for PHP5 +SPKG_DESC_CSWphp5posix = The posix extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5posix = CSWphp5 CATALOGNAME_CSWphp5pspell = php5_pspell -SPKG_DESC_CSWphp5pspell = pspell Extension for PHP5 +SPKG_DESC_CSWphp5pspell = The pspell extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5pspell = CSWphp5 CSWaspell CATALOGNAME_CSWphp5readline = php5_readline -SPKG_DESC_CSWphp5readline = readline Extension for PHP5 +SPKG_DESC_CSWphp5readline = The readline extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5readline = CSWphp5 CSWreadline CSWncurses CATALOGNAME_CSWphp5session = php5_session -SPKG_DESC_CSWphp5session = session Extension for PHP5 +SPKG_DESC_CSWphp5session = The session extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5session = CSWphp5 CSWlibmm CATALOGNAME_CSWphp5shmop = php5_shmop -SPKG_DESC_CSWphp5shmop = shmop Extension for PHP5 +SPKG_DESC_CSWphp5shmop = The shmop extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5shmop = CSWphp5 CATALOGNAME_CSWphp5snmp = php5_snmp -SPKG_DESC_CSWphp5snmp = snmp Extension for PHP5 +SPKG_DESC_CSWphp5snmp = The snmp extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5snmp = CSWphp5 CSWnetsnmp CSWosslrt CSWtcpwrap CATALOGNAME_CSWphp5soap = php5_soap -SPKG_DESC_CSWphp5soap = soap Extension for PHP5 +SPKG_DESC_CSWphp5soap = The soap extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5soap = CSWphp5 CSWiconv CSWlibxml2 CSWzlib CATALOGNAME_CSWphp5sockets = php5_sockets -SPKG_DESC_CSWphp5sockets = sockets Extension for PHP5 +SPKG_DESC_CSWphp5sockets = The sockets extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5sockets = CSWphp5 CATALOGNAME_CSWphp5sqlite = php5_sqlite -SPKG_DESC_CSWphp5sqlite = sqlite Extension for PHP5 +SPKG_DESC_CSWphp5sqlite = The sqlite extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5sqlite = CSWphp5 CSWsqlite CATALOGNAME_CSWphp5sysvmsg = php5_sysvmsg -SPKG_DESC_CSWphp5sysvmsg = sysvmsg Extension for PHP5 +SPKG_DESC_CSWphp5sysvmsg = The sysvmsg extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5sysvmsg = CSWphp5 CATALOGNAME_CSWphp5sysvsem = php5_sysvsem -SPKG_DESC_CSWphp5sysvsem = sysvsem Extension for PHP5 +SPKG_DESC_CSWphp5sysvsem = The sysvsem extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5sysvsem = CSWphp5 CATALOGNAME_CSWphp5sysvshm = php5_sysvshm -SPKG_DESC_CSWphp5sysvshm = sysvshm Extension for PHP5 +SPKG_DESC_CSWphp5sysvshm = The sysvshm extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5sysvshm = CSWphp5 CATALOGNAME_CSWphp5tidy = php5_tidy -SPKG_DESC_CSWphp5tidy = tidy Extension for PHP5 +SPKG_DESC_CSWphp5tidy = The tidy extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5tidy = CSWphp5 CSWhtmltidy CATALOGNAME_CSWphp5tokenizer = php5_tokenizer -SPKG_DESC_CSWphp5tokenizer = tokenizer Extension for PHP5 +SPKG_DESC_CSWphp5tokenizer = The tokenizer extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5tokenizer = CSWphp5 CATALOGNAME_CSWphp5wddx = php5_wddx -SPKG_DESC_CSWphp5wddx = wddx Extension for PHP5 +SPKG_DESC_CSWphp5wddx = The wddx extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5wddx = CSWphp5 CATALOGNAME_CSWphp5xmlreader = php5_xmlreader -SPKG_DESC_CSWphp5xmlreader = xmlreader Extension for PHP5 +SPKG_DESC_CSWphp5xmlreader = The xmlreader extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5xmlreader = CSWphp5 CSWiconv CSWlibxml2 CSWzlib CATALOGNAME_CSWphp5xmlrpc = php5_xmlrpc -SPKG_DESC_CSWphp5xmlrpc = xmlrpc Extension for PHP5 +SPKG_DESC_CSWphp5xmlrpc = The xmlrpc extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5xmlrpc = CSWphp5 CSWiconv CSWlibxml2 CSWzlib CSWexpat CATALOGNAME_CSWphp5xmlwriter = php5_xmlwriter -SPKG_DESC_CSWphp5xmlwriter = xmlwriter Extension for PHP5 +SPKG_DESC_CSWphp5xmlwriter = The xmlwriter extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5xmlwriter = CSWphp5 CSWiconv CSWlibxml2 CSWzlib CATALOGNAME_CSWphp5xsl = php5_xsl -SPKG_DESC_CSWphp5xsl = xsl Extension for PHP5 +SPKG_DESC_CSWphp5xsl = The xsl extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5xsl = CSWphp5 CSWiconv CSWlibxml2 RUNTIME_DEP_PKGS_CSWphp5xsl += CSWlibxslt CSWzlib CATALOGNAME_CSWphp5zip = php5_zip -SPKG_DESC_CSWphp5zip = zip Extension for PHP5 +SPKG_DESC_CSWphp5zip = The zip extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5zip = CSWphp5 CSWzlib PKGFILES_CSWphp5devel = $(bindir)/php-config 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 Mar 1 21:33:57 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 01 Mar 2011 20:33:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[13511] csw/mgar/pkg/cswclassutils/trunk/Makefile Message-ID: Revision: 13511 http://gar.svn.sourceforge.net/gar/?rev=13511&view=rev Author: bdwalton Date: 2011-03-01 20:33:57 +0000 (Tue, 01 Mar 2011) Log Message: ----------- cswclassutils/trunk: cas-initsmf needs to at least deliver /etc/opt/csw/init.d to not break other packages Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2011-03-01 20:18:22 UTC (rev 13510) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2011-03-01 20:33:57 UTC (rev 13511) @@ -100,6 +100,7 @@ PKGFILES_CSWcas-cptemplates += /opt/csw/etc/templates PKGFILES_CSWcas-initsmf += /opt/csw/etc/init.d/.* +PKGFILES_CSWcas-initsmf += /etc/opt/csw/init.d.* PKGFILES_CSWcas-initsmf += /var/opt/csw/svc/.* # Mark these as _extra_ so they're applied after the excludes, which would @@ -117,6 +118,7 @@ @echo " ==> Installing $(NAME) (custom)" @rm -rf $(DESTDIR) @ginstall -m 0755 -d $(DESTDIR)/opt/csw/etc/init.d + @ginstall -m 0755 -d $(DESTDIR)/etc/opt/csw/init.d @ginstall -m 0755 -d $(DESTDIR)/opt/csw/etc/templates @ginstall -m 0755 -d $(DESTDIR)$(docdir)/$(NAME) @ginstall -m 0755 -d $(DESTDIR)/usr/sadm/install/scripts 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 Mar 1 21:38:52 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 01 Mar 2011 20:38:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[13512] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 13512 http://gar.svn.sourceforge.net/gar/?rev=13512&view=rev Author: bdwalton Date: 2011-03-01 20:38:52 +0000 (Tue, 01 Mar 2011) Log Message: ----------- cswclassutils/trunk: add release notes to cas-initsmf Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcas-initsmf.cswreleasenotes Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2011-03-01 20:33:57 UTC (rev 13511) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2011-03-01 20:38:52 UTC (rev 13512) @@ -52,7 +52,7 @@ DESCRIPTION = CSW class action utilities MASTER_SITES = -DISTFILES = COPYING +DISTFILES = COPYING CSWcas-initsmf.cswreleasenotes ARCHALL = 1 Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcas-initsmf.cswreleasenotes =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcas-initsmf.cswreleasenotes (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcas-initsmf.cswreleasenotes 2011-03-01 20:38:52 UTC (rev 13512) @@ -0,0 +1,2 @@ +* Creating /etc/opt/csw/init.d so other packages relying on it aren't borked + - mantis 4635 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 Mar 1 22:01:47 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 01 Mar 2011 21:01:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[13513] csw/mgar/pkg/cswclassutils/trunk/Makefile Message-ID: Revision: 13513 http://gar.svn.sourceforge.net/gar/?rev=13513&view=rev Author: bdwalton Date: 2011-03-01 21:01:47 +0000 (Tue, 01 Mar 2011) Log Message: ----------- cswclassutils/trunk: no longer generate overrides for the surplus deps in cswclassutils Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2011-03-01 20:38:52 UTC (rev 13512) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2011-03-01 21:01:47 UTC (rev 13513) @@ -43,9 +43,11 @@ $(call set,$(call var_name,CATALOGNAME,$(1)),$(call catname_val,$(1))) endef -define surplus_dep -$(eval CHECKPKG_OVERRIDES_CSWcswclassutils += surplus-dependency|$(call csw_pkgname,$(1))) -endef +# checkpkg understands this relationship now, so no need to override it +# any more. keep it here in case it ever becomes useful for something else +# define surplus_dep +# $(eval CHECKPKG_OVERRIDES_CSWcswclassutils += surplus-dependency|$(call csw_pkgname,$(1))) +# endef # end of handy functions @@ -94,7 +96,7 @@ $(foreach C,$(CSWCLASSES),$(call catname,$(C))) # tell checkpkg to ignore the surplus dep on the subpkgs -$(foreach C,$(CSWCLASSES),$(call surplus_dep,$(C))) +#$(foreach C,$(CSWCLASSES),$(call surplus_dep,$(C))) # Add non-auto changes to checkpkg overrides, pkg files, etc. 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 Mar 1 22:24:30 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 01 Mar 2011 21:24:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[13514] csw/mgar/pkg/cswclassutils/trunk/Makefile Message-ID: Revision: 13514 http://gar.svn.sourceforge.net/gar/?rev=13514&view=rev Author: bdwalton Date: 2011-03-01 21:24:30 +0000 (Tue, 01 Mar 2011) Log Message: ----------- cswclassutils/trunk: dynamically generate overrides to the /usr/sadm file location warning from checkpkg Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2011-03-01 21:01:47 UTC (rev 13513) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2011-03-01 21:24:30 UTC (rev 13514) @@ -49,6 +49,10 @@ # $(eval CHECKPKG_OVERRIDES_CSWcswclassutils += surplus-dependency|$(call csw_pkgname,$(1))) # endef +define bad_location +$(eval CHECKPKG_OVERRIDES_CSWcas-$(1) += bad-location-of-file|file=/usr/sadm/install/scripts/$(2).csw$(1)) +endef + # end of handy functions DESCRIPTION = CSW class action utilities @@ -98,6 +102,11 @@ # tell checkpkg to ignore the surplus dep on the subpkgs #$(foreach C,$(CSWCLASSES),$(call surplus_dep,$(C))) +# tell checkpkg to ignore the bad file location in the subpackages +$(foreach C,$(CSWCLASSES),$(call bad_location,$(call cas_shortname,$(C)),i)) +$(foreach C,$(CSWCLASSES),$(call bad_location,$(call cas_shortname,$(C)),r)) + + # Add non-auto changes to checkpkg overrides, pkg files, etc. PKGFILES_CSWcas-cptemplates += /opt/csw/etc/templates 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 Mar 1 22:26:58 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 01 Mar 2011 21:26:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[13515] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 13515 http://gar.svn.sourceforge.net/gar/?rev=13515&view=rev Author: bdwalton Date: 2011-03-01 21:26:58 +0000 (Tue, 01 Mar 2011) Log Message: ----------- cswclassutils/trunk: override /usr/share warning and note it Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/files/CSWcas-initsmf.cswreleasenotes Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2011-03-01 21:24:30 UTC (rev 13514) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2011-03-01 21:26:58 UTC (rev 13515) @@ -89,7 +89,6 @@ PROTOTYPE_USER_cas = bin PROTOTYPE_GROUP_cas = sys - # set a unique description for each CAS $(foreach C,$(CSWCLASSES),$(call spkg_desc,$(C))) SPKG_DESC_CSWcswclassutils = $(DESCRIPTION) @@ -123,6 +122,9 @@ CHECKPKG_OVERRIDES_CSWcas-initsmf += init-file-wrong-location CHECKPKG_OVERRIDES_CSWcas-initsmf += init-file-wrong-location|/opt/csw/etc/init.d/csw.smf.sample +# the doctype string +CHECKPKG_OVERRIDES_CSWcas-initsmf += file-with-bad-content|/usr/share|root/usr/sadm/install/scripts/i.cswinitsmf + include gar/category.mk install-custom: Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcas-initsmf.cswreleasenotes =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcas-initsmf.cswreleasenotes 2011-03-01 21:24:30 UTC (rev 13514) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcas-initsmf.cswreleasenotes 2011-03-01 21:26:58 UTC (rev 13515) @@ -1,2 +1,3 @@ * Creating /etc/opt/csw/init.d so other packages relying on it aren't borked - mantis 4635 +* Override /usr/share warning as it's part of the doctype string 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 Mar 1 23:31:34 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 01 Mar 2011 22:31:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[13516] csw/mgar/pkg/lighttpd/trunk/files Message-ID: Revision: 13516 http://gar.svn.sourceforge.net/gar/?rev=13516&view=rev Author: wahwah Date: 2011-03-01 22:31:34 +0000 (Tue, 01 Mar 2011) Log Message: ----------- lighttpd: Checking in scripts from the non-gar package Added Paths: ----------- csw/mgar/pkg/lighttpd/trunk/files/CSWlighttpd.postinstall csw/mgar/pkg/lighttpd/trunk/files/CSWlighttpd.preremove csw/mgar/pkg/lighttpd/trunk/files/cswlighttpd Added: csw/mgar/pkg/lighttpd/trunk/files/CSWlighttpd.postinstall =================================================================== --- csw/mgar/pkg/lighttpd/trunk/files/CSWlighttpd.postinstall (rev 0) +++ csw/mgar/pkg/lighttpd/trunk/files/CSWlighttpd.postinstall 2011-03-01 22:31:34 UTC (rev 13516) @@ -0,0 +1,71 @@ +# lighttpd - postinstall script +# +if [ "$PKG_INSTALL_ROOT" = "" ] +then + PKG_INSTALL_ROOT=/ + CONFDIR="/opt/csw/etc" +else + CONFDIR="$PKG_INSTALL_ROOT/opt/csw/etc" +fi + +# daemons are started by default +enable_daemon=yes + +# Source csw.conf, if it exists +if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then + . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf +fi +if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then + . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf +fi + +# If defined, autoenable for the specific daemon name takes precedence +if [ "$autoenable_lighttpd" = "no" ] ; then + enable_daemon=no +elif [ "$autoenable_daemons" = "no" -a ! -n "$autoenable_lighttpd" ] ; then + enable_daemon=no +fi + +# We don't want to overwrite the lighttpd.conf the user may have already installed +case "$autoenable_demons" in + ""|"yes") + if [ ! -f $CONFDIR/lighttpd.conf ]; then + echo copying default template lighttpd.conf.CSW to lighttpd.conf + cp -p $CONFDIR/lighttpd.conf.CSW $CONFDIR/lighttpd.conf + else + echo lighttpd.conf already exists. Not copying lighttpd.conf.CSW + fi + ;; +esac + +# Set variable smf depending on the availability of SMF binaries +smf=no +if [ -f $PKG_INSTALL_ROOT/usr/sbin/svccfg -a -f $PKG_INSTALL_ROOT/usr/sbin/svcadm ]; then + smf=yes +fi + +# let's add lighttpd to the smf framework if necessary (we won't enable it yet) +if [ $smf = yes ]; then + echo "Configuring service in SMF" + /usr/sbin/svccfg import /opt/csw/var/svc/manifest/network/lighttpd.xml >/dev/null 2>&1 + /usr/sbin/svcadm disable svc:network/lighttpd >/dev/null 2>&1 + echo "Lighttpd is using Service Management Facility." + echo " The FMRI is: svc:network/lighttpd" +fi + +if [ "$PKG_INSTALL_ROOT" = "" ] ; then PKG_INSTALL_ROOT=/ ; fi + +# Let's enable the daemon (if necessary) +if [ "$enable_daemon" = "yes" -a "$PKG_INSTALL_ROOT" = "/" ]; then + echo "Starting lighttpd" + if [ $smf = no ]; then + /etc/init.d/cswlighttpd start >/dev/null 2>&1 + else + /usr/sbin/svcadm enable svc:network/lighttpd >/dev/null 2>&1 + fi +fi + +# FIXES: https://www.opencsw.org/mantis/view.php?id=4574 +crle -l /usr/lib:/lib:/opt/csw/gcc4/lib + +exit 0 Added: csw/mgar/pkg/lighttpd/trunk/files/CSWlighttpd.preremove =================================================================== --- csw/mgar/pkg/lighttpd/trunk/files/CSWlighttpd.preremove (rev 0) +++ csw/mgar/pkg/lighttpd/trunk/files/CSWlighttpd.preremove 2011-03-01 22:31:34 UTC (rev 13516) @@ -0,0 +1,29 @@ +# lighttpd - preremove script +# Stop lighttpd if it is running. +CONFFILE=$CONFDIR/lighttpd.conf +if [ "$PKG_ROOT_DIR" = "" ] ; then PKG_ROOT_DIR=/ ; fi + +smf=no +if [ -f $PKG_ROOT_DIR/usr/sbin/svccfg -a -f $PKG_ROOT_DIR/usr/sbin/svcadm ] ; then smf=yes ; fi + +if [ $smf = yes ] +then + /usr/sbin/svcadm disable -s svc:network/lighttpd >/dev/null 2>&1 + /usr/sbin/svccfg delete svc:network/lighttpd >/dev/null 2>&1 +else + case "$PKG_ROOT_DIR" in + "/") + test -x /etc/init.d/cswlighttpd && /etc/init.d/cswlighttpd stop + ;; + esac +fi + +# Remove lighttpd.conf if necessary +if cmp $CONFFILE $CONFFILE.CSW >/dev/null ; then + echo "$CONFFILE unchanged from default. Removing it." + rm $CONFFILE +else + echo "$CONFFILE has been modified. Leaving it as-is." +fi + +exit 0 Added: csw/mgar/pkg/lighttpd/trunk/files/cswlighttpd =================================================================== --- csw/mgar/pkg/lighttpd/trunk/files/cswlighttpd (rev 0) +++ csw/mgar/pkg/lighttpd/trunk/files/cswlighttpd 2011-03-01 22:31:34 UTC (rev 13516) @@ -0,0 +1,43 @@ +#!/bin/sh +# +# Copyright 2005 Sergiusz Pawlowicz All rights reserved. +# Use is subject to license terms. +# Modified for lighttpd +# +# + +LIGHTTPD_HOME=/opt/csw +CONF_FILE=/opt/csw/etc/lighttpd.conf +PIDFILE=/var/run/lighttpd.pid +HTTPD="${LIGHTTPD_HOME}/sbin/lighttpd" + +[ ! -f ${CONF_FILE} ] && exit $CONF_FILE + +case "$1" in +start) + /bin/rm -f ${PIDFILE} +# Enable NCA: + NCAKMODCONF=/etc/nca/ncakmod.conf + if [ -f $NCAKMODCONF ]; then + . $NCAKMODCONF + if [ "x$status" = "xenabled" ]; then + HTTPD="env LD_PRELOAD=/usr/lib/ncad_addr.so $HTTPD" + fi + fi + exec $HTTPD -f ${CONF_FILE} 2>&1 + ;; +refresh) + if [ -f "$PIDFILE" ]; then + /usr/bin/kill -HUP `/usr/bin/cat $PIDFILE` + fi + ;; +stop) + if [ -f "$PIDFILE" ]; then + /usr/bin/kill -QUIT `/usr/bin/cat $PIDFILE` + fi + ;; +*) + echo "Usage: $0 {start|stop|refresh}" + exit 1 + ;; +esac 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 Mar 2 02:45:38 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Mar 2011 01:45:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[13517] csw/mgar/pkg/lighttpd/trunk Message-ID: Revision: 13517 http://gar.svn.sourceforge.net/gar/?rev=13517&view=rev Author: wahwah Date: 2011-03-02 01:45:38 +0000 (Wed, 02 Mar 2011) Log Message: ----------- lighttpd: It passes the smoke test now Using SMF integration, running as the lighttpd user. Deploying a default configuration file. Modified Paths: -------------- csw/mgar/pkg/lighttpd/trunk/Makefile csw/mgar/pkg/lighttpd/trunk/files/cswlighttpd Added Paths: ----------- csw/mgar/pkg/lighttpd/trunk/files/lighttpd.conf Removed Paths: ------------- csw/mgar/pkg/lighttpd/trunk/files/CSWlighttpd.postinstall csw/mgar/pkg/lighttpd/trunk/files/CSWlighttpd.preremove Modified: csw/mgar/pkg/lighttpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/lighttpd/trunk/Makefile 2011-03-01 22:31:34 UTC (rev 13516) +++ csw/mgar/pkg/lighttpd/trunk/Makefile 2011-03-02 01:45:38 UTC (rev 13517) @@ -16,7 +16,8 @@ endef MASTER_SITES = http://download.lighttpd.net/lighttpd/releases-1.4.x/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += $(NAME)-$(VERSION).tar.gz +DISTFILES += cswlighttpd PATCHFILES += 0001-Work-around-linking-problem-buffer.c.patch @@ -46,6 +47,10 @@ # because modules are not supposed to be in /opt/csw/lib. libdir = $(prefix)/lib/lighttpd +# Solaris Zones support +sysconfdir = /etc$(prefix) +localstatedir = /var$(prefix) + CONFIGURE_ARGS = $(DIRPATHS) # Solaris 9 does not have IPV6_V6ONLY. @@ -59,4 +64,31 @@ # One test is still failing. TEST_TARGET = check +INITSMF = $(sysconfdir)/init\.d/cswlighttpd +PRESERVECONF = $(sysconfdir)/lighttpd\.conf +USERGROUP = $(sysconfdir)/pkg/$(NAME)/cswusergroup + +# To allow lighttpd to write logs +PROTOTYPE_MODIFIERS = user +PROTOTYPE_FILES_user = $(localstatedir)/log/lighttpd +PROTOTYPE_USER_user = lighttpd +PROTOTYPE_GROUP_user = lighttpd +PROTOTYPE_CLASS_user = ugfiles + include gar/category.mk + +post-install-modulated: + ginstall -d -m 755 $(DESTDIR)$(sysconfdir)/init.d + ginstall -m 755 $(DOWNLOADDIR)/cswlighttpd $(DESTDIR)$(sysconfdir)/init.d + # ginstall -m 644 $(WORKSRC)/doc/config/lighttpd.conf $(DESTDIR)$(sysconfdir) + # gsed -i -e 's+/usr/local+/opt/csw+g' $(DESTDIR)$(sysconfdir)/lighttpd.conf + ginstall -m 644 $(FILEDIR)/lighttpd.conf $(DESTDIR)$(sysconfdir) + gsed -i -e 's+/usr/local+/opt/csw+g' $(DESTDIR)$(sysconfdir)/lighttpd.conf + ginstall -d -m 755 $(DESTDIR)$(localstatedir)/run + ginstall -d -m 755 $(DESTDIR)$(datadir)/lighttpd-root + echo 'lighttpd is working!' > $(DESTDIR)$(datadir)/lighttpd-root/index.html + ginstall -d -m 755 $(DESTDIR)$(localstatedir)/log/lighttpd + ginstall -d -m 755 $(DESTDIR)$(sysconfdir)/pkg/$(NAME) + echo "lighttpd:lighttpd:lighttpd web server::::" \ + > $(DESTDIR)$(sysconfdir)/pkg/$(NAME)/cswusergroup + @$(MAKECOOKIE) Deleted: csw/mgar/pkg/lighttpd/trunk/files/CSWlighttpd.postinstall =================================================================== --- csw/mgar/pkg/lighttpd/trunk/files/CSWlighttpd.postinstall 2011-03-01 22:31:34 UTC (rev 13516) +++ csw/mgar/pkg/lighttpd/trunk/files/CSWlighttpd.postinstall 2011-03-02 01:45:38 UTC (rev 13517) @@ -1,71 +0,0 @@ -# lighttpd - postinstall script -# -if [ "$PKG_INSTALL_ROOT" = "" ] -then - PKG_INSTALL_ROOT=/ - CONFDIR="/opt/csw/etc" -else - CONFDIR="$PKG_INSTALL_ROOT/opt/csw/etc" -fi - -# daemons are started by default -enable_daemon=yes - -# Source csw.conf, if it exists -if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then - . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf -fi -if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then - . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf -fi - -# If defined, autoenable for the specific daemon name takes precedence -if [ "$autoenable_lighttpd" = "no" ] ; then - enable_daemon=no -elif [ "$autoenable_daemons" = "no" -a ! -n "$autoenable_lighttpd" ] ; then - enable_daemon=no -fi - -# We don't want to overwrite the lighttpd.conf the user may have already installed -case "$autoenable_demons" in - ""|"yes") - if [ ! -f $CONFDIR/lighttpd.conf ]; then - echo copying default template lighttpd.conf.CSW to lighttpd.conf - cp -p $CONFDIR/lighttpd.conf.CSW $CONFDIR/lighttpd.conf - else - echo lighttpd.conf already exists. Not copying lighttpd.conf.CSW - fi - ;; -esac - -# Set variable smf depending on the availability of SMF binaries -smf=no -if [ -f $PKG_INSTALL_ROOT/usr/sbin/svccfg -a -f $PKG_INSTALL_ROOT/usr/sbin/svcadm ]; then - smf=yes -fi - -# let's add lighttpd to the smf framework if necessary (we won't enable it yet) -if [ $smf = yes ]; then - echo "Configuring service in SMF" - /usr/sbin/svccfg import /opt/csw/var/svc/manifest/network/lighttpd.xml >/dev/null 2>&1 - /usr/sbin/svcadm disable svc:network/lighttpd >/dev/null 2>&1 - echo "Lighttpd is using Service Management Facility." - echo " The FMRI is: svc:network/lighttpd" -fi - -if [ "$PKG_INSTALL_ROOT" = "" ] ; then PKG_INSTALL_ROOT=/ ; fi - -# Let's enable the daemon (if necessary) -if [ "$enable_daemon" = "yes" -a "$PKG_INSTALL_ROOT" = "/" ]; then - echo "Starting lighttpd" - if [ $smf = no ]; then - /etc/init.d/cswlighttpd start >/dev/null 2>&1 - else - /usr/sbin/svcadm enable svc:network/lighttpd >/dev/null 2>&1 - fi -fi - -# FIXES: https://www.opencsw.org/mantis/view.php?id=4574 -crle -l /usr/lib:/lib:/opt/csw/gcc4/lib - -exit 0 Deleted: csw/mgar/pkg/lighttpd/trunk/files/CSWlighttpd.preremove =================================================================== --- csw/mgar/pkg/lighttpd/trunk/files/CSWlighttpd.preremove 2011-03-01 22:31:34 UTC (rev 13516) +++ csw/mgar/pkg/lighttpd/trunk/files/CSWlighttpd.preremove 2011-03-02 01:45:38 UTC (rev 13517) @@ -1,29 +0,0 @@ -# lighttpd - preremove script -# Stop lighttpd if it is running. -CONFFILE=$CONFDIR/lighttpd.conf -if [ "$PKG_ROOT_DIR" = "" ] ; then PKG_ROOT_DIR=/ ; fi - -smf=no -if [ -f $PKG_ROOT_DIR/usr/sbin/svccfg -a -f $PKG_ROOT_DIR/usr/sbin/svcadm ] ; then smf=yes ; fi - -if [ $smf = yes ] -then - /usr/sbin/svcadm disable -s svc:network/lighttpd >/dev/null 2>&1 - /usr/sbin/svccfg delete svc:network/lighttpd >/dev/null 2>&1 -else - case "$PKG_ROOT_DIR" in - "/") - test -x /etc/init.d/cswlighttpd && /etc/init.d/cswlighttpd stop - ;; - esac -fi - -# Remove lighttpd.conf if necessary -if cmp $CONFFILE $CONFFILE.CSW >/dev/null ; then - echo "$CONFFILE unchanged from default. Removing it." - rm $CONFFILE -else - echo "$CONFFILE has been modified. Leaving it as-is." -fi - -exit 0 Modified: csw/mgar/pkg/lighttpd/trunk/files/cswlighttpd =================================================================== --- csw/mgar/pkg/lighttpd/trunk/files/cswlighttpd 2011-03-01 22:31:34 UTC (rev 13516) +++ csw/mgar/pkg/lighttpd/trunk/files/cswlighttpd 2011-03-02 01:45:38 UTC (rev 13517) @@ -7,8 +7,8 @@ # LIGHTTPD_HOME=/opt/csw -CONF_FILE=/opt/csw/etc/lighttpd.conf -PIDFILE=/var/run/lighttpd.pid +CONF_FILE=/etc/opt/csw/lighttpd.conf +PIDFILE=/var/opt/csw/run/lighttpd.pid HTTPD="${LIGHTTPD_HOME}/sbin/lighttpd" [ ! -f ${CONF_FILE} ] && exit $CONF_FILE Added: csw/mgar/pkg/lighttpd/trunk/files/lighttpd.conf =================================================================== --- csw/mgar/pkg/lighttpd/trunk/files/lighttpd.conf (rev 0) +++ csw/mgar/pkg/lighttpd/trunk/files/lighttpd.conf 2011-03-02 01:45:38 UTC (rev 13517) @@ -0,0 +1,325 @@ +# lighttpd configuration file +# +# use it as a base for lighttpd 1.0.0 and above +# +# $Id: lighttpd.conf,v 1.7 2004/11/03 22:26:05 weigon Exp $ + +############ Options you really have to take care of #################### + +## modules to load +# at least mod_access and mod_accesslog should be loaded +# all other module should only be loaded if really neccesary +# - saves some time +# - saves memory +server.modules = ( +# "mod_rewrite", +# "mod_redirect", +# "mod_alias", + "mod_access", +# "mod_cml", +# "mod_trigger_b4_dl", +# "mod_auth", +# "mod_status", +# "mod_setenv", +# "mod_fastcgi", +# "mod_proxy", +# "mod_simple_vhost", +# "mod_evhost", +# "mod_userdir", +# "mod_cgi", +# "mod_compress", +# "mod_ssi", +# "mod_usertrack", +# "mod_expire", +# "mod_secdownload", +# "mod_rrdtool", + "mod_accesslog" ) + +# READ: http://blogs.sun.com/shanti/entry/lighttpd_on_solaris +server.event-handler = "solaris-devpoll" + +## a static document-root, for virtual-hosting take look at the +## server.virtual-* options +server.document-root = "/opt/csw/share/lighttpd-root" + +## where to send error-messages to +server.errorlog = "/var/opt/csw/log/lighttpd/error.log" + +# files to check for if .../ is requested +index-file.names = ( "index.php", "index.html", + "index.htm", "default.htm" ) + +## set the event-handler (read the performance section in the manual) +# server.event-handler = "freebsd-kqueue" # needed on OS X + +# mimetype mapping +mimetype.assign = ( + ".pdf" => "application/pdf", + ".sig" => "application/pgp-signature", + ".spl" => "application/futuresplash", + ".class" => "application/octet-stream", + ".ps" => "application/postscript", + ".torrent" => "application/x-bittorrent", + ".dvi" => "application/x-dvi", + ".gz" => "application/x-gzip", + ".pac" => "application/x-ns-proxy-autoconfig", + ".swf" => "application/x-shockwave-flash", + ".tar.gz" => "application/x-tgz", + ".tgz" => "application/x-tgz", + ".tar" => "application/x-tar", + ".zip" => "application/zip", + ".mp3" => "audio/mpeg", + ".m3u" => "audio/x-mpegurl", + ".wma" => "audio/x-ms-wma", + ".wax" => "audio/x-ms-wax", + ".ogg" => "application/ogg", + ".wav" => "audio/x-wav", + ".gif" => "image/gif", + ".jpg" => "image/jpeg", + ".jpeg" => "image/jpeg", + ".png" => "image/png", + ".xbm" => "image/x-xbitmap", + ".xpm" => "image/x-xpixmap", + ".xwd" => "image/x-xwindowdump", + ".css" => "text/css", + ".html" => "text/html", + ".htm" => "text/html", + ".js" => "text/javascript", + ".asc" => "text/plain", + ".c" => "text/plain", + ".cpp" => "text/plain", + ".log" => "text/plain", + ".conf" => "text/plain", + ".text" => "text/plain", + ".txt" => "text/plain", + ".dtd" => "text/xml", + ".xml" => "text/xml", + ".mpeg" => "video/mpeg", + ".mpg" => "video/mpeg", + ".mov" => "video/quicktime", + ".qt" => "video/quicktime", + ".avi" => "video/x-msvideo", + ".asf" => "video/x-ms-asf", + ".asx" => "video/x-ms-asf", + ".wmv" => "video/x-ms-wmv", + ".bz2" => "application/x-bzip", + ".tbz" => "application/x-bzip-compressed-tar", + ".tar.bz2" => "application/x-bzip-compressed-tar" + ) + +# Use the "Content-Type" extended attribute to obtain mime type if possible +#mimetype.use-xattr = "enable" + + +## send a different Server: header +## be nice and keep it at lighttpd +# server.tag = "lighttpd" + +#### accesslog module +accesslog.filename = "/var/opt/csw/log/lighttpd/access.log" + +## deny access the file-extensions +# +# ~ is for backupfiles from vi, emacs, joe, ... +# .inc is often used for code includes which should in general not be part +# of the document-root +url.access-deny = ( "~", ".inc" ) + +$HTTP["url"] =~ "\.pdf$" { + server.range-requests = "disable" +} + +## +# which extensions should not be handle via static-file transfer +# +# .php, .pl, .fcgi are most often handled by mod_fastcgi or mod_cgi +static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" ) + +######### Options that are good to be but not neccesary to be changed ####### + +## bind to port (default: 80) +#server.port = 81 + +## bind to localhost (default: all interfaces) +#server.bind = "grisu.home.kneschke.de" + +## error-handler for status 404 +#server.error-handler-404 = "/error-handler.html" +#server.error-handler-404 = "/error-handler.php" + +## to help the rc.scripts +server.pid-file = "/var/opt/csw/run/lighttpd.pid" + + +###### virtual hosts +## +## If you want name-based virtual hosting add the next three settings and load +## mod_simple_vhost +## +## document-root = +## virtual-server-root + virtual-server-default-host + virtual-server-docroot +## or +## virtual-server-root + http-host + virtual-server-docroot +## +#simple-vhost.server-root = "/home/weigon/wwwroot/servers/" +#simple-vhost.default-host = "grisu.home.kneschke.de" +#simple-vhost.document-root = "/pages/" + + +## +## Format: .html +## -> ..../status-404.html for 'File not found' +#server.errorfile-prefix = "/home/weigon/projects/lighttpd/doc/status-" + +## virtual directory listings +#dir-listing.activate = "enable" + +## enable debugging +#debug.log-request-header = "enable" +#debug.log-response-header = "enable" +#debug.log-request-handling = "enable" +#debug.log-file-not-found = "enable" + +### only root can use these options +# +# chroot() to directory (default: no chroot() ) +#server.chroot = "/" + +## change uid to (default: don't care) +server.username = "lighttpd" + +## change uid to (default: don't care) +server.groupname = "lighttpd" + +#### compress module +#compress.cache-dir = "/tmp/lighttpd/cache/compress/" +#compress.filetype = ("text/plain", "text/html") + +#### proxy module +## read proxy.txt for more info +#proxy.server = ( ".php" => +# ( "localhost" => +# ( +# "host" => "192.168.0.101", +# "port" => 80 +# ) +# ) +# ) + +#### fastcgi module +## read fastcgi.txt for more info +## for PHP don't forget to set cgi.fix_pathinfo = 1 in the php.ini +#fastcgi.server = ( ".php" => +# ( "localhost" => +# ( +# "socket" => "/tmp/php-fastcgi.socket", +# "bin-path" => "/usr/local/bin/php" +# ) +# ) +# ) + +#### CGI module +#cgi.assign = ( ".pl" => "/usr/bin/perl", +# ".cgi" => "/usr/bin/perl" ) +# + +#### SSL engine +#ssl.engine = "enable" +#ssl.pemfile = "server.pem" + +#### status module +#status.status-url = "/server-status" +#status.config-url = "/server-config" + +#### auth module +## read authentication.txt for more info +#auth.backend = "plain" +#auth.backend.plain.userfile = "lighttpd.user" +#auth.backend.plain.groupfile = "lighttpd.group" + +#auth.backend.ldap.hostname = "localhost" +#auth.backend.ldap.base-dn = "dc=my-domain,dc=com" +#auth.backend.ldap.filter = "(uid=$)" + +#auth.require = ( "/server-status" => +# ( +# "method" => "digest", +# "realm" => "download archiv", +# "require" => "user=jan" +# ), +# "/server-config" => +# ( +# "method" => "digest", +# "realm" => "download archiv", +# "require" => "valid-user" +# ) +# ) + +#### url handling modules (rewrite, redirect, access) +#url.rewrite = ( "^/$" => "/server-status" ) +#url.redirect = ( "^/wishlist/(.+)" => "http://www.123.org/$1" ) +#### both rewrite/redirect support back reference to regex conditional using %n +#$HTTP["host"] =~ "^www\.(.*)" { +# url.redirect = ( "^/(.*)" => "http://%1/$1" ) +#} + +# +# define a pattern for the host url finding +# %% => % sign +# %0 => domain name + tld +# %1 => tld +# %2 => domain name without tld +# %3 => subdomain 1 name +# %4 => subdomain 2 name +# +#evhost.path-pattern = "/home/storage/dev/www/%3/htdocs/" + +#### expire module +#expire.url = ( "/buggy/" => "access 2 hours", "/asdhas/" => "access plus 1 seconds 2 minutes") + +#### ssi +#ssi.extension = ( ".shtml" ) + +#### rrdtool +#rrdtool.binary = "/usr/bin/rrdtool" +#rrdtool.db-name = "/var/www/lighttpd.rrd" + +#### setenv +#setenv.add-request-header = ( "TRAV_ENV" => "mysql://user at host/db" ) +#setenv.add-response-header = ( "X-Secret-Message" => "42" ) + +## for mod_trigger_b4_dl +# trigger-before-download.gdbm-filename = "/home/weigon/testbase/trigger.db" +# trigger-before-download.memcache-hosts = ( "127.0.0.1:11211" ) +# trigger-before-download.trigger-url = "^/trigger/" +# trigger-before-download.download-url = "^/download/" +# trigger-before-download.deny-url = "http://127.0.0.1/index.html" +# trigger-before-download.trigger-timeout = 10 + +## for mod_cml +## don't forget to add index.cml to server.indexfiles +# cml.extension = ".cml" +# cml.memcache-hosts = ( "127.0.0.1:11211" ) + +#### variable usage: +## variable name without "." is auto prefixed by "var." and becomes "var.bar" +#bar = 1 +#var.mystring = "foo" + +## integer add +#bar += 1 +## string concat, with integer cast as string, result: "www.foo1.com" +#server.name = "www." + mystring + var.bar + ".com" +## array merge +#index-file.names = (foo + ".php") + index-file.names +#index-file.names += (foo + ".php") + +#### include +#include /etc/lighttpd/lighttpd-inc.conf +## same as above if you run: "lighttpd -f /etc/lighttpd/lighttpd.conf" +#include "lighttpd-inc.conf" + +#### include_shell +#include_shell "echo var.a=1" +## the above is same as: +#var.a=1 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 Mar 2 03:21:37 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 02 Mar 2011 02:21:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[13518] csw/mgar/pkg/php5/trunk Message-ID: Revision: 13518 http://gar.svn.sourceforge.net/gar/?rev=13518&view=rev Author: bdwalton Date: 2011-03-02 02:21:37 +0000 (Wed, 02 Mar 2011) Log Message: ----------- php5/trunk: move current set of checkpkg overrides to a separate file for later reference Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/php5/trunk/checkpkg.old Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-02 01:45:38 UTC (rev 13517) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-02 02:21:37 UTC (rev 13518) @@ -594,31 +594,5 @@ SKIPTEST = 1 #ENABLE_CHECK = 0 -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/apache/libexec/libphp5.so -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/apache2/libexec/libphp5.so -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php-cgi -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php.ini.CSW -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/phpize.m4 -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/libtool.m4 -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/shtool -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/acinclude.m4 -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/PEAR/Config.php -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/man/man1/php-config.1 -CHECKPKG_OVERRIDES_CSWphp5 += license-missing|/opt/csw/share/doc/php5/license -CHECKPKG_OVERRIDES_CSWphp5 += bad-rpath-entry|/usr/ucblib|opt/csw/apache/libexec/libphp5.so -CHECKPKG_OVERRIDES_CSWphp5 += bad-rpath-entry|/usr/ucblib|opt/csw/apache2/libexec/libphp5.so -CHECKPKG_OVERRIDES_CSWphp5 += bad-rpath-entry|/usr/ucblib|opt/csw/php5/bin/php -CHECKPKG_OVERRIDES_CSWphp5 += bad-rpath-entry|/usr/ucblib|opt/csw/php5/bin/php-cgi - -CHECKPKG_OVERRIDES_CSWphp5 += file-collision|/opt/csw/apache2/libexec/libphp5.so|CSWap2modphp5|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5 += file-collision|/opt/csw/apache/libexec/libphp5.so|CSWmodphp5|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5 += file-collision|/opt/csw/apache2/etc/extra/httpd-php5.conf.CSW|CSWap2modphp5|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5devel += action-class-only-in-pkginfo|none -CHECKPKG_OVERRIDES_CSWphp5devel += catalogname-does-not-match-pkgname|pkgname=CSWphp5devel|catalogname=php5_devel|expected-catalogname=php5devel -CHECKPKG_OVERRIDES_CSWphp5devel += license-missing|/opt/csw/share/doc/php5_devel/license - - - include files/scripts.mk include gar/category.mk Added: csw/mgar/pkg/php5/trunk/checkpkg.old =================================================================== --- csw/mgar/pkg/php5/trunk/checkpkg.old (rev 0) +++ csw/mgar/pkg/php5/trunk/checkpkg.old 2011-03-02 02:21:37 UTC (rev 13518) @@ -0,0 +1,23 @@ +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/apache/libexec/libphp5.so +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/apache2/libexec/libphp5.so +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php-cgi +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php.ini.CSW +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/phpize.m4 +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/libtool.m4 +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/shtool +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/acinclude.m4 +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/PEAR/Config.php +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/man/man1/php-config.1 +CHECKPKG_OVERRIDES_CSWphp5 += license-missing|/opt/csw/share/doc/php5/license +CHECKPKG_OVERRIDES_CSWphp5 += bad-rpath-entry|/usr/ucblib|opt/csw/apache/libexec/libphp5.so +CHECKPKG_OVERRIDES_CSWphp5 += bad-rpath-entry|/usr/ucblib|opt/csw/apache2/libexec/libphp5.so +CHECKPKG_OVERRIDES_CSWphp5 += bad-rpath-entry|/usr/ucblib|opt/csw/php5/bin/php +CHECKPKG_OVERRIDES_CSWphp5 += bad-rpath-entry|/usr/ucblib|opt/csw/php5/bin/php-cgi + +CHECKPKG_OVERRIDES_CSWphp5 += file-collision|/opt/csw/apache2/libexec/libphp5.so|CSWap2modphp5|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5 += file-collision|/opt/csw/apache/libexec/libphp5.so|CSWmodphp5|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5 += file-collision|/opt/csw/apache2/etc/extra/httpd-php5.conf.CSW|CSWap2modphp5|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5devel += action-class-only-in-pkginfo|none +CHECKPKG_OVERRIDES_CSWphp5devel += catalogname-does-not-match-pkgname|pkgname=CSWphp5devel|catalogname=php5_devel|expected-catalogname=php5devel +CHECKPKG_OVERRIDES_CSWphp5devel += license-missing|/opt/csw/share/doc/php5_devel/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 Wed Mar 2 03:30:02 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 02 Mar 2011 02:30:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[13519] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13519 http://gar.svn.sourceforge.net/gar/?rev=13519&view=rev Author: bdwalton Date: 2011-03-02 02:30:02 +0000 (Wed, 02 Mar 2011) Log Message: ----------- php5/trunk: override checkpkg as all of the modules must depend on php5 Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-02 02:21:37 UTC (rev 13518) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-02 02:30:02 UTC (rev 13519) @@ -594,5 +594,60 @@ SKIPTEST = 1 #ENABLE_CHECK = 0 +CHECKPKG_OVERRIDES_CSWphp5bcmath += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5gd += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5tidy += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5pdopgsql += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5snmp += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5ctype += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5calendar += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5hash += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5sysvshm += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5xmlwriter += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5xmlreader += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5mysql += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5iconv += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5dbase += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5mbstring += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5xsl += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5exif += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5bz2 += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5pdoodbc += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5dba += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5sysvmsg += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5imap += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5odbc += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5readline += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5openssl += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5pdosqlite += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5sockets += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5ldap += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5ncurses += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5json += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5tokenizer += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5dom += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5soap += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5pspell += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5wddx += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5gmp += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5mssql += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5pcntl += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5zip += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5pdomysql += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5curl += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5sysvsem += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5mysqli += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5mimemagic += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5posix += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5ftp += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5gettext += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5mcrypt += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5sqlite += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5xmlrpc += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5pgsql += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5shmop += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5mhash += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5session += surplus-dependency|CSWphp5 + include files/scripts.mk 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 Mar 2 04:12:32 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 02 Mar 2011 03:12:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[13520] csw/mgar/pkg/ruby18/trunk Message-ID: Revision: 13520 http://gar.svn.sourceforge.net/gar/?rev=13520&view=rev Author: bdwalton Date: 2011-03-02 03:12:32 +0000 (Wed, 02 Mar 2011) Log Message: ----------- ruby18/trunk: patch a few more usr/local references (dln.c this time) Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ruby18/trunk/files/0004-Patch-a-few-more-usr-local-references.patch Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-02 02:30:02 UTC (rev 13519) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-02 03:12:32 UTC (rev 13520) @@ -88,6 +88,7 @@ PATCHFILES = rdoc_parse_order_fix.patch PATCHFILES += 0002-Correct-potential-segfault-caused-during-garbage-col.patch PATCHFILES += 0003-Force-ld-to-embed-the-proper-SONAME-for-libruby.patch +PATCHFILES += 0004-Patch-a-few-more-usr-local-references.patch CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-pthread @@ -130,7 +131,7 @@ CHECKPKG_OVERRIDES_CSWruby += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.8/fileutils.rb CHECKPKG_OVERRIDES_CSWruby += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/ruby.1 CHECKPKG_OVERRIDES_CSWruby += file-with-bad-content|/usr/local|root/opt/csw/bin/ri -CHECKPKG_OVERRIDES_CSWrubydoc += file-with-bad-content|/usr/local +CHECKPKG_OVERRIDES_CSWrubydoc += file-with-bad-content include gar/category.mk Added: csw/mgar/pkg/ruby18/trunk/files/0004-Patch-a-few-more-usr-local-references.patch =================================================================== --- csw/mgar/pkg/ruby18/trunk/files/0004-Patch-a-few-more-usr-local-references.patch (rev 0) +++ csw/mgar/pkg/ruby18/trunk/files/0004-Patch-a-few-more-usr-local-references.patch 2011-03-02 03:12:32 UTC (rev 13520) @@ -0,0 +1,40 @@ +From 02889f366c472ec30d6f19cfd882385fd936b734 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Wed, 2 Mar 2011 04:10:08 +0100 +Subject: [PATCH] Patch a few more usr/local references + +Set default DLN paths + +Signed-off-by: Ben Walton +--- + dln.c | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/dln.c b/dln.c +index 93d912c..4711d4c 100644 +--- a/dln.c ++++ b/dln.c +@@ -156,7 +156,7 @@ init_funcname_len(buf, file) + #endif + + #ifndef DLN_DEFAULT_LIB_PATH +-# define DLN_DEFAULT_LIB_PATH "/lib:/usr/lib:/usr/local/lib:." ++# define DLN_DEFAULT_LIB_PATH "/lib:/usr/lib:/opt/csw/lib:." + #endif + + #include +@@ -1663,9 +1663,9 @@ dln_find_exe(fname, path) + + if (!path) { + #if defined(MSDOS) || defined(_WIN32) || defined(__human68k__) || defined(__MACOS__) +- path = "/usr/local/bin;/usr/ucb;/usr/bin;/bin;."; ++ path = "/opt/csw/bin;/usr/ucb;/usr/bin;/bin;."; + #else +- path = "/usr/local/bin:/usr/ucb:/usr/bin:/bin:."; ++ path = "/opt/csw/bin:/usr/ucb:/usr/bin:/bin:."; + #endif + } + return dln_find_1(fname, path, 1); +-- +1.7.3.2 + 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 Mar 2 04:16:54 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 02 Mar 2011 03:16:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[13521] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13521 http://gar.svn.sourceforge.net/gar/?rev=13521&view=rev Author: bdwalton Date: 2011-03-02 03:16:54 +0000 (Wed, 02 Mar 2011) Log Message: ----------- php5/trunk: add license file; update deps for dba module Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-02 03:12:32 UTC (rev 13520) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-02 03:16:54 UTC (rev 13521) @@ -23,6 +23,8 @@ INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) STRIP_DIRS := $(shell $(call _get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)/*/ +LICENSE = LICENSE + DISTFILES += $(DISTNAME).tar.bz2 DISTFILES += php.ini.CSW phpext pear.conf.CSW CSWphp5.postinstall @@ -117,7 +119,7 @@ CATALOGNAME_CSWphp5dba = php5_dba SPKG_DESC_CSWphp5dba = The dba extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5dba = CSWphp5 CSWbdb CSWgdbm +RUNTIME_DEP_PKGS_CSWphp5dba = CSWphp5 CSWlibgdbm3 CSWbdb42 CATALOGNAME_CSWphp5dbase = php5_dbase SPKG_DESC_CSWphp5dbase = The dbase extension for PHP5 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 Mar 2 04:18:00 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 02 Mar 2011 03:18:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[13522] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13522 http://gar.svn.sourceforge.net/gar/?rev=13522&view=rev Author: bdwalton Date: 2011-03-02 03:18:00 +0000 (Wed, 02 Mar 2011) Log Message: ----------- php5/trunk: add a missing surplus dep override (pdo -> php5) Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-02 03:16:54 UTC (rev 13521) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-02 03:18:00 UTC (rev 13522) @@ -596,6 +596,7 @@ SKIPTEST = 1 #ENABLE_CHECK = 0 +CHECKPKG_OVERRIDES_CSWphp5pdo += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5bcmath += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5gd += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5tidy += surplus-dependency|CSWphp5 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 Mar 2 04:21:27 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 02 Mar 2011 03:21:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[13523] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13523 http://gar.svn.sourceforge.net/gar/?rev=13523&view=rev Author: bdwalton Date: 2011-03-02 03:21:27 +0000 (Wed, 02 Mar 2011) Log Message: ----------- php5/trunk: update deps for mcrypt module Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-02 03:18:00 UTC (rev 13522) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-02 03:21:27 UTC (rev 13523) @@ -176,7 +176,7 @@ CATALOGNAME_CSWphp5mcrypt = php5_mcrypt SPKG_DESC_CSWphp5mcrypt = The mcrypt extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5mcrypt = CSWphp5 CSWlibmcrypt CSWlibtoolrt +RUNTIME_DEP_PKGS_CSWphp5mcrypt = CSWphp5 CSWlibmcrypt CSWlibltdl7 CATALOGNAME_CSWphp5mhash = php5_mhash SPKG_DESC_CSWphp5mhash = The mhash extension for PHP5 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 Mar 2 05:09:20 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 02 Mar 2011 04:09:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[13524] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13524 http://gar.svn.sourceforge.net/gar/?rev=13524&view=rev Author: bdwalton Date: 2011-03-02 04:09:19 +0000 (Wed, 02 Mar 2011) Log Message: ----------- php5/trunk: begin correcting package to catalog name mapping Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-02 03:21:27 UTC (rev 13523) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-02 04:09:19 UTC (rev 13524) @@ -53,7 +53,7 @@ PACKAGES += CSWphp5mimemagic PACKAGES += CSWphp5mssql PACKAGES += CSWphp5mysql -PACKAGES += CSWphp5mysqli +PACKAGES += CSWphp5-mysqli PACKAGES += CSWphp5ncurses PACKAGES += CSWphp5odbc PACKAGES += CSWphp5openssl @@ -66,7 +66,7 @@ PACKAGES += CSWphp5pgsql PACKAGES += CSWphp5posix PACKAGES += CSWphp5pspell -PACKAGES += CSWphp5readline +PACKAGES += CSWphp5-readline PACKAGES += CSWphp5session PACKAGES += CSWphp5shmop PACKAGES += CSWphp5snmp @@ -75,7 +75,7 @@ PACKAGES += CSWphp5sqlite PACKAGES += CSWphp5sysvmsg PACKAGES += CSWphp5sysvsem -PACKAGES += CSWphp5sysvshm +PACKAGES += CSWphp5-sysvshm PACKAGES += CSWphp5tidy PACKAGES += CSWphp5tokenizer PACKAGES += CSWphp5wddx @@ -194,9 +194,10 @@ SPKG_DESC_CSWphp5mysql = The mysql extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5mysql = CSWphp5 CSWmysql5rt -CATALOGNAME_CSWphp5mysqli = php5_mysqli -SPKG_DESC_CSWphp5mysqli = The mysqli extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5mysqli = CSWphp5 CSWmysql5rt CSWzlib +CATALOGNAME_CSWphp5-mysqli = php5_mysqli +SPKG_DESC_CSWphp5-mysqli = The mysqli extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-mysqli = CSWphp5 CSWmysql5rt CSWzlib +OBSOLETES_CSWphp5-mysqli = CSWphp5mysqli CATALOGNAME_CSWphp5ncurses = php5_ncurses SPKG_DESC_CSWphp5ncurses = The ncurses extension for PHP5 @@ -246,9 +247,10 @@ SPKG_DESC_CSWphp5pspell = The pspell extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5pspell = CSWphp5 CSWaspell -CATALOGNAME_CSWphp5readline = php5_readline -SPKG_DESC_CSWphp5readline = The readline extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5readline = CSWphp5 CSWreadline CSWncurses +CATALOGNAME_CSWphp5-readline = php5_readline +SPKG_DESC_CSWphp5-readline = The readline extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-readline = CSWphp5 CSWreadline CSWncurses +OBSOLETES_CSWphp5-readline = CSWphp5readline CATALOGNAME_CSWphp5session = php5_session SPKG_DESC_CSWphp5session = The session extension for PHP5 @@ -282,9 +284,10 @@ SPKG_DESC_CSWphp5sysvsem = The sysvsem extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5sysvsem = CSWphp5 -CATALOGNAME_CSWphp5sysvshm = php5_sysvshm -SPKG_DESC_CSWphp5sysvshm = The sysvshm extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5sysvshm = CSWphp5 +CATALOGNAME_CSWphp5-sysvshm = php5_sysvshm +SPKG_DESC_CSWphp5-sysvshm = The sysvshm extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-sysvshm = CSWphp5 +OBSOLETES_CSWphp5-sysvshm = CSWphp5sysvshm CATALOGNAME_CSWphp5tidy = php5_tidy SPKG_DESC_CSWphp5tidy = The tidy extension for PHP5 @@ -391,7 +394,7 @@ PKGFILES_CSWphp5mysql = .*/lib/php/extensions/.*/mysql\.so -PKGFILES_CSWphp5mysqli = .*/lib/php/extensions/.*/mysqli.* +PKGFILES_CSWphp5-mysqli = .*/lib/php/extensions/.*/mysqli.* PKGFILES_CSWphp5ncurses = .*/lib/php/extensions/.*/ncurses.* @@ -418,7 +421,7 @@ PKGFILES_CSWphp5pspell = .*/lib/php/extensions/.*/pspell.* -PKGFILES_CSWphp5readline = .*/lib/php/extensions/.*/readline.* +PKGFILES_CSWphp5-readline = .*/lib/php/extensions/.*/readline.* PKGFILES_CSWphp5session = .*/lib/php/extensions/.*/session.* PKGFILES_CSWphp5session += .*/include/php/ext/session.* @@ -438,7 +441,7 @@ PKGFILES_CSWphp5sysvsem = .*/lib/php/extensions/.*/sysvsem.* -PKGFILES_CSWphp5sysvshm = .*/lib/php/extensions/.*/sysvshm.* +PKGFILES_CSWphp5-sysvshm = .*/lib/php/extensions/.*/sysvshm.* PKGFILES_CSWphp5tidy = .*/lib/php/extensions/.*/tidy.* @@ -605,7 +608,7 @@ CHECKPKG_OVERRIDES_CSWphp5ctype += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5calendar += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5hash += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5sysvshm += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-sysvshm += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5xmlwriter += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5xmlreader += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5mysql += surplus-dependency|CSWphp5 @@ -620,7 +623,7 @@ CHECKPKG_OVERRIDES_CSWphp5sysvmsg += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5imap += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5odbc += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5readline += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-readline += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5openssl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5pdosqlite += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5sockets += surplus-dependency|CSWphp5 @@ -639,7 +642,7 @@ CHECKPKG_OVERRIDES_CSWphp5pdomysql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5curl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5sysvsem += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5mysqli += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-mysqli += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5mimemagic += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5posix += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5ftp += surplus-dependency|CSWphp5 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 Mar 2 05:10:43 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 02 Mar 2011 04:10:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[13525] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13525 http://gar.svn.sourceforge.net/gar/?rev=13525&view=rev Author: bdwalton Date: 2011-03-02 04:10:43 +0000 (Wed, 02 Mar 2011) Log Message: ----------- ruby18/trunk: fix up a few dependecy declarations Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-02 04:09:19 UTC (rev 13524) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-02 04:10:43 UTC (rev 13525) @@ -19,14 +19,14 @@ LICENSE = COPYING -RUNTIME_DEP_PKGS_CSWruby = CSWbdb48 CSWgdbm CSWiconv CSWlibruby1 +RUNTIME_DEP_PKGS_CSWruby = CSWbdb48 CSWlibgdbm3 CSWiconv CSWlibruby1 RUNTIME_DEP_PKGS_CSWruby += CSWncurses CSWosslrt CSWreadline CSWzlib RUNTIME_DEP_PKGS_CSWrubydoc = CSWruby RUNTIME_DEP_PKGS_CSWrubytk = CSWruby CSWtk CSWtcl CSWlibruby1 -RUNTIME_DEP_PKGS_CSWrubydev = CSWruby CSWcoreutils +RUNTIME_DEP_PKGS_CSWrubydev = CSWruby CSWlibruby1 CSWcoreutils RUNTIME_DEP_PKGS_CSWrubymode = CSWemacscommon 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 Mar 2 10:04:44 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 02 Mar 2011 09:04:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[13526] csw/mgar/pkg/m4/trunk Message-ID: Revision: 13526 http://gar.svn.sourceforge.net/gar/?rev=13526&view=rev Author: dmichelsen Date: 2011-03-02 09:04:44 +0000 (Wed, 02 Mar 2011) Log Message: ----------- m4: Update to 1.4.16 Modified Paths: -------------- csw/mgar/pkg/m4/trunk/Makefile csw/mgar/pkg/m4/trunk/checksums Modified: csw/mgar/pkg/m4/trunk/Makefile =================================================================== --- csw/mgar/pkg/m4/trunk/Makefile 2011-03-02 04:10:43 UTC (rev 13525) +++ csw/mgar/pkg/m4/trunk/Makefile 2011-03-02 09:04:44 UTC (rev 13526) @@ -1,5 +1,5 @@ NAME = m4 -VERSION = 1.4.15 +VERSION = 1.4.16 CATEGORIES = utils DESCRIPTION = GNU m4 Unix macro processor @@ -10,8 +10,8 @@ built-in functions for including files, running shell commands, doing arithmetic, etc. endef -MASTER_SITES = ftp://ftp.gnu.org/gnu/m4/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(NAME)-$(VERSION).tar.xz PACKAGES = CSWgm4 @@ -20,16 +20,18 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -DEP_PKGS = CSWlibsigsegv +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --program-prefix=g -CONFIGURE_ARGS = $(DIRPATHS) --program-prefix=g -TEST_SCRIPTS = +TEST_TARGET = check +# This must only be shipped by libiconv EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias include gar/category.mk post-install-modulated: + @# Every package carries his own links in /opt/csw/gnu ginstall -d $(DESTDIR)$(prefix)/gnu $(foreach G,$(notdir $(wildcard $(DESTDIR)$(bindir)/*)),ln -s ../bin/$G $(DESTDIR)$(prefix)/gnu/$(patsubst g%,%,$G);) @$(MAKECOOKIE) Modified: csw/mgar/pkg/m4/trunk/checksums =================================================================== --- csw/mgar/pkg/m4/trunk/checksums 2011-03-02 04:10:43 UTC (rev 13525) +++ csw/mgar/pkg/m4/trunk/checksums 2011-03-02 09:04:44 UTC (rev 13526) @@ -1 +1 @@ -5649a2e593b6c639deae9e72ede777dd m4-1.4.15.tar.gz +7548ec061a1ba993790159764f522d0e m4-1.4.16.tar.xz 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 Mar 2 11:21:44 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Mar 2011 10:21:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[13527] csw/mgar/pkg/lighttpd/trunk/files/cswlighttpd Message-ID: Revision: 13527 http://gar.svn.sourceforge.net/gar/?rev=13527&view=rev Author: wahwah Date: 2011-03-02 10:21:43 +0000 (Wed, 02 Mar 2011) Log Message: ----------- lighttpd: Add 'restart' command support in SMF When 'svcadm restart cswlighttpd' was issued, the service was going into maintainance state. Modified Paths: -------------- csw/mgar/pkg/lighttpd/trunk/files/cswlighttpd Modified: csw/mgar/pkg/lighttpd/trunk/files/cswlighttpd =================================================================== --- csw/mgar/pkg/lighttpd/trunk/files/cswlighttpd 2011-03-02 09:04:44 UTC (rev 13526) +++ csw/mgar/pkg/lighttpd/trunk/files/cswlighttpd 2011-03-02 10:21:43 UTC (rev 13527) @@ -13,8 +13,7 @@ [ ! -f ${CONF_FILE} ] && exit $CONF_FILE -case "$1" in -start) +start_service() { /bin/rm -f ${PIDFILE} # Enable NCA: NCAKMODCONF=/etc/nca/ncakmod.conf @@ -25,19 +24,37 @@ fi fi exec $HTTPD -f ${CONF_FILE} 2>&1 - ;; -refresh) +} + +stop_service() { if [ -f "$PIDFILE" ]; then + /usr/bin/kill -QUIT `/usr/bin/cat $PIDFILE` + fi +} + +refresh_service() { + if [ -f "$PIDFILE" ]; then /usr/bin/kill -HUP `/usr/bin/cat $PIDFILE` fi +} + +case "$1" in +start) + start_service ;; +refresh|reload) + refresh_service + ;; stop) - if [ -f "$PIDFILE" ]; then - /usr/bin/kill -QUIT `/usr/bin/cat $PIDFILE` - fi + stop_service ;; +restart) + stop_service + sleep 1 + start_service + ;; *) - echo "Usage: $0 {start|stop|refresh}" + echo "Usage: $0 {start|stop|refresh|reload|restart}" exit 1 ;; esac 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 Mar 2 11:48:33 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 02 Mar 2011 10:48:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[13528] csw/mgar/pkg/parallel/trunk Message-ID: Revision: 13528 http://gar.svn.sourceforge.net/gar/?rev=13528&view=rev Author: dmichelsen Date: 2011-03-02 10:48:33 +0000 (Wed, 02 Mar 2011) Log Message: ----------- parallel: Update to 20110205 and add necessary overrides Modified Paths: -------------- csw/mgar/pkg/parallel/trunk/Makefile csw/mgar/pkg/parallel/trunk/checksums Modified: csw/mgar/pkg/parallel/trunk/Makefile =================================================================== --- csw/mgar/pkg/parallel/trunk/Makefile 2011-03-02 10:21:43 UTC (rev 13527) +++ csw/mgar/pkg/parallel/trunk/Makefile 2011-03-02 10:48:33 UTC (rev 13528) @@ -1,6 +1,6 @@ # $Id$ NAME = parallel -VERSION = 20101222 +VERSION = 20110205 CATEGORIES = utils DESCRIPTION = Shell tool for executing jobs in parallel @@ -34,6 +34,15 @@ RUNTIME_DEP_PKGS = CSWperl CHECKPKG_OVERRIDES_CSWparallel += surplus-dependency|CSWperl +# This references a special ssh like /usr/local/bin/myssh +CHECKPKG_OVERRIDES_CSWparallel += file-with-bad-content|/usr/local|root/opt/csw/share/doc/parallel/parallel.html +# This references a special ssh like /usr/local/bin/myssh +CHECKPKG_OVERRIDES_CSWparallel += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/parallel.1 +# This is only in a comment +CHECKPKG_OVERRIDES_CSWparallel += file-with-bad-content|/usr/local|root/opt/csw/bin/parallel +# This is only in a comment +CHECKPKG_OVERRIDES_CSWparallel += file-with-bad-content|/usr/local|root/opt/csw/bin/sem + include gar/category.mk post-extract-modulated: Modified: csw/mgar/pkg/parallel/trunk/checksums =================================================================== --- csw/mgar/pkg/parallel/trunk/checksums 2011-03-02 10:21:43 UTC (rev 13527) +++ csw/mgar/pkg/parallel/trunk/checksums 2011-03-02 10:48:33 UTC (rev 13528) @@ -1 +1 @@ -7d531b835fa7ba2975a3d3cdf13aae4c parallel-20101222.tar.bz2 +4a8484fd4e11fd2fee63ee763f22786c parallel-20110205.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 Mar 2 12:40:52 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 02 Mar 2011 11:40:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[13529] csw/mgar/pkg/sox/trunk Message-ID: Revision: 13529 http://gar.svn.sourceforge.net/gar/?rev=13529&view=rev Author: dmichelsen Date: 2011-03-02 11:40:52 +0000 (Wed, 02 Mar 2011) Log Message: ----------- sox: Update to 14.3.2, reorganize Makefile, use new-style devel package name Modified Paths: -------------- csw/mgar/pkg/sox/trunk/Makefile csw/mgar/pkg/sox/trunk/checksums Modified: csw/mgar/pkg/sox/trunk/Makefile =================================================================== --- csw/mgar/pkg/sox/trunk/Makefile 2011-03-02 10:48:33 UTC (rev 13528) +++ csw/mgar/pkg/sox/trunk/Makefile 2011-03-02 11:40:52 UTC (rev 13529) @@ -1,5 +1,5 @@ NAME = sox -VERSION = 14.3.1 +VERSION = 14.3.2 CATEGORIES = apps DESCRIPTION = Swiss Army Knife of sound processing utilities @@ -21,36 +21,61 @@ VENDOR_URL = http://sox.sourceforge.net/ -PACKAGES = CSWsox CSWlibsox1 CSWlibsoxdevel +PACKAGES += CSWsox +CATALOGNAME_CSWsox = sox +SPKG_DESC_CSWsox = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWsox += CSWlibsox1 +RUNTIME_DEP_PKGS_CSWsox += CSWvorbis +RUNTIME_DEP_PKGS_CSWsox += CSWlibogg +RUNTIME_DEP_PKGS_CSWsox += CSWlibmad +RUNTIME_DEP_PKGS_CSWsox += CSWlibid3tag +RUNTIME_DEP_PKGS_CSWsox += CSWflac +RUNTIME_DEP_PKGS_CSWsox += CSWlibao +RUNTIME_DEP_PKGS_CSWsox += CSWlibsndfile +RUNTIME_DEP_PKGS_CSWsox += CSWpng +RUNTIME_DEP_PKGS_CSWsox += CSWwavpack +RUNTIME_DEP_PKGS_CSWsox += CSWlibmagic1 +RUNTIME_DEP_PKGS_CSWsox += CSWlibmp3lame0 +RUNTIME_DEP_PKGS_CSWsox += CSWzlib -CATALOGNAME_CSWsox = sox -CATALOGNAME_CSWlibsox1 = libsox1 -CATALOGNAME_CSWlibsoxdevel = libsox_devel +PACKAGES += CSWlibsox1 +CATALOGNAME_CSWlibsox1 = libsox1 +SPKG_DESC_CSWlibsox1 = SOX Library for Audio Processing +PKGFILES_CSWlibsox1 += $(PKGFILES_RT) +RUNTIME_DEP_PKGS_CSWlibsox1 += CSWvorbis +RUNTIME_DEP_PKGS_CSWlibsox1 += CSWlibogg +RUNTIME_DEP_PKGS_CSWlibsox1 += CSWlibmad +RUNTIME_DEP_PKGS_CSWlibsox1 += CSWlibid3tag +RUNTIME_DEP_PKGS_CSWlibsox1 += CSWflac +RUNTIME_DEP_PKGS_CSWlibsox1 += CSWlibao +RUNTIME_DEP_PKGS_CSWlibsox1 += CSWlibsndfile +RUNTIME_DEP_PKGS_CSWlibsox1 += CSWpng +RUNTIME_DEP_PKGS_CSWlibsox1 += CSWwavpack +RUNTIME_DEP_PKGS_CSWlibsox1 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibsox1 += CSWlibmagic1 +RUNTIME_DEP_PKGS_CSWlibsox1 += CSWlibmp3lame0 -SPKG_DESC_CSWsox = $(DESCRIPTION) -SPKG_DESC_CSWlibsox1 = SOX Library for Audio Processing -SPKG_DESC_CSWlibsoxdevel = SOX Library Development Files +PACKAGES += CSWlibsox-dev +CATALOGNAME_CSWlibsox-dev = libsox_dev +SPKG_DESC_CSWlibsox-dev = SOX Library Development Files +PKGFILES_CSWlibsox-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibsox-dev = CSWlibsox1 -RUNTIME_DEP_PKGS_CSWsox = CSWlibsox1 CSWvorbis CSWlibogg CSWlibmad CSWlame CSWlibid3tag -RUNTIME_DEP_PKGS_CSWsox += CSWflac CSWlibao CSWlibsndfile CSWpng CSWwavpack CSWzlib CSWlibmagic +OBSOLETES_CSWlibsox-dev = CSWlibsoxdevel +CATALOGNAME_CSWlibsoxdevel = libsox_devel -RUNTIME_DEP_PKGS_CSWlibsox1 = CSWvorbis CSWlibogg CSWlibmad CSWlame CSWlibid3tag -RUNTIME_DEP_PKGS_CSWlibsox1 += CSWflac CSWlibao CSWlibsndfile CSWpng CSWwavpack CSWzlib CSWlibmagic +BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWsox) +BUILD_DEP_PKGS += CSWlibmagic-dev +BUILD_DEP_PKGS += CSWlame-devel -RUNTIME_DEP_PKGS_CSWlibsoxdevel = CSWlibsox1 - -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWsox) - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --without-libltdl BUILD64 = 1 NOISAEXEC = 1 + TEST_TARGET = check MERGE_DIRS_isa-extra = $(libdir) -PKGFILES_CSWlibsox1 = $(PKGFILES_RT) -PKGFILES_CSWlibsoxdevel = $(PKGFILES_DEVEL) - include gar/category.mk Modified: csw/mgar/pkg/sox/trunk/checksums =================================================================== --- csw/mgar/pkg/sox/trunk/checksums 2011-03-02 10:48:33 UTC (rev 13528) +++ csw/mgar/pkg/sox/trunk/checksums 2011-03-02 11:40:52 UTC (rev 13529) @@ -1 +1 @@ -b99871c7bbae84feac9d0d1f010331ba sox-14.3.1.tar.gz +e9d35cf3b0f8878596e0b7c49f9e8302 sox-14.3.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 Mar 2 13:01:23 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 02 Mar 2011 12:01:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[13530] csw/mgar/pkg/memconf/trunk/checksums Message-ID: Revision: 13530 http://gar.svn.sourceforge.net/gar/?rev=13530&view=rev Author: bonivart Date: 2011-03-02 12:01:23 +0000 (Wed, 02 Mar 2011) Log Message: ----------- memconf/trunk: old source used accidentally when updating Modified Paths: -------------- csw/mgar/pkg/memconf/trunk/checksums Modified: csw/mgar/pkg/memconf/trunk/checksums =================================================================== --- csw/mgar/pkg/memconf/trunk/checksums 2011-03-02 11:40:52 UTC (rev 13529) +++ csw/mgar/pkg/memconf/trunk/checksums 2011-03-02 12:01:23 UTC (rev 13530) @@ -1,2 +1,2 @@ -53e202902c198e56d9223803e4e857be memconf.gz -5e13adbfce546b47d8cc84261c3738e2 memconf.man +b972422a206a4837eb1c34f1fbe9f236 memconf.gz +e9413ba46055e74fd9184b31e453471d 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 Mar 2 13:17:01 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 02 Mar 2011 12:17:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[13531] csw/mgar/pkg/perl/branches/perl-5.10.1-64bit/ Message-ID: Revision: 13531 http://gar.svn.sourceforge.net/gar/?rev=13531&view=rev Author: dmichelsen Date: 2011-03-02 12:17:01 +0000 (Wed, 02 Mar 2011) Log Message: ----------- perl: Make branch perl-5.10.1-64bit Added Paths: ----------- csw/mgar/pkg/perl/branches/perl-5.10.1-64bit/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Mar 2 14:16:03 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 02 Mar 2011 13:16:03 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[352] utilities/packagesStatistics/tools Message-ID: Revision: 352 http://opencsw.svn.sourceforge.net/opencsw/?rev=352&view=rev Author: wbonnet Date: 2011-03-02 13:16:03 +0000 (Wed, 02 Mar 2011) Log Message: ----------- Move Lutefisk wrappers to the right place Added Paths: ----------- utilities/packagesStatistics/tools/db-config.php.sample Removed Paths: ------------- utilities/packagesStatistics/tools/db-config.php utilities/packagesStatistics/tools/mirrorSurvey.php utilities/packagesStatistics/tools/monthlyPackageCount.php utilities/packagesStatistics/tools/monthlyPackageCreationUpdate.php utilities/packagesStatistics/tools/packageSurvey.php Deleted: utilities/packagesStatistics/tools/db-config.php =================================================================== --- utilities/packagesStatistics/tools/db-config.php 2011-02-27 22:52:13 UTC (rev 351) +++ utilities/packagesStatistics/tools/db-config.php 2011-03-02 13:16:03 UTC (rev 352) @@ -1,42 +0,0 @@ - Copied: utilities/packagesStatistics/tools/db-config.php.sample (from rev 321, utilities/packagesStatistics/tools/db-config.php) =================================================================== --- utilities/packagesStatistics/tools/db-config.php.sample (rev 0) +++ utilities/packagesStatistics/tools/db-config.php.sample 2011-03-02 13:16:03 UTC (rev 352) @@ -0,0 +1,42 @@ + Deleted: utilities/packagesStatistics/tools/mirrorSurvey.php =================================================================== --- utilities/packagesStatistics/tools/mirrorSurvey.php 2011-02-27 22:52:13 UTC (rev 351) +++ utilities/packagesStatistics/tools/mirrorSurvey.php 2011-03-02 13:16:03 UTC (rev 352) @@ -1,81 +0,0 @@ -connect(); - - $mirrorArch = ""; - $mirrorOsVersion = ""; - $mirrorSource = ""; - - if(isset($_GET["mirrorArch"])) - { - // If defined, thus retrieve the mirror arch - $mirrorArch = substr($_GET["mirrorArch"], 0, 8); // Retrieve only the 8 chars of the version string - } - - if(isset($_GET["mirrorOsVersion"])) - { - // If defined, thus retrieve the mirror os version - $mirrorOsVersion = substr($_GET["mirrorOsVersion"], 0, 8); // Retrieve only the 8 chars of the version string - } - - if(isset($_GET["mirrorSource"])) - { - // If defined, thus retrieve the mirror packages source - $mirrorSource = substr($_GET["mirrorSource"], 0, 16); // Retrieve only the 16 chars of the version string - } - - // Execute query - $statDAO->increaseMirrorDownloadCounter($mirrorName, $mirrorArch, $mirrorOsVersion, $mirrorSource); - - // Disconnect from database - $statDAO->disconnect(); - } -?> Deleted: utilities/packagesStatistics/tools/monthlyPackageCount.php =================================================================== --- utilities/packagesStatistics/tools/monthlyPackageCount.php 2011-02-27 22:52:13 UTC (rev 351) +++ utilities/packagesStatistics/tools/monthlyPackageCount.php 2011-03-02 13:16:03 UTC (rev 352) @@ -1,88 +0,0 @@ -setAntiAliasing(FALSE); - - $group = new PlotGroup; - $group->grid->setType(Line::DASHED); - - $group->setPadding(40, NULL, 20, NULL); - - $group->axis->left->setLabelNumber(8); - $group->axis->left->setLabelPrecision(1); - $group->axis->left->setTickStyle(Tick::OUT); - - // Statistics array population - $statPackage = array(); // Initialize the number of packages array - - // Create the DAO object - $statDAO = new mysqlDAO(); - - // Connect to database - $statDAO->connect(); - - // Retrieve the statistics from the database - $stats = $statDAO->getMonthlyPackageCountOverLastYear(); - - // Disconnect from database - $statDAO->disconnect(); - - for ($idxCounter = 11 ; $idxCounter >= 0 ; $idxCounter--) { // Loop used to copy data - $statPackage[$idxCounter] = $stats[11 - $idxCounter][0]; // into the creation array - } - - $plot = new LinePlot($statPackage); - - $plot->label->setFont(new Tuffy(7)); - $plot->label->setPadding(1, 1, 1, 1); - $plot->label->setCallbackFunction("labelFormat"); - $plot->label->setBackgroundColor( - new Color(227, 223, 241, 15) - ); - $plot->setColor(new Green()); - $plot->setFillColor(new LightGreen(80)); - - $plot->mark->setType(Mark::CIRCLE); - $plot->mark->setFill(new MidGreen); - $plot->mark->setSize(6); - - $group->legend->add($plot, "Number of available packages", Legend::MARK); - $group->legend->setPosition(0.35, 0.15); - $group->add($plot); - - $x = array(NULL, NULL, NULL, 10, 12, 14, 18, 26, 42); - - $group->axis->bottom->label->setCallbackFunction('setMonth'); - $group->axis->left->label->setCallbackFunction('setNumber'); - - $graph->add($group); - - $graph->draw(); - -?> Deleted: utilities/packagesStatistics/tools/monthlyPackageCreationUpdate.php =================================================================== --- utilities/packagesStatistics/tools/monthlyPackageCreationUpdate.php 2011-02-27 22:52:13 UTC (rev 351) +++ utilities/packagesStatistics/tools/monthlyPackageCreationUpdate.php 2011-03-02 13:16:03 UTC (rev 352) @@ -1,139 +0,0 @@ -setAntiAliasing(FALSE); - - $group = new PlotGroup; - $group->setSpace(5, 5, 5, 0); - $group->setPadding(40, 20); - - $group->axis->left->setLabelPrecision(0); - - $colors = array( - new Color(80, 105, 190, 10), - new Color(105, 190, 80, 10) - ); - - $darkColor = array( - new Color(40, 55, 120, 10), - new Color(55, 120, 40, 10) - ); - - $axis = array( - Plot::LEFT, - ); - - $group->axis->left->setColor($darkColor[0]); - $group->axis->left->label->setColor($darkColor[0]); - - $group->setBackgroundGradient( - new LinearGradient( - new Color(225, 225, 225), - new Color(255, 255, 255), - 0 - ) - ); - - // Statistics array population - $statCreation = array(); // Initialize the creation data array - $statUpdate = array(); // Initialize the update data array - - // Create the DAO object - $statDAO = new mysqlDAO(); - - // Connect to database - $statDAO->connect(); - - // Retrieve the statistics from the database - $stats = $statDAO->getMonthlyPackageCreationAndUpdateOverLastYear(); - - // Disconnect from database - $statDAO->disconnect(); - - for ($idxCounter = 11 ; $idxCounter >= 0 ; $idxCounter--) { // Loop used to copy data - $statCreation[$idxCounter] = $stats[11 - $idxCounter][0]; // into the creation array - $statUpdate[$idxCounter] = $stats[11 - $idxCounter][1]; // into the update array - } - - // Add the "creations" serie on the graphic - $plot = new BarPlot($statCreation, 1, 2); - $plot->barBorder->setColor(new Color(0, 0, 0, 30)); - - $plot->setBarPadding(0.1, 0.1); - $plot->setBarSpace(5); - - $plot->barShadow->setSize(2); - $plot->barShadow->setPosition(Shadow::RIGHT_TOP); - $plot->barShadow->setColor(new Color(180, 180, 180, 10)); - $plot->barShadow->smooth(TRUE); - - $plot->label->set($statCreation); - $plot->label->move(0, -6); - $plot->label->setFont(new Tuffy(7)); - $plot->label->setAngle(0); - $plot->label->setAlign(NULL, Label::TOP); - $plot->label->setPadding(3, 1, 0, 6); - $plot->label->setCallbackFunction("labelFormat"); - - $plot->setBarColor($colors[0]); - $plot->setYAxis($axis[0]); - - $group->legend->add($plot, "Packages creations", Legend::BACKGROUND); - $group->legend->setPosition(0.30, 0.15); - $group->legend->shadow->smooth(TRUE); - - $group->add($plot); - - // Add the "updates" serie on the graphic - $plot = new BarPlot($statUpdate, 2, 2); - $plot->barBorder->setColor(new Color(0, 0, 0, 30)); - - $plot->setBarPadding(0.1, 0.1); - $plot->setBarSpace(5); - - $plot->barShadow->setSize(2); - $plot->barShadow->setPosition(Shadow::RIGHT_TOP); - $plot->barShadow->setColor(new Color(180, 180, 180, 10)); - $plot->barShadow->smooth(TRUE); - - $plot->label->set($statUpdate); - $plot->label->move(0, -6); - $plot->label->setFont(new Tuffy(7)); - $plot->label->setAngle(0); - $plot->label->setAlign(NULL, Label::TOP); - $plot->label->setPadding(3, 1, 0, 6); - $plot->label->setCallbackFunction("labelFormat"); - - $plot->setBarColor($colors[1]); - $plot->setYAxis($axis[0]); - - $group->legend->add($plot, "Packages updates", Legend::BACKGROUND); - $group->add($plot); - - $group->axis->bottom->label->setCallbackFunction('setMonth'); - - $graph->add($group); - $graph->draw(); -?> Deleted: utilities/packagesStatistics/tools/packageSurvey.php =================================================================== --- utilities/packagesStatistics/tools/packageSurvey.php 2011-02-27 22:52:13 UTC (rev 351) +++ utilities/packagesStatistics/tools/packageSurvey.php 2011-03-02 13:16:03 UTC (rev 352) @@ -1,97 +0,0 @@ -connect(); - - $packageArch = ""; - $packageSource = ""; - $packageOsVersion = ""; - $targetOsVersion = ""; - - if(isset($_GET["packageArch"])) - { - // If defined, thus retrieve the package arch - $packageArch = substr($_GET["packageArch"], 0, 8); // Retrieve only the 8 chars of the version string - } - - if(isset($_GET["packageOsVersion"])) - { - // If defined, thus retrieve the package os version - $packageOsVersion = substr($_GET["packageOsVersion"], 0, 8); // Retrieve only the 8 chars of the version string - } - - if(isset($_GET["targetOsVersion"])) - { - // If defined, thus retrieve the target os version - $targetOsVersion = substr($_GET["targetOsVersion"], 0, 8); // Retrieve only the 8 chars of the version string - } - - if(isset($_GET["packageSource"])) - { - // If defined, thus retrieve the target os version - $packageSource = substr($_GET["packageSource"], 0, 8); // Retrieve only the 8 chars of the version string - } - - if(isset($_GET["selectByUser"])) - { - // Execute query - $statDAO->increasePackageSelectCounter($packageName, $packageOsVersion, $packageArch, $targetOsVersion, $packageSource); - } - else - { - // Execute query - $statDAO->increasePackageFetchCounter($packageName, $packageOsVersion, $packageArch, $targetOsVersion, $packageSource); - } - - // Disconnect from database - $statDAO->disconnect(); - } -?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Mar 2 14:16:35 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 02 Mar 2011 13:16:35 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[353] web/wordpresscsw/tools/statistics Message-ID: Revision: 353 http://opencsw.svn.sourceforge.net/opencsw/?rev=353&view=rev Author: wbonnet Date: 2011-03-02 13:16:35 +0000 (Wed, 02 Mar 2011) Log Message: ----------- Move Lutefisk wrappers to the right place Added Paths: ----------- web/wordpresscsw/tools/statistics/mirrorSurvey.php web/wordpresscsw/tools/statistics/packageSurvey.php Copied: web/wordpresscsw/tools/statistics/mirrorSurvey.php (from rev 321, utilities/packagesStatistics/tools/mirrorSurvey.php) =================================================================== --- web/wordpresscsw/tools/statistics/mirrorSurvey.php (rev 0) +++ web/wordpresscsw/tools/statistics/mirrorSurvey.php 2011-03-02 13:16:35 UTC (rev 353) @@ -0,0 +1,81 @@ +connect(); + + $mirrorArch = ""; + $mirrorOsVersion = ""; + $mirrorSource = ""; + + if(isset($_GET["mirrorArch"])) + { + // If defined, thus retrieve the mirror arch + $mirrorArch = substr($_GET["mirrorArch"], 0, 8); // Retrieve only the 8 chars of the version string + } + + if(isset($_GET["mirrorOsVersion"])) + { + // If defined, thus retrieve the mirror os version + $mirrorOsVersion = substr($_GET["mirrorOsVersion"], 0, 8); // Retrieve only the 8 chars of the version string + } + + if(isset($_GET["mirrorSource"])) + { + // If defined, thus retrieve the mirror packages source + $mirrorSource = substr($_GET["mirrorSource"], 0, 16); // Retrieve only the 16 chars of the version string + } + + // Execute query + $statDAO->increaseMirrorDownloadCounter($mirrorName, $mirrorArch, $mirrorOsVersion, $mirrorSource); + + // Disconnect from database + $statDAO->disconnect(); + } +?> Copied: web/wordpresscsw/tools/statistics/packageSurvey.php (from rev 321, utilities/packagesStatistics/tools/packageSurvey.php) =================================================================== --- web/wordpresscsw/tools/statistics/packageSurvey.php (rev 0) +++ web/wordpresscsw/tools/statistics/packageSurvey.php 2011-03-02 13:16:35 UTC (rev 353) @@ -0,0 +1,97 @@ +connect(); + + $packageArch = ""; + $packageSource = ""; + $packageOsVersion = ""; + $targetOsVersion = ""; + + if(isset($_GET["packageArch"])) + { + // If defined, thus retrieve the package arch + $packageArch = substr($_GET["packageArch"], 0, 8); // Retrieve only the 8 chars of the version string + } + + if(isset($_GET["packageOsVersion"])) + { + // If defined, thus retrieve the package os version + $packageOsVersion = substr($_GET["packageOsVersion"], 0, 8); // Retrieve only the 8 chars of the version string + } + + if(isset($_GET["targetOsVersion"])) + { + // If defined, thus retrieve the target os version + $targetOsVersion = substr($_GET["targetOsVersion"], 0, 8); // Retrieve only the 8 chars of the version string + } + + if(isset($_GET["packageSource"])) + { + // If defined, thus retrieve the target os version + $packageSource = substr($_GET["packageSource"], 0, 8); // Retrieve only the 8 chars of the version string + } + + if(isset($_GET["selectByUser"])) + { + // Execute query + $statDAO->increasePackageSelectCounter($packageName, $packageOsVersion, $packageArch, $targetOsVersion, $packageSource); + } + else + { + // Execute query + $statDAO->increasePackageFetchCounter($packageName, $packageOsVersion, $packageArch, $targetOsVersion, $packageSource); + } + + // Disconnect from database + $statDAO->disconnect(); + } +?> 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 Mar 2 15:27:25 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 02 Mar 2011 14:27:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[13532] csw/mgar/pkg/ruby18/trunk Message-ID: Revision: 13532 http://gar.svn.sourceforge.net/gar/?rev=13532&view=rev Author: bdwalton Date: 2011-03-02 14:27:25 +0000 (Wed, 02 Mar 2011) Log Message: ----------- ruby18/trunk: override /usr/share ref in tk package, note it Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ruby18/trunk/files/CSWrubytk.cswreleasenotes Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-02 12:17:01 UTC (rev 13531) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-02 14:27:25 UTC (rev 13532) @@ -82,7 +82,7 @@ DISTFILES = $(NAME)-$(DISTVERSION)-$(PATCHLEVEL).tar.bz2 DISTFILES += CSWruby.cswreleasenotes -DISTFILES += CSWrubydoc.cswreleasenotes +DISTFILES += CSWrubydoc.cswreleasenotes CSWrubytk.cswreleasenotes # See: http://rubyforge.org/tracker/index.php?func=detail&aid=17607&group_id=426&atid=1698 PATCHFILES = rdoc_parse_order_fix.patch @@ -133,6 +133,8 @@ CHECKPKG_OVERRIDES_CSWruby += file-with-bad-content|/usr/local|root/opt/csw/bin/ri CHECKPKG_OVERRIDES_CSWrubydoc += file-with-bad-content +CHECKPKG_OVERRIDES_CSWrubytk += file-with-bad-content|/usr/share|root/opt/csw/lib/ruby/1.8/tk/dialog.rb + include gar/category.mk SPKG_VERSION := $(SPKG_VERSION)$(PATCHLEVEL) Added: csw/mgar/pkg/ruby18/trunk/files/CSWrubytk.cswreleasenotes =================================================================== --- csw/mgar/pkg/ruby18/trunk/files/CSWrubytk.cswreleasenotes (rev 0) +++ csw/mgar/pkg/ruby18/trunk/files/CSWrubytk.cswreleasenotes 2011-03-02 14:27:25 UTC (rev 13532) @@ -0,0 +1 @@ +* /usr/share reference in dialog.rb is in a comment 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 Mar 2 16:21:20 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 02 Mar 2011 15:21:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[13533] csw/mgar/pkg/ruby18/trunk Message-ID: Revision: 13533 http://gar.svn.sourceforge.net/gar/?rev=13533&view=rev Author: bdwalton Date: 2011-03-02 15:21:20 +0000 (Wed, 02 Mar 2011) Log Message: ----------- ruby18/trunk: tk package: override two usr/local references that reside in comments Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile csw/mgar/pkg/ruby18/trunk/files/CSWrubytk.cswreleasenotes Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-02 14:27:25 UTC (rev 13532) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-02 15:21:20 UTC (rev 13533) @@ -134,6 +134,8 @@ CHECKPKG_OVERRIDES_CSWrubydoc += file-with-bad-content CHECKPKG_OVERRIDES_CSWrubytk += file-with-bad-content|/usr/share|root/opt/csw/lib/ruby/1.8/tk/dialog.rb +CHECKPKG_OVERRIDES_CSWrubytk += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.8/tkextlib/itcl/setup.rb +CHECKPKG_OVERRIDES_CSWrubytk += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.8/tkextlib/itk/setup.rb include gar/category.mk Modified: csw/mgar/pkg/ruby18/trunk/files/CSWrubytk.cswreleasenotes =================================================================== --- csw/mgar/pkg/ruby18/trunk/files/CSWrubytk.cswreleasenotes 2011-03-02 14:27:25 UTC (rev 13532) +++ csw/mgar/pkg/ruby18/trunk/files/CSWrubytk.cswreleasenotes 2011-03-02 15:21:20 UTC (rev 13533) @@ -1 +1,2 @@ * /usr/share reference in dialog.rb is in a comment +* /usr/local references are both in comments 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 Mar 2 17:41:56 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 02 Mar 2011 16:41:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[13534] csw/mgar/pkg/perl/branches/perl-5.10.1-64bit/ Makefile Message-ID: Revision: 13534 http://gar.svn.sourceforge.net/gar/?rev=13534&view=rev Author: dmichelsen Date: 2011-03-02 16:41:56 +0000 (Wed, 02 Mar 2011) Log Message: ----------- perl/perl-5-10.1-64bit: Intermediate commit Modified Paths: -------------- csw/mgar/pkg/perl/branches/perl-5.10.1-64bit/Makefile Modified: csw/mgar/pkg/perl/branches/perl-5.10.1-64bit/Makefile =================================================================== --- csw/mgar/pkg/perl/branches/perl-5.10.1-64bit/Makefile 2011-03-02 15:21:20 UTC (rev 13533) +++ csw/mgar/pkg/perl/branches/perl-5.10.1-64bit/Makefile 2011-03-02 16:41:56 UTC (rev 13534) @@ -17,22 +17,30 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz -PACKAGES = CSWperl CSWperldoc -ARCHALL_CSWperldoc = 1 -RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWgdbm -RUNTIME_DEP_PKGS_CSWperldoc = CSWperl -INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags +PACKAGES += CSWperl +SPKG_DESC_CSWperl = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWperl += CSWbdb48 +RUNTIME_DEP_PKGS_CSWperl += CSWgdbm -SPKG_DESC_CSWperl = $(DESCRIPTION) +PACKAGES += CSWperldoc SPKG_DESC_CSWperldoc = Perl documentation +PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* +ARCHALL_CSWperldoc = 1 +INCOMPATIBLE_PKGS_CSWperl += CSWperlmods +INCOMPATIBLE_PKGS_CSWperl += CSWpmdigest +INCOMPATIBLE_PKGS_CSWperl += CSWpmi18nlangtags +# The diagnostics.pm module needs the podfile to output its messages. +# That means it must be included in the main package, not the docs. +EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod +EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod + LICENSE = Copying PATCHFILES += 0001-change-inc-based-on-rhel5-patch.patch -CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWperl += surplus-dependency|CSWgdbm -CHECKPKG_OVERRIDES_CSWperl += soname-not-found|libgdbm.so.3|is|needed|by|opt/csw/lib/perl/5.10.1/auto/GDBM_File/GDBM_File.so +# CHECKPKG_OVERRIDES_CSWperl += surplus-dependency|CSWgdbm +# CHECKPKG_OVERRIDES_CSWperl += soname-not-found|libgdbm.so.3|is|needed|by|opt/csw/lib/perl/5.10.1/auto/GDBM_File/GDBM_File.so # Core module updates # Not used at the moment, leave one as example @@ -42,9 +50,7 @@ DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) -# Dependencies -#LIBDEPS += bdb48/lib -LIBDEPS += lib/gdbm +BUILD64 = 1 # Custom configure CONFIGURE_SCRIPTS = perl @@ -53,7 +59,10 @@ INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 # Force use of db-4.8 -PERL_LIBS += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc -lperl +# TBD: Take out libperl.so, see below. +PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc -lperl +PERL_LIBS-64 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc +PERL_LIBS = $(PERL_LIBS-$(MEMORYMODEL)) # Configuration flags CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION) @@ -74,13 +83,14 @@ CONFIGURE_ARGS += -Doptimize="$(OPTFLAGS)" CONFIGURE_ARGS += -Dperladmin="root at localhost" CONFIGURE_ARGS += -Dprefix=$(prefix) +CONFIGURE_ARGS += -Dbin=$(bindir) +CONFIGURE_ARGS += -Dscriptdir=$(bindir) CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION) CONFIGURE_ARGS += -Dsitearch=$(libdir)/perl/site_perl CONFIGURE_ARGS += -Dsitelib=$(datadir)/perl/site_perl CONFIGURE_ARGS += -Dsiteman1dir=$(mandir)/man1 CONFIGURE_ARGS += -Dsiteman3dir=$(mandir)/man3 CONFIGURE_ARGS += -Dsiteprefix=/usr -CONFIGURE_ARGS += -Duselargefiles CONFIGURE_ARGS += -Duseshrplib CONFIGURE_ARGS += -Dusesitecustomize CONFIGURE_ARGS += -Dusethreads @@ -89,9 +99,13 @@ CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl/csw CONFIGURE_ARGS += -Dvendorprefix=$(prefix) CONFIGURE_ARGS += -Dlibs="$(PERL_LIBS)" -CONFIGURE_ARGS += -Dlibsdirs=" /usr/lib /opt/csw/lib" +CONFIGURE_ARGS += -Dlibsdirs=" /usr/lib $(libdir)" CONFIGURE_ARGS += -Dsed=$(bindir)/gsed +# On 64 bit there are no largefile issues and the definition disturbs other builds (like NetSNMP embeddded Perl) +CONFIGURE_ARGS-32 += -Duselargefiles +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) + EXTRA_LIB += $(prefix)/bdb48/lib EXTRA_INC += $(prefix)/bdb48/include @@ -102,23 +116,22 @@ # https://www.opencsw.org/mantis/view.php?id=4544 EXTRA_CFLAGS = $(CPPFLAGS) -EXTRA_LDFLAGS = -L$(libdir) -lperl +# Adding -lperl requires that libperl.so is available during compilation, which is not +# the case on bootstrapping. However, we require explicit libperl linkage or programs +# embedding perl will have problems with duplicated static variables. +# XXX Investigate further after 64 bit has built +EXTRA_LDFLAGS-32 = -L$(libdir) -lperl +EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod -PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* - -# The diagnostics.pm module needs the podfile to output its messages. -# That means it must be included in the main package, not the docs. -EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod -EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod - # Tests take a long time -TEST_SCRIPTS = +# SKIPTEST ?= 1 # Make sure we don't include the path to the newly built perl as the # library is not in place yet. IGNORE_DESTDIR = 1 +EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod + # Do not exclude static libs as at least DynaLoader.a is needed for XS compilation MERGE_EXCLUDE_STATICLIBS = @@ -129,6 +142,9 @@ include gar/category.mk +# This is probably due to -lperl, but during Configure the one in /opt/csw/lib is picked up and +# the one in $WORKSRC has not been built yet +# TBD: Investigate post-extract-modulated: mkdir -p $(WORKSRC) gln -s libperl.so.5.10.1 $(WORKSRC)/libperl.so 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 Mar 2 18:28:18 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 02 Mar 2011 17:28:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[13535] csw/mgar/pkg/apache2/branches/open-bug-squash/ Makefile Message-ID: Revision: 13535 http://gar.svn.sourceforge.net/gar/?rev=13535&view=rev Author: bdwalton Date: 2011-03-02 17:28:18 +0000 (Wed, 02 Mar 2011) Log Message: ----------- apache2/branches/open-bug-squash: use the new obsoletes mechanism instead of declaring I with apache2c Modified Paths: -------------- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-02 16:41:56 UTC (rev 13534) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-02 17:28:18 UTC (rev 13535) @@ -65,6 +65,8 @@ ARCHALL_CSWap2prefork = 1 ARCHALL_CSWapache2rt = 1 +OBSOLETES_CSWapache2 = CSWapache2c + CATALOGNAME_CSWapache2 = apache2 CATALOGNAME_CSWapache2-devel = apache2_devel CATALOGNAME_CSWapache2-manual = apache2_manual @@ -81,8 +83,6 @@ SPKG_DESC_CSWap2prefork = A stub for the old prefork mpm package. SPKG_DESC_CSWapache2rt = A stub for the old apache2rt package. -INCOMPATIBLE_PKGS_CSWapache2 = CSWapache2c - RUNTIME_DEP_PKGS_CSWapache2 += CSWexpat CSWiconv CSWosslutils RUNTIME_DEP_PKGS_CSWapache2 += CSWoldaprt CSWosslrt CSWzlib RUNTIME_DEP_PKGS_CSWapache2 += CSWapr CSWapr-util CSWbdb48 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Wed Mar 2 20:22:25 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Wed, 02 Mar 2011 19:22:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[13536] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 13536 http://gar.svn.sourceforge.net/gar/?rev=13536&view=rev Author: phipsy Date: 2011-03-02 19:22:25 +0000 (Wed, 02 Mar 2011) Log Message: ----------- Starting to update puppet for 2.6.5 - work in progress Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums Added Paths: ----------- csw/mgar/pkg/puppet/trunk/files/puppetd.xml csw/mgar/pkg/puppet/trunk/files/puppetmaster.xml Removed Paths: ------------- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.cron.root Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2011-03-02 17:28:18 UTC (rev 13535) +++ csw/mgar/pkg/puppet/trunk/Makefile 2011-03-02 19:22:25 UTC (rev 13536) @@ -7,7 +7,7 @@ # [1] http://garylaw.net/packages/puppet-build.sh NAME = puppet -VERSION = 2.6.4 +VERSION = 2.6.5 CATEGORIES = apps define BLURB @@ -20,18 +20,17 @@ applications as well as test systems identical to production environments. endef -MASTER_SITES = http://reductivelabs.com/downloads/puppet/ +MASTER_SITES = http://puppetlabs.com/downloads/puppet/ DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += cswpuppetd DISTFILES += cswpuppetmasterd DISTFILES += cswusergroup -DISTFILES += CSWpuppet.cron.root +DISTFILES += puppetd.xml +DISTFILES += puppetmaster.xml UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_SOURCEURL = http://www.puppetlabs.com/ +SPKG_SOURCEURL = http://puppetlabs.com/ -# 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 += $(sysconfdir)/init\.d/cswpuppetd INITSMF += $(sysconfdir)/init\.d/cswpuppetmasterd USERGROUP = $(sysconfdir)/pkg/puppet/cswusergroup @@ -70,8 +69,8 @@ CHECKPKG_OVERRIDES_CSWpuppet += surplus-dependency|CSWfacter CHECKPKG_OVERRIDES_CSWpuppetmaster += surplus-dependency|CSWpuppet -CRONDIR = $(sysconfdir)/pkg/CSWpuppet/crontabs -CRONTABS = $(CRONDIR)/root +# CRONDIR = $(sysconfdir)/pkg/CSWpuppet/crontabs +# CRONTABS = $(CRONDIR)/root CHECKPKG_OVERRIDES_CSWpuppet += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/cswpuppetd|class=none CHECKPKG_OVERRIDES_CSWpuppetmaster += surplus-dependency|CSWruby # Puppet has hardcoded paths to look at for many OSes, many of which involve @@ -118,5 +117,7 @@ # and we don't want that. It could be split off to another package, but # this file doesn't seem to be of any use on Solaris, so we can safely # remove it. - rm $(DESTDIR)$(libdir)/ruby/site_ruby/1.8/puppet/provider/package/yumhelper.py + # markp: Putting this back in. Will look at deps later. Some places do run + # yum on Solaris, would you believe. + # rm $(DESTDIR)$(libdir)/ruby/site_ruby/1.8/puppet/provider/package/yumhelper.py @$(MAKECOOKIE) Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2011-03-02 17:28:18 UTC (rev 13535) +++ csw/mgar/pkg/puppet/trunk/checksums 2011-03-02 19:22:25 UTC (rev 13536) @@ -1 +1,2 @@ c0b86f40c8000dae2f0f7f2f91579c2a puppet-2.6.4.tar.gz +645543a18050f1d991796d865c53f9a4 puppet-2.6.5.tar.gz Deleted: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.cron.root =================================================================== --- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.cron.root 2011-03-02 17:28:18 UTC (rev 13535) +++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.cron.root 2011-03-02 19:22:25 UTC (rev 13536) @@ -1 +0,0 @@ -0,30 * * * * /opt/csw/sbin/puppetd --no-daemon --onetime Added: csw/mgar/pkg/puppet/trunk/files/puppetd.xml =================================================================== --- csw/mgar/pkg/puppet/trunk/files/puppetd.xml (rev 0) +++ csw/mgar/pkg/puppet/trunk/files/puppetd.xml 2011-03-02 19:22:25 UTC (rev 13536) @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: csw/mgar/pkg/puppet/trunk/files/puppetmaster.xml =================================================================== --- csw/mgar/pkg/puppet/trunk/files/puppetmaster.xml (rev 0) +++ csw/mgar/pkg/puppet/trunk/files/puppetmaster.xml 2011-03-02 19:22:25 UTC (rev 13536) @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 Mar 2 20:24:28 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 02 Mar 2011 19:24:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[13537] csw/mgar/pkg/libsndfile Message-ID: Revision: 13537 http://gar.svn.sourceforge.net/gar/?rev=13537&view=rev Author: dmichelsen Date: 2011-03-02 19:24:28 +0000 (Wed, 02 Mar 2011) Log Message: ----------- libsndfile: Move stuff from branch to trunk and update to 1.0.23 mainline, split packages Modified Paths: -------------- csw/mgar/pkg/libsndfile/trunk/Makefile csw/mgar/pkg/libsndfile/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libsndfile/trunk/files/0004-Add-branch-for-inttypes.h.patch csw/mgar/pkg/libsndfile/trunk/files/0005-Test-for-unsigned-or-test-will-fail.patch Removed Paths: ------------- csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/ csw/mgar/pkg/libsndfile/trunk/files/0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch Modified: csw/mgar/pkg/libsndfile/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsndfile/trunk/Makefile 2011-03-02 19:22:25 UTC (rev 13536) +++ csw/mgar/pkg/libsndfile/trunk/Makefile 2011-03-02 19:24:28 UTC (rev 13537) @@ -3,11 +3,10 @@ # $Id$ NAME = libsndfile -VERSION = 1.0.21 - +VERSION = 1.0.23 CATEGORIES = lib -DESCRIPTION = a C library for reading and writing files containing sampled sound +DESCRIPTION = C library for reading and writing files containing sampled sound define BLURB Libsndfile is a C library for reading and writing files containing sampled @@ -36,22 +35,39 @@ PATCHFILES = 0001-Add-lrintf-workaround-to-regtest.patch PATCHFILES += 0002-Add-workaround-for-missing-libm-function-lrint-and-l.patch PATCHFILES += 0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch -PATCHFILES += 0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch +PATCHFILES += 0004-Add-branch-for-inttypes.h.patch +PATCHFILES += 0005-Test-for-unsigned-or-test-will-fail.patch -# TODO: The __func__ replacement may be enhanced with -# http://mail-index.netbsd.org/pkgsrc-users/2009/05/18/msg009885.html -# PATCHFILES += sunpro-extensions.patch +PACKAGES += CSWlibsndfile +CATALOGNAME_CSWlibsndfile = libsndfile +SPKG_DESC_CSWlibsndfile = Tools for reading and writing files containing sampled sound +RUNTIME_DEP_PKGS_CSWlibsndfile += CSWlibogg +RUNTIME_DEP_PKGS_CSWlibsndfile += CSWflac +RUNTIME_DEP_PKGS_CSWlibsndfile += CSWvorbis +RUNTIME_DEP_PKGS_CSWlibsndfile += CSWsqlite3rt +RUNTIME_DEP_PKGS_CSWlibsndfile += CSWlibsndfile1 -RUNTIME_DEP_PKGS = CSWvorbis CSWflac CSWlibogg CSWsqlite3rt -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) +PACKAGES += CSWlibsndfile1 +CATALOGNAME_CSWlibsndfile1 = libsndfile1 +SPKG_DESC_CSWlibsndfile1 = Library for reading and writing files containing sampled sound, libsndfile.so.1 +PKGFILES_CSWlibsndfile1 = $(call baseisadirs,$(libdir),libsndfile\.so\.1(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibsndfile1 += CSWlibogg +RUNTIME_DEP_PKGS_CSWlibsndfile1 += CSWflac +RUNTIME_DEP_PKGS_CSWlibsndfile1 += CSWvorbis -SPKG_SOURCEURL = http://www.mega-nerd.com/libsndfile/ +PACKAGES += CSWlibsndfile-dev +CATALOGNAME_CSWlibsndfile-dev = libsndfile_dev +SPKG_DESC_CSWlibsndfile-dev = Development files for libsndfile.so.1 +PKGFILES_CSWlibsndfile-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibsndfile-dev += $(docdir)/.* +RUNTIME_DEP_PKGS_CSWlibsndfile-dev += CSWlibsndfile1 +BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWlibsndfile) + +VENDOR_URL = http://www.mega-nerd.com/libsndfile/ + UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -# EXTRA_CFLAGS = -features=extensions -# EXTRA_CXXFLAGS = -features=extensions - BUILD64 = 1 NOISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) @@ -62,6 +78,11 @@ MERGE_DIRS_isa-extra = $(libdir) # Relocate docs to standard location -EXTRA_PAX_ARGS += -s ',^\.$(prefix)/share/doc/libsndfile1-dev,.$(BUILD_PREFIX)/share/doc/$(NAME),' +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/share/doc/libsndfile1-dev,.$(prefix)/share/doc/$(NAME),' +# These are all examples +CHECKPKG_OVERRIDES_CSWlibsndfile-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libsndfile/html/FAQ.html +CHECKPKG_OVERRIDES_CSWlibsndfile-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libsndfile/html/octave.html +CHECKPKG_OVERRIDES_CSWlibsndfile-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libsndfile/html/pkgconfig.html + include gar/category.mk Modified: csw/mgar/pkg/libsndfile/trunk/checksums =================================================================== --- csw/mgar/pkg/libsndfile/trunk/checksums 2011-03-02 19:22:25 UTC (rev 13536) +++ csw/mgar/pkg/libsndfile/trunk/checksums 2011-03-02 19:24:28 UTC (rev 13537) @@ -1,5 +1 @@ -5a1c6c4bfb8b8426d8ebc8d67814a7c8 0001-Add-lrintf-workaround-to-regtest.patch -ab0c6ea20d4bda60f6f6dd4fa4c26871 0002-Add-workaround-for-missing-libm-function-lrint-and-l.patch -599bd5f64872bbddf993ce0815d28417 0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch -732c648739e94cb5fd2e70d983390318 0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch -880a40ec636ab2185b97f8927299b292 libsndfile-1.0.21.tar.gz +d0e22b5ff2ef945615db33960376d733 libsndfile-1.0.23.tar.gz Added: csw/mgar/pkg/libsndfile/trunk/files/0004-Add-branch-for-inttypes.h.patch =================================================================== --- csw/mgar/pkg/libsndfile/trunk/files/0004-Add-branch-for-inttypes.h.patch (rev 0) +++ csw/mgar/pkg/libsndfile/trunk/files/0004-Add-branch-for-inttypes.h.patch 2011-03-02 19:24:28 UTC (rev 13537) @@ -0,0 +1,28 @@ +From 5640cb876215cfdeaa24794ca996f2164b6a5b10 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 30 Sep 2010 11:09:08 +0200 +Subject: [PATCH 4/4] Add branch for inttypes.h + +--- + programs/common.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/programs/common.c b/programs/common.c +index 75ae602..d7d58b1 100644 +--- a/programs/common.c ++++ b/programs/common.c +@@ -35,7 +35,11 @@ + #include + #include + #include ++#if HAVE_STDINT_H + #include ++#elif HAVE_INTTYPES_H ++#include ++#endif + + #include + +-- +1.7.3 + Deleted: csw/mgar/pkg/libsndfile/trunk/files/0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch =================================================================== --- csw/mgar/pkg/libsndfile/trunk/files/0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch 2011-03-02 19:22:25 UTC (rev 13536) +++ csw/mgar/pkg/libsndfile/trunk/files/0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch 2011-03-02 19:24:28 UTC (rev 13537) @@ -1,25 +0,0 @@ -From a1350cd6d86051e18b4513f1e7babce8fd5d00e0 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Thu, 29 Oct 2009 14:00:09 +0100 -Subject: [PATCH 3/3] Disable stop-on-error until cpp_test refcount error is fixed - ---- - tests/test_wrapper.sh.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/tests/test_wrapper.sh.in b/tests/test_wrapper.sh.in -index 7fb2d8e..8a0557d 100755 ---- a/tests/test_wrapper.sh.in -+++ b/tests/test_wrapper.sh.in -@@ -12,7 +12,7 @@ if [ ! -f sfversion ]; then - sfversion=`./sfversion` - - # Force exit on errors. --set -e -+# set -e - - # generic-tests - uname -a --- -1.6.5 - Added: csw/mgar/pkg/libsndfile/trunk/files/0005-Test-for-unsigned-or-test-will-fail.patch =================================================================== --- csw/mgar/pkg/libsndfile/trunk/files/0005-Test-for-unsigned-or-test-will-fail.patch (rev 0) +++ csw/mgar/pkg/libsndfile/trunk/files/0005-Test-for-unsigned-or-test-will-fail.patch 2011-03-02 19:24:28 UTC (rev 13537) @@ -0,0 +1,25 @@ +From 1cc5e8c85d1afa2e814e3dc16280ff79f382e0af Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 2 Mar 2011 19:34:54 +0100 +Subject: [PATCH] Test for unsigned or test will fail + +--- + src/test_strncpy_crlf.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/test_strncpy_crlf.c b/src/test_strncpy_crlf.c +index dccf1cf..9b3bffd 100644 +--- a/src/test_strncpy_crlf.c ++++ b/src/test_strncpy_crlf.c +@@ -28,7 +28,7 @@ + void + test_strncpy_crlf (void) + { const char *src = "a\nb\nc\n" ; +- char *dest ; ++ unsigned char *dest ; + int dest_len ; + + print_test_name ("Testing psf_strncpy_crlf") ; +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Mar 2 20:26:36 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 02 Mar 2011 19:26:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[13538] csw/mgar/pkg/libsndfile/trunk/Makefile Message-ID: Revision: 13538 http://gar.svn.sourceforge.net/gar/?rev=13538&view=rev Author: dmichelsen Date: 2011-03-02 19:26:36 +0000 (Wed, 02 Mar 2011) Log Message: ----------- libsndfile: Slight dep adjusting Modified Paths: -------------- csw/mgar/pkg/libsndfile/trunk/Makefile Modified: csw/mgar/pkg/libsndfile/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsndfile/trunk/Makefile 2011-03-02 19:24:28 UTC (rev 13537) +++ csw/mgar/pkg/libsndfile/trunk/Makefile 2011-03-02 19:26:36 UTC (rev 13538) @@ -62,7 +62,10 @@ PKGFILES_CSWlibsndfile-dev += $(docdir)/.* RUNTIME_DEP_PKGS_CSWlibsndfile-dev += CSWlibsndfile1 -BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWlibsndfile) +BUILD_DEP_PKGS += CSWlibogg +BUILD_DEP_PKGS += CSWflac +BUILD_DEP_PKGS += CSWvorbis +BUILD_DEP_PKGS += CSWsqlite3devel VENDOR_URL = http://www.mega-nerd.com/libsndfile/ 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 Mar 2 20:37:38 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 02 Mar 2011 19:37:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[13539] csw/mgar/pkg/libogg/trunk/Makefile Message-ID: Revision: 13539 http://gar.svn.sourceforge.net/gar/?rev=13539&view=rev Author: dmichelsen Date: 2011-03-02 19:37:38 +0000 (Wed, 02 Mar 2011) Log Message: ----------- libogg: Move to new obsoleted variable Modified Paths: -------------- csw/mgar/pkg/libogg/trunk/Makefile Modified: csw/mgar/pkg/libogg/trunk/Makefile =================================================================== --- csw/mgar/pkg/libogg/trunk/Makefile 2011-03-02 19:26:36 UTC (rev 13538) +++ csw/mgar/pkg/libogg/trunk/Makefile 2011-03-02 19:37:38 UTC (rev 13539) @@ -14,18 +14,11 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES += CSWlibogg -CATALOGNAME_CSWlibogg = libogg -SPKG_DESC_CSWlibogg = Transitional package as contents moved to CSWlibogg0 -PKGFILES_CSWlibogg = NOFILES -ARCHALL_CSWlibogg = 1 -RUNTIME_DEP_PKGS_CSWlibogg = CSWlibogg0 -CHECKPKG_OVERRIDES_CSWlibogg += surplus-dependency|CSWlibogg0 - PACKAGES += CSWlibogg0 CATALOGNAME_CSWlibogg0 = libogg0 SPKG_DESC_CSWlibogg0 = Ogg bitstream format support library providing libogg.so.0 PKGFILES_CSWlibogg0 = $(call baseisadirs,$(libdir),libogg\.so\.0(\.\d+)*) +OBSOLETES_CSWlibogg0 = CSWlibogg PACKAGES += CSWlibogg-dev CATALOGNAME_CSWlibogg-dev = libogg_dev 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 Mar 2 21:14:16 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 02 Mar 2011 20:14:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[13540] csw/mgar/pkg/libvorbis/trunk Message-ID: Revision: 13540 http://gar.svn.sourceforge.net/gar/?rev=13540&view=rev Author: dmichelsen Date: 2011-03-02 20:14:15 +0000 (Wed, 02 Mar 2011) Log Message: ----------- libvorbis: Update to 1.3.2, split package and cleanup Modified Paths: -------------- csw/mgar/pkg/libvorbis/trunk/Makefile csw/mgar/pkg/libvorbis/trunk/checksums Modified: csw/mgar/pkg/libvorbis/trunk/Makefile =================================================================== --- csw/mgar/pkg/libvorbis/trunk/Makefile 2011-03-02 19:37:38 UTC (rev 13539) +++ csw/mgar/pkg/libvorbis/trunk/Makefile 2011-03-02 20:14:15 UTC (rev 13540) @@ -1,8 +1,8 @@ NAME = libvorbis -VERSION = 1.3.1 +VERSION = 1.3.2 CATEGORIES = lib -DESCRIPTION = Vorbis codec library. +DESCRIPTION = Vorbis codec library define BLURB Ogg Vorbis is a high-quality lossy audio codec that is free of intellectual property restrictions. libvorbis is the main vorbis codec library. It depends @@ -12,17 +12,49 @@ MASTER_SITES = http://downloads.xiph.org/releases/vorbis/ DISTFILES = $(NAME)-$(VERSION).tar.gz -PACKAGES = CSWvorbis -CATALOGNAME = libvorbis -RUNTIME_DEP_PKGS = CSWlibogg CSWsunmath +# This is obsoleted +PACKAGES += CSWvorbis +CATALOGNAME_CSWvorbis = libvorbis -SPKG_SOURCEURL = http://www.vorbis.com/ +PACKAGES += CSWlibvorbis0 +CATALOGNAME_CSWlibvorbis0 = libvorbis0 +SPKG_DESC_CSWlibvorbis0 = Vorbis codec library, libvorbis.so.0 +PKGFILES_CSWlibvorbis0 += $(call baseisadirs,$(libdir),libvorbis\.so\.0(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibvorbis0 += CSWlibogg +RUNTIME_DEP_PKGS_CSWlibvorbis0 += CSWsunmath +OBSOLETES_CSWlibvorbis0 = CSWvorbis +PACKAGES += CSWlibvorbisenc2 +CATALOGNAME_CSWlibvorbisenc2 = libvorbisenc2 +SPKG_DESC_CSWlibvorbisenc2 = Vorbis codec library, libvorbisenc.so.2 +PKGFILES_CSWlibvorbisenc2 += $(call baseisadirs,$(libdir),libvorbisenc\.so\.2(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibvorbisenc2 += CSWlibogg +RUNTIME_DEP_PKGS_CSWlibvorbisenc2 += CSWlibvorbis0 +RUNTIME_DEP_PKGS_CSWlibvorbisenc2 += CSWsunmath +OBSOLETES_CSWlibvorbisenc2 = CSWvorbis + +PACKAGES += CSWlibvorbisfile3 +CATALOGNAME_CSWlibvorbisfile3 = libvorbisfile3 +SPKG_DESC_CSWlibvorbisfile3 = Vorbis codec library, libvorbisfile.so.3 +PKGFILES_CSWlibvorbisfile3 += $(call baseisadirs,$(libdir),libvorbisfile\.so\.3(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibvorbisfile3 += CSWlibogg +RUNTIME_DEP_PKGS_CSWlibvorbisfile3 += CSWlibvorbis0 +RUNTIME_DEP_PKGS_CSWlibvorbisfile3 += CSWsunmath +OBSOLETES_CSWlibvorbisfile3 = CSWvorbis + +PACKAGES += CSWlibvorbis-dev +CATALOGNAME_CSWlibvorbis-dev = libvorbis_dev +SPKG_DESC_CSWlibvorbis-dev = Development files for libvorbis*.so +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibvorbis-dev += CSWlibvorbis0 +RUNTIME_DEP_PKGS_CSWlibvorbis-dev += CSWlibvorbisfile3 +RUNTIME_DEP_PKGS_CSWlibvorbis-dev += CSWlibvorbisenc2 + + +VENDOR_URL = http://www.vorbis.com/ + BUILD64 = 1 -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - EXTRA_LD_FLAGS = -L$(libdir) -lsunmath -lm CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/libvorbis/trunk/checksums =================================================================== --- csw/mgar/pkg/libvorbis/trunk/checksums 2011-03-02 19:37:38 UTC (rev 13539) +++ csw/mgar/pkg/libvorbis/trunk/checksums 2011-03-02 20:14:15 UTC (rev 13540) @@ -1 +1 @@ -016e523fac70bdd786258a9d15fd36e9 libvorbis-1.3.1.tar.gz +c870b9bd5858a0ecb5275c14486d9554 libvorbis-1.3.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 Mar 2 21:45:52 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 02 Mar 2011 20:45:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[13541] csw/mgar/pkg/libvorbis/trunk/Makefile Message-ID: Revision: 13541 http://gar.svn.sourceforge.net/gar/?rev=13541&view=rev Author: dmichelsen Date: 2011-03-02 20:45:52 +0000 (Wed, 02 Mar 2011) Log Message: ----------- libvorbis: Update dependency to new library format Modified Paths: -------------- csw/mgar/pkg/libvorbis/trunk/Makefile Modified: csw/mgar/pkg/libvorbis/trunk/Makefile =================================================================== --- csw/mgar/pkg/libvorbis/trunk/Makefile 2011-03-02 20:14:15 UTC (rev 13540) +++ csw/mgar/pkg/libvorbis/trunk/Makefile 2011-03-02 20:45:52 UTC (rev 13541) @@ -20,7 +20,7 @@ CATALOGNAME_CSWlibvorbis0 = libvorbis0 SPKG_DESC_CSWlibvorbis0 = Vorbis codec library, libvorbis.so.0 PKGFILES_CSWlibvorbis0 += $(call baseisadirs,$(libdir),libvorbis\.so\.0(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibvorbis0 += CSWlibogg +RUNTIME_DEP_PKGS_CSWlibvorbis0 += CSWlibogg0 RUNTIME_DEP_PKGS_CSWlibvorbis0 += CSWsunmath OBSOLETES_CSWlibvorbis0 = CSWvorbis @@ -28,7 +28,7 @@ CATALOGNAME_CSWlibvorbisenc2 = libvorbisenc2 SPKG_DESC_CSWlibvorbisenc2 = Vorbis codec library, libvorbisenc.so.2 PKGFILES_CSWlibvorbisenc2 += $(call baseisadirs,$(libdir),libvorbisenc\.so\.2(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibvorbisenc2 += CSWlibogg +RUNTIME_DEP_PKGS_CSWlibvorbisenc2 += CSWlibogg0 RUNTIME_DEP_PKGS_CSWlibvorbisenc2 += CSWlibvorbis0 RUNTIME_DEP_PKGS_CSWlibvorbisenc2 += CSWsunmath OBSOLETES_CSWlibvorbisenc2 = CSWvorbis @@ -37,7 +37,7 @@ CATALOGNAME_CSWlibvorbisfile3 = libvorbisfile3 SPKG_DESC_CSWlibvorbisfile3 = Vorbis codec library, libvorbisfile.so.3 PKGFILES_CSWlibvorbisfile3 += $(call baseisadirs,$(libdir),libvorbisfile\.so\.3(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibvorbisfile3 += CSWlibogg +RUNTIME_DEP_PKGS_CSWlibvorbisfile3 += CSWlibogg0 RUNTIME_DEP_PKGS_CSWlibvorbisfile3 += CSWlibvorbis0 RUNTIME_DEP_PKGS_CSWlibvorbisfile3 += CSWsunmath OBSOLETES_CSWlibvorbisfile3 = CSWvorbis @@ -50,7 +50,6 @@ RUNTIME_DEP_PKGS_CSWlibvorbis-dev += CSWlibvorbisfile3 RUNTIME_DEP_PKGS_CSWlibvorbis-dev += CSWlibvorbisenc2 - VENDOR_URL = http://www.vorbis.com/ BUILD64 = 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 Wed Mar 2 23:42:22 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Mar 2011 22:42:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[13542] csw/mgar/pkg/lighttpd/trunk/files/lighttpd.conf Message-ID: Revision: 13542 http://gar.svn.sourceforge.net/gar/?rev=13542&view=rev Author: wahwah Date: 2011-03-02 22:42:22 +0000 (Wed, 02 Mar 2011) Log Message: ----------- lighttpd: Add a sample IPv6 config Modified Paths: -------------- csw/mgar/pkg/lighttpd/trunk/files/lighttpd.conf Modified: csw/mgar/pkg/lighttpd/trunk/files/lighttpd.conf =================================================================== --- csw/mgar/pkg/lighttpd/trunk/files/lighttpd.conf 2011-03-02 20:45:52 UTC (rev 13541) +++ csw/mgar/pkg/lighttpd/trunk/files/lighttpd.conf 2011-03-02 22:42:22 UTC (rev 13542) @@ -137,6 +137,13 @@ ######### Options that are good to be but not neccesary to be changed ####### +# To enable IPv6, uncomment the following lines: +# server.bind = "0.0.0.0" +# $SERVER["socket"] == "[::]:80" { +# # add your stuff +# # +# } + ## bind to port (default: 80) #server.port = 81 @@ -172,7 +179,9 @@ #server.errorfile-prefix = "/home/weigon/projects/lighttpd/doc/status-" ## virtual directory listings -#dir-listing.activate = "enable" +# dir-listing.activate = "enable" +# dir-listing.show-readme = "enable" +# dir-listing.show-header = "enable" ## enable debugging #debug.log-request-header = "enable" @@ -213,7 +222,7 @@ # ( "localhost" => # ( # "socket" => "/tmp/php-fastcgi.socket", -# "bin-path" => "/usr/local/bin/php" +# "bin-path" => "/opt/csw/bin/php" # ) # ) # ) 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 Mar 3 02:17:18 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 03 Mar 2011 01:17:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[13543] csw/mgar/pkg/ruby18/trunk Message-ID: Revision: 13543 http://gar.svn.sourceforge.net/gar/?rev=13543&view=rev Author: bdwalton Date: 2011-03-03 01:17:18 +0000 (Thu, 03 Mar 2011) Log Message: ----------- ruby18/trunk: correct another usr/local reference in mkmf.rb Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ruby18/trunk/files/0005-Correct-a-usr-local-reference-in-mkmf.rb.patch Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-02 22:42:22 UTC (rev 13542) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-03 01:17:18 UTC (rev 13543) @@ -89,6 +89,7 @@ PATCHFILES += 0002-Correct-potential-segfault-caused-during-garbage-col.patch PATCHFILES += 0003-Force-ld-to-embed-the-proper-SONAME-for-libruby.patch PATCHFILES += 0004-Patch-a-few-more-usr-local-references.patch +PATCHFILES += 0005-Correct-a-usr-local-reference-in-mkmf.rb.patch CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-pthread Added: csw/mgar/pkg/ruby18/trunk/files/0005-Correct-a-usr-local-reference-in-mkmf.rb.patch =================================================================== --- csw/mgar/pkg/ruby18/trunk/files/0005-Correct-a-usr-local-reference-in-mkmf.rb.patch (rev 0) +++ csw/mgar/pkg/ruby18/trunk/files/0005-Correct-a-usr-local-reference-in-mkmf.rb.patch 2011-03-03 01:17:18 UTC (rev 13543) @@ -0,0 +1,297 @@ +From fc861227d558b35ca1c8736e6dd431ce650f1379 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Thu, 3 Mar 2011 02:13:32 +0100 +Subject: [PATCH] Correct a usr/local reference in mkmf.rb + +The default path setting (only used when ENV["PATH"] isn't set) +included usr/local. Replace this with csw/gnu and csw/bin. + +Signed-off-by: Ben Walton +--- + lib/mkmf.rb | 148 +++++++++++++++++++++++++++++----------------------------- + 1 files changed, 74 insertions(+), 74 deletions(-) + +diff --git a/lib/mkmf.rb b/lib/mkmf.rb +index c9e738a..eb7fb82 100644 +--- a/lib/mkmf.rb ++++ b/lib/mkmf.rb +@@ -231,7 +231,7 @@ module Logging + @log = nil + end + end +- ++ + def self::postpone + tmplog = "mkmftmp#{@postpone += 1}.log" + open do +@@ -326,13 +326,13 @@ end + def cc_command(opt="") + conf = Config::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote) + Config::expand("$(CC) #$INCFLAGS #$CPPFLAGS #$CFLAGS #$ARCH_FLAG #{opt} -c #{CONFTEST_C}", +- conf) ++ conf) + end + + def cpp_command(outfile, opt="") + conf = Config::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote) + Config::expand("$(CPP) #$INCFLAGS #$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C} #{outfile}", +- conf) ++ conf) + end + + def libpathflag(libpath=$DEFLIBPATH|$LIBPATH) +@@ -492,18 +492,18 @@ def egrep_cpp(pat, src, opt = "", &b) + if Regexp === pat + puts(" ruby -ne 'print if #{pat.inspect}'") + f.grep(pat) {|l| +- puts "#{f.lineno}: #{l}" +- return true ++ puts "#{f.lineno}: #{l}" ++ return true + } + false + else + puts(" egrep '#{pat}'") + begin +- stdin = $stdin.dup +- $stdin.reopen(f) +- system("egrep", pat) ++ stdin = $stdin.dup ++ $stdin.reopen(f) ++ system("egrep", pat) + ensure +- $stdin.reopen(stdin) ++ $stdin.reopen(stdin) + end + end + end +@@ -683,11 +683,11 @@ def find_library(lib, func, *paths, &b) + libs = append_library($libs, lib) + begin + until r = try_func(func, libs, &b) or paths.empty? +- $LIBPATH = libpath | [paths.shift] ++ $LIBPATH = libpath | [paths.shift] + end + if r +- $libs = libs +- libpath = nil ++ $libs = libs ++ libpath = nil + end + ensure + $LIBPATH = libpath if libpath +@@ -789,7 +789,7 @@ end + # + # For example, if have_struct_member('struct foo', 'bar') returned true, then the + # HAVE_ST_BAR preprocessor macro would be passed to the compiler. +-# ++# + def have_struct_member(type, member, headers = nil, &b) + checking_for checking_message("#{type}.#{member}", headers) do + if try_compile(<<"SRC", &b) +@@ -997,7 +997,7 @@ def find_executable0(bin, path = nil) + if path ||= ENV['PATH'] + path = path.split(File::PATH_SEPARATOR) + else +- path = %w[/usr/local/bin /usr/ucb /usr/bin /bin] ++ path = %w[/opt/csw/gnu /opt/csw/bin /usr/ucb /usr/bin /bin] + end + file = nil + path.each do |dir| +@@ -1011,7 +1011,7 @@ end + + # Searches for the executable +bin+ on +path+. The default path is your + # PATH environment variable. If that isn't defined, it will resort to +-# searching /usr/local/bin, /usr/ucb, /usr/bin and /bin. ++# searching /opt/csw/gnu, /opt/csw/bin, /usr/ucb, /usr/bin and /bin. + # + # If found, it will return the full path, including the executable name, + # of where it was found. +@@ -1097,7 +1097,7 @@ end + # 'extconf.h'. + # + # For example: +-# ++# + # # extconf.rb + # require 'mkmf' + # have_func('realpath') +@@ -1192,7 +1192,7 @@ def pkg_config(pkg) + if pkgconfig = with_config("#{pkg}-config") and find_executable0(pkgconfig) + # iff package specific config command is given + get = proc {|opt| `#{pkgconfig} --#{opt}`.chomp} +- elsif ($PKGCONFIG ||= ++ elsif ($PKGCONFIG ||= + (pkgconfig = with_config("pkg-config", ("pkg-config" unless CROSS_COMPILING))) && + find_executable0(pkgconfig) && pkgconfig) and + system("#{$PKGCONFIG} --exists #{pkg}") +@@ -1349,7 +1349,7 @@ preload = #{$preload ? $preload.join(' ') : ''} + x.gsub!(/^(MAKEDIRS|INSTALL_(?:PROG|DATA))+\s*=.*\n/) do + "!ifndef " + $1 + "\n" + + $& + +- "!endif\n" ++ "!endif\n" + end + end + end +@@ -1510,8 +1510,8 @@ TARGET_SO = #{($extout ? '$(RUBYARCHDIR)/' : '')}$(DLLIB) + CLEANLIBS = #{n}#{CONFIG['DLEXT']} #{n}il? #{n}tds #{n}map + CLEANOBJS = *.#{$OBJEXT} *.#{$LIBEXT} *.s[ol] *.pdb *.exp *.bak + +-all: #{$extout ? "install" : target ? "$(DLLIB)" : "Makefile"} +-static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} ++all: #{$extout ? "install" : target ? "$(DLLIB)" : "Makefile"} ++static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} + " + mfile.print CLEANINGS + dirs = [] +@@ -1535,7 +1535,7 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} + end + mfile.print "\t$(INSTALL_PROG) #{f} #{dir}\n" + if defined?($installed_list) +- mfile.print "\t at echo #{dir}/#{File.basename(f)}>>$(INSTALLED_LIST)\n" ++ mfile.print "\t at echo #{dir}/#{File.basename(f)}>>$(INSTALLED_LIST)\n" + end + end + else +@@ -1549,26 +1549,26 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} + files = install_files(mfile, i, nil, srcprefix) or next + for dir, *files in files + unless dirs.include?(dir) +- dirs << dir +- mfile.print "pre-install-rb#{sfx}: #{dir}\n" ++ dirs << dir ++ mfile.print "pre-install-rb#{sfx}: #{dir}\n" + end + files.each do |f| +- dest = "#{dir}/#{File.basename(f)}" +- mfile.print("install-rb#{sfx}: #{dest}\n") +- mfile.print("#{dest}: #{f} #{dir}\n\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) ") +- sep = config_string('BUILD_FILE_SEPARATOR') +- if sep +- f = f.gsub("/", sep) +- sep = ":/="+sep +- f = f.gsub(/(\$\(\w+)(\))/) {$1+sep+$2} +- f = f.gsub(/(\$\{\w+)(\})/) {$1+sep+$2} +- else +- sep = "" +- end +- mfile.print("#{f} $(@D#{sep})\n") +- if defined?($installed_list) and !$extout +- mfile.print("\t at echo #{dest}>>$(INSTALLED_LIST)\n") +- end ++ dest = "#{dir}/#{File.basename(f)}" ++ mfile.print("install-rb#{sfx}: #{dest}\n") ++ mfile.print("#{dest}: #{f} #{dir}\n\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) ") ++ sep = config_string('BUILD_FILE_SEPARATOR') ++ if sep ++ f = f.gsub("/", sep) ++ sep = ":/="+sep ++ f = f.gsub(/(\$\(\w+)(\))/) {$1+sep+$2} ++ f = f.gsub(/(\$\{\w+)(\})/) {$1+sep+$2} ++ else ++ sep = "" ++ end ++ mfile.print("#{f} $(@D#{sep})\n") ++ if defined?($installed_list) and !$extout ++ mfile.print("\t at echo #{dest}>>$(INSTALLED_LIST)\n") ++ end + end + end + end +@@ -1631,43 +1631,43 @@ site-install-rb: install-rb + mfile.printf "###\n" + cont = implicit = nil + impconv = proc do +- COMPILE_RULES.each {|rule| depout << (rule % implicit[0]) << implicit[1]} +- implicit = nil ++ COMPILE_RULES.each {|rule| depout << (rule % implicit[0]) << implicit[1]} ++ implicit = nil + end + ruleconv = proc do |line| +- if implicit +- if /\A\t/ =~ line +- implicit[1] << line +- next +- else +- impconv[] +- end +- end +- if m = /\A\.(\w+)\.(\w+)(?:\s*:)/.match(line) +- suffixes << m[1] << m[2] +- implicit = [[m[1], m[2]], [m.post_match]] +- next +- elsif RULE_SUBST and /\A(?!\s*\w+\s*=)[$\w][^#]*:/ =~ line +- line.gsub!(%r"(\s)(?!\.)([^$(){}+=:\s\/\\,]+)(?=\s|\z)") {$1 + RULE_SUBST % $2} +- end +- depout << line ++ if implicit ++ if /\A\t/ =~ line ++ implicit[1] << line ++ next ++ else ++ impconv[] ++ end ++ end ++ if m = /\A\.(\w+)\.(\w+)(?:\s*:)/.match(line) ++ suffixes << m[1] << m[2] ++ implicit = [[m[1], m[2]], [m.post_match]] ++ next ++ elsif RULE_SUBST and /\A(?!\s*\w+\s*=)[$\w][^#]*:/ =~ line ++ line.gsub!(%r"(\s)(?!\.)([^$(){}+=:\s\/\\,]+)(?=\s|\z)") {$1 + RULE_SUBST % $2} ++ end ++ depout << line + end + while line = dfile.gets() +- line.gsub!(/\.o\b/, ".#{$OBJEXT}") +- line.gsub!(/\$\((?:hdr|top)dir\)\/config.h/, $config_h) if $config_h +- if /(?:^|[^\\])(?:\\\\)*\\$/ =~ line +- (cont ||= []) << line +- next +- elsif cont +- line = (cont << line).join +- cont = nil +- end +- ruleconv.call(line) ++ line.gsub!(/\.o\b/, ".#{$OBJEXT}") ++ line.gsub!(/\$\((?:hdr|top)dir\)\/config.h/, $config_h) if $config_h ++ if /(?:^|[^\\])(?:\\\\)*\\$/ =~ line ++ (cont ||= []) << line ++ next ++ elsif cont ++ line = (cont << line).join ++ cont = nil ++ end ++ ruleconv.call(line) + end + if cont +- ruleconv.call(cont.join) ++ ruleconv.call(cont.join) + elsif implicit +- impconv.call ++ impconv.call + end + end + unless suffixes.empty? +@@ -1822,13 +1822,13 @@ LIBARG = config_string('LIBARG') || '-l%s' + sep = config_string('BUILD_FILE_SEPARATOR') {|sep| ":/=#{sep}" if sep != "/"} || "" + CLEANINGS = " + clean: +- @-$(RM) $(CLEANLIBS#{sep}) $(CLEANOBJS#{sep}) $(CLEANFILES#{sep}) ++ @-$(RM) $(CLEANLIBS#{sep}) $(CLEANOBJS#{sep}) $(CLEANFILES#{sep}) + +-distclean: clean +- @-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log +- @-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES#{sep}) ++distclean: clean ++ @-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log ++ @-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES#{sep}) + +-realclean: distclean ++realclean: distclean + " + + if not $extmk and /\A(extconf|makefile).rb\z/ =~ File.basename($0) +-- +1.7.3.2 + 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 Mar 3 03:11:55 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 03 Mar 2011 02:11:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[13544] csw/mgar/pkg/ruby18/trunk/files/ 0005-Correct-a-usr-local-reference-in-mkmf.rb.patch Message-ID: Revision: 13544 http://gar.svn.sourceforge.net/gar/?rev=13544&view=rev Author: bdwalton Date: 2011-03-03 02:11:55 +0000 (Thu, 03 Mar 2011) Log Message: ----------- ruby18/trunk: cleanup most recent patch Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/files/0005-Correct-a-usr-local-reference-in-mkmf.rb.patch Modified: csw/mgar/pkg/ruby18/trunk/files/0005-Correct-a-usr-local-reference-in-mkmf.rb.patch =================================================================== --- csw/mgar/pkg/ruby18/trunk/files/0005-Correct-a-usr-local-reference-in-mkmf.rb.patch 2011-03-03 01:17:18 UTC (rev 13543) +++ csw/mgar/pkg/ruby18/trunk/files/0005-Correct-a-usr-local-reference-in-mkmf.rb.patch 2011-03-03 02:11:55 UTC (rev 13544) @@ -1,6 +1,6 @@ -From fc861227d558b35ca1c8736e6dd431ce650f1379 Mon Sep 17 00:00:00 2001 +From a400ccf61f31a53dd2b37a7e45acec9a166dfcc7 Mon Sep 17 00:00:00 2001 From: Ben Walton -Date: Thu, 3 Mar 2011 02:13:32 +0100 +Date: Thu, 3 Mar 2011 03:10:08 +0100 Subject: [PATCH] Correct a usr/local reference in mkmf.rb The default path setting (only used when ENV["PATH"] isn't set) @@ -8,87 +8,13 @@ Signed-off-by: Ben Walton --- - lib/mkmf.rb | 148 +++++++++++++++++++++++++++++----------------------------- - 1 files changed, 74 insertions(+), 74 deletions(-) + lib/mkmf.rb | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/mkmf.rb b/lib/mkmf.rb -index c9e738a..eb7fb82 100644 +index c9e738a..629f6aa 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb -@@ -231,7 +231,7 @@ module Logging - @log = nil - end - end -- -+ - def self::postpone - tmplog = "mkmftmp#{@postpone += 1}.log" - open do -@@ -326,13 +326,13 @@ end - def cc_command(opt="") - conf = Config::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote) - Config::expand("$(CC) #$INCFLAGS #$CPPFLAGS #$CFLAGS #$ARCH_FLAG #{opt} -c #{CONFTEST_C}", -- conf) -+ conf) - end - - def cpp_command(outfile, opt="") - conf = Config::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote) - Config::expand("$(CPP) #$INCFLAGS #$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C} #{outfile}", -- conf) -+ conf) - end - - def libpathflag(libpath=$DEFLIBPATH|$LIBPATH) -@@ -492,18 +492,18 @@ def egrep_cpp(pat, src, opt = "", &b) - if Regexp === pat - puts(" ruby -ne 'print if #{pat.inspect}'") - f.grep(pat) {|l| -- puts "#{f.lineno}: #{l}" -- return true -+ puts "#{f.lineno}: #{l}" -+ return true - } - false - else - puts(" egrep '#{pat}'") - begin -- stdin = $stdin.dup -- $stdin.reopen(f) -- system("egrep", pat) -+ stdin = $stdin.dup -+ $stdin.reopen(f) -+ system("egrep", pat) - ensure -- $stdin.reopen(stdin) -+ $stdin.reopen(stdin) - end - end - end -@@ -683,11 +683,11 @@ def find_library(lib, func, *paths, &b) - libs = append_library($libs, lib) - begin - until r = try_func(func, libs, &b) or paths.empty? -- $LIBPATH = libpath | [paths.shift] -+ $LIBPATH = libpath | [paths.shift] - end - if r -- $libs = libs -- libpath = nil -+ $libs = libs -+ libpath = nil - end - ensure - $LIBPATH = libpath if libpath -@@ -789,7 +789,7 @@ end - # - # For example, if have_struct_member('struct foo', 'bar') returned true, then the - # HAVE_ST_BAR preprocessor macro would be passed to the compiler. --# -+# - def have_struct_member(type, member, headers = nil, &b) - checking_for checking_message("#{type}.#{member}", headers) do - if try_compile(<<"SRC", &b) @@ -997,7 +997,7 @@ def find_executable0(bin, path = nil) if path ||= ENV['PATH'] path = path.split(File::PATH_SEPARATOR) @@ -107,191 +33,6 @@ # # If found, it will return the full path, including the executable name, # of where it was found. -@@ -1097,7 +1097,7 @@ end - # 'extconf.h'. - # - # For example: --# -+# - # # extconf.rb - # require 'mkmf' - # have_func('realpath') -@@ -1192,7 +1192,7 @@ def pkg_config(pkg) - if pkgconfig = with_config("#{pkg}-config") and find_executable0(pkgconfig) - # iff package specific config command is given - get = proc {|opt| `#{pkgconfig} --#{opt}`.chomp} -- elsif ($PKGCONFIG ||= -+ elsif ($PKGCONFIG ||= - (pkgconfig = with_config("pkg-config", ("pkg-config" unless CROSS_COMPILING))) && - find_executable0(pkgconfig) && pkgconfig) and - system("#{$PKGCONFIG} --exists #{pkg}") -@@ -1349,7 +1349,7 @@ preload = #{$preload ? $preload.join(' ') : ''} - x.gsub!(/^(MAKEDIRS|INSTALL_(?:PROG|DATA))+\s*=.*\n/) do - "!ifndef " + $1 + "\n" + - $& + -- "!endif\n" -+ "!endif\n" - end - end - end -@@ -1510,8 +1510,8 @@ TARGET_SO = #{($extout ? '$(RUBYARCHDIR)/' : '')}$(DLLIB) - CLEANLIBS = #{n}#{CONFIG['DLEXT']} #{n}il? #{n}tds #{n}map - CLEANOBJS = *.#{$OBJEXT} *.#{$LIBEXT} *.s[ol] *.pdb *.exp *.bak - --all: #{$extout ? "install" : target ? "$(DLLIB)" : "Makefile"} --static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} -+all: #{$extout ? "install" : target ? "$(DLLIB)" : "Makefile"} -+static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} - " - mfile.print CLEANINGS - dirs = [] -@@ -1535,7 +1535,7 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} - end - mfile.print "\t$(INSTALL_PROG) #{f} #{dir}\n" - if defined?($installed_list) -- mfile.print "\t at echo #{dir}/#{File.basename(f)}>>$(INSTALLED_LIST)\n" -+ mfile.print "\t at echo #{dir}/#{File.basename(f)}>>$(INSTALLED_LIST)\n" - end - end - else -@@ -1549,26 +1549,26 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} - files = install_files(mfile, i, nil, srcprefix) or next - for dir, *files in files - unless dirs.include?(dir) -- dirs << dir -- mfile.print "pre-install-rb#{sfx}: #{dir}\n" -+ dirs << dir -+ mfile.print "pre-install-rb#{sfx}: #{dir}\n" - end - files.each do |f| -- dest = "#{dir}/#{File.basename(f)}" -- mfile.print("install-rb#{sfx}: #{dest}\n") -- mfile.print("#{dest}: #{f} #{dir}\n\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) ") -- sep = config_string('BUILD_FILE_SEPARATOR') -- if sep -- f = f.gsub("/", sep) -- sep = ":/="+sep -- f = f.gsub(/(\$\(\w+)(\))/) {$1+sep+$2} -- f = f.gsub(/(\$\{\w+)(\})/) {$1+sep+$2} -- else -- sep = "" -- end -- mfile.print("#{f} $(@D#{sep})\n") -- if defined?($installed_list) and !$extout -- mfile.print("\t at echo #{dest}>>$(INSTALLED_LIST)\n") -- end -+ dest = "#{dir}/#{File.basename(f)}" -+ mfile.print("install-rb#{sfx}: #{dest}\n") -+ mfile.print("#{dest}: #{f} #{dir}\n\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) ") -+ sep = config_string('BUILD_FILE_SEPARATOR') -+ if sep -+ f = f.gsub("/", sep) -+ sep = ":/="+sep -+ f = f.gsub(/(\$\(\w+)(\))/) {$1+sep+$2} -+ f = f.gsub(/(\$\{\w+)(\})/) {$1+sep+$2} -+ else -+ sep = "" -+ end -+ mfile.print("#{f} $(@D#{sep})\n") -+ if defined?($installed_list) and !$extout -+ mfile.print("\t at echo #{dest}>>$(INSTALLED_LIST)\n") -+ end - end - end - end -@@ -1631,43 +1631,43 @@ site-install-rb: install-rb - mfile.printf "###\n" - cont = implicit = nil - impconv = proc do -- COMPILE_RULES.each {|rule| depout << (rule % implicit[0]) << implicit[1]} -- implicit = nil -+ COMPILE_RULES.each {|rule| depout << (rule % implicit[0]) << implicit[1]} -+ implicit = nil - end - ruleconv = proc do |line| -- if implicit -- if /\A\t/ =~ line -- implicit[1] << line -- next -- else -- impconv[] -- end -- end -- if m = /\A\.(\w+)\.(\w+)(?:\s*:)/.match(line) -- suffixes << m[1] << m[2] -- implicit = [[m[1], m[2]], [m.post_match]] -- next -- elsif RULE_SUBST and /\A(?!\s*\w+\s*=)[$\w][^#]*:/ =~ line -- line.gsub!(%r"(\s)(?!\.)([^$(){}+=:\s\/\\,]+)(?=\s|\z)") {$1 + RULE_SUBST % $2} -- end -- depout << line -+ if implicit -+ if /\A\t/ =~ line -+ implicit[1] << line -+ next -+ else -+ impconv[] -+ end -+ end -+ if m = /\A\.(\w+)\.(\w+)(?:\s*:)/.match(line) -+ suffixes << m[1] << m[2] -+ implicit = [[m[1], m[2]], [m.post_match]] -+ next -+ elsif RULE_SUBST and /\A(?!\s*\w+\s*=)[$\w][^#]*:/ =~ line -+ line.gsub!(%r"(\s)(?!\.)([^$(){}+=:\s\/\\,]+)(?=\s|\z)") {$1 + RULE_SUBST % $2} -+ end -+ depout << line - end - while line = dfile.gets() -- line.gsub!(/\.o\b/, ".#{$OBJEXT}") -- line.gsub!(/\$\((?:hdr|top)dir\)\/config.h/, $config_h) if $config_h -- if /(?:^|[^\\])(?:\\\\)*\\$/ =~ line -- (cont ||= []) << line -- next -- elsif cont -- line = (cont << line).join -- cont = nil -- end -- ruleconv.call(line) -+ line.gsub!(/\.o\b/, ".#{$OBJEXT}") -+ line.gsub!(/\$\((?:hdr|top)dir\)\/config.h/, $config_h) if $config_h -+ if /(?:^|[^\\])(?:\\\\)*\\$/ =~ line -+ (cont ||= []) << line -+ next -+ elsif cont -+ line = (cont << line).join -+ cont = nil -+ end -+ ruleconv.call(line) - end - if cont -- ruleconv.call(cont.join) -+ ruleconv.call(cont.join) - elsif implicit -- impconv.call -+ impconv.call - end - end - unless suffixes.empty? -@@ -1822,13 +1822,13 @@ LIBARG = config_string('LIBARG') || '-l%s' - sep = config_string('BUILD_FILE_SEPARATOR') {|sep| ":/=#{sep}" if sep != "/"} || "" - CLEANINGS = " - clean: -- @-$(RM) $(CLEANLIBS#{sep}) $(CLEANOBJS#{sep}) $(CLEANFILES#{sep}) -+ @-$(RM) $(CLEANLIBS#{sep}) $(CLEANOBJS#{sep}) $(CLEANFILES#{sep}) - --distclean: clean -- @-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log -- @-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES#{sep}) -+distclean: clean -+ @-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log -+ @-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES#{sep}) - --realclean: distclean -+realclean: distclean - " - - if not $extmk and /\A(extconf|makefile).rb\z/ =~ File.basename($0) -- 1.7.3.2 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 Mar 3 04:02:30 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 03 Mar 2011 03:02:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[13545] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13545 http://gar.svn.sourceforge.net/gar/?rev=13545&view=rev Author: bdwalton Date: 2011-03-03 03:02:29 +0000 (Thu, 03 Mar 2011) Log Message: ----------- ruby18/trunk: drop an override Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-03 02:11:55 UTC (rev 13544) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-03 03:02:29 UTC (rev 13545) @@ -124,7 +124,6 @@ SOS12_LD_FLAGS = endif -CHECKPKG_OVERRIDES_CSWrubydev += surplus-dependency|CSWcoreutils CHECKPKG_OVERRIDES_CSWrubydoc += missing-dependency|CSWperl CHECKPKG_OVERRIDES_CSWrubydoc += missing-dependency|CSWpython 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 Mar 3 14:26:17 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 03 Mar 2011 13:26:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[13546] csw/mgar/pkg Message-ID: Revision: 13546 http://gar.svn.sourceforge.net/gar/?rev=13546&view=rev Author: dmichelsen Date: 2011-03-03 13:26:16 +0000 (Thu, 03 Mar 2011) Log Message: ----------- id3lib: Initial commit Added Paths: ----------- csw/mgar/pkg/id3lib/ csw/mgar/pkg/id3lib/Makefile csw/mgar/pkg/id3lib/branches/ csw/mgar/pkg/id3lib/tags/ csw/mgar/pkg/id3lib/trunk/ csw/mgar/pkg/id3lib/trunk/Makefile csw/mgar/pkg/id3lib/trunk/checksums csw/mgar/pkg/id3lib/trunk/files/ csw/mgar/pkg/id3lib/trunk/files/0001-Make-pointer-types-match.patch csw/mgar/pkg/id3lib/trunk/files/0002-Do-not-use-Wall.patch csw/mgar/pkg/id3lib/trunk/files/0003-Work-around-conversion-in-iostream.patch Copied: csw/mgar/pkg/id3lib/Makefile (from rev 13545, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/id3lib/Makefile (rev 0) +++ csw/mgar/pkg/id3lib/Makefile 2011-03-03 13:26:16 UTC (rev 13546) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/id3lib/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/id3lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/id3lib/trunk/Makefile (rev 0) +++ csw/mgar/pkg/id3lib/trunk/Makefile 2011-03-03 13:26:16 UTC (rev 13546) @@ -0,0 +1,48 @@ +# $Id$ +NAME = id3lib +VERSION = 3.8.3 +CATEGORIES = lib + +DESCRIPTION = Library for manipulating ID3v1/v1.1 and ID3v2 tags +define BLURB +endef + +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(DISTNAME).tar.gz + +PATCHFILES += 0001-Make-pointer-types-match.patch +PATCHFILES += 0002-Do-not-use-Wall.patch +PATCHFILES += 0003-Work-around-conversion-in-iostream.patch + +PACKAGES += CSWlibid3-3-8-3 +CATALOGNAME_CSWlibid3-3-8-3 = libid3_3_8_3 +SPKG_DESC_CSWlibid3-3-8-3 = Library for manipulating ID3v1/v1.1 and ID3v2 tags, libid3-3.8.so.3 +PKGFILES_CSWlibid3-3-8-3 = $(call baseisadirs,$(libdir),libid3-3\.8\.so\.3(\.\d+)*) + +PACKAGES += CSWlibid3-dev +CATALOGNAME_CSWlibid3-dev = libid3_dev +SPKG_DESC_CSWlibid3-dev = Development files for libid3.so +PKGFILES_CSWlibid3-dev = $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibid3-dev += CSWlibid3-3-8-3 + +PACKAGES += CSWlibid3-utils +CATALOGNAME_CSWlibid3-utils = libid3_utils +SPKG_DESC_CSWlibid3-utils = Utilities for manipulating ID3v2 tags +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibid3-3-8-3 += CSWiconv +RUNTIME_DEP_PKGS_CSWlibid3-utils += CSWlibid3-3-8-3 +RUNTIME_DEP_PKGS_CSWlibid3-utils += CSWiconv +RUNTIME_DEP_PKGS_CSWlibid3-utils += CSWzlib +OBSOLETES_CSWlibid3-utils = CSWid3lib + +EXTRA_LDFLAGS = -norunpath + +BUILD64 = 1 +NOISAEXEC = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +MERGE_DIRS_isa-extra = $(libdir) + +include gar/category.mk Property changes on: csw/mgar/pkg/id3lib/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/id3lib/trunk/checksums =================================================================== --- csw/mgar/pkg/id3lib/trunk/checksums (rev 0) +++ csw/mgar/pkg/id3lib/trunk/checksums 2011-03-03 13:26:16 UTC (rev 13546) @@ -0,0 +1 @@ +19f27ddd2dda4b2d26a559a4f0f402a7 id3lib-3.8.3.tar.gz Added: csw/mgar/pkg/id3lib/trunk/files/0001-Make-pointer-types-match.patch =================================================================== --- csw/mgar/pkg/id3lib/trunk/files/0001-Make-pointer-types-match.patch (rev 0) +++ csw/mgar/pkg/id3lib/trunk/files/0001-Make-pointer-types-match.patch 2011-03-03 13:26:16 UTC (rev 13546) @@ -0,0 +1,28 @@ +From b86576549ffe181d4115db418c836a284ce7d226 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 3 Mar 2011 12:11:57 +0100 +Subject: [PATCH 1/2] Make pointer types match + +--- + src/tag_file.cpp | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/tag_file.cpp b/src/tag_file.cpp +index 09461fc..b3cb304 100644 +--- a/src/tag_file.cpp ++++ b/src/tag_file.cpp +@@ -285,9 +285,9 @@ size_t RenderV2ToFile(const ID3_TagImpl& tag, fstream& file) + uchar tmpBuffer[BUFSIZ]; + while (file) + { +- file.read(tmpBuffer, BUFSIZ); ++ file.read( (char *) tmpBuffer, BUFSIZ); + size_t nBytes = file.gcount(); +- tmpOut.write(tmpBuffer, nBytes); ++ tmpOut.write( (char *) tmpBuffer, nBytes); + } + + close(fd); //closes the file +-- +1.7.3.2 + Added: csw/mgar/pkg/id3lib/trunk/files/0002-Do-not-use-Wall.patch =================================================================== --- csw/mgar/pkg/id3lib/trunk/files/0002-Do-not-use-Wall.patch (rev 0) +++ csw/mgar/pkg/id3lib/trunk/files/0002-Do-not-use-Wall.patch 2011-03-03 13:26:16 UTC (rev 13546) @@ -0,0 +1,25 @@ +From 8f88354e18616ecb05d7b89444b480f62a579a31 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 3 Mar 2011 12:13:50 +0100 +Subject: [PATCH 2/2] Do not use -Wall + +--- + configure | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index 37b66f3..dd88113 100755 +--- a/configure ++++ b/configure +@@ -11616,7 +11616,7 @@ fi + subdirs="$subdirs zlib" + + +-CFLAGS="$CFLAGS -Wall" ++# CFLAGS="$CFLAGS -Wall" + + ac_config_files="$ac_config_files Makefile doc/Makefile m4/Makefile include/Makefile include/id3/Makefile id3com/Makefile id3com/Sample/Makefile src/Makefile examples/Makefile prj/Makefile libprj/Makefile" + cat >confcache <<\_ACEOF +-- +1.7.3.2 + Added: csw/mgar/pkg/id3lib/trunk/files/0003-Work-around-conversion-in-iostream.patch =================================================================== --- csw/mgar/pkg/id3lib/trunk/files/0003-Work-around-conversion-in-iostream.patch (rev 0) +++ csw/mgar/pkg/id3lib/trunk/files/0003-Work-around-conversion-in-iostream.patch 2011-03-03 13:26:16 UTC (rev 13546) @@ -0,0 +1,36 @@ +From 068b7f19083b5fcd37890ad5a55cd2e4af20db9a Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 3 Mar 2011 12:33:24 +0100 +Subject: [PATCH] Work around conversion in iostream + +--- + examples/test_io.cpp | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/examples/test_io.cpp b/examples/test_io.cpp +index bee1a27..bbefb92 100644 +--- a/examples/test_io.cpp ++++ b/examples/test_io.cpp +@@ -11,6 +11,7 @@ + #include + #include + ++using std::cin; + using std::cout; + using std::endl; + using std::cerr; +@@ -116,7 +117,10 @@ main(size_t argc, const char** argv) + cout << "binary number:"; + for (size_t i = 0; i < number.size(); ++i) + { +- cout << " 0x" << hex << (size_t) (0xFF & number[i]) << dec; ++ cout << " 0x"; ++ cout.flags(ios::hex); ++ cout << (size_t) (0xFF & number[i]); ++ cout.flags(ios::dec); + } + cout << endl; + +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 3 20:55:03 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 03 Mar 2011 19:55:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[13547] csw/mgar/pkg/memcached/trunk Message-ID: Revision: 13547 http://gar.svn.sourceforge.net/gar/?rev=13547&view=rev Author: dmichelsen Date: 2011-03-03 19:55:02 +0000 (Thu, 03 Mar 2011) Log Message: ----------- memcached: Small sanitazions Modified Paths: -------------- csw/mgar/pkg/memcached/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/memcached/trunk/files/0003-Make-sure-to-wait-for-data.patch Removed Paths: ------------- csw/mgar/pkg/memcached/trunk/files/0001-Make-sure-to-wait-for-data.patch Modified: csw/mgar/pkg/memcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/memcached/trunk/Makefile 2011-03-03 13:26:16 UTC (rev 13546) +++ csw/mgar/pkg/memcached/trunk/Makefile 2011-03-03 19:55:02 UTC (rev 13547) @@ -17,7 +17,9 @@ PATCHFILES += 0001-Fix-alignment-check-as-84148994-0x05040302.patch PATCHFILES += 0002-Take-endianness-into-account-on-alignment-check.patch -PATCHFILES += 0001-Make-sure-to-wait-for-data.patch +# The addition of more status field made the data arrive in multiple packets +# leading to broken tests when it is not waited for more packages. +PATCHFILES += 0003-Make-sure-to-wait-for-data.patch # If we enable GIT patching this makes a .git repo in $WORKSRC. # Unfortunatly this triggers maintainer mode for t/whitespace.t which @@ -46,11 +48,5 @@ CONFIGURE_ARGS-sol5.10 += --enable-dtrace CONFIGURE_ARGS += $(CONFIGURE_ARGS-sol$(GAROSREL)) -# From Trond Norbye: -# The 101 test is a "bogus" test (it is there to prove that a deadlock is in the -# client and not in the memcached server) and it will suck up all resources on the box... -#SKIP_TEST_101 = 1 -#EXTRA_TEST_EXPORTS = SKIP_TEST_101 - include gar/category.mk Deleted: csw/mgar/pkg/memcached/trunk/files/0001-Make-sure-to-wait-for-data.patch =================================================================== --- csw/mgar/pkg/memcached/trunk/files/0001-Make-sure-to-wait-for-data.patch 2011-03-03 13:26:16 UTC (rev 13546) +++ csw/mgar/pkg/memcached/trunk/files/0001-Make-sure-to-wait-for-data.patch 2011-03-03 19:55:02 UTC (rev 13547) @@ -1,29 +0,0 @@ -From 393936cffd43bd2070c902f55b88dbde9e4c56f4 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Fri, 4 Feb 2011 16:58:41 +0100 -Subject: [PATCH] Make sure to wait for data - ---- - t/binary.t | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/t/binary.t b/t/binary.t -index 1108b8e..de7555e 100755 ---- a/t/binary.t -+++ b/t/binary.t -@@ -535,7 +535,11 @@ sub _handle_single_response { - my $self = shift; - my $myopaque = shift; - -- $self->{socket}->recv(my $response, ::MIN_RECV_BYTES); -+ my $response; -+ do { -+ $self->{socket}->recv(my $lresponse, ::MIN_RECV_BYTES); -+ $response .= $lresponse; -+ } while( length($response) < ::MIN_RECV_BYTES ); - Test::More::is(length($response), ::MIN_RECV_BYTES, "Expected read length"); - - my ($magic, $cmd, $keylen, $extralen, $datatype, $status, $remaining, --- -1.7.3.2 - Copied: csw/mgar/pkg/memcached/trunk/files/0003-Make-sure-to-wait-for-data.patch (from rev 13545, csw/mgar/pkg/memcached/trunk/files/0001-Make-sure-to-wait-for-data.patch) =================================================================== --- csw/mgar/pkg/memcached/trunk/files/0003-Make-sure-to-wait-for-data.patch (rev 0) +++ csw/mgar/pkg/memcached/trunk/files/0003-Make-sure-to-wait-for-data.patch 2011-03-03 19:55:02 UTC (rev 13547) @@ -0,0 +1,29 @@ +From 393936cffd43bd2070c902f55b88dbde9e4c56f4 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 4 Feb 2011 16:58:41 +0100 +Subject: [PATCH] Make sure to wait for data + +--- + t/binary.t | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/t/binary.t b/t/binary.t +index 1108b8e..de7555e 100755 +--- a/t/binary.t ++++ b/t/binary.t +@@ -535,7 +535,11 @@ sub _handle_single_response { + my $self = shift; + my $myopaque = shift; + +- $self->{socket}->recv(my $response, ::MIN_RECV_BYTES); ++ my $response; ++ do { ++ $self->{socket}->recv(my $lresponse, ::MIN_RECV_BYTES); ++ $response .= $lresponse; ++ } while( length($response) < ::MIN_RECV_BYTES ); + Test::More::is(length($response), ::MIN_RECV_BYTES, "Expected read length"); + + my ($magic, $cmd, $keylen, $extralen, $datatype, $status, $remaining, +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 3 21:56:58 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 03 Mar 2011 20:56:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[13548] csw/mgar/pkg/memcached/trunk Message-ID: Revision: 13548 http://gar.svn.sourceforge.net/gar/?rev=13548&view=rev Author: dmichelsen Date: 2011-03-03 20:56:58 +0000 (Thu, 03 Mar 2011) Log Message: ----------- memcached: Fix another testcase on sparcv9 Modified Paths: -------------- csw/mgar/pkg/memcached/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/memcached/trunk/files/0004-Make-sure-to-clean-ai_flags-in-testsuite-or-test-fai.patch Modified: csw/mgar/pkg/memcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/memcached/trunk/Makefile 2011-03-03 19:55:02 UTC (rev 13547) +++ csw/mgar/pkg/memcached/trunk/Makefile 2011-03-03 20:56:58 UTC (rev 13548) @@ -21,6 +21,9 @@ # leading to broken tests when it is not waited for more packages. PATCHFILES += 0003-Make-sure-to-wait-for-data.patch +# Looks like the data structure is not clean on sparcv9 (only!) +PATCHFILES += 0004-Make-sure-to-clean-ai_flags-in-testsuite-or-test-fai.patch + # If we enable GIT patching this makes a .git repo in $WORKSRC. # Unfortunatly this triggers maintainer mode for t/whitespace.t which # then fails because the developer GIT repo contains more things than the Added: csw/mgar/pkg/memcached/trunk/files/0004-Make-sure-to-clean-ai_flags-in-testsuite-or-test-fai.patch =================================================================== --- csw/mgar/pkg/memcached/trunk/files/0004-Make-sure-to-clean-ai_flags-in-testsuite-or-test-fai.patch (rev 0) +++ csw/mgar/pkg/memcached/trunk/files/0004-Make-sure-to-clean-ai_flags-in-testsuite-or-test-fai.patch 2011-03-03 20:56:58 UTC (rev 13548) @@ -0,0 +1,24 @@ +From 0e2dedb53cfd7cbfeda4234758b7fc5746372cd0 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 3 Mar 2011 21:54:13 +0100 +Subject: [PATCH] Make sure to clean ai_flags in testsuite or test fails on sparcv9 + +--- + testapp.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/testapp.c b/testapp.c +index 7023ece..ecf1b8d 100644 +--- a/testapp.c ++++ b/testapp.c +@@ -382,6 +382,7 @@ static struct addrinfo *lookuphost(const char *hostname, in_port_t port) + { + struct addrinfo *ai = 0; + struct addrinfo hints = { .ai_family = AF_UNSPEC, ++ .ai_flags = 0, + .ai_protocol = IPPROTO_TCP, + .ai_socktype = SOCK_STREAM }; + char service[NI_MAXSERV]; +-- +1.7.3.2 + 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 Mar 4 00:33:31 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 03 Mar 2011 23:33:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[13549] csw/mgar/pkg/file/trunk Message-ID: Revision: 13549 http://gar.svn.sourceforge.net/gar/?rev=13549&view=rev Author: wahwah Date: 2011-03-03 23:33:30 +0000 (Thu, 03 Mar 2011) Log Message: ----------- gfile: Remove surplus output from libmagic Not sure why the printf is there at all. Commenting it out won't change the functionality of libmagic. Modified Paths: -------------- csw/mgar/pkg/file/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/file/trunk/files/0001-Remove-surplus-flags-output-on-SPARC.patch Modified: csw/mgar/pkg/file/trunk/Makefile =================================================================== --- csw/mgar/pkg/file/trunk/Makefile 2011-03-03 20:56:58 UTC (rev 13548) +++ csw/mgar/pkg/file/trunk/Makefile 2011-03-03 23:33:30 UTC (rev 13549) @@ -20,6 +20,7 @@ # These flags are not understood by Sun Studio CONFIGURE_ARGS += --disable-warnings TEST_TARGET = check +PATCHFILES += 0001-Remove-surplus-flags-output-on-SPARC.patch NOISAEXEC = 1 Added: csw/mgar/pkg/file/trunk/files/0001-Remove-surplus-flags-output-on-SPARC.patch =================================================================== --- csw/mgar/pkg/file/trunk/files/0001-Remove-surplus-flags-output-on-SPARC.patch (rev 0) +++ csw/mgar/pkg/file/trunk/files/0001-Remove-surplus-flags-output-on-SPARC.patch 2011-03-03 23:33:30 UTC (rev 13549) @@ -0,0 +1,27 @@ +From 9be2ae854b16feecf9aed9cf908faf30e33b0edf Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Fri, 4 Mar 2011 00:30:29 +0100 +Subject: [PATCH] Remove surplus "flags!" output on SPARC + +--- + src/apprentice.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/src/apprentice.c b/src/apprentice.c +index 49126ac..15d34de 100644 +--- a/src/apprentice.c ++++ b/src/apprentice.c +@@ -2461,8 +2461,10 @@ bs1(struct magic *m) + m->in_offset = swap4((uint32_t)m->in_offset); + m->lineno = swap4((uint32_t)m->lineno); + if (IS_STRING(m->type)) { ++ /* This printf causes surplus output on sparc machines. + if (m->type == FILE_PSTRING) + printf("flags! %d\n", m->str_flags); ++ */ + m->str_range = swap4(m->str_range); + m->str_flags = swap4(m->str_flags); + } +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Mar 4 02:35:32 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 04 Mar 2011 01:35:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[13550] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13550 http://gar.svn.sourceforge.net/gar/?rev=13550&view=rev Author: bdwalton Date: 2011-03-04 01:35:32 +0000 (Fri, 04 Mar 2011) Log Message: ----------- ruby18/trunk: do the package renaming for the new standards and the dublin goals Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-03 23:33:30 UTC (rev 13549) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-04 01:35:32 UTC (rev 13550) @@ -1,4 +1,4 @@ -NAME = ruby +NAME = ruby18 DISTVERSION = 1.8.7 PATCHLEVEL = p334 VERSION = $(DISTVERSION) @@ -10,27 +10,27 @@ BUILD_DEP_PKGS = CSWbdb48devel CSWlibgdbm3 CSWcoreutils CSWiconv CSWncurses BUILD_DEP_PKGS += CSWreadline CSWzlib CSWossldevel -PACKAGES = CSWruby CSWrubydoc CSWrubytk CSWrubydev CSWrubymode CSWrubymode-el -PACKAGES += CSWlibruby1 +PACKAGES = CSWruby18 CSWruby18-doc CSWruby18-tk CSWruby18-dev CSWruby18-mode +PACKAGES += CSWruby18-mode-el CSWlibruby1 -ARCHALL_CSWrubydoc = 1 -ARCHALL_CSWrubymode = 1 -ARCHALL_CSWrubymode-el = 1 +ARCHALL_CSWruby18-doc = 1 +ARCHALL_CSWruby18-mode = 1 +ARCHALL_CSWruby18-mode-el = 1 LICENSE = COPYING -RUNTIME_DEP_PKGS_CSWruby = CSWbdb48 CSWlibgdbm3 CSWiconv CSWlibruby1 -RUNTIME_DEP_PKGS_CSWruby += CSWncurses CSWosslrt CSWreadline CSWzlib +RUNTIME_DEP_PKGS_CSWruby18 = CSWbdb48 CSWlibgdbm3 CSWiconv CSWlibruby1 +RUNTIME_DEP_PKGS_CSWruby18 += CSWncurses CSWosslrt CSWreadline CSWzlib -RUNTIME_DEP_PKGS_CSWrubydoc = CSWruby +RUNTIME_DEP_PKGS_CSWruby18-doc = CSWruby18 -RUNTIME_DEP_PKGS_CSWrubytk = CSWruby CSWtk CSWtcl CSWlibruby1 +RUNTIME_DEP_PKGS_CSWruby18-tk = CSWruby18 CSWtk CSWtcl CSWlibruby1 -RUNTIME_DEP_PKGS_CSWrubydev = CSWruby CSWlibruby1 CSWcoreutils +RUNTIME_DEP_PKGS_CSWruby18-dev = CSWruby18 CSWlibruby1 CSWcoreutils -RUNTIME_DEP_PKGS_CSWrubymode = CSWemacscommon +RUNTIME_DEP_PKGS_CSWruby18-mode = CSWemacscommon -RUNTIME_DEP_PKGS_CSWrubymode-el = CSWemacscommon +RUNTIME_DEP_PKGS_CSWruby18-mode-el = CSWemacscommon DESCRIPTION = An object-oriented language for quick and easy programming. define BLURB @@ -43,35 +43,35 @@ closures. endef -SPKG_DESC_CSWruby = $(DESCRIPTION) +SPKG_DESC_CSWruby18 = $(DESCRIPTION) -SPKG_DESC_CSWlibruby1 = The libruby.so.1* files +SPKG_DESC_CSWlibruby1 = The libruby.so.1* files (Ruby 1.8) -SPKG_DESC_CSWrubydoc = Documentation for Ruby +SPKG_DESC_CSWruby18-doc = Documentation for Ruby 1.8 -SPKG_DESC_CSWrubytk = Ruby Tcl/TK Extension +SPKG_DESC_CSWruby18-tk = Ruby 1.8 Tcl/TK Extension -SPKG_DESC_CSWrubydev = Ruby Extension Development Files +SPKG_DESC_CSWruby18-dev = Ruby 1.8 Extension Development Files -SPKG_DESC_CSWrubymode = Ruby major mode for Emacs +SPKG_DESC_CSWruby18-mode = Ruby 1.8 major mode for Emacs -SPKG_DESC_CSWrubymode-el = Elisp source for ruby mode +SPKG_DESC_CSWruby18-mode-el = Elisp source for ruby mode (Ruby 1.8) -PKGFILES_CSWrubydoc = $(datadir)/ri/.* $(docdir)/ruby/sample.* +PKGFILES_CSWruby18-doc = $(datadir)/ri/.* $(docdir)/ruby/sample.* -PKGFILES_CSWrubytk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb +PKGFILES_CSWruby18-tk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb -PKGFILES_CSWrubydev = $(libdir)/.*\.h $(libdir)/.*/mkmf.rb $(libdir)/.*static.a -PKGFILES_CSWrubydev += /opt/csw/lib/libruby.so +PKGFILES_CSWruby18-dev = $(libdir)/.*\.h $(libdir)/.*/mkmf.rb $(libdir)/.*static.a +PKGFILES_CSWruby18-dev += /opt/csw/lib/libruby.so -PKGFILES_CSWrubymode = $(datadir)/emacs/site-lisp/.*elc$ +PKGFILES_CSWruby18-mode = $(datadir)/emacs/site-lisp/.*elc$ -PKGFILES_CSWrubymode-el = $(datadir)/emacs/site-lisp/.*el$ +PKGFILES_CSWruby18-mode-el = $(datadir)/emacs/site-lisp/.*el$ PKGFILES_CSWlibruby1 += /opt/csw/lib/libruby.so.1 PKGFILES_CSWlibruby1 += /opt/csw/lib/libruby.so.1.* -OBSOLETES_CSWrubymode-el = CSWrubymodeel +OBSOLETES_CSWruby18-mode-el = CSWrubymodeel MASTER_SITES = ftp://ftp.ruby-lang.org/pub/ruby/ MASTER_SITES += ftp://www.ibiblio.org/pub/languages/ruby/ @@ -80,7 +80,7 @@ # software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*)-p(\d+).tar.bz2 -DISTFILES = $(NAME)-$(DISTVERSION)-$(PATCHLEVEL).tar.bz2 +DISTFILES = ruby-$(DISTVERSION)-$(PATCHLEVEL).tar.bz2 DISTFILES += CSWruby.cswreleasenotes DISTFILES += CSWrubydoc.cswreleasenotes CSWrubytk.cswreleasenotes @@ -106,7 +106,7 @@ INSTALL_ARGS = install -DISTNAME = $(NAME)-$(VERSION)-$(PATCHLEVEL) +DISTNAME = ruby-$(VERSION)-$(PATCHLEVEL) # We want libruby-static.a to ship. mkmf tests for various things using it. MERGE_EXCLUDE_STATICLIBS = 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 Mar 4 02:41:04 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 04 Mar 2011 01:41:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[13551] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 13551 http://gar.svn.sourceforge.net/gar/?rev=13551&view=rev Author: rthurner Date: 2011-03-04 01:41:04 +0000 (Fri, 04 Mar 2011) Log Message: ----------- mercurial: upgrade to hg-1.8 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 2011-03-04 01:35:32 UTC (rev 13550) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2011-03-04 01:41:04 UTC (rev 13551) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 1.7.5 +VERSION = 1.8 CATEGORIES = python DESCRIPTION = Fast, lightweight Source Control Management system Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2011-03-04 01:35:32 UTC (rev 13550) +++ csw/mgar/pkg/mercurial/trunk/checksums 2011-03-04 01:41:04 UTC (rev 13551) @@ -1 +1 @@ -269e924b3770535cf72049db01c35afa mercurial-1.7.5.tar.gz +c97b39832f2da60f951d1b7701688bd2 mercurial-1.8.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Mar 4 02:41:30 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 04 Mar 2011 01:41:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[13552] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13552 http://gar.svn.sourceforge.net/gar/?rev=13552&view=rev Author: bdwalton Date: 2011-03-04 01:41:29 +0000 (Fri, 04 Mar 2011) Log Message: ----------- ruby18/trunk: add obsoletes for all old package names Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-04 01:41:04 UTC (rev 13551) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-04 01:41:29 UTC (rev 13552) @@ -13,6 +13,13 @@ PACKAGES = CSWruby18 CSWruby18-doc CSWruby18-tk CSWruby18-dev CSWruby18-mode PACKAGES += CSWruby18-mode-el CSWlibruby1 +OBSOLETES_CSWruby18 = CSWruby +OBSOLETES_CSWruby18-doc = CSWrubydoc +OBSOLETES_CSWruby18-tk = CSWrubytk +OBSOLETES_CSWruby18-dev = CSWrubydev +OBSOLETES_CSWruby18-mode = CSWrubymode +OBSOLETES_CSWruby18-mode-el = CSWrubymodeel + ARCHALL_CSWruby18-doc = 1 ARCHALL_CSWruby18-mode = 1 ARCHALL_CSWruby18-mode-el = 1 @@ -71,8 +78,6 @@ PKGFILES_CSWlibruby1 += /opt/csw/lib/libruby.so.1 PKGFILES_CSWlibruby1 += /opt/csw/lib/libruby.so.1.* -OBSOLETES_CSWruby18-mode-el = CSWrubymodeel - MASTER_SITES = ftp://ftp.ruby-lang.org/pub/ruby/ MASTER_SITES += ftp://www.ibiblio.org/pub/languages/ruby/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Mar 4 03:54:40 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 04 Mar 2011 02:54:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[13553] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 13553 http://gar.svn.sourceforge.net/gar/?rev=13553&view=rev Author: bdwalton Date: 2011-03-04 02:54:40 +0000 (Fri, 04 Mar 2011) Log Message: ----------- .buildsys/v2: fix string cutting glitch in obsolete package description creation (no more word boundaries...) Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-03-04 01:41:29 UTC (rev 13552) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-03-04 02:54:40 UTC (rev 13553) @@ -57,8 +57,9 @@ define obsoleted_pkg CATALOGNAME_$(1) = $(call catalogname,$(1)) -# The length of the description has been limited to 100 characters, the string is cut only on word boundaries -SPKG_DESC_$(1) ?= $(shell echo Transitional package as contents moved to $(foreach P,$(PACKAGES),$(if $(filter $(1),$(OBSOLETES_$P)),$P)) | perl -npe 's/^(.{0,96})\s.+/$$1 .../') +# The length of the description has been limited to 100 characters, +# the string is cut (no longer on word boundaries). +SPKG_DESC_$(1) ?= $(shell echo Transitional package. Content moved to $(foreach P,$(PACKAGES),$(if $(filter $(1),$(OBSOLETES_$P)),$P)) | perl -npe 's/^(.{100}).+/substr($$1,0,-4) . " ..."/') RUNTIME_DEP_PKGS_$(1) = $(foreach P,$(PACKAGES),$(if $(filter $(1),$(OBSOLETES_$P)),$P)) PKGFILES_$(1) = NOFILES ARCHALL_$(1) = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Mar 4 04:13:25 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 04 Mar 2011 03:13:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[13554] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13554 http://gar.svn.sourceforge.net/gar/?rev=13554&view=rev Author: bdwalton Date: 2011-03-04 03:13:25 +0000 (Fri, 04 Mar 2011) Log Message: ----------- ruby18/trunk: update checkpkg overrides to reflect renamed packages Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-04 02:54:40 UTC (rev 13553) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-04 03:13:25 UTC (rev 13554) @@ -129,18 +129,18 @@ SOS12_LD_FLAGS = endif -CHECKPKG_OVERRIDES_CSWrubydoc += missing-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWrubydoc += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWruby18-doc += missing-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWruby18-doc += missing-dependency|CSWpython # usr/local overrides -CHECKPKG_OVERRIDES_CSWruby += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.8/fileutils.rb -CHECKPKG_OVERRIDES_CSWruby += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/ruby.1 -CHECKPKG_OVERRIDES_CSWruby += file-with-bad-content|/usr/local|root/opt/csw/bin/ri -CHECKPKG_OVERRIDES_CSWrubydoc += file-with-bad-content +CHECKPKG_OVERRIDES_CSWruby18 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.8/fileutils.rb +CHECKPKG_OVERRIDES_CSWruby18 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/ruby.1 +CHECKPKG_OVERRIDES_CSWruby18 += file-with-bad-content|/usr/local|root/opt/csw/bin/ri +CHECKPKG_OVERRIDES_CSWruby18-doc += file-with-bad-content -CHECKPKG_OVERRIDES_CSWrubytk += file-with-bad-content|/usr/share|root/opt/csw/lib/ruby/1.8/tk/dialog.rb -CHECKPKG_OVERRIDES_CSWrubytk += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.8/tkextlib/itcl/setup.rb -CHECKPKG_OVERRIDES_CSWrubytk += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.8/tkextlib/itk/setup.rb +CHECKPKG_OVERRIDES_CSWruby18-tk += file-with-bad-content|/usr/share|root/opt/csw/lib/ruby/1.8/tk/dialog.rb +CHECKPKG_OVERRIDES_CSWruby18-tk += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.8/tkextlib/itcl/setup.rb +CHECKPKG_OVERRIDES_CSWruby18-tk += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.8/tkextlib/itk/setup.rb 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 Fri Mar 4 04:22:46 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 04 Mar 2011 03:22:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[13555] csw/mgar/pkg/apache2/branches/open-bug-squash/ Makefile Message-ID: Revision: 13555 http://gar.svn.sourceforge.net/gar/?rev=13555&view=rev Author: bdwalton Date: 2011-03-04 03:22:46 +0000 (Fri, 04 Mar 2011) Log Message: ----------- apache2/branches/open-bug-squash: make package and catalog names line up for ap2 packages Modified Paths: -------------- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-04 03:13:25 UTC (rev 13554) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-04 03:22:46 UTC (rev 13555) @@ -55,11 +55,11 @@ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz # The PACKAGES variable tell GAR which packages to build -PACKAGES = CSWapache2 CSWapache2-devel CSWapache2-manual CSWap2suexec -PACKAGES += CSWap2worker +PACKAGES = CSWapache2 CSWapache2-devel CSWapache2-manual CSWap2-suexec +PACKAGES += CSWap2-worker # These packages are dummy versions to make dependencies nicer # as various things depend on CSWap2prefork currently -PACKAGES += CSWap2prefork CSWapache2rt +PACKAGES += CSWap2-prefork CSWapache2rt ARCHALL_CSWapache2-manual = 1 ARCHALL_CSWap2prefork = 1 @@ -78,9 +78,9 @@ SPKG_DESC_CSWapache2 = A high performance Unix-based HTTP server. SPKG_DESC_CSWapache2-devel = The development files for Apache2. SPKG_DESC_CSWapache2-manual = The Apache2 manual files. -SPKG_DESC_CSWap2suexec = The standard suEXEC binary for Apache2. -SPKG_DESC_CSWap2worker = The apache worker mpm. -SPKG_DESC_CSWap2prefork = A stub for the old prefork mpm package. +SPKG_DESC_CSWap2-suexec = The standard suEXEC binary for Apache2. +SPKG_DESC_CSWap2-worker = The apache worker mpm. +SPKG_DESC_CSWap2-prefork = A stub for the old prefork mpm package. SPKG_DESC_CSWapache2rt = A stub for the old apache2rt package. RUNTIME_DEP_PKGS_CSWapache2 += CSWexpat CSWiconv CSWosslutils @@ -88,17 +88,17 @@ RUNTIME_DEP_PKGS_CSWapache2 += CSWapr CSWapr-util CSWbdb48 RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2 RUNTIME_DEP_PKGS_CSWapache2-devel = CSWapache2 -RUNTIME_DEP_PKGS_CSWap2suexec = CSWapache2 -RUNTIME_DEP_PKGS_CSWap2prefork = CSWapache2 -RUNTIME_DEP_PKGS_CSWap2worker = CSWapache2 CSWapr CSWexpat CSWap2prefork -RUNTIME_DEP_PKGS_CSWap2worker += CSWbdb48 CSWapr-util CSWiconv +RUNTIME_DEP_PKGS_CSWap2-suexec = CSWapache2 +RUNTIME_DEP_PKGS_CSWap2-prefork = CSWapache2 +RUNTIME_DEP_PKGS_CSWap2-worker = CSWapache2 CSWapr CSWexpat CSWap2-prefork +RUNTIME_DEP_PKGS_CSWap2-worker += CSWbdb48 CSWapr-util CSWiconv RUNTIME_DEP_PKGS_CSWapache2rt = CSWapache2 CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWalternatives CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWosslutils -CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2 -CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWalternatives -CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWap2prefork +CHECKPKG_OVERRIDES_CSWap2-prefork += surplus-dependency|CSWapache2 +CHECKPKG_OVERRIDES_CSWap2-worker += surplus-dependency|CSWalternatives +CHECKPKG_OVERRIDES_CSWap2-worker += surplus-dependency|CSWap2prefork CHECKPKG_OVERRIDES_CSWapache2rt += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWapache2-devel += file-with-bad-content|/usr/local|root/opt/csw/apache2/include/httpd.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Mar 4 04:24:20 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 04 Mar 2011 03:24:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[13556] csw/mgar/pkg/apache2/branches/open-bug-squash/ Makefile Message-ID: Revision: 13556 http://gar.svn.sourceforge.net/gar/?rev=13556&view=rev Author: bdwalton Date: 2011-03-04 03:24:20 +0000 (Fri, 04 Mar 2011) Log Message: ----------- apache2/branches/open-bug-squash: add obsoletes definitions to help with the renaming Modified Paths: -------------- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-04 03:22:46 UTC (rev 13555) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-04 03:24:20 UTC (rev 13556) @@ -61,6 +61,10 @@ # as various things depend on CSWap2prefork currently PACKAGES += CSWap2-prefork CSWapache2rt +OBSOLETES_CSWap2-suexec = CSWap2suexec +OBSOLETES_CSWap2-prefork = CSWap2prefork +OBSOLETES_CSWap2-worker = CSWap2worker + ARCHALL_CSWapache2-manual = 1 ARCHALL_CSWap2prefork = 1 ARCHALL_CSWapache2rt = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Mar 4 04:26:50 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 04 Mar 2011 03:26:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[13557] csw/mgar/pkg/apache2/branches/open-bug-squash Message-ID: Revision: 13557 http://gar.svn.sourceforge.net/gar/?rev=13557&view=rev Author: bdwalton Date: 2011-03-04 03:26:49 +0000 (Fri, 04 Mar 2011) Log Message: ----------- apache2/branches/open-bug-squash: rename scripts and correct a few more items due to the renaming Modified Paths: -------------- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile Added Paths: ----------- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postinstall csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postremove csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.preinstall Removed Paths: ------------- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postinstall csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postremove csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.preinstall Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-04 03:24:20 UTC (rev 13556) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-04 03:26:49 UTC (rev 13557) @@ -38,8 +38,8 @@ DISTFILES += CSWapache2.killproc cswapache2 DISTFILES += CSWapache2.preinstall CSWapache2.postinstall -DISTFILES += CSWap2worker.postinstall CSWap2worker.postremove -DISTFILES += CSWap2worker.preinstall +DISTFILES += CSWap2-worker.postinstall CSWap2worker.postremove +DISTFILES += CSWap2-worker.preinstall DISTFILES += CSWapache2-devel.cswreleasenotes @@ -66,7 +66,7 @@ OBSOLETES_CSWap2-worker = CSWap2worker ARCHALL_CSWapache2-manual = 1 -ARCHALL_CSWap2prefork = 1 +ARCHALL_CSWap2-prefork = 1 ARCHALL_CSWapache2rt = 1 OBSOLETES_CSWapache2 = CSWapache2c Copied: csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postinstall (from rev 13546, csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postinstall) =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postinstall (rev 0) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postinstall 2011-03-04 03:26:49 UTC (rev 13557) @@ -0,0 +1,41 @@ +#!/bin/sh + + # Source csw.conf, if it exists +if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then + . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf +fi +if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then + . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf +fi + +# Determine if service should be started or not +daemon=yes +if [ "$autoenable_daemons" = "no" ]; then + daemon=no +fi + +if [ "$autoenable_cswapache2" = "no" ]; then + + daemon=no +elif [ "$autoenable_cswapache2" = "yes" ]; then + daemon=yes +fi + +if [ "$daemon" = "yes" ]; then + # Determine if SMF should be used or not + smf=no + + if [ "$use_smf" = "no" ]; then + smf=no + else + if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ]; then + smf=yes + fi + fi + + if [ "$smf" = "yes" ]; then + svcadm restart cswapache2 + else + /etc/init.d/cswapache2 restart + fi +fi Copied: csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postremove (from rev 13546, csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postremove) =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postremove (rev 0) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postremove 2011-03-04 03:26:49 UTC (rev 13557) @@ -0,0 +1,30 @@ +#!/bin/sh + +# Source csw.conf, if it exists +if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then + . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf +fi +if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then + . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf +fi + +# On removal of the worker mpm, restart apache to use the prefork (default) +# mpm...only if it's currently running though +if [ -n "`pgrep -f apache2/sbin/httpd`" ]; then + # Determine if SMF should be used or not + smf=no + + if [ "$use_smf" = "no" ]; then + smf=no + else + if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ]; then + smf=yes + fi + fi + + if [ "$smf" = "yes" ]; then + svcadm restart cswapache2 + else + /etc/init.d/cswapache2 restart + fi +fi Copied: csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.preinstall (from rev 13546, csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.preinstall) =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.preinstall (rev 0) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.preinstall 2011-03-04 03:26:49 UTC (rev 13557) @@ -0,0 +1,15 @@ +#!/bin/sh + +# The old apache2 packages could potentially leave a dangling +# sbin/httpd file. As this would prevent successful delivery of the +# new packages (alternatives won't instantiate sbin/httpd as a symlink +# since it exists already), we need to kill sbin/httpd if it exists +# when CSWapache2 is installed. + +HTTPD=$PKG_INSTALL_ROOT/opt/csw/apache2/sbin/httpd + +if [ -f "$HTTPD" -a ! -L "$HTTPD" ]; then + rm -f "$HTTPD" +fi + +exit 0 Deleted: csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postinstall =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postinstall 2011-03-04 03:24:20 UTC (rev 13556) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postinstall 2011-03-04 03:26:49 UTC (rev 13557) @@ -1,41 +0,0 @@ -#!/bin/sh - - # Source csw.conf, if it exists -if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then - . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf -fi -if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then - . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf -fi - -# Determine if service should be started or not -daemon=yes -if [ "$autoenable_daemons" = "no" ]; then - daemon=no -fi - -if [ "$autoenable_cswapache2" = "no" ]; then - - daemon=no -elif [ "$autoenable_cswapache2" = "yes" ]; then - daemon=yes -fi - -if [ "$daemon" = "yes" ]; then - # Determine if SMF should be used or not - smf=no - - if [ "$use_smf" = "no" ]; then - smf=no - else - if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ]; then - smf=yes - fi - fi - - if [ "$smf" = "yes" ]; then - svcadm restart cswapache2 - else - /etc/init.d/cswapache2 restart - fi -fi Deleted: csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postremove =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postremove 2011-03-04 03:24:20 UTC (rev 13556) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postremove 2011-03-04 03:26:49 UTC (rev 13557) @@ -1,30 +0,0 @@ -#!/bin/sh - -# Source csw.conf, if it exists -if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then - . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf -fi -if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then - . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf -fi - -# On removal of the worker mpm, restart apache to use the prefork (default) -# mpm...only if it's currently running though -if [ -n "`pgrep -f apache2/sbin/httpd`" ]; then - # Determine if SMF should be used or not - smf=no - - if [ "$use_smf" = "no" ]; then - smf=no - else - if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ]; then - smf=yes - fi - fi - - if [ "$smf" = "yes" ]; then - svcadm restart cswapache2 - else - /etc/init.d/cswapache2 restart - fi -fi Deleted: csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.preinstall =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.preinstall 2011-03-04 03:24:20 UTC (rev 13556) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.preinstall 2011-03-04 03:26:49 UTC (rev 13557) @@ -1,15 +0,0 @@ -#!/bin/sh - -# The old apache2 packages could potentially leave a dangling -# sbin/httpd file. As this would prevent successful delivery of the -# new packages (alternatives won't instantiate sbin/httpd as a symlink -# since it exists already), we need to kill sbin/httpd if it exists -# when CSWapache2 is installed. - -HTTPD=$PKG_INSTALL_ROOT/opt/csw/apache2/sbin/httpd - -if [ -f "$HTTPD" -a ! -L "$HTTPD" ]; then - rm -f "$HTTPD" -fi - -exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Mar 4 04:33:42 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 04 Mar 2011 03:33:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[13558] csw/mgar/pkg/apache2/branches/open-bug-squash/ Makefile Message-ID: Revision: 13558 http://gar.svn.sourceforge.net/gar/?rev=13558&view=rev Author: bdwalton Date: 2011-03-04 03:33:41 +0000 (Fri, 04 Mar 2011) Log Message: ----------- apache2/branches/open-bug-squash: correct a missed DISTFILES after the renaming Modified Paths: -------------- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-04 03:26:49 UTC (rev 13557) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-04 03:33:41 UTC (rev 13558) @@ -38,7 +38,7 @@ DISTFILES += CSWapache2.killproc cswapache2 DISTFILES += CSWapache2.preinstall CSWapache2.postinstall -DISTFILES += CSWap2-worker.postinstall CSWap2worker.postremove +DISTFILES += CSWap2-worker.postinstall CSWap2-worker.postremove DISTFILES += CSWap2-worker.preinstall DISTFILES += CSWapache2-devel.cswreleasenotes This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Mar 4 04:53:19 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 04 Mar 2011 03:53:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[13559] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13559 http://gar.svn.sourceforge.net/gar/?rev=13559&view=rev Author: bdwalton Date: 2011-03-04 03:53:19 +0000 (Fri, 04 Mar 2011) Log Message: ----------- ruby18/trunk: add some transitional overrides Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-04 03:33:41 UTC (rev 13558) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-04 03:53:19 UTC (rev 13559) @@ -129,6 +129,19 @@ SOS12_LD_FLAGS = endif +# Transitional overrides. Once the packages with 18 in the names are +# released, these can be removed...oh and checkpkg will need a tweak too +CHECKPKG_OVERRIDES_CSWruby18-doc += missing-dependency|CSWruby +CHECKPKG_OVERRIDES_CSWruby18-doc += surplus-dependency|CSWruby18 +CHECKPKG_OVERRIDES_CSWruby18-dev += missing-dependency|CSWruby +CHECKPKG_OVERRIDES_CSWruby18-dev += surplus-dependency|CSWcoreutils +CHECKPKG_OVERRIDES_CSWruby18-dev += surplus-dependency|CSWruby18 +CHECKPKG_OVERRIDES_CSWruby18-tk += missing-dependency|CSWruby +CHECKPKG_OVERRIDES_CSWruby18-tk += surplus-dependency|CSWruby18 +CHECKPKG_OVERRIDES_CSWruby18 += missing-dependency|CSWruby +CHECKPKG_OVERRIDES_CSWrubydev += archall-devel-package +# End of transitional overrides. + CHECKPKG_OVERRIDES_CSWruby18-doc += missing-dependency|CSWperl CHECKPKG_OVERRIDES_CSWruby18-doc += missing-dependency|CSWpython This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Mar 4 16:26:10 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 04 Mar 2011 15:26:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[13560] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13560 http://gar.svn.sourceforge.net/gar/?rev=13560&view=rev Author: bdwalton Date: 2011-03-04 15:26:09 +0000 (Fri, 04 Mar 2011) Log Message: ----------- ruby18/trunk: make the things in bin use the 18 suffix without affecting the whole build Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-04 03:53:19 UTC (rev 13559) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-04 15:26:09 UTC (rev 13560) @@ -161,7 +161,7 @@ RBCONFIG = /opt/csw/lib/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb -PI_TARGETS = samples rbconfig rbscripts rubymode +PI_TARGETS = samples rbconfig rbscripts rubymode suffixbins ifndef USEGCC PI_TARGETS += multiconfig endif @@ -169,6 +169,10 @@ post-install-modulated: $(PI_TARGETS) @$(MAKECOOKIE) +suffixbins: + @echo "Making binaries use 18 suffix" + @(cd $(DESTDIR)$(bindir); for f in *; do mv $$f $${f}18; done) + multiconfig: @echo "Setting up the CSW rbconfig stuff so we can switch between compilers" @mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).SOS12 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Mar 4 16:32:52 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 04 Mar 2011 15:32:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[13561] csw/mgar/pkg/apache2/branches/open-bug-squash/ Makefile Message-ID: Revision: 13561 http://gar.svn.sourceforge.net/gar/?rev=13561&view=rev Author: bdwalton Date: 2011-03-04 15:32:52 +0000 (Fri, 04 Mar 2011) Log Message: ----------- apache2/branches/open-bug-squash: more corrections for the renaming Modified Paths: -------------- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-04 15:26:09 UTC (rev 13560) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-04 15:32:52 UTC (rev 13561) @@ -102,7 +102,7 @@ CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWosslutils CHECKPKG_OVERRIDES_CSWap2-prefork += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWap2-worker += surplus-dependency|CSWalternatives -CHECKPKG_OVERRIDES_CSWap2-worker += surplus-dependency|CSWap2prefork +CHECKPKG_OVERRIDES_CSWap2-worker += surplus-dependency|CSWap2-prefork CHECKPKG_OVERRIDES_CSWapache2rt += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWapache2-devel += file-with-bad-content|/usr/local|root/opt/csw/apache2/include/httpd.h @@ -206,12 +206,12 @@ LIBTOOL_LADIR = $(APACHE_ROOT)/lib STRIP_DIRS = $(APACHE_ROOT)/sbin $(APACHE_ROOT)/libexec -PKGFILES_CSWap2suexec = .*sbin/suexec .*libexec/.*suexec.* .*/man/.*suexec.* -PKGFILES_CSWap2suexec += .*ap2mod/suexec +PKGFILES_CSWap2-suexec = .*sbin/suexec .*libexec/.*suexec.* .*/man/.*suexec.* +PKGFILES_CSWap2-suexec += .*ap2mod/suexec PKGFILES_CSWapache2-devel = .*include/.* .*\.(a|la) PKGFILES_CSWapache2-manual = .*share/.*manual.* .*etc/extra/httpd-manual.conf -PKGFILES_CSWap2prefork = .*share/doc/ap2_prefork.* -PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker +PKGFILES_CSWap2-prefork = .*share/doc/ap2_prefork.* +PKGFILES_CSWap2-worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker PKGFILES_CSWapache2rt = .*share/doc/apache2rt.* #PROTOTYPE_FILTER = awk '$$$$3 == "/opt/csw/apache2/sbin/suexec" { $$$$4 = "4755" }; $$$$3 ~ /cswap2mod/ { $$$$4 = "0555" }; { 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 Fri Mar 4 17:10:39 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 04 Mar 2011 16:10:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[13562] csw/mgar/pkg/apache2/branches/open-bug-squash/ Makefile Message-ID: Revision: 13562 http://gar.svn.sourceforge.net/gar/?rev=13562&view=rev Author: bdwalton Date: 2011-03-04 16:10:38 +0000 (Fri, 04 Mar 2011) Log Message: ----------- apache2/branches/open-bug-squash: drop an override that is no longer required Modified Paths: -------------- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-04 15:32:52 UTC (rev 13561) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-04 16:10:38 UTC (rev 13562) @@ -101,7 +101,6 @@ CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWalternatives CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWosslutils CHECKPKG_OVERRIDES_CSWap2-prefork += surplus-dependency|CSWapache2 -CHECKPKG_OVERRIDES_CSWap2-worker += surplus-dependency|CSWalternatives CHECKPKG_OVERRIDES_CSWap2-worker += surplus-dependency|CSWap2-prefork CHECKPKG_OVERRIDES_CSWapache2rt += surplus-dependency|CSWapache2 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 Mar 4 22:12:46 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Mar 2011 21:12:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[13563] csw/mgar/pkg/libidn/trunk Message-ID: Revision: 13563 http://gar.svn.sourceforge.net/gar/?rev=13563&view=rev Author: dmichelsen Date: 2011-03-04 21:12:46 +0000 (Fri, 04 Mar 2011) Log Message: ----------- libidn: Update to 1.20, split package and generally sanitize 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 2011-03-04 16:10:38 UTC (rev 13562) +++ csw/mgar/pkg/libidn/trunk/Makefile 2011-03-04 21:12:46 UTC (rev 13563) @@ -1,5 +1,5 @@ NAME = libidn -VERSION = 1.19 +VERSION = 1.20 CATEGORIES = lib DESCRIPTION = GNU IDN Library @@ -14,12 +14,33 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz -SPKG_SOURCEURL = http://www.gnu.org/software/libidn/ +VENDOR_URL = http://www.gnu.org/software/libidn/ -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES += CSWlibidn11 +CATALOGNAME_CSWlibidn11 = libidn11 +SPKG_DESC_CSWlibidn11 = GNU IDN library, libidn.so.11 +PKGFILES_CSWlibidn11 += $(call baseisadirs,$(libdir),libidn\.so\.11(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibidn11 += CSWggettextrt +RUNTIME_DEP_PKGS_CSWlibidn11 += CSWiconv -RUNTIME_DEP_PKGS = CSWggettextrt CSWiconv +PACKAGES += CSWlibidn-dev +CATALOGNAME_CSWlibidn-dev = libidn_dev +SPKG_DESC_CSWlibidn-dev = GNU IDN development files +PKGFILES_CSWlibidn-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibidn-dev += $(sharedstatedir)/emacs/.* +PKGFILES_CSWlibidn-dev += $(infodir)/.* +RUNTIME_DEP_PKGS_CSWlibidn-dev += CSWlibidn11 +CHECKPKG_OVERRIDES_CSWlibidn-dev += missing-dependency|CSWemacscommon +PACKAGES += CSWlibidn-utils +CATALOGNAME_CSWlibidn-utils = libidn_utils +SPKG_DESC_CSWlibidn-utils = GNU IDN utilities +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibidn-utils += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWlibidn-utils += CSWggettextrt +RUNTIME_DEP_PKGS_CSWlibidn-utils += CSWiconv +OBSOLETES_CSWlibidn-utils = CSWlibidn + BUILD64 = 1 NOISAEXEC = 1 @@ -31,6 +52,14 @@ TEST_TARGET = check +# One test for GNULib in 32 bit is failing, disable for now +SKIPTEST ?= 1 + +# What's this? Windows DLLs? How do they end up in the Solaris build? +EXTRA_MERGE_EXCLUDE_FILES = .*\.dll + +MERGE_DIRS_isa-extra = $(libdir) + CHECKPKG_OVERRIDES_CSWlibidn += missing-dependency|CSWemacscommon include gar/category.mk Modified: csw/mgar/pkg/libidn/trunk/checksums =================================================================== --- csw/mgar/pkg/libidn/trunk/checksums 2011-03-04 16:10:38 UTC (rev 13562) +++ csw/mgar/pkg/libidn/trunk/checksums 2011-03-04 21:12:46 UTC (rev 13563) @@ -1 +1 @@ -a45142126d28162014c995f969bdb5a8 libidn-1.19.tar.gz +03996d474a696e59fdddbee87fc9519c libidn-1.20.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 Mar 4 22:28:22 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Mar 2011 21:28:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[13564] csw/mgar/pkg/id3lib/trunk/Makefile Message-ID: Revision: 13564 http://gar.svn.sourceforge.net/gar/?rev=13564&view=rev Author: dmichelsen Date: 2011-03-04 21:28:22 +0000 (Fri, 04 Mar 2011) Log Message: ----------- id3lib: Ensure library is self-sufficient Modified Paths: -------------- csw/mgar/pkg/id3lib/trunk/Makefile Modified: csw/mgar/pkg/id3lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/id3lib/trunk/Makefile 2011-03-04 21:12:46 UTC (rev 13563) +++ csw/mgar/pkg/id3lib/trunk/Makefile 2011-03-04 21:28:22 UTC (rev 13564) @@ -18,6 +18,7 @@ CATALOGNAME_CSWlibid3-3-8-3 = libid3_3_8_3 SPKG_DESC_CSWlibid3-3-8-3 = Library for manipulating ID3v1/v1.1 and ID3v2 tags, libid3-3.8.so.3 PKGFILES_CSWlibid3-3-8-3 = $(call baseisadirs,$(libdir),libid3-3\.8\.so\.3(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibid3-3-8-3 += CSWzlib PACKAGES += CSWlibid3-dev CATALOGNAME_CSWlibid3-dev = libid3_dev @@ -37,6 +38,14 @@ EXTRA_LDFLAGS = -norunpath +# The following part is to make the library self-sufficient +# (that means a simple -lid3 is sufficient). +# We link with /usr/ccs/bin/ld which requires setting the path to libCstd.so, +# using CC as linker would have made this automatic. +SUBDIR64-sparc = v9 +SUBDIR64-i386 = amd64 +EXTRA_LINKER_FLAGS = -L$($(GARCOMPILER)_CC_HOME)/lib/$(SUBDIR$(MEMORYMODEL)-$(GARCH)) -lCstd -lz + BUILD64 = 1 NOISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 4 23:28:02 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Mar 2011 22:28:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[13565] csw/mgar/pkg Message-ID: Revision: 13565 http://gar.svn.sourceforge.net/gar/?rev=13565&view=rev Author: dmichelsen Date: 2011-03-04 22:28:02 +0000 (Fri, 04 Mar 2011) Log Message: ----------- libflac4: Initial creation Modified Paths: -------------- csw/mgar/pkg/libflac4/trunk/Makefile csw/mgar/pkg/libflac4/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libflac4/ Removed Paths: ------------- csw/mgar/pkg/libflac4/trunk/files/libtool-64bit.patch csw/mgar/pkg/libflac4/trunk/files/no-stdint.patch csw/mgar/pkg/libflac4/trunk/files/strip-nasm-1.1.2.patch csw/mgar/pkg/libflac4/trunk/files/strip-nasm-1.2.1.patch Modified: csw/mgar/pkg/libflac4/trunk/Makefile =================================================================== --- csw/mgar/pkg/flac/trunk/Makefile 2011-03-03 03:02:29 UTC (rev 13545) +++ csw/mgar/pkg/libflac4/trunk/Makefile 2011-03-04 22:28:02 UTC (rev 13565) @@ -1,18 +1,7 @@ NAME = libflac -VERSION = 1.2.1 +VERSION = 1.0.4 CATEGORIES = lib -EXTRA_MODULATORS = VERSION -# Version 1.1.2 is the last to contain libflac.so.7 where most of the binaries depend on -MODULATIONS_VERSION = 1.0.4 1.1.2 1.2.1 - -# There was no 64 bit legacy version. Do not provide it as new binaries should -# link against the new version. -SKIP_MODULATIONS = isa-sparcv9-garversion-1.0.4 -SKIP_MODULATIONS += isa-amd64-garversion-1.0.4 -SKIP_MODULATIONS += isa-sparcv9-garversion-1.1.2 -SKIP_MODULATIONS += isa-amd64-garversion-1.1.2 - DESCRIPTION = Free lossless audio codec define BLURB FLAC stands for Free Lossless Audio Codec, an audio format similar @@ -27,112 +16,45 @@ SF_PROJ = flac MASTER_SITES = $(SF_MIRRORS) DISTNAME = $(SF_PROJ)-$(VERSION) -SOURCEFILES = $(foreach VERSION,$(MODULATIONS_VERSION),$(SF_PROJ)-$(VERSION).tar.gz) -DISTFILES = $(SOURCEFILES) +DISTFILES = $(DISTNAME).tar.gz -NOEXTRACT = $(filter-out $(SF_PROJ)-$(VERSION).tar.gz,$(SOURCEFILES)) +PATCHFILES = strip-nasm-1.0.4.patch +BUILD_DEP_PKGS += CSWbash -PATCHFILES_isa-sparcv8-garversion-1.1.2 = libtool-64bit.patch -PATCHFILES_isa-sparcv9-garversion-1.1.2 = libtool-64bit.patch -PATCHFILES_isa-sparcv8-garversion-1.2.1 = libtool-64bit.patch no-stdint.patch -PATCHFILES_isa-sparcv9-garversion-1.2.1 = libtool-64bit.patch no-stdint.patch +PACKAGES += CSWlibflac4 +CATALOGNAME_CSWlibflac4 = libflac4 +SPKG_DESC_CSWlibflac4 = Free lossless audio codec library, libflac.so.4 +PKGFILES_CSWlibflac4 = $(call baseisadirs,$(libdir),libFLAC\.so\.4(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibflac4 += CSWiconv -PATCHFILES_isa-i386-garversion-1.0.4 = strip-nasm-1.0.4.patch -PATCHFILES_isa-i386-garversion-1.1.2 = strip-nasm-1.1.2.patch libtool-64bit.patch -PATCHFILES_isa-amd64-garversion-1.1.2 = libtool-64bit.patch -PATCHFILES_isa-i386-garversion-1.2.1 = strip-nasm-1.2.1.patch libtool-64bit.patch no-stdint.patch -PATCHFILES_isa-amd64-garversion-1.2.1 = strip-nasm-1.2.1.patch libtool-64bit.patch no-stdint.patch +# Override conflicts with CSWflac as the new CSWflac is built from the latest libflac +CHECKPKG_OVERRIDES_CSWlibflac4 += file-collision|/opt/csw/lib/libFLAC.so.4.0.1|CSWflac|CSWlibflac4 +CHECKPKG_OVERRIDES_CSWlibflac4 += file-collision|/opt/csw/lib/libFLAC.so.4|CSWflac|CSWlibflac4 -PACKAGES = CSWflac CSWxmmsflac -CATALOGNAME_CSWflac = libflac -CATALOGNAME_CSWxmmsflac = xmms_flac +VENDOR_URL = http://flac.sourceforge.net/ -BUILD_DEP_PKGS = CSWbash CSWnasm - -RUNTIME_DEP_PKGS_CSWflac = CSWiconv CSWlibogg -RUNTIME_DEP_PKGS_CSWxmmsflac = CSWglib CSWgtk CSWxmms CSWflac CSWiconv CSWlibogg - -SPKG_DESC_CSWflac = Free lossless audio codec -SPKG_DESC_CSWxmmsflac = FLAC plugin for XMMS - -SPKG_SOURCEURL = http://flac.sourceforge.net/ - LICENSE = $(foreach lic,FDL GPL LGPL Xiph,COPYING.$(lic)) -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=13478 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = flac-(\d+(?:\.\d+)*)-src +EXTRA_LINKER_FLAGS = -liconv -lm -BUILD64 = 1 - -# For 1.0.4 -EXTRA_LINKER_FLAGS = -liconv - -NODIRPATHS = --includedir +# Must be defined and empty or -I$(includedir) is added too early +# EXTRA_INC = ../../include CPPFLAGS = +EXTRA_CFLAGS = $(INCLUDE_FLAGS) -D__inline= -# Must be defined and empty or -I$(includedir) is added too early -EXTRA_CFLAGS = -D__inline= -EXTRA_BUILD_EXPORTS = AM_CFLAGS - -EXTRA_CONFIGURE_ARGS_mm-64 = --disable-xmms-plugin CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS_mm-$(MEMORYMODEL)) -# XXX: Assembler optimization just doesn't work. Disable for now. -CONFIGURE_ARGS += --disable-asm-optimizations +# This is a legacy library, built XMMS plugin against newest one +CONFIGURE_ARGS += --with-xmms-prefix=/notthere TEST_TARGET = check -MERGE_SCRIPTS_isa-i386-garversion-1.0.4 = copy-only -MERGE_DIRS_isa-i386-garversion-1.0.4 = $(libdir) -MERGE_SCRIPTS_isa-amd64-garversion-1.0.4 = copy-relocated-only -MERGE_DIRS_isa-amd64-garversion-1.0.4 = $(libdir) +# There is one test failing, but as this is really a long-outdated legacy library +# I don't care much for now. +SKIPTEST ?= 1 -MERGE_SCRIPTS_isa-i386-garversion-1.1.2 = copy-only -MERGE_DIRS_isa-i386-garversion-1.1.2 = $(libdir) -MERGE_SCRIPTS_isa-amd64-garversion-1.1.2 = copy-relocated-only -MERGE_DIRS_isa-amd64-garversion-1.1.2 = $(libdir) - -MERGE_SCRIPTS_isa-i386-garversion-1.2.1 = copy-all -MERGE_SCRIPTS_isa-amd64-garversion-1.2.1 = copy-relocated-only -MERGE_DIRS_isa-amd64-garversion-1.2.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir) - -MERGE_SCRIPTS_isa-sparcv8-garversion-1.0.4 = copy-only -MERGE_DIRS_isa-sparcv8-garversion-1.0.4 = $(libdir) -MERGE_SCRIPTS_isa-sparcv9-garversion-1.0.4 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-garversion-1.0.4 = $(libdir) - -MERGE_SCRIPTS_isa-sparcv8-garversion-1.1.2 = copy-only -MERGE_DIRS_isa-sparcv8-garversion-1.1.2 = $(libdir) -MERGE_SCRIPTS_isa-sparcv9-garversion-1.1.2 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-garversion-1.1.2 = $(libdir) - -MERGE_SCRIPTS_isa-sparcv8-garversion-1.2.1 = copy-all -MERGE_SCRIPTS_isa-sparcv9-garversion-1.2.1 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-garversion-1.2.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir) - -PKGFILES_CSWxmmsflac = $(libdir)/xmms/.* - include gar/category.mk -CC := $(abspath ./bin/cc) -CXX := $(abspath ./bin/CC) -PATH := ./bin:$(PATH):/usr/ccs/bin - -post-patch-isa-i386-garversion-1.0.4: +post-patch-modulated: perl -pi -e "s/-O3 //g" $(WORKSRC)/configure $(MAKECOOKIE) - -post-patch-isa-i386-garversion-1.1.2: - perl -pi -e "s/-O2 //g" $(WORKSRC)/configure - $(MAKECOOKIE) - -post-patch-isa-sparcv8-garversion-1.0.4: - perl -pi -e "s/-O3 //g" $(WORKSRC)/configure - $(MAKECOOKIE) - -post-patch-isa-sparcv8-garversion-1.1.2: - perl -pi -e "s/-O2 //g" $(WORKSRC)/configure - $(MAKECOOKIE) Modified: csw/mgar/pkg/libflac4/trunk/checksums =================================================================== --- csw/mgar/pkg/flac/trunk/checksums 2011-03-03 03:02:29 UTC (rev 13545) +++ csw/mgar/pkg/libflac4/trunk/checksums 2011-03-04 22:28:02 UTC (rev 13565) @@ -1,8 +1 @@ -b1523e6ad8ef85d1df5b18f20a8cfad6 download/flac-1.0.4.tar.gz -2bfc127cdda02834d0491ab531a20960 download/flac-1.1.2.tar.gz -153c8b15a54da428d1f0fadc756c22c7 download/flac-1.2.1.tar.gz -c9e9052e1d1238a21ac6c4ab263d2b7f download/libtool-64bit.patch -e3144fad8810ceaca718adb6f09dc8fa download/no-stdint.patch -03e0502642d568b5b004f69328485720 download/strip-nasm-1.0.4.patch -394225d96661019d32cc0ebfdad3d377 download/strip-nasm-1.1.2.patch -64e7f447c2ca09ec041e6740a209291d download/strip-nasm-1.2.1.patch +b1523e6ad8ef85d1df5b18f20a8cfad6 flac-1.0.4.tar.gz Deleted: csw/mgar/pkg/libflac4/trunk/files/libtool-64bit.patch =================================================================== --- csw/mgar/pkg/flac/trunk/files/libtool-64bit.patch 2011-03-03 03:02:29 UTC (rev 13545) +++ csw/mgar/pkg/libflac4/trunk/files/libtool-64bit.patch 2011-03-04 22:28:02 UTC (rev 13565) @@ -1,13 +0,0 @@ -diff -Naur flac-1.1.4.orig/ltmain.sh flac-1.1.4.patched/ltmain.sh ---- flac-1.1.4.orig/ltmain.sh 2005-04-26 20:23:39.000000000 +0200 -+++ flac-1.1.4.patched/ltmain.sh 2009-04-09 13:59:57.521039544 +0200 -@@ -1545,9 +1545,7 @@ - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" -- if test "$with_gcc" = "yes" ; then - compiler_flags="$compiler_flags $arg" -- fi - continue - ;; - Deleted: csw/mgar/pkg/libflac4/trunk/files/no-stdint.patch =================================================================== --- csw/mgar/pkg/flac/trunk/files/no-stdint.patch 2011-03-03 03:02:29 UTC (rev 13545) +++ csw/mgar/pkg/libflac4/trunk/files/no-stdint.patch 2011-03-04 22:28:02 UTC (rev 13565) @@ -1,12 +0,0 @@ -diff -Naur flac-1.2.1.orig/include/share/alloc.h flac-1.2.1.patch/include/share/alloc.h ---- flac-1.2.1.orig/include/share/alloc.h 2007-09-12 07:32:21.000000000 +0200 -+++ flac-1.2.1.patch/include/share/alloc.h 2009-02-24 16:19:58.442033162 +0100 -@@ -29,7 +29,7 @@ - - #include /* for SIZE_MAX */ - #if !defined _MSC_VER && !defined __MINGW32__ && !defined __EMX__ --#include /* for SIZE_MAX in case limits.h didn't get it */ -+/* #include /* for SIZE_MAX in case limits.h didn't get it */ - #endif - #include /* for size_t, malloc(), etc */ - Deleted: csw/mgar/pkg/libflac4/trunk/files/strip-nasm-1.1.2.patch =================================================================== --- csw/mgar/pkg/flac/trunk/files/strip-nasm-1.1.2.patch 2011-03-03 03:02:29 UTC (rev 13545) +++ csw/mgar/pkg/libflac4/trunk/files/strip-nasm-1.1.2.patch 2011-03-04 22:28:02 UTC (rev 13565) @@ -1,34 +0,0 @@ -diff -Naur flac-1.1.2.orig/src/libFLAC/ia32/Makefile.in flac-1.1.2.patched/src/libFLAC/ia32/Makefile.in ---- flac-1.1.2.orig/src/libFLAC/ia32/Makefile.in 2005-02-05 03:23:38.000000000 +0100 -+++ flac-1.1.2.patched/src/libFLAC/ia32/Makefile.in 2009-08-04 09:37:40.159783125 +0200 -@@ -253,7 +253,7 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - SUFFIXES = .nasm .lo --STRIP_NON_ASM = sh $(top_srcdir)/strip_non_asm_libtool_args.sh -+STRIP_NON_ASM = /opt/csw/bin/bash $(top_srcdir)/strip_non_asm_libtool_args.sh - noinst_LTLIBRARIES = libFLAC-asm.la - libFLAC_asm_la_SOURCES = \ - cpu_asm.nasm \ -diff -Naur flac-1.1.2.orig/strip_non_asm_libtool_args.sh flac-1.1.2.patched/strip_non_asm_libtool_args.sh ---- flac-1.1.2.orig/strip_non_asm_libtool_args.sh 2004-07-29 08:52:52.000000000 +0200 -+++ flac-1.1.2.patched/strip_non_asm_libtool_args.sh 2009-08-04 09:38:06.129792997 +0200 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/opt/csw/bin/bash - # - # libtool assumes that the compiler can handle the -fPIC flag. - # This isn't always true (for example, nasm can't handle it). -@@ -8,10 +8,12 @@ - while [ $1 ]; do - if [ "$1" != "-fPIC" ]; then - if [ "$1" != "-DPIC" ]; then -+ if [ "$1" != "-KPIC" ]; then - if [ "$1" != "-fno-common" ]; then - command="$command $1" - fi - fi -+ fi - fi - shift - done Deleted: csw/mgar/pkg/libflac4/trunk/files/strip-nasm-1.2.1.patch =================================================================== --- csw/mgar/pkg/flac/trunk/files/strip-nasm-1.2.1.patch 2011-03-03 03:02:29 UTC (rev 13545) +++ csw/mgar/pkg/libflac4/trunk/files/strip-nasm-1.2.1.patch 2011-03-04 22:28:02 UTC (rev 13565) @@ -1,34 +0,0 @@ -diff -Naur flac-1.2.1.orig/src/libFLAC/ia32/Makefile.in flac-1.2.1.patched/src/libFLAC/ia32/Makefile.in ---- flac-1.2.1.orig/src/libFLAC/ia32/Makefile.in 2007-09-16 22:05:12.000000000 +0200 -+++ flac-1.2.1.patched/src/libFLAC/ia32/Makefile.in 2009-08-04 13:31:07.693331268 +0200 -@@ -234,7 +234,7 @@ - - SUFFIXES = .nasm .lo - --STRIP_NON_ASM = sh $(top_srcdir)/strip_non_asm_libtool_args.sh -+STRIP_NON_ASM = /opt/csw/bin/bash $(top_srcdir)/strip_non_asm_libtool_args.sh - - noinst_LTLIBRARIES = libFLAC-asm.la - libFLAC_asm_la_SOURCES = \ -diff -Naur flac-1.2.1.orig/strip_non_asm_libtool_args.sh flac-1.2.1.patched/strip_non_asm_libtool_args.sh ---- flac-1.2.1.orig/strip_non_asm_libtool_args.sh 2004-07-29 08:43:23.000000000 +0200 -+++ flac-1.2.1.patched/strip_non_asm_libtool_args.sh 2009-08-04 13:30:46.782902121 +0200 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/opt/csw/bin/bash - # - # libtool assumes that the compiler can handle the -fPIC flag. - # This isn't always true (for example, nasm can't handle it). -@@ -8,10 +8,12 @@ - while [ $1 ]; do - if [ "$1" != "-fPIC" ]; then - if [ "$1" != "-DPIC" ]; then -+ if [ "$1" != "-KPIC" ]; then - if [ "$1" != "-fno-common" ]; then - command="$command $1" - fi - fi -+ fi - fi - shift - done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Mar 5 00:47:41 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 04 Mar 2011 23:47:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[13566] csw/mgar/pkg/dnstop/trunk Message-ID: Revision: 13566 http://gar.svn.sourceforge.net/gar/?rev=13566&view=rev Author: bonivart Date: 2011-03-04 23:47:40 +0000 (Fri, 04 Mar 2011) Log Message: ----------- dnstop/trunk: update to 20110127 Modified Paths: -------------- csw/mgar/pkg/dnstop/trunk/Makefile csw/mgar/pkg/dnstop/trunk/checksums csw/mgar/pkg/dnstop/trunk/files/Makefile.i386.p csw/mgar/pkg/dnstop/trunk/files/Makefile.sparc.p Modified: csw/mgar/pkg/dnstop/trunk/Makefile =================================================================== --- csw/mgar/pkg/dnstop/trunk/Makefile 2011-03-04 22:28:02 UTC (rev 13565) +++ csw/mgar/pkg/dnstop/trunk/Makefile 2011-03-04 23:47:40 UTC (rev 13566) @@ -1,5 +1,5 @@ NAME = dnstop -VERSION = 20090128 +VERSION = 20110127 CATEGORIES = net DESCRIPTION = Displays various tables of DNS traffic @@ -7,17 +7,15 @@ Displays various tables of DNS traffic endef +SPKG_SOURCEURL = http://dns.measurement-factory.com/tools/dnstop MASTER_SITES = http://dns.measurement-factory.com/tools/dnstop/src/ DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += dnstop.pod DISTFILES += dnstop.8 LICENSE = LICENSE RUNTIME_DEP_PKGS = CSWlibpcap -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - TEST_SCRIPTS = INSTALL_SCRIPTS = custom Modified: csw/mgar/pkg/dnstop/trunk/checksums =================================================================== --- csw/mgar/pkg/dnstop/trunk/checksums 2011-03-04 22:28:02 UTC (rev 13565) +++ csw/mgar/pkg/dnstop/trunk/checksums 2011-03-04 23:47:40 UTC (rev 13566) @@ -1,3 +1 @@ -827a0d2020b157b925411dd30b6feff3 dnstop-20090128.tar.gz -70ffba84342497ab9d5da57ab0b4e0d5 dnstop.8 -fdfa026782a0fdc5b24b934ef5782ebd dnstop.pod +e1c6416ad700d2d4d52f176f0827c60d dnstop-20110127.tar.gz Modified: csw/mgar/pkg/dnstop/trunk/files/Makefile.i386.p =================================================================== --- csw/mgar/pkg/dnstop/trunk/files/Makefile.i386.p 2011-03-04 22:28:02 UTC (rev 13565) +++ csw/mgar/pkg/dnstop/trunk/files/Makefile.i386.p 2011-03-04 23:47:40 UTC (rev 13566) @@ -1,13 +1,13 @@ --- Makefile 2010-01-13 17:55:54.574796795 +0100 +++ Makefile 2010-01-13 18:00:42.582082173 +0100 @@ -2,8 +2,8 @@ - DATE != date +%Y%m%d - CC=/opt/studio/SOS11/SUNWspro/bin/cc --CFLAGS=-xO3 -xarch=386 --LIBS=-lresolv -lnsl -lsocket -lcurses -+CFLAGS=-xO3 -xarch=386 -I/opt/csw/include -+LIBS=-lresolv -lnsl -lsocket -lcurses -lpcap OPTFLAGS= -DUSE_IPV6=1 + CC=/opt/SUNWspro/bin/cc +-CFLAGS=-xO3 -m32 -xarch=386 -xnorunpath ${OPTFLAGS} +-LIBS=-lresolv -lnsl -lsocket -lpcap -lncurses ++CFLAGS=-xO3 -m32 -xarch=386 -xnorunpath ${OPTFLAGS} -I/opt/csw/include ++LIBS=-lresolv -lnsl -lsocket -lpcap -lcurses prefix=/opt/csw + exec_prefix=/opt/csw Modified: csw/mgar/pkg/dnstop/trunk/files/Makefile.sparc.p =================================================================== --- csw/mgar/pkg/dnstop/trunk/files/Makefile.sparc.p 2011-03-04 22:28:02 UTC (rev 13565) +++ csw/mgar/pkg/dnstop/trunk/files/Makefile.sparc.p 2011-03-04 23:47:40 UTC (rev 13566) @@ -1,13 +1,13 @@ ---- Makefile 2010-01-13 19:25:50.435317055 +0100 -+++ Makefile 2010-01-13 19:24:07.075661494 +0100 -@@ -2,9 +2,9 @@ - DATE != date +%Y%m%d +--- Makefile Sat Mar 5 00:33:14 2011 ++++ Makefile.new Sat Mar 5 00:34:19 2011 +@@ -2,8 +2,8 @@ - CC=/opt/studio/SOS11/SUNWspro/bin/cc --CFLAGS=-xO3 -xarch=v8 --LIBS=-lresolv -lnsl -lsocket -lcurses -+CFLAGS=-xO3 -xarch=v8 -I/opt/csw/include -+LIBS=-lresolv -lnsl -lsocket -lcurses -lpcap OPTFLAGS= -DUSE_IPV6=1 + CC=/opt/SUNWspro/bin/cc +-CFLAGS=-xO3 -m32 -xarch=v8 -xnorunpath ${OPTFLAGS} +-LIBS=-lresolv -lnsl -lsocket -lpcap -lncurses ++CFLAGS=-xO3 -m32 -xarch=v8 -xnorunpath ${OPTFLAGS} -I/opt/csw/include ++LIBS=-lresolv -lnsl -lsocket -lpcap -lcurses prefix=/opt/csw + exec_prefix=/opt/csw 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 Mar 5 01:57:44 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 05 Mar 2011 00:57:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[13567] csw/mgar/pkg/apache2/branches/open-bug-squash/ Makefile Message-ID: Revision: 13567 http://gar.svn.sourceforge.net/gar/?rev=13567&view=rev Author: bdwalton Date: 2011-03-05 00:57:44 +0000 (Sat, 05 Mar 2011) Log Message: ----------- apache2/branches/open-bug-squash: a correction to the alternatives handling due to the renaming Modified Paths: -------------- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-04 23:47:40 UTC (rev 13566) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-05 00:57:44 UTC (rev 13567) @@ -121,7 +121,7 @@ AP2_MODFILES = *suexec*\.so ALTERNATIVES_CSWapache2 = prefork -ALTERNATIVES_CSWap2worker = worker +ALTERNATIVES_CSWap2-worker = worker ALTERNATIVE_prefork = /opt/csw/apache2/sbin/httpd httpd /opt/csw/apache2/sbin/httpd.prefork 50 ALTERNATIVE_worker = /opt/csw/apache2/sbin/httpd httpd /opt/csw/apache2/sbin/httpd.worker 100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Mar 5 03:12:25 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 05 Mar 2011 02:12:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[13568] csw/mgar/pkg/cpan/Algorithm-CheckDigits/trunk Message-ID: Revision: 13568 http://gar.svn.sourceforge.net/gar/?rev=13568&view=rev Author: bonivart Date: 2011-03-05 02:12:24 +0000 (Sat, 05 Mar 2011) Log Message: ----------- cpan/Algorithm-CheckDigits/trunk: update to 1.1.1, rename Modified Paths: -------------- csw/mgar/pkg/cpan/Algorithm-CheckDigits/trunk/Makefile csw/mgar/pkg/cpan/Algorithm-CheckDigits/trunk/checksums Modified: csw/mgar/pkg/cpan/Algorithm-CheckDigits/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Algorithm-CheckDigits/trunk/Makefile 2011-03-05 00:57:44 UTC (rev 13567) +++ csw/mgar/pkg/cpan/Algorithm-CheckDigits/trunk/Makefile 2011-03-05 02:12:24 UTC (rev 13568) @@ -1,17 +1,20 @@ NAME = Algorithm-CheckDigits -VERSION = 0.53 +VERSION = v1.1.1 CATEGORIES = cpan AUTHOR = MAMAWE -DESCRIPTION = Perl extension to generate and test check digits +DESCRIPTION = Generate and test check digits define BLURB - Perl extension to generate and test check digits + Generate and test check digits endef DISTFILES += COPYING -PACKAGES = CSWpmalgorithmchkdig -CATALOGNAME = pm_algorithmchkdig -ARCHALL = 1 +PACKAGES += CSWpm-algorithm-checkdigits +CATALOGNAME_CSWpm-algorithm-checkdigits = pm_algorithm_checkdigits +SPKG_DESC_CSWpm-algorithm-checkdigits = $(DESCRIPTION) +ARCHALL_CSWpm-algorithm-checkdigits = 1 +OBSOLETES_CSWpm-algorithm-checkdigits = CSWpmalgorithmchkdig +CATALOGNAME_CSWpmalgorithmchkdig = pm_algorithmchkdig include gar/category.mk Modified: csw/mgar/pkg/cpan/Algorithm-CheckDigits/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Algorithm-CheckDigits/trunk/checksums 2011-03-05 00:57:44 UTC (rev 13567) +++ csw/mgar/pkg/cpan/Algorithm-CheckDigits/trunk/checksums 2011-03-05 02:12:24 UTC (rev 13568) @@ -1,2 +1 @@ -f5b22e4b25688495e53d133bc88393dd Algorithm-CheckDigits-0.53.tar.gz -981311c031af8910652bdff1312ac2ef COPYING +481901a19f0cd7a91f6dd553c81a9d4b Algorithm-CheckDigits-v1.1.1.tar.gz 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 Mar 5 04:05:46 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 05 Mar 2011 03:05:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[13569] csw/mgar/pkg/apache2/branches/open-bug-squash/ Makefile Message-ID: Revision: 13569 http://gar.svn.sourceforge.net/gar/?rev=13569&view=rev Author: bdwalton Date: 2011-03-05 03:05:46 +0000 (Sat, 05 Mar 2011) Log Message: ----------- apache2/branches/open-bug-squash: ap2_worker dep on alternatives Modified Paths: -------------- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-05 02:12:24 UTC (rev 13568) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-05 03:05:46 UTC (rev 13569) @@ -102,6 +102,7 @@ CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWosslutils CHECKPKG_OVERRIDES_CSWap2-prefork += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWap2-worker += surplus-dependency|CSWap2-prefork +CHECKPKG_OVERRIDES_CSWap2-worker += surplus-dependency|CSWalternatives CHECKPKG_OVERRIDES_CSWapache2rt += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWapache2-devel += file-with-bad-content|/usr/local|root/opt/csw/apache2/include/httpd.h 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 Mar 5 04:10:29 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 05 Mar 2011 03:10:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[13570] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13570 http://gar.svn.sourceforge.net/gar/?rev=13570&view=rev Author: bdwalton Date: 2011-03-05 03:10:28 +0000 (Sat, 05 Mar 2011) Log Message: ----------- ruby18/trunk: use alternatives for ruby, irb, ri, etc; ensure we only run suffixbins once by using makecookie Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-05 03:05:46 UTC (rev 13569) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-05 03:10:28 UTC (rev 13570) @@ -20,6 +20,9 @@ OBSOLETES_CSWruby18-mode = CSWrubymode OBSOLETES_CSWruby18-mode-el = CSWrubymodeel +ALTERNATIVES_CSWruby18 = ruby +ALTERNATIVE_ruby = $(bindir)/ruby ruby $(bindir)/ruby18 10 $(bindir)/irb irb $(bindir)/irb18 $(bindir)/erb erb $(bindir)/erb18 $(bindir)/rdoc rdoc $(bindir)/rdoc18 $(bindir)/ri ri $(bindir)/ri18 $(bindir)/testrb testrb $(bindir)/testrb18 + ARCHALL_CSWruby18-doc = 1 ARCHALL_CSWruby18-mode = 1 ARCHALL_CSWruby18-mode-el = 1 @@ -172,6 +175,7 @@ suffixbins: @echo "Making binaries use 18 suffix" @(cd $(DESTDIR)$(bindir); for f in *; do mv $$f $${f}18; done) + @$(MAKECOOKIE) multiconfig: @echo "Setting up the CSW rbconfig stuff so we can switch between compilers" 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 Mar 5 04:47:28 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 05 Mar 2011 03:47:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[13571] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13571 http://gar.svn.sourceforge.net/gar/?rev=13571&view=rev Author: bdwalton Date: 2011-03-05 03:47:28 +0000 (Sat, 05 Mar 2011) Log Message: ----------- drop suffixbins, bite the bullet and go for program suffix option to configure Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-05 03:10:28 UTC (rev 13570) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-05 03:47:28 UTC (rev 13571) @@ -111,6 +111,7 @@ CONFIGURE_ARGS += --with-readline-dir=$(prefix) CONFIGURE_ARGS += --with-zlib-dir=$(prefix) CONFIGURE_ARGS += --enable-install-doc +CONFIGURE_ARGS += --program-suffix=18 INSTALL_ARGS = install @@ -164,7 +165,7 @@ RBCONFIG = /opt/csw/lib/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb -PI_TARGETS = samples rbconfig rbscripts rubymode suffixbins +PI_TARGETS = samples rbconfig rbscripts rubymode ifndef USEGCC PI_TARGETS += multiconfig endif @@ -172,11 +173,6 @@ post-install-modulated: $(PI_TARGETS) @$(MAKECOOKIE) -suffixbins: - @echo "Making binaries use 18 suffix" - @(cd $(DESTDIR)$(bindir); for f in *; do mv $$f $${f}18; done) - @$(MAKECOOKIE) - multiconfig: @echo "Setting up the CSW rbconfig stuff so we can switch between compilers" @mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).SOS12 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 Mar 5 04:49:30 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 05 Mar 2011 03:49:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[13572] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13572 http://gar.svn.sourceforge.net/gar/?rev=13572&view=rev Author: bdwalton Date: 2011-03-05 03:49:29 +0000 (Sat, 05 Mar 2011) Log Message: ----------- ruby18/trunk: make further adjustments to accommodate --program-suffix option Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-05 03:47:28 UTC (rev 13571) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-05 03:49:29 UTC (rev 13572) @@ -199,10 +199,10 @@ # Copy samples samples: - @mkdir -p $(DESTDIR)$(docdir)/ruby/ - @cp -R $(WORKSRC_FIRSTMOD)/sample $(DESTDIR)$(docdir)/ruby/ + @mkdir -p $(DESTDIR)$(docdir)/ruby18/ + @cp -R $(WORKSRC_FIRSTMOD)/sample $(DESTDIR)$(docdir)/ruby18/ @for ext in bigdecimal dl tk ; do \ - cp -R $(WORKSRC_FIRSTMOD)/ext/$$ext/sample $(DESTDIR)$(docdir)/ruby/sample/$$ext ; \ + cp -R $(WORKSRC_FIRSTMOD)/ext/$$ext/sample $(DESTDIR)$(docdir)/ruby18/sample/$$ext ; \ done @$(MAKECOOKIE) @@ -210,7 +210,7 @@ rbscripts: @echo " ==> Fixing shebang path in distributed ruby scripts" @find $(DESTDIR)$(prefix) -type f -name '*.rb' -exec \ - perl -i -plne "s{^#!/usr/local/bin/ruby}{#!$(bindir)/ruby}g" {} \; + perl -i -plne "s{^#!/usr/local/bin/ruby}{#!$(bindir)/ruby18}g" {} \; @$(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 Mar 5 05:01:55 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 05 Mar 2011 04:01:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[13573] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13573 http://gar.svn.sourceforge.net/gar/?rev=13573&view=rev Author: bdwalton Date: 2011-03-05 04:01:55 +0000 (Sat, 05 Mar 2011) Log Message: ----------- ruby18/trunk: add legacy symlinks to account for the changed .so file names Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-05 03:49:29 UTC (rev 13572) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-05 04:01:55 UTC (rev 13573) @@ -165,7 +165,7 @@ RBCONFIG = /opt/csw/lib/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb -PI_TARGETS = samples rbconfig rbscripts rubymode +PI_TARGETS = samples rbconfig rbscripts rubymode legacylinks ifndef USEGCC PI_TARGETS += multiconfig endif @@ -173,6 +173,13 @@ post-install-modulated: $(PI_TARGETS) @$(MAKECOOKIE) +legacylinks: + @(cd $(DESTDIR)$(libdir); \ + for f in libruby.so libruby.so.1.8.7; do \ + ln -s libruby18.so.1 $$f; \ + done) + @$(MAKECOOKIE) + multiconfig: @echo "Setting up the CSW rbconfig stuff so we can switch between compilers" @mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).SOS12 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 Mar 5 05:03:25 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 05 Mar 2011 04:03:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[13574] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13574 http://gar.svn.sourceforge.net/gar/?rev=13574&view=rev Author: bdwalton Date: 2011-03-05 04:03:25 +0000 (Sat, 05 Mar 2011) Log Message: ----------- ruby18/trunk: incorporate the legacy symlinks into the proper packages Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-05 04:01:55 UTC (rev 13573) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-05 04:03:25 UTC (rev 13574) @@ -72,14 +72,14 @@ PKGFILES_CSWruby18-tk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb PKGFILES_CSWruby18-dev = $(libdir)/.*\.h $(libdir)/.*/mkmf.rb $(libdir)/.*static.a -PKGFILES_CSWruby18-dev += /opt/csw/lib/libruby.so +PKGFILES_CSWruby18-dev += /opt/csw/lib/libruby.*.so PKGFILES_CSWruby18-mode = $(datadir)/emacs/site-lisp/.*elc$ PKGFILES_CSWruby18-mode-el = $(datadir)/emacs/site-lisp/.*el$ -PKGFILES_CSWlibruby1 += /opt/csw/lib/libruby.so.1 -PKGFILES_CSWlibruby1 += /opt/csw/lib/libruby.so.1.* +PKGFILES_CSWlibruby1 += /opt/csw/lib/libruby.*.so.1 +PKGFILES_CSWlibruby1 += /opt/csw/lib/libruby.*.so.1.* MASTER_SITES = ftp://ftp.ruby-lang.org/pub/ruby/ MASTER_SITES += ftp://www.ibiblio.org/pub/languages/ruby/ 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 Mar 5 05:10:31 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 05 Mar 2011 04:10:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[13575] csw/mgar/pkg/apache2/branches/open-bug-squash Message-ID: Revision: 13575 http://gar.svn.sourceforge.net/gar/?rev=13575&view=rev Author: bdwalton Date: 2011-03-05 04:10:30 +0000 (Sat, 05 Mar 2011) Log Message: ----------- apache2/branches/open-bug-squash: rename devel to dev for new standard; use obsoletes mechanism to smooth this over Modified Paths: -------------- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile Added Paths: ----------- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWapache2-dev.cswreleasenotes Removed Paths: ------------- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWapache2-devel.cswreleasenotes Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-05 04:03:25 UTC (rev 13574) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-05 04:10:30 UTC (rev 13575) @@ -41,7 +41,7 @@ DISTFILES += CSWap2-worker.postinstall CSWap2-worker.postremove DISTFILES += CSWap2-worker.preinstall -DISTFILES += CSWapache2-devel.cswreleasenotes +DISTFILES += CSWapache2-dev.cswreleasenotes # Configuration templates DISTFILES += update20to22 @@ -55,7 +55,7 @@ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz # The PACKAGES variable tell GAR which packages to build -PACKAGES = CSWapache2 CSWapache2-devel CSWapache2-manual CSWap2-suexec +PACKAGES = CSWapache2 CSWapache2-dev CSWapache2-manual CSWap2-suexec PACKAGES += CSWap2-worker # These packages are dummy versions to make dependencies nicer # as various things depend on CSWap2prefork currently @@ -64,6 +64,7 @@ OBSOLETES_CSWap2-suexec = CSWap2suexec OBSOLETES_CSWap2-prefork = CSWap2prefork OBSOLETES_CSWap2-worker = CSWap2worker +OBSOLETES_CSWapache2-dev = CSWapache2-devel ARCHALL_CSWapache2-manual = 1 ARCHALL_CSWap2-prefork = 1 @@ -72,7 +73,7 @@ OBSOLETES_CSWapache2 = CSWapache2c CATALOGNAME_CSWapache2 = apache2 -CATALOGNAME_CSWapache2-devel = apache2_devel +CATALOGNAME_CSWapache2-dev = apache2_dev CATALOGNAME_CSWapache2-manual = apache2_manual CATALOGNAME_CSWap2suexec = ap2_suexec CATALOGNAME_CSWap2prefork = ap2_prefork @@ -80,7 +81,7 @@ CATALOGNAME_CSWapache2rt = apache2rt SPKG_DESC_CSWapache2 = A high performance Unix-based HTTP server. -SPKG_DESC_CSWapache2-devel = The development files for Apache2. +SPKG_DESC_CSWapache2-dev = The development files for Apache2. SPKG_DESC_CSWapache2-manual = The Apache2 manual files. SPKG_DESC_CSWap2-suexec = The standard suEXEC binary for Apache2. SPKG_DESC_CSWap2-worker = The apache worker mpm. @@ -91,7 +92,7 @@ RUNTIME_DEP_PKGS_CSWapache2 += CSWoldaprt CSWosslrt CSWzlib RUNTIME_DEP_PKGS_CSWapache2 += CSWapr CSWapr-util CSWbdb48 RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2 -RUNTIME_DEP_PKGS_CSWapache2-devel = CSWapache2 +RUNTIME_DEP_PKGS_CSWapache2-dev = CSWapache2 RUNTIME_DEP_PKGS_CSWap2-suexec = CSWapache2 RUNTIME_DEP_PKGS_CSWap2-prefork = CSWapache2 RUNTIME_DEP_PKGS_CSWap2-worker = CSWapache2 CSWapr CSWexpat CSWap2-prefork @@ -105,7 +106,7 @@ CHECKPKG_OVERRIDES_CSWap2-worker += surplus-dependency|CSWalternatives CHECKPKG_OVERRIDES_CSWapache2rt += surplus-dependency|CSWapache2 -CHECKPKG_OVERRIDES_CSWapache2-devel += file-with-bad-content|/usr/local|root/opt/csw/apache2/include/httpd.h +CHECKPKG_OVERRIDES_CSWapache2-dev += file-with-bad-content|/usr/local|root/opt/csw/apache2/include/httpd.h # We need this to get bdb48/lib into the runpath EXTRA_LIB = $(prefix)/bdb48/lib @@ -208,7 +209,7 @@ PKGFILES_CSWap2-suexec = .*sbin/suexec .*libexec/.*suexec.* .*/man/.*suexec.* PKGFILES_CSWap2-suexec += .*ap2mod/suexec -PKGFILES_CSWapache2-devel = .*include/.* .*\.(a|la) +PKGFILES_CSWapache2-dev = .*include/.* .*\.(a|la) PKGFILES_CSWapache2-manual = .*share/.*manual.* .*etc/extra/httpd-manual.conf PKGFILES_CSWap2-prefork = .*share/doc/ap2_prefork.* PKGFILES_CSWap2-worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker Copied: csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWapache2-dev.cswreleasenotes (from rev 13546, csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWapache2-devel.cswreleasenotes) =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWapache2-dev.cswreleasenotes (rev 0) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWapache2-dev.cswreleasenotes 2011-03-05 04:10:30 UTC (rev 13575) @@ -0,0 +1,3 @@ +* /usr/local references: + - include/httpd.h: specifies default if no HTTPD_ROOT set, overridden via + ap_config_auto.h Deleted: csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWapache2-devel.cswreleasenotes =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWapache2-devel.cswreleasenotes 2011-03-05 04:03:25 UTC (rev 13574) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWapache2-devel.cswreleasenotes 2011-03-05 04:10:30 UTC (rev 13575) @@ -1,3 +0,0 @@ -* /usr/local references: - - include/httpd.h: specifies default if no HTTPD_ROOT set, overridden via - ap_config_auto.h 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 Mar 5 08:20:31 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Mar 2011 07:20:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[13576] csw/mgar/pkg/template/trunk/Makefile Message-ID: Revision: 13576 http://gar.svn.sourceforge.net/gar/?rev=13576&view=rev Author: wahwah Date: 2011-03-05 07:20:31 +0000 (Sat, 05 Mar 2011) Log Message: ----------- template: Removing UFILES_REGEX uwatch can now automatically generate regexes. Modified Paths: -------------- csw/mgar/pkg/template/trunk/Makefile Modified: csw/mgar/pkg/template/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2011-03-05 04:10:30 UTC (rev 13575) +++ csw/mgar/pkg/template/trunk/Makefile 2011-03-05 07:20:31 UTC (rev 13576) @@ -57,8 +57,9 @@ ## $(MASTER_SITES). DISTFILES = $(NAME)-$(VERSION).tar.gz ## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +## We define upstream file regex so we can be notifed of new upstream software +## release +## UFILES_REGEX = $(NAME)-(\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. 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 Mar 5 08:31:00 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Mar 2011 07:31:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[13577] csw/mgar/pkg/lang-python Message-ID: Revision: 13577 http://gar.svn.sourceforge.net/gar/?rev=13577&view=rev Author: wahwah Date: 2011-03-05 07:31:00 +0000 (Sat, 05 Mar 2011) Log Message: ----------- mock: Python mocking framework Modified Paths: -------------- csw/mgar/pkg/lang-python/mock/trunk/Makefile csw/mgar/pkg/lang-python/mock/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/mock/ Modified: csw/mgar/pkg/lang-python/mock/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2011-02-15 08:22:56 UTC (rev 13317) +++ csw/mgar/pkg/lang-python/mock/trunk/Makefile 2011-03-05 07:31:00 UTC (rev 13577) @@ -2,185 +2,16 @@ # 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 -## -NAME = mypkg -VERSION = 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. +NAME = mock +VERSION = 0.7.0 +CATEGORIES = python +DESCRIPTION = A Python Mocking and Patching Library for Testing define BLURB - 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), -## $(PYPI_MIRROR) -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(NAME). 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). +SPKG_SOURCEURL = http://pypi.python.org/pypi/mock +MASTER_SITES = $(PYPI_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\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)/$(NAME)-$(VERSION) -## -## 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 +ARCHALL = 1 +LICENSE = PKG-INFO +PACKAGES = CSWpy-mock +include gar/category.mk Modified: csw/mgar/pkg/lang-python/mock/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2011-02-15 08:22:56 UTC (rev 13317) +++ csw/mgar/pkg/lang-python/mock/trunk/checksums 2011-03-05 07:31:00 UTC (rev 13577) @@ -0,0 +1 @@ +be029f8c963c55250a452c400e10cf42 mock-0.7.0.tar.gz 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 Mar 5 09:07:00 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Mar 2011 08:07:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[13578] csw/mgar/gar/v2/lib/web/pkgdb_web.py Message-ID: Revision: 13578 http://gar.svn.sourceforge.net/gar/?rev=13578&view=rev Author: wahwah Date: 2011-03-05 08:07:00 +0000 (Sat, 05 Mar 2011) Log Message: ----------- pkgdb-web: URL recognizer bugfixes Some URLs use catrel-arch-osrel, while others use catrel/arch/osrel. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2011-03-05 07:31:00 UTC (rev 13577) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2011-03-05 08:07:00 UTC (rev 13578) @@ -27,11 +27,11 @@ r'/catalognames/', 'CatalognameList', r'/catalognames/([^/]+)/', 'Catalogname', r'/error-tags/', 'ErrorTagList', - r'/rest/catalogs/([\w-]+)-(sparc|i386)-(SunOS[^-]+)/', 'Catalogs', - r'/rest/catalogs/([\w-]+)-(sparc|i386)-(SunOS[^-]+)/pkgname-by-filename', + r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/', 'Catalogs', + r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/pkgname-by-filename', 'PkgnameByFilename', # Query by catalog release, arch, OS release and catalogname - r'/rest/catalogs/([\w-]+)-(sparc|i386)-(SunOS[^-]+)/catalognames/([^/]+)/', 'Srv4ByCatAndCatalogname', + r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/catalognames/([^/]+)/', 'Srv4ByCatAndCatalogname', r'/rest/srv4/([0-9a-f]{32})/', 'RestSrv4Detail', ) 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 Mar 5 09:07:34 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Mar 2011 08:07:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[13579] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Message-ID: Revision: 13579 http://gar.svn.sourceforge.net/gar/?rev=13579&view=rev Author: wahwah Date: 2011-03-05 08:07:33 +0000 (Sat, 05 Mar 2011) Log Message: ----------- csw-upload-pkg: Graceful handling of nonexistent When asked to remove a file from a catalog, and the file is not present in the database, gracefully skip it and proceed to the next one. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-03-05 08:07:00 UTC (rev 13578) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-03-05 08:07:33 UTC (rev 13579) @@ -85,6 +85,9 @@ def _RemoveFile(self, filename): md5_sum = self._GetFileMd5sum(filename) file_in_allpkgs, file_metadata = self._GetSrv4FileMetadata(md5_sum) + if not file_metadata: + logging.warning("Could not find metadata for file %s", repr(filename)) + return osrel = file_metadata['osrel'] arch = file_metadata['arch'] catalogs = self._MatchSrv4ToCatalogs( 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 Mar 5 09:08:06 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Mar 2011 08:08:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[13580] csw/mgar/gar/v2/categories/python/category.mk Message-ID: Revision: 13580 http://gar.svn.sourceforge.net/gar/?rev=13580&view=rev Author: wahwah Date: 2011-03-05 08:08:06 +0000 (Sat, 05 Mar 2011) Log Message: ----------- categories/python/category.mk: More defaults With many Python packages being on pypi, more defaults can be set. Modified Paths: -------------- csw/mgar/gar/v2/categories/python/category.mk Modified: csw/mgar/gar/v2/categories/python/category.mk =================================================================== --- csw/mgar/gar/v2/categories/python/category.mk 2011-03-05 08:07:33 UTC (rev 13579) +++ csw/mgar/gar/v2/categories/python/category.mk 2011-03-05 08:08:06 UTC (rev 13580) @@ -20,5 +20,8 @@ INSTALL_SCRIPTS ?= $(WORKSRC)/setup.py INSTALL_ARGS ?= --root=$(DESTDIR) --prefix=$(prefix) TEST_SCRIPTS ?= $(WORKSRC)/setup.py +LICENSE ?= PKG-INFO +SPKG_SOURCEURL ?= http://pypi.python.org/pypi/$(NAME) +MASTER_SITES ?= $(PYPI_MIRROR) include gar/gar.mk 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 Mar 5 09:08:40 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Mar 2011 08:08:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[13581] csw/mgar/gar/v2 Message-ID: Revision: 13581 http://gar.svn.sourceforge.net/gar/?rev=13581&view=rev Author: wahwah Date: 2011-03-05 08:08:39 +0000 (Sat, 05 Mar 2011) Log Message: ----------- python/category.mk: Default CSWpy-$(DASHED_NAME) Modified Paths: -------------- csw/mgar/gar/v2/categories/python/category.mk csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/categories/python/category.mk =================================================================== --- csw/mgar/gar/v2/categories/python/category.mk 2011-03-05 08:08:06 UTC (rev 13580) +++ csw/mgar/gar/v2/categories/python/category.mk 2011-03-05 08:08:39 UTC (rev 13581) @@ -23,5 +23,6 @@ LICENSE ?= PKG-INFO SPKG_SOURCEURL ?= http://pypi.python.org/pypi/$(NAME) MASTER_SITES ?= $(PYPI_MIRROR) +PACKAGES ?= CSWpy-$(DASHED_NAME) include gar/gar.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-03-05 08:08:06 UTC (rev 13580) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-03-05 08:08:39 UTC (rev 13581) @@ -44,6 +44,9 @@ SPKG_SPECS ?= $(sort $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES) $(OBSOLETED_PKGS) $(if $(NOSOURCEPACKAGE),,$(SRCPACKAGE))) endif +# For creating default pkgnames, e.g. CSWpy-$(DASHED_NAME) +DASHED_NAME ?= $(subst _,-,$(patsubst CSW%,%,$(NAME))) + # Automatic definitions for source package CATALOGNAME_$(SRCPACKAGE) ?= $(patsubst CSW%,%,$(SRCPACKAGE_BASE))_src SPKG_DESC_$(SRCPACKAGE) ?= $(SPKG_DESC_$(SRCPACKAGE_BASE)) Source Package 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 Mar 5 09:14:40 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Mar 2011 08:14:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[13582] csw/mgar/pkg/lang-python Message-ID: Revision: 13582 http://gar.svn.sourceforge.net/gar/?rev=13582&view=rev Author: wahwah Date: 2011-03-05 08:14:40 +0000 (Sat, 05 Mar 2011) Log Message: ----------- unittest2: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/unittest2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/unittest2/ csw/mgar/pkg/lang-python/unittest2/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/lang-python/unittest2/trunk/Makefile Deleted: csw/mgar/pkg/lang-python/unittest2/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2011-02-15 08:22:56 UTC (rev 13317) +++ csw/mgar/pkg/lang-python/unittest2/trunk/Makefile 2011-03-05 08:14:40 UTC (rev 13582) @@ -1,186 +0,0 @@ -# Copyright 2009 OpenCSW -# 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 -## -NAME = mypkg -VERSION = 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. -define BLURB - -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), -## $(PYPI_MIRROR) -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(NAME). 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 = $(NAME)-$(VERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\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)/$(NAME)-$(VERSION) -## -## 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 Copied: csw/mgar/pkg/lang-python/unittest2/trunk/Makefile (from rev 13576, csw/mgar/pkg/template/trunk/Makefile) =================================================================== --- csw/mgar/pkg/lang-python/unittest2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/unittest2/trunk/Makefile 2011-03-05 08:14:40 UTC (rev 13582) @@ -0,0 +1,12 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +NAME = unittest2 +VERSION = 0.5.1 +CATEGORIES = python +DESCRIPTION = The new features in unittest for Python 2.7 backported to Python 2.3+ +define BLURB +endef +ARCHALL = 1 +include gar/category.mk Modified: csw/mgar/pkg/lang-python/unittest2/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2011-02-15 08:22:56 UTC (rev 13317) +++ csw/mgar/pkg/lang-python/unittest2/trunk/checksums 2011-03-05 08:14:40 UTC (rev 13582) @@ -0,0 +1 @@ +a0af5cac92bbbfa0c3b0e99571390e0f unittest2-0.5.1.tar.gz 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 Mar 5 09:22:09 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Mar 2011 08:22:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[13583] csw/mgar/gar/v2/categories/python/category.mk Message-ID: Revision: 13583 http://gar.svn.sourceforge.net/gar/?rev=13583&view=rev Author: wahwah Date: 2011-03-05 08:22:09 +0000 (Sat, 05 Mar 2011) Log Message: ----------- mGAR v2: python/category.mk, excluding tests There's no need to include unit tests in released packages. Modified Paths: -------------- csw/mgar/gar/v2/categories/python/category.mk Modified: csw/mgar/gar/v2/categories/python/category.mk =================================================================== --- csw/mgar/gar/v2/categories/python/category.mk 2011-03-05 08:14:40 UTC (rev 13582) +++ csw/mgar/gar/v2/categories/python/category.mk 2011-03-05 08:22:09 UTC (rev 13583) @@ -7,6 +7,10 @@ # It breaks pysetuptools and trac. Here's a relevant reading: # http://fedoraproject.org/wiki/Packaging:Python#Packaging_eggs_and_setuptools_concerns +# No need to include unit tests in released packages. +_MERGE_EXCLUDE_CATEGORY += .*/$(NAME)/test +_MERGE_EXCLUDE_CATEGORY += .*/$(NAME)/test/.* + # Activate cswpycompile support to exclude .pyc and .pyo files from # the package and compile them on installation. File exclusion is # handled by gar.mk and cswclassutils integration by gar.pkg.mk 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 Mar 5 09:26:58 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Mar 2011 08:26:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[13584] csw/mgar/pkg/lang-python/mock/trunk/Makefile Message-ID: Revision: 13584 http://gar.svn.sourceforge.net/gar/?rev=13584&view=rev Author: wahwah Date: 2011-03-05 08:26:58 +0000 (Sat, 05 Mar 2011) Log Message: ----------- mock: Removed values now handled by default Modified Paths: -------------- csw/mgar/pkg/lang-python/mock/trunk/Makefile Modified: csw/mgar/pkg/lang-python/mock/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/mock/trunk/Makefile 2011-03-05 08:22:09 UTC (rev 13583) +++ csw/mgar/pkg/lang-python/mock/trunk/Makefile 2011-03-05 08:26:58 UTC (rev 13584) @@ -8,10 +8,5 @@ DESCRIPTION = A Python Mocking and Patching Library for Testing define BLURB endef -SPKG_SOURCEURL = http://pypi.python.org/pypi/mock -MASTER_SITES = $(PYPI_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.gz ARCHALL = 1 -LICENSE = PKG-INFO -PACKAGES = CSWpy-mock include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sat Mar 5 10:58:28 2011 From: maciej at opencsw.org (Maciej Blizinski) Date: Sat, 5 Mar 2011 10:58:28 +0100 Subject: [csw-devel] [PATCH] mgar: support show-buildsys outside Subversion Message-ID: <1299319108-6191-1-git-send-email-maciej@opencsw.org> Subversion might not always be available. If it isn't mgar should not crash. --- gar-wrapper/mgar | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gar-wrapper/mgar b/gar-wrapper/mgar index acf48db..5a9adb3 100755 --- a/gar-wrapper/mgar +++ b/gar-wrapper/mgar @@ -423,8 +423,8 @@ case $1 in # per-pkg-cmds edit-file) $EDITOR `gfind \`get_srcdir\` -name "$2"`;; find-file) gfind "`get_srcdir`" -name "$2";; - show-buildsys) __rev="`svn info "$BUILDSYS" | grep ^Revision:`" - __branch=`svn info "$BUILDSYS" | grep ^URL: | awk -F/ '{ print $(NF-1)"/"$NF }'` + show-buildsys) __rev="$( ( svn info "$BUILDSYS" || echo "Revision: unknown" ) | grep ^Revision:)" + __branch=$( ( svn info "$BUILDSYS" || echo "URL: unknown" ) | grep ^URL: | awk -F/ '{ print $(NF-1)"/"$NF }') echo -e "$BUILDSYS\t($__rev, Branch: $__branch)" ;; show-srcdir) echo `get_srcdir`;; -- 1.7.3.2 From maciej at opencsw.org Sat Mar 5 11:00:22 2011 From: maciej at opencsw.org (Maciej Blizinski) Date: Sat, 5 Mar 2011 11:00:22 +0100 Subject: [csw-devel] (no subject) Message-ID: <1299319239-8242-1-git-send-email-maciej@opencsw.org> From maciej at opencsw.org Sat Mar 5 11:00:23 2011 From: maciej at opencsw.org (Maciej Blizinski) Date: Sat, 5 Mar 2011 11:00:23 +0100 Subject: [csw-devel] (no subject) In-Reply-To: <1299319239-8242-1-git-send-email-maciej@opencsw.org> References: <1299319239-8242-1-git-send-email-maciej@opencsw.org> Message-ID: <1299319239-8242-2-git-send-email-maciej@opencsw.org> From maciej at opencsw.org Sat Mar 5 11:00:52 2011 From: maciej at opencsw.org (Maciej Blizinski) Date: Sat, 5 Mar 2011 11:00:52 +0100 Subject: [csw-devel] (no subject) Message-ID: <1299319269-8873-1-git-send-email-maciej@opencsw.org> From maciej at opencsw.org Sat Mar 5 11:00:53 2011 From: maciej at opencsw.org (Maciej Blizinski) Date: Sat, 5 Mar 2011 11:00:53 +0100 Subject: [csw-devel] (no subject) In-Reply-To: <1299319269-8873-1-git-send-email-maciej@opencsw.org> References: <1299319269-8873-1-git-send-email-maciej@opencsw.org> Message-ID: <1299319269-8873-2-git-send-email-maciej@opencsw.org> From maciej at opencsw.org Sat Mar 5 11:01:15 2011 From: maciej at opencsw.org (Maciej Blizinski) Date: Sat, 5 Mar 2011 11:01:15 +0100 Subject: [csw-devel] [PATCH] mgar: Use local variables Message-ID: <1299319275-8920-1-git-send-email-maciej@opencsw.org> Bash support local variables in function, if they are declared. This patch declares local variables for functions in mgar. --- gar-wrapper/mgar | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/gar-wrapper/mgar b/gar-wrapper/mgar index acf48db..5d5ce56 100755 --- a/gar-wrapper/mgar +++ b/gar-wrapper/mgar @@ -54,6 +54,8 @@ REQ_TOOLS="gfind ggrep gmake gxargs mknmz namazu svn" REQ_PKGS="findutils ggrep gmake namazu svn" function assert_required_tools { + local tool + local dir for tool in $REQ_TOOLS; do for dir in ${PATH//:/ }; do [ -x $dir/$tool ] && continue 2 @@ -100,13 +102,13 @@ EOM } function read_config_value { - __param=$1 + local __param=$1 [ -f ~/.garrc ] || die_config_missing ggrep -E "^$__param *=" ~/.garrc | tail -1 | cut -d= -f2 | sed -e 's/^ *//' } function read_makefile_value { - __param=$1 + local __param=$1 ggrep -E "^$__param *=" Makefile | tail -1 | cut -d= -f2 | sed -e 's/^ *//' } @@ -149,6 +151,7 @@ function assert_in_pkg_dir { # Is this a per-pkg command? Relies on *-cmd markers in the code (c.f. ##main) function is_per_pkg_command { + local __cmd __global_cmds __cmd=$1 __global_cmds=`sed -ne '/^# global-cmds/,/^# \/global-cmds/p' $0 | \ ggrep -E '^\s*[^)]+\) ' | cut -d\) -f1 | tr '|' '\n'` @@ -189,7 +192,7 @@ function convert_existing_buildtree { } function init_buildtree { - __buildtree="$1" + local __buildtree="$1" if [ -a "$__buildtree" ]; then echo "The directory $__buildtree already exists. Please remove it." >&2 @@ -214,14 +217,14 @@ function init_buildtree { } function create_legacy_gar_link { - __buildsys="$1" + local __buildsys="$1" if [ ! -h "$__buildsys"/gar ]; then ( cd "$__buildsys" && ln -s . gar ) fi } function assert_multi_buildsys_tree { - __buildsys_tree="$1" + local __buildsys_tree="$1" # migrate from single-buildsys to multi-buildsys (<= mgar version 297) if [ -f "$__buildsys_tree"/category.mk ]; then @@ -237,7 +240,7 @@ function assert_multi_buildsys_tree { # Commit working files (prefixes pkg path and checks for untracked changes) function verify_local_status_and_commit() { - + local opts __forceflag __logmsg __untracked # Beware: getopts stops on the first non-option argument, thus # "mgar . -m foo -f" won't see any getopts handling while getopts "fm:" opts ; do @@ -288,7 +291,7 @@ function get_stagedir() { function get_pkg_buildsysdir() { # fallback to svn:externals until builds are adjusted to carry GARYTPE - __gartype=`read_makefile_value GARTYPE`; + local __gartype=`read_makefile_value GARTYPE`; if [ -z "$__gartype" ]; then __gartype=`svn pg svn:externals . | awk -F/ '/^gar/ { print $NF }'` fi @@ -297,7 +300,7 @@ function get_pkg_buildsysdir() { # Build the index for locating Makefiles within the package build tree function build_index() { - __buildtree=$1 + local __buildtree=$1 [ -d "$__buildtree/.index" ] || mkdir "$__buildtree/.index" cd "$__buildtree" && mknmz \ -Ux \ @@ -310,9 +313,9 @@ function build_index() { # why we do a keyword search first and then - if a specific search "field" was # requested - narrow down the result set with grep. function search_index() { - __buildtree=${1-} - __term="$2" - __searchby="" + local __buildtree=${1-} + local __term="$2" + local __searchby="" [ -d "$__buildtree/.index" ] || \ { echo "Index not found, create it with: mgar index" >&2; exit 2; } -- 1.7.3.2 From maciej at opencsw.org Sat Mar 5 11:18:18 2011 From: maciej at opencsw.org (Maciej Blizinski) Date: Sat, 5 Mar 2011 11:18:18 +0100 Subject: [csw-devel] [PATCH] mGAR v2: README.CSW support, base directories Message-ID: <1299320298-16373-1-git-send-email-maciej@opencsw.org> Before copying README.CSW, make sure that the base directory already exists. --- gar/v2/gar.pkg.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/gar/v2/gar.pkg.mk b/gar/v2/gar.pkg.mk index 644f672..cb8114e 100644 --- a/gar/v2/gar.pkg.mk +++ b/gar/v2/gar.pkg.mk @@ -682,6 +682,7 @@ reset-merge-license: merge-README.CSW: $(WORKDIR) $(_DBG)if test -f $(WORKDIR)/README.CSW; then \ + $(foreach P,$(_PKG_SPECS),mkdir -p $(PKGROOT)$(docdir)/$(call catalogname,$P);) \ $(foreach P,$(_PKG_SPECS),cp $(WORKDIR)/README.CSW $(PKGROOT)$(docdir)/$(call catalogname,$P)/README.CSW;) \ fi @$(MAKECOOKIE) -- 1.7.3.2 From maciej at opencsw.org Sat Mar 5 11:20:54 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Sat, 5 Mar 2011 10:20:54 +0000 Subject: [csw-devel] (no subject) In-Reply-To: <1299319269-8873-2-git-send-email-maciej@opencsw.org> References: <1299319269-8873-1-git-send-email-maciej@opencsw.org> <1299319269-8873-2-git-send-email-maciej@opencsw.org> Message-ID: Not sure why these e-mails were sent. I must have used git send-email wrong. From wahwah at users.sourceforge.net Sat Mar 5 11:56:31 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Mar 2011 10:56:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[13585] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 13585 http://gar.svn.sourceforge.net/gar/?rev=13585&view=rev Author: wahwah Date: 2011-03-05 10:56:31 +0000 (Sat, 05 Mar 2011) Log Message: ----------- mysql5: Reordering package definitions Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-03-05 08:26:58 UTC (rev 13584) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-03-05 10:56:31 UTC (rev 13585) @@ -28,8 +28,20 @@ # Change prefix to /opt/csw/$(NAME) prefix = /opt/csw/$(NAME) localstatedir = /var$(prefix) -sysconfdir = /etc$(prefix) +sysconfdir = /etc/opt/csw +libdir = /opt/csw/lib +includedir = /opt/csw/include +# --bindir=/opt/csw/mysql5/bin +# --datadir=/opt/csw/mysql5/share +# --exec_prefix=/opt/csw/mysql5 +# --infodir=/opt/csw/mysql5/share/info +# --libexecdir=/opt/csw/mysql5/libexec +# --mandir=/opt/csw/mysql5/share/man +# --prefix=/opt/csw/mysql5 +# --sbindir=/opt/csw/mysql5/sbin +# --sharedstatedir=/opt/csw/mysql5/share + # Where to put the init script global_sysconfdir = /etc/opt/csw # Where to link the binaries @@ -37,36 +49,28 @@ INITSMF = $(global_sysconfdir)/init\.d/csw$(NAME) -PACKAGES = CSW$(NAME) -PACKAGES += CSW$(NAME)bench -PACKAGES += CSW$(NAME)client -PACKAGES += CSW$(NAME)devel -PACKAGES += CSW$(NAME)rt -PACKAGES += CSW$(NAME)test +PACKAGES += CSWlibmysqlclient15 +PKGFILES_CSWlibmysqlclient15 += $(call baseisadirs,$(libdir),libmysqlclient\.so\.15(\.\d+)*) +SPKG_DESC_CSWlibmysqlclient15 += MySQL $(BASE_VERSION) client library, libmysqlclient.so.15 +RUNTIME_DEP_PKGS_CSWlibmysqlclient15 += CSWzlib +OBSOLETES_CSWlibmysqlclient15 += CSWmysql5rt -PATCHFILES = 0001-Use-libc-not-libcrypt.patch -PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch -PATCHFILES += 0003-OpenCSW-perl-for-tests.patch -PATCHFILES += 0004-basedir-and-datadir-in-the-cnf-files.patch +PACKAGES += CSWlibmysqlclient-r15 +PKGFILES_CSWlibmysqlclient-r15 += $(call baseisadirs,$(libdir),libmysqlclient_r\.so\.15(\.\d+)*) +SPKG_DESC_CSWlibmysqlclient-r15 += MySQL $(BASE_VERSION) client library, libmysqlclient_r.so.15 +RUNTIME_DEP_PKGS_CSWlibmysqlclient-r15 += CSWzlib +OBSOLETES_CSWlibmysqlclient-r15 += CSWmysql5rt -SPKG_DESC_CSW$(NAME) = Multithreaded SQL database -SPKG_DESC_CSW$(NAME)bench = MySQL $(BASE_VERSION) benchmarking +PACKAGES += CSW$(NAME)client SPKG_DESC_CSW$(NAME)client = MySQL $(BASE_VERSION) client binaries -SPKG_DESC_CSW$(NAME)devel = MySQL $(BASE_VERSION) header files -SPKG_DESC_CSW$(NAME)rt = MySQL $(BASE_VERSION) runtime files -SPKG_DESC_CSW$(NAME)test = MySQL $(BASE_VERSION) testing files - -CATALOGNAME_CSW$(NAME) = $(NAME) -CATALOGNAME_CSW$(NAME)bench = $(NAME)bench -CATALOGNAME_CSW$(NAME)client = $(NAME)client -CATALOGNAME_CSW$(NAME)devel = $(NAME)devel -CATALOGNAME_CSW$(NAME)rt = $(NAME)rt -CATALOGNAME_CSW$(NAME)test = $(NAME)test - - -ARCHALL_CSW$(NAME)bench = 1 -ARCHALL_CSW$(NAME)test = 1 - +RPKGFILES_CSW$(NAME)client = $(bindir) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),$(call baseisadirs,$(bindir),$(bin_name))) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),$(mandir)/man1/$(bin_name)\.1) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),/opt/csw/bin/$(bin_name)) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),/opt/csw/sbin/$(bin_name)) +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient15 +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWncurses +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWzlib # Defining the client programs, which are going to pick up the 32- and 64-bit # binaries, symbolic links, isaexec stuff and man pages. CSW$(NAME)client_programs = myisamlog @@ -86,27 +90,39 @@ CSW$(NAME)client_programs += perror CSW$(NAME)client_programs += replace -# Without this EXTRA_LD_OPTIONS setting, /opt/csw/bin/mysql fails with a shared -# library not found. EXTRA_LIB was tried too, but did not work, as the -R path -# ended up with having two $ISALIST tokens. -# -# Without this setting it looks for: -# /opt/csw/$(NAME)/lib/amd64/libmysqlclient.so.15 -# The library is at: -# /opt/csw/$(NAME)/lib/amd64/mysql/libmysqlclient.so.15 -EXTRA_LD_OPTIONS = -R$(libdir)/\$$ISALIST/mysql +PACKAGES += CSW$(NAME) +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient-r15 +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient15 +SPKG_DESC_CSW$(NAME) = Multithreaded SQL database +RUNTIME_DEP_PKGS_CSW$(NAME) += CSW$(NAME)client +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWzlib +PACKAGES += CSW$(NAME)bench +PACKAGES += CSW$(NAME)devel +PACKAGES += CSW$(NAME)test + +PATCHFILES = 0001-Use-libc-not-libcrypt.patch +PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch +PATCHFILES += 0003-OpenCSW-perl-for-tests.patch +PATCHFILES += 0004-basedir-and-datadir-in-the-cnf-files.patch + +SPKG_DESC_CSW$(NAME)bench = MySQL $(BASE_VERSION) benchmarking +SPKG_DESC_CSW$(NAME)devel = MySQL $(BASE_VERSION) header files +SPKG_DESC_CSW$(NAME)test = MySQL $(BASE_VERSION) testing files + +CATALOGNAME_CSW$(NAME)bench = $(NAME)bench +CATALOGNAME_CSW$(NAME)devel = $(NAME)devel +CATALOGNAME_CSW$(NAME)test = $(NAME)test + +ARCHALL_CSW$(NAME)bench = 1 +ARCHALL_CSW$(NAME)test = 1 + CSW$(NAME)devel_programs += mysql_config # Enable 64 bits build BUILD64 = 1 PKGFILES_CSW$(NAME)bench = $(prefix)/sql-bench.* -PKGFILES_CSW$(NAME)client = $(bindir) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),$(call baseisadirs,$(bindir),$(bin_name))) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),$(mandir)/man1/$(bin_name)\.1) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),/opt/csw/bin/$(bin_name)) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),/opt/csw/sbin/$(bin_name)) PKGFILES_CSW$(NAME)devel += $(foreach bin_name,$(CSW$(NAME)devel_programs),$(call baseisadirs,$(bindir),$(bin_name))) PKGFILES_CSW$(NAME)devel += $(foreach bin_name,$(CSW$(NAME)devel_programs),$(mandir)/man1/$(bin_name)\.1) PKGFILES_CSW$(NAME)devel += $(foreach bin_name,$(CSW$(NAME)devel_programs),/opt/csw/bin/$(bin_name)) @@ -115,22 +131,10 @@ PKGFILES_CSW$(NAME)devel += $(prefix)/include.* PKGFILES_CSW$(NAME)devel += /opt/csw/include/mysql -PKGFILES_CSW$(NAME)rt = $(libdir) -PKGFILES_CSW$(NAME)rt += $(libdir)/.* -# http://www.opencsw.org/bugtrack/view.php?id=4149 -PKGFILES_CSW$(NAME)rt += /opt/csw/lib/mysql PKGFILES_CSW$(NAME)test = $(prefix)/mysql-test.* -RUNTIME_DEP_PKGS_CSW$(NAME) = CSW$(NAME)client -RUNTIME_DEP_PKGS_CSW$(NAME) += CSW$(NAME)rt -RUNTIME_DEP_PKGS_CSW$(NAME) += CSWzlib -RUNTIME_DEP_PKGS_CSW$(NAME)rt += CSWzlib RUNTIME_DEP_PKGS_CSW$(NAME)bench = CSW$(NAME) RUNTIME_DEP_PKGS_CSW$(NAME)bench += CSWperl -RUNTIME_DEP_PKGS_CSW$(NAME)client = CSW$(NAME)rt -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWncurses -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWzlib -RUNTIME_DEP_PKGS_CSW$(NAME)devel = CSW$(NAME)rt RUNTIME_DEP_PKGS_CSW$(NAME)test = CSW$(NAME) RUNTIME_DEP_PKGS_CSW$(NAME)test += CSWperl @@ -187,7 +191,25 @@ CHECKPKG_OVERRIDES_CSWmysql5devel += surplus-dependency|CSWmysql5rt CHECKPKG_OVERRIDES_CSWmysql5 += surplus-dependency|CSWmysql5client CHECKPKG_OVERRIDES_CSWmysql5bench += surplus-dependency|CSWmysql5 +CHECKPKG_OVERRIDES_CSWmysql5test += file-with-bad-content +CHECKPKG_OVERRIDES_CSWmysql5bench += file-with-bad-content +CHECKPKG_OVERRIDES_CSWmysql5client += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man1/mysqlaccess.1 +CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/info/mysql.info +CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man1/myisam_ftdump.1 +CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man1/mysqld_multi.1 +CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man1/mysqld_safe.1 +CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man1/mysqldumpslow.1 +CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man8/mysqlmanager.8 +CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/mysql/mysqld_multi.server +CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/local|root/opt/csw/mysql5/bin/sparcv8/mysqlbug +CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/local|root/opt/csw/mysql5/bin/sparcv9/mysqlbug +CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/export/home|root/opt/csw/mysql5/share/info/mysql.info +CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/share|root/opt/csw/mysql5/share/info/mysql.info +CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/share|root/opt/csw/mysql5/share/man/man1/mysql_tzinfo_to_sql.1 +CHECKPKG_OVERRIDES_CSWmysql5devel += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man1/mysql_config.1 + + include gar/category.mk CFLAGS := $(filter-out -I%,$(CFLAGS)) @@ -207,23 +229,24 @@ cd $(WORKSRC) && autoreconf --force --install --symlink @$(MAKECOOKIE) +post-install-modulated: + (cd $(DESTDIR)$(libdir); gmv -v mysql/* .) + @$(MAKECOOKIE) + post-merge: ginstall -m 755 -d $(PKGROOT)$(localstatedir) ginstall -m 755 -d $(PKGROOT)$(datadir)/mysql/doc ginstall -m 644 $(FILEDIR)/ChangeLog $(PKGROOT)$(datadir)/mysql/doc ginstall -m 644 $(FILEDIR)/README.CSW $(PKGROOT)$(datadir)/mysql/doc ginstall -m 755 -d $(PKGROOT)/opt/csw/share/mysql/doc - ln -sf ../../../$(NAME)/share/mysql/doc/README.CSW \ + gln -sf ../../../$(NAME)/share/mysql/doc/README.CSW \ $(PKGROOT)/opt/csw/share/mysql/doc/README.CSW - ginstall -m 755 -d $(PKGROOT)/etc/opt/csw/init.d - ginstall -m 755 $(FILEDIR)/csw$(NAME) $(PKGROOT)/etc/opt/csw/init.d + ginstall -m 755 -d $(PKGROOT)$(sysconfdir)/init.d + ginstall -m 755 $(FILEDIR)/csw$(NAME) $(PKGROOT)$(sysconfdir)/init.d ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(NAME) ginstall -m 644 $(FILEDIR)/cswusergroup \ $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(NAME) - # A symlink for mysql5 include files - ginstall -m 755 -d $(PKGROOT)/opt/csw/include - ln -s ../$(NAME)/include/mysql $(PKGROOT)/opt/csw/include/mysql # Create symlinks to binaries ginstall -m 755 -d $(PKGROOT)$(global_bindir) for f in $(PKGROOT)$(bindir)/*; do \ @@ -232,16 +255,9 @@ ln -s ../$(NAME)/bin/`basename $$f` \ $(PKGROOT)$(global_bindir)/`basename $$f`; \ done - # /opt/csw/$(NAME)/lib/sparc9/mysql -- by GAR, it's logical - # /opt/csw/$(NAME)/lib/mysql/sparcv9 -- expected by other packages - gln -s ../$(ISA_DEFAULT64)/mysql $(PKGROOT)$(libdir)/mysql/$(ISA_DEFAULT64) - # For other applications to link against - gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 - gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/mysql/64 - gln -s . $(PKGROOT)$(libdir)/$(ISA_DEFAULT) - gln -s . $(PKGROOT)$(libdir)/mysql/$(ISA_DEFAULT) # http://www.opencsw.org/bugtrack/view.php?id=4149 - ginstall -m 755 -d $(PKGROOT)/opt/csw/lib - gln -s ../mysql5/lib/mysql $(PKGROOT)/opt/csw/lib/mysql ginstall -m 755 -d $(PKGROOT)$(sysconfdir) @$(MAKECOOKIE) + +show-dirpaths: + echo $(DIRPATHS) 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 Mar 5 20:49:29 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 05 Mar 2011 19:49:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[13586] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13586 http://gar.svn.sourceforge.net/gar/?rev=13586&view=rev Author: bdwalton Date: 2011-03-05 19:49:29 +0000 (Sat, 05 Mar 2011) Log Message: ----------- ruby18/trunk: correct the pkgfiles split for the -doc package Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-05 10:56:31 UTC (rev 13585) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-05 19:49:29 UTC (rev 13586) @@ -67,7 +67,7 @@ SPKG_DESC_CSWruby18-mode-el = Elisp source for ruby mode (Ruby 1.8) -PKGFILES_CSWruby18-doc = $(datadir)/ri/.* $(docdir)/ruby/sample.* +PKGFILES_CSWruby18-doc = $(datadir)/ri/.* $(docdir)/$(NAME)/sample.* PKGFILES_CSWruby18-tk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb 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 Mar 5 20:56:38 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 05 Mar 2011 19:56:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[13587] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13587 http://gar.svn.sourceforge.net/gar/?rev=13587&view=rev Author: bdwalton Date: 2011-03-05 19:56:37 +0000 (Sat, 05 Mar 2011) Log Message: ----------- php5/trunk: do some further renames for catalog -> package consistency Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-05 19:49:29 UTC (rev 13586) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-05 19:56:37 UTC (rev 13587) @@ -29,10 +29,10 @@ DISTFILES += php.ini.CSW phpext pear.conf.CSW CSWphp5.postinstall PACKAGES = CSWphp5 CSWphp5devel -PACKAGES += CSWphp5bcmath -PACKAGES += CSWphp5bz2 -PACKAGES += CSWphp5calendar -PACKAGES += CSWphp5ctype +PACKAGES += CSWphp5-bcmath +PACKAGES += CSWphp5-bz2 +PACKAGES += CSWphp5-calendar +PACKAGES += CSWphp5-ctype PACKAGES += CSWphp5curl PACKAGES += CSWphp5dba PACKAGES += CSWphp5dbase @@ -96,21 +96,25 @@ RUNTIME_DEP_PKGS_CSWphp5 += CSWlibxml2 CSWzlib RUNTIME_DEP_PKGS_CSWphp5 += CSWlibmm CSWapache2 -CATALOGNAME_CSWphp5bcmath = php5_bcmath -SPKG_DESC_CSWphp5bcmath = The bcmath extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5bcmath = CSWphp5 +CATALOGNAME_CSWphp5-bcmath = php5_bcmath +SPKG_DESC_CSWphp5-bcmath = The bcmath extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-bcmath = CSWphp5 +OBSOLETES_CSWphp5-bcmath = CSWphp5bcmath -CATALOGNAME_CSWphp5bz2 = php5_bz2 -SPKG_DESC_CSWphp5bz2 = The bz2 extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5bz2 = CSWphp5 CSWbzip2 +CATALOGNAME_CSWphp5-bz2 = php5_bz2 +SPKG_DESC_CSWphp5-bz2 = The bz2 extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-bz2 = CSWphp5 CSWbzip2 +OBSOLETES_CSWphp5-bz2 = CSWphp5bz2 -CATALOGNAME_CSWphp5calendar = php5_calendar -SPKG_DESC_CSWphp5calendar = The calendar extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5calendar = CSWphp5 +CATALOGNAME_CSWphp5-calendar = php5_calendar +SPKG_DESC_CSWphp5-calendar = The calendar extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-calendar = CSWphp5 +OBSOLETES_CSWphp5-calendar = CSWphp5calendar -CATALOGNAME_CSWphp5ctype = php5_ctype -SPKG_DESC_CSWphp5ctype = The ctype extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5ctype = CSWphp5 +CATALOGNAME_CSWphp5-ctype = php5_ctype +SPKG_DESC_CSWphp5-ctype = The ctype extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-ctype = CSWphp5 +OBSOLETES_CSWphp5-ctype = CSWphp5ctype CATALOGNAME_CSWphp5curl = php5_curl SPKG_DESC_CSWphp5curl = The curl extension for PHP5 @@ -142,9 +146,10 @@ RUNTIME_DEP_PKGS_CSWphp5gd = CSWphp5 CSWftype2 CSWgd CSWjpeg RUNTIME_DEP_PKGS_CSWphp5gd += CSWpng CSWt1lib CSWxpm CSWzlib -CATALOGNAME_CSWphp5gettext = php5_gettext -SPKG_DESC_CSWphp5gettext = The gettext extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5gettext = CSWphp5 CSWggettextrt +CATALOGNAME_CSWphp5-gettext = php5_gettext +SPKG_DESC_CSWphp5-gettext = The gettext extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-gettext = CSWphp5 CSWggettextrt +OBSOLETES_CSWphp5-gettext = CSWphp5gettext CATALOGNAME_CSWphp5gmp = php5_gmp SPKG_DESC_CSWphp5gmp = The gmp extension for PHP5 @@ -341,13 +346,13 @@ PKGFILES_CSWphp5devel += $(mandir)/man1/php-config.1 PKGFILES_CSWphp5devel += $(mandir)/man1/phpize.1 -PKGFILES_CSWphp5bcmath = .*/lib/php/extensions/.*/bcmath.* +PKGFILES_CSWphp5-bcmath = .*/lib/php/extensions/.*/bcmath.* -PKGFILES_CSWphp5bz2 = .*/lib/php/extensions/.*/bz2.* +PKGFILES_CSWphp5-bz2 = .*/lib/php/extensions/.*/bz2.* -PKGFILES_CSWphp5calendar = .*/lib/php/extensions/.*/calendar.* +PKGFILES_CSWphp5-calendar = .*/lib/php/extensions/.*/calendar.* -PKGFILES_CSWphp5ctype = .*/lib/php/extensions/.*/ctype.* +PKGFILES_CSWphp5-ctype = .*/lib/php/extensions/.*/ctype.* PKGFILES_CSWphp5curl = .*/lib/php/extensions/.*/curl.* @@ -365,7 +370,7 @@ PKGFILES_CSWphp5gd = .*/lib/php/extensions/.*/gd.* PKGFILES_CSWphp5gd += .*/include/php/ext/gd.* -PKGFILES_CSWphp5gettext = .*/lib/php/extensions/.*/gettext.* +PKGFILES_CSWphp5-gettext = .*/lib/php/extensions/.*/gettext.* PKGFILES_CSWphp5gmp = .*/lib/php/extensions/.*/gmp.* @@ -600,13 +605,13 @@ #ENABLE_CHECK = 0 CHECKPKG_OVERRIDES_CSWphp5pdo += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5bcmath += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-bcmath += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5gd += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5tidy += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5pdopgsql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5snmp += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5ctype += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5calendar += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-ctype += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-calendar += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5hash += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sysvshm += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5xmlwriter += surplus-dependency|CSWphp5 @@ -617,7 +622,7 @@ CHECKPKG_OVERRIDES_CSWphp5mbstring += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5xsl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5exif += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5bz2 += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-bz2 += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5pdoodbc += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5dba += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5sysvmsg += surplus-dependency|CSWphp5 @@ -646,7 +651,7 @@ CHECKPKG_OVERRIDES_CSWphp5mimemagic += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5posix += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5ftp += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5gettext += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-gettext += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5mcrypt += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5sqlite += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5xmlrpc += surplus-dependency|CSWphp5 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 Mar 5 21:20:28 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 05 Mar 2011 20:20:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[13588] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13588 http://gar.svn.sourceforge.net/gar/?rev=13588&view=rev Author: bdwalton Date: 2011-03-05 20:20:28 +0000 (Sat, 05 Mar 2011) Log Message: ----------- ruby18/trunk: update man1/ruby override, add it to alternatives selection for ruby Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-05 19:56:37 UTC (rev 13587) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-05 20:20:28 UTC (rev 13588) @@ -21,7 +21,7 @@ OBSOLETES_CSWruby18-mode-el = CSWrubymodeel ALTERNATIVES_CSWruby18 = ruby -ALTERNATIVE_ruby = $(bindir)/ruby ruby $(bindir)/ruby18 10 $(bindir)/irb irb $(bindir)/irb18 $(bindir)/erb erb $(bindir)/erb18 $(bindir)/rdoc rdoc $(bindir)/rdoc18 $(bindir)/ri ri $(bindir)/ri18 $(bindir)/testrb testrb $(bindir)/testrb18 +ALTERNATIVE_ruby = $(bindir)/ruby ruby $(bindir)/ruby18 10 $(bindir)/irb irb $(bindir)/irb18 $(bindir)/erb erb $(bindir)/erb18 $(bindir)/rdoc rdoc $(bindir)/rdoc18 $(bindir)/ri ri $(bindir)/ri18 $(bindir)/testrb testrb $(bindir)/testrb18 $(mandir)/man1/ruby.1 ruby.1 $(mandir)/man1/ruby18.1 ARCHALL_CSWruby18-doc = 1 ARCHALL_CSWruby18-mode = 1 @@ -151,7 +151,7 @@ # usr/local overrides CHECKPKG_OVERRIDES_CSWruby18 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.8/fileutils.rb -CHECKPKG_OVERRIDES_CSWruby18 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/ruby.1 +CHECKPKG_OVERRIDES_CSWruby18 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/ruby18.1 CHECKPKG_OVERRIDES_CSWruby18 += file-with-bad-content|/usr/local|root/opt/csw/bin/ri CHECKPKG_OVERRIDES_CSWruby18-doc += file-with-bad-content 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 Mar 5 21:26:39 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 05 Mar 2011 20:26:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[13589] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13589 http://gar.svn.sourceforge.net/gar/?rev=13589&view=rev Author: bdwalton Date: 2011-03-05 20:26:38 +0000 (Sat, 05 Mar 2011) Log Message: ----------- php5/trunk: more renames Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-05 20:20:28 UTC (rev 13588) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-05 20:26:38 UTC (rev 13589) @@ -33,30 +33,30 @@ PACKAGES += CSWphp5-bz2 PACKAGES += CSWphp5-calendar PACKAGES += CSWphp5-ctype -PACKAGES += CSWphp5curl -PACKAGES += CSWphp5dba -PACKAGES += CSWphp5dbase -PACKAGES += CSWphp5dom -PACKAGES += CSWphp5exif -PACKAGES += CSWphp5ftp -PACKAGES += CSWphp5gd -PACKAGES += CSWphp5gettext -PACKAGES += CSWphp5gmp -PACKAGES += CSWphp5hash -PACKAGES += CSWphp5iconv -PACKAGES += CSWphp5imap -PACKAGES += CSWphp5json -PACKAGES += CSWphp5ldap -PACKAGES += CSWphp5mbstring -PACKAGES += CSWphp5mcrypt -PACKAGES += CSWphp5mhash -PACKAGES += CSWphp5mimemagic -PACKAGES += CSWphp5mssql -PACKAGES += CSWphp5mysql +PACKAGES += CSWphp5-curl +PACKAGES += CSWphp5-dba +PACKAGES += CSWphp5-dbase +PACKAGES += CSWphp5-dom +PACKAGES += CSWphp5-exif +PACKAGES += CSWphp5-ftp +PACKAGES += CSWphp5-gd +PACKAGES += CSWphp5-gettext +PACKAGES += CSWphp5-gmp +PACKAGES += CSWphp5-hash +PACKAGES += CSWphp5-iconv +PACKAGES += CSWphp5-imap +PACKAGES += CSWphp5-json +PACKAGES += CSWphp5-ldap +PACKAGES += CSWphp5-mbstring +PACKAGES += CSWphp5-mcrypt +PACKAGES += CSWphp5-mhash +PACKAGES += CSWphp5-mimemagic +PACKAGES += CSWphp5-mssql +PACKAGES += CSWphp5-mysql PACKAGES += CSWphp5-mysqli -PACKAGES += CSWphp5ncurses -PACKAGES += CSWphp5odbc -PACKAGES += CSWphp5openssl +PACKAGES += CSWphp5-ncurses +PACKAGES += CSWphp5-odbc +PACKAGES += CSWphp5-openssl PACKAGES += CSWphp5pcntl PACKAGES += CSWphp5pdo PACKAGES += CSWphp5pdomysql @@ -116,105 +116,126 @@ RUNTIME_DEP_PKGS_CSWphp5-ctype = CSWphp5 OBSOLETES_CSWphp5-ctype = CSWphp5ctype -CATALOGNAME_CSWphp5curl = php5_curl -SPKG_DESC_CSWphp5curl = The curl extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5curl = CSWphp5 CSWcurlrt CSWlibidn -RUNTIME_DEP_PKGS_CSWphp5curl += CSWoldaprt CSWosslrt CSWzlib +CATALOGNAME_CSWphp5-curl = php5_curl +SPKG_DESC_CSWphp5-curl = The curl extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-curl = CSWphp5 CSWcurlrt CSWlibidn +RUNTIME_DEP_PKGS_CSWphp5-curl += CSWoldaprt CSWosslrt CSWzlib +OBSOLETES_CSWphp5-curl = CSWphp5curl -CATALOGNAME_CSWphp5dba = php5_dba -SPKG_DESC_CSWphp5dba = The dba extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5dba = CSWphp5 CSWlibgdbm3 CSWbdb42 +CATALOGNAME_CSWphp5-dba = php5_dba +SPKG_DESC_CSWphp5-dba = The dba extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-dba = CSWphp5 CSWlibgdbm3 CSWbdb42 +OBSOLETES_CSWphp5-dba = CSWphp5dba -CATALOGNAME_CSWphp5dbase = php5_dbase -SPKG_DESC_CSWphp5dbase = The dbase extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5dbase = CSWphp5 +CATALOGNAME_CSWphp5-dbase = php5_dbase +SPKG_DESC_CSWphp5-dbase = The dbase extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-dbase = CSWphp5 +OBSOLETES_CSWphp5-dbase = CSWphp5dbase -CATALOGNAME_CSWphp5dom = php5_dom -SPKG_DESC_CSWphp5dom = The dom extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5dom = CSWphp5 CSWiconv CSWlibxml2 CSWzlib +CATALOGNAME_CSWphp5-dom = php5_dom +SPKG_DESC_CSWphp5-dom = The dom extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-dom = CSWphp5 CSWiconv CSWlibxml2 CSWzlib +OBSOLETES_CSWphp5-dom = CSWphp5dom -CATALOGNAME_CSWphp5exif = php5_exif -SPKG_DESC_CSWphp5exif = The exif extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5exif = CSWphp5 +CATALOGNAME_CSWphp5-exif = php5_exif +SPKG_DESC_CSWphp5-exif = The exif extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-exif = CSWphp5 +OBSOLETES_CSWphp5-exif = CSWphp5exif -CATALOGNAME_CSWphp5ftp = php5_ftp -SPKG_DESC_CSWphp5ftp = The ftp extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5ftp = CSWphp5 CSWosslrt +CATALOGNAME_CSWphp5-ftp = php5_ftp +SPKG_DESC_CSWphp5-ftp = The ftp extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-ftp = CSWphp5 CSWosslrt +OBSOLETES_CSWphp5-ftp = CSWphp5ftp -CATALOGNAME_CSWphp5gd = php5_gd -SPKG_DESC_CSWphp5gd = The gd extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5gd = CSWphp5 CSWftype2 CSWgd CSWjpeg -RUNTIME_DEP_PKGS_CSWphp5gd += CSWpng CSWt1lib CSWxpm CSWzlib +CATALOGNAME_CSWphp5-gd = php5_gd +SPKG_DESC_CSWphp5-gd = The gd extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-gd = CSWphp5 CSWftype2 CSWgd CSWjpeg +RUNTIME_DEP_PKGS_CSWphp5-gd += CSWpng CSWt1lib CSWxpm CSWzlib +OBSOLETES_CSWphp5-gd = CSWphp5gd CATALOGNAME_CSWphp5-gettext = php5_gettext SPKG_DESC_CSWphp5-gettext = The gettext extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-gettext = CSWphp5 CSWggettextrt OBSOLETES_CSWphp5-gettext = CSWphp5gettext -CATALOGNAME_CSWphp5gmp = php5_gmp -SPKG_DESC_CSWphp5gmp = The gmp extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5gmp = CSWphp5 CSWlibgmp +CATALOGNAME_CSWphp5-gmp = php5_gmp +SPKG_DESC_CSWphp5-gmp = The gmp extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-gmp = CSWphp5 CSWlibgmp +OBSOLETES_CSWphp5-gmp = CSWphp5gmp -CATALOGNAME_CSWphp5hash = php5_hash -SPKG_DESC_CSWphp5hash = The hash extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5hash = CSWphp5 +CATALOGNAME_CSWphp5-hash = php5_hash +SPKG_DESC_CSWphp5-hash = The hash extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-hash = CSWphp5 +OBSOLETES_CSWphp5-hash = CSWphp5hash -CATALOGNAME_CSWphp5iconv = php5_iconv -SPKG_DESC_CSWphp5iconv = The iconv extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5iconv = CSWphp5 CSWiconv +CATALOGNAME_CSWphp5-iconv = php5_iconv +SPKG_DESC_CSWphp5-iconv = The iconv extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-iconv = CSWphp5 CSWiconv +OBSOLETES_CSWphp5-iconv = CSWphp5iconv -CATALOGNAME_CSWphp5imap = php5_imap -SPKG_DESC_CSWphp5imap = The imap extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5imap = CSWphp5 CSWimaprt CSWkrb5lib CSWosslrt +CATALOGNAME_CSWphp5-imap = php5_imap +SPKG_DESC_CSWphp5-imap = The imap extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-imap = CSWphp5 CSWimaprt CSWkrb5lib CSWosslrt +OBSOLETES_CSWphp5-imap = CSWphp5imap -CATALOGNAME_CSWphp5json = php5_json -SPKG_DESC_CSWphp5json = The json extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5json = CSWphp5 +CATALOGNAME_CSWphp5-json = php5_json +SPKG_DESC_CSWphp5-json = The json extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-json = CSWphp5 +OBSOLETES_CSWphp5-json = CSWphp5json -CATALOGNAME_CSWphp5ldap = php5_ldap -SPKG_DESC_CSWphp5ldap = The ldap extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5ldap = CSWphp5 CSWoldaprt CSWsasl +CATALOGNAME_CSWphp5-ldap = php5_ldap +SPKG_DESC_CSWphp5-ldap = The ldap extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-ldap = CSWphp5 CSWoldaprt CSWsasl -CATALOGNAME_CSWphp5mbstring = php5_mbstring -SPKG_DESC_CSWphp5mbstring = The mbstring extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5mbstring = CSWphp5 +CATALOGNAME_CSWphp5-mbstring = php5_mbstring +SPKG_DESC_CSWphp5-mbstring = The mbstring extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-mbstring = CSWphp5 +OBSOLETES_CSWphp5-mbstring = CSWphp5mbstring -CATALOGNAME_CSWphp5mcrypt = php5_mcrypt -SPKG_DESC_CSWphp5mcrypt = The mcrypt extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5mcrypt = CSWphp5 CSWlibmcrypt CSWlibltdl7 +CATALOGNAME_CSWphp5-mcrypt = php5_mcrypt +SPKG_DESC_CSWphp5-mcrypt = The mcrypt extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-mcrypt = CSWphp5 CSWlibmcrypt CSWlibltdl7 +OBSOLETES_CSWphp5-mcrypt = CSWphp5mcrypt -CATALOGNAME_CSWphp5mhash = php5_mhash -SPKG_DESC_CSWphp5mhash = The mhash extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5mhash = CSWphp5 CSWlibmhash +CATALOGNAME_CSWphp5-mhash = php5_mhash +SPKG_DESC_CSWphp5-mhash = The mhash extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-mhash = CSWphp5 CSWlibmhash +OBSOLETES_CSWphp5-mhash = CSWphp5mhash -CATALOGNAME_CSWphp5mimemagic = php5_mime_magic -SPKG_DESC_CSWphp5mimemagic = The mime magic Extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5mimemagic = CSWphp5 +CATALOGNAME_CSWphp5-mimemagic = php5_mime_magic +SPKG_DESC_CSWphp5-mimemagic = The mime magic Extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-mimemagic = CSWphp5 +OBSOLETES_CSWphp5-mimemagic = CSWphp5mimemagic -CATALOGNAME_CSWphp5mssql = php5_mssql -SPKG_DESC_CSWphp5mssql = The mssql extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5mssql = CSWphp5 CSWfreetds +CATALOGNAME_CSWphp5-mssql = php5_mssql +SPKG_DESC_CSWphp5-mssql = The mssql extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-mssql = CSWphp5 CSWfreetds +OBSOLETES_CSWphp5-mssql = CSWphp5mssql -CATALOGNAME_CSWphp5mysql = php5_mysql -SPKG_DESC_CSWphp5mysql = The mysql extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5mysql = CSWphp5 CSWmysql5rt +CATALOGNAME_CSWphp5-mysql = php5_mysql +SPKG_DESC_CSWphp5-mysql = The mysql extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-mysql = CSWphp5 CSWmysql5rt +OBSOLETES_CSWphp5-mysql = CSWphp5mysql CATALOGNAME_CSWphp5-mysqli = php5_mysqli SPKG_DESC_CSWphp5-mysqli = The mysqli extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-mysqli = CSWphp5 CSWmysql5rt CSWzlib -OBSOLETES_CSWphp5-mysqli = CSWphp5mysqli +OBSOLETES_CSWphp5-mysqli = CSWphp5-mysqli -CATALOGNAME_CSWphp5ncurses = php5_ncurses -SPKG_DESC_CSWphp5ncurses = The ncurses extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5ncurses = CSWphp5 CSWncurses +CATALOGNAME_CSWphp5-ncurses = php5_ncurses +SPKG_DESC_CSWphp5-ncurses = The ncurses extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-ncurses = CSWphp5 CSWncurses +OBSOLETES_CSWphp5-ncurses = CSWphp5ncurses -CATALOGNAME_CSWphp5odbc = php5_odbc -SPKG_DESC_CSWphp5odbc = The odbc extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5odbc = CSWphp5 CSWunixodbc +CATALOGNAME_CSWphp5-odbc = php5_odbc +SPKG_DESC_CSWphp5-odbc = The odbc extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-odbc = CSWphp5 CSWunixodbc +OBSOLETES_CSWPhp5-odbc = CSWphp5odbc -CATALOGNAME_CSWphp5openssl = php5_openssl -SPKG_DESC_CSWphp5openssl = The openssl extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5openssl = CSWphp5 CSWosslrt CSWkrb5lib +CATALOGNAME_CSWphp5-openssl = php5_openssl +SPKG_DESC_CSWphp5-openssl = The openssl extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-openssl = CSWphp5 CSWosslrt CSWkrb5lib +OBSOLETES_CSWphp5-openssl = CSWphp5openssl CATALOGNAME_CSWphp5pcntl = php5_pcntl SPKG_DESC_CSWphp5pcntl = The pcntl extension for PHP5 @@ -354,58 +375,58 @@ PKGFILES_CSWphp5-ctype = .*/lib/php/extensions/.*/ctype.* -PKGFILES_CSWphp5curl = .*/lib/php/extensions/.*/curl.* +PKGFILES_CSWphp5-curl = .*/lib/php/extensions/.*/curl.* -PKGFILES_CSWphp5dba = .*/lib/php/extensions/.*/dba\.so +PKGFILES_CSWphp5-dba = .*/lib/php/extensions/.*/dba\.so -PKGFILES_CSWphp5dbase = .*/lib/php/extensions/.*/dbase.* +PKGFILES_CSWphp5-dbase = .*/lib/php/extensions/.*/dbase.* -PKGFILES_CSWphp5dom = .*/lib/php/extensions/.*/dom.* -PKGFILES_CSWphp5dom += .*/include/php/ext/dom.* +PKGFILES_CSWphp5-dom = .*/lib/php/extensions/.*/dom.* +PKGFILES_CSWphp5-dom += .*/include/php/ext/dom.* -PKGFILES_CSWphp5exif = .*/lib/php/extensions/.*/exif.* +PKGFILES_CSWphp5-exif = .*/lib/php/extensions/.*/exif.* -PKGFILES_CSWphp5ftp = .*/lib/php/extensions/.*/ftp.* +PKGFILES_CSWphp5-ftp = .*/lib/php/extensions/.*/ftp.* -PKGFILES_CSWphp5gd = .*/lib/php/extensions/.*/gd.* -PKGFILES_CSWphp5gd += .*/include/php/ext/gd.* +PKGFILES_CSWphp5-gd = .*/lib/php/extensions/.*/gd.* +PKGFILES_CSWphp5-gd += .*/include/php/ext/gd.* PKGFILES_CSWphp5-gettext = .*/lib/php/extensions/.*/gettext.* -PKGFILES_CSWphp5gmp = .*/lib/php/extensions/.*/gmp.* +PKGFILES_CSWphp5-gmp = .*/lib/php/extensions/.*/gmp.* -PKGFILES_CSWphp5hash = .*/lib/php/extensions/.*/hash.* -PKGFILES_CSWphp5hash += .*/include/php/ext/hash.* +PKGFILES_CSWphp5-hash = .*/lib/php/extensions/.*/hash.* +PKGFILES_CSWphp5-hash += .*/include/php/ext/hash.* -PKGFILES_CSWphp5iconv = .*/lib/php/extensions/.*/iconv.* -PKGFILES_CSWphp5iconv += .*/include/php/ext/iconv.* +PKGFILES_CSWphp5-iconv = .*/lib/php/extensions/.*/iconv.* +PKGFILES_CSWphp5-iconv += .*/include/php/ext/iconv.* -PKGFILES_CSWphp5imap = .*/lib/php/extensions/.*/imap.* +PKGFILES_CSWphp5-imap = .*/lib/php/extensions/.*/imap.* -PKGFILES_CSWphp5json = .*/lib/php/extensions/.*/json.* +PKGFILES_CSWphp5-json = .*/lib/php/extensions/.*/json.* -PKGFILES_CSWphp5ldap = .*/lib/php/extensions/.*/ldap.* +PKGFILES_CSWphp5-ldap = .*/lib/php/extensions/.*/ldap.* -PKGFILES_CSWphp5mbstring = .*/lib/php/extensions/.*/mbstring.* -PKGFILES_CSWphp5mbstring += .*/include/php/ext/mbstring.* +PKGFILES_CSWphp5-mbstring = .*/lib/php/extensions/.*/mbstring.* +PKGFILES_CSWphp5-mbstring += .*/include/php/ext/mbstring.* -PKGFILES_CSWphp5mcrypt = .*/lib/php/extensions/.*/mcrypt.* +PKGFILES_CSWphp5-mcrypt = .*/lib/php/extensions/.*/mcrypt.* -PKGFILES_CSWphp5mhash = .*/lib/php/extensions/.*/mhash.* +PKGFILES_CSWphp5-mhash = .*/lib/php/extensions/.*/mhash.* -PKGFILES_CSWphp5mimemagic = .*/lib/php/extensions/.*/mime_magic.* +PKGFILES_CSWphp5-mimemagic = .*/lib/php/extensions/.*/mime_magic.* -PKGFILES_CSWphp5mssql = .*/lib/php/extensions/.*/mssql.* +PKGFILES_CSWphp5-mssql = .*/lib/php/extensions/.*/mssql.* -PKGFILES_CSWphp5mysql = .*/lib/php/extensions/.*/mysql\.so +PKGFILES_CSWphp5-mysql = .*/lib/php/extensions/.*/mysql\.so PKGFILES_CSWphp5-mysqli = .*/lib/php/extensions/.*/mysqli.* -PKGFILES_CSWphp5ncurses = .*/lib/php/extensions/.*/ncurses.* +PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5odbc = .*/lib/php/extensions/.*/odbc.* +PKGFILES_CSWphp5-odbc = .*/lib/php/extensions/.*/odbc.* -PKGFILES_CSWphp5openssl = .*/lib/php/extensions/.*/openssl.* +PKGFILES_CSWphp5-openssl = .*/lib/php/extensions/.*/openssl.* PKGFILES_CSWphp5pcntl = .*/lib/php/extensions/.*/pcntl.* @@ -606,58 +627,58 @@ CHECKPKG_OVERRIDES_CSWphp5pdo += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-bcmath += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5gd += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-gd += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5tidy += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5pdopgsql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5snmp += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-ctype += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-calendar += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5hash += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-hash += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sysvshm += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5xmlwriter += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5xmlreader += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5mysql += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5iconv += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5dbase += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5mbstring += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-mysql += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-iconv += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-dbase += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-mbstring += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5xsl += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5exif += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-exif += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-bz2 += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5pdoodbc += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5dba += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-dba += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5sysvmsg += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5imap += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5odbc += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-imap += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-odbc += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-readline += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5openssl += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-openssl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5pdosqlite += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5sockets += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5ldap += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5ncurses += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5json += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-ldap += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-ncurses += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-json += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5tokenizer += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5dom += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-dom += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5soap += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5pspell += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5wddx += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5gmp += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5mssql += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-gmp += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-mssql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5pcntl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5zip += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5pdomysql += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5curl += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-curl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5sysvsem += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mysqli += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5mimemagic += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-mimemagic += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5posix += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5ftp += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-ftp += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-gettext += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5mcrypt += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-mcrypt += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5sqlite += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5xmlrpc += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5pgsql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5shmop += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5mhash += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-mhash += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5session += surplus-dependency|CSWphp5 include files/scripts.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 Sat Mar 5 21:35:12 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 05 Mar 2011 20:35:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[13590] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13590 http://gar.svn.sourceforge.net/gar/?rev=13590&view=rev Author: bdwalton Date: 2011-03-05 20:35:11 +0000 (Sat, 05 Mar 2011) Log Message: ----------- php5/trunk: yet more renames Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-05 20:26:38 UTC (rev 13589) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-05 20:35:11 UTC (rev 13590) @@ -57,24 +57,24 @@ PACKAGES += CSWphp5-ncurses PACKAGES += CSWphp5-odbc PACKAGES += CSWphp5-openssl -PACKAGES += CSWphp5pcntl -PACKAGES += CSWphp5pdo -PACKAGES += CSWphp5pdomysql -PACKAGES += CSWphp5pdoodbc -PACKAGES += CSWphp5pdopgsql -PACKAGES += CSWphp5pdosqlite -PACKAGES += CSWphp5pgsql -PACKAGES += CSWphp5posix -PACKAGES += CSWphp5pspell +PACKAGES += CSWphp5-pcntl +PACKAGES += CSWphp5-pdo +PACKAGES += CSWphp5-pdomysql +PACKAGES += CSWphp5-pdoodbc +PACKAGES += CSWphp5-pdopgsql +PACKAGES += CSWphp5-pdosqlite +PACKAGES += CSWphp5-pgsql +PACKAGES += CSWphp5-posix +PACKAGES += CSWphp5-pspell PACKAGES += CSWphp5-readline -PACKAGES += CSWphp5session -PACKAGES += CSWphp5shmop -PACKAGES += CSWphp5snmp -PACKAGES += CSWphp5soap -PACKAGES += CSWphp5sockets -PACKAGES += CSWphp5sqlite -PACKAGES += CSWphp5sysvmsg -PACKAGES += CSWphp5sysvsem +PACKAGES += CSWphp5-session +PACKAGES += CSWphp5-shmop +PACKAGES += CSWphp5-snmp +PACKAGES += CSWphp5-soap +PACKAGES += CSWphp5-sockets +PACKAGES += CSWphp5-sqlite +PACKAGES += CSWphp5-sysvmsg +PACKAGES += CSWphp5-sysvsem PACKAGES += CSWphp5-sysvshm PACKAGES += CSWphp5tidy PACKAGES += CSWphp5tokenizer @@ -237,83 +237,100 @@ RUNTIME_DEP_PKGS_CSWphp5-openssl = CSWphp5 CSWosslrt CSWkrb5lib OBSOLETES_CSWphp5-openssl = CSWphp5openssl -CATALOGNAME_CSWphp5pcntl = php5_pcntl -SPKG_DESC_CSWphp5pcntl = The pcntl extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5pcntl = CSWphp5 +CATALOGNAME_CSWphp5-pcntl = php5_pcntl +SPKG_DESC_CSWphp5-pcntl = The pcntl extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-pcntl = CSWphp5 +OBSOLETES_CSWphp5-pcntl = CSWphp5pcntl -CATALOGNAME_CSWphp5pdo = php5_pdo -SPKG_DESC_CSWphp5pdo = A database access abstraction module for PHP applications -RUNTIME_DEP_PKGS_CSWphp5pdo = CSWphp5 +CATALOGNAME_CSWphp5-pdo = php5_pdo +SPKG_DESC_CSWphp5-pdo = A database access abstraction module for PHP applications +RUNTIME_DEP_PKGS_CSWphp5-pdo = CSWphp5 +OBSOLETES_CSWphp5-pdo = CSWphp5pdo -CATALOGNAME_CSWphp5pdomysql = php5_pdomysql -SPKG_DESC_CSWphp5pdomysql = A MySQL specific database access abstraction module for PHP applications (pdo version) -RUNTIME_DEP_PKGS_CSWphp5pdomysql = CSWphp5 CSWmysql5rt CSWzlib CSWphp5pdo +CATALOGNAME_CSWphp5-pdomysql = php5_pdomysql +SPKG_DESC_CSWphp5-pdomysql = A MySQL specific database access abstraction module for PHP applications (pdo version) +RUNTIME_DEP_PKGS_CSWphp5-pdomysql = CSWphp5 CSWmysql5rt CSWzlib CSWphp5-pdo +OBSOLETS_CSWphp5-pdomysql = CSWphp5pdomysql -CATALOGNAME_CSWphp5pdoodbc = php5_pdoodbc -SPKG_DESC_CSWphp5pdoodbc = An ODBC specific database access abstraction module for PHP applications -RUNTIME_DEP_PKGS_CSWphp5pdoodbc = CSWphp5 CSWunixodbc CSWphp5pdo +CATALOGNAME_CSWphp5-pdoodbc = php5_pdoodbc +SPKG_DESC_CSWphp5-pdoodbc = An ODBC specific database access abstraction module for PHP applications +RUNTIME_DEP_PKGS_CSWphp5-pdoodbc = CSWphp5 CSWunixodbc CSWphp5-pdo +OBSOLETS_CSWphp5-pdoodbc = CSWphp5pdoodbc -CATALOGNAME_CSWphp5pdopgsql = php5_pdopgsql -SPKG_DESC_CSWphp5pdopgsql = A PgSQL specific database access abstraction module for PHP applications (pdo version) -RUNTIME_DEP_PKGS_CSWphp5pdopgsql = CSWphp5 CSWlibpq CSWphp5pdo +CATALOGNAME_CSWphp5-pdopgsql = php5_pdopgsql +SPKG_DESC_CSWphp5-pdopgsql = A PgSQL specific database access abstraction module for PHP applications (pdo version) +RUNTIME_DEP_PKGS_CSWphp5-pdopgsql = CSWphp5 CSWlibpq CSWphp5-pdo +OBSOLETS_CSWphp5-pdopgsql = CSWphp5pdopgsql -CATALOGNAME_CSWphp5pdosqlite = php5_pdosqlite -SPKG_DESC_CSWphp5pdosqlite = A Sqlite specific database access abstraction module for PHP applications (pdo version) -RUNTIME_DEP_PKGS_CSWphp5pdosqlite = CSWphp5 CSWphp5pdo +CATALOGNAME_CSWphp5-pdosqlite = php5_pdosqlite +SPKG_DESC_CSWphp5-pdosqlite = A Sqlite specific database access abstraction module for PHP applications (pdo version) +RUNTIME_DEP_PKGS_CSWphp5-pdosqlite = CSWphp5 CSWphp5-pdo +OBSOLETES_CSWphp5-pdosqlite = CSWphp5pdosqlite -CATALOGNAME_CSWphp5pgsql = php5_pgsql -SPKG_DESC_CSWphp5pgsql = The pgsql extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5pgsql = CSWphp5 CSWlibpq +CATALOGNAME_CSWphp5-pgsql = php5_pgsql +SPKG_DESC_CSWphp5-pgsql = The pgsql extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-pgsql = CSWphp5 CSWlibpq +OBSOLETES_CSWphp5-pgsql = CSWphp5pgsql -CATALOGNAME_CSWphp5posix = php5_posix -SPKG_DESC_CSWphp5posix = The posix extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5posix = CSWphp5 +CATALOGNAME_CSWphp5-posix = php5_posix +SPKG_DESC_CSWphp5-posix = The posix extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-posix = CSWphp5 +OBSOLETES_CSWphp5-posix = CSWphp5posix -CATALOGNAME_CSWphp5pspell = php5_pspell -SPKG_DESC_CSWphp5pspell = The pspell extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5pspell = CSWphp5 CSWaspell +CATALOGNAME_CSWphp5-pspell = php5_pspell +SPKG_DESC_CSWphp5-pspell = The pspell extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-pspell = CSWphp5 CSWaspell +OBSOLETES_CSWphp5-pspell = CSWphp5pspell CATALOGNAME_CSWphp5-readline = php5_readline SPKG_DESC_CSWphp5-readline = The readline extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-readline = CSWphp5 CSWreadline CSWncurses OBSOLETES_CSWphp5-readline = CSWphp5readline -CATALOGNAME_CSWphp5session = php5_session -SPKG_DESC_CSWphp5session = The session extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5session = CSWphp5 CSWlibmm +CATALOGNAME_CSWphp5-session = php5_session +SPKG_DESC_CSWphp5-session = The session extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-session = CSWphp5 CSWlibmm +OBSOLETES_CSWphp5-session = CSWphp5-session -CATALOGNAME_CSWphp5shmop = php5_shmop -SPKG_DESC_CSWphp5shmop = The shmop extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5shmop = CSWphp5 +CATALOGNAME_CSWphp5-shmop = php5_shmop +SPKG_DESC_CSWphp5-shmop = The shmop extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-shmop = CSWphp5 +OBSOLETS_CSWphp5-shmop = CSWphp5shmop -CATALOGNAME_CSWphp5snmp = php5_snmp -SPKG_DESC_CSWphp5snmp = The snmp extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5snmp = CSWphp5 CSWnetsnmp CSWosslrt CSWtcpwrap +CATALOGNAME_CSWphp5-snmp = php5_snmp +SPKG_DESC_CSWphp5-snmp = The snmp extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-snmp = CSWphp5 CSWnetsnmp CSWosslrt CSWtcpwrap +OBSOLETES_CSWphp5-snmp = CSWphp5snmp -CATALOGNAME_CSWphp5soap = php5_soap -SPKG_DESC_CSWphp5soap = The soap extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5soap = CSWphp5 CSWiconv CSWlibxml2 CSWzlib +CATALOGNAME_CSWphp5-soap = php5_soap +SPKG_DESC_CSWphp5-soap = The soap extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-soap = CSWphp5 CSWiconv CSWlibxml2 CSWzlib +OBSOLETES_CSWphp5-soap = CSWphp5soap -CATALOGNAME_CSWphp5sockets = php5_sockets -SPKG_DESC_CSWphp5sockets = The sockets extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5sockets = CSWphp5 +CATALOGNAME_CSWphp5-sockets = php5_sockets +SPKG_DESC_CSWphp5-sockets = The sockets extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-sockets = CSWphp5 +OBSOLETES_CSWphp5-sockets = CSWphp5sockets -CATALOGNAME_CSWphp5sqlite = php5_sqlite -SPKG_DESC_CSWphp5sqlite = The sqlite extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5sqlite = CSWphp5 CSWsqlite +CATALOGNAME_CSWphp5-sqlite = php5_sqlite +SPKG_DESC_CSWphp5-sqlite = The sqlite extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-sqlite = CSWphp5 CSWsqlite +OBSOLETS_CSWphp5-sqlite = CSWphp5sqlite -CATALOGNAME_CSWphp5sysvmsg = php5_sysvmsg -SPKG_DESC_CSWphp5sysvmsg = The sysvmsg extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5sysvmsg = CSWphp5 +CATALOGNAME_CSWphp5-sysvmsg = php5_sysvmsg +SPKG_DESC_CSWphp5-sysvmsg = The sysvmsg extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-sysvmsg = CSWphp5 +OBSOLETS_CSWphp5-sysvmsg = CSWphp5sysvmsg -CATALOGNAME_CSWphp5sysvsem = php5_sysvsem -SPKG_DESC_CSWphp5sysvsem = The sysvsem extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5sysvsem = CSWphp5 +CATALOGNAME_CSWphp5-sysvsem = php5_sysvsem +SPKG_DESC_CSWphp5-sysvsem = The sysvsem extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-sysvsem = CSWphp5 +OBSOLETS_CSWphp5-sysvsem = CSWphp5sysvsem CATALOGNAME_CSWphp5-sysvshm = php5_sysvshm SPKG_DESC_CSWphp5-sysvshm = The sysvshm extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-sysvshm = CSWphp5 -OBSOLETES_CSWphp5-sysvshm = CSWphp5sysvshm +OBSOLETES_CSWphp5-sysvshm = CSWphp5-sysvshm CATALOGNAME_CSWphp5tidy = php5_tidy SPKG_DESC_CSWphp5tidy = The tidy extension for PHP5 @@ -428,44 +445,44 @@ PKGFILES_CSWphp5-openssl = .*/lib/php/extensions/.*/openssl.* -PKGFILES_CSWphp5pcntl = .*/lib/php/extensions/.*/pcntl.* +PKGFILES_CSWphp5-pcntl = .*/lib/php/extensions/.*/pcntl.* -PKGFILES_CSWphp5pdo = .*/lib/php/extensions/.*/pdo\.so* -PKGFILES_CSWphp5pdo += .*/include/php/ext/pdo.* +PKGFILES_CSWphp5-pdo = .*/lib/php/extensions/.*/pdo\.so* +PKGFILES_CSWphp5-pdo += .*/include/php/ext/pdo.* -PKGFILES_CSWphp5pdomysql = .*/lib/php/extensions/.*/pdo_mysql.* +PKGFILES_CSWphp5-pdomysql = .*/lib/php/extensions/.*/pdo_mysql.* -PKGFILES_CSWphp5pdoodbc = .*/lib/php/extensions/.*/pdo_odbc.* +PKGFILES_CSWphp5-pdoodbc = .*/lib/php/extensions/.*/pdo_odbc.* -PKGFILES_CSWphp5pdopgsql = .*/lib/php/extensions/.*/pdo_pgsql.* +PKGFILES_CSWphp5-pdopgsql = .*/lib/php/extensions/.*/pdo_pgsql.* -PKGFILES_CSWphp5pdosqlite = .*/lib/php/extensions/.*/pdo_sqlite.* +PKGFILES_CSWphp5-pdosqlite = .*/lib/php/extensions/.*/pdo_sqlite.* -PKGFILES_CSWphp5pgsql = .*/lib/php/extensions/.*/pgsql.* +PKGFILES_CSWphp5-pgsql = .*/lib/php/extensions/.*/pgsql.* -PKGFILES_CSWphp5posix = .*/lib/php/extensions/.*/posix.* +PKGFILES_CSWphp5-posix = .*/lib/php/extensions/.*/posix.* -PKGFILES_CSWphp5pspell = .*/lib/php/extensions/.*/pspell.* +PKGFILES_CSWphp5-pspell = .*/lib/php/extensions/.*/pspell.* PKGFILES_CSWphp5-readline = .*/lib/php/extensions/.*/readline.* -PKGFILES_CSWphp5session = .*/lib/php/extensions/.*/session.* -PKGFILES_CSWphp5session += .*/include/php/ext/session.* +PKGFILES_CSWphp5-session = .*/lib/php/extensions/.*/session.* +PKGFILES_CSWphp5-session += .*/include/php/ext/session.* -PKGFILES_CSWphp5shmop = .*/lib/php/extensions/.*/shmop.* +PKGFILES_CSWphp5-shmop = .*/lib/php/extensions/.*/shmop.* -PKGFILES_CSWphp5snmp = .*/lib/php/extensions/.*/snmp.* +PKGFILES_CSWphp5-snmp = .*/lib/php/extensions/.*/snmp.* -PKGFILES_CSWphp5soap = .*/lib/php/extensions/.*/soap.* +PKGFILES_CSWphp5-soap = .*/lib/php/extensions/.*/soap.* -PKGFILES_CSWphp5sockets = .*/lib/php/extensions/.*/sockets.* +PKGFILES_CSWphp5-sockets = .*/lib/php/extensions/.*/sockets.* -PKGFILES_CSWphp5sqlite = .*/lib/php/extensions/.*/sqlite.* -PKGFILES_CSWphp5sqlite += .*/include/php/ext/sqlite.* +PKGFILES_CSWphp5-sqlite = .*/lib/php/extensions/.*/sqlite.* +PKGFILES_CSWphp5-sqlite += .*/include/php/ext/sqlite.* -PKGFILES_CSWphp5sysvmsg = .*/lib/php/extensions/.*/sysvmsg.* +PKGFILES_CSWphp5-sysvmsg = .*/lib/php/extensions/.*/sysvmsg.* -PKGFILES_CSWphp5sysvsem = .*/lib/php/extensions/.*/sysvsem.* +PKGFILES_CSWphp5-sysvsem = .*/lib/php/extensions/.*/sysvsem.* PKGFILES_CSWphp5-sysvshm = .*/lib/php/extensions/.*/sysvshm.* @@ -625,12 +642,12 @@ SKIPTEST = 1 #ENABLE_CHECK = 0 -CHECKPKG_OVERRIDES_CSWphp5pdo += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-pdo += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-bcmath += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-gd += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5tidy += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5pdopgsql += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5snmp += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-snmp += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-ctype += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-calendar += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-hash += surplus-dependency|CSWphp5 @@ -644,42 +661,42 @@ CHECKPKG_OVERRIDES_CSWphp5xsl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-exif += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-bz2 += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5pdoodbc += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-dba += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5sysvmsg += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-sysvmsg += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-imap += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-odbc += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-readline += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-openssl += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5pdosqlite += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5sockets += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-sockets += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-ldap += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-ncurses += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-json += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5tokenizer += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-dom += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5soap += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5pspell += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-soap += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-pspell += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5wddx += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-gmp += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mssql += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5pcntl += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-pcntl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5zip += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5pdomysql += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-curl += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5sysvsem += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-sysvsem += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mysqli += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mimemagic += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5posix += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-posix += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-ftp += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-gettext += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mcrypt += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5sqlite += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-sqlite += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5xmlrpc += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5pgsql += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5shmop += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-pgsql += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-shmop += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mhash += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5session += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-session += surplus-dependency|CSWphp5 include files/scripts.mk 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 Sat Mar 5 21:59:06 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 05 Mar 2011 20:59:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[13591] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13591 http://gar.svn.sourceforge.net/gar/?rev=13591&view=rev Author: bdwalton Date: 2011-03-05 20:59:06 +0000 (Sat, 05 Mar 2011) Log Message: ----------- php5/trunk: complete the renames Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-05 20:35:11 UTC (rev 13590) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-05 20:59:06 UTC (rev 13591) @@ -76,14 +76,14 @@ PACKAGES += CSWphp5-sysvmsg PACKAGES += CSWphp5-sysvsem PACKAGES += CSWphp5-sysvshm -PACKAGES += CSWphp5tidy -PACKAGES += CSWphp5tokenizer -PACKAGES += CSWphp5wddx -PACKAGES += CSWphp5xmlreader -PACKAGES += CSWphp5xmlrpc -PACKAGES += CSWphp5xmlwriter -PACKAGES += CSWphp5xsl -PACKAGES += CSWphp5zip +PACKAGES += CSWphp5-tidy +PACKAGES += CSWphp5-tokenizer +PACKAGES += CSWphp5-wddx +PACKAGES += CSWphp5-xmlreader +PACKAGES += CSWphp5-xmlrpc +PACKAGES += CSWphp5-xmlwriter +PACKAGES += CSWphp5-xsl +PACKAGES += CSWphp5-zip BUILD_DEP_PKGS += CSWlibgdbm-dev @@ -250,17 +250,17 @@ CATALOGNAME_CSWphp5-pdomysql = php5_pdomysql SPKG_DESC_CSWphp5-pdomysql = A MySQL specific database access abstraction module for PHP applications (pdo version) RUNTIME_DEP_PKGS_CSWphp5-pdomysql = CSWphp5 CSWmysql5rt CSWzlib CSWphp5-pdo -OBSOLETS_CSWphp5-pdomysql = CSWphp5pdomysql +OBSOLETES_CSWphp5-pdomysql = CSWphp5pdomysql CATALOGNAME_CSWphp5-pdoodbc = php5_pdoodbc SPKG_DESC_CSWphp5-pdoodbc = An ODBC specific database access abstraction module for PHP applications RUNTIME_DEP_PKGS_CSWphp5-pdoodbc = CSWphp5 CSWunixodbc CSWphp5-pdo -OBSOLETS_CSWphp5-pdoodbc = CSWphp5pdoodbc +OBSOLETES_CSWphp5-pdoodbc = CSWphp5pdoodbc CATALOGNAME_CSWphp5-pdopgsql = php5_pdopgsql SPKG_DESC_CSWphp5-pdopgsql = A PgSQL specific database access abstraction module for PHP applications (pdo version) RUNTIME_DEP_PKGS_CSWphp5-pdopgsql = CSWphp5 CSWlibpq CSWphp5-pdo -OBSOLETS_CSWphp5-pdopgsql = CSWphp5pdopgsql +OBSOLETES_CSWphp5-pdopgsql = CSWphp5pdopgsql CATALOGNAME_CSWphp5-pdosqlite = php5_pdosqlite SPKG_DESC_CSWphp5-pdosqlite = A Sqlite specific database access abstraction module for PHP applications (pdo version) @@ -295,7 +295,7 @@ CATALOGNAME_CSWphp5-shmop = php5_shmop SPKG_DESC_CSWphp5-shmop = The shmop extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-shmop = CSWphp5 -OBSOLETS_CSWphp5-shmop = CSWphp5shmop +OBSOLETES_CSWphp5-shmop = CSWphp5shmop CATALOGNAME_CSWphp5-snmp = php5_snmp SPKG_DESC_CSWphp5-snmp = The snmp extension for PHP5 @@ -315,55 +315,63 @@ CATALOGNAME_CSWphp5-sqlite = php5_sqlite SPKG_DESC_CSWphp5-sqlite = The sqlite extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-sqlite = CSWphp5 CSWsqlite -OBSOLETS_CSWphp5-sqlite = CSWphp5sqlite +OBSOLETES_CSWphp5-sqlite = CSWphp5sqlite CATALOGNAME_CSWphp5-sysvmsg = php5_sysvmsg SPKG_DESC_CSWphp5-sysvmsg = The sysvmsg extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-sysvmsg = CSWphp5 -OBSOLETS_CSWphp5-sysvmsg = CSWphp5sysvmsg +OBSOLETES_CSWphp5-sysvmsg = CSWphp5sysvmsg CATALOGNAME_CSWphp5-sysvsem = php5_sysvsem SPKG_DESC_CSWphp5-sysvsem = The sysvsem extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-sysvsem = CSWphp5 -OBSOLETS_CSWphp5-sysvsem = CSWphp5sysvsem +OBSOLETES_CSWphp5-sysvsem = CSWphp5sysvsem CATALOGNAME_CSWphp5-sysvshm = php5_sysvshm SPKG_DESC_CSWphp5-sysvshm = The sysvshm extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-sysvshm = CSWphp5 OBSOLETES_CSWphp5-sysvshm = CSWphp5-sysvshm -CATALOGNAME_CSWphp5tidy = php5_tidy -SPKG_DESC_CSWphp5tidy = The tidy extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5tidy = CSWphp5 CSWhtmltidy +CATALOGNAME_CSWphp5-tidy = php5_tidy +SPKG_DESC_CSWphp5-tidy = The tidy extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-tidy = CSWphp5 CSWhtmltidy +OBSOLETES_CSWphp5-tidy = CSWphp5tidy -CATALOGNAME_CSWphp5tokenizer = php5_tokenizer -SPKG_DESC_CSWphp5tokenizer = The tokenizer extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5tokenizer = CSWphp5 +CATALOGNAME_CSWphp5-tokenizer = php5_tokenizer +SPKG_DESC_CSWphp5-tokenizer = The tokenizer extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-tokenizer = CSWphp5 +OBSOLETES_CSWphp5-tokenizer = CSWphp5tokenizer -CATALOGNAME_CSWphp5wddx = php5_wddx -SPKG_DESC_CSWphp5wddx = The wddx extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5wddx = CSWphp5 +CATALOGNAME_CSWphp5-wddx = php5_wddx +SPKG_DESC_CSWphp5-wddx = The wddx extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-wddx = CSWphp5 +OBSOLETES_CSWphp5-wddx = CSWphp5wddx -CATALOGNAME_CSWphp5xmlreader = php5_xmlreader -SPKG_DESC_CSWphp5xmlreader = The xmlreader extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5xmlreader = CSWphp5 CSWiconv CSWlibxml2 CSWzlib +CATALOGNAME_CSWphp5-xmlreader = php5_xmlreader +SPKG_DESC_CSWphp5-xmlreader = The xmlreader extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-xmlreader = CSWphp5 CSWiconv CSWlibxml2 CSWzlib +OBSOLETES_CSWphp5-xmlreader = CSWphp5xmlreader -CATALOGNAME_CSWphp5xmlrpc = php5_xmlrpc -SPKG_DESC_CSWphp5xmlrpc = The xmlrpc extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5xmlrpc = CSWphp5 CSWiconv CSWlibxml2 CSWzlib CSWexpat +CATALOGNAME_CSWphp5-xmlrpc = php5_xmlrpc +SPKG_DESC_CSWphp5-xmlrpc = The xmlrpc extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-xmlrpc = CSWphp5 CSWiconv CSWlibxml2 CSWzlib CSWexpat +OBSOLETES_CSWphp5-xmlrpc = CSWphp5xmlrpc -CATALOGNAME_CSWphp5xmlwriter = php5_xmlwriter -SPKG_DESC_CSWphp5xmlwriter = The xmlwriter extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5xmlwriter = CSWphp5 CSWiconv CSWlibxml2 CSWzlib +CATALOGNAME_CSWphp5-xmlwriter = php5_xmlwriter +SPKG_DESC_CSWphp5-xmlwriter = The xmlwriter extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-xmlwriter = CSWphp5 CSWiconv CSWlibxml2 CSWzlib +OBSOLETES_CSWphp5-xmlwriter = CSWphp5xmlwriter -CATALOGNAME_CSWphp5xsl = php5_xsl -SPKG_DESC_CSWphp5xsl = The xsl extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5xsl = CSWphp5 CSWiconv CSWlibxml2 -RUNTIME_DEP_PKGS_CSWphp5xsl += CSWlibxslt CSWzlib +CATALOGNAME_CSWphp5-xsl = php5_xsl +SPKG_DESC_CSWphp5-xsl = The xsl extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-xsl = CSWphp5 CSWiconv CSWlibxml2 +RUNTIME_DEP_PKGS_CSWphp5-xsl += CSWlibxslt CSWzlib +OBSOLETES_CSWphp5-xsl = CSWphp5xsl -CATALOGNAME_CSWphp5zip = php5_zip -SPKG_DESC_CSWphp5zip = The zip extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5zip = CSWphp5 CSWzlib +CATALOGNAME_CSWphp5-zip = php5_zip +SPKG_DESC_CSWphp5-zip = The zip extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-zip = CSWphp5 CSWzlib +OBSOLETES_CSWphp5-zip = CSWphp5zip PKGFILES_CSWphp5devel = $(bindir)/php-config PKGFILES_CSWphp5devel += $(bindir)/phpize @@ -486,21 +494,21 @@ PKGFILES_CSWphp5-sysvshm = .*/lib/php/extensions/.*/sysvshm.* -PKGFILES_CSWphp5tidy = .*/lib/php/extensions/.*/tidy.* +PKGFILES_CSWphp5-tidy = .*/lib/php/extensions/.*/tidy.* -PKGFILES_CSWphp5tokenizer = .*/lib/php/extensions/.*/tokenizer.* +PKGFILES_CSWphp5-tokenizer = .*/lib/php/extensions/.*/tokenizer.* -PKGFILES_CSWphp5wddx = .*/lib/php/extensions/.*/wddx.* +PKGFILES_CSWphp5-wddx = .*/lib/php/extensions/.*/wddx.* -PKGFILES_CSWphp5xmlreader = .*/lib/php/extensions/.*/xmlreader.* +PKGFILES_CSWphp5-xmlreader = .*/lib/php/extensions/.*/xmlreader.* -PKGFILES_CSWphp5xmlrpc = .*/lib/php/extensions/.*/xmlrpc.* +PKGFILES_CSWphp5-xmlrpc = .*/lib/php/extensions/.*/xmlrpc.* -PKGFILES_CSWphp5xmlwriter = .*/lib/php/extensions/.*/xmlwriter.* +PKGFILES_CSWphp5-xmlwriter = .*/lib/php/extensions/.*/xmlwriter.* -PKGFILES_CSWphp5xsl = .*/lib/php/extensions/.*/xsl.* +PKGFILES_CSWphp5-xsl = .*/lib/php/extensions/.*/xsl.* -PKGFILES_CSWphp5zip = .*/lib/php/extensions/.*/zip.* +PKGFILES_CSWphp5-zip = .*/lib/php/extensions/.*/zip.* PATCHFILES += configure.diff PATCHFILES += odbc.diff @@ -645,20 +653,20 @@ CHECKPKG_OVERRIDES_CSWphp5-pdo += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-bcmath += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-gd += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5tidy += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-tidy += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-snmp += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-ctype += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-calendar += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-hash += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sysvshm += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5xmlwriter += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5xmlreader += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-xmlwriter += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-xmlreader += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mysql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-iconv += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-dbase += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mbstring += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5xsl += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-xsl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-exif += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-bz2 += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5 @@ -673,15 +681,15 @@ CHECKPKG_OVERRIDES_CSWphp5-ldap += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-ncurses += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-json += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5tokenizer += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-tokenizer += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-dom += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-soap += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pspell += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5wddx += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-wddx += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-gmp += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mssql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pcntl += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5zip += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-zip += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-curl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sysvsem += surplus-dependency|CSWphp5 @@ -692,7 +700,7 @@ CHECKPKG_OVERRIDES_CSWphp5-gettext += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mcrypt += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sqlite += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5xmlrpc += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-xmlrpc += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pgsql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-shmop += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mhash += surplus-dependency|CSWphp5 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 Mar 5 22:01:43 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 05 Mar 2011 21:01:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[13592] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13592 http://gar.svn.sourceforge.net/gar/?rev=13592&view=rev Author: bdwalton Date: 2011-03-05 21:01:43 +0000 (Sat, 05 Mar 2011) Log Message: ----------- ruby18/trunk: correct override for ri holding usr/local reference Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-05 20:59:06 UTC (rev 13591) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-05 21:01:43 UTC (rev 13592) @@ -152,7 +152,7 @@ # usr/local overrides CHECKPKG_OVERRIDES_CSWruby18 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.8/fileutils.rb CHECKPKG_OVERRIDES_CSWruby18 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/ruby18.1 -CHECKPKG_OVERRIDES_CSWruby18 += file-with-bad-content|/usr/local|root/opt/csw/bin/ri +CHECKPKG_OVERRIDES_CSWruby18 += file-with-bad-content|/usr/local|root/opt/csw/bin/ri18 CHECKPKG_OVERRIDES_CSWruby18-doc += file-with-bad-content CHECKPKG_OVERRIDES_CSWruby18-tk += file-with-bad-content|/usr/share|root/opt/csw/lib/ruby/1.8/tk/dialog.rb 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 Mar 5 22:03:44 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 05 Mar 2011 21:03:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[13593] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13593 http://gar.svn.sourceforge.net/gar/?rev=13593&view=rev Author: bdwalton Date: 2011-03-05 21:03:44 +0000 (Sat, 05 Mar 2011) Log Message: ----------- ruby18/trunk: override alternatives dep for ruby18 Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-05 21:01:43 UTC (rev 13592) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-05 21:03:44 UTC (rev 13593) @@ -149,6 +149,8 @@ CHECKPKG_OVERRIDES_CSWruby18-doc += missing-dependency|CSWperl CHECKPKG_OVERRIDES_CSWruby18-doc += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWruby18 += surplus-dependency|CSWalternatives + # usr/local overrides CHECKPKG_OVERRIDES_CSWruby18 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.8/fileutils.rb CHECKPKG_OVERRIDES_CSWruby18 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/ruby18.1 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 Mar 5 22:34:08 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 05 Mar 2011 21:34:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[13594] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13594 http://gar.svn.sourceforge.net/gar/?rev=13594&view=rev Author: bdwalton Date: 2011-03-05 21:34:08 +0000 (Sat, 05 Mar 2011) Log Message: ----------- ruby18/trunk: rename libruby-1 to match new soname after using --program-suffix; obsolete old package Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-05 21:03:44 UTC (rev 13593) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-05 21:34:08 UTC (rev 13594) @@ -11,7 +11,7 @@ BUILD_DEP_PKGS += CSWreadline CSWzlib CSWossldevel PACKAGES = CSWruby18 CSWruby18-doc CSWruby18-tk CSWruby18-dev CSWruby18-mode -PACKAGES += CSWruby18-mode-el CSWlibruby1 +PACKAGES += CSWruby18-mode-el CSWlibruby18-1 OBSOLETES_CSWruby18 = CSWruby OBSOLETES_CSWruby18-doc = CSWrubydoc @@ -19,6 +19,7 @@ OBSOLETES_CSWruby18-dev = CSWrubydev OBSOLETES_CSWruby18-mode = CSWrubymode OBSOLETES_CSWruby18-mode-el = CSWrubymodeel +OBSOLETES_CSWlibruby18-1 = CSWlibruby1 ALTERNATIVES_CSWruby18 = ruby ALTERNATIVE_ruby = $(bindir)/ruby ruby $(bindir)/ruby18 10 $(bindir)/irb irb $(bindir)/irb18 $(bindir)/erb erb $(bindir)/erb18 $(bindir)/rdoc rdoc $(bindir)/rdoc18 $(bindir)/ri ri $(bindir)/ri18 $(bindir)/testrb testrb $(bindir)/testrb18 $(mandir)/man1/ruby.1 ruby.1 $(mandir)/man1/ruby18.1 @@ -29,14 +30,14 @@ LICENSE = COPYING -RUNTIME_DEP_PKGS_CSWruby18 = CSWbdb48 CSWlibgdbm3 CSWiconv CSWlibruby1 +RUNTIME_DEP_PKGS_CSWruby18 = CSWbdb48 CSWlibgdbm3 CSWiconv CSWlibruby18-1 RUNTIME_DEP_PKGS_CSWruby18 += CSWncurses CSWosslrt CSWreadline CSWzlib RUNTIME_DEP_PKGS_CSWruby18-doc = CSWruby18 -RUNTIME_DEP_PKGS_CSWruby18-tk = CSWruby18 CSWtk CSWtcl CSWlibruby1 +RUNTIME_DEP_PKGS_CSWruby18-tk = CSWruby18 CSWtk CSWtcl CSWlibruby18-1 -RUNTIME_DEP_PKGS_CSWruby18-dev = CSWruby18 CSWlibruby1 CSWcoreutils +RUNTIME_DEP_PKGS_CSWruby18-dev = CSWruby18 CSWlibruby18-1 CSWcoreutils RUNTIME_DEP_PKGS_CSWruby18-mode = CSWemacscommon @@ -55,7 +56,7 @@ SPKG_DESC_CSWruby18 = $(DESCRIPTION) -SPKG_DESC_CSWlibruby1 = The libruby.so.1* files (Ruby 1.8) +SPKG_DESC_CSWlibruby18-1 = The libruby.so.1* files (Ruby 1.8) SPKG_DESC_CSWruby18-doc = Documentation for Ruby 1.8 @@ -78,8 +79,8 @@ PKGFILES_CSWruby18-mode-el = $(datadir)/emacs/site-lisp/.*el$ -PKGFILES_CSWlibruby1 += /opt/csw/lib/libruby.*.so.1 -PKGFILES_CSWlibruby1 += /opt/csw/lib/libruby.*.so.1.* +PKGFILES_CSWlibruby18-1 += /opt/csw/lib/libruby.*.so.1 +PKGFILES_CSWlibruby18-1 += /opt/csw/lib/libruby.*.so.1.* MASTER_SITES = ftp://ftp.ruby-lang.org/pub/ruby/ MASTER_SITES += ftp://www.ibiblio.org/pub/languages/ruby/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 6 04:27:12 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 06 Mar 2011 03:27:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[13595] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13595 http://gar.svn.sourceforge.net/gar/?rev=13595&view=rev Author: bdwalton Date: 2011-03-06 03:27:12 +0000 (Sun, 06 Mar 2011) Log Message: ----------- php5/trunk: drop useless overrides Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-05 21:34:08 UTC (rev 13594) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-06 03:27:12 UTC (rev 13595) @@ -692,8 +692,6 @@ CHECKPKG_OVERRIDES_CSWphp5-zip += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-curl += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-sysvsem += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-mysqli += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mimemagic += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-posix += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-ftp += surplus-dependency|CSWphp5 @@ -704,7 +702,6 @@ CHECKPKG_OVERRIDES_CSWphp5-pgsql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-shmop += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mhash += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-session += surplus-dependency|CSWphp5 include files/scripts.mk 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 Sun Mar 6 04:27:49 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 06 Mar 2011 03:27:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[13596] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13596 http://gar.svn.sourceforge.net/gar/?rev=13596&view=rev Author: bdwalton Date: 2011-03-06 03:27:49 +0000 (Sun, 06 Mar 2011) Log Message: ----------- php5/trunk: the snmp module does not need tcpwrap or ssl deps Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-06 03:27:12 UTC (rev 13595) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-06 03:27:49 UTC (rev 13596) @@ -299,7 +299,7 @@ CATALOGNAME_CSWphp5-snmp = php5_snmp SPKG_DESC_CSWphp5-snmp = The snmp extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-snmp = CSWphp5 CSWnetsnmp CSWosslrt CSWtcpwrap +RUNTIME_DEP_PKGS_CSWphp5-snmp = CSWphp5 CSWnetsnmp OBSOLETES_CSWphp5-snmp = CSWphp5snmp CATALOGNAME_CSWphp5-soap = php5_soap This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 6 04:29:43 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 06 Mar 2011 03:29:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[13597] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13597 http://gar.svn.sourceforge.net/gar/?rev=13597&view=rev Author: bdwalton Date: 2011-03-06 03:29:43 +0000 (Sun, 06 Mar 2011) Log Message: ----------- php5/trunk: correct a few obsoletes definitions Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-06 03:27:49 UTC (rev 13596) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-06 03:29:43 UTC (rev 13597) @@ -220,7 +220,7 @@ CATALOGNAME_CSWphp5-mysqli = php5_mysqli SPKG_DESC_CSWphp5-mysqli = The mysqli extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-mysqli = CSWphp5 CSWmysql5rt CSWzlib -OBSOLETES_CSWphp5-mysqli = CSWphp5-mysqli +OBSOLETES_CSWphp5-mysqli = CSWphp5mysqli CATALOGNAME_CSWphp5-ncurses = php5_ncurses SPKG_DESC_CSWphp5-ncurses = The ncurses extension for PHP5 @@ -290,7 +290,7 @@ CATALOGNAME_CSWphp5-session = php5_session SPKG_DESC_CSWphp5-session = The session extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-session = CSWphp5 CSWlibmm -OBSOLETES_CSWphp5-session = CSWphp5-session +OBSOLETES_CSWphp5-session = CSWphp5session CATALOGNAME_CSWphp5-shmop = php5_shmop SPKG_DESC_CSWphp5-shmop = The shmop extension for PHP5 @@ -330,7 +330,7 @@ CATALOGNAME_CSWphp5-sysvshm = php5_sysvshm SPKG_DESC_CSWphp5-sysvshm = The sysvshm extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-sysvshm = CSWphp5 -OBSOLETES_CSWphp5-sysvshm = CSWphp5-sysvshm +OBSOLETES_CSWphp5-sysvshm = CSWphp5sysvshm CATALOGNAME_CSWphp5-tidy = php5_tidy SPKG_DESC_CSWphp5-tidy = The tidy extension for PHP5 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 6 04:31:04 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 06 Mar 2011 03:31:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[13598] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13598 http://gar.svn.sourceforge.net/gar/?rev=13598&view=rev Author: bdwalton Date: 2011-03-06 03:31:04 +0000 (Sun, 06 Mar 2011) Log Message: ----------- php5/trunk: correct the mime-magic naming conventions Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-06 03:29:43 UTC (rev 13597) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-06 03:31:04 UTC (rev 13598) @@ -50,7 +50,7 @@ PACKAGES += CSWphp5-mbstring PACKAGES += CSWphp5-mcrypt PACKAGES += CSWphp5-mhash -PACKAGES += CSWphp5-mimemagic +PACKAGES += CSWphp5-mime-magic PACKAGES += CSWphp5-mssql PACKAGES += CSWphp5-mysql PACKAGES += CSWphp5-mysqli @@ -202,10 +202,10 @@ RUNTIME_DEP_PKGS_CSWphp5-mhash = CSWphp5 CSWlibmhash OBSOLETES_CSWphp5-mhash = CSWphp5mhash -CATALOGNAME_CSWphp5-mimemagic = php5_mime_magic -SPKG_DESC_CSWphp5-mimemagic = The mime magic Extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-mimemagic = CSWphp5 -OBSOLETES_CSWphp5-mimemagic = CSWphp5mimemagic +CATALOGNAME_CSWphp5-mime-magic = php5_mime_magic +SPKG_DESC_CSWphp5-mime=magic = The mime magic Extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-mime-magic = CSWphp5 +OBSOLETES_CSWphp5-mime-magic = CSWphp5mimemagic CATALOGNAME_CSWphp5-mssql = php5_mssql SPKG_DESC_CSWphp5-mssql = The mssql extension for PHP5 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 6 04:36:35 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 06 Mar 2011 03:36:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[13599] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13599 http://gar.svn.sourceforge.net/gar/?rev=13599&view=rev Author: bdwalton Date: 2011-03-06 03:36:35 +0000 (Sun, 06 Mar 2011) Log Message: ----------- php5/trunk: correct typo in mime-magic module split Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-06 03:31:04 UTC (rev 13598) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-06 03:36:35 UTC (rev 13599) @@ -203,7 +203,7 @@ OBSOLETES_CSWphp5-mhash = CSWphp5mhash CATALOGNAME_CSWphp5-mime-magic = php5_mime_magic -SPKG_DESC_CSWphp5-mime=magic = The mime magic Extension for PHP5 +SPKG_DESC_CSWphp5-mime-magic = The mime magic Extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-mime-magic = CSWphp5 OBSOLETES_CSWphp5-mime-magic = CSWphp5mimemagic This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 6 15:13:28 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 06 Mar 2011 14:13:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[13600] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13600 http://gar.svn.sourceforge.net/gar/?rev=13600&view=rev Author: bdwalton Date: 2011-03-06 14:13:28 +0000 (Sun, 06 Mar 2011) Log Message: ----------- php5/trunk: drop the mime-magic package as it is deprecated by the fileinfo module Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-06 03:36:35 UTC (rev 13599) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-06 14:13:28 UTC (rev 13600) @@ -50,7 +50,6 @@ PACKAGES += CSWphp5-mbstring PACKAGES += CSWphp5-mcrypt PACKAGES += CSWphp5-mhash -PACKAGES += CSWphp5-mime-magic PACKAGES += CSWphp5-mssql PACKAGES += CSWphp5-mysql PACKAGES += CSWphp5-mysqli @@ -202,11 +201,6 @@ RUNTIME_DEP_PKGS_CSWphp5-mhash = CSWphp5 CSWlibmhash OBSOLETES_CSWphp5-mhash = CSWphp5mhash -CATALOGNAME_CSWphp5-mime-magic = php5_mime_magic -SPKG_DESC_CSWphp5-mime-magic = The mime magic Extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-mime-magic = CSWphp5 -OBSOLETES_CSWphp5-mime-magic = CSWphp5mimemagic - CATALOGNAME_CSWphp5-mssql = php5_mssql SPKG_DESC_CSWphp5-mssql = The mssql extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-mssql = CSWphp5 CSWfreetds This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 6 15:15:25 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 06 Mar 2011 14:15:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[13601] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13601 http://gar.svn.sourceforge.net/gar/?rev=13601&view=rev Author: bdwalton Date: 2011-03-06 14:15:25 +0000 (Sun, 06 Mar 2011) Log Message: ----------- php5/trunk: declare an I dep from php5 on the old php5_mime_magic Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-06 14:13:28 UTC (rev 13600) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-06 14:15:25 UTC (rev 13601) @@ -88,6 +88,7 @@ CATALOGNAME_CSWphp5 = php5 SPKG_DESC_CSWphp5 = A High-Level Scripting Language +INCOMPATIBLE_PKGS_CSWphp5 = CSWphp5mimemagic CATALOGNAME_CSWphp5devel = php5_devel SPKG_DESC_CSWphp5devel = Development files for php5 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 6 15:52:42 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 06 Mar 2011 14:52:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[13602] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13602 http://gar.svn.sourceforge.net/gar/?rev=13602&view=rev Author: bdwalton Date: 2011-03-06 14:52:42 +0000 (Sun, 06 Mar 2011) Log Message: ----------- ruby18/trunk: do not obsolete the libruby1 package with the old soname Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-06 14:15:25 UTC (rev 13601) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-06 14:52:42 UTC (rev 13602) @@ -19,7 +19,6 @@ OBSOLETES_CSWruby18-dev = CSWrubydev OBSOLETES_CSWruby18-mode = CSWrubymode OBSOLETES_CSWruby18-mode-el = CSWrubymodeel -OBSOLETES_CSWlibruby18-1 = CSWlibruby1 ALTERNATIVES_CSWruby18 = ruby ALTERNATIVE_ruby = $(bindir)/ruby ruby $(bindir)/ruby18 10 $(bindir)/irb irb $(bindir)/irb18 $(bindir)/erb erb $(bindir)/erb18 $(bindir)/rdoc rdoc $(bindir)/rdoc18 $(bindir)/ri ri $(bindir)/ri18 $(bindir)/testrb testrb $(bindir)/testrb18 $(mandir)/man1/ruby.1 ruby.1 $(mandir)/man1/ruby18.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 6 16:57:16 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 06 Mar 2011 15:57:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[13603] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13603 http://gar.svn.sourceforge.net/gar/?rev=13603&view=rev Author: bdwalton Date: 2011-03-06 15:57:15 +0000 (Sun, 06 Mar 2011) Log Message: ----------- ruby18/trunk: drop the legacy link creation as those will remain in libruby1 Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-06 14:52:42 UTC (rev 13602) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-06 15:57:15 UTC (rev 13603) @@ -167,7 +167,7 @@ RBCONFIG = /opt/csw/lib/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb -PI_TARGETS = samples rbconfig rbscripts rubymode legacylinks +PI_TARGETS = samples rbconfig rbscripts rubymode ifndef USEGCC PI_TARGETS += multiconfig endif @@ -175,13 +175,6 @@ post-install-modulated: $(PI_TARGETS) @$(MAKECOOKIE) -legacylinks: - @(cd $(DESTDIR)$(libdir); \ - for f in libruby.so libruby.so.1.8.7; do \ - ln -s libruby18.so.1 $$f; \ - done) - @$(MAKECOOKIE) - multiconfig: @echo "Setting up the CSW rbconfig stuff so we can switch between compilers" @mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).SOS12 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Sun Mar 6 19:09:11 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Sun, 06 Mar 2011 18:09:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[13604] csw/mgar/pkg/puppet/trunk/Makefile Message-ID: Revision: 13604 http://gar.svn.sourceforge.net/gar/?rev=13604&view=rev Author: phipsy Date: 2011-03-06 18:09:10 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Work on puppet Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2011-03-06 15:57:15 UTC (rev 13603) +++ csw/mgar/pkg/puppet/trunk/Makefile 2011-03-06 18:09:10 UTC (rev 13604) @@ -7,7 +7,7 @@ # [1] http://garylaw.net/packages/puppet-build.sh NAME = puppet -VERSION = 2.6.5 +VERSION = 2.6.4 CATEGORIES = apps define BLURB @@ -32,6 +32,8 @@ INITSMF += $(sysconfdir)/init\.d/cswpuppetd INITSMF += $(sysconfdir)/init\.d/cswpuppetmasterd +#MANIFEST /var${prefix}/svc/manifest/network/puppetd.xml +#MANIFEST /var${prefix}/svc/manifest/network/puppetmaster.xml USERGROUP = $(sysconfdir)/pkg/puppet/cswusergroup # Creating a separate package CSWpuppetmaster so that the cswpuppetmaster @@ -51,6 +53,7 @@ PKGFILES_CSWpuppetmaster += $(sbindir)/puppetmasterd PKGFILES_CSWpuppetmaster += $(mandir)/man8/puppetmasterd.8 PKGFILES_CSWpuppetmaster += $(libdir)/.*/puppet/application/puppetmasterd.rb +PKGFILES_CSWpuppetmaster += /var${prefix}/svc/manifest/network/puppetmaster.xml ARCHALL = 1 @@ -67,6 +70,7 @@ PATCHFILES += 0003-Use-opt-csw-share-puppet-modules-as-default.patch CHECKPKG_OVERRIDES_CSWpuppet += surplus-dependency|CSWfacter +CHECKPKG_OVERRIDES_CSWpuppet += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWpuppetmaster += surplus-dependency|CSWpuppet # CRONDIR = $(sysconfdir)/pkg/CSWpuppet/crontabs @@ -83,10 +87,6 @@ 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)$(CRONDIR) - ginstall -m 644 \ - $(FILEDIR)/CSWpuppet.cron.root \ - $(DESTDIR)$(CRONDIR)/root 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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Sun Mar 6 19:09:40 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Sun, 06 Mar 2011 18:09:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[13605] csw/mgar/pkg/facter/trunk Message-ID: Revision: 13605 http://gar.svn.sourceforge.net/gar/?rev=13605&view=rev Author: phipsy Date: 2011-03-06 18:09:40 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Bumped facter to 1.5.8 Modified Paths: -------------- csw/mgar/pkg/facter/trunk/Makefile csw/mgar/pkg/facter/trunk/checksums Modified: csw/mgar/pkg/facter/trunk/Makefile =================================================================== --- csw/mgar/pkg/facter/trunk/Makefile 2011-03-06 18:09:10 UTC (rev 13604) +++ csw/mgar/pkg/facter/trunk/Makefile 2011-03-06 18:09:40 UTC (rev 13605) @@ -3,10 +3,10 @@ # $Id$ NAME = facter -VERSION = 1.5.7 +VERSION = 1.5.8 CATEGORIES = apps -DESCRIPTION = a system fact gatherer +DESCRIPTION = A system fact gatherer define BLURB A cross-platform Ruby library for retrieving facts from operating systems. Supports multiple resolution mechanisms, any of which can be restricted to @@ -18,13 +18,16 @@ additional mechanisms for retrieving facts. endef -MASTER_SITES = http://reductivelabs.com/downloads/facter/ +MASTER_SITES = http://puppetlabs.com/downloads/facter/ DISTFILES = $(NAME)-$(VERSION).tar.gz +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +SPKG_SOURCEURL = http://puppetlabs.com/ RUNTIME_DEP_PKGS = CSWruby BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -# We define upstream file regex so we can be notifed of new upstream software release +# We define upstream file regex so we can be notifed of new upstream software +# release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz ARCHALL=1 @@ -34,6 +37,12 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = facter +CHECKPKG_OVERRIDES_CSWfacter += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/site_ruby/1.8/facter/ssh.rb +CHECKPKG_OVERRIDES_CSWfacter += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/site_ruby/1.8/facter/Cfkey.rb +CHECKPKG_OVERRIDES_CSWfacter += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/site_ruby/1.8/facter/util/manufacturer.rb +CHECKPKG_OVERRIDES_CSWfacter += pkginfo-description-not-starting-with-uppercase|a|system|fact|gatherer + + include gar/category.mk install-facter: Modified: csw/mgar/pkg/facter/trunk/checksums =================================================================== --- csw/mgar/pkg/facter/trunk/checksums 2011-03-06 18:09:10 UTC (rev 13604) +++ csw/mgar/pkg/facter/trunk/checksums 2011-03-06 18:09:40 UTC (rev 13605) @@ -1 +1,2 @@ 21db7b613fe14a54e72ef062f3d5e190 facter-1.5.7.tar.gz +4dd4daebc59fa985b8aa7eb247ac4030 facter-1.5.8.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sun Mar 6 19:25:31 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Sun, 6 Mar 2011 18:25:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[13604] csw/mgar/pkg/puppet/trunk/Makefile In-Reply-To: References: Message-ID: 2011/3/6 : > Revision: 13604 > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=13604&view=rev > Author: ? phipsy > Date: ? ? 2011-03-06 18:09:10 +0000 (Sun, 06 Mar 2011) > > Log Message: > ----------- > Work on puppet > > Modified Paths: > -------------- > ? ?csw/mgar/pkg/puppet/trunk/Makefile > > Modified: csw/mgar/pkg/puppet/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/puppet/trunk/Makefile ?2011-03-06 15:57:15 UTC (rev 13603) > +++ csw/mgar/pkg/puppet/trunk/Makefile ?2011-03-06 18:09:10 UTC (rev 13604) > @@ -7,7 +7,7 @@ > ?# [1] http://garylaw.net/packages/puppet-build.sh > > ?NAME = puppet > -VERSION = 2.6.5 > +VERSION = 2.6.4 > ?CATEGORIES = apps > > ?define BLURB > @@ -32,6 +32,8 @@ > > ?INITSMF += $(sysconfdir)/init\.d/cswpuppetd > ?INITSMF += $(sysconfdir)/init\.d/cswpuppetmasterd > +#MANIFEST /var${prefix}/svc/manifest/network/puppetd.xml > +#MANIFEST /var${prefix}/svc/manifest/network/puppetmaster.xml > ?USERGROUP = $(sysconfdir)/pkg/puppet/cswusergroup > > ?# Creating a separate package CSWpuppetmaster so that the cswpuppetmaster > @@ -51,6 +53,7 @@ > ?PKGFILES_CSWpuppetmaster += $(sbindir)/puppetmasterd > ?PKGFILES_CSWpuppetmaster += $(mandir)/man8/puppetmasterd.8 > ?PKGFILES_CSWpuppetmaster += $(libdir)/.*/puppet/application/puppetmasterd.rb > +PKGFILES_CSWpuppetmaster += /var${prefix}/svc/manifest/network/puppetmaster.xml I think you mean $(prefix), not ${prefix}. The former is GNU make syntax, the latter is shell syntax. Generally, you can define localstatedir as /var$(prefix) and use $(localstatedir) instead. That is also the best option for autotools-driven projects. > ?ARCHALL = 1 > > @@ -67,6 +70,7 @@ > ?PATCHFILES += 0003-Use-opt-csw-share-puppet-modules-as-default.patch > > ?CHECKPKG_OVERRIDES_CSWpuppet ? ? ? += surplus-dependency|CSWfacter > +CHECKPKG_OVERRIDES_CSWpuppet += missing-dependency|CSWpython > ?CHECKPKG_OVERRIDES_CSWpuppetmaster += surplus-dependency|CSWpuppet > > ?# CRONDIR = $(sysconfdir)/pkg/CSWpuppet/crontabs > @@ -83,10 +87,6 @@ > ? ? ? ?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)$(CRONDIR) > - ? ? ? ginstall -m 644 \ > - ? ? ? ? ? ? ? $(FILEDIR)/CSWpuppet.cron.root \ > - ? ? ? ? ? ? ? $(DESTDIR)$(CRONDIR)/root Can you leave the cron job as an option? From maciej at opencsw.org Sun Mar 6 19:27:02 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Sun, 6 Mar 2011 18:27:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[13605] csw/mgar/pkg/facter/trunk In-Reply-To: References: Message-ID: 2011/3/6 : > ?DISTFILES ?= $(NAME)-$(VERSION).tar.gz > +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz You don't need UFILES_REGEX any more, it's autogenerated based on DISTFILES. > +SPKG_SOURCEURL = http://puppetlabs.com/ > > ?RUNTIME_DEP_PKGS = CSWruby > ?BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) > > -# We define upstream file regex so we can be notifed of new upstream software release > +# We define upstream file regex so we can be notifed of new upstream software > +# release > ?UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz Ditto. Maciej From phipsy at users.sourceforge.net Sun Mar 6 19:42:33 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Sun, 06 Mar 2011 18:42:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[13606] csw/mgar/pkg/facter/tags/facter-1.5.8, REV=2011.03. 06/ Message-ID: Revision: 13606 http://gar.svn.sourceforge.net/gar/?rev=13606&view=rev Author: phipsy Date: 2011-03-06 18:42:33 +0000 (Sun, 06 Mar 2011) Log Message: ----------- facter: Tag as release 1.5.8,REV=2011.03.06 Added Paths: ----------- csw/mgar/pkg/facter/tags/facter-1.5.8,REV=2011.03.06/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sun Mar 6 19:58:53 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Sun, 6 Mar 2011 18:58:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[13605] csw/mgar/pkg/facter/trunk In-Reply-To: References: Message-ID: 2011/3/6 Mark Phillips : > On 6 Mar 2011, at 18:27, Maciej Blizi?ski wrote: > >> 2011/3/6 ?: >>> ?DISTFILES ?= $(NAME)-$(VERSION).tar.gz >>> +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz >> >> You don't need UFILES_REGEX any more, it's autogenerated based on DISTFILES. > > Ah, magic, ta. > > I only stuck it in facter because it was already in puppet - and didn't you write that Makefile? ;-) I did! The makefile predates the ufiles_regex generator which I wrote only two weeks ago. From bdwalton at users.sourceforge.net Sun Mar 6 20:17:19 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 06 Mar 2011 19:17:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[13607] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13607 http://gar.svn.sourceforge.net/gar/?rev=13607&view=rev Author: bdwalton Date: 2011-03-06 19:17:19 +0000 (Sun, 06 Mar 2011) Log Message: ----------- ruby18/trunk: streamline postinstall, postmerge steps, introduce basis for modulating on compiler Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-06 18:42:33 UTC (rev 13606) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-06 19:17:19 UTC (rev 13607) @@ -13,6 +13,11 @@ PACKAGES = CSWruby18 CSWruby18-doc CSWruby18-tk CSWruby18-dev CSWruby18-mode PACKAGES += CSWruby18-mode-el CSWlibruby18-1 +EXTRA_MODULATORS = COMPILER +MODULATIONS_COMPILER = sun gcc4 +MERGE_SCRIPTS_isa-default-compiler-sun = copy-all +MERGE_SCRIPTS_isa-default-compiler-gcc4 = copy-custom + OBSOLETES_CSWruby18 = CSWruby OBSOLETES_CSWruby18-doc = CSWrubydoc OBSOLETES_CSWruby18-tk = CSWrubytk @@ -167,52 +172,29 @@ RBCONFIG = /opt/csw/lib/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb -PI_TARGETS = samples rbconfig rbscripts rubymode -ifndef USEGCC -PI_TARGETS += multiconfig -endif -post-install-modulated: $(PI_TARGETS) +post-install-modulated: + @echo "Stripping DESTDIR from rbconfig.rb" + @gsed -i -e s,$(DESTDIR),, \ + $(DESTDIR)$(libdir)/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb @$(MAKECOOKIE) - -multiconfig: @echo "Setting up the CSW rbconfig stuff so we can switch between compilers" - @mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).SOS12 - @gcp $(FILEDIR)/rbconfig.rb.GCC4.$(GARCH) $(DESTDIR)/$(RBCONFIG).GCC4 - @gln -n -s $(RBCONFIG).SOS12 $(DESTDIR)$(RBCONFIG) - @gcp $(FILEDIR)/cswrbconfig $(DESTDIR)/opt/csw/bin/ - @chmod 755 $(DESTDIR)/opt/csw/bin/cswrbconfig - @ginstall -c -d -m 0755 $(DESTDIR)$(docdir)/ruby/ - @ginstall -c -m 0644 $(FILEDIR)/README.csw $(DESTDIR)$(docdir)/ruby/ + @mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).$(COMPILER) @$(MAKECONFIG) -rubymode: RMDIR=$(DESTDIR)/$(datadir)/emacs/site-lisp/ruby-mode -rubymode: - @echo " ===> Installing and Compilingn ruby-mode elisp" +post-merge: RMDIR=$(PKGROOT)/$(datadir)/emacs/site-lisp/ruby-mode +post-merge: + @echo "Installing ruby-mode elisp..." @(mkdir -p $(RMDIR); \ - cp $(WORKSRC)/misc/*el $(RMDIR)) - @$(MAKECOOKIE) - -# Fix up rbconfig -rbconfig: - @gsed -i -e s,$(DESTDIR),, \ - $(DESTDIR)$(libdir)/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb - @$(MAKECOOKIE) - -# Copy samples -samples: + cp $(WORKSRC_FIRSTMOD)/misc/*el $(RMDIR)) + @echo "Copying in sample code..." @mkdir -p $(DESTDIR)$(docdir)/ruby18/ - @cp -R $(WORKSRC_FIRSTMOD)/sample $(DESTDIR)$(docdir)/ruby18/ + @cp -R $(WORKSRC_FIRSTMOD)/sample $(PKGROOT)$(docdir)/ruby18/ @for ext in bigdecimal dl tk ; do \ - cp -R $(WORKSRC_FIRSTMOD)/ext/$$ext/sample $(DESTDIR)$(docdir)/ruby18/sample/$$ext ; \ + cp -R $(WORKSRC_FIRSTMOD)/ext/$$ext/sample \ + $(PKGROOT)$(docdir)/ruby18/sample/$$ext ; \ done - @$(MAKECOOKIE) - -# Some scripts come with /usr/local/bin/ruby hard coded. -rbscripts: - @echo " ==> Fixing shebang path in distributed ruby scripts" - @find $(DESTDIR)$(prefix) -type f -name '*.rb' -exec \ + @echo "Fixing shebang path in distributed ruby scripts..." + @find $(PKGROOT)$(prefix) -type f -name '*.rb' -exec \ perl -i -plne "s{^#!/usr/local/bin/ruby}{#!$(bindir)/ruby18}g" {} \; @$(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 Sun Mar 6 21:30:24 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 06 Mar 2011 20:30:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[13608] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 13608 http://gar.svn.sourceforge.net/gar/?rev=13608&view=rev Author: dmichelsen Date: 2011-03-06 20:30:24 +0000 (Sun, 06 Mar 2011) Log Message: ----------- mGAR v2: Allow overriding of obseleted catalog names Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-03-06 19:17:19 UTC (rev 13607) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-03-06 20:30:24 UTC (rev 13608) @@ -59,15 +59,20 @@ CATALOG_RELEASE ?= current define obsoleted_pkg -CATALOGNAME_$(1) = $(call catalogname,$(1)) +CATALOGNAME_$(1) ?= $(call catalogname,$(1)) # The length of the description has been limited to 100 characters, # the string is cut (no longer on word boundaries). SPKG_DESC_$(1) ?= $(shell echo Transitional package. Content moved to $(foreach P,$(PACKAGES),$(if $(filter $(1),$(OBSOLETES_$P)),$P)) | perl -npe 's/^(.{100}).+/substr($$1,0,-4) . " ..."/') RUNTIME_DEP_PKGS_$(1) = $(foreach P,$(PACKAGES),$(if $(filter $(1),$(OBSOLETES_$P)),$P)) PKGFILES_$(1) = NOFILES ARCHALL_$(1) = 1 +# For legacy packages we know that the dependency is correct because we deliberately set it +# The catalog name may not match for legacy packages +# The overridden package may be a devel package, as it is empty it is ok to be archall $(foreach P,$(PACKAGES),$(if $(filter $(1),$(OBSOLETES_$P)), CHECKPKG_OVERRIDES_$(1) += surplus-dependency|$P + CHECKPKG_OVERRIDES_$(1) += catalogname-does-not-match-pkgname + CHECKPKG_OVERRIDES_$(1) += archall-devel-package )) endef 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 Mar 6 21:46:02 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Mar 2011 20:46:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[13609] csw/mgar/pkg/mpg321/trunk/Makefile Message-ID: Revision: 13609 http://gar.svn.sourceforge.net/gar/?rev=13609&view=rev Author: wahwah Date: 2011-03-06 20:46:02 +0000 (Sun, 06 Mar 2011) Log Message: ----------- mpg321: Removing ufiles_regex Modified Paths: -------------- csw/mgar/pkg/mpg321/trunk/Makefile Modified: csw/mgar/pkg/mpg321/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpg321/trunk/Makefile 2011-03-06 20:30:24 UTC (rev 13608) +++ csw/mgar/pkg/mpg321/trunk/Makefile 2011-03-06 20:46:02 UTC (rev 13609) @@ -18,7 +18,6 @@ RUNTIME_DEP_PKGS_CSWmpg321 += CSWlibmad RUNTIME_DEP_PKGS_CSWmpg321 += CSWzlib BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWmpg321) -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz TEST_TARGET = check CONFIGURE_ARGS = $(DIRPATHS) # A fix for an inline function and 'symbol not found'. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Mar 6 22:41:59 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 06 Mar 2011 21:41:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[13610] csw/mgar/pkg/vorbistools/trunk Message-ID: Revision: 13610 http://gar.svn.sourceforge.net/gar/?rev=13610&view=rev Author: dmichelsen Date: 2011-03-06 21:41:59 +0000 (Sun, 06 Mar 2011) Log Message: ----------- vorbistools: Update to 1.4.0 Modified Paths: -------------- csw/mgar/pkg/vorbistools/trunk/Makefile csw/mgar/pkg/vorbistools/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/vorbistools/trunk/files/fixme.sh Modified: csw/mgar/pkg/vorbistools/trunk/Makefile =================================================================== --- csw/mgar/pkg/vorbistools/trunk/Makefile 2011-03-06 20:46:02 UTC (rev 13609) +++ csw/mgar/pkg/vorbistools/trunk/Makefile 2011-03-06 21:41:59 UTC (rev 13610) @@ -1,5 +1,5 @@ NAME = vorbistools -VERSION = 1.2.0 +VERSION = 1.4.0 CATEGORIES = utils DESCRIPTION = Vorbis audio tools @@ -13,34 +13,34 @@ DISTNAME = vorbis-tools-$(VERSION) MASTER_SITES = http://downloads.xiph.org/releases/vorbis/ DISTFILES = $(DISTNAME).tar.gz -DISTFILES += fixme.sh -SPKG_SOURCEURL = http://www.vorbis.com +VENDOR_URL = http://www.vorbis.com PACKAGES = CSWvtools CATALOGNAME = vorbistools BUILD_DEP_PKGS = CSWcurldevel -RUNTIME_DEP_PKGS = CSWcurlrt CSWflac CSWggettextrt CSWiconv CSWlibao -RUNTIME_DEP_PKGS += CSWlibogg CSWspeex CSWsunmath CSWvorbis +RUNTIME_DEP_PKGS += CSWcurlrt +RUNTIME_DEP_PKGS += CSWflac +RUNTIME_DEP_PKGS += CSWggettextrt +RUNTIME_DEP_PKGS += CSWiconv +RUNTIME_DEP_PKGS += CSWlibao +RUNTIME_DEP_PKGS += CSWlibogg +RUNTIME_DEP_PKGS += CSWspeex +RUNTIME_DEP_PKGS += CSWsunmath +RUNTIME_DEP_PKGS += CSWvorbis # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = (\d+(?:\.\d+)*) +EXTRA_LINKER_FLAGS += -lrt + BUILD64 = 1 EXTRA_BUILD_ISAS = sparcv8plus+vis pentium_pro -EXTRA_LINKER_FLAGS += -lrt - CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check include gar/category.mk - -post-configure-modulated: - @echo " ==> Fixing libtool files" - @$(DOWNLOADDIR)/fixme.sh $(WORKSRC) - @$(MAKECOOKIE) - Modified: csw/mgar/pkg/vorbistools/trunk/checksums =================================================================== --- csw/mgar/pkg/vorbistools/trunk/checksums 2011-03-06 20:46:02 UTC (rev 13609) +++ csw/mgar/pkg/vorbistools/trunk/checksums 2011-03-06 21:41:59 UTC (rev 13610) @@ -1,2 +1 @@ -34f5b20f6caf282b2533784fbb1b4395 download/fixme.sh -df976d24e51ef3d87cd462edf747bf9a download/vorbis-tools-1.2.0.tar.gz +567e0fb8d321b2cd7124f8208b8b90e6 vorbis-tools-1.4.0.tar.gz Deleted: csw/mgar/pkg/vorbistools/trunk/files/fixme.sh =================================================================== --- csw/mgar/pkg/vorbistools/trunk/files/fixme.sh 2011-03-06 20:46:02 UTC (rev 13609) +++ csw/mgar/pkg/vorbistools/trunk/files/fixme.sh 2011-03-06 21:41:59 UTC (rev 13610) @@ -1,51 +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 - 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} - gchmod +x ${mk} - done -done - -## Fix libtool Script -for lt in $(gfind ${BASEPATH} -name libtool -print); do - gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new - gmv ${lt}.new ${lt} - gchmod +x ${lt} -done - -for LTMAIN in $(gfind ${BASEPATH} -name ltmain.sh -print); do - gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new - gmv ${LTMAIN}.new ${LTMAIN} - gchmod +x ${LTMAIN} -done - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 6 22:55:34 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 06 Mar 2011 21:55:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[13611] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13611 http://gar.svn.sourceforge.net/gar/?rev=13611&view=rev Author: bdwalton Date: 2011-03-06 21:55:34 +0000 (Sun, 06 Mar 2011) Log Message: ----------- ruby18/trunk: add the compiler selection based on modulation, add the custom merge target Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-06 21:41:59 UTC (rev 13610) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-06 21:55:34 UTC (rev 13611) @@ -127,14 +127,13 @@ COMPILE_ELISP = 1 -ifdef USEGCC -GARCOMPILER = GNU -RUNTIME_DEP_PKGS_CSWruby += CSWgcc4corert -RUNTIME_DEP_PKGS_CSWrubydev += CSWgcc4core +ifeq ($(COMPILER),gcc4) # This is for rbconfig.rb: without this, modules built may not get a proper # setting. +GARCOMPILER = GNU EXTRA_LDFLAGS = -R $(abspath /opt/csw/gcc4/lib/$(MM_LIBDIR)) else +GARCOMPILER = SUN SOS12_LD_FLAGS = endif @@ -172,6 +171,9 @@ RBCONFIG = /opt/csw/lib/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb +merge-copy-custom: $(PKGROOT) $(INSTALLISADIR) + $(_DBUG_MERGE)(cp $(INSTALLIDADIR)$(RBCONFIG).$(COMPILER) \ + $(PKGROOT)$(RBCONFIG).$(COMPILER) post-install-modulated: @echo "Stripping DESTDIR from rbconfig.rb" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Mar 6 23:06:23 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 06 Mar 2011 22:06:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[13612] csw/mgar/pkg/cpan/App-CLI/trunk Message-ID: Revision: 13612 http://gar.svn.sourceforge.net/gar/?rev=13612&view=rev Author: bonivart Date: 2011-03-06 22:06:22 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Update to 0.313. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/App-CLI/trunk/Makefile csw/mgar/pkg/cpan/App-CLI/trunk/checksums Modified: csw/mgar/pkg/cpan/App-CLI/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/App-CLI/trunk/Makefile 2011-03-06 21:55:34 UTC (rev 13611) +++ csw/mgar/pkg/cpan/App-CLI/trunk/Makefile 2011-03-06 22:06:22 UTC (rev 13612) @@ -1,7 +1,7 @@ NAME = App-CLI -VERSION = 0.08 +VERSION = 0.313 CATEGORIES = cpan -AUTHOR = ALEXMV +AUTHOR = CORNELIUS DESCRIPTION = Dispatcher module for command line interface programs define BLURB @@ -12,13 +12,16 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += COPYING -PACKAGES = CSWpmappcli -CATALOGNAME = pm_appcli +PACKAGES = CSWpm-app-cli +CATALOGNAME = pm_app_cli +SPKG_DESC_CSWpm-app-cli = $(DESCRIPTION) ARCHALL = 1 +OBSOLETES_CSWpm-app-cli = CSWpmappcli +CATALOGNAME_CSWpmappcli = pm_appcli RUNTIME_DEP_PKGS = CSWpmlclemktxtsimple CSWpmpodsimple -CHECKPKG_OVERRIDES_CSWpmappcli += surplus-dependency|CSWpmpodsimple -CHECKPKG_OVERRIDES_CSWpmappcli += surplus-dependency|CSWpmlclemktxtsimple +#CHECKPKG_OVERRIDES_CSWpmappcli += surplus-dependency|CSWpmpodsimple +#CHECKPKG_OVERRIDES_CSWpmappcli += surplus-dependency|CSWpmlclemktxtsimple include gar/category.mk Modified: csw/mgar/pkg/cpan/App-CLI/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/App-CLI/trunk/checksums 2011-03-06 21:55:34 UTC (rev 13611) +++ csw/mgar/pkg/cpan/App-CLI/trunk/checksums 2011-03-06 22:06:22 UTC (rev 13612) @@ -1,2 +1 @@ -dc376fad10f1d2457571a0e52158ff17 App-CLI-0.08.tar.gz -27698f516ae4dc71414205c2b635c231 COPYING +efe1a2287c8447fb46e9f43594c3ce28 App-CLI-0.313.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 Sun Mar 6 23:08:02 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 06 Mar 2011 22:08:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[13613] csw/mgar/pkg/cpan/Archive-Extract/trunk Message-ID: Revision: 13613 http://gar.svn.sourceforge.net/gar/?rev=13613&view=rev Author: bonivart Date: 2011-03-06 22:08:02 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Update to 0.48. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/Archive-Extract/trunk/Makefile csw/mgar/pkg/cpan/Archive-Extract/trunk/checksums Modified: csw/mgar/pkg/cpan/Archive-Extract/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Archive-Extract/trunk/Makefile 2011-03-06 22:06:22 UTC (rev 13612) +++ csw/mgar/pkg/cpan/Archive-Extract/trunk/Makefile 2011-03-06 22:08:02 UTC (rev 13613) @@ -1,5 +1,5 @@ NAME = Archive-Extract -VERSION = 0.46 +VERSION = 0.48 CATEGORIES = cpan AUTHOR = BINGOS @@ -14,9 +14,12 @@ DISTFILES += COPYING -PACKAGES = CSWpmarchiveextract -CATALOGNAME = pm_archiveextract +PACKAGES = CSWpm-archive-extract +CATALOGNAME = pm_archive_extract +SPKG_DESC_CSWpm-archive-extract = $(DESCRIPTION) ARCHALL = 1 +OBSOLETES_CSWpm-archive-extract = CSWpmarchiveextract +CATALOGNAME_CSWpmarchiveextract = pm_archiveextract RUNTIME_DEP_PKGS += CSWpmipccmd CSWpmlclemktxtsimple CSWpmmodloadcond CSWpmprmscheck Modified: csw/mgar/pkg/cpan/Archive-Extract/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Archive-Extract/trunk/checksums 2011-03-06 22:06:22 UTC (rev 13612) +++ csw/mgar/pkg/cpan/Archive-Extract/trunk/checksums 2011-03-06 22:08:02 UTC (rev 13613) @@ -1 +1 @@ -ce99b25fa0dacb584574a6c27b1f0e24 Archive-Extract-0.46.tar.gz +4612867ecbd0e4f30beb62fc50cea23b Archive-Extract-0.48.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 Sun Mar 6 23:09:09 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 06 Mar 2011 22:09:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[13614] csw/mgar/pkg/cpan/Authen-SASL/trunk Message-ID: Revision: 13614 http://gar.svn.sourceforge.net/gar/?rev=13614&view=rev Author: bonivart Date: 2011-03-06 22:09:09 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Update to 2.15. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/Authen-SASL/trunk/Makefile csw/mgar/pkg/cpan/Authen-SASL/trunk/checksums Modified: csw/mgar/pkg/cpan/Authen-SASL/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Authen-SASL/trunk/Makefile 2011-03-06 22:08:02 UTC (rev 13613) +++ csw/mgar/pkg/cpan/Authen-SASL/trunk/Makefile 2011-03-06 22:09:09 UTC (rev 13614) @@ -1,5 +1,5 @@ NAME = Authen-SASL -VERSION = 2.12 +VERSION = 2.15 CATEGORIES = cpan AUTHOR = GBARR @@ -12,8 +12,11 @@ DISTFILES += COPYING -PACKAGES = CSWpmauthensasl -CATALOGNAME = pm_authensasl +PACKAGES = CSWpm-authen-sasl +CATALOGNAME = pm_authen_sasl +SPKG_DESC_CSWpm-authen-sasl = $(DESCRIPTION) +OBSOLETES_CSWpm-authen-sasl = CSWpmauthensasl +CATALOGNAME_CSWpmauthensasl = pm_authensasl RUNTIME_DEP_PKGS = CSWpmgssapi CSWpmdigesthmac BUILD_DEP_PKGS = CSWperl Modified: csw/mgar/pkg/cpan/Authen-SASL/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Authen-SASL/trunk/checksums 2011-03-06 22:08:02 UTC (rev 13613) +++ csw/mgar/pkg/cpan/Authen-SASL/trunk/checksums 2011-03-06 22:09:09 UTC (rev 13614) @@ -1,2 +1 @@ -ddbcb7917bf3659d5cf1ee6b681f06d4 download/Authen-SASL-2.12.tar.gz -9fa272a706a6f6b8ccbb19ca13e8b0e2 download/COPYING +35929abb2755cf479d548672800aebee Authen-SASL-2.15.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 Sun Mar 6 23:10:26 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 06 Mar 2011 22:10:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[13615] csw/mgar/pkg/cpan/CGI-Session/trunk Message-ID: Revision: 13615 http://gar.svn.sourceforge.net/gar/?rev=13615&view=rev Author: bonivart Date: 2011-03-06 22:10:26 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Update to 4.43. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/CGI-Session/trunk/Makefile csw/mgar/pkg/cpan/CGI-Session/trunk/checksums Modified: csw/mgar/pkg/cpan/CGI-Session/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/CGI-Session/trunk/Makefile 2011-03-06 22:09:09 UTC (rev 13614) +++ csw/mgar/pkg/cpan/CGI-Session/trunk/Makefile 2011-03-06 22:10:26 UTC (rev 13615) @@ -1,5 +1,5 @@ NAME = CGI-Session -VERSION = 4.42 +VERSION = 4.43 CATEGORIES = cpan AUTHOR = MARKSTOS @@ -14,8 +14,11 @@ DISTFILES += COPYING -PACKAGES = CSWpmcgisession -CATALOGNAME = pm_cgisession +PACKAGES = CSWpm-cgi-session +CATALOGNAME = pm_cgi_session +SPKG_DESC_CSWpm-cgi-session = $(DESCRIPTION) ARCHALL = 1 +OBSOLETES_CSWpm-cgi-session = CSWpmcgisession +CATALOGNAME_CSWpmcgisession = pm_cgisession include gar/category.mk Modified: csw/mgar/pkg/cpan/CGI-Session/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/CGI-Session/trunk/checksums 2011-03-06 22:09:09 UTC (rev 13614) +++ csw/mgar/pkg/cpan/CGI-Session/trunk/checksums 2011-03-06 22:10:26 UTC (rev 13615) @@ -1,2 +1 @@ -6544261a6aae66410188520b27e10699 CGI-Session-4.42.tar.gz -78dfea90d54bddf8ee7fac98f7ab4f29 COPYING +3ac7f31d5d2e11e28cc75c78d5042382 CGI-Session-4.43.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 Sun Mar 6 23:11:42 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 06 Mar 2011 22:11:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[13616] csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk Message-ID: Revision: 13616 http://gar.svn.sourceforge.net/gar/?rev=13616&view=rev Author: bonivart Date: 2011-03-06 22:11:42 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Update to 2.033. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/Makefile csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/checksums Modified: csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/Makefile 2011-03-06 22:10:26 UTC (rev 13615) +++ csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/Makefile 2011-03-06 22:11:42 UTC (rev 13616) @@ -1,5 +1,5 @@ NAME = Compress-Raw-Bzip2 -VERSION = 2.032 +VERSION = 2.033 CATEGORIES = cpan AUTHOR = PMQS @@ -11,8 +11,11 @@ DISTFILES += COPYING -PACKAGES = CSWpmcompressrawbz2 -CATALOGNAME = pm_compressrawbz2 +PACKAGES = CSWpm-compress-raw-bzip2 +CATALOGNAME = pm_compress_raw_bzip2 +SPKG_DESC_CSWpm-compress-raw-bzip2 = $(DESCRIPTION) +OBSOLETES_CSWpm-compress-raw-bzip2 = CSWpmcompressrawbz2 +CATALOGNAME_CSWpmcompressrawbz2 = pm_compressrawbz2 EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* .*\/man\/man1.* Modified: csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/checksums 2011-03-06 22:10:26 UTC (rev 13615) +++ csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/checksums 2011-03-06 22:11:42 UTC (rev 13616) @@ -1 +1 @@ -08df41206303b12e556d473ba1d74d4f Compress-Raw-Bzip2-2.032.tar.gz +7978a4dde2a9d8e9dd05ab23ee0d1278 Compress-Raw-Bzip2-2.033.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 Sun Mar 6 23:13:23 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 06 Mar 2011 22:13:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[13617] csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk Message-ID: Revision: 13617 http://gar.svn.sourceforge.net/gar/?rev=13617&view=rev Author: bonivart Date: 2011-03-06 22:13:22 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Update to 2.033. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/checksums Modified: csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile 2011-03-06 22:11:42 UTC (rev 13616) +++ csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile 2011-03-06 22:13:22 UTC (rev 13617) @@ -1,5 +1,5 @@ NAME = Compress-Raw-Zlib -VERSION = 2.032 +VERSION = 2.033 CATEGORIES = cpan AUTHOR = PMQS @@ -11,8 +11,11 @@ DISTFILES += COPYING -CATALOGNAME = pm_compressrawzlib -PACKAGES = CSWpmcompressrawzlib +PACKAGES = CSWpm-compress-raw-zlib +CATALOGNAME = pm_compress_raw_zlib +SPKG_DESC_CSWpm-compress-raw-zlib = $(DESCRIPTION) +OBSOLETES_CSWpm-compress-raw-zlib = CSWpmcompressrawzlib +CATALOGNAME_CSWpmcompressrawzlib = pmcompressrawzlib EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* .*\/man\/man1.* Modified: csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/checksums 2011-03-06 22:11:42 UTC (rev 13616) +++ csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/checksums 2011-03-06 22:13:22 UTC (rev 13617) @@ -1 +1 @@ -b440004f7ee7b901382cf9bf0ee9e433 Compress-Raw-Zlib-2.032.tar.gz +e9ec0f336997311648a0b611a1f1f6eb Compress-Raw-Zlib-2.033.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 Sun Mar 6 23:16:52 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 06 Mar 2011 22:16:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[13618] csw/mgar/pkg/cpan/DBD-SQLite/trunk Message-ID: Revision: 13618 http://gar.svn.sourceforge.net/gar/?rev=13618&view=rev Author: bonivart Date: 2011-03-06 22:16:51 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Update to 1.31. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile csw/mgar/pkg/cpan/DBD-SQLite/trunk/checksums Modified: csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile 2011-03-06 22:13:22 UTC (rev 13617) +++ csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile 2011-03-06 22:16:51 UTC (rev 13618) @@ -1,5 +1,5 @@ NAME = DBD-SQLite -VERSION = 1.29 +VERSION = 1.31 CATEGORIES = cpan AUTHOR = ADAMK @@ -11,8 +11,12 @@ module, and nothing else. endef -PACKAGES = CSWpmdbdsqlite -CATALOGNAME = pm_dbdsqlite +PACKAGES = CSWpm-dbd-sqlite +CATALOGNAME = pm_dbd_sqlite +SPKG_DESC_CSWpm-dbd-sqlite = $(DESCRIPTION) +OBSOLETES_CSWpm-dbd-sqlite = CSWpmdbdsqlite +CATALOGNAME_CSWpmdbdsqlite = pm_dbdsqlite + RUNTIME_DEP_PKGS = CSWpmdbi LICENSE = LICENSE Modified: csw/mgar/pkg/cpan/DBD-SQLite/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/DBD-SQLite/trunk/checksums 2011-03-06 22:13:22 UTC (rev 13617) +++ csw/mgar/pkg/cpan/DBD-SQLite/trunk/checksums 2011-03-06 22:16:51 UTC (rev 13618) @@ -1,2 +1 @@ -2a47cea6ecff62508775d90151a8030f download/DBD-SQLite-1.29.tar.gz -065e7791e4b06c234d9052ed81de6095 download/optimize.diff +67b3575104efd606c8093bc416e3338d DBD-SQLite-1.31.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 Sun Mar 6 23:18:20 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 06 Mar 2011 22:18:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[13619] csw/mgar/pkg/cpan/DBI/trunk Message-ID: Revision: 13619 http://gar.svn.sourceforge.net/gar/?rev=13619&view=rev Author: bonivart Date: 2011-03-06 22:18:19 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Update to 1.616. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/DBI/trunk/Makefile csw/mgar/pkg/cpan/DBI/trunk/checksums Modified: csw/mgar/pkg/cpan/DBI/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBI/trunk/Makefile 2011-03-06 22:16:51 UTC (rev 13618) +++ csw/mgar/pkg/cpan/DBI/trunk/Makefile 2011-03-06 22:18:19 UTC (rev 13619) @@ -1,5 +1,5 @@ NAME = DBI -VERSION = 1.609 +VERSION = 1.616 CATEGORIES = cpan AUTHOR = TIMB @@ -13,10 +13,11 @@ DISTFILES = COPYING -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -PACKAGES = CSWpmdbi +PACKAGES = CSWpm-dbi CATALOGNAME = pm_dbi +SPKG_DESC_CSWpm-dbi = $(DESCRIPTION) +OBSOLETES_CSWpm-dbi = CSWpmdbi +CATALOGNAME_CSWpmdbi = pm_dbi2 #RUNTIME_DEP_PKGS = CSWpmplrpc Modified: csw/mgar/pkg/cpan/DBI/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/DBI/trunk/checksums 2011-03-06 22:16:51 UTC (rev 13618) +++ csw/mgar/pkg/cpan/DBI/trunk/checksums 2011-03-06 22:18:19 UTC (rev 13619) @@ -1,2 +1 @@ -e8ddfc437b943ae538b777d472060191 COPYING -e4689870b3f7ce503022a076c53284ed DBI-1.609.tar.gz +799313e54a693beb635b47918458f7c4 DBI-1.616.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 6 23:19:18 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 06 Mar 2011 22:19:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[13620] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: Revision: 13620 http://gar.svn.sourceforge.net/gar/?rev=13620&view=rev Author: bdwalton Date: 2011-03-06 22:19:18 +0000 (Sun, 06 Mar 2011) Log Message: ----------- gettext/trunk: add creation of the opt/csw/gnu symlinks; Mantis 4455 Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2011-03-06 22:18:19 UTC (rev 13619) +++ csw/mgar/pkg/gettext/trunk/Makefile 2011-03-06 22:19:18 UTC (rev 13620) @@ -235,6 +235,15 @@ $(MAKECOOKIE) post-merge: + @echo "Setting up gnu links..." + @(cd $(PKGROOT)$(prefix); \ + mkdir gnu; cd gnu; \ + for f in ../bin/g*; do \ + echo Linking $$f; \ + base=$$(basename $$f); \ + gln -s $$f ./$${base/g/}; \ + done ) + @echo "Fixing usr/local and usr/share references..." @(cd $(PKGROOT); \ find .$(docdir) .$(datadir)/aclocal -type f -print0 | \ xargs -0 perl -pi \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Mar 6 23:19:50 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 06 Mar 2011 22:19:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[13621] csw/mgar/pkg/cpan/File-Fetch/trunk Message-ID: Revision: 13621 http://gar.svn.sourceforge.net/gar/?rev=13621&view=rev Author: bonivart Date: 2011-03-06 22:19:50 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Update to 0.32. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/File-Fetch/trunk/Makefile csw/mgar/pkg/cpan/File-Fetch/trunk/checksums Modified: csw/mgar/pkg/cpan/File-Fetch/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/File-Fetch/trunk/Makefile 2011-03-06 22:19:18 UTC (rev 13620) +++ csw/mgar/pkg/cpan/File-Fetch/trunk/Makefile 2011-03-06 22:19:50 UTC (rev 13621) @@ -1,5 +1,5 @@ NAME = File-Fetch -VERSION = 0.24 +VERSION = 0.32 CATEGORIES = cpan AUTHOR = BINGOS @@ -12,8 +12,11 @@ DISTFILES += COPYING -PACKAGES = CSWpmfilefetch -CATALOGNAME = pm_filefetch +PACKAGES = CSWpm-file-fetch +CATALOGNAME = pm_file_fetch +SPKG_DESC_CSWpm-file-fetch = $(DESCRIPTION) +OBSOLETES_CSWpm-file-fetch = CSWpmfilefetch +CATALOGNAME_CSWpmfilefetch = pm_filefetch ARCHALL = 1 Modified: csw/mgar/pkg/cpan/File-Fetch/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/File-Fetch/trunk/checksums 2011-03-06 22:19:18 UTC (rev 13620) +++ csw/mgar/pkg/cpan/File-Fetch/trunk/checksums 2011-03-06 22:19:50 UTC (rev 13621) @@ -1 +1 @@ -4c1dadfc0f7428414b247a5ef55a6778 File-Fetch-0.24.tar.gz +ae8e602cc209ea0cef0eb7504b4a500e File-Fetch-0.32.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 Sun Mar 6 23:21:26 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 06 Mar 2011 22:21:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[13622] csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile Message-ID: Revision: 13622 http://gar.svn.sourceforge.net/gar/?rev=13622&view=rev Author: bonivart Date: 2011-03-06 22:21:26 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Update to 1.25. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile Modified: csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile 2011-03-06 22:19:50 UTC (rev 13621) +++ csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile 2011-03-06 22:21:26 UTC (rev 13622) @@ -13,9 +13,12 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz -PACKAGES = CSWpmgeoippureperl -CATALOGNAME = pm_geoippureperl +PACKAGES = CSWpm-geo-ip-pureperl +CATALOGNAME = pm_geo_ip_pureperl +SPKG_DESC_CSWpm-geo-ip-pureperl = $(DESCRIPTION) ARCHALL = 1 +OBSOLETES_CSWpm-geo-ip-pureperl = CSWpmgeoippureperl +CATALOGNAME_CSWpmgeoippureperl = pm_geoippureperl UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).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 Sun Mar 6 23:22:53 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 06 Mar 2011 22:22:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[13623] csw/mgar/pkg/cpan/GSSAPI/trunk Message-ID: Revision: 13623 http://gar.svn.sourceforge.net/gar/?rev=13623&view=rev Author: bonivart Date: 2011-03-06 22:22:53 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Update to 0.28. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile csw/mgar/pkg/cpan/GSSAPI/trunk/checksums Modified: csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile 2011-03-06 22:21:26 UTC (rev 13622) +++ csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile 2011-03-06 22:22:53 UTC (rev 13623) @@ -1,17 +1,20 @@ NAME = GSSAPI -VERSION = 0.26 +VERSION = 0.28 CATEGORIES = cpan AUTHOR = AGROLMS -DESCRIPTION = Perl extension providing access to the GSSAPIv2 library +DESCRIPTION = Providing access to the GSSAPIv2 library define BLURB - Perl extension providing access to the GSSAPIv2 library. + Providing access to the GSSAPIv2 library. endef DISTFILES += COPYING -PACKAGES = CSWpmgssapi +PACKAGES = CSWpm-gssapi CATALOGNAME = pm_gssapi +SPKG_DESC_CSWpm-gssapi = $(DESCRIPTION) +OBSOLETES_CSWpm-gssapi = CSWpmgssapi +CATALOGNAME_CSWpmgssapi = pm_gssapi2 RUNTIME_DEP_PKGS = CSWkrb5lib Modified: csw/mgar/pkg/cpan/GSSAPI/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/GSSAPI/trunk/checksums 2011-03-06 22:21:26 UTC (rev 13622) +++ csw/mgar/pkg/cpan/GSSAPI/trunk/checksums 2011-03-06 22:22:53 UTC (rev 13623) @@ -1,2 +1 @@ -b386bc039a9a3bed7d79042a9c127bb1 COPYING -c113a8952a9b97541fb7fb9de4502ad6 GSSAPI-0.26.tar.gz +65f00a0749212af064289c8a05e59b3f GSSAPI-0.28.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 Sun Mar 6 23:24:04 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 06 Mar 2011 22:24:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[13624] csw/mgar/pkg/cpan/HTML-Parser/trunk Message-ID: Revision: 13624 http://gar.svn.sourceforge.net/gar/?rev=13624&view=rev Author: bonivart Date: 2011-03-06 22:24:04 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Update to 3.68. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile csw/mgar/pkg/cpan/HTML-Parser/trunk/checksums Modified: csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile 2011-03-06 22:22:53 UTC (rev 13623) +++ csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile 2011-03-06 22:24:04 UTC (rev 13624) @@ -1,5 +1,5 @@ NAME = HTML-Parser -VERSION = 3.64 +VERSION = 3.68 CATEGORIES = cpan AUTHOR = GAAS @@ -13,8 +13,11 @@ DISTFILES += COPYING -PACKAGES = CSWpmhtmlparser -CATALOGNAME = pm_htmlparser +PACKAGES = CSWpm-html-parser +CATALOGNAME = pm_html_parser +SPKG_DESC_CSWpm-html-parser = $(DESCRIPTION) +OBSOLETES_CSWpm-html-parser = CSWpmhtmlparser +CATALOGNAME_CSWpmhtmlparser = pm_htmlparser RUNTIME_DEP_PKGS = CSWpmhtmltagset Modified: csw/mgar/pkg/cpan/HTML-Parser/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/HTML-Parser/trunk/checksums 2011-03-06 22:22:53 UTC (rev 13623) +++ csw/mgar/pkg/cpan/HTML-Parser/trunk/checksums 2011-03-06 22:24:04 UTC (rev 13624) @@ -1,2 +1 @@ -1b7b2684344443752a102fc95cfb2449 COPYING -26ceb6357e855b9e7aad5a5fd66d493e HTML-Parser-3.64.tar.gz +5550b2da7aa94341f1e8a17a4ac20c68 HTML-Parser-3.68.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 Sun Mar 6 23:25:45 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 06 Mar 2011 22:25:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[13625] csw/mgar/pkg/cpan/IO-Compress/trunk Message-ID: Revision: 13625 http://gar.svn.sourceforge.net/gar/?rev=13625&view=rev Author: bonivart Date: 2011-03-06 22:25:45 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Update to 2.033. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile csw/mgar/pkg/cpan/IO-Compress/trunk/checksums Modified: csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile 2011-03-06 22:24:04 UTC (rev 13624) +++ csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile 2011-03-06 22:25:45 UTC (rev 13625) @@ -1,5 +1,5 @@ NAME = IO-Compress -VERSION = 2.032 +VERSION = 2.033 CATEGORIES = cpan AUTHOR = PMQS @@ -18,7 +18,6 @@ IO-Compress-Zlib IO-Compress-Bzip2 IO-Compress-Base - endef DISTFILES += COPYING @@ -31,8 +30,11 @@ INCOMPATIBLE_PKGS += CSWpmiocompressbase INCOMPATIBLE_PKGS += CSWpmiocompresszlib -PACKAGES = CSWpmiocompress -CATALOGNAME = pm_iocompress +PACKAGES = CSWpm-io-compress +CATALOGNAME = pm_io_compress +SPKG_DESC_CSWpm-io-compress = $(DESCRIPTION) +OBSOLETES_CSWpm-io-compress = CSWpmiocompress +CATALOGNAME_CSWpmiocompress = pm_iocompress ARCHALL = 1 Modified: csw/mgar/pkg/cpan/IO-Compress/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/IO-Compress/trunk/checksums 2011-03-06 22:24:04 UTC (rev 13624) +++ csw/mgar/pkg/cpan/IO-Compress/trunk/checksums 2011-03-06 22:25:45 UTC (rev 13625) @@ -1 +1 @@ -b16ac9f5fbb3b5c67294df3b39ce920d IO-Compress-2.032.tar.gz +3c9091f3b76219bd79070efb7db8c877 IO-Compress-2.033.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 Sun Mar 6 23:27:26 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 06 Mar 2011 22:27:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[13626] csw/mgar/pkg/cpan/IO-Socket-INET6/trunk Message-ID: Revision: 13626 http://gar.svn.sourceforge.net/gar/?rev=13626&view=rev Author: bonivart Date: 2011-03-06 22:27:26 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Update to 2.67. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/IO-Socket-INET6/trunk/Makefile csw/mgar/pkg/cpan/IO-Socket-INET6/trunk/checksums Modified: csw/mgar/pkg/cpan/IO-Socket-INET6/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IO-Socket-INET6/trunk/Makefile 2011-03-06 22:25:45 UTC (rev 13625) +++ csw/mgar/pkg/cpan/IO-Socket-INET6/trunk/Makefile 2011-03-06 22:27:26 UTC (rev 13626) @@ -1,5 +1,5 @@ NAME = IO-Socket-INET6 -VERSION = 2.65 +VERSION = 2.67 CATEGORIES = cpan AUTHOR = SHLOMIF @@ -10,8 +10,11 @@ DISTFILES += COPYING -PACKAGES = CSWpmiosocketinet6 -CATALOGNAME = pm_iosocketinet6 +PACKAGES = CSWpm-io-socket-inet6 +CATALOGNAME = pm_io_socket_inet6 ARCHALL = 1 +SPKG_DESC_CSWpm-io-socket-inet6 = $(DESCRIPTION) +OBSOLETES_CSWpm-io-socket-inet6 = CSWpmiosocketinet6 +CATALOGNAME_CSWpmiosocketinet6 = pm_iosocketinet6 include gar/category.mk Modified: csw/mgar/pkg/cpan/IO-Socket-INET6/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/IO-Socket-INET6/trunk/checksums 2011-03-06 22:25:45 UTC (rev 13625) +++ csw/mgar/pkg/cpan/IO-Socket-INET6/trunk/checksums 2011-03-06 22:27:26 UTC (rev 13626) @@ -1 +1 @@ -4ac4a245b3c31a09e01c755b16a1e3e2 IO-Socket-INET6-2.65.tar.gz +228c12e74df686f78b09aee1139dc11c IO-Socket-INET6-2.67.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 Sun Mar 6 23:28:35 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 06 Mar 2011 22:28:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[13627] csw/mgar/pkg/cpan/IO-Socket-SSL/trunk Message-ID: Revision: 13627 http://gar.svn.sourceforge.net/gar/?rev=13627&view=rev Author: bonivart Date: 2011-03-06 22:28:34 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Update to 1.38. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/Makefile csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/checksums Modified: csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/Makefile 2011-03-06 22:27:26 UTC (rev 13626) +++ csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/Makefile 2011-03-06 22:28:34 UTC (rev 13627) @@ -1,5 +1,5 @@ NAME = IO-Socket-SSL -VERSION = 1.33 +VERSION = 1.39 CATEGORIES = cpan AUTHOR = SULLR @@ -15,8 +15,11 @@ DISTFILES += COPYING -PACKAGES = CSWpmiosocketssl -CATALOGNAME = pm_iosocketssl +PACKAGES = CSWpm-io-socket-ssl +CATALOGNAME = pm_io_socket_ssl +SPKG_DESC_CSWpm-io-socket-ssl = $(DESCRIPTION) +OBSOLETES_CSWpm-io-socket-ssl = CSWpmiosocketssl +CATALOGNAME_CSWpmiosocketssl = pm_iosocketssl ARCHALL = 1 Modified: csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/checksums 2011-03-06 22:27:26 UTC (rev 13626) +++ csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/checksums 2011-03-06 22:28:34 UTC (rev 13627) @@ -1 +1 @@ -e288b5cda3de1f4cbf15e2eb709e9d7c IO-Socket-SSL-1.33.tar.gz +776f36451970287c9b3c77e1d39dd7ed IO-Socket-SSL-1.39.tar.gz 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 Mar 7 00:50:45 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Mar 2011 23:50:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[13628] csw/mgar/pkg/lighttpd/trunk/Makefile Message-ID: Revision: 13628 http://gar.svn.sourceforge.net/gar/?rev=13628&view=rev Author: wahwah Date: 2011-03-06 23:50:44 +0000 (Sun, 06 Mar 2011) Log Message: ----------- lighttpd: 64-bit build Modified Paths: -------------- csw/mgar/pkg/lighttpd/trunk/Makefile Modified: csw/mgar/pkg/lighttpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/lighttpd/trunk/Makefile 2011-03-06 22:28:34 UTC (rev 13627) +++ csw/mgar/pkg/lighttpd/trunk/Makefile 2011-03-06 23:50:44 UTC (rev 13628) @@ -45,7 +45,7 @@ # lighttpd puts its modules under libdir, so we pass libdir as a subdirectory, # because modules are not supposed to be in /opt/csw/lib. -libdir = $(prefix)/lib/lighttpd +libdir_install = $(prefix)/lib/lighttpd # Solaris Zones support sysconfdir = /etc$(prefix) @@ -75,6 +75,8 @@ PROTOTYPE_GROUP_user = lighttpd PROTOTYPE_CLASS_user = ugfiles +BUILD64 = 1 + include gar/category.mk post-install-modulated: @@ -91,4 +93,6 @@ ginstall -d -m 755 $(DESTDIR)$(sysconfdir)/pkg/$(NAME) echo "lighttpd:lighttpd:lighttpd web server::::" \ > $(DESTDIR)$(sysconfdir)/pkg/$(NAME)/cswusergroup + (cd $(DESTDIR)$(libdir_install); ln -s $(ISA_DEFAULT) 32) + (cd $(DESTDIR)$(libdir_install); ln -s $(ISA_DEFAULT64) 64) @$(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 Mon Mar 7 01:51:21 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 07 Mar 2011 00:51:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[13629] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13629 http://gar.svn.sourceforge.net/gar/?rev=13629&view=rev Author: bdwalton Date: 2011-03-07 00:51:21 +0000 (Mon, 07 Mar 2011) Log Message: ----------- ruby18/trunk: add the modulation configure args, tweak the custom merge script Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-06 23:50:44 UTC (rev 13628) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-07 00:51:21 UTC (rev 13629) @@ -115,9 +115,10 @@ CONFIGURE_ARGS += --with-openssl-dir=$(prefix) CONFIGURE_ARGS += --with-readline-dir=$(prefix) CONFIGURE_ARGS += --with-zlib-dir=$(prefix) -CONFIGURE_ARGS += --enable-install-doc CONFIGURE_ARGS += --program-suffix=18 +EXTRA_CONFIGURE_ARGS_isa-default-compiler-sun = --enable-install-doc + INSTALL_ARGS = install DISTNAME = ruby-$(VERSION)-$(PATCHLEVEL) @@ -169,11 +170,14 @@ SPKG_VERSION := $(SPKG_VERSION)$(PATCHLEVEL) -RBCONFIG = /opt/csw/lib/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb +RBCDIR = $(libdir)/ruby/1.8/$(GARCH)-solaris2.9 +RBCONFIG = $(RBCDIR)/rbconfig.rb merge-copy-custom: $(PKGROOT) $(INSTALLISADIR) - $(_DBUG_MERGE)(cp $(INSTALLIDADIR)$(RBCONFIG).$(COMPILER) \ - $(PKGROOT)$(RBCONFIG).$(COMPILER) + $(_DBUG_MERGE)( [ -d "$(PKGROOT)$(RBCDIR)" ] || \ + mkdir -p $(PKGROOT)$(RBCDIR); \ + cp $(DESTDIR)$(RBCONFIG).$(COMPILER) \ + $(PKGROOT)$(RBCONFIG).$(COMPILER) ) post-install-modulated: @echo "Stripping DESTDIR from rbconfig.rb" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 7 02:22:45 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 07 Mar 2011 01:22:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[13630] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13630 http://gar.svn.sourceforge.net/gar/?rev=13630&view=rev Author: bdwalton Date: 2011-03-07 01:22:44 +0000 (Mon, 07 Mar 2011) Log Message: ----------- ruby18/trunk: ensure we install the elisp files as postinstall, not postmerge so they are available for the compile-elisp target (run before post-merge) Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-07 00:51:21 UTC (rev 13629) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-07 01:22:44 UTC (rev 13630) @@ -186,13 +186,13 @@ @$(MAKECOOKIE) @echo "Setting up the CSW rbconfig stuff so we can switch between compilers" @mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).$(COMPILER) + @echo "Installing ruby-mode elisp..." + @(mkdir -p $(RMDIR); \ + cp $(WORKSRC_FIRSTMOD)/misc/*el $(RMDIR)) @$(MAKECONFIG) post-merge: RMDIR=$(PKGROOT)/$(datadir)/emacs/site-lisp/ruby-mode post-merge: - @echo "Installing ruby-mode elisp..." - @(mkdir -p $(RMDIR); \ - cp $(WORKSRC_FIRSTMOD)/misc/*el $(RMDIR)) @echo "Copying in sample code..." @mkdir -p $(DESTDIR)$(docdir)/ruby18/ @cp -R $(WORKSRC_FIRSTMOD)/sample $(PKGROOT)$(docdir)/ruby18/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 7 02:26:37 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 07 Mar 2011 01:26:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[13631] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13631 http://gar.svn.sourceforge.net/gar/?rev=13631&view=rev Author: bdwalton Date: 2011-03-07 01:26:36 +0000 (Mon, 07 Mar 2011) Log Message: ----------- ruby18/trunk: adjust the elisp install to run in postinstall Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-07 01:22:44 UTC (rev 13630) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-07 01:26:36 UTC (rev 13631) @@ -179,6 +179,7 @@ cp $(DESTDIR)$(RBCONFIG).$(COMPILER) \ $(PKGROOT)$(RBCONFIG).$(COMPILER) ) +post-install-modulated: RMDIR=$(PKGROOT)/$(datadir)/emacs/site-lisp/ruby-mode post-install-modulated: @echo "Stripping DESTDIR from rbconfig.rb" @gsed -i -e s,$(DESTDIR),, \ @@ -188,10 +189,9 @@ @mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).$(COMPILER) @echo "Installing ruby-mode elisp..." @(mkdir -p $(RMDIR); \ - cp $(WORKSRC_FIRSTMOD)/misc/*el $(RMDIR)) + cp $(WORKSRC)/misc/*el $(RMDIR)) @$(MAKECONFIG) -post-merge: RMDIR=$(PKGROOT)/$(datadir)/emacs/site-lisp/ruby-mode post-merge: @echo "Copying in sample code..." @mkdir -p $(DESTDIR)$(docdir)/ruby18/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 7 02:36:41 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 07 Mar 2011 01:36:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[13632] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13632 http://gar.svn.sourceforge.net/gar/?rev=13632&view=rev Author: bdwalton Date: 2011-03-07 01:36:41 +0000 (Mon, 07 Mar 2011) Log Message: ----------- php5/trunk: more overrides for mod -> php5 deps; drop deps from main package; add library based deps to other modules Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-07 01:26:36 UTC (rev 13631) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-07 01:36:41 UTC (rev 13632) @@ -29,6 +29,7 @@ DISTFILES += php.ini.CSW phpext pear.conf.CSW CSWphp5.postinstall PACKAGES = CSWphp5 CSWphp5devel +PACKAGES += CSWap2-modphp5 PACKAGES += CSWphp5-bcmath PACKAGES += CSWphp5-bz2 PACKAGES += CSWphp5-calendar @@ -94,8 +95,13 @@ SPKG_DESC_CSWphp5devel = Development files for php5 RUNTIME_DEP_PKGS_CSWphp5 = CSWiconv RUNTIME_DEP_PKGS_CSWphp5 += CSWlibxml2 CSWzlib -RUNTIME_DEP_PKGS_CSWphp5 += CSWlibmm CSWapache2 +CATALOGNAME_CSWap2-modphp5 = ap2_modphp5 +SPKG_DESC_CSWap2-modphp5 = The apache 2.2.x php5 module +RUNTIME_DEP_PKGS_CSWap2-modphp5 = CSWphp5 CSWapache2 CSWlibxml2 CSWiconv +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib +OBSOLETES_CSWap2-modphp5 = CSWap2modphp5 + CATALOGNAME_CSWphp5-bcmath = php5_bcmath SPKG_DESC_CSWphp5-bcmath = The bcmath extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-bcmath = CSWphp5 @@ -119,7 +125,7 @@ CATALOGNAME_CSWphp5-curl = php5_curl SPKG_DESC_CSWphp5-curl = The curl extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-curl = CSWphp5 CSWcurlrt CSWlibidn -RUNTIME_DEP_PKGS_CSWphp5-curl += CSWoldaprt CSWosslrt CSWzlib +RUNTIME_DEP_PKGS_CSWphp5-curl += CSWoldaprt CSWosslrt CSWzlib CSWlibcares OBSOLETES_CSWphp5-curl = CSWphp5curl CATALOGNAME_CSWphp5-dba = php5_dba @@ -170,7 +176,7 @@ CATALOGNAME_CSWphp5-iconv = php5_iconv SPKG_DESC_CSWphp5-iconv = The iconv extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-iconv = CSWphp5 CSWiconv +RUNTIME_DEP_PKGS_CSWphp5-iconv = CSWphp5 OBSOLETES_CSWphp5-iconv = CSWphp5iconv CATALOGNAME_CSWphp5-imap = php5_imap @@ -259,7 +265,7 @@ CATALOGNAME_CSWphp5-pdosqlite = php5_pdosqlite SPKG_DESC_CSWphp5-pdosqlite = A Sqlite specific database access abstraction module for PHP applications (pdo version) -RUNTIME_DEP_PKGS_CSWphp5-pdosqlite = CSWphp5 CSWphp5-pdo +RUNTIME_DEP_PKGS_CSWphp5-pdosqlite = CSWphp5 CSWphp5-pdo CSWsqlite3rt OBSOLETES_CSWphp5-pdosqlite = CSWphp5pdosqlite CATALOGNAME_CSWphp5-pgsql = php5_pgsql @@ -349,7 +355,7 @@ CATALOGNAME_CSWphp5-xmlrpc = php5_xmlrpc SPKG_DESC_CSWphp5-xmlrpc = The xmlrpc extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-xmlrpc = CSWphp5 CSWiconv CSWlibxml2 CSWzlib CSWexpat +RUNTIME_DEP_PKGS_CSWphp5-xmlrpc = CSWphp5 CSWiconv CSWexpat OBSOLETES_CSWphp5-xmlrpc = CSWphp5xmlrpc CATALOGNAME_CSWphp5-xmlwriter = php5_xmlwriter @@ -387,6 +393,8 @@ PKGFILES_CSWphp5devel += $(mandir)/man1/php-config.1 PKGFILES_CSWphp5devel += $(mandir)/man1/phpize.1 +PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.* + PKGFILES_CSWphp5-bcmath = .*/lib/php/extensions/.*/bcmath.* PKGFILES_CSWphp5-bz2 = .*/lib/php/extensions/.*/bz2.* @@ -697,6 +705,13 @@ CHECKPKG_OVERRIDES_CSWphp5-pgsql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-shmop += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mhash += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-session += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5-pdo +CHECKPKG_OVERRIDES_CSWphp5-sysvsem += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5-pdo +CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5-pdo +CHECKPKG_OVERRIDES_CSWphp5-mysqli += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5-pdo include files/scripts.mk 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 Mon Mar 7 02:55:34 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 07 Mar 2011 01:55:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[13633] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13633 http://gar.svn.sourceforge.net/gar/?rev=13633&view=rev Author: bdwalton Date: 2011-03-07 01:55:34 +0000 (Mon, 07 Mar 2011) Log Message: ----------- ruby18/trunk: split the gcc4 version of rbconfig.rb into a separate package Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-07 01:36:41 UTC (rev 13632) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-07 01:55:34 UTC (rev 13633) @@ -11,7 +11,7 @@ BUILD_DEP_PKGS += CSWreadline CSWzlib CSWossldevel PACKAGES = CSWruby18 CSWruby18-doc CSWruby18-tk CSWruby18-dev CSWruby18-mode -PACKAGES += CSWruby18-mode-el CSWlibruby18-1 +PACKAGES += CSWruby18-mode-el CSWlibruby18-1 CSWruby18-gcc4 EXTRA_MODULATORS = COMPILER MODULATIONS_COMPILER = sun gcc4 @@ -25,18 +25,25 @@ OBSOLETES_CSWruby18-mode = CSWrubymode OBSOLETES_CSWruby18-mode-el = CSWrubymodeel -ALTERNATIVES_CSWruby18 = ruby +ALTERNATIVES_CSWruby18 = ruby rbconfig18 ALTERNATIVE_ruby = $(bindir)/ruby ruby $(bindir)/ruby18 10 $(bindir)/irb irb $(bindir)/irb18 $(bindir)/erb erb $(bindir)/erb18 $(bindir)/rdoc rdoc $(bindir)/rdoc18 $(bindir)/ri ri $(bindir)/ri18 $(bindir)/testrb testrb $(bindir)/testrb18 $(mandir)/man1/ruby.1 ruby.1 $(mandir)/man1/ruby18.1 +ALTERNATIVE_rbconfig18 += $(libdir)/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb rbconfig18 $(libdir)/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb.sun 5 +ALTERNATIVES_CSWruby18-gcc4 = rbconfig18 +ALTERNATIVE_rbconfig18 += $(libdir)/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb rbconfig18 $(libdir)/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb.gcc4 10 + ARCHALL_CSWruby18-doc = 1 ARCHALL_CSWruby18-mode = 1 ARCHALL_CSWruby18-mode-el = 1 +ARCHALL_CSWruby18-gcc4 = 1 LICENSE = COPYING RUNTIME_DEP_PKGS_CSWruby18 = CSWbdb48 CSWlibgdbm3 CSWiconv CSWlibruby18-1 RUNTIME_DEP_PKGS_CSWruby18 += CSWncurses CSWosslrt CSWreadline CSWzlib +RUNTIME_DEP_PKGS_CSWruby18-gcc4 = CSWruby18 + RUNTIME_DEP_PKGS_CSWruby18-doc = CSWruby18 RUNTIME_DEP_PKGS_CSWruby18-tk = CSWruby18 CSWtk CSWtcl CSWlibruby18-1 @@ -60,6 +67,8 @@ SPKG_DESC_CSWruby18 = $(DESCRIPTION) +SPKG_DESC_CSWruby18-gcc4 = A gcc4 compatible rbconfig.rb (Ruby 1.8) + SPKG_DESC_CSWlibruby18-1 = The libruby.so.1* files (Ruby 1.8) SPKG_DESC_CSWruby18-doc = Documentation for Ruby 1.8 @@ -74,6 +83,8 @@ PKGFILES_CSWruby18-doc = $(datadir)/ri/.* $(docdir)/$(NAME)/sample.* +PKGFILES_CSWruby18-gcc4 = $(libdir)/ruby/1.8/$(GARCH)-solaris2.9/.*gcc4 + PKGFILES_CSWruby18-tk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb PKGFILES_CSWruby18-dev = $(libdir)/.*\.h $(libdir)/.*/mkmf.rb $(libdir)/.*static.a @@ -118,7 +129,6 @@ CONFIGURE_ARGS += --program-suffix=18 EXTRA_CONFIGURE_ARGS_isa-default-compiler-sun = --enable-install-doc - INSTALL_ARGS = install DISTNAME = ruby-$(VERSION)-$(PATCHLEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 7 03:03:48 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 07 Mar 2011 02:03:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[13634] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13634 http://gar.svn.sourceforge.net/gar/?rev=13634&view=rev Author: bdwalton Date: 2011-03-07 02:03:48 +0000 (Mon, 07 Mar 2011) Log Message: ----------- ruby18/trunk: the gcc4 sub-package cannot be arch=all Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-07 01:55:34 UTC (rev 13633) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-07 02:03:48 UTC (rev 13634) @@ -35,7 +35,6 @@ ARCHALL_CSWruby18-doc = 1 ARCHALL_CSWruby18-mode = 1 ARCHALL_CSWruby18-mode-el = 1 -ARCHALL_CSWruby18-gcc4 = 1 LICENSE = COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 7 03:05:11 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 07 Mar 2011 02:05:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[13635] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13635 http://gar.svn.sourceforge.net/gar/?rev=13635&view=rev Author: bdwalton Date: 2011-03-07 02:05:10 +0000 (Mon, 07 Mar 2011) Log Message: ----------- ruby18/trunk: override alternatives dep for gcc4 subpackage Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-07 02:03:48 UTC (rev 13634) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-07 02:05:10 UTC (rev 13635) @@ -163,6 +163,8 @@ CHECKPKG_OVERRIDES_CSWruby18-doc += missing-dependency|CSWperl CHECKPKG_OVERRIDES_CSWruby18-doc += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWruby18-gcc4 += surplus-dependency|CSWalternatives + CHECKPKG_OVERRIDES_CSWruby18 += surplus-dependency|CSWalternatives # usr/local overrides This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 7 03:24:34 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 07 Mar 2011 02:24:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[13636] csw/mgar/pkg/apache2/branches/open-bug-squash/ Makefile Message-ID: Revision: 13636 http://gar.svn.sourceforge.net/gar/?rev=13636&view=rev Author: bdwalton Date: 2011-03-07 02:24:34 +0000 (Mon, 07 Mar 2011) Log Message: ----------- apache2/branches/open-bug-squash: correct a few catalog name definitions after making catalog name equal package name Modified Paths: -------------- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-07 02:05:10 UTC (rev 13635) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-07 02:24:34 UTC (rev 13636) @@ -75,9 +75,9 @@ CATALOGNAME_CSWapache2 = apache2 CATALOGNAME_CSWapache2-dev = apache2_dev CATALOGNAME_CSWapache2-manual = apache2_manual -CATALOGNAME_CSWap2suexec = ap2_suexec -CATALOGNAME_CSWap2prefork = ap2_prefork -CATALOGNAME_CSWap2worker = ap2_worker +CATALOGNAME_CSWap2-suexec = ap2_suexec +CATALOGNAME_CSWap2-prefork = ap2_prefork +CATALOGNAME_CSWap2-worker = ap2_worker CATALOGNAME_CSWapache2rt = apache2rt SPKG_DESC_CSWapache2 = A high performance Unix-based HTTP server. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 7 04:08:01 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 07 Mar 2011 03:08:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[13637] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13637 http://gar.svn.sourceforge.net/gar/?rev=13637&view=rev Author: bdwalton Date: 2011-03-07 03:08:01 +0000 (Mon, 07 Mar 2011) Log Message: ----------- php5/trunk: split out the apache 1.3 package again (should be dropped?) Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-07 02:24:34 UTC (rev 13636) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-07 03:08:01 UTC (rev 13637) @@ -84,9 +84,15 @@ PACKAGES += CSWphp5-xmlwriter PACKAGES += CSWphp5-xsl PACKAGES += CSWphp5-zip +PACKAGES += CSWmod-php5 BUILD_DEP_PKGS += CSWlibgdbm-dev +CATALOGNAME_CSWmod-php5 = mod_php5 +SPKG_DESC_CSWmodphp5 = The apache 1.3.x php5 module +RUNTIME_DEP_PKGS_CSWmod-php5 = CSWphp5 CSWapache CSWlibxml2 CSWiconv +OBSOLETES_CSWmod-php5 = CSWmodphp5 + CATALOGNAME_CSWphp5 = php5 SPKG_DESC_CSWphp5 = A High-Level Scripting Language INCOMPATIBLE_PKGS_CSWphp5 = CSWphp5mimemagic @@ -395,6 +401,8 @@ PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.* +PKGFILES_CSWmod-php5 += $(prefix)/apache/.* + PKGFILES_CSWphp5-bcmath = .*/lib/php/extensions/.*/bcmath.* PKGFILES_CSWphp5-bz2 = .*/lib/php/extensions/.*/bz2.* @@ -712,6 +720,7 @@ CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5-pdo CHECKPKG_OVERRIDES_CSWphp5-mysqli += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5-pdo +CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5 include files/scripts.mk 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 Mon Mar 7 04:12:25 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 07 Mar 2011 03:12:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[13638] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13638 http://gar.svn.sourceforge.net/gar/?rev=13638&view=rev Author: bdwalton Date: 2011-03-07 03:12:25 +0000 (Mon, 07 Mar 2011) Log Message: ----------- php5/trunk: correct typo in description for mod_php5 Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-07 03:08:01 UTC (rev 13637) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-07 03:12:25 UTC (rev 13638) @@ -89,7 +89,7 @@ BUILD_DEP_PKGS += CSWlibgdbm-dev CATALOGNAME_CSWmod-php5 = mod_php5 -SPKG_DESC_CSWmodphp5 = The apache 1.3.x php5 module +SPKG_DESC_CSWmod-php5 = The apache 1.3.x php5 module RUNTIME_DEP_PKGS_CSWmod-php5 = CSWphp5 CSWapache CSWlibxml2 CSWiconv OBSOLETES_CSWmod-php5 = CSWmodphp5 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 7 04:19:02 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 07 Mar 2011 03:19:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[13639] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 13639 http://gar.svn.sourceforge.net/gar/?rev=13639&view=rev Author: bdwalton Date: 2011-03-07 03:19:02 +0000 (Mon, 07 Mar 2011) Log Message: ----------- coreutils/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2011-03-07 03:12:25 UTC (rev 13638) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2011-03-07 03:19:02 UTC (rev 13639) @@ -1,5 +1,5 @@ NAME = coreutils -VERSION = 8.9 +VERSION = 8.10 CATEGORIES = utils # seq has issues related to the handling of long double's with -O2. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 7 04:20:42 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 07 Mar 2011 03:20:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[13640] csw/mgar/pkg/coreutils/trunk/checksums Message-ID: Revision: 13640 http://gar.svn.sourceforge.net/gar/?rev=13640&view=rev Author: bdwalton Date: 2011-03-07 03:20:42 +0000 (Mon, 07 Mar 2011) Log Message: ----------- coreutils/trunk: update makesums Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/checksums Modified: csw/mgar/pkg/coreutils/trunk/checksums =================================================================== --- csw/mgar/pkg/coreutils/trunk/checksums 2011-03-07 03:19:02 UTC (rev 13639) +++ csw/mgar/pkg/coreutils/trunk/checksums 2011-03-07 03:20:42 UTC (rev 13640) @@ -1 +1 @@ -36909ae68840d73a800120cf74af794a coreutils-8.9.tar.gz +74d54d09fc5c1bd3337127f49c88b1c5 coreutils-8.10.tar.gz 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 Mar 7 09:26:07 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Mar 2011 08:26:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[13641] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 13641 http://gar.svn.sourceforge.net/gar/?rev=13641&view=rev Author: wahwah Date: 2011-03-07 08:26:07 +0000 (Mon, 07 Mar 2011) Log Message: ----------- mysql5: Adjust overrides Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-03-07 03:20:42 UTC (rev 13640) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-03-07 08:26:07 UTC (rev 13641) @@ -187,12 +187,11 @@ PROTOTYPE_PERMS_dbdir = 0700 PROTOTYPE_CLASS_dbdir = ugfiles -CHECKPKG_OVERRIDES_CSWmysql5test += surplus-dependency|CSWmysql5 -CHECKPKG_OVERRIDES_CSWmysql5devel += surplus-dependency|CSWmysql5rt CHECKPKG_OVERRIDES_CSWmysql5 += surplus-dependency|CSWmysql5client +CHECKPKG_OVERRIDES_CSWmysql5bench += file-with-bad-content CHECKPKG_OVERRIDES_CSWmysql5bench += surplus-dependency|CSWmysql5 CHECKPKG_OVERRIDES_CSWmysql5test += file-with-bad-content -CHECKPKG_OVERRIDES_CSWmysql5bench += file-with-bad-content +CHECKPKG_OVERRIDES_CSWmysql5test += surplus-dependency|CSWmysql5 CHECKPKG_OVERRIDES_CSWmysql5client += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man1/mysqlaccess.1 CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/info/mysql.info @@ -209,6 +208,8 @@ CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/share|root/opt/csw/mysql5/share/man/man1/mysql_tzinfo_to_sql.1 CHECKPKG_OVERRIDES_CSWmysql5devel += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man1/mysql_config.1 +CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/local|root/opt/csw/mysql5/bin/i386/mysqlbug +CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/local|root/opt/csw/mysql5/bin/amd64/mysqlbug include gar/category.mk 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 Mar 7 10:07:09 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Mar 2011 09:07:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[13642] csw/mgar/pkg/postgresql/branches/postgresql-9.0/ Makefile Message-ID: Revision: 13642 http://gar.svn.sourceforge.net/gar/?rev=13642&view=rev Author: wahwah Date: 2011-03-07 09:07:09 +0000 (Mon, 07 Mar 2011) Log Message: ----------- postgresql-9.0: Sorted dependency list Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2011-03-07 08:26:07 UTC (rev 13641) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2011-03-07 09:07:09 UTC (rev 13642) @@ -73,14 +73,14 @@ CATALOGNAME_CSWpostgresql-$(BASE_VERSION_G)-doc = postgresql_$(BASE_VERSION_G)_doc SPKG_DESC_CSWpostgresql-$(BASE_VERSION_G)-doc = PostgreSQL $(BASE_VERSION).x Documentation -RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibxslt +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWkrb5lib RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibgnugetopt -RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWzlib +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibpq5 RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibxslt +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWosslrt RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWreadline -RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWkrb5lib -RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWosslrt -RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibpq5 +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWzlib ARCHALL_CSWpostgresql = 1 ARCHALL_CSWpostgresql-$(BASE_VERSION_G)-doc = 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 Mon Mar 7 10:07:41 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Mar 2011 09:07:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[13643] csw/mgar/pkg/postgresql/branches/postgresql-9.0/ files/check_pkgroot.sh Message-ID: Revision: 13643 http://gar.svn.sourceforge.net/gar/?rev=13643&view=rev Author: wahwah Date: 2011-03-07 09:07:41 +0000 (Mon, 07 Mar 2011) Log Message: ----------- posqgresql-9.0: Moved set -x to the top of check_pkgroot.sh Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/check_pkgroot.sh Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/check_pkgroot.sh =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/check_pkgroot.sh 2011-03-07 09:07:09 UTC (rev 13642) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/check_pkgroot.sh 2011-03-07 09:07:41 UTC (rev 13643) @@ -1,6 +1,10 @@ #!/opt/csw/bin/bash # $Id$ +set -u +set -e +set -x + declare -r PKGROOT="$1" if [[ -z "${PKGROOT}" ]] @@ -9,10 +13,6 @@ exit 1 fi -set -u -set -e -set -x - # Look for unexpanded variables ! grep @sysconfdir@ ${PKGROOT}/etc/opt/csw/init.d/cswpostgres_9_0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Mon Mar 7 10:15:56 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Mon, 7 Mar 2011 09:15:56 +0000 Subject: [csw-devel] [PATCH] mgar: support show-buildsys outside Subversion In-Reply-To: <1299319108-6191-1-git-send-email-maciej@opencsw.org> References: <1299319108-6191-1-git-send-email-maciej@opencsw.org> Message-ID: Sebastian, ping? From maciej at opencsw.org Mon Mar 7 10:16:14 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Mon, 7 Mar 2011 09:16:14 +0000 Subject: [csw-devel] [PATCH] mGAR v2: README.CSW support, base directories In-Reply-To: <1299320298-16373-1-git-send-email-maciej@opencsw.org> References: <1299320298-16373-1-git-send-email-maciej@opencsw.org> Message-ID: Dago, ping? From phipsy at users.sourceforge.net Mon Mar 7 12:53:03 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Mon, 07 Mar 2011 11:53:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[13644] csw/mgar/pkg/facter/trunk/Makefile Message-ID: Revision: 13644 http://gar.svn.sourceforge.net/gar/?rev=13644&view=rev Author: phipsy Date: 2011-03-07 11:53:02 +0000 (Mon, 07 Mar 2011) Log Message: ----------- Removed spurious stuff from facter Makefile Modified Paths: -------------- csw/mgar/pkg/facter/trunk/Makefile Modified: csw/mgar/pkg/facter/trunk/Makefile =================================================================== --- csw/mgar/pkg/facter/trunk/Makefile 2011-03-07 09:07:41 UTC (rev 13643) +++ csw/mgar/pkg/facter/trunk/Makefile 2011-03-07 11:53:02 UTC (rev 13644) @@ -20,16 +20,11 @@ MASTER_SITES = http://puppetlabs.com/downloads/facter/ DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz SPKG_SOURCEURL = http://puppetlabs.com/ RUNTIME_DEP_PKGS = CSWruby BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -# We define upstream file regex so we can be notifed of new upstream software -# release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - ARCHALL=1 CONFIGURE_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Mon Mar 7 15:20:50 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Mon, 07 Mar 2011 14:20:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[13645] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 13645 http://gar.svn.sourceforge.net/gar/?rev=13645&view=rev Author: phipsy Date: 2011-03-07 14:20:50 +0000 (Mon, 07 Mar 2011) Log Message: ----------- Changes to puppet to cater for inbuilt behaviour Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall csw/mgar/pkg/puppet/trunk/files/cswpuppetd csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2011-03-07 11:53:02 UTC (rev 13644) +++ csw/mgar/pkg/puppet/trunk/Makefile 2011-03-07 14:20:50 UTC (rev 13645) @@ -25,15 +25,11 @@ DISTFILES += cswpuppetd DISTFILES += cswpuppetmasterd DISTFILES += cswusergroup -DISTFILES += puppetd.xml -DISTFILES += puppetmaster.xml -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +DISTFILES += CSWpuppet.postinstall SPKG_SOURCEURL = http://puppetlabs.com/ INITSMF += $(sysconfdir)/init\.d/cswpuppetd INITSMF += $(sysconfdir)/init\.d/cswpuppetmasterd -#MANIFEST /var${prefix}/svc/manifest/network/puppetd.xml -#MANIFEST /var${prefix}/svc/manifest/network/puppetmaster.xml USERGROUP = $(sysconfdir)/pkg/puppet/cswusergroup # Creating a separate package CSWpuppetmaster so that the cswpuppetmaster @@ -53,7 +49,7 @@ PKGFILES_CSWpuppetmaster += $(sbindir)/puppetmasterd PKGFILES_CSWpuppetmaster += $(mandir)/man8/puppetmasterd.8 PKGFILES_CSWpuppetmaster += $(libdir)/.*/puppet/application/puppetmasterd.rb -PKGFILES_CSWpuppetmaster += /var${prefix}/svc/manifest/network/puppetmaster.xml +PKGFILES_CSWpuppetmaster += $(sysconfdir)/puppet/auth.conf ARCHALL = 1 @@ -70,7 +66,7 @@ PATCHFILES += 0003-Use-opt-csw-share-puppet-modules-as-default.patch CHECKPKG_OVERRIDES_CSWpuppet += surplus-dependency|CSWfacter -CHECKPKG_OVERRIDES_CSWpuppet += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWpuppet += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWpuppetmaster += surplus-dependency|CSWpuppet # CRONDIR = $(sysconfdir)/pkg/CSWpuppet/crontabs @@ -91,12 +87,8 @@ ginstall -m 755 $(FILEDIR)/cswpuppetd $(DESTDIR)$(sysconfdir)/init.d ginstall -m 755 $(FILEDIR)/cswpuppetmasterd $(DESTDIR)$(sysconfdir)/init.d ginstall -m 755 $(FILEDIR)/cswpuppetmasterd $(DESTDIR)/etc$(prefix)/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; \ - gsed -e "s|/var/run/puppet|/var/opt/csw/puppet/run|g" -i ./lib/puppet/defaults.rb) cd $(WORKSRC) && $(INSTALL_ENV) ruby install.rb \ - --configdir=$(sysconfdir) \ + --configdir=$(sysconfdir)/puppet \ --bindir=$(bindir) \ --sbindir=$(sbindir) \ --full @@ -111,13 +103,6 @@ ginstall -d -m 755 $(DESTDIR)$(sysconfdir)/pkg/puppet ginstall -m 644 $(FILEDIR)/cswusergroup \ $(DESTDIR)$(sysconfdir)/pkg/puppet/cswusergroup - ( [ -d $(DESTDIR)/var/lib ] && echo "$(DESTDIR)/var/lib" must not exist && false ) || true + # ( [ -d $(DESTDIR)/var/lib ] && echo "$(DESTDIR)/var/lib" must not exist && false ) || true mkdir -p $(DESTDIR)$(localstatedir)/lib - # For this file to run, CSWpuppet would need to depend on CSWpython, - # and we don't want that. It could be split off to another package, but - # this file doesn't seem to be of any use on Solaris, so we can safely - # remove it. - # markp: Putting this back in. Will look at deps later. Some places do run - # yum on Solaris, would you believe. - # rm $(DESTDIR)$(libdir)/ruby/site_ruby/1.8/puppet/provider/package/yumhelper.py @$(MAKECOOKIE) Modified: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall =================================================================== --- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall 2011-03-07 11:53:02 UTC (rev 13644) +++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall 2011-03-07 14:20:50 UTC (rev 13645) @@ -6,11 +6,22 @@ PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-/} # Migration of the configuration files? -/usr/bin/test -d $PKG_INSTALL_ROOT/opt/csw/etc/puppet || /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/ln -s /etc/opt/csw/puppet /opt/csw/etc/puppet -/usr/bin/test -d $PKG_INSTALL_ROOT/etc/puppet || /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/ln -s /opt/csw/etc/puppet /etc/puppet -/usr/bin/test -d $PKG_INSTALL_ROOT/opt/csw/var/puppet || /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/ln -s /var/opt/csw/puppet /opt/csw/var/puppet -/usr/bin/test -d $PKG_INSTALL_ROOT/var/puppet || /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/ln -s /var/opt/csw/puppet /var/puppet +# This is horrible. Puppet insists on it's directories and will FORCE them to +# _be_ directories. Therefore, to fit in with the CSW layout the only vaguely +# sensible thing to do is to symlink TO the CSW layout and not FROM it. +if [ ! -d $PKG_INSTALL_ROOT/opt/csw/etc/puppet ]; then + /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/ln -s /etc/opt/csw/puppet /opt/csw/etc/puppet +fi +if [ ! -d $PKG_INSTALL_ROOT/var/lib ]; then + /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/mkdir -p /var/lib/puppet + /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/ln -s /var/lib/puppet /var/opt/csw/puppet +fi + +if [ ! -d $PKG_INSTALL_ROOT/opt/csw/var/puppet ]; then + /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/ln -s /var/lib/puppet /opt/csw/var/puppet +fi + # Replaced with INITSMF exit 0 Modified: csw/mgar/pkg/puppet/trunk/files/cswpuppetd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2011-03-07 11:53:02 UTC (rev 13644) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2011-03-07 14:20:50 UTC (rev 13645) @@ -4,6 +4,9 @@ # # /etc/opt/csw/init.d/cswpuppetd # +# 2011-03-06 Mark Phillips +# * Added getprop - not used, yet +# # 2009-10-21 Maciej Blizinski # # * Introduced start/stop/reload as functions @@ -22,101 +25,111 @@ sbindir="/opt/csw/sbin" localstatedir="/var/opt/csw" +getprop() { + val=`/usr/bin/svcprop -p $1 $SMF_FMRI` + [ -n "$val" ] && echo $val +} start_puppetd() { - cd / - # Start daemons. - ${sbindir}/puppetd + cd / + confdir=`getprop puppet/confdir` + vardir=`getprop puppet/vardir` + ssldir=`getprop puppet/ssldir` + + # Start daemons. + #${sbindir}/puppetd --confdir=$confdir --vardir=$vardir --ssldir=$ssldir + ${sbindir}/puppetd } reload_puppetd() { - if [ -r $pidfile ]; then - kill -HUP `cat $pidfile` - fi + if [ -r $pidfile ]; then + kill -HUP `cat $pidfile` + fi } stop_puppetd() { - if [ -r $pidfile ]; then - pid=`cat $pidfile` - kill $pid - fi + if [ -r $pidfile ]; then + pid=`cat $pidfile` + kill $pid + fi } get_current_pid() { - if [ -x /usr/bin/zonename ]; then - zone=`/usr/bin/zonename` - zoneopts="-z $zone" - else - zoneopts="" - fi - pgrep $zoneopts puppetd + if [ -x /usr/bin/zonename ]; then + zone=`/usr/bin/zonename` + zoneopts="-z $zone" + else + zoneopts="" + fi + pgrep $zoneopts puppetd } # Returns a line with certain string from a config file. get_line_with() { - __s="$1" - __f="$2" - cat "${__f}" \ - | sed -e 's/^ *//' \ - | grep -v '^#' \ - | grep "${__s}" + __s="$1" + __f="$2" + cat "${__f}" \ + | sed -e 's/^ *//' \ + | grep -v '^#' \ + | grep "${__s}" } get_pid_file() { - # The default pid file is /var/opt/csw/puppet/run/puppetd.pid - # but a different pid file can be set in puppet.conf. - __pidfile="/var/opt/csw/puppet/run/puppetd.pid" - conffile="/etc/opt/csw/puppet/puppet.conf" - if [ -r "$conffile" ]; then - pid_line=`get_line_with pidfile ${conffile}` - if [ -n "${pid_line}" ]; then - echo "${pid_line}" | cut -d= -f2 | tr -d ' ' - return + # The default pid file is /var/opt/csw/puppet/run/puppetd.pid + # but a different pid file can be set in puppet.conf. + __pidfile="/var/opt/csw/puppet/run/puppetd.pid" + conffile="/etc/opt/csw/puppet/puppet.conf" + if [ -r "$conffile" ]; then + pid_line=`get_line_with pidfile ${conffile}` + if [ -n "${pid_line}" ]; then + echo "${pid_line}" | cut -d= -f2 | tr -d ' ' + return + fi fi - fi - echo "${__pidfile}" + echo "${__pidfile}" } pidfile=`get_pid_file` case "$1" in - start) - printf "Starting Puppet client services:" - start_puppetd - printf " puppetd" - echo "" - ;; - stop) - printf "Stopping Puppet client services:" - stop_puppetd - printf " puppetd" - echo "" - ;; - restart) - printf "Restarting Puppet client services:" - stop_puppetd - start_puppetd - printf " puppetd" - echo "" - ;; - reload) - printf "Reloading Puppet client services:" - reload_puppetd - printf " puppetd" - echo "" - ;; - status) - if [ -f $pidfile ]; then - pid=`cat $pidfile` - curpid=`get_current_pid` - if [ "$pid" -eq "$curpid" ]; then - exit 0 - else - exit 1 - fi - else - exit 1 - fi - ;; + start) + printf "Starting Puppet client services:" + start_puppetd + printf " puppetd" + echo "" + ;; + stop) + printf "Stopping Puppet client services:" + stop_puppetd + printf " puppetd" + echo "" + ;; + restart) + printf "Restarting Puppet client services:" + stop_puppetd + start_puppetd + printf " puppetd" + echo "" + ;; + reload) + printf "Reloading Puppet client services:" + reload_puppetd + printf " puppetd" + echo "" + ;; + status) + if [ -f $pidfile ]; then + pid=`cat $pidfile` + curpid=`get_current_pid` + if [ "$pid" -eq "$curpid" ]; then + exit 0 + else + exit 1 + fi + else + exit 1 + fi + ;; esac exit 0 + Modified: csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd 2011-03-07 11:53:02 UTC (rev 13644) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd 2011-03-07 14:20:50 UTC (rev 13645) @@ -1,5 +1,10 @@ #!/bin/sh # +# 2011-03-06 Mark Phillips +# * Added getprop +# +# 2009-11-23 Gary Law +# * Original version . /lib/svc/share/smf_include.sh @@ -10,15 +15,19 @@ pidfile=/var/opt/csw/puppet/run/puppetmasterd.pid +getprop() { + val=`/usr/bin/svcprop -p $1 $SMF_FMRI` + [ -n "$val" ] && echo $val +} + case "$1" in start) cd / # Start daemons. printf "Starting Puppet server services:" + ${sbindir}/puppetmasterd - /opt/csw/sbin/puppetmasterd - printf " puppetmaster" echo "" ;; @@ -59,4 +68,3 @@ esac exit 0 -# $Id$ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Mar 7 17:45:38 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 07 Mar 2011 16:45:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[13646] csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile Message-ID: Revision: 13646 http://gar.svn.sourceforge.net/gar/?rev=13646&view=rev Author: bonivart Date: 2011-03-07 16:45:37 +0000 (Mon, 07 Mar 2011) Log Message: ----------- cpan/IO-Compress/trunk: Overrides about not yet released packages, change dep names to new standard Modified Paths: -------------- csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile Modified: csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile 2011-03-07 14:20:50 UTC (rev 13645) +++ csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile 2011-03-07 16:45:37 UTC (rev 13646) @@ -22,14 +22,6 @@ DISTFILES += COPYING -RUNTIME_DEP_PKGS = CSWpmcompressrawzlib -RUNTIME_DEP_PKGS += CSWpmcompressrawbz2 - -# Uncomment if all packages who depend on these have switched to depend on this package -#INCOMPATIBLE_PKGS = CSWpmcompresszlib -INCOMPATIBLE_PKGS += CSWpmiocompressbase -INCOMPATIBLE_PKGS += CSWpmiocompresszlib - PACKAGES = CSWpm-io-compress CATALOGNAME = pm_io_compress SPKG_DESC_CSWpm-io-compress = $(DESCRIPTION) @@ -38,6 +30,18 @@ ARCHALL = 1 +RUNTIME_DEP_PKGS = CSWpm-compress-raw-zlib +RUNTIME_DEP_PKGS += CSWpm-compress-raw-bzip2 + +# Uncomment if all packages who depend on these have switched to depend on this package +#INCOMPATIBLE_PKGS = CSWpmcompresszlib +INCOMPATIBLE_PKGS += CSWpmiocompressbase +INCOMPATIBLE_PKGS += CSWpmiocompresszlib + +# Not yet released, remove these next build +CHECKPKG_OVERRIDES_CSWpm-io-compress += unidentified-dependency|CSWpm-compress-raw-zlib +CHECKPKG_OVERRIDES_CSWpm-io-compress += unidentified-dependency|CSWpm-compress-raw-bzip2 + EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* .*\/man\/man1.* include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Mon Mar 7 17:56:14 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Mon, 07 Mar 2011 16:56:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[13647] csw/mgar/pkg/puppet/trunk/files/CSWpuppet. postinstall Message-ID: Revision: 13647 http://gar.svn.sourceforge.net/gar/?rev=13647&view=rev Author: phipsy Date: 2011-03-07 16:56:14 +0000 (Mon, 07 Mar 2011) Log Message: ----------- Fixed puppet postinstall a bit more Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall Modified: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall =================================================================== --- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall 2011-03-07 16:45:37 UTC (rev 13646) +++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall 2011-03-07 16:56:14 UTC (rev 13647) @@ -15,7 +15,9 @@ if [ ! -d $PKG_INSTALL_ROOT/var/lib ]; then /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/mkdir -p /var/lib/puppet - /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/ln -s /var/lib/puppet /var/opt/csw/puppet + if [ ! -d $PKG_INSTALL_ROOT/var/opt/csw/puppet ]; then + /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/ln -s /var/lib/puppet /var/opt/csw/puppet + fi fi if [ ! -d $PKG_INSTALL_ROOT/opt/csw/var/puppet ]; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Mar 7 18:27:55 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 07 Mar 2011 17:27:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[13648] csw/mgar/pkg/cpan/DBI/trunk Message-ID: Revision: 13648 http://gar.svn.sourceforge.net/gar/?rev=13648&view=rev Author: bonivart Date: 2011-03-07 17:27:55 +0000 (Mon, 07 Mar 2011) Log Message: ----------- cpan/DBI/trunk: Overrides about /usr/local Modified Paths: -------------- csw/mgar/pkg/cpan/DBI/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cpan/DBI/trunk/files/CSWpm-dbi.cswreleasenotes Modified: csw/mgar/pkg/cpan/DBI/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBI/trunk/Makefile 2011-03-07 16:56:14 UTC (rev 13647) +++ csw/mgar/pkg/cpan/DBI/trunk/Makefile 2011-03-07 17:27:55 UTC (rev 13648) @@ -11,7 +11,8 @@ used. endef -DISTFILES = COPYING +DISTFILES = COPYING +DISTFILES += CSWpm-dbi.cswreleasenotes PACKAGES = CSWpm-dbi CATALOGNAME = pm_dbi @@ -19,6 +20,9 @@ OBSOLETES_CSWpm-dbi = CSWpmdbi CATALOGNAME_CSWpmdbi = pm_dbi2 -#RUNTIME_DEP_PKGS = CSWpmplrpc +CHECKPKG_OVERRIDES_CSWpm-dbi += file-with-bad-content|/usr/local|root/opt/csw/lib/perl/csw/DBD/File.pm +CHECKPKG_OVERRIDES_CSWpm-dbi += file-with-bad-content|/usr/local|root/opt/csw/lib/perl/csw/DBI/ProfileDumper/Apache.pm +CHECKPKG_OVERRIDES_CSWpm-dbi += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/DBD::File.3perl +CHECKPKG_OVERRIDES_CSWpm-dbi += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/DBI::ProfileDumper::Apache.3perl include gar/category.mk Added: csw/mgar/pkg/cpan/DBI/trunk/files/CSWpm-dbi.cswreleasenotes =================================================================== --- csw/mgar/pkg/cpan/DBI/trunk/files/CSWpm-dbi.cswreleasenotes (rev 0) +++ csw/mgar/pkg/cpan/DBI/trunk/files/CSWpm-dbi.cswreleasenotes 2011-03-07 17:27:55 UTC (rev 13648) @@ -0,0 +1 @@ +The /usr/local references are harmless examples in the documentation. 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 Mar 7 18:47:08 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 07 Mar 2011 17:47:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[13649] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 13649 http://gar.svn.sourceforge.net/gar/?rev=13649&view=rev Author: dmichelsen Date: 2011-03-07 17:47:08 +0000 (Mon, 07 Mar 2011) Log Message: ----------- mGAR v2: Fix generation of transitional package name when exceeding length Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-03-07 17:27:55 UTC (rev 13648) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-03-07 17:47:08 UTC (rev 13649) @@ -62,7 +62,7 @@ CATALOGNAME_$(1) ?= $(call catalogname,$(1)) # The length of the description has been limited to 100 characters, # the string is cut (no longer on word boundaries). -SPKG_DESC_$(1) ?= $(shell echo Transitional package. Content moved to $(foreach P,$(PACKAGES),$(if $(filter $(1),$(OBSOLETES_$P)),$P)) | perl -npe 's/^(.{100}).+/substr($$1,0,-4) . " ..."/') +SPKG_DESC_$(1) ?= $(shell echo Transitional package. Content moved to $(foreach P,$(PACKAGES),$(if $(filter $(1),$(OBSOLETES_$P)),$P)) | perl -npe 's/(.{0,97}\s|\S{0,97})(.+)/$$1.../') RUNTIME_DEP_PKGS_$(1) = $(foreach P,$(PACKAGES),$(if $(filter $(1),$(OBSOLETES_$P)),$P)) PKGFILES_$(1) = NOFILES ARCHALL_$(1) = 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 Mon Mar 7 19:05:16 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 07 Mar 2011 18:05:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[13650] csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile Message-ID: Revision: 13650 http://gar.svn.sourceforge.net/gar/?rev=13650&view=rev Author: bonivart Date: 2011-03-07 18:05:16 +0000 (Mon, 07 Mar 2011) Log Message: ----------- cpan/GSSAPI/trunk: Override bad rpath due to krb5-config problem Modified Paths: -------------- csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile Modified: csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile 2011-03-07 17:47:08 UTC (rev 13649) +++ csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile 2011-03-07 18:05:16 UTC (rev 13650) @@ -18,4 +18,8 @@ RUNTIME_DEP_PKGS = CSWkrb5lib +# Dago: "You can safely override it and make a comment +# that after krb5-config fixing it should go away" +CHECKPKG_OVERRIDES_CSWpm-gssapi += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/perl/csw/auto/GSSAPI/GSSAPI.so + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Mar 7 19:15:03 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 07 Mar 2011 18:15:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[13651] csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile Message-ID: Revision: 13651 http://gar.svn.sourceforge.net/gar/?rev=13651&view=rev Author: bonivart Date: 2011-03-07 18:15:03 +0000 (Mon, 07 Mar 2011) Log Message: ----------- cpan/HTML-Parser/trunk: Override about not yet renamed/released dep Modified Paths: -------------- csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile Modified: csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile 2011-03-07 18:05:16 UTC (rev 13650) +++ csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile 2011-03-07 18:15:03 UTC (rev 13651) @@ -19,8 +19,10 @@ OBSOLETES_CSWpm-html-parser = CSWpmhtmlparser CATALOGNAME_CSWpmhtmlparser = pm_htmlparser -RUNTIME_DEP_PKGS = CSWpmhtmltagset +RUNTIME_DEP_PKGS = CSWpm-html-tagset +CHECKPKG_OVERRIDES_CSWpm-html-parser += unidentified-dependency|CSWpm-html-tagset + CONFIGURE_ARGS = -n include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Mon Mar 7 19:24:01 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Mon, 07 Mar 2011 18:24:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[13652] csw/mgar/pkg/puppet/tags/puppet-2.6.4, REV=2011.03. 07/ Message-ID: Revision: 13652 http://gar.svn.sourceforge.net/gar/?rev=13652&view=rev Author: phipsy Date: 2011-03-07 18:24:00 +0000 (Mon, 07 Mar 2011) Log Message: ----------- puppet: Tag as release 2.6.4,REV=2011.03.07 Added Paths: ----------- csw/mgar/pkg/puppet/tags/puppet-2.6.4,REV=2011.03.07/ 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 Mar 7 19:32:15 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 07 Mar 2011 18:32:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[13653] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 13653 http://gar.svn.sourceforge.net/gar/?rev=13653&view=rev Author: dmichelsen Date: 2011-03-07 18:32:15 +0000 (Mon, 07 Mar 2011) Log Message: ----------- mGAR v2: Allow finegrained adjustment of PKGFILES_DEVEL and add pkgfiles_lib Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-03-07 18:24:00 UTC (rev 13652) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-03-07 18:32:15 UTC (rev 13653) @@ -322,15 +322,29 @@ # PKGFILES_RT selects files belonging to a runtime package PKGFILES_RT += $(call baseisadirs,$(libdir),[^/]*\.so\.\d+(\.\d+)*) +# PKGFILES_LIB selects just one library. The '.' will be escaped automatically! +# Use PKGFILES_CSWlibfoo1 = $(call pkgfiles_lib,libfoo.so.1) +pkgfiles_lib += $(call baseisadirs,$(libdir),$(subst .,\.,$(1))(\.\d+)*) + # PKGFILES_DEVEL selects files belonging to a developer package -PKGFILES_DEVEL += $(call baseisadirs,$(bindir),[^/]*-config) -PKGFILES_DEVEL += $(call baseisadirs,$(libdir),[^/]*\.so) -PKGFILES_DEVEL += $(call baseisadirs,$(libdir),[^/]*\.(a|la)) -PKGFILES_DEVEL += $(call baseisadirs,$(libdir),pkgconfig(/.*)?) -PKGFILES_DEVEL += $(includedir)/.* -PKGFILES_DEVEL += $(sharedstatedir)/aclocal/.* -PKGFILES_DEVEL += $(mandir)/man1/.*-config\.1.* -PKGFILES_DEVEL += $(mandir)/man3/.*\.3 +PKGFILES_DEVEL_CONFIG ?= $(call baseisadirs,$(bindir),[^/]*-config) +PKGFILES_DEVEL += $(PKGFILES_DEVEL_CONFIG) +PKGFILES_DEVEL_SHAREDLIBLINK ?= $(call baseisadirs,$(libdir),[^/]*\.so) +PKGFILES_DEVEL += $(PKGFILES_DEVEL_SHAREDLIBLINK) +PKGFILES_DEVEL_STATICLIB ?= $(call baseisadirs,$(libdir),[^/]*\.a) +PKGFILES_DEVEL += $(PKGFILES_DEVEL_STATICLIB) +PKGFILES_DEVEL_LIBTOOL ?= $(call baseisadirs,$(libdir),[^/]*\.la) +PKGFILES_DEVEL += $(PKGFILES_DEVEL_LIBTOOL) +PKGFILES_DEVEL_PKGCONFIG ?= $(call baseisadirs,$(libdir),pkgconfig(/.*)?) +PKGFILES_DEVEL += $(PKGFILES_DEVEL_PKGCONFIG) +PKGFILES_DEVEL_INCLUDEDIR ?= $(includedir)/.* +PKGFILES_DEVEL += $(PKGFILES_DEVEL_INCLUDEDIR) +PKGFILES_DEVEL_ACLOCAL ?= $(sharedstatedir)/aclocal/.* +PKGFILES_DEVEL += $(PKGFILES_DEVEL_ACLOCAL) +PKGFILES_DEVEL_CONFIG_MANPAGE ?= $(mandir)/man1/.*-config\.1.* +PKGFILES_DEVEL += $(PKGFILES_DEVEL_CONFIG_MANPAGE) +PKGFILES_DEVEL_MAN3_MANPAGE ?= $(mandir)/man3/.*\.3 +PKGFILES_DEVEL += $(PKGFILES_DEVEL_MAN3_MANPAGE) # PKGFILES_DOC selects files beloging to a documentation package PKGFILES_DOC = $(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 Mon Mar 7 19:58:51 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 07 Mar 2011 18:58:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[13654] csw/mgar/pkg/bdb3/trunk/Makefile Message-ID: Revision: 13654 http://gar.svn.sourceforge.net/gar/?rev=13654&view=rev Author: dmichelsen Date: 2011-03-07 18:58:50 +0000 (Mon, 07 Mar 2011) Log Message: ----------- bdb3: Minor restructuring and fix for #4708 Modified Paths: -------------- csw/mgar/pkg/bdb3/trunk/Makefile Modified: csw/mgar/pkg/bdb3/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb3/trunk/Makefile 2011-03-07 18:32:15 UTC (rev 13653) +++ csw/mgar/pkg/bdb3/trunk/Makefile 2011-03-07 18:58:50 UTC (rev 13654) @@ -19,6 +19,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +# GIT Patching does not work when WORKSRC is explicitly set +NOGITPATCH = 1 WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION)/build_unix PATCHDIR = $(WORKSRC)/.. @@ -50,33 +52,46 @@ # bdb tests are *very* time consuming TEST_SCRIPTS = -PACKAGES = CSWbdb3 CSWbdb3devel CSWbdb3doc +LICENSE = LICENSE +VENDOR_URL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html -CATALOGNAME_CSWbdb3 = berkeleydb3 +PACKAGES += CSWbdb3 +CATALOGNAME_CSWbdb3 = berkeleydb3 +SPKG_DESC_CSWbdb3 = BerkeleyDB 3.3 embedded database libraries and utilities +RUNTIME_DEP_PKGS_CSWbdb3 += CSWtcl +CHECKPKG_OVERRIDES_CSWbdb3 += catalogname-does-not-match-pkgname|pkgname=CSWbdb3|catalogname=berkeleydb3|expected-catalogname=bdb3 + +PACKAGES += CSWbdb3devel CATALOGNAME_CSWbdb3devel = berkeleydb3_devel -CATALOGNAME_CSWbdb3doc = berkeleydb3_doc +SPKG_DESC_CSWbdb3devel = BerkeleyDB 3.3 development support +# Keep these in the main package +PKGFILES_DEVEL_SHAREDLIBLINK = +PKGFILES_CSWbdb3devel = $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWbdb3devel = CSWbdb3 +CHECKPKG_OVERRIDES_CSWbdb3devel += surplus-dependency|CSWbdb3 +CHECKPKG_OVERRIDES_CSWbdb3devel += catalogname-does-not-match-pkgname|pkgname=CSWbdb3devel|catalogname=berkeleydb3_devel|expected-catalogname=bdb3devel +PACKAGES += CSWbdb3doc +CATALOGNAME_CSWbdb3doc = berkeleydb3_doc +SPKG_DESC_CSWbdb3doc = BerkeleyDB 3.3 documentation +PKGFILES_CSWbdb3doc = $(PKGFILES_DOC) ARCHALL_CSWbdb3doc = 1 +CHECKPKG_OVERRIDES_CSWbdb3doc += catalogname-does-not-match-pkgname|pkgname=CSWbdb3doc|catalogname=berkeleydb3_doc|expected-catalogname=bdb3doc -SPKG_DESC_CSWbdb3 = BerkeleyDB 3.3 embedded database libraries and utilities -SPKG_DESC_CSWbdb3devel = BerkeleyDB 3.3 development support -SPKG_DESC_CSWbdb3doc = BerkeleyDB 3.3 documentation +# These are all pure examples +CHECKPKG_OVERRIDES_CSWbdb3doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/build_unix/flags.html +CHECKPKG_OVERRIDES_CSWbdb3doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/build_unix/install.html +CHECKPKG_OVERRIDES_CSWbdb3doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/build_unix/conf.html +CHECKPKG_OVERRIDES_CSWbdb3doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/build_unix/notes.html +CHECKPKG_OVERRIDES_CSWbdb3doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/sendmail/intro.html +CHECKPKG_OVERRIDES_CSWbdb3doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/tcl/intro.html -SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html - -RUNTIME_DEP_PKGS_CSWbdb3devel = CSWbdb3 - -LICENSE = LICENSE - INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir includedir libdir EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb3),' EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* -PKGFILES_CSWbdb3doc = $(PKGFILES_DOC) -PKGFILES_CSWbdb3devel = $(PKGFILES_DEVEL) - include gar/category.mk LIBS += -lnsl 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 Mar 7 22:12:08 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Mar 2011 21:12:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[13655] csw/mgar/pkg/postgresql/branches/postgresql-9.0 Message-ID: Revision: 13655 http://gar.svn.sourceforge.net/gar/?rev=13655&view=rev Author: wahwah Date: 2011-03-07 21:12:08 +0000 (Mon, 07 Mar 2011) Log Message: ----------- postgresql: Removed /usr/local occurrences Also, fixed CSWlibpq4 to obsolete CSWlibpq. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile Added Paths: ----------- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/0001-postgresql-Removed-two-usr-local-occurrences.patch csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/0003-postgresql-Removed-usr-local-from-ecpg.c.patch Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2011-03-07 18:58:50 UTC (rev 13654) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2011-03-07 21:12:08 UTC (rev 13655) @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ # -# Based on the Ubuntu PostgreSQL package. +# The idea is based on the Ubuntu PostgreSQL package. # This BUILD is NOT READY! It needs work before it's usable. @@ -65,6 +65,9 @@ DISTFILES += README-CSW.txt DISTFILES += CSWpostgresql-$(BASE_VERSION_G).postinstall +PATCHFILES += 0001-postgresql-Removed-two-usr-local-occurrences.patch +PATCHFILES += 0003-postgresql-Removed-usr-local-from-ecpg.c.patch + PACKAGES += CSWpostgresql CATALOGNAME_CSWpostgresql = postgresql SPKG_DESC_CSWpostgresql = An advanced open source database @@ -270,6 +273,7 @@ PKGFILES_CSWlibpq4 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.4(\.\d+)*) SPKG_DESC_CSWlibpq4 += PostgreSQL C client library, libpq.so.4 RUNTIME_DEP_PKGS_CSWlibpq4 += CSWosslrt +OBSOLETES_CSWlibpq4 = CSWlibpq PACKAGES += CSWlibpgtypes1 CATALOGNAME_CSWlibpgtypes1 = libpgtypes1 @@ -309,6 +313,22 @@ RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibpq5 OBSOLETES_CSWlibecpg-compat2 = CSWlibpq + +# This occurrence is okay. +# # On HPUX platforms, gcc is usually configured to search for libraries +# # in /usr/local/lib, but ld won't do so. Add an explicit -L switch so +# # ld can find the same libraries gcc does. Make sure it goes after any +# # -L switches provided explicitly. +# ifeq ($(GCC), yes) +# SHLIB_LINK += -L/usr/local/lib +# endif +# +# CHECKPKG_OVERRIDES_CSWpostgresql-90 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/postgresql/pgxs/src/Makefile.shlib +# CHECKPKG_OVERRIDES_CSWpostgresql-90 += file-with-bad-content|/usr/local|root/opt/csw/lib/postgresql/pgxs/src/Makefile.shlib + +# CHECKPKG_OVERRIDES_CSWpostgresql-90 += file-with-bad-content|/usr/local|root/opt/csw/lib/postgresql/9.0/bin/ecpg +# CHECKPKG_OVERRIDES_CSWpostgresql-90 += file-with-bad-content|/usr/local|root/opt/csw/lib/postgresql/9.0/bin/sparcv9/ecpg + include gar/category.mk CFLAGS := $(filter-out -I%,$(CFLAGS)) Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/0001-postgresql-Removed-two-usr-local-occurrences.patch =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/0001-postgresql-Removed-two-usr-local-occurrences.patch (rev 0) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/0001-postgresql-Removed-two-usr-local-occurrences.patch 2011-03-07 21:12:08 UTC (rev 13655) @@ -0,0 +1,37 @@ +From e145d2b1f349867b3414324e9a219f31a40b95d7 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Mon, 7 Mar 2011 22:06:01 +0100 +Subject: [PATCH] postgresql: Removed two /usr/local occurrences + +--- + src/bin/psql/psqlrc.sample | 2 +- + src/interfaces/libpq/pg_service.conf.sample | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/bin/psql/psqlrc.sample b/src/bin/psql/psqlrc.sample +index 6054fab..7bcc816 100644 +--- a/src/bin/psql/psqlrc.sample ++++ b/src/bin/psql/psqlrc.sample +@@ -3,5 +3,5 @@ + -- + -- This file is read before the .psqlrc file in the user's home directory. + -- +--- Copy this to your sysconf directory (typically /usr/local/pgsql/etc) and ++-- Copy this to your sysconf directory (typically /etc/opt/csw/postgresql/9.0) and + -- rename it psqlrc. +diff --git a/src/interfaces/libpq/pg_service.conf.sample b/src/interfaces/libpq/pg_service.conf.sample +index de60028..bd7a16b 100644 +--- a/src/interfaces/libpq/pg_service.conf.sample ++++ b/src/interfaces/libpq/pg_service.conf.sample +@@ -8,7 +8,7 @@ + # to look up such parameters. A sample configuration for postgres is + # included in this file. Lines beginning with '#' are comments. + # +-# Copy this to your sysconf directory (typically /usr/local/pgsql/etc) and ++# Copy this to your sysconf directory (typically /etc/opt/csw/postgresql/9.0/) and + # rename it pg_service.conf. + # + # +-- +1.7.3.2 + Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/0003-postgresql-Removed-usr-local-from-ecpg.c.patch =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/0003-postgresql-Removed-usr-local-from-ecpg.c.patch (rev 0) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/0003-postgresql-Removed-usr-local-from-ecpg.c.patch 2011-03-07 21:12:08 UTC (rev 13655) @@ -0,0 +1,25 @@ +From 351cb3ace190b99541c0a1b278ea60b7d953c5f8 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Mon, 7 Mar 2011 22:08:38 +0100 +Subject: [PATCH 3/3] postgresql: Removed /usr/local from ecpg.c + +--- + src/interfaces/ecpg/preproc/ecpg.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c +index db52bf5..05cad72 100644 +--- a/src/interfaces/ecpg/preproc/ecpg.c ++++ b/src/interfaces/ecpg/preproc/ecpg.c +@@ -253,7 +253,7 @@ main(int argc, char *const argv[]) + } + + add_include_path("."); +- add_include_path("/usr/local/include"); ++ add_include_path("/opt/csw/include"); + get_include_path(my_exec_path, include_path); + add_include_path(include_path); + add_include_path("/usr/include"); +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Mar 7 22:39:32 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 07 Mar 2011 21:39:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[13656] csw/mgar/pkg/cpan/IPC-Cmd/trunk Message-ID: Revision: 13656 http://gar.svn.sourceforge.net/gar/?rev=13656&view=rev Author: bonivart Date: 2011-03-07 21:39:32 +0000 (Mon, 07 Mar 2011) Log Message: ----------- cpan/IPC-Cmd/trunk: Update to 0.70. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile csw/mgar/pkg/cpan/IPC-Cmd/trunk/checksums Modified: csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile 2011-03-07 21:12:08 UTC (rev 13655) +++ csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile 2011-03-07 21:39:32 UTC (rev 13656) @@ -1,5 +1,5 @@ NAME = IPC-Cmd -VERSION = 0.64 +VERSION = 0.70 CATEGORIES = cpan AUTHOR = BINGOS @@ -11,9 +11,12 @@ DISTFILES += COPYING -PACKAGES = CSWpmipccmd -CATALOGNAME = pm_ipccmd +PACKAGES = CSWpm-ipc-cmd +CATALOGNAME = pm_ipc_cmd +SPKG_DESC_CSWpm-ipc-cmd = $(DESCRIPTION) ARCHALL = 1 +OBSOLETES_CSWpm-ipc-cmd = CSWpmipccmd +CATALOGNAME_CSWpmipccmd = pm_ipccmd RUNTIME_DEP_PKGS = CSWpmlclemktxtsimple CSWpmmodloadcond CSWpmprmscheck Modified: csw/mgar/pkg/cpan/IPC-Cmd/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/IPC-Cmd/trunk/checksums 2011-03-07 21:12:08 UTC (rev 13655) +++ csw/mgar/pkg/cpan/IPC-Cmd/trunk/checksums 2011-03-07 21:39:32 UTC (rev 13656) @@ -1 +1 @@ -c94e8acff9c02c7b1ed0533fe01db2d2 IPC-Cmd-0.64.tar.gz +fbc97fd24fa180192fa5951136886afc IPC-Cmd-0.70.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 Mon Mar 7 22:45:45 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 07 Mar 2011 21:45:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[13657] csw/mgar/pkg/cpan/JSON/trunk Message-ID: Revision: 13657 http://gar.svn.sourceforge.net/gar/?rev=13657&view=rev Author: bonivart Date: 2011-03-07 21:45:45 +0000 (Mon, 07 Mar 2011) Log Message: ----------- cpan/JSON/trunk: Update to 2.50. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/JSON/trunk/Makefile csw/mgar/pkg/cpan/JSON/trunk/checksums Modified: csw/mgar/pkg/cpan/JSON/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/JSON/trunk/Makefile 2011-03-07 21:39:32 UTC (rev 13656) +++ csw/mgar/pkg/cpan/JSON/trunk/Makefile 2011-03-07 21:45:45 UTC (rev 13657) @@ -1,5 +1,5 @@ NAME = JSON -VERSION = 2.21 +VERSION = 2.50 CATEGORIES = cpan AUTHOR = MAKAMAKA @@ -10,8 +10,11 @@ DISTFILES += COPYING -PACKAGES = CSWpmjson +PACKAGES = CSWpm-json CATALOGNAME = pm_json +SPKG_DESC_CSWpm-json = $(DESCRIPTION) ARCHALL = 1 +OBSOLETES_CSWpm-json = CSWpmjson +CATALOGNAME_CSWpmjson = pm_json2 include gar/category.mk Modified: csw/mgar/pkg/cpan/JSON/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/JSON/trunk/checksums 2011-03-07 21:39:32 UTC (rev 13656) +++ csw/mgar/pkg/cpan/JSON/trunk/checksums 2011-03-07 21:45:45 UTC (rev 13657) @@ -1,2 +1 @@ -e3953c4142b9c523685957ee86575db1 COPYING -52cdec34f1d669b64ee15dce1c9a11d5 JSON-2.21.tar.gz +7aa1f17255ec8b074a1e8b18df23d6fb JSON-2.50.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 Mon Mar 7 23:10:56 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 07 Mar 2011 22:10:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[13658] csw/mgar/pkg/cpan/perl-ldap/trunk Message-ID: Revision: 13658 http://gar.svn.sourceforge.net/gar/?rev=13658&view=rev Author: bonivart Date: 2011-03-07 22:10:56 +0000 (Mon, 07 Mar 2011) Log Message: ----------- cpan/perl-ldap/trunk: Update to 0.4001. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/perl-ldap/trunk/Makefile csw/mgar/pkg/cpan/perl-ldap/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/perl-ldap/trunk/files/CSWpm-ldap.releasenotes Modified: csw/mgar/pkg/cpan/perl-ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/perl-ldap/trunk/Makefile 2011-03-07 21:45:45 UTC (rev 13657) +++ csw/mgar/pkg/cpan/perl-ldap/trunk/Makefile 2011-03-07 22:10:56 UTC (rev 13658) @@ -1,5 +1,5 @@ NAME = perl-ldap -VERSION = 0.39 +VERSION = 0.4001 CATEGORIES = cpan AUTHOR = GBARR @@ -10,20 +10,21 @@ maintenance functions such as adding, deleting or modifying entries. endef -DISTFILES = COPYING +DISTFILES = COPYING +DISTFILES += CSWpm-ldap.releasenotes -PACKAGES = CSWpmldap +PACKAGES = CSWpm-ldap CATALOGNAME = pm_ldap +SPKG_DESC_CSWpm-ldap = $(DESCRIPTION) ARCHALL = 1 +OBSOLETES_CSWpm-ldap = CSWpmldap +CATALOGNAME_CSWpmldap = pm_ldap2 +# Harmless /usr/local references +CHECKPKG_OVERRIDES_CSWpm-ldap += file-with-bad-content + RUNTIME_DEP_PKGS = CSWpmxmlsax CSWpmauthensasl CSWpmiosocketssl CSWpmuri CSWpmconvertasn1 CSWpmmimebase64 -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -DEPENDS += cpan/Convert-ASN1 cpan/IO-Socket-SSL -DEPENDS += cpan/Authen-SASL cpan/XML-SAX - # Module version numbers defeat Sort::Versions #MANUAL_UPDATE = 1 Modified: csw/mgar/pkg/cpan/perl-ldap/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/perl-ldap/trunk/checksums 2011-03-07 21:45:45 UTC (rev 13657) +++ csw/mgar/pkg/cpan/perl-ldap/trunk/checksums 2011-03-07 22:10:56 UTC (rev 13658) @@ -1,2 +1 @@ -4d6588c2fa0d38ae162f6314d201d89e download/COPYING -0c31097aa22672a2831a7542250d1b55 download/perl-ldap-0.39.tar.gz +f30af2904b093fa81a42ab682ca440a6 perl-ldap-0.4001.tar.gz Added: csw/mgar/pkg/cpan/perl-ldap/trunk/files/CSWpm-ldap.releasenotes =================================================================== --- csw/mgar/pkg/cpan/perl-ldap/trunk/files/CSWpm-ldap.releasenotes (rev 0) +++ csw/mgar/pkg/cpan/perl-ldap/trunk/files/CSWpm-ldap.releasenotes 2011-03-07 22:10:56 UTC (rev 13658) @@ -0,0 +1 @@ +The /usr/local references are harmless documentation examples. 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 Mar 7 23:18:17 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Mar 2011 22:18:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[13659] csw/mgar/pkg/postgresql/branches/postgresql-9.0/ Makefile Message-ID: Revision: 13659 http://gar.svn.sourceforge.net/gar/?rev=13659&view=rev Author: wahwah Date: 2011-03-07 22:18:16 +0000 (Mon, 07 Mar 2011) Log Message: ----------- postgresql: /usr/local overrides Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2011-03-07 22:10:56 UTC (rev 13658) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2011-03-07 22:18:16 UTC (rev 13659) @@ -323,8 +323,8 @@ # SHLIB_LINK += -L/usr/local/lib # endif # -# CHECKPKG_OVERRIDES_CSWpostgresql-90 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/postgresql/pgxs/src/Makefile.shlib -# CHECKPKG_OVERRIDES_CSWpostgresql-90 += file-with-bad-content|/usr/local|root/opt/csw/lib/postgresql/pgxs/src/Makefile.shlib +CHECKPKG_OVERRIDES_CSWpostgresql-90 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/postgresql/pgxs/src/Makefile.shlib +CHECKPKG_OVERRIDES_CSWpostgresql-90 += file-with-bad-content|/usr/local|root/opt/csw/lib/postgresql/pgxs/src/Makefile.shlib # CHECKPKG_OVERRIDES_CSWpostgresql-90 += file-with-bad-content|/usr/local|root/opt/csw/lib/postgresql/9.0/bin/ecpg # CHECKPKG_OVERRIDES_CSWpostgresql-90 += file-with-bad-content|/usr/local|root/opt/csw/lib/postgresql/9.0/bin/sparcv9/ecpg This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Mar 7 23:34:27 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 07 Mar 2011 22:34:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[13660] csw/mgar/pkg/cpan/libwww-perl/trunk Message-ID: Revision: 13660 http://gar.svn.sourceforge.net/gar/?rev=13660&view=rev Author: bonivart Date: 2011-03-07 22:34:26 +0000 (Mon, 07 Mar 2011) Log Message: ----------- cpan/libwww-perl/trunk: Update to 5.837. Rename Modified Paths: -------------- csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile csw/mgar/pkg/cpan/libwww-perl/trunk/checksums Modified: csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile 2011-03-07 22:18:16 UTC (rev 13659) +++ csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile 2011-03-07 22:34:26 UTC (rev 13660) @@ -1,5 +1,5 @@ NAME = libwww-perl -VERSION = 5.833 +VERSION = 5.837 CATEGORIES = cpan AUTHOR = GAAS @@ -13,9 +13,12 @@ DISTFILES = COPYING -CATALOGNAME = pm_libwww -PACKAGES = CSWpmlibwww +PACKAGES = CSWpm-libwww-perl +CATALOGNAME = pm_libwww_perl +SPKG_DESC_CSWpm-libwww-perl = $(DESCRIPTION) ARCHALL = 1 +OBSOLETES_CSWpm-libwww-perl = CSWpmlibwww +CATALOGNAME_CSWpmlibwww = pm_libwww RUNTIME_DEP_PKGS = CSWpmhtmltagset CSWpmuri CSWpmhtmlparser CSWpmiocompress CSWpmhtmlfmt CSWpmmimebase64 Modified: csw/mgar/pkg/cpan/libwww-perl/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/libwww-perl/trunk/checksums 2011-03-07 22:18:16 UTC (rev 13659) +++ csw/mgar/pkg/cpan/libwww-perl/trunk/checksums 2011-03-07 22:34:26 UTC (rev 13660) @@ -1,2 +1 @@ -d6d74a59bf794b8ffc8da8bbf1e4e15a COPYING -8fd7d7e793355c4e6e6806c70f6d2917 libwww-perl-5.833.tar.gz +9bbf1bce482b0bac98bb4f04253c03d0 libwww-perl-5.837.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 Mon Mar 7 23:39:59 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 07 Mar 2011 22:39:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[13661] csw/mgar/pkg/cpan/Log-Message-Simple/trunk Message-ID: Revision: 13661 http://gar.svn.sourceforge.net/gar/?rev=13661&view=rev Author: bonivart Date: 2011-03-07 22:39:59 +0000 (Mon, 07 Mar 2011) Log Message: ----------- cpan/Log-Message-Simple/trunk: Update to 0.08. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile csw/mgar/pkg/cpan/Log-Message-Simple/trunk/checksums Modified: csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile 2011-03-07 22:34:26 UTC (rev 13660) +++ csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile 2011-03-07 22:39:59 UTC (rev 13661) @@ -1,5 +1,5 @@ NAME = Log-Message-Simple -VERSION = 0.06 +VERSION = 0.08 CATEGORIES = cpan AUTHOR = BINGOS @@ -11,9 +11,12 @@ DISTFILES += COPYING -PACKAGES = CSWpmlogmsgsimple -CATALOGNAME = pm_logmsgsimple +PACKAGES = CSWpm-log-message-simple +CATALOGNAME = pm_log_message_simple +SPKG_DESC_CSWpm-log-message-simple = $(DESCRIPTION) ARCHALL = 1 +OBSOLETES_CSWpm-log-message-simple = CSWpmlogmsgsimple +CATALOGNAME_CSWpmlogmsgsimple = pm_logmsgsimple EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* .*\/man\/man1.* Modified: csw/mgar/pkg/cpan/Log-Message-Simple/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Log-Message-Simple/trunk/checksums 2011-03-07 22:34:26 UTC (rev 13660) +++ csw/mgar/pkg/cpan/Log-Message-Simple/trunk/checksums 2011-03-07 22:39:59 UTC (rev 13661) @@ -1 +1 @@ -bee9416fae39f8cf034ad9da512a6f62 Log-Message-Simple-0.06.tar.gz +2cd93bc5928ca0272dbe7e42cc7d0120 Log-Message-Simple-0.08.tar.gz 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 Mar 7 23:43:21 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Mar 2011 22:43:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[13662] csw/mgar/gar/v2/lib/python/catalog_test.py Message-ID: Revision: 13662 http://gar.svn.sourceforge.net/gar/?rev=13662&view=rev Author: wahwah Date: 2011-03-07 22:43:21 +0000 (Mon, 07 Mar 2011) Log Message: ----------- pkgdb: Fixed a unit test Order in which dependencies are listed must match what's in the package data. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/catalog_test.py Modified: csw/mgar/gar/v2/lib/python/catalog_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/catalog_test.py 2011-03-07 22:39:59 UTC (rev 13661) +++ csw/mgar/gar/v2/lib/python/catalog_test.py 2011-03-07 22:43:21 UTC (rev 13662) @@ -30,16 +30,18 @@ 'catalogname': 'syslog_ng', 'category': 'none', 'deps': ( - 'CSWcommon', - 'CSWcswclassutils', + # Dependencies need to be ordered that way, because they're + # listed that way in the package. + 'CSWgcc4corert', 'CSWeventlog', - 'CSWgcc4corert', + 'CSWosslrt', + 'CSWzlib', + 'CSWpcrert', 'CSWggettextrt', 'CSWglib2', - 'CSWosslrt', - 'CSWpcrert', 'CSWtcpwrap', - 'CSWzlib', + 'CSWcswclassutils', + 'CSWcommon', ), 'file_basename': 'syslog_ng-3.0.4,REV=2009.08.30-SunOS5.8-i386-CSW.pkg.gz', 'i_deps': (), 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 Mar 7 23:44:32 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Mar 2011 22:44:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[13663] csw/mgar/gar/v2/lib/python/README Message-ID: Revision: 13663 http://gar.svn.sourceforge.net/gar/?rev=13663&view=rev Author: wahwah Date: 2011-03-07 22:44:32 +0000 (Mon, 07 Mar 2011) Log Message: ----------- lib/python/README: Notifier is now implemented Modified Paths: -------------- csw/mgar/gar/v2/lib/python/README Modified: csw/mgar/gar/v2/lib/python/README =================================================================== --- csw/mgar/gar/v2/lib/python/README 2011-03-07 22:43:21 UTC (rev 13662) +++ csw/mgar/gar/v2/lib/python/README 2011-03-07 22:44:32 UTC (rev 13663) @@ -18,7 +18,6 @@ - outside /opt/csw, /etc/opt/csw, /var/opt/csw -> error Development plan for checkpkg: -- Notify maintainers when their package is available from mirrors - Allow maintainers to opt-out from these notifications - Add support for the 'overridden' field in the database - When adding a package to a catalog, store the time and date of the @@ -45,6 +44,7 @@ - Generalize dependency checking by adding NeedFile(file_list, reason) to error_mgr. It's possible to need one of the listed files only, so files are given as alternatives, but the reason is common. +- Notify maintainers when their package is available from mirrors Known problems: - libmagic fails sometimes when processing the whole catalog 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 Mar 7 23:45:07 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Mar 2011 22:45:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[13664] csw/mgar/gar/v2/lib/python/README Message-ID: Revision: 13664 http://gar.svn.sourceforge.net/gar/?rev=13664&view=rev Author: wahwah Date: 2011-03-07 22:45:07 +0000 (Mon, 07 Mar 2011) Log Message: ----------- lib/python/README: Update, separate primary focus Some features are more important than others. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/README Modified: csw/mgar/gar/v2/lib/python/README =================================================================== --- csw/mgar/gar/v2/lib/python/README 2011-03-07 22:44:32 UTC (rev 13663) +++ csw/mgar/gar/v2/lib/python/README 2011-03-07 22:45:07 UTC (rev 13664) @@ -18,22 +18,27 @@ - outside /opt/csw, /etc/opt/csw, /var/opt/csw -> error Development plan for checkpkg: -- Allow maintainers to opt-out from these notifications -- Add support for the 'overridden' field in the database -- When adding a package to a catalog, store the time and date of the - addition -- Display stats from each run -- Shorten the on-screen output, add commands to display override lines -- Move the set check stats outside of checking functions, remove the special - status of dependency checking functions; add a progress bar for it. -- Restructure the error reporting, group them by errors. -- Sort all list data structures so that it's possible to diff the results of - pprint.pprint() and see meaningful results. This will be the new - implementation for comparepkg. -- Add fields to the srv4_file_stats table: - - source URL (for grouping by software) - - Description (to search for the word 'transitional') -- Don't suggest two packages for the same soname. + Primary focus: + - Add support for tiering (core/active/unsupported) + - Add support for the 'overridden' field in the database + - When adding a package to a catalog, store the time and date of the + addition + - Can be generalized as logging + - Add fields to the srv4_file_stats table: + - source URL (for grouping by software) + - Description (to search for the word 'transitional') + - Whether the package is obsolete + - Don't suggest two packages for the same soname. + Additional, nice to have: + - Allow maintainers to opt-out from notifications + - Display stats from each run + - Shorten the on-screen output, add commands to display override lines + - Move the set check stats outside of checking functions, remove the special + status of dependency checking functions; add a progress bar for it. + - Sort all list data structures so that it's possible to diff the results of + pprint.pprint() and see meaningful results. This will be the new + - Restructure the error reporting, group them by errors. + implementation for comparepkg. Also, see ticket list on trac: http://sourceforge.net/apps/trac/gar/report/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 Mon Mar 7 23:45:35 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Mar 2011 22:45:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[13665] csw/mgar/gar/v2/lib/python/README Message-ID: Revision: 13665 http://gar.svn.sourceforge.net/gar/?rev=13665&view=rev Author: wahwah Date: 2011-03-07 22:45:35 +0000 (Mon, 07 Mar 2011) Log Message: ----------- lib/python/README: New: add garbage collection The database is now 1.5GB uncompressed and growing. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/README Modified: csw/mgar/gar/v2/lib/python/README =================================================================== --- csw/mgar/gar/v2/lib/python/README 2011-03-07 22:45:07 UTC (rev 13664) +++ csw/mgar/gar/v2/lib/python/README 2011-03-07 22:45:35 UTC (rev 13665) @@ -20,6 +20,9 @@ Development plan for checkpkg: Primary focus: - Add support for tiering (core/active/unsupported) + - Add MySQL database garbage collection + - Currently, the database is growing indefinitely, at the time of writing + it's 1.5GB uncompressed. - Add support for the 'overridden' field in the database - When adding a package to a catalog, store the time and date of the addition This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Mar 7 23:45:38 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 07 Mar 2011 22:45:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[13666] csw/mgar/pkg/cpan/MIME-Base64/trunk Message-ID: Revision: 13666 http://gar.svn.sourceforge.net/gar/?rev=13666&view=rev Author: bonivart Date: 2011-03-07 22:45:38 +0000 (Mon, 07 Mar 2011) Log Message: ----------- cpan/MIME-Base64/trunk: Update to 3.13. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/MIME-Base64/trunk/Makefile csw/mgar/pkg/cpan/MIME-Base64/trunk/checksums Modified: csw/mgar/pkg/cpan/MIME-Base64/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/MIME-Base64/trunk/Makefile 2011-03-07 22:45:35 UTC (rev 13665) +++ csw/mgar/pkg/cpan/MIME-Base64/trunk/Makefile 2011-03-07 22:45:38 UTC (rev 13666) @@ -1,5 +1,5 @@ NAME = MIME-Base64 -VERSION = 3.09 +VERSION = 3.13 CATEGORIES = cpan AUTHOR = GAAS @@ -10,12 +10,12 @@ DISTFILES += COPYING -CATALOGNAME = pm_mimebase64 -PACKAGES = CSWpmmimebase64 +PACKAGES = CSWpm-mime-base64 +CATALOGNAME = pm_mime_base64 +SPKG_DESC_CSWpm-mime-base64 = $(DESCRIPTION) +OBSOLETES_CSWpm-mime-base64 = CSWpmmimebase64 +CATALOGNAME_CSWpmmimebase64 = pm_mimebase64 -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz - EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod .*\/man\/.* CONFIGURE_ARGS = Modified: csw/mgar/pkg/cpan/MIME-Base64/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/MIME-Base64/trunk/checksums 2011-03-07 22:45:35 UTC (rev 13665) +++ csw/mgar/pkg/cpan/MIME-Base64/trunk/checksums 2011-03-07 22:45:38 UTC (rev 13666) @@ -1,2 +1 @@ -aa9873abcfbf59300a1e7a088eab4fb0 COPYING -5056bf56fb41c0ce6edd2c73de2574a5 MIME-Base64-3.09.tar.gz +a555d807b328aee871c686a6b6bae5b4 MIME-Base64-3.13.tar.gz 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 Mar 7 23:46:12 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Mar 2011 22:46:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[13667] csw/mgar/gar/v2/lib/web/pkgdb_web.py Message-ID: Revision: 13667 http://gar.svn.sourceforge.net/gar/?rev=13667&view=rev Author: wahwah Date: 2011-03-07 22:46:11 +0000 (Mon, 07 Mar 2011) Log Message: ----------- pkgdb-web: RESTful URL to retrieve pkg by pkgname Returns a JSON data structure. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2011-03-07 22:45:38 UTC (rev 13666) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2011-03-07 22:46:11 UTC (rev 13667) @@ -32,6 +32,7 @@ 'PkgnameByFilename', # Query by catalog release, arch, OS release and catalogname r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/catalognames/([^/]+)/', 'Srv4ByCatAndCatalogname', + r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/pkgnames/([^/]+)/', 'Srv4ByCatAndPkgname', r'/rest/srv4/([0-9a-f]{32})/', 'RestSrv4Detail', ) @@ -302,6 +303,41 @@ raise web.internalerror(e) +class Srv4ByCatAndPkgname(object): + + def GET(self, catrel_name, arch_name, osrel_name, pkgname): + """Get a srv4 reference by catalog ane pkgname.""" + configuration.SetUpSqlobjectConnection() + sqo_osrel, sqo_arch, sqo_catrel = pkgdb.GetSqoTriad( + osrel_name, arch_name, catrel_name) + join = [ + sqlbuilder.INNERJOINOn(None, + models.Srv4FileInCatalog, + models.Srv4FileInCatalog.q.srv4file==models.Srv4FileStats.q.id), + sqlbuilder.INNERJOINOn(None, + models.Pkginst, + models.Pkginst.q.id==models.Srv4FileStats.q.pkginst), + ] + res = models.Srv4FileStats.select( + sqlobject.AND( + models.Srv4FileInCatalog.q.osrel==sqo_osrel, + models.Srv4FileInCatalog.q.arch==sqo_arch, + models.Srv4FileInCatalog.q.catrel==sqo_catrel, + models.Pkginst.q.pkgname==pkgname, + models.Srv4FileStats.q.use_to_generate_catalogs==True), + join=join, + ) + try: + srv4 = res.getOne() + mimetype, data = srv4.GetRestRepr() + web.header('Content-type', mimetype) + return json.dumps(data) + except sqlobject.main.SQLObjectNotFound: + return json.dumps(None) + except sqlobject.dberrors.OperationalError, e: + raise web.internalerror(e) + + web.webapi.internalerror = web.debugerror # app = web.application(urls, globals()) 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 Mar 8 00:30:26 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Mar 2011 23:30:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[13668] csw/mgar/pkg/postgresql/branches/postgresql-9.0/ Makefile Message-ID: Revision: 13668 http://gar.svn.sourceforge.net/gar/?rev=13668&view=rev Author: wahwah Date: 2011-03-07 23:30:26 +0000 (Mon, 07 Mar 2011) Log Message: ----------- postgresql: Additional overrides Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2011-03-07 22:46:11 UTC (rev 13667) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2011-03-07 23:30:26 UTC (rev 13668) @@ -325,6 +325,8 @@ # CHECKPKG_OVERRIDES_CSWpostgresql-90 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/postgresql/pgxs/src/Makefile.shlib CHECKPKG_OVERRIDES_CSWpostgresql-90 += file-with-bad-content|/usr/local|root/opt/csw/lib/postgresql/pgxs/src/Makefile.shlib +CHECKPKG_OVERRIDES_CSWpostgresql-90 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/postgresql/pgxs/src/Makefile.shlib +CHECKPKG_OVERRIDES_CSWpostgresql-90 += file-with-bad-content|/usr/local|root/opt/csw/lib/postgresql/pgxs/src/Makefile.shlib # CHECKPKG_OVERRIDES_CSWpostgresql-90 += file-with-bad-content|/usr/local|root/opt/csw/lib/postgresql/9.0/bin/ecpg # CHECKPKG_OVERRIDES_CSWpostgresql-90 += file-with-bad-content|/usr/local|root/opt/csw/lib/postgresql/9.0/bin/sparcv9/ecpg 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 Mar 8 02:13:34 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 08 Mar 2011 01:13:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[13669] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 13669 http://gar.svn.sourceforge.net/gar/?rev=13669&view=rev Author: bdwalton Date: 2011-03-08 01:13:34 +0000 (Tue, 08 Mar 2011) Log Message: ----------- coreutils/trunk: change dep from gettextrt to libintl8 Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2011-03-07 23:30:26 UTC (rev 13668) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2011-03-08 01:13:34 UTC (rev 13669) @@ -15,7 +15,7 @@ BUILD_DEP_PKGS = CSWautomake CSWautoconf CSWbison CSWggettext CSWgit BUILD_DEP_PKGS += CSWgperf CSWgzip CSWperl CSWrsync CSWgtar CSWbash -RUNTIME_DEP_PKGS = CSWiconv CSWggettextrt CSWlibgmp +RUNTIME_DEP_PKGS = CSWiconv CSWlibintl8 CSWlibgmp INCOMPATIBLE_PKGS = CSWshutils CSWtextutils 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 Mar 8 03:46:27 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 08 Mar 2011 02:46:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[13670] csw/mgar/pkg Message-ID: Revision: 13670 http://gar.svn.sourceforge.net/gar/?rev=13670&view=rev Author: bdwalton Date: 2011-03-08 02:46:26 +0000 (Tue, 08 Mar 2011) Log Message: ----------- xmltoman: initial commit Added Paths: ----------- csw/mgar/pkg/xmltoman/ csw/mgar/pkg/xmltoman/Makefile csw/mgar/pkg/xmltoman/branches/ csw/mgar/pkg/xmltoman/tags/ csw/mgar/pkg/xmltoman/trunk/ csw/mgar/pkg/xmltoman/trunk/Makefile csw/mgar/pkg/xmltoman/trunk/checksums csw/mgar/pkg/xmltoman/trunk/files/ Copied: csw/mgar/pkg/xmltoman/Makefile (from rev 13546, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/xmltoman/Makefile (rev 0) +++ csw/mgar/pkg/xmltoman/Makefile 2011-03-08 02:46:26 UTC (rev 13670) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/xmltoman/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/xmltoman/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmltoman/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xmltoman/trunk/Makefile 2011-03-08 02:46:26 UTC (rev 13670) @@ -0,0 +1,20 @@ +# $Id$ +NAME = xmltoman +VERSION = 0.4 +CATEGORIES = utils + +DESCRIPTION = A man page creation tool +define BLURB + +endef + +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(DISTNAME).tar.gz +PATCHFILES += 0001-Override-default-hard-coded-prefix-with-opt-csw.patch +PATCHFILES += 0002-Use-CSW-perl-instead-of-system-perl.patch +PATCHFILES += 0003-Use-ginstall-not-system-install.patch + +CONFIGURE_SCRIPTS = +TEST_SCRIPTS = + +include gar/category.mk Property changes on: csw/mgar/pkg/xmltoman/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/xmltoman/trunk/checksums =================================================================== --- csw/mgar/pkg/xmltoman/trunk/checksums (rev 0) +++ csw/mgar/pkg/xmltoman/trunk/checksums 2011-03-08 02:46:26 UTC (rev 13670) @@ -0,0 +1 @@ +99be944b9fce40b3fe397049bf14a097 xmltoman-0.4.tar.gz 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 Mar 8 03:47:18 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 08 Mar 2011 02:47:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[13671] csw/mgar/pkg/xmltoman/trunk/files Message-ID: Revision: 13671 http://gar.svn.sourceforge.net/gar/?rev=13671&view=rev Author: bdwalton Date: 2011-03-08 02:47:18 +0000 (Tue, 08 Mar 2011) Log Message: ----------- xmltoman/trunk: add patches that allow installation to proceed Added Paths: ----------- csw/mgar/pkg/xmltoman/trunk/files/0001-Override-default-hard-coded-prefix-with-opt-csw.patch csw/mgar/pkg/xmltoman/trunk/files/0002-Use-CSW-perl-instead-of-system-perl.patch csw/mgar/pkg/xmltoman/trunk/files/0003-Use-ginstall-not-system-install.patch Added: csw/mgar/pkg/xmltoman/trunk/files/0001-Override-default-hard-coded-prefix-with-opt-csw.patch =================================================================== --- csw/mgar/pkg/xmltoman/trunk/files/0001-Override-default-hard-coded-prefix-with-opt-csw.patch (rev 0) +++ csw/mgar/pkg/xmltoman/trunk/files/0001-Override-default-hard-coded-prefix-with-opt-csw.patch 2011-03-08 02:47:18 UTC (rev 13671) @@ -0,0 +1,26 @@ +From 73929a0716f96c262920b3bd40efac71e17cbac2 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Tue, 8 Mar 2011 03:24:20 +0100 +Subject: [PATCH] Override default (hard coded) prefix with /opt/csw + +Signed-off-by: Ben Walton +--- + Makefile | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 1195c52..ae89d52 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,6 @@ +-PREFIX=/usr/local ++PREFIX=/opt/csw/ + PACKAGE=xmltoman +-VERSION=0.3 ++VERSION=0.4 + DISTNAME=$(PACKAGE)-$(VERSION) + DISTFILES= COPYING Makefile README xml/ xmlmantohtml xmltoman xmltoman.css xmltoman.dtd xmltoman.xsl + +-- +1.7.3.2 + Added: csw/mgar/pkg/xmltoman/trunk/files/0002-Use-CSW-perl-instead-of-system-perl.patch =================================================================== --- csw/mgar/pkg/xmltoman/trunk/files/0002-Use-CSW-perl-instead-of-system-perl.patch (rev 0) +++ csw/mgar/pkg/xmltoman/trunk/files/0002-Use-CSW-perl-instead-of-system-perl.patch 2011-03-08 02:47:18 UTC (rev 13671) @@ -0,0 +1,23 @@ +From e61ef0560a36132fbb5751805bcc74f1fba8158d Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Tue, 8 Mar 2011 03:25:19 +0100 +Subject: [PATCH 3/3] Use CSW perl instead of system perl + +Signed-off-by: Ben Walton +--- + xmltoman | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/xmltoman b/xmltoman +index 6a7489a..33b99bf 100755 +--- a/xmltoman ++++ b/xmltoman +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/opt/csw/bin/perl -w + + # xmltoman - simple xml to man converter + # Copyright (C) 2000-2002 Oliver Kurth +-- +1.7.3.2 + Added: csw/mgar/pkg/xmltoman/trunk/files/0003-Use-ginstall-not-system-install.patch =================================================================== --- csw/mgar/pkg/xmltoman/trunk/files/0003-Use-ginstall-not-system-install.patch (rev 0) +++ csw/mgar/pkg/xmltoman/trunk/files/0003-Use-ginstall-not-system-install.patch 2011-03-08 02:47:18 UTC (rev 13671) @@ -0,0 +1,42 @@ +From 2227aedee4ee6d2c0b7d8d8864e752d101f0381c Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Tue, 8 Mar 2011 03:40:36 +0100 +Subject: [PATCH] Use ginstall, not system install + +Signed-off-by: Ben Walton +--- + Makefile | 11 ++++++----- + 1 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/Makefile b/Makefile +index ae89d52..194ba20 100644 +--- a/Makefile ++++ b/Makefile +@@ -3,6 +3,7 @@ PACKAGE=xmltoman + VERSION=0.4 + DISTNAME=$(PACKAGE)-$(VERSION) + DISTFILES= COPYING Makefile README xml/ xmlmantohtml xmltoman xmltoman.css xmltoman.dtd xmltoman.xsl ++INSTALL=/opt/csw/bin/ginstall + + all: xmltoman.1 xmlmantohtml.1 + +@@ -13,11 +14,11 @@ xmlmantohtml.1: xml/xmlmantohtml.1.xml + ./xmltoman $< > $@ + + install: +- install -D xmltoman $(DESTDIR)/$(PREFIX)/bin/xmltoman +- install -D xmlmantohtml $(DESTDIR)/$(PREFIX)/bin/xmlmantohtml +- install -D -m 0644 xmltoman.dtd $(DESTDIR)/$(PREFIX)/share/xmltoman/xmltoman.dtd +- install -D -m 0644 xmltoman.css $(DESTDIR)/$(PREFIX)/share/xmltoman/xmltoman.css +- install -D -m 0644 xmltoman.xsl $(DESTDIR)/$(PREFIX)/share/xmltoman/xmltoman.xsl ++ $(INSTALL) -D xmltoman $(DESTDIR)/$(PREFIX)/bin/xmltoman ++ $(INSTALL) -D xmlmantohtml $(DESTDIR)/$(PREFIX)/bin/xmlmantohtml ++ $(INSTALL) -D -m 0644 xmltoman.dtd $(DESTDIR)/$(PREFIX)/share/xmltoman/xmltoman.dtd ++ $(INSTALL) -D -m 0644 xmltoman.css $(DESTDIR)/$(PREFIX)/share/xmltoman/xmltoman.css ++ $(INSTALL) -D -m 0644 xmltoman.xsl $(DESTDIR)/$(PREFIX)/share/xmltoman/xmltoman.xsl + + dist: + [ -d $(DISTNAME) ] && rm -rf $(DISTNAME) || true +-- +1.7.3.2 + 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 Mar 8 03:52:52 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 08 Mar 2011 02:52:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[13672] csw/mgar/pkg/xmltoman/trunk/Makefile Message-ID: Revision: 13672 http://gar.svn.sourceforge.net/gar/?rev=13672&view=rev Author: bdwalton Date: 2011-03-08 02:52:52 +0000 (Tue, 08 Mar 2011) Log Message: ----------- xmltoman/trunk: add post build and post install hooks to get man pages Modified Paths: -------------- csw/mgar/pkg/xmltoman/trunk/Makefile Modified: csw/mgar/pkg/xmltoman/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmltoman/trunk/Makefile 2011-03-08 02:47:18 UTC (rev 13671) +++ csw/mgar/pkg/xmltoman/trunk/Makefile 2011-03-08 02:52:52 UTC (rev 13672) @@ -18,3 +18,11 @@ TEST_SCRIPTS = include gar/category.mk + +post-build-modulated: + @(cd $(WORKSRC); for m in xmltoman xmlmantohtml; do gmake $$m.1; done) + @$(MAKECOOKIE); + +post-install-modulated: + @(cd $(WORKSRC); gmkdir -p $(DESTDIR)$(mandir)/man1; for m in xmltoman xmlmantohtml; do cp $$m.1 $(DESTDIR)$(mandir)/man1; done) + @$(MAKECOOKIE) \ No newline at end of file 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 Mar 8 03:54:08 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 08 Mar 2011 02:54:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[13673] csw/mgar/pkg/xmltoman/trunk/Makefile Message-ID: Revision: 13673 http://gar.svn.sourceforge.net/gar/?rev=13673&view=rev Author: bdwalton Date: 2011-03-08 02:54:08 +0000 (Tue, 08 Mar 2011) Log Message: ----------- xmltoman/trunk: set arch=all; depend on perl; add sample description Modified Paths: -------------- csw/mgar/pkg/xmltoman/trunk/Makefile Modified: csw/mgar/pkg/xmltoman/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmltoman/trunk/Makefile 2011-03-08 02:52:52 UTC (rev 13672) +++ csw/mgar/pkg/xmltoman/trunk/Makefile 2011-03-08 02:54:08 UTC (rev 13673) @@ -5,7 +5,7 @@ DESCRIPTION = A man page creation tool define BLURB - +A special tool to convert xml files to man pages. endef MASTER_SITES = $(SF_MIRROR) @@ -17,6 +17,10 @@ CONFIGURE_SCRIPTS = TEST_SCRIPTS = +ARCHALL = 1 + +RUNTIME_DEP_PKGS += CSWperl + include gar/category.mk post-build-modulated: 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 Mar 8 04:02:16 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 08 Mar 2011 03:02:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[13674] csw/mgar/pkg/xmltoman/trunk Message-ID: Revision: 13674 http://gar.svn.sourceforge.net/gar/?rev=13674&view=rev Author: bdwalton Date: 2011-03-08 03:02:16 +0000 (Tue, 08 Mar 2011) Log Message: ----------- xmltoman/trunk: patch the manpages for usr/share references; install the examples referenced by the manpages Modified Paths: -------------- csw/mgar/pkg/xmltoman/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/xmltoman/trunk/files/0004-Patch-usr-share-references-out-of-the-manpages.patch Modified: csw/mgar/pkg/xmltoman/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmltoman/trunk/Makefile 2011-03-08 02:54:08 UTC (rev 13673) +++ csw/mgar/pkg/xmltoman/trunk/Makefile 2011-03-08 03:02:16 UTC (rev 13674) @@ -13,6 +13,7 @@ PATCHFILES += 0001-Override-default-hard-coded-prefix-with-opt-csw.patch PATCHFILES += 0002-Use-CSW-perl-instead-of-system-perl.patch PATCHFILES += 0003-Use-ginstall-not-system-install.patch +PATCHFILES += 0004-Patch-usr-share-references-out-of-the-manpages.patch CONFIGURE_SCRIPTS = TEST_SCRIPTS = @@ -28,5 +29,11 @@ @$(MAKECOOKIE); post-install-modulated: - @(cd $(WORKSRC); gmkdir -p $(DESTDIR)$(mandir)/man1; for m in xmltoman xmlmantohtml; do cp $$m.1 $(DESTDIR)$(mandir)/man1; done) + @(cd $(WORKSRC); \ + gmkdir -p $(DESTDIR)$(mandir)/man1 \ + $(DESTDIR)$(docdir)/$(NAME); \ + for m in xmltoman xmlmantohtml; do \ + cp $$m.1 $(DESTDIR)$(mandir)/man1; \ + done; \ + cp -pR xml $(DESTDIR)$(docdir)/$(NAME)/examples; ) @$(MAKECOOKIE) \ No newline at end of file Added: csw/mgar/pkg/xmltoman/trunk/files/0004-Patch-usr-share-references-out-of-the-manpages.patch =================================================================== --- csw/mgar/pkg/xmltoman/trunk/files/0004-Patch-usr-share-references-out-of-the-manpages.patch (rev 0) +++ csw/mgar/pkg/xmltoman/trunk/files/0004-Patch-usr-share-references-out-of-the-manpages.patch 2011-03-08 03:02:16 UTC (rev 13674) @@ -0,0 +1,60 @@ +From eabf65adb61703819191835031fd864e040f9cb5 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Tue, 8 Mar 2011 03:56:45 +0100 +Subject: [PATCH] Patch usr/share references out of the manpages + +Signed-off-by: Ben Walton +--- + xml/xmlmantohtml.1.xml | 6 +++--- + xml/xmltoman.1.xml | 12 ++++++------ + 2 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/xml/xmlmantohtml.1.xml b/xml/xmlmantohtml.1.xml +index 735a779..e757305 100644 +--- a/xml/xmlmantohtml.1.xml ++++ b/xml/xmlmantohtml.1.xml +@@ -12,10 +12,10 @@ + +

xmlmantohtml is a small script to convert xml/man to html.

+ +-

You will find the dtd in /usr/share/xmltoman/ on a +-debian system. There is also an xsl file to generate html using ++

You will find the dtd in /opt/csw/share/xmltoman/ on an ++OpenCSW system. There is also an xsl file to generate html using + . +-See also /usr/share/doc/xmltoman/examples for examples.

++See also /opt/csw/share/doc/xmltoman/examples for examples.

+

If xsltproc proves to be a useful alternative, this program + will be obsoleted.

+ +diff --git a/xml/xmltoman.1.xml b/xml/xmltoman.1.xml +index 662c8f2..7040175 100644 +--- a/xml/xmltoman.1.xml ++++ b/xml/xmltoman.1.xml +@@ -15,17 +15,17 @@ format. It features the usual man page items such a description, + options, see also etc. The xml format also supports converting to html + pages.

+ +-

You will find the dtd in /usr/share/xmltoman/ on a +-debian system. There is also an xsl file to generate html using ++

You will find the dtd in /opt/csw/share/xmltoman/ on an ++OpenCSW system. There is also an xsl file to generate html using + . +-See also /usr/share/doc/xmltoman/examples for examples.

++See also /opt/csw/share/doc/xmltoman/examples for examples.

+ + + +
+-

/usr/share/xmltoman/xmltoman.dtd the DTD file.

+-

/usr/share/xmltoman/xmltoman.xsl XSLT stylesheet to generate html.

+-

/usr/share/xmltoman/xmltoman.css stylesheet to be used for HTML.

++

/opt/csw/share/xmltoman/xmltoman.dtd the DTD file.

++

/opt/csw/share/xmltoman/xmltoman.xsl XSLT stylesheet to generate html.

++

/opt/csw/share/xmltoman/xmltoman.css stylesheet to be used for HTML.

+
+ +
+-- +1.7.3.2 + 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 Mar 8 04:24:49 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 08 Mar 2011 03:24:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[13675] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 13675 http://gar.svn.sourceforge.net/gar/?rev=13675&view=rev Author: bdwalton Date: 2011-03-08 03:24:48 +0000 (Tue, 08 Mar 2011) Log Message: ----------- coreutils/trunk: disable test suite until next version bump (2 failing tests on sparc due to buggy gdf in current 8.8 package) Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2011-03-08 03:02:16 UTC (rev 13674) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2011-03-08 03:24:48 UTC (rev 13675) @@ -49,7 +49,9 @@ PROTOTYPE_FILTER = awk '$$$$3 == "/opt/csw/bin/gsu" { $$$$4 = "4555" }; { print }' -ifneq ($(VERSION), 8.8) +# 8.10 fails cp/fiemap-perf and cp/fiemap-2 on sparc due to gdf not returning +# an error when running gdf -T -t ... (fiemap_capable_ in tests/init.cfg) +ifneq ($(VERSION), 8.10) TEST_TARGET = check else TEST_SCRIPTS = 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 Mar 8 09:25:13 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 08 Mar 2011 08:25:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[13676] csw/mgar/pkg/postgresql/branches/postgresql-9.0/ Makefile Message-ID: Revision: 13676 http://gar.svn.sourceforge.net/gar/?rev=13676&view=rev Author: wahwah Date: 2011-03-08 08:25:12 +0000 (Tue, 08 Mar 2011) Log Message: ----------- postgresql: Adding a /usr/local override Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2011-03-08 03:24:48 UTC (rev 13675) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2011-03-08 08:25:12 UTC (rev 13676) @@ -326,6 +326,7 @@ CHECKPKG_OVERRIDES_CSWpostgresql-90 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/postgresql/pgxs/src/Makefile.shlib CHECKPKG_OVERRIDES_CSWpostgresql-90 += file-with-bad-content|/usr/local|root/opt/csw/lib/postgresql/pgxs/src/Makefile.shlib CHECKPKG_OVERRIDES_CSWpostgresql-90 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/postgresql/pgxs/src/Makefile.shlib +CHECKPKG_OVERRIDES_CSWpostgresql-90 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/postgresql/pgxs/src/Makefile.global CHECKPKG_OVERRIDES_CSWpostgresql-90 += file-with-bad-content|/usr/local|root/opt/csw/lib/postgresql/pgxs/src/Makefile.shlib # CHECKPKG_OVERRIDES_CSWpostgresql-90 += file-with-bad-content|/usr/local|root/opt/csw/lib/postgresql/9.0/bin/ecpg 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 Mar 8 11:07:46 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 08 Mar 2011 10:07:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[13677] csw/mgar/pkg/cpan/Module-Load-Conditional/trunk Message-ID: Revision: 13677 http://gar.svn.sourceforge.net/gar/?rev=13677&view=rev Author: bonivart Date: 2011-03-08 10:07:46 +0000 (Tue, 08 Mar 2011) Log Message: ----------- cpan/Module-Load-Conditional/trunk: Update to 0.44. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/checksums Modified: csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile 2011-03-08 08:25:12 UTC (rev 13676) +++ csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile 2011-03-08 10:07:46 UTC (rev 13677) @@ -1,5 +1,5 @@ NAME = Module-Load-Conditional -VERSION = 0.38 +VERSION = 0.44 CATEGORIES = cpan AUTHOR = BINGOS @@ -11,9 +11,12 @@ DISTFILES += COPYING -PACKAGES = CSWpmmodloadcond -CATALOGNAME = pm_modloadcond +PACKAGES = CSWpm-module-load-conditional +CATALOGNAME = pm_module_load_conditional +SPKG_DESC_CSWpm-module-load-conditional = $(DESCRIPTION) ARCHALL = 1 +OBSOLETES_CSWpm-module-load-conditional = CSWpmmodloadcond +CATALOGNAME_CSWpmmodloadcond = pm_modloadcond RUNTIME_DEP_PKGS = CSWpmprmscheck CSWpmmodload CSWpmlclemktxtsimple Modified: csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/checksums 2011-03-08 08:25:12 UTC (rev 13676) +++ csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/checksums 2011-03-08 10:07:46 UTC (rev 13677) @@ -1 +1 @@ -ddc4284f922b525a6c14769694498cf4 Module-Load-Conditional-0.38.tar.gz +a352813c21314ab1ab48291a179f6570 Module-Load-Conditional-0.44.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 Mar 8 11:15:39 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 08 Mar 2011 10:15:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[13678] csw/mgar/pkg/cpan/Module-Signature/trunk Message-ID: Revision: 13678 http://gar.svn.sourceforge.net/gar/?rev=13678&view=rev Author: bonivart Date: 2011-03-08 10:15:39 +0000 (Tue, 08 Mar 2011) Log Message: ----------- cpan/Module-Signature/trunk: Update to 0.66. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/Module-Signature/trunk/Makefile csw/mgar/pkg/cpan/Module-Signature/trunk/checksums Modified: csw/mgar/pkg/cpan/Module-Signature/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Signature/trunk/Makefile 2011-03-08 10:07:46 UTC (rev 13677) +++ csw/mgar/pkg/cpan/Module-Signature/trunk/Makefile 2011-03-08 10:15:39 UTC (rev 13678) @@ -1,5 +1,5 @@ NAME = Module-Signature -VERSION = 0.63 +VERSION = 0.66 CATEGORIES = cpan AUTHOR = FLORA @@ -11,16 +11,15 @@ DISTFILES += COPYING -PACKAGES = CSWpmmodulesign -CATALOGNAME = pm_modulesign +PACKAGES = CSWpm-module-signature +CATALOGNAME = pm_module_signature +SPKG_DESC_CSWpm-module-signature = $(DESCRIPTION) ARCHALL = 1 +OBSOLETES_CSWpm-module-signature = CSWpmmodulesign +CATALOGNAME_CSWpmmodulesign = pm_modulesign RUNTIME_DEP_PKGS += CSWgnupg RUNTIME_DEP_PKGS += CSWpmpardist RUNTIME_DEP_PKGS += CSWpmtextdiff -CHECKPKG_OVERRIDES_CSWpmmodulesign += surplus-dependency|CSWpmpardist -CHECKPKG_OVERRIDES_CSWpmmodulesign += surplus-dependency|CSWgnupg -CHECKPKG_OVERRIDES_CSWpmmodulesign += surplus-dependency|CSWpmtextdiff - include gar/category.mk Modified: csw/mgar/pkg/cpan/Module-Signature/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Module-Signature/trunk/checksums 2011-03-08 10:07:46 UTC (rev 13677) +++ csw/mgar/pkg/cpan/Module-Signature/trunk/checksums 2011-03-08 10:15:39 UTC (rev 13678) @@ -1,2 +1 @@ -dbdbae43103a35e96797f75082852bda COPYING -49a961502c0786797dabfea9c7fd30c3 Module-Signature-0.63.tar.gz +72d63f7dfe13d7dab7450dd9b356b1bc Module-Signature-0.66.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 Mar 8 14:00:53 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 08 Mar 2011 13:00:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[13679] csw/mgar/pkg/cpan/Net-CIDR/trunk Message-ID: Revision: 13679 http://gar.svn.sourceforge.net/gar/?rev=13679&view=rev Author: bonivart Date: 2011-03-08 13:00:52 +0000 (Tue, 08 Mar 2011) Log Message: ----------- cpan/Net-CIDR/trunk: Update to 0.14. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/Net-CIDR/trunk/Makefile csw/mgar/pkg/cpan/Net-CIDR/trunk/checksums Modified: csw/mgar/pkg/cpan/Net-CIDR/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-CIDR/trunk/Makefile 2011-03-08 10:15:39 UTC (rev 13678) +++ csw/mgar/pkg/cpan/Net-CIDR/trunk/Makefile 2011-03-08 13:00:52 UTC (rev 13679) @@ -1,5 +1,5 @@ NAME = Net-CIDR -VERSION = 0.13 +VERSION = 0.14 CATEGORIES = cpan AUTHOR = MRSAM @@ -8,13 +8,17 @@ Manipulate IPv4/IPv6 netblocks in CIDR notation endef -DISTFILES = COPYING +# For some reason it's in a testing subdir even though it's an official release +MASTER_SITES = http://search.cpan.org/CPAN/authors/id/M/MR/MRSAM/testing/ +DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += COPYING -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWpm-net-cidr +CATALOGNAME = pm_net_cidr +SPKG_DESC_CSWpm-net-cidr = $(DESCRIPTION) +OBSOLETES_CSWpm-net-cidr = CSWpmnetcidr +CATALOGNAME_CSWpmnetcidr = pm_netcidr -PACKAGES = CSWpmnetcidr -CATALOGNAME = pm_netcidr ARCHALL = 1 include gar/category.mk Modified: csw/mgar/pkg/cpan/Net-CIDR/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-CIDR/trunk/checksums 2011-03-08 10:15:39 UTC (rev 13678) +++ csw/mgar/pkg/cpan/Net-CIDR/trunk/checksums 2011-03-08 13:00:52 UTC (rev 13679) @@ -1,2 +1 @@ -994cc0020f9ec032f5581ee99cd63a49 download/COPYING -40f0f42104b314af91ab78119e0096de download/Net-CIDR-0.13.tar.gz +52081c62fe551a205127025c09698ec5 Net-CIDR-0.14.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 Mar 8 16:22:20 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 08 Mar 2011 15:22:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[13680] csw/mgar/pkg/cpan/Net-IDN-Encode/trunk Message-ID: Revision: 13680 http://gar.svn.sourceforge.net/gar/?rev=13680&view=rev Author: bonivart Date: 2011-03-08 15:22:20 +0000 (Tue, 08 Mar 2011) Log Message: ----------- cpan/Net-IDN-Encode/trunk: Update to 1.100. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/Makefile csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/checksums Modified: csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/Makefile 2011-03-08 13:00:52 UTC (rev 13679) +++ csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/Makefile 2011-03-08 15:22:20 UTC (rev 13680) @@ -1,5 +1,5 @@ NAME = Net-IDN-Encode -VERSION = 1.000 +VERSION = 1.100 CATEGORIES = cpan AUTHOR = CFAERBER @@ -8,12 +8,18 @@ Internationalizing Domain Names in Applications (RFC 3490) endef -PACKAGES = CSWpmnetidnencode -CATALOGNAME = pm_netidnencode +PACKAGES = CSWpm-net-idn-encode +CATALOGNAME = pm_net_idn_encode +SPKG_DESC_CSWpm-net-idn-encode = $(DESCRIPTION) +OBSOLETES_CSWpm-net-idn-encode = CSWpmnetidnencode +CATALOGNAME_CSWpmnetidnencode = pm_netidnencode + ARCHALL = 1 LICENSE = LICENSE -RUNTIME_DEP_PKGS += CSWpmunicodestrprep +RUNTIME_DEP_PKGS += CSWpmnetidnnameprep +BUILD_DEP_PKGS += CSWpmtestnowarnings + include gar/category.mk Modified: csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/checksums 2011-03-08 13:00:52 UTC (rev 13679) +++ csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/checksums 2011-03-08 15:22:20 UTC (rev 13680) @@ -1 +1 @@ -5b1c00ce7e6c7896b90f4435c650c99d Net-IDN-Encode-1.000.tar.gz +9a90b0d9bcc7886c0f7214df94bfa62f Net-IDN-Encode-1.100.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 Mar 8 16:28:48 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 08 Mar 2011 15:28:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[13681] csw/mgar/pkg/cpan/Pod-Simple/trunk Message-ID: Revision: 13681 http://gar.svn.sourceforge.net/gar/?rev=13681&view=rev Author: bonivart Date: 2011-03-08 15:28:47 +0000 (Tue, 08 Mar 2011) Log Message: ----------- cpan/Pod-Simple/trunk: Update to 3.15. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/Pod-Simple/trunk/Makefile csw/mgar/pkg/cpan/Pod-Simple/trunk/checksums Modified: csw/mgar/pkg/cpan/Pod-Simple/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Pod-Simple/trunk/Makefile 2011-03-08 15:22:20 UTC (rev 13680) +++ csw/mgar/pkg/cpan/Pod-Simple/trunk/Makefile 2011-03-08 15:28:47 UTC (rev 13681) @@ -1,5 +1,5 @@ NAME = Pod-Simple -VERSION = 3.14 +VERSION = 3.15 CATEGORIES = cpan AUTHOR = DWHEELER @@ -13,8 +13,12 @@ DISTFILES = COPYING -PACKAGES = CSWpmpodsimple -CATALOGNAME = pm_podsimple +PACKAGES = CSWpm-pod-simple +CATALOGNAME = pm_pod_simple +SPKG_DESC_CSWpm-pod-simple = $(DESCRIPTION) +OBSOLETES_CSWpm-pod-simple = CSWpmpodsimple +CATALOGNAME_CSWpmpodsimple = pm_podsimple + ARCHALL = 1 EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3\/.* Modified: csw/mgar/pkg/cpan/Pod-Simple/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Pod-Simple/trunk/checksums 2011-03-08 15:22:20 UTC (rev 13680) +++ csw/mgar/pkg/cpan/Pod-Simple/trunk/checksums 2011-03-08 15:28:47 UTC (rev 13681) @@ -1 +1 @@ -10b084e7f24c4fd70bbc00e0198a20d6 Pod-Simple-3.14.tar.gz +2ebe2e9ce2f834d0db73c8a65258e887 Pod-Simple-3.15.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 Mar 8 16:33:46 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 08 Mar 2011 15:33:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[13682] csw/mgar/pkg/cpan/Params-Check/trunk Message-ID: Revision: 13682 http://gar.svn.sourceforge.net/gar/?rev=13682&view=rev Author: bonivart Date: 2011-03-08 15:33:46 +0000 (Tue, 08 Mar 2011) Log Message: ----------- cpan/Params-Check/trunk: Update to 0.28. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/Params-Check/trunk/Makefile csw/mgar/pkg/cpan/Params-Check/trunk/checksums Modified: csw/mgar/pkg/cpan/Params-Check/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Params-Check/trunk/Makefile 2011-03-08 15:28:47 UTC (rev 13681) +++ csw/mgar/pkg/cpan/Params-Check/trunk/Makefile 2011-03-08 15:33:46 UTC (rev 13682) @@ -1,7 +1,7 @@ NAME = Params-Check -VERSION = 0.26 +VERSION = 0.28 CATEGORIES = cpan -AUTHOR = KANE +AUTHOR = BINGOS DESCRIPTION = A generic input parsing/checking mechanism. define BLURB @@ -12,8 +12,12 @@ DISTFILES += COPYING -PACKAGES = CSWpmprmscheck -CATALOGNAME = pm_prmscheck +PACKAGES = CSWpm-params-check +CATALOGNAME = pm_params_check +SPKG_DESC_CSWpm-params-check = $(DESCRIPTION) +OBSOLETES_CSWpm-params-check = CSWpmprmscheck +CATALOGNAME_CSWpmprmscheck = pm_prmscheck + ARCHALL = 1 RUNTIME_DEP_PKGS = CSWpmlclemktxtsimple Modified: csw/mgar/pkg/cpan/Params-Check/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Params-Check/trunk/checksums 2011-03-08 15:28:47 UTC (rev 13681) +++ csw/mgar/pkg/cpan/Params-Check/trunk/checksums 2011-03-08 15:33:46 UTC (rev 13682) @@ -1 +1 @@ -d740a81f3078dcae83d8b6b4859885c7 Params-Check-0.26.tar.gz +e4fddf3e22bbc23d223dd72f1c2a3c8f Params-Check-0.28.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 Mar 8 16:38:48 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 08 Mar 2011 15:38:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[13683] csw/mgar/pkg/cpan/Schedule-At/trunk Message-ID: Revision: 13683 http://gar.svn.sourceforge.net/gar/?rev=13683&view=rev Author: bonivart Date: 2011-03-08 15:38:48 +0000 (Tue, 08 Mar 2011) Log Message: ----------- cpan/Schedule-At/trunk: Update to 1.11. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/Schedule-At/trunk/Makefile csw/mgar/pkg/cpan/Schedule-At/trunk/checksums Modified: csw/mgar/pkg/cpan/Schedule-At/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Schedule-At/trunk/Makefile 2011-03-08 15:33:46 UTC (rev 13682) +++ csw/mgar/pkg/cpan/Schedule-At/trunk/Makefile 2011-03-08 15:38:48 UTC (rev 13683) @@ -1,5 +1,5 @@ NAME = Schedule-At -VERSION = 1.10 +VERSION = 1.11 CATEGORIES = cpan AUTHOR = JOSERODR @@ -10,8 +10,12 @@ DISTFILES += COPYING -PACKAGES = CSWpmscheduleat -CATALOGNAME = pm_scheduleat +PACKAGES = CSWpm-schedule-at +CATALOGNAME = pm_schedule_at +SPKG_DESC_CSWpm-schedule-at = $(DESCRIPTION) +OBSOLETES_CSWpm-schedule-at = CSWpmscheduleat +CATALOGNAME_CSWpmscheduleat = pm_scheduleat + ARCHALL = 1 include gar/category.mk Modified: csw/mgar/pkg/cpan/Schedule-At/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Schedule-At/trunk/checksums 2011-03-08 15:33:46 UTC (rev 13682) +++ csw/mgar/pkg/cpan/Schedule-At/trunk/checksums 2011-03-08 15:38:48 UTC (rev 13683) @@ -1,2 +1 @@ -2e3bc448a96d75abc21205d93740c46f COPYING -0de060a71f602d3420caad7eebf17f9c Schedule-At-1.10.tar.gz +734ce94ad1d676a15768911ae03ec526 Schedule-At-1.11.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 Mar 8 16:46:50 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 08 Mar 2011 15:46:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[13684] csw/mgar/pkg/cpan/Term-UI/trunk Message-ID: Revision: 13684 http://gar.svn.sourceforge.net/gar/?rev=13684&view=rev Author: bonivart Date: 2011-03-08 15:46:50 +0000 (Tue, 08 Mar 2011) Log Message: ----------- cpan/Term-UI/trunk: Update to 0.26. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/Term-UI/trunk/Makefile csw/mgar/pkg/cpan/Term-UI/trunk/checksums Modified: csw/mgar/pkg/cpan/Term-UI/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Term-UI/trunk/Makefile 2011-03-08 15:38:48 UTC (rev 13683) +++ csw/mgar/pkg/cpan/Term-UI/trunk/Makefile 2011-03-08 15:46:50 UTC (rev 13684) @@ -1,7 +1,7 @@ NAME = Term-UI -VERSION = 0.20 +VERSION = 0.26 CATEGORIES = cpan -AUTHOR = KANE +AUTHOR = BINGOS DESCRIPTION = Term::ReadLine UI made easy define BLURB @@ -12,12 +12,22 @@ DISTFILES += COPYING -PACKAGES = CSWpmtermui -CATALOGNAME = pm_termui +PACKAGES = CSWpm-term-ui +CATALOGNAME = pm_term_ui +SPKG_DESC_CSWpm-term-ui = $(DESCRIPTION) +OBSOLETES_CSWpm-term-ui = CSWpmtermui +CATALOGNAME_CSWpmtermui = pm_termui + ARCHALL = 1 -RUNTIME_DEP_PKGS += CSWpmlclemktxtsimple CSWpmlogmsgsimple CSWpmprmscheck +RUNTIME_DEP_PKGS += CSWpmlclemktxtsimple +RUNTIME_DEP_PKGS += CSWpm-log-message-simple +RUNTIME_DEP_PKGS += CSWpm-params-check +# Not yet released/renamed packages +CHECKPKG_OVERRIDES_CSWpm-term-ui += unidentified-dependency|CSWpm-params-check +CHECKPKG_OVERRIDES_CSWpm-term-ui += unidentified-dependency|CSWpm-log-message-simple + EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* .*\/man\/man1.* include gar/category.mk Modified: csw/mgar/pkg/cpan/Term-UI/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Term-UI/trunk/checksums 2011-03-08 15:38:48 UTC (rev 13683) +++ csw/mgar/pkg/cpan/Term-UI/trunk/checksums 2011-03-08 15:46:50 UTC (rev 13684) @@ -1 +1 @@ -7da07b14b0b6565e879aefd3abf15cde Term-UI-0.20.tar.gz +3617e50e56cd7f856af66dbf32ae7e7b Term-UI-0.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 Tue Mar 8 17:09:52 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 08 Mar 2011 16:09:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[13685] csw/mgar/pkg/cpan/Test-Deep/trunk Message-ID: Revision: 13685 http://gar.svn.sourceforge.net/gar/?rev=13685&view=rev Author: bonivart Date: 2011-03-08 16:09:52 +0000 (Tue, 08 Mar 2011) Log Message: ----------- cpan/Test-Deep/trunk: Update to 0.108. Rename. Add deps. Modified Paths: -------------- csw/mgar/pkg/cpan/Test-Deep/trunk/Makefile csw/mgar/pkg/cpan/Test-Deep/trunk/checksums Modified: csw/mgar/pkg/cpan/Test-Deep/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-Deep/trunk/Makefile 2011-03-08 15:46:50 UTC (rev 13684) +++ csw/mgar/pkg/cpan/Test-Deep/trunk/Makefile 2011-03-08 16:09:52 UTC (rev 13685) @@ -1,7 +1,7 @@ NAME = Test-Deep -VERSION = 0.106 +VERSION = 0.108 CATEGORIES = cpan -AUTHOR = FDALY +AUTHOR = RJBS DESCRIPTION = Extremely flexible deep comparison define BLURB @@ -10,8 +10,15 @@ DISTFILES += COPYING -PACKAGES = CSWpmtestdeep -CATALOGNAME = pm_testdeep +PACKAGES = CSWpm-test-deep +CATALOGNAME = pm_test_deep +SPKG_DESC_CSWpm-test-deep = $(DESCRIPTION) +OBSOLETES_CSWpm-test-deep = CSWpmtestdeep +CATALOGNAME_CSWpmtestdeep = pm_testdeep + ARCHALL = 1 +RUNTIME_DEP_PKGS += CSWpmtesttester +RUNTIME_DEP_PKGS += CSWpmtestnowarnings + include gar/category.mk Modified: csw/mgar/pkg/cpan/Test-Deep/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Test-Deep/trunk/checksums 2011-03-08 15:46:50 UTC (rev 13684) +++ csw/mgar/pkg/cpan/Test-Deep/trunk/checksums 2011-03-08 16:09:52 UTC (rev 13685) @@ -1,2 +1 @@ -0b61be0f858484ea7c7c876ffa9f85b2 COPYING -8cf0066dca9c3c102e4ae8f57173d12f Test-Deep-0.106.tar.gz +df17efafc31acb927cc1d950115f4178 Test-Deep-0.108.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 Mar 8 17:15:48 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 08 Mar 2011 16:15:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[13686] csw/mgar/pkg/cpan/Test-NoWarnings/trunk Message-ID: Revision: 13686 http://gar.svn.sourceforge.net/gar/?rev=13686&view=rev Author: bonivart Date: 2011-03-08 16:15:48 +0000 (Tue, 08 Mar 2011) Log Message: ----------- cpan/Test-NoWarnings/trunk: Update to 1.02. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/Test-NoWarnings/trunk/Makefile csw/mgar/pkg/cpan/Test-NoWarnings/trunk/checksums Modified: csw/mgar/pkg/cpan/Test-NoWarnings/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-NoWarnings/trunk/Makefile 2011-03-08 16:09:52 UTC (rev 13685) +++ csw/mgar/pkg/cpan/Test-NoWarnings/trunk/Makefile 2011-03-08 16:15:48 UTC (rev 13686) @@ -1,5 +1,5 @@ NAME = Test-NoWarnings -VERSION = 1.01 +VERSION = 1.02 CATEGORIES = cpan AUTHOR = ADAMK @@ -8,8 +8,12 @@ Make sure you didn't emit any warnings while testing endef -PACKAGES = CSWpmtestnowarnings -CATALOGNAME = pm_testnowarnings +PACKAGES = CSWpm-test-nowarnings +CATALOGNAME = pm_test_nowarnings +SPKG_DESC_CSWpm-test-nowarnings = $(DESCRIPTION) +OBSOLETES_CSWpm-test-nowarnings = CSWpmtestnowarnings +CATALOGNAME_CSWpmtestnowarnings = pm_testnowarnings + ARCHALL = 1 LICENSE = LICENSE Modified: csw/mgar/pkg/cpan/Test-NoWarnings/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Test-NoWarnings/trunk/checksums 2011-03-08 16:09:52 UTC (rev 13685) +++ csw/mgar/pkg/cpan/Test-NoWarnings/trunk/checksums 2011-03-08 16:15:48 UTC (rev 13686) @@ -1 +1 @@ -ea97a1891812c2968f2fa8f89c06ff30 Test-NoWarnings-1.01.tar.gz +6c5ae5613c66d6b5e4f0799085571a64 Test-NoWarnings-1.02.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 Mar 8 17:38:11 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 08 Mar 2011 16:38:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[13687] csw/mgar/pkg/cpan/Text-vFile-asData/trunk Message-ID: Revision: 13687 http://gar.svn.sourceforge.net/gar/?rev=13687&view=rev Author: bonivart Date: 2011-03-08 16:38:11 +0000 (Tue, 08 Mar 2011) Log Message: ----------- cpan/Text-vFile-asData/trunk: Update to 0.07. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/Text-vFile-asData/trunk/Makefile csw/mgar/pkg/cpan/Text-vFile-asData/trunk/checksums Modified: csw/mgar/pkg/cpan/Text-vFile-asData/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-vFile-asData/trunk/Makefile 2011-03-08 16:15:48 UTC (rev 13686) +++ csw/mgar/pkg/cpan/Text-vFile-asData/trunk/Makefile 2011-03-08 16:38:11 UTC (rev 13687) @@ -1,5 +1,5 @@ NAME = Text-vFile-asData -VERSION = 0.05 +VERSION = 0.07 CATEGORIES = cpan AUTHOR = RCLAMP @@ -10,10 +10,16 @@ DISTFILES += COPYING -PACKAGES = CSWpmtextvfileasdata -CATALOGNAME = pm_textvfileasdata +PACKAGES = CSWpm-text-vfile-asdata +CATALOGNAME = pm_text_vfile_asdata +SPKG_DESC_CSWpm-text-vfile-asdata = $(DESCRIPTION) +OBSOLETES_CSWpm-text-vfile-asdata = CSWpmtextvfileasdata +CATALOGNAME_CSWpmtextvfileasdata = pm_textvfileasdata + ARCHALL = 1 -RUNTIME_DEP_PKGS += CSWpmclsaccessorchnd +RUNTIME_DEP_PKGS += CSWpm-class-accessor-chained +CHECKPKG_OVERRIDES_CSWpm-text-vfile-asdata += unidentified-dependency|CSWpm-class-accessor-chained + include gar/category.mk Modified: csw/mgar/pkg/cpan/Text-vFile-asData/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Text-vFile-asData/trunk/checksums 2011-03-08 16:15:48 UTC (rev 13686) +++ csw/mgar/pkg/cpan/Text-vFile-asData/trunk/checksums 2011-03-08 16:38:11 UTC (rev 13687) @@ -1,2 +1 @@ -3ce05362dd1733c952d19530cd7c0e09 COPYING -3e2ec1f22562dc3d92ababac4f882bed Text-vFile-asData-0.05.tar.gz +1f0fc1fbef2111a936db3eb4678ddccc Text-vFile-asData-0.07.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 Mar 8 17:53:17 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 08 Mar 2011 16:53:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[13688] csw/mgar/pkg/cpan Message-ID: Revision: 13688 http://gar.svn.sourceforge.net/gar/?rev=13688&view=rev Author: bonivart Date: 2011-03-08 16:53:16 +0000 (Tue, 08 Mar 2011) Log Message: ----------- cpan/Class-Accessor-Chained: Initial commit. Rename. Added Paths: ----------- csw/mgar/pkg/cpan/Class-Accessor-Chained/ csw/mgar/pkg/cpan/Class-Accessor-Chained/branches/ csw/mgar/pkg/cpan/Class-Accessor-Chained/tags/ csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/ csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/Makefile csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/checksums csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/files/ csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Class-Accessor-Chained/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/cpan/Class-Accessor-Chained/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/Makefile 2011-03-08 16:53:16 UTC (rev 13688) @@ -0,0 +1,23 @@ +NAME = Class-Accessor-Chained +VERSION = 0.01 +CATEGORIES = cpan +AUTHOR = RCLAMP + +DESCRIPTION = Make chained accessors +define BLURB + Make chained accessors +endef + +DISTFILES += COPYING + +PACKAGES = CSWpm-class-accessor-chained +CATALOGNAME = pm_class_accessor_chained +SPKG_DESC_CSWpm-class-accessor-chained = $(DESCRIPTION) +OBSOLETES_CSWpm-class-accessor-chained = CSWpmclsaccessorchnd +CATALOGNAME_CSWpmclsaccessorchnd = pm_clsaccessorchnd + +ARCHALL = 1 + +RUNTIME_DEP_PKGS += CSWpmclsaccessor + +include gar/category.mk Added: csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/checksums 2011-03-08 16:53:16 UTC (rev 13688) @@ -0,0 +1 @@ +9825a1f30a70e55e61bb5660b2bd7365 Class-Accessor-Chained-0.01.tar.gz Added: csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/files/COPYING 2011-03-08 16:53:16 UTC (rev 13688) @@ -0,0 +1,4 @@ +Copyright (C) 2003 Richard Clamp. All Rights Reserved. + +This module is free software; you can redistribute it and/or modify it +under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Tue Mar 8 18:05:13 2011 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Tue, 08 Mar 2011 17:05:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[13689] csw/mgar/pkg/TEMPLATES/createpkg/README Message-ID: Revision: 13689 http://gar.svn.sourceforge.net/gar/?rev=13689&view=rev Author: theferret Date: 2011-03-08 17:05:12 +0000 (Tue, 08 Mar 2011) Log Message: ----------- Bumped README file a little Modified Paths: -------------- csw/mgar/pkg/TEMPLATES/createpkg/README Modified: csw/mgar/pkg/TEMPLATES/createpkg/README =================================================================== --- csw/mgar/pkg/TEMPLATES/createpkg/README 2011-03-08 16:53:16 UTC (rev 13688) +++ csw/mgar/pkg/TEMPLATES/createpkg/README 2011-03-08 17:05:12 UTC (rev 13689) @@ -86,9 +86,8 @@ 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. +Note that there is a make target that explicitly tries to generate one +for you: pkgproto @@ -107,8 +106,9 @@ * distclean * reallyclean * package + * pkgproto -Note that there is a single shared upstream source tree, that should be +Note that there is a single shared upstream source archive, that should be extracted under a "build" directory. The "clean" and "distclean" targets, are only pass-through targets, that will call the upstream source tree makefile with that argument. 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 Mar 8 18:06:21 2011 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Tue, 08 Mar 2011 17:06:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[13690] csw/mgar/pkg/gtk_engines/trunk Message-ID: Revision: 13690 http://gar.svn.sourceforge.net/gar/?rev=13690&view=rev Author: theferret Date: 2011-03-08 17:06:21 +0000 (Tue, 08 Mar 2011) Log Message: ----------- bumped gtk_engines for newer version Modified Paths: -------------- csw/mgar/pkg/gtk_engines/trunk/Makefile csw/mgar/pkg/gtk_engines/trunk/prototype Modified: csw/mgar/pkg/gtk_engines/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtk_engines/trunk/Makefile 2011-03-08 17:05:12 UTC (rev 13689) +++ csw/mgar/pkg/gtk_engines/trunk/Makefile 2011-03-08 17:06:21 UTC (rev 13690) @@ -10,11 +10,11 @@ # Where do we keep local downloads of software src files ARCHIVEDIR ?= /home/src -ARCHIVENAME ?= gtk-engines-2.18.5.tar.bz2 +ARCHIVENAME ?= gtk-engines-2.20.2.tar.bz2 EXTRACTPROG ?= /usr/sfw/bin/gtar jfx # Only use ONE here. The name is used for compat with 'gar'. -MASTER_SITES ?= http://ftp.acc.umu.se/pub/GNOME/sources/gtk-engines/2.18 +MASTER_SITES ?= http://ftp.acc.umu.se/pub/GNOME/sources/gtk-engines/2.20 ARCH := $(shell /bin/uname -p) @@ -28,8 +28,8 @@ # DO NOT specify the arch-64 stuff such as -m64 here. # the individual targets will do that. -CFLAGS_COMMON ?= -mt -xnorunpath -xO2 -CXXFLAGS_COMMON ?= -mt -norunpath -xO2 +CFLAGS_COMMON ?= -mt -xnorunpath -xO3 +CXXFLAGS_COMMON ?= -mt -norunpath -xO3 CFLAGS_sparc ?= -xarch=v8 CFLAGS_i386 ?= -xarch=386 Modified: csw/mgar/pkg/gtk_engines/trunk/prototype =================================================================== --- csw/mgar/pkg/gtk_engines/trunk/prototype 2011-03-08 17:05:12 UTC (rev 13689) +++ csw/mgar/pkg/gtk_engines/trunk/prototype 2011-03-08 17:06:21 UTC (rev 13690) @@ -1,92 +1,63 @@ i pkginfo i copyright i depend +d none /opt/csw/lib 0755 root bin +d none /opt/csw/lib/gtk-2.0 0755 root bin +d none /opt/csw/lib/gtk-2.0/2.10.0 0755 root bin +d none /opt/csw/lib/gtk-2.0/2.10.0/engines 0755 root bin +f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libcrux-engine.la 0755 root bin +f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libmist.la 0755 root bin +f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libglide.so 0755 root bin +f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libglide.la 0755 root bin +f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libcrux-engine.so 0755 root bin +f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libmist.so 0755 root bin +f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libindustrial.la 0755 root bin +f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libredmond95.la 0755 root bin +f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libclearlooks.so 0755 root bin +f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libthinice.la 0755 root bin +f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libhcengine.so 0755 root bin +f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libhcengine.la 0755 root bin +f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libclearlooks.la 0755 root bin +f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libthinice.so 0755 root bin +f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libredmond95.so 0755 root bin +f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libindustrial.so 0755 root bin +d none /opt/csw/lib/pkgconfig 0755 root bin +f none /opt/csw/lib/pkgconfig/gtk-engines-2.pc 0644 root bin d none /opt/csw/share 0755 root bin d none /opt/csw/share/locale 0755 root bin -d none /opt/csw/share/locale/si 0755 root bin -d none /opt/csw/share/locale/si/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/si/LC_MESSAGES/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/pa 0755 root bin -d none /opt/csw/share/locale/pa/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/pa/LC_MESSAGES/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/et 0755 root bin -d none /opt/csw/share/locale/et/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/et/LC_MESSAGES/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/en_GB 0755 root bin -d none /opt/csw/share/locale/en_GB/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/en_GB/LC_MESSAGES/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/bg 0755 root bin -d none /opt/csw/share/locale/bg/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/bg/LC_MESSAGES/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/kn 0755 root bin -d none /opt/csw/share/locale/kn/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/kn/LC_MESSAGES/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/gu 0755 root bin -d none /opt/csw/share/locale/gu/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/gu/LC_MESSAGES/gtk-engines.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/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/nb 0755 root bin -d none /opt/csw/share/locale/nb/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/nb/LC_MESSAGES/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/dz 0755 root bin -d none /opt/csw/share/locale/dz/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/dz/LC_MESSAGES/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/gl 0755 root bin -d none /opt/csw/share/locale/gl/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/gl/LC_MESSAGES/gtk-engines.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/gtk-engines.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/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/hu 0755 root bin -d none /opt/csw/share/locale/hu/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/hu/LC_MESSAGES/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/or 0755 root bin -d none /opt/csw/share/locale/or/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/or/LC_MESSAGES/gtk-engines.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/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/ar 0755 root bin -d none /opt/csw/share/locale/ar/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/ar/LC_MESSAGES/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/bn 0755 root bin -d none /opt/csw/share/locale/bn/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/bn/LC_MESSAGES/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/be at latin 0755 root bin -d none /opt/csw/share/locale/be at latin/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/be at latin/LC_MESSAGES/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/sr at latin 0755 root bin -d none /opt/csw/share/locale/sr at latin/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/sr at latin/LC_MESSAGES/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/lt 0755 root bin -d none /opt/csw/share/locale/lt/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/lt/LC_MESSAGES/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/cs 0755 root bin -d none /opt/csw/share/locale/cs/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/cs/LC_MESSAGES/gtk-engines.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/gtk-engines.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/gtk-engines.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/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/el 0755 root bin -d none /opt/csw/share/locale/el/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/el/LC_MESSAGES/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/sq 0755 root bin -d none /opt/csw/share/locale/sq/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/sq/LC_MESSAGES/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/th 0755 root bin -d none /opt/csw/share/locale/th/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/th/LC_MESSAGES/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/te 0755 root bin +d none /opt/csw/share/locale/te/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/te/LC_MESSAGES/gtk-engines.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/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/en at shaw 0755 root bin +d none /opt/csw/share/locale/en at shaw/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/en at shaw/LC_MESSAGES/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/fi 0755 root bin +d none /opt/csw/share/locale/fi/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/fi/LC_MESSAGES/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/lv 0755 root bin +d none /opt/csw/share/locale/lv/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/lv/LC_MESSAGES/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/eu 0755 root bin +d none /opt/csw/share/locale/eu/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/eu/LC_MESSAGES/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/ko 0755 root bin +d none /opt/csw/share/locale/ko/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ko/LC_MESSAGES/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/pt 0755 root bin +d none /opt/csw/share/locale/pt/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/pt/LC_MESSAGES/gtk-engines.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/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/ru 0755 root bin +d none /opt/csw/share/locale/ru/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ru/LC_MESSAGES/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/mk 0755 root bin +d none /opt/csw/share/locale/mk/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/mk/LC_MESSAGES/gtk-engines.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/gtk-engines.mo 0644 root bin @@ -96,143 +67,187 @@ d none /opt/csw/share/locale/ml 0755 root bin d none /opt/csw/share/locale/ml/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/ml/LC_MESSAGES/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/mr 0755 root bin +d none /opt/csw/share/locale/mr/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/mr/LC_MESSAGES/gtk-engines.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/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/mr 0755 root bin -d none /opt/csw/share/locale/mr/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/mr/LC_MESSAGES/gtk-engines.mo 0644 root bin d none /opt/csw/share/locale/nn 0755 root bin d none /opt/csw/share/locale/nn/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/nn/LC_MESSAGES/gtk-engines.mo 0644 root bin d none /opt/csw/share/locale/uk 0755 root bin d none /opt/csw/share/locale/uk/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/uk/LC_MESSAGES/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/ru 0755 root bin -d none /opt/csw/share/locale/ru/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/ru/LC_MESSAGES/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/mk 0755 root bin -d none /opt/csw/share/locale/mk/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/mk/LC_MESSAGES/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/te 0755 root bin -d none /opt/csw/share/locale/te/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/te/LC_MESSAGES/gtk-engines.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/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/fi 0755 root bin -d none /opt/csw/share/locale/fi/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/fi/LC_MESSAGES/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/eu 0755 root bin -d none /opt/csw/share/locale/eu/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/eu/LC_MESSAGES/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/pt 0755 root bin -d none /opt/csw/share/locale/pt/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/pt/LC_MESSAGES/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/ko 0755 root bin -d none /opt/csw/share/locale/ko/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/ko/LC_MESSAGES/gtk-engines.mo 0644 root bin d none /opt/csw/share/locale/ca at valencia 0755 root bin d none /opt/csw/share/locale/ca at valencia/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/ca at valencia/LC_MESSAGES/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/el 0755 root bin +d none /opt/csw/share/locale/el/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/el/LC_MESSAGES/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/sq 0755 root bin +d none /opt/csw/share/locale/sq/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/sq/LC_MESSAGES/gtk-engines.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/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/th 0755 root bin +d none /opt/csw/share/locale/th/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/th/LC_MESSAGES/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/oc 0755 root bin +d none /opt/csw/share/locale/oc/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/oc/LC_MESSAGES/gtk-engines.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/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/as 0755 root bin +d none /opt/csw/share/locale/as/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/as/LC_MESSAGES/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/sr at latin 0755 root bin +d none /opt/csw/share/locale/sr at latin/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/sr at latin/LC_MESSAGES/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/be at latin 0755 root bin +d none /opt/csw/share/locale/be at latin/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/be at latin/LC_MESSAGES/gtk-engines.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/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/en_GB 0755 root bin +d none /opt/csw/share/locale/en_GB/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/en_GB/LC_MESSAGES/gtk-engines.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/gtk-engines.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/gtk-engines.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/gtk-engines.mo 0644 root bin d none /opt/csw/share/locale/ta 0755 root bin d none /opt/csw/share/locale/ta/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/ta/LC_MESSAGES/gtk-engines.mo 0644 root bin d none /opt/csw/share/locale/sl 0755 root bin d none /opt/csw/share/locale/sl/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/sl/LC_MESSAGES/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/hi 0755 root bin +d none /opt/csw/share/locale/hi/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/hi/LC_MESSAGES/gtk-engines.mo 0644 root bin d none /opt/csw/share/locale/sr 0755 root bin d none /opt/csw/share/locale/sr/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/sr/LC_MESSAGES/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/hi 0755 root bin -d none /opt/csw/share/locale/hi/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/hi/LC_MESSAGES/gtk-engines.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/gtk-engines.mo 0644 root bin d none /opt/csw/share/locale/zh_TW 0755 root bin d none /opt/csw/share/locale/zh_TW/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/zh_TW/LC_MESSAGES/gtk-engines.mo 0644 root bin d none /opt/csw/share/locale/zh_HK 0755 root bin d none /opt/csw/share/locale/zh_HK/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/zh_HK/LC_MESSAGES/gtk-engines.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/gtk-engines.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/gtk-engines.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/gtk-engines.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/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/hu 0755 root bin +d none /opt/csw/share/locale/hu/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/hu/LC_MESSAGES/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/or 0755 root bin +d none /opt/csw/share/locale/or/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/or/LC_MESSAGES/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/dz 0755 root bin +d none /opt/csw/share/locale/dz/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/dz/LC_MESSAGES/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/gl 0755 root bin +d none /opt/csw/share/locale/gl/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/gl/LC_MESSAGES/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/mai 0755 root bin +d none /opt/csw/share/locale/mai/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/mai/LC_MESSAGES/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/gu 0755 root bin +d none /opt/csw/share/locale/gu/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/gu/LC_MESSAGES/gtk-engines.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/gtk-engines.mo 0644 root bin d none /opt/csw/share/locale/fur 0755 root bin d none /opt/csw/share/locale/fur/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/fur/LC_MESSAGES/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/mai 0755 root bin -d none /opt/csw/share/locale/mai/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/mai/LC_MESSAGES/gtk-engines.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/gtk-engines.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/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/oc 0755 root bin -d none /opt/csw/share/locale/oc/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/oc/LC_MESSAGES/gtk-engines.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/gtk-engines.mo 0644 root bin -d none /opt/csw/share/locale/as 0755 root bin -d none /opt/csw/share/locale/as/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/as/LC_MESSAGES/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/nb 0755 root bin +d none /opt/csw/share/locale/nb/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/nb/LC_MESSAGES/gtk-engines.mo 0644 root bin d none /opt/csw/share/locale/bn_IN 0755 root bin d none /opt/csw/share/locale/bn_IN/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/bn_IN/LC_MESSAGES/gtk-engines.mo 0644 root bin -d none /opt/csw/share/gtk-engines 0755 root bin -f none /opt/csw/share/gtk-engines/glide.xml 0644 root bin -f none /opt/csw/share/gtk-engines/mist.xml 0644 root bin -f none /opt/csw/share/gtk-engines/crux-engine.xml 0644 root bin -f none /opt/csw/share/gtk-engines/clearlooks.xml 0644 root bin -f none /opt/csw/share/gtk-engines/thinice.xml 0644 root bin -f none /opt/csw/share/gtk-engines/hcengine.xml 0644 root bin -f none /opt/csw/share/gtk-engines/redmond95.xml 0644 root bin -f none /opt/csw/share/gtk-engines/industrial.xml 0644 root bin +d none /opt/csw/share/locale/si 0755 root bin +d none /opt/csw/share/locale/si/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/si/LC_MESSAGES/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/et 0755 root bin +d none /opt/csw/share/locale/et/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/et/LC_MESSAGES/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/pa 0755 root bin +d none /opt/csw/share/locale/pa/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/pa/LC_MESSAGES/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/bg 0755 root bin +d none /opt/csw/share/locale/bg/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/bg/LC_MESSAGES/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/kn 0755 root bin +d none /opt/csw/share/locale/kn/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/kn/LC_MESSAGES/gtk-engines.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/gtk-engines.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/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/cs 0755 root bin +d none /opt/csw/share/locale/cs/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/cs/LC_MESSAGES/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/af 0755 root bin +d none /opt/csw/share/locale/af/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/af/LC_MESSAGES/gtk-engines.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/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/ar 0755 root bin +d none /opt/csw/share/locale/ar/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ar/LC_MESSAGES/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/bn 0755 root bin +d none /opt/csw/share/locale/bn/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/bn/LC_MESSAGES/gtk-engines.mo 0644 root bin +d none /opt/csw/share/locale/lt 0755 root bin +d none /opt/csw/share/locale/lt/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/lt/LC_MESSAGES/gtk-engines.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/gtk-engines.mo 0644 root bin d none /opt/csw/share/themes 0755 root bin +d none /opt/csw/share/themes/Redmond 0755 root bin +d none /opt/csw/share/themes/Redmond/gtk-2.0 0755 root bin +f none /opt/csw/share/themes/Redmond/gtk-2.0/gtkrc 0644 root bin +d none /opt/csw/share/themes/Crux 0755 root bin +d none /opt/csw/share/themes/Crux/gtk-2.0 0755 root bin +f none /opt/csw/share/themes/Crux/gtk-2.0/gtkrc 0644 root bin +d none /opt/csw/share/themes/ThinIce 0755 root bin +d none /opt/csw/share/themes/ThinIce/gtk-2.0 0755 root bin +f none /opt/csw/share/themes/ThinIce/gtk-2.0/gtkrc 0644 root bin d none /opt/csw/share/themes/Industrial 0755 root bin d none /opt/csw/share/themes/Industrial/gtk-2.0 0755 root bin f none /opt/csw/share/themes/Industrial/gtk-2.0/gtkrc 0644 root bin -d none /opt/csw/share/themes/Redmond 0755 root bin -d none /opt/csw/share/themes/Redmond/gtk-2.0 0755 root bin -f none /opt/csw/share/themes/Redmond/gtk-2.0/gtkrc 0644 root bin d none /opt/csw/share/themes/Mist 0755 root bin d none /opt/csw/share/themes/Mist/gtk-2.0 0755 root bin f none /opt/csw/share/themes/Mist/gtk-2.0/gtkrc 0644 root bin d none /opt/csw/share/themes/Clearlooks 0755 root bin d none /opt/csw/share/themes/Clearlooks/gtk-2.0 0755 root bin f none /opt/csw/share/themes/Clearlooks/gtk-2.0/gtkrc 0644 root bin -d none /opt/csw/share/themes/Crux 0755 root bin -d none /opt/csw/share/themes/Crux/gtk-2.0 0755 root bin -f none /opt/csw/share/themes/Crux/gtk-2.0/gtkrc 0644 root bin -d none /opt/csw/share/themes/ThinIce 0755 root bin -d none /opt/csw/share/themes/ThinIce/gtk-2.0 0755 root bin -f none /opt/csw/share/themes/ThinIce/gtk-2.0/gtkrc 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/gtk-engines-2.pc 0644 root bin -d none /opt/csw/lib/gtk-2.0 0755 root bin -d none /opt/csw/lib/gtk-2.0/2.10.0 0755 root bin -d none /opt/csw/lib/gtk-2.0/2.10.0/engines 0755 root bin -f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libglide.la 0755 root bin -f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libhcengine.la 0755 root bin -f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libindustrial.so 0755 root bin -f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libthinice.so 0755 root bin -f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libclearlooks.la 0755 root bin -f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libclearlooks.so 0755 root bin -f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libthinice.la 0755 root bin -f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libindustrial.la 0755 root bin -f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libhcengine.so 0755 root bin -f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libglide.so 0755 root bin -f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libcrux-engine.la 0755 root bin -f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libmist.la 0755 root bin -f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libredmond95.la 0755 root bin -f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libmist.so 0755 root bin -f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libredmond95.so 0755 root bin -f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libcrux-engine.so 0755 root bin +d none /opt/csw/share/gtk-engines 0755 root bin +f none /opt/csw/share/gtk-engines/thinice.xml 0644 root bin +f none /opt/csw/share/gtk-engines/mist.xml 0644 root bin +f none /opt/csw/share/gtk-engines/hcengine.xml 0644 root bin +f none /opt/csw/share/gtk-engines/industrial.xml 0644 root bin +f none /opt/csw/share/gtk-engines/glide.xml 0644 root bin +f none /opt/csw/share/gtk-engines/clearlooks.xml 0644 root bin +f none /opt/csw/share/gtk-engines/redmond95.xml 0644 root bin +f none /opt/csw/share/gtk-engines/crux-engine.xml 0644 root bin 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 Mar 8 18:26:40 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 08 Mar 2011 17:26:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[13691] csw/mgar/pkg/cpan/WWW-Curl/trunk Message-ID: Revision: 13691 http://gar.svn.sourceforge.net/gar/?rev=13691&view=rev Author: bonivart Date: 2011-03-08 17:26:40 +0000 (Tue, 08 Mar 2011) Log Message: ----------- cpan/WWW-Curl/trunk: Update to 4.15. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile csw/mgar/pkg/cpan/WWW-Curl/trunk/checksums Modified: csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile 2011-03-08 17:06:21 UTC (rev 13690) +++ csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile 2011-03-08 17:26:40 UTC (rev 13691) @@ -1,5 +1,5 @@ NAME = WWW-Curl -VERSION = 4.11 +VERSION = 4.15 CATEGORIES = cpan AUTHOR = SZBALINT @@ -10,15 +10,22 @@ DISTFILES += COPYING -PACKAGES = CSWpmwwwcurl -CATALOGNAME = pm_wwwcurl +PACKAGES = CSWpm-www-curl +CATALOGNAME = pm_www_curl +SPKG_DESC_CSWpm-www-curl = $(DESCRIPTION) +OBSOLETES_CSWpm-www-curl = CSWpmwwwcurl +CATALOGNAME_CSWpmwwwcurl = pm_wwwcurl -RUNTIME_DEP_PKGS = CSWcurlrt CSWlibidn CSWoldaprt CSWosslrt CSWzlib +RUNTIME_DEP_PKGS += CSWcurlrt +RUNTIME_DEP_PKGS += CSWlibidn +RUNTIME_DEP_PKGS += CSWoldaprt +RUNTIME_DEP_PKGS += CSWosslrt +RUNTIME_DEP_PKGS += CSWzlib +RUNTIME_DEP_PKGS += CSWlibcares -EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod - CONFIGURE_ARGS = -TEST_SCRIPTS = +# Note that 08ssl.t fails (probably due to connection issues) +#TEST_SCRIPTS = include gar/category.mk Modified: csw/mgar/pkg/cpan/WWW-Curl/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/WWW-Curl/trunk/checksums 2011-03-08 17:06:21 UTC (rev 13690) +++ csw/mgar/pkg/cpan/WWW-Curl/trunk/checksums 2011-03-08 17:26:40 UTC (rev 13691) @@ -1,2 +1 @@ -db18751ba774bf0b6adce949b343ea21 COPYING -0fa0d459454dd37ff70033abcc0c64ab WWW-Curl-4.11.tar.gz +31c0b8c7e5e2d26bcc8213d702186d5f WWW-Curl-4.15.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 Tue Mar 8 19:47:23 2011 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Tue, 08 Mar 2011 18:47:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[13692] csw/mgar/pkg/gtk_engines/trunk Message-ID: Revision: 13692 http://gar.svn.sourceforge.net/gar/?rev=13692&view=rev Author: theferret Date: 2011-03-08 18:47:23 +0000 (Tue, 08 Mar 2011) Log Message: ----------- gtk_engines: missed including full copyright file Modified Paths: -------------- csw/mgar/pkg/gtk_engines/trunk/copyright csw/mgar/pkg/gtk_engines/trunk/prototype Modified: csw/mgar/pkg/gtk_engines/trunk/copyright =================================================================== --- csw/mgar/pkg/gtk_engines/trunk/copyright 2011-03-08 17:26:40 UTC (rev 13691) +++ csw/mgar/pkg/gtk_engines/trunk/copyright 2011-03-08 18:47:23 UTC (rev 13692) @@ -0,0 +1,2 @@ +Please see /opt/csw/lib/gtk-2.0/2.10.0/engines/COPYING for full text +of copyright license. (LGPL v2.1) Modified: csw/mgar/pkg/gtk_engines/trunk/prototype =================================================================== --- csw/mgar/pkg/gtk_engines/trunk/prototype 2011-03-08 17:26:40 UTC (rev 13691) +++ csw/mgar/pkg/gtk_engines/trunk/prototype 2011-03-08 18:47:23 UTC (rev 13692) @@ -5,6 +5,7 @@ d none /opt/csw/lib/gtk-2.0 0755 root bin d none /opt/csw/lib/gtk-2.0/2.10.0 0755 root bin d none /opt/csw/lib/gtk-2.0/2.10.0/engines 0755 root bin +f none /opt/csw/lib/gtk-2.0/2.10.0/engines/COPYING=COPYING 0755 root bin f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libcrux-engine.la 0755 root bin f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libmist.la 0755 root bin f none /opt/csw/lib/gtk-2.0/2.10.0/engines/libglide.so 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 Tue Mar 8 19:50:22 2011 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Tue, 08 Mar 2011 18:50:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[13693] csw/mgar/pkg/gtk_engines/trunk/pkginfo Message-ID: Revision: 13693 http://gar.svn.sourceforge.net/gar/?rev=13693&view=rev Author: theferret Date: 2011-03-08 18:50:21 +0000 (Tue, 08 Mar 2011) Log Message: ----------- gtk_engines pkginfo bumped for newer version Modified Paths: -------------- csw/mgar/pkg/gtk_engines/trunk/pkginfo Modified: csw/mgar/pkg/gtk_engines/trunk/pkginfo =================================================================== --- csw/mgar/pkg/gtk_engines/trunk/pkginfo 2011-03-08 18:47:23 UTC (rev 13692) +++ csw/mgar/pkg/gtk_engines/trunk/pkginfo 2011-03-08 18:50:21 UTC (rev 13693) @@ -1,6 +1,6 @@ PKG=CSWgtkengines NAME=gtk_engines - A collection of basic theme engines for GTK+ -VERSION=2.18.5,REV=2010.06.29 +VERSION=2.20.2,REV=YYYY.MM.DD CATEGORY=application VENDOR=http://www.gnome.org/ packaged for CSW by Philip Brown HOTLINE=http://www.opencsw.org/bugtrack/ 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 Mar 8 22:19:15 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 08 Mar 2011 21:19:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[13694] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 13694 http://gar.svn.sourceforge.net/gar/?rev=13694&view=rev Author: dmichelsen Date: 2011-03-08 21:19:14 +0000 (Tue, 08 Mar 2011) Log Message: ----------- mGAR v2: Add FOREIGN_PACKAGES to obsolete from external packages Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-03-08 18:50:21 UTC (rev 13693) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-03-08 21:19:14 UTC (rev 13694) @@ -40,7 +40,8 @@ CATALOGNAME ?= $(if $(filter-out $(firstword $(PACKAGES)),$(PACKAGES)),,$(subst -,_,$(patsubst CSW%,%,$(PACKAGES)))) SRCPACKAGE_BASE = $(firstword $(PACKAGES)) SRCPACKAGE ?= $(SRCPACKAGE_BASE)-src -OBSOLETED_PKGS ?= $(sort $(foreach P,$(PACKAGES),$(OBSOLETES_$P))) +OBSOLETING_PKGS ?= $(sort $(PACKAGES) $(FOREIGN_PACKAGES)) +OBSOLETED_PKGS ?= $(sort $(foreach P,$(OBSOLETING_PKGS),$(OBSOLETES_$P))) SPKG_SPECS ?= $(sort $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES) $(OBSOLETED_PKGS) $(if $(NOSOURCEPACKAGE),,$(SRCPACKAGE))) endif @@ -62,21 +63,19 @@ CATALOGNAME_$(1) ?= $(call catalogname,$(1)) # The length of the description has been limited to 100 characters, # the string is cut (no longer on word boundaries). -SPKG_DESC_$(1) ?= $(shell echo Transitional package. Content moved to $(foreach P,$(PACKAGES),$(if $(filter $(1),$(OBSOLETES_$P)),$P)) | perl -npe 's/(.{0,97}\s|\S{0,97})(.+)/$$1.../') -RUNTIME_DEP_PKGS_$(1) = $(foreach P,$(PACKAGES),$(if $(filter $(1),$(OBSOLETES_$P)),$P)) +SPKG_DESC_$(1) ?= $(shell echo Transitional package. Content moved to $(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETES_$P)),$P)) | perl -npe 's/(.{0,97}\s|\S{0,97})(.+)/$$1.../') +RUNTIME_DEP_PKGS_$(1) = $(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETES_$P)),$P)) PKGFILES_$(1) = NOFILES ARCHALL_$(1) = 1 # For legacy packages we know that the dependency is correct because we deliberately set it # The catalog name may not match for legacy packages # The overridden package may be a devel package, as it is empty it is ok to be archall -$(foreach P,$(PACKAGES),$(if $(filter $(1),$(OBSOLETES_$P)), - CHECKPKG_OVERRIDES_$(1) += surplus-dependency|$P - CHECKPKG_OVERRIDES_$(1) += catalogname-does-not-match-pkgname - CHECKPKG_OVERRIDES_$(1) += archall-devel-package - +$(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETES_$P)), +CHECKPKG_OVERRIDES_$(1) += surplus-dependency|$P )) +CHECKPKG_OVERRIDES_$(1) += catalogname-does-not-match-pkgname +CHECKPKG_OVERRIDES_$(1) += archall-devel-package endef -# ^^ "THE NEWLINE IS IMPORTANT, DO NOT DELETE!", Dago M. $(foreach P,$(OBSOLETED_PKGS),$(eval $(call obsoleted_pkg,$P))) @@ -710,7 +709,7 @@ $(_DBG)rm -f $(COOKIEDIR)/merge-README.CSW $(foreach SPEC,$(_PKG_SPECS),$(PKGROOT)$(docdir)/$(call catalogname,$(SPEC))/README.CSW) merge-obsolete: $(WORKDIR_GLOBAL) - $(_DBG)$(foreach P,$(OBSOLETED_PKGS),$(foreach Q,$(PACKAGES),$(if $(filter $P,$(OBSOLETES_$Q)), \ + $(_DBG)$(foreach P,$(OBSOLETED_PKGS),$(foreach Q,$(OBSOLETING_PACKAGES),$(if $(filter $P,$(OBSOLETES_$Q)), \ $(if $(SPKG_DESC_$Q), \ echo "$Q $(call catalogname,$Q) - $(SPKG_DESC_$Q)" >> $(WORKDIR_GLOBAL)/$P.obsolete;, \ echo "$(shell (/usr/bin/pkginfo $Q || echo "$Q - ") | $(GAWK) '{ $$1 = "P"; print } ')" $(WORKDIR_GLOBAL)/$P.obsolete; \ 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 Mar 8 22:27:29 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 08 Mar 2011 21:27:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[13695] csw/mgar/pkg/libtool/branches/libtool24/Makefile Message-ID: Revision: 13695 http://gar.svn.sourceforge.net/gar/?rev=13695&view=rev Author: dmichelsen Date: 2011-03-08 21:27:29 +0000 (Tue, 08 Mar 2011) Log Message: ----------- libtool24: Reorganize package description and make CSWlibtool also directly depend on CSWlibltdl3 to fix #4722 Modified Paths: -------------- csw/mgar/pkg/libtool/branches/libtool24/Makefile Modified: csw/mgar/pkg/libtool/branches/libtool24/Makefile =================================================================== --- csw/mgar/pkg/libtool/branches/libtool24/Makefile 2011-03-08 21:19:14 UTC (rev 13694) +++ csw/mgar/pkg/libtool/branches/libtool24/Makefile 2011-03-08 21:27:29 UTC (rev 13695) @@ -34,21 +34,28 @@ COMPILER_TAGNAME_GCC4 = gcc4 COMPILER_TAGNAME_SOS12 = sos12 -PACKAGES = CSWlibtool CSWlibltdl7 CSWlibtoolrt +VENDOR_URL = http://www.gnu.org/software/libtool/ +PACKAGES += CSWlibtool CATALOGNAME_CSWlibtool = libtool -CATALOGNAME_CSWlibltdl7 = libltdl7 -CATALOGNAME_CSWlibtoolrt = libtool_rt +SPKG_DESC_CSWlibtool = A generic library support tool +# Double-legacy packages may not even depend on CSWlibtoolrt, so we must +# also directly depend on CSWlibltdl3 +RUNTIME_DEP_PKGS_CSWlibtool += CSWlibltdl3 +RUNTIME_DEP_PKGS_CSWlibtool += CSWlibltdl7 +CHECKPKG_OVERRIDES_CSWlibtool += surplus-dependency|CSWlibltdl3 +CHECKPKG_OVERRIDES_CSWlibtool += surplus-dependency|CSWlibltdl7 -SPKG_SOURCEURL = http://www.gnu.org/software/libtool/ +# This is built from pkgs/libltdl3 +FOREIGN_PACKAGES += CSWlibltdl3 +OBSOLETES_CSWlibltdl3 += CSWlibtoolrt -RUNTIME_DEP_PKGS_CSWlibtool = CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWlibtoolrt = CSWlibltdl3 CSWlibltdl7 +PACKAGES += CSWlibltdl7 +CATALOGNAME_CSWlibltdl7 = libltdl7 +SPKG_DESC_CSWlibltdl7 = Libtool libltdl.so.7 from libtool 2.x +PKGFILES_CSWlibltdl7 += $(PKGFILES_RT) +OBSOLETES_CSWlibltdl7 += CSWlibtoolrt -SPKG_DESC_CSWlibtool = A generic library support tool -SPKG_DESC_CSWlibltdl7 = Libtool libltdl.so.7 from libtool 2.x -SPKG_DESC_CSWlibtoolrt = Runtime libraries for libtool - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz @@ -69,15 +76,6 @@ MERGE_SCRIPTS_isa-default-garcompiler-GCC3 = copy-tags MERGE_SCRIPTS_isa-default-garcompiler-GCC4 = copy-tags -PKGFILES_CSWlibltdl7 = $(PKGFILES_RT) -PKGFILES_CSWlibtoolrt = NONE - -ARCHALL_CSWlibtoolrt = 1 - -CHECKPKG_OVERRIDES_CSWlibtool += surplus-dependency|CSWlibltdl7 -CHECKPKG_OVERRIDES_CSWlibtoolrt += surplus-dependency|CSWlibltdl3 -CHECKPKG_OVERRIDES_CSWlibtoolrt += surplus-dependency|CSWlibltdl7 - include gar/category.mk post-install-modulated: $(if $(PATCHFILES_POSTINSTALL_$(MODULATION)),patch-libtool) 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 Mar 9 00:43:18 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 08 Mar 2011 23:43:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[13696] csw/mgar/pkg/file/trunk Message-ID: Revision: 13696 http://gar.svn.sourceforge.net/gar/?rev=13696&view=rev Author: wahwah Date: 2011-03-08 23:43:18 +0000 (Tue, 08 Mar 2011) Log Message: ----------- gfind: Downgrade to 5.04 due to python library issues. Modified Paths: -------------- csw/mgar/pkg/file/trunk/Makefile csw/mgar/pkg/file/trunk/checksums Modified: csw/mgar/pkg/file/trunk/Makefile =================================================================== --- csw/mgar/pkg/file/trunk/Makefile 2011-03-08 21:27:29 UTC (rev 13695) +++ csw/mgar/pkg/file/trunk/Makefile 2011-03-08 23:43:18 UTC (rev 13696) @@ -1,7 +1,7 @@ # $Id$ NAME = file -VERSION = 5.05 +VERSION = 5.04 CATEGORIES = utils define BLURB @@ -20,7 +20,7 @@ # These flags are not understood by Sun Studio CONFIGURE_ARGS += --disable-warnings TEST_TARGET = check -PATCHFILES += 0001-Remove-surplus-flags-output-on-SPARC.patch +# PATCHFILES += 0001-Remove-surplus-flags-output-on-SPARC.patch NOISAEXEC = 1 Modified: csw/mgar/pkg/file/trunk/checksums =================================================================== --- csw/mgar/pkg/file/trunk/checksums 2011-03-08 21:27:29 UTC (rev 13695) +++ csw/mgar/pkg/file/trunk/checksums 2011-03-08 23:43:18 UTC (rev 13696) @@ -1 +1 @@ -0b429063710457be2bd17a18389cb018 file-5.05.tar.gz +accade81ff1cc774904b47c72c8aeea0 file-5.04.tar.gz 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 Mar 9 01:26:42 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 09 Mar 2011 00:26:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[13697] csw/mgar/pkg/file/trunk Message-ID: Revision: 13697 http://gar.svn.sourceforge.net/gar/?rev=13697&view=rev Author: wahwah Date: 2011-03-09 00:26:42 +0000 (Wed, 09 Mar 2011) Log Message: ----------- file: Adding a check for missing magic.so Modified Paths: -------------- csw/mgar/pkg/file/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/file/trunk/files/check_pkgroot.sh Modified: csw/mgar/pkg/file/trunk/Makefile =================================================================== --- csw/mgar/pkg/file/trunk/Makefile 2011-03-08 23:43:18 UTC (rev 13696) +++ csw/mgar/pkg/file/trunk/Makefile 2011-03-09 00:26:42 UTC (rev 13697) @@ -102,3 +102,7 @@ (cd $(DESTDIR) && \ gln -s ../bin/gfile $(DESTDIR)$(prefix)/gnu/file) @$(MAKECOOKIE) + +post-merge: + $(FILEDIR)/check_pkgroot.sh "$(PKGROOT)" + @$(MAKECOOKIE) Added: csw/mgar/pkg/file/trunk/files/check_pkgroot.sh =================================================================== --- csw/mgar/pkg/file/trunk/files/check_pkgroot.sh (rev 0) +++ csw/mgar/pkg/file/trunk/files/check_pkgroot.sh 2011-03-09 00:26:42 UTC (rev 13697) @@ -0,0 +1,15 @@ +#!/opt/csw/bin/bash +# $Id$ + +declare -r PKGROOT="$1" +if [[ -z "${PKGROOT}" ]] +then + echo "Please give an argument." + exit 1 +fi +set -u +set -e +set -x + +# This file was missing in file-5.05, and that broke py_libmagic. +test -f ${PKGROOT}/opt/csw/lib/python/site-packages/magic.so Property changes on: csw/mgar/pkg/file/trunk/files/check_pkgroot.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Id 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 Mar 9 02:20:36 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 09 Mar 2011 01:20:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[13698] csw/mgar/pkg/file/trunk Message-ID: Revision: 13698 http://gar.svn.sourceforge.net/gar/?rev=13698&view=rev Author: wahwah Date: 2011-03-09 01:20:36 +0000 (Wed, 09 Mar 2011) Log Message: ----------- file: Disabling the 64-bit build which breaks the Python library Modified Paths: -------------- csw/mgar/pkg/file/trunk/Makefile csw/mgar/pkg/file/trunk/checksums Modified: csw/mgar/pkg/file/trunk/Makefile =================================================================== --- csw/mgar/pkg/file/trunk/Makefile 2011-03-09 00:26:42 UTC (rev 13697) +++ csw/mgar/pkg/file/trunk/Makefile 2011-03-09 01:20:36 UTC (rev 13698) @@ -1,7 +1,7 @@ # $Id$ NAME = file -VERSION = 5.04 +VERSION = 5.05 CATEGORIES = utils define BLURB @@ -82,7 +82,7 @@ DISTUTILS_DEBUG = 1 export DISTUTILS_DEBUG -BUILD64 = 1 +# BUILD64 = 1 include gar/category.mk Modified: csw/mgar/pkg/file/trunk/checksums =================================================================== --- csw/mgar/pkg/file/trunk/checksums 2011-03-09 00:26:42 UTC (rev 13697) +++ csw/mgar/pkg/file/trunk/checksums 2011-03-09 01:20:36 UTC (rev 13698) @@ -1 +1 @@ -accade81ff1cc774904b47c72c8aeea0 file-5.04.tar.gz +0b429063710457be2bd17a18389cb018 file-5.05.tar.gz 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 Mar 9 02:22:05 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 09 Mar 2011 01:22:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[13699] csw/mgar/pkg/file/trunk Message-ID: Revision: 13699 http://gar.svn.sourceforge.net/gar/?rev=13699&view=rev Author: wahwah Date: 2011-03-09 01:22:05 +0000 (Wed, 09 Mar 2011) Log Message: ----------- file: Downgrade to 5.04 again. Modified Paths: -------------- csw/mgar/pkg/file/trunk/Makefile csw/mgar/pkg/file/trunk/checksums Modified: csw/mgar/pkg/file/trunk/Makefile =================================================================== --- csw/mgar/pkg/file/trunk/Makefile 2011-03-09 01:20:36 UTC (rev 13698) +++ csw/mgar/pkg/file/trunk/Makefile 2011-03-09 01:22:05 UTC (rev 13699) @@ -1,7 +1,7 @@ # $Id$ NAME = file -VERSION = 5.05 +VERSION = 5.04 CATEGORIES = utils define BLURB Modified: csw/mgar/pkg/file/trunk/checksums =================================================================== --- csw/mgar/pkg/file/trunk/checksums 2011-03-09 01:20:36 UTC (rev 13698) +++ csw/mgar/pkg/file/trunk/checksums 2011-03-09 01:22:05 UTC (rev 13699) @@ -1 +1 @@ -0b429063710457be2bd17a18389cb018 file-5.05.tar.gz +accade81ff1cc774904b47c72c8aeea0 file-5.04.tar.gz 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 Mar 9 03:17:14 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 09 Mar 2011 02:17:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[13700] csw/mgar/pkg/file/trunk/Makefile Message-ID: Revision: 13700 http://gar.svn.sourceforge.net/gar/?rev=13700&view=rev Author: wahwah Date: 2011-03-09 02:17:14 +0000 (Wed, 09 Mar 2011) Log Message: ----------- file: py_libmagic is not ARCH=all Modified Paths: -------------- csw/mgar/pkg/file/trunk/Makefile Modified: csw/mgar/pkg/file/trunk/Makefile =================================================================== --- csw/mgar/pkg/file/trunk/Makefile 2011-03-09 01:22:05 UTC (rev 13699) +++ csw/mgar/pkg/file/trunk/Makefile 2011-03-09 02:17:14 UTC (rev 13700) @@ -38,7 +38,8 @@ PKGFILES_CSWpy-libmagic += /opt/csw/lib/python.* SPKG_DESC_CSWpy-libmagic = Python extension for libmagic CATALOGNAME_CSWpy-libmagic = py_libmagic -ARCHALL_CSWpy-libmagic = 1 +# py-libmagic should have a .so object in it, so it's architecture-specific. +# ARCHALL_CSWpy-libmagic = 1 RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWpython RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWlibmagic1 CHECKPKG_OVERRIDES_CSWpy-libmagic += surplus-dependency|CSWlibmagic1 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 Mar 9 03:42:18 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 09 Mar 2011 02:42:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[13701] csw/mgar/pkg/file/trunk/Makefile Message-ID: Revision: 13701 http://gar.svn.sourceforge.net/gar/?rev=13701&view=rev Author: wahwah Date: 2011-03-09 02:42:18 +0000 (Wed, 09 Mar 2011) Log Message: ----------- file: Drop transitional package Modified Paths: -------------- csw/mgar/pkg/file/trunk/Makefile Modified: csw/mgar/pkg/file/trunk/Makefile =================================================================== --- csw/mgar/pkg/file/trunk/Makefile 2011-03-09 02:17:14 UTC (rev 13700) +++ csw/mgar/pkg/file/trunk/Makefile 2011-03-09 02:42:18 UTC (rev 13701) @@ -44,13 +44,6 @@ RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWlibmagic1 CHECKPKG_OVERRIDES_CSWpy-libmagic += surplus-dependency|CSWlibmagic1 -PACKAGES += CSWlibmagic -ARCHALL_CSWlibmagic = 1 -SPKG_DESC_CSWlibmagic = Empty transitional package -RUNTIME_DEP_PKGS_CSWlibmagic += CSWlibmagic1 -CHECKPKG_OVERRIDES_CSWlibmagic += surplus-dependency|CSWlibmagic1 -PKGFILES_CSWlibmagic = NONE - PACKAGES += CSWlibmagic-data CATALOGNAME_CSWlibmagic-data = libmagic_data SPKG_DESC_CSWlibmagic-data = Database for libmagic 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 Mar 9 04:15:20 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 09 Mar 2011 03:15:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[13702] csw/mgar/pkg/file/trunk/Makefile Message-ID: Revision: 13702 http://gar.svn.sourceforge.net/gar/?rev=13702&view=rev Author: wahwah Date: 2011-03-09 03:15:19 +0000 (Wed, 09 Mar 2011) Log Message: ----------- file: Enabling patches with RPATH Modified Paths: -------------- csw/mgar/pkg/file/trunk/Makefile Modified: csw/mgar/pkg/file/trunk/Makefile =================================================================== --- csw/mgar/pkg/file/trunk/Makefile 2011-03-09 02:42:18 UTC (rev 13701) +++ csw/mgar/pkg/file/trunk/Makefile 2011-03-09 03:15:19 UTC (rev 13702) @@ -20,6 +20,9 @@ # These flags are not understood by Sun Studio CONFIGURE_ARGS += --disable-warnings TEST_TARGET = check + +PATCHFILES += 0001-libtool-dir-used-for-linking.patch +PATCHFILES += 0002-CSW-runpath.patch # PATCHFILES += 0001-Remove-surplus-flags-output-on-SPARC.patch NOISAEXEC = 1 @@ -42,7 +45,6 @@ # ARCHALL_CSWpy-libmagic = 1 RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWpython RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWlibmagic1 -CHECKPKG_OVERRIDES_CSWpy-libmagic += surplus-dependency|CSWlibmagic1 PACKAGES += CSWlibmagic-data CATALOGNAME_CSWlibmagic-data = libmagic_data @@ -88,7 +90,7 @@ post-install-modulated: (cd $(WORKSRC)/python && \ - python setup.py install --root=$(DESTDIR) --prefix=$(prefix)) + $(BUILD_ENV) python setup.py install --root=$(DESTDIR) --prefix=$(prefix)) (cd $(DESTDIR) && \ mv $(DESTDIR)$(bindir)/file $(DESTDIR)$(bindir)/gfile && \ mv $(DESTDIR)$(mandir)/man1/file\.1 $(DESTDIR)$(mandir)/man1/gfile\.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 Wed Mar 9 04:47:43 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 09 Mar 2011 03:47:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[13703] csw/mgar/pkg/file/trunk/Makefile Message-ID: Revision: 13703 http://gar.svn.sourceforge.net/gar/?rev=13703&view=rev Author: wahwah Date: 2011-03-09 03:47:43 +0000 (Wed, 09 Mar 2011) Log Message: ----------- file: Correct dependencies of py_libmagic Modified Paths: -------------- csw/mgar/pkg/file/trunk/Makefile Modified: csw/mgar/pkg/file/trunk/Makefile =================================================================== --- csw/mgar/pkg/file/trunk/Makefile 2011-03-09 03:15:19 UTC (rev 13702) +++ csw/mgar/pkg/file/trunk/Makefile 2011-03-09 03:47:43 UTC (rev 13703) @@ -45,6 +45,8 @@ # ARCHALL_CSWpy-libmagic = 1 RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWpython RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWlibmagic1 +RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWlibpython2-6-1-0 +CHECKPKG_OVERRIDES_CSWpy-libmagic += surplus-dependency|CSWpython PACKAGES += CSWlibmagic-data CATALOGNAME_CSWlibmagic-data = libmagic_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 Wed Mar 9 04:54:34 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 09 Mar 2011 03:54:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[13704] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: Revision: 13704 http://gar.svn.sourceforge.net/gar/?rev=13704&view=rev Author: bdwalton Date: 2011-03-09 03:54:33 +0000 (Wed, 09 Mar 2011) Log Message: ----------- gettext/trunk: add additional legacy deps; drop duplicated PACKAGES entry for gettextlib0-18-1 Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2011-03-09 03:47:43 UTC (rev 13703) +++ csw/mgar/pkg/gettext/trunk/Makefile 2011-03-09 03:54:33 UTC (rev 13704) @@ -19,7 +19,6 @@ PACKAGES += CSWlibintl2 PACKAGES += CSWlibintl3 PACKAGES += CSWlibintl8 -PACKAGES += CSWlibgettextlib0-18-1 PACKAGES += CSWggettext-dev PACKAGES += CSWggettext-data PACKAGES += CSWggettextrt @@ -59,8 +58,12 @@ RUNTIME_DEP_PKGS_CSWggettext += CSWexpat RUNTIME_DEP_PKGS_CSWggettext += CSWiconv +RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-14-1 +RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-17 RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-18-1 RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextsrc0-18-1 +RUNTIME_DEP_PKGS_CSWggettext += CSWlibintl2 +RUNTIME_DEP_PKGS_CSWggettext += CSWlibintl3 RUNTIME_DEP_PKGS_CSWggettext += CSWlibintl8 RUNTIME_DEP_PKGS_CSWggettext += CSWlibxml2 RUNTIME_DEP_PKGS_CSWggettext += CSWncurses @@ -68,6 +71,7 @@ RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibasprintf0 RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextlib0-18-1 RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextpo0 +RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextsrc0-17 RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextsrc0-18-1 RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibintl8 RUNTIME_DEP_PKGS_CSWggettextrt += CSWlibasprintf0 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 Mar 9 11:17:26 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 09 Mar 2011 10:17:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[13705] csw/mgar/pkg/file/trunk Message-ID: Revision: 13705 http://gar.svn.sourceforge.net/gar/?rev=13705&view=rev Author: wahwah Date: 2011-03-09 10:17:26 +0000 (Wed, 09 Mar 2011) Log Message: ----------- file: Upgrade to 5.05, Python bindings use hardcoded library name The call to find_library was removed and replaced by the "libmagic.so.1" string. Modified Paths: -------------- csw/mgar/pkg/file/trunk/Makefile csw/mgar/pkg/file/trunk/checksums csw/mgar/pkg/file/trunk/files/check_pkgroot.sh Added Paths: ----------- csw/mgar/pkg/file/trunk/files/0002-Do-not-use-find_library-at-runtime.patch Modified: csw/mgar/pkg/file/trunk/Makefile =================================================================== --- csw/mgar/pkg/file/trunk/Makefile 2011-03-09 03:54:33 UTC (rev 13704) +++ csw/mgar/pkg/file/trunk/Makefile 2011-03-09 10:17:26 UTC (rev 13705) @@ -1,7 +1,7 @@ # $Id$ NAME = file -VERSION = 5.04 +VERSION = 5.05 CATEGORIES = utils define BLURB @@ -21,10 +21,14 @@ CONFIGURE_ARGS += --disable-warnings TEST_TARGET = check -PATCHFILES += 0001-libtool-dir-used-for-linking.patch -PATCHFILES += 0002-CSW-runpath.patch -# PATCHFILES += 0001-Remove-surplus-flags-output-on-SPARC.patch +# Patches specific to the 5.04 version: +# PATCHFILES += 0001-libtool-dir-used-for-linking.patch +# PATCHFILES += 0002-CSW-runpath.patch +# Patches specific to the 5.05 version: +PATCHFILES += 0001-Remove-surplus-flags-output-on-SPARC.patch +PATCHFILES += 0002-Do-not-use-find_library-at-runtime.patch + NOISAEXEC = 1 PACKAGES += CSWgfile @@ -41,12 +45,9 @@ PKGFILES_CSWpy-libmagic += /opt/csw/lib/python.* SPKG_DESC_CSWpy-libmagic = Python extension for libmagic CATALOGNAME_CSWpy-libmagic = py_libmagic -# py-libmagic should have a .so object in it, so it's architecture-specific. -# ARCHALL_CSWpy-libmagic = 1 +ARCHALL_CSWpy-libmagic = 1 RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWpython RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWlibmagic1 -RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWlibpython2-6-1-0 -CHECKPKG_OVERRIDES_CSWpy-libmagic += surplus-dependency|CSWpython PACKAGES += CSWlibmagic-data CATALOGNAME_CSWlibmagic-data = libmagic_data @@ -80,7 +81,7 @@ DISTUTILS_DEBUG = 1 export DISTUTILS_DEBUG -# BUILD64 = 1 +BUILD64 = 1 include gar/category.mk @@ -99,6 +100,11 @@ ginstall -d -m 755 $(DESTDIR)$(prefix)/gnu (cd $(DESTDIR) && \ gln -s ../bin/gfile $(DESTDIR)$(prefix)/gnu/file) + # Injecting a symlink pointing at libmagic.so.1 on the filesystem, so that + # checkpkg realizes that the dependency is necessary. + if [ -d $(DESTDIR)$(libdir)/python/site-packages ]; then \ + ln -s ../../libmagic.so.1 $(DESTDIR)$(libdir)/python/site-packages/need-libmagic; \ + fi @$(MAKECOOKIE) post-merge: Modified: csw/mgar/pkg/file/trunk/checksums =================================================================== --- csw/mgar/pkg/file/trunk/checksums 2011-03-09 03:54:33 UTC (rev 13704) +++ csw/mgar/pkg/file/trunk/checksums 2011-03-09 10:17:26 UTC (rev 13705) @@ -1 +1 @@ -accade81ff1cc774904b47c72c8aeea0 file-5.04.tar.gz +0b429063710457be2bd17a18389cb018 file-5.05.tar.gz Added: csw/mgar/pkg/file/trunk/files/0002-Do-not-use-find_library-at-runtime.patch =================================================================== --- csw/mgar/pkg/file/trunk/files/0002-Do-not-use-find_library-at-runtime.patch (rev 0) +++ csw/mgar/pkg/file/trunk/files/0002-Do-not-use-find_library-at-runtime.patch 2011-03-09 10:17:26 UTC (rev 13705) @@ -0,0 +1,35 @@ +From 4d7a3366cfa5a60d39b14677dca940b5720a9130 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 9 Mar 2011 10:27:30 +0100 +Subject: [PATCH] Do not use find_library at runtime + +--- + python/magic.py | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/python/magic.py b/python/magic.py +index 35a7182..7807ce2 100644 +--- a/python/magic.py ++++ b/python/magic.py +@@ -6,14 +6,16 @@ Python bindings for libmagic + import ctypes + + from ctypes import * +-from ctypes.util import find_library + + def _init(): + """ + Loads the shared library through ctypes and returns a library + L{ctypes.CDLL} instance + """ +- return ctypes.cdll.LoadLibrary(find_library('magic')) ++ # the find_library function depends on a compiler being installed at ++ # runtime, which would be unacceptable even if it worked (it doesn't). ++ # Removing the call to find_library and hardcoding the library name. ++ return ctypes.cdll.LoadLibrary('libmagic.so.1') + + _libraries = {} + _libraries['magic'] = _init() +-- +1.7.3.2 + Modified: csw/mgar/pkg/file/trunk/files/check_pkgroot.sh =================================================================== --- csw/mgar/pkg/file/trunk/files/check_pkgroot.sh 2011-03-09 03:54:33 UTC (rev 13704) +++ csw/mgar/pkg/file/trunk/files/check_pkgroot.sh 2011-03-09 10:17:26 UTC (rev 13705) @@ -11,5 +11,5 @@ set -e set -x -# This file was missing in file-5.05, and that broke py_libmagic. -test -f ${PKGROOT}/opt/csw/lib/python/site-packages/magic.so +# The 5.05 version has a pure Python rewrite of the Python bindings. +# test -f ${PKGROOT}/opt/csw/lib/python/site-packages/magic.so 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 Mar 9 12:06:33 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 09 Mar 2011 11:06:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[13706] csw/mgar/pkg/help2man/trunk Message-ID: Revision: 13706 http://gar.svn.sourceforge.net/gar/?rev=13706&view=rev Author: dmichelsen Date: 2011-03-09 11:06:33 +0000 (Wed, 09 Mar 2011) Log Message: ----------- help2man: Update to 1.39.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 2011-03-09 10:17:26 UTC (rev 13705) +++ csw/mgar/pkg/help2man/trunk/Makefile 2011-03-09 11:06:33 UTC (rev 13706) @@ -1,5 +1,5 @@ NAME = help2man -VERSION = 1.39.1 +VERSION = 1.39.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 2011-03-09 10:17:26 UTC (rev 13705) +++ csw/mgar/pkg/help2man/trunk/checksums 2011-03-09 11:06:33 UTC (rev 13706) @@ -1 +1 @@ -6f60412cf70129ab096577c13d4da4c7 help2man-1.39.1.tar.gz +36659da3ba7a9a51813e1c4848900a28 help2man-1.39.2.tar.gz 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 Mar 9 15:12:32 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 09 Mar 2011 14:12:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[13707] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: Revision: 13707 http://gar.svn.sourceforge.net/gar/?rev=13707&view=rev Author: bdwalton Date: 2011-03-09 14:12:32 +0000 (Wed, 09 Mar 2011) Log Message: ----------- gettext/trunk: override surplus deps on legacy libs; Mantis 4723 Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2011-03-09 11:06:33 UTC (rev 13706) +++ csw/mgar/pkg/gettext/trunk/Makefile 2011-03-09 14:12:32 UTC (rev 13707) @@ -165,6 +165,11 @@ CHECKPKG_OVERRIDES_CSWlibintl8 += surplus-dependency|CSWggettext-data CHECKPKG_OVERRIDES_CSWlibasprintf0 += surplus-dependency|CSWggettext-data +CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWlibintl2 +CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWlibintl3 +CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWlibgettextlib0-14-1 +CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWlibgettextlib0-17 + ARCHALL_CSWggettextrt = 1 ARCHALL_CSWggettext-data = 1 ARCHALL_CSWggettextdoc = 1 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 Mar 9 15:13:51 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 09 Mar 2011 14:13:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[13708] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: Revision: 13708 http://gar.svn.sourceforge.net/gar/?rev=13708&view=rev Author: bdwalton Date: 2011-03-09 14:13:51 +0000 (Wed, 09 Mar 2011) Log Message: ----------- gettext/trunk: override warnings from legacy .so files Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2011-03-09 14:12:32 UTC (rev 13707) +++ csw/mgar/pkg/gettext/trunk/Makefile 2011-03-09 14:13:51 UTC (rev 13708) @@ -155,7 +155,9 @@ CHECKPKG_OVERRIDES_CSWggettextrt += surplus-dependency|CSWlibintl3 CHECKPKG_OVERRIDES_CSWggettextrt += surplus-dependency|CSWlibasprintf0 CHECKPKG_OVERRIDES_CSWlibgettextpo0 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libgettextpo.so.0.4.0 +CHECKPKG_OVERRIDES_CSWlibgettextlib0-14-1 += soname-equals-filename|file=/opt/csw/lib/libgettextlib-0.14.1.so CHECKPKG_OVERRIDES_CSWlibgettextlib0-17 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libgettextlib-0.17.so +CHECKPKG_OVERRIDES_CSWlibgettextlib0-17 += soname-equals-filename|file=/opt/csw/lib/libgettextlib-0.17.so CHECKPKG_OVERRIDES_CSWlibgettextsrc0-17 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libgettextsrc-0.17.so CHECKPKG_OVERRIDES_CSWlibgettextpo0 += surplus-dependency|CSWggettext-data CHECKPKG_OVERRIDES_CSWlibgettextsrc0-18-1 += surplus-dependency|CSWggettext-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 Wed Mar 9 15:16:43 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 09 Mar 2011 14:16:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[13709] csw/mgar/pkg/gettext/trunk Message-ID: Revision: 13709 http://gar.svn.sourceforge.net/gar/?rev=13709&view=rev Author: bdwalton Date: 2011-03-09 14:16:43 +0000 (Wed, 09 Mar 2011) Log Message: ----------- gettext/trunk: override file collisions with gnulinks (simultaneous release pending) Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gettext/trunk/gnulinks.checkpkg.mk Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2011-03-09 14:13:51 UTC (rev 13708) +++ csw/mgar/pkg/gettext/trunk/Makefile 2011-03-09 14:16:43 UTC (rev 13709) @@ -144,6 +144,10 @@ PKGFILES_CSWggettextrt += /opt/csw/share/.*ggettextrt.* PKGFILES_CSWggettextdoc = $(PKGFILES_DOC) +# override all file collissions for now. release updated gnulinks with this +# update and then remove this file and include +include gnulinks.checkpkg.mk + CHECKPKG_OVERRIDES_CSWggettextdoc += missing-dependency|CSWperl CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWggettext-data CHECKPKG_OVERRIDES_CSWggettext += discouraged-path-in-pkgmap|/opt/csw/share/gettext/archive.git.tar.gz Added: csw/mgar/pkg/gettext/trunk/gnulinks.checkpkg.mk =================================================================== --- csw/mgar/pkg/gettext/trunk/gnulinks.checkpkg.mk (rev 0) +++ csw/mgar/pkg/gettext/trunk/gnulinks.checkpkg.mk 2011-03-09 14:16:43 UTC (rev 13709) @@ -0,0 +1,22 @@ +CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/msgunfmt|CSWggettext|CSWgnulinks +CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/msguniq|CSWggettext|CSWgnulinks +CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/ngettext|CSWggettext|CSWgnulinks +CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/gettextize|CSWggettext|CSWgnulinks +CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/msgmerge|CSWggettext|CSWgnulinks +CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/msggrep|CSWggettext|CSWgnulinks +CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/msgcomm|CSWggettext|CSWgnulinks +CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/msgen|CSWggettext|CSWgnulinks +CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/gettext|CSWggettext|CSWgnulinks +CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/msginit|CSWggettext|CSWgnulinks +CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/envsubst|CSWggettext|CSWgnulinks +CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/msgconv|CSWggettext|CSWgnulinks +CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/msgfmt|CSWggettext|CSWgnulinks +CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/msgcat|CSWggettext|CSWgnulinks +CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/msgattrib|CSWggettext|CSWgnulinks +CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/xgettext|CSWggettext|CSWgnulinks +CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/msgexec|CSWggettext|CSWgnulinks +CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/autopoint|CSWggettext|CSWgnulinks +CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/msgcmp|CSWggettext|CSWgnulinks +CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/gettext.sh|CSWggettext|CSWgnulinks +CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/msgfilter|CSWggettext|CSWgnulinks +CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/recode-sr-latin|CSWggettext|CSWgnulinks 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 Mar 9 16:57:34 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 09 Mar 2011 15:57:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[13710] csw/mgar/pkg Message-ID: Revision: 13710 http://gar.svn.sourceforge.net/gar/?rev=13710&view=rev Author: dmichelsen Date: 2011-03-09 15:57:34 +0000 (Wed, 09 Mar 2011) Log Message: ----------- readline43: Initial commit of library split Modified Paths: -------------- csw/mgar/pkg/readline43/trunk/Makefile csw/mgar/pkg/readline43/trunk/checksums Added Paths: ----------- csw/mgar/pkg/readline43/ Removed Paths: ------------- csw/mgar/pkg/readline43/trunk/files/patch-history.3.diff csw/mgar/pkg/readline43/trunk/legacy/ Modified: csw/mgar/pkg/readline43/trunk/Makefile =================================================================== --- csw/mgar/pkg/readline/trunk/Makefile 2011-03-09 03:54:33 UTC (rev 13704) +++ csw/mgar/pkg/readline43/trunk/Makefile 2011-03-09 15:57:34 UTC (rev 13710) @@ -1,10 +1,7 @@ NAME = readline -VERSION = 6.1 +VERSION = 4.3 CATEGORIES = lib -EXTRA_MODULATORS = VERSION -MODULATIONS_VERSION = 4.3 5.2 6.1 - DESCRIPTION = GNU readline define BLURB The Readline library provides a set of functions for use by applications @@ -16,20 +13,21 @@ endef MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(foreach V,$(MODULATIONS_VERSION),$(NAME)-$(V).tar.gz) +DISTFILES = $(NAME)-$(VERSION).tar.gz -PATCHFILES_isa-sparcv8-garversion-6.1 = patch-history.3.diff -PATCHFILES_isa-sparcv9-garversion-6.1 = patch-history.3.diff -PATCHFILES_isa-i386-garversion-6.1 = patch-history.3.diff -PATCHFILES_isa-amd64-garversion-6.1 = patch-history.3.diff +VENDOR_URL = http://tiswww.case.edu/php/chet/readline/rltop.html -RUNTIME_DEP_PKGS = CSWncurses +PACKAGES += CSWlibhistory4 +CATALOGNAME_CSWlibhistory4 = libhistory4 +SPKG_DESC_CSWlibhistory4 = GNU readline library, libhistory.so.4 +PKGFILES_CSWlibhistory4 = $(call pkgfiles_lib,libhistory.so.4) -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES += CSWlibreadline4 +CATALOGNAME_CSWlibreadline4 = libreadline4 +SPKG_DESC_CSWlibreadline4 = GNU readline library, libreadline4.so.4 +PKGFILES_CSWlibreadline4 = $(call pkgfiles_lib,libreadline.so.4) BUILD64 = 1 - NORUNPATH = 1 CONFIGURE_ARGS = $(DIRPATHS) @@ -37,26 +35,6 @@ TEST_TARGET = check -MERGE_SCRIPTS_isa-default-garversion-4.3 = copy-only -MERGE_DIRS_isa-default-garversion-4.3 = $(libdir) -MERGE_SCRIPTS_isa-default64-garversion-4.3 = copy-relocated-only -MERGE_DIRS_isa-default64-garversion-4.3 = $(libdir) +MERGE_DIRS_isa-extra = $(libdir) -MERGE_SCRIPTS_isa-default-garversion-5.2 = copy-only -MERGE_DIRS_isa-default-garversion-5.2 = $(libdir) -MERGE_SCRIPTS_isa-default64-garversion-5.2 = copy-relocated-only -MERGE_DIRS_isa-default64-garversion-5.2 = $(libdir) - -MERGE_SCRIPTS_isa-default-garversion-6.1 = copy-all -MERGE_SCRIPTS_isa-default64-garversion-6.1 = copy-relocated-only -MERGE_DIRS_isa-default64-garversion-6.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir) - -SPKG_SOURCEURL = http://tiswww.case.edu/php/chet/readline/rltop.html - include gar/category.mk - -post-install: - @chmod 555 $(DESTDIR)$(libdir)/libhistory.* - @chmod 555 $(DESTDIR)$(libdir)/libreadline.* - -LDFLAGS := $(filter-out -xarch=%,$(filter-out -m%,$(LDFLAGS))) -R$(libdir) -lncurses Modified: csw/mgar/pkg/readline43/trunk/checksums =================================================================== --- csw/mgar/pkg/readline/trunk/checksums 2011-03-09 03:54:33 UTC (rev 13704) +++ csw/mgar/pkg/readline43/trunk/checksums 2011-03-09 15:57:34 UTC (rev 13710) @@ -1,4 +1 @@ -8db909e6af79c3f5c266fad1972b4e41 patch-history.3.diff f86f7cb717ab321fe15f1bbcb058c11e readline-4.3.tar.gz -e39331f32ad14009b9ff49cc10c5e751 readline-5.2.tar.gz -fc2f7e714fe792db1ce6ddc4c9fb4ef3 readline-6.1.tar.gz Deleted: csw/mgar/pkg/readline43/trunk/files/patch-history.3.diff =================================================================== --- csw/mgar/pkg/readline/trunk/files/patch-history.3.diff 2011-03-09 03:54:33 UTC (rev 13704) +++ csw/mgar/pkg/readline43/trunk/files/patch-history.3.diff 2011-03-09 15:57:34 UTC (rev 13710) @@ -1,263 +0,0 @@ -diff -Naur readline-6.0.orig/doc/history.3 readline-6.0.patched/doc/history.3 ---- readline-6.0.orig/doc/history.3 2008-08-12 22:40:59.000000000 +0200 -+++ readline-6.0.patched/doc/history.3 2009-03-30 18:28:59.014167720 +0200 -@@ -8,7 +8,7 @@ - .\" - .\" Last Change: Thu Jul 31 08:46:08 EDT 2003 - .\" --.TH HISTORY 3 "2003 July 31" "GNU History 6.0" -+.TH HISTORY 3 "2003 July 31" "GNU History 5.0" - .\" - .\" File Name macro. This used to be `.PN', for Path Name, - .\" but Sun doesn't seem to like that very much. -@@ -18,17 +18,17 @@ - .. - .ds lp \fR\|(\fP - .ds rp \fR\|)\fP --.\" FnN return-value fun-name N arguments --.de Fn1 -+.\" FN return-value fun-name N arguments -+.de F1 - \fI\\$1\fP \fB\\$2\fP \\*(lp\fI\\$3\fP\\*(rp - .br - .. --.de Fn2 -+.de F2 - .if t \fI\\$1\fP \fB\\$2\fP \\*(lp\fI\\$3,\|\\$4\fP\\*(rp - .if n \fI\\$1\fP \fB\\$2\fP \\*(lp\fI\\$3, \\$4\fP\\*(rp - .br - .. --.de Fn3 -+.de F3 - .if t \fI\\$1\fP \fB\\$2\fP \\*(lp\fI\\$3,\|\\$4,\|\\$5\fP\|\\*(rp - .if n \fI\\$1\fP \fB\\$2\fP \\*(lp\fI\\$3, \\$4, \\$5\fP\\*(rp - .br -@@ -331,14 +331,14 @@ - the state of the History library when you want to use the history - functions in your program. - --.Fn1 void using_history void -+.F1 void using_history void - Begin a session in which the history functions might be used. This - initializes the interactive variables. - --.Fn1 "HISTORY_STATE *" history_get_history_state void -+.F1 "HISTORY_STATE *" history_get_history_state void - Return a structure describing the current state of the input history. - --.Fn1 void history_set_history_state "HISTORY_STATE *state" -+.F1 void history_set_history_state "HISTORY_STATE *state" - Set the state of the history list according to \fIstate\fP. - - .SS History List Management -@@ -346,43 +346,43 @@ - These functions manage individual entries on the history list, or set - parameters managing the list itself. - --.Fn1 void add_history "const char *string" -+.F1 void add_history "const char *string" - Place \fIstring\fP at the end of the history list. The associated data - field (if any) is set to \fBNULL\fP. - --.Fn1 void add_history_time "const char *string" -+.F1 void add_history_time "const char *string" - Change the time stamp associated with the most recent history entry to - \fIstring\fP. - --.Fn1 "HIST_ENTRY *" remove_history "int which" -+.F1 "HIST_ENTRY *" remove_history "int which" - Remove history entry at offset \fIwhich\fP from the history. The - removed element is returned so you can free the line, data, - and containing structure. - --.Fn1 "histdata_t" free_history_entry "HIST_ENTRY *histent" -+.F1 "histdata_t" free_history_entry "HIST_ENTRY *histent" - Free the history entry \fIhistent\fP and any history library private - data associated with it. Returns the application-specific data - so the caller can dispose of it. - --.Fn3 "HIST_ENTRY *" replace_history_entry "int which" "const char *line" "histdata_t data" -+.F3 "HIST_ENTRY *" replace_history_entry "int which" "const char *line" "histdata_t data" - Make the history entry at offset \fIwhich\fP have \fIline\fP and \fIdata\fP. - This returns the old entry so the caller can dispose of any - application-specific data. In the case - of an invalid \fIwhich\fP, a \fBNULL\fP pointer is returned. - --.Fn1 void clear_history "void" -+.F1 void clear_history "void" - Clear the history list by deleting all the entries. - --.Fn1 void stifle_history "int max" -+.F1 void stifle_history "int max" - Stifle the history list, remembering only the last \fImax\fP entries. - --.Fn1 int unstifle_history "void" -+.F1 int unstifle_history "void" - Stop stifling the history. This returns the previously-set - maximum number of history entries (as set by \fBstifle_history()\fP). - history was stifled. The value is positive if the history was - stifled, negative if it wasn't. - --.Fn1 int history_is_stifled "void" -+.F1 int history_is_stifled "void" - Returns non-zero if the history is stifled, zero if it is not. - - .SS Information About the History List -@@ -390,29 +390,29 @@ - These functions return information about the entire history list or - individual list entries. - --.Fn1 "HIST_ENTRY **" history_list "void" -+.F1 "HIST_ENTRY **" history_list "void" - Return a \fBNULL\fP terminated array of \fIHIST_ENTRY *\fP which is the - current input history. Element 0 of this list is the beginning of time. - If there is no history, return \fBNULL\fP. - --.Fn1 int where_history "void" -+.F1 int where_history "void" - Returns the offset of the current history element. - --.Fn1 "HIST_ENTRY *" current_history "void" -+.F1 "HIST_ENTRY *" current_history "void" - Return the history entry at the current position, as determined by - \fBwhere_history()\fP. If there is no entry there, return a \fBNULL\fP - pointer. - --.Fn1 "HIST_ENTRY *" history_get "int offset" -+.F1 "HIST_ENTRY *" history_get "int offset" - Return the history entry at position \fIoffset\fP, starting from - \fBhistory_base\fP. - If there is no entry there, or if \fIoffset\fP - is greater than the history length, return a \fBNULL\fP pointer. - --.Fn1 "time_t" history_get_time "HIST_ENTRY *" -+.F1 "time_t" history_get_time "HIST_ENTRY *" - Return the time stamp associated with the history entry passed as the argument. - --.Fn1 int history_total_bytes "void" -+.F1 int history_total_bytes "void" - Return the number of bytes that the primary history entries are using. - This function returns the sum of the lengths of all the lines in the - history. -@@ -422,18 +422,18 @@ - These functions allow the current index into the history list to be - set or changed. - --.Fn1 int history_set_pos "int pos" -+.F1 int history_set_pos "int pos" - Set the current history offset to \fIpos\fP, an absolute index - into the list. - Returns 1 on success, 0 if \fIpos\fP is less than zero or greater - than the number of history entries. - --.Fn1 "HIST_ENTRY *" previous_history "void" -+.F1 "HIST_ENTRY *" previous_history "void" - Back up the current history offset to the previous history entry, and - return a pointer to that entry. If there is no previous entry, return - a \fBNULL\fP pointer. - --.Fn1 "HIST_ENTRY *" next_history "void" -+.F1 "HIST_ENTRY *" next_history "void" - Move the current history offset forward to the next history entry, and - return the a pointer to that entry. If there is no next entry, return - a \fBNULL\fP pointer. -@@ -445,7 +445,7 @@ - from the current history position. The search may be \fIanchored\fP, - meaning that the string must match at the beginning of the history entry. - --.Fn2 int history_search "const char *string" "int direction" -+.F2 int history_search "const char *string" "int direction" - Search the history for \fIstring\fP, starting at the current history offset. - If \fIdirection\fP is less than 0, then the search is through - previous entries, otherwise through subsequent entries. -@@ -455,7 +455,7 @@ - \fIstring\fP was found. Otherwise, nothing is changed, and a -1 is - returned. - --.Fn2 int history_search_prefix "const char *string" "int direction" -+.F2 int history_search_prefix "const char *string" "int direction" - Search the history for \fIstring\fP, starting at the current history - offset. The search is anchored: matching lines must begin with - \fIstring\fP. If \fIdirection\fP is less than 0, then the search is -@@ -464,7 +464,7 @@ - current history index is set to that entry, and the return value is 0. - Otherwise, nothing is changed, and a -1 is returned. - --.Fn3 int history_search_pos "const char *string" "int direction" "int pos" -+.F3 int history_search_pos "const char *string" "int direction" "int pos" - Search for \fIstring\fP in the history list, starting at \fIpos\fP, an - absolute index into the list. If \fIdirection\fP is negative, the search - proceeds backward from \fIpos\fP, otherwise forward. Returns the absolute -@@ -474,12 +474,12 @@ - The History library can read the history from and write it to a file. - This section documents the functions for managing a history file. - --.Fn1 int read_history "const char *filename" -+.F1 int read_history "const char *filename" - Add the contents of \fIfilename\fP to the history list, a line at a time. - If \fIfilename\fP is \fBNULL\fP, then read from \fI~/.history\fP. - Returns 0 if successful, or \fBerrno\fP if not. - --.Fn3 int read_history_range "const char *filename" "int from" "int to" -+.F3 int read_history_range "const char *filename" "int from" "int to" - Read a range of lines from \fIfilename\fP, adding them to the history list. - Start reading at line \fIfrom\fP and end at \fIto\fP. - If \fIfrom\fP is zero, start at the beginning. If \fIto\fP is less than -@@ -487,19 +487,19 @@ - \fBNULL\fP, then read from \fI~/.history\fP. Returns 0 if successful, - or \fBerrno\fP if not. - --.Fn1 int write_history "const char *filename" -+.F1 int write_history "const char *filename" - Write the current history to \fIfilename\fP, overwriting \fIfilename\fP - if necessary. - If \fIfilename\fP is \fBNULL\fP, then write the history list to \fI~/.history\fP. - Returns 0 on success, or \fBerrno\fP on a read or write error. - - --.Fn2 int append_history "int nelements" "const char *filename" -+.F2 int append_history "int nelements" "const char *filename" - Append the last \fInelements\fP of the history list to \fIfilename\fP. - If \fIfilename\fP is \fBNULL\fP, then append to \fI~/.history\fP. - Returns 0 on success, or \fBerrno\fP on a read or write error. - --.Fn2 int history_truncate_file "const char *filename" "int nlines" -+.F2 int history_truncate_file "const char *filename" "int nlines" - Truncate the history file \fIfilename\fP, leaving only the last - \fInlines\fP lines. - If \fIfilename\fP is \fBNULL\fP, then \fI~/.history\fP is truncated. -@@ -509,7 +509,7 @@ - - These functions implement history expansion. - --.Fn2 int history_expand "char *string" "char **output" -+.F2 int history_expand "char *string" "char **output" - Expand \fIstring\fP, placing the result into \fIoutput\fP, a pointer - to a string. Returns: - .RS -@@ -534,7 +534,7 @@ - If an error ocurred in expansion, then \fIoutput\fP contains a descriptive - error message. - --.Fn3 "char *" get_history_event "const char *string" "int *cindex" "int qchar" -+.F3 "char *" get_history_event "const char *string" "int *cindex" "int qchar" - Returns the text of the history event beginning at \fIstring\fP + - \fI*cindex\fP. \fI*cindex\fP is modified to point to after the event - specifier. At function entry, \fIcindex\fP points to the index into -@@ -542,14 +542,14 @@ - is a character that is allowed to end the event specification in addition - to the ``normal'' terminating characters. - --.Fn1 "char **" history_tokenize "const char *string" -+.F1 "char **" history_tokenize "const char *string" - Return an array of tokens parsed out of \fIstring\fP, much as the - shell might. - The tokens are split on the characters in the - \fBhistory_word_delimiters\fP variable, - and shell quoting conventions are obeyed. - --.Fn3 "char *" history_arg_extract "int first" "int last" "const char *string" -+.F3 "char *" history_arg_extract "int first" "int last" "const char *string" - Extract a string segment consisting of the \fIfirst\fP through \fIlast\fP - arguments present in \fIstring\fP. Arguments are split using - \fBhistory_tokenize()\fP. 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 Mar 9 17:02:34 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 09 Mar 2011 16:02:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[13711] csw/mgar/pkg/readline43/tags/readline-6.0, REV=2009. 03.31/ Message-ID: Revision: 13711 http://gar.svn.sourceforge.net/gar/?rev=13711&view=rev Author: dmichelsen Date: 2011-03-09 16:02:33 +0000 (Wed, 09 Mar 2011) Log Message: ----------- readline43: Remove old tag Removed Paths: ------------- csw/mgar/pkg/readline43/tags/readline-6.0,REV=2009.03.31/ 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 Mar 9 18:02:37 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 09 Mar 2011 17:02:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[13712] csw/mgar/pkg/cpan/Cache-Memcached/trunk Message-ID: Revision: 13712 http://gar.svn.sourceforge.net/gar/?rev=13712&view=rev Author: bonivart Date: 2011-03-09 17:02:36 +0000 (Wed, 09 Mar 2011) Log Message: ----------- cpan/Cache-Memcached/trunk: Update to 1.29. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/Cache-Memcached/trunk/Makefile csw/mgar/pkg/cpan/Cache-Memcached/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Cache-Memcached/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Cache-Memcached/trunk/files/CSWpmcachememcached.depend csw/mgar/pkg/cpan/Cache-Memcached/trunk/files/CSWpmcachememcached.gspec csw/mgar/pkg/cpan/Cache-Memcached/trunk/files/CSWpmcachememcached.prototype Modified: csw/mgar/pkg/cpan/Cache-Memcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Cache-Memcached/trunk/Makefile 2011-03-09 16:02:33 UTC (rev 13711) +++ csw/mgar/pkg/cpan/Cache-Memcached/trunk/Makefile 2011-03-09 17:02:36 UTC (rev 13712) @@ -1,16 +1,24 @@ NAME = Cache-Memcached -VERSION = 1.18 +VERSION = 1.29 CATEGORIES = cpan -AUTHOR = BRADFITZ +AUTHOR = DORMANDO -DESCRIPTION = client library for memcached +DESCRIPTION = Client library for memcached define BLURB This is the Perl API for memcached, a distributed memory cache daemon. More information is available at: http://www.danga.com/memcached/ endef -DISTFILES = $(call admfiles,CSWpmcachememcached,depend prototype) +DISTFILES += COPYING -DEPENDS += cpan/String-CRC32 +PACKAGES = CSWpm-cache-memcached +CATALOGNAME_CSWpm-cache-memcached = pm_cache_memcached +SPKG_DESC_CSWpm-cache-memcached = $(DESCRIPTION) +OBSOLETES_CSWpm-cache-memcached = CSWpmcachememcached +CATALOGNAME_CSWpmcachememcached = pm_cachememcached +ARCHALL = 1 + +RUNTIME_DEP_PKGS += CSWpmstringcrc32 + include gar/category.mk Modified: csw/mgar/pkg/cpan/Cache-Memcached/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Cache-Memcached/trunk/checksums 2011-03-09 16:02:33 UTC (rev 13711) +++ csw/mgar/pkg/cpan/Cache-Memcached/trunk/checksums 2011-03-09 17:02:36 UTC (rev 13712) @@ -1,4 +1 @@ -9f98db2f1cfef744feac10a0fc02a1bd download/CSWpmcachememcached.gspec -8f931b46841629fe644018de4a32db3d download/CSWpmcachememcached.depend -452256d45468d800894e69f1ab5ccab3 download/CSWpmcachememcached.prototype -120d1766c94153339072d9c73f36fcb3 download/Cache-Memcached-1.18.tar.gz +d255a6b3937b77c5e9d0f3fffb5bcfbd Cache-Memcached-1.29.tar.gz Added: csw/mgar/pkg/cpan/Cache-Memcached/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Cache-Memcached/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Cache-Memcached/trunk/files/COPYING 2011-03-09 17:02:36 UTC (rev 13712) @@ -0,0 +1,5 @@ +This module is Copyright (c) 2003 Brad Fitzpatrick. +All rights reserved. + +You may distribute under the terms of either the GNU General Public +License or the Artistic License, as specified in the Perl README file. Deleted: csw/mgar/pkg/cpan/Cache-Memcached/trunk/files/CSWpmcachememcached.depend =================================================================== --- csw/mgar/pkg/cpan/Cache-Memcached/trunk/files/CSWpmcachememcached.depend 2011-03-09 16:02:33 UTC (rev 13711) +++ csw/mgar/pkg/cpan/Cache-Memcached/trunk/files/CSWpmcachememcached.depend 2011-03-09 17:02:36 UTC (rev 13712) @@ -1 +0,0 @@ -P CSWpmstringcrc32 pm_stringcrc32 - interface for cyclic redundency check generation Deleted: csw/mgar/pkg/cpan/Cache-Memcached/trunk/files/CSWpmcachememcached.gspec =================================================================== --- csw/mgar/pkg/cpan/Cache-Memcached/trunk/files/CSWpmcachememcached.gspec 2011-03-09 16:02:33 UTC (rev 13711) +++ csw/mgar/pkg/cpan/Cache-Memcached/trunk/files/CSWpmcachememcached.gspec 2011-03-09 17:02:36 UTC (rev 13712) @@ -1,10 +0,0 @@ -%var bitname pm_cachememcached -%var pkgname CSWpmcachememcached -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -This module is Copyright (c) 2003 Brad Fitzpatrick. -All rights reserved. - -You may distribute under the terms of either the GNU General Public -License or the Artistic License, as specified in the Perl README file Deleted: csw/mgar/pkg/cpan/Cache-Memcached/trunk/files/CSWpmcachememcached.prototype =================================================================== --- csw/mgar/pkg/cpan/Cache-Memcached/trunk/files/CSWpmcachememcached.prototype 2011-03-09 16:02:33 UTC (rev 13711) +++ csw/mgar/pkg/cpan/Cache-Memcached/trunk/files/CSWpmcachememcached.prototype 2011-03-09 17:02:36 UTC (rev 13712) @@ -1,15 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Cache 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Cache/Memcached 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Cache/Memcached/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Cache::Memcached.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/Cache 0755 root bin -f none /opt/csw/share/perl/csw/Cache/Memcached.pm 0444 root bin 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 Mar 9 18:14:35 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 09 Mar 2011 17:14:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[13713] csw/mgar/pkg/cpan/Pod-POM/trunk Message-ID: Revision: 13713 http://gar.svn.sourceforge.net/gar/?rev=13713&view=rev Author: bonivart Date: 2011-03-09 17:14:34 +0000 (Wed, 09 Mar 2011) Log Message: ----------- cpan/Pod-POM/trunk: Update to 0.27. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/Pod-POM/trunk/Makefile csw/mgar/pkg/cpan/Pod-POM/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Pod-POM/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Pod-POM/trunk/files/CSWpmpodpom.depend csw/mgar/pkg/cpan/Pod-POM/trunk/files/CSWpmpodpom.gspec csw/mgar/pkg/cpan/Pod-POM/trunk/files/htmlview.diff Modified: csw/mgar/pkg/cpan/Pod-POM/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Pod-POM/trunk/Makefile 2011-03-09 17:02:36 UTC (rev 13712) +++ csw/mgar/pkg/cpan/Pod-POM/trunk/Makefile 2011-03-09 17:14:34 UTC (rev 13713) @@ -1,7 +1,7 @@ NAME = Pod-POM -VERSION = 0.17 +VERSION = 0.27 CATEGORIES = cpan -AUTHOR = ABW +AUTHOR = ANDREWF DESCRIPTION = POD Object Model define BLURB @@ -15,12 +15,14 @@ form or another. endef -DISTFILES += CSWpmpodpom.gspec CSWpmpodpom.depend +DISTFILES += COPYING -#DEPENDS += cpan/Text-Diff +PACKAGES = CSWpm-pod-pom +CATALOGNAME_CSWpm-pod-pom = pm_pod_pom +SPKG_DESC_CSWpm-pod-pom = $(DESCRIPTION) +OBSOLETES_CSWpm-pod-pom = CSWpmpodpom +CATALOGNAME_CSWpmpodpom = pm_podpom -# The 'htmlview' function is currently broken (0.17) -# =for sections are being ignored! -PATCHFILES = htmlview.diff +ARCHALL = 1 include gar/category.mk Modified: csw/mgar/pkg/cpan/Pod-POM/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Pod-POM/trunk/checksums 2011-03-09 17:02:36 UTC (rev 13712) +++ csw/mgar/pkg/cpan/Pod-POM/trunk/checksums 2011-03-09 17:14:34 UTC (rev 13713) @@ -1,4 +1 @@ -83683599bfa169333ea5553583202e67 download/CSWpmpodpom.gspec -a7864fa64516a9f4bb7f7c45129739a1 download/CSWpmpodpom.depend -6ec8b345c9d43d45cc404c9416443d76 download/Pod-POM-0.17.tar.gz -39f0360d125e12b95264dde14c31bf88 download/htmlview.diff +8cff81ea5d86cf4b0377f655ce759bdd Pod-POM-0.27.tar.gz Added: csw/mgar/pkg/cpan/Pod-POM/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Pod-POM/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Pod-POM/trunk/files/COPYING 2011-03-09 17:14:34 UTC (rev 13713) @@ -0,0 +1,5 @@ +Copyright (C) 2000-2002 Andy Wardley. All Rights Reserved. +Copyright (C) 2009-2010 Andrew Ford. All Rights Reserved. + +This is free software; you can redistribute it and/or modify it under +the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Pod-POM/trunk/files/CSWpmpodpom.depend =================================================================== --- csw/mgar/pkg/cpan/Pod-POM/trunk/files/CSWpmpodpom.depend 2011-03-09 17:02:36 UTC (rev 13712) +++ csw/mgar/pkg/cpan/Pod-POM/trunk/files/CSWpmpodpom.depend 2011-03-09 17:14:34 UTC (rev 13713) @@ -1 +0,0 @@ -P CSWpmtextdiff pm_textdiff - perform diffs on files and record sets Deleted: csw/mgar/pkg/cpan/Pod-POM/trunk/files/CSWpmpodpom.gspec =================================================================== --- csw/mgar/pkg/cpan/Pod-POM/trunk/files/CSWpmpodpom.gspec 2011-03-09 17:02:36 UTC (rev 13712) +++ csw/mgar/pkg/cpan/Pod-POM/trunk/files/CSWpmpodpom.gspec 2011-03-09 17:14:34 UTC (rev 13713) @@ -1,9 +0,0 @@ -%var bitname pm_podpom -%var pkgname CSWpmpodpom -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (C) 2000-2002 Andy Wardley. All Rights Reserved. - -This module is free software; you can redistribute it and/or -modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Pod-POM/trunk/files/htmlview.diff =================================================================== --- csw/mgar/pkg/cpan/Pod-POM/trunk/files/htmlview.diff 2011-03-09 17:02:36 UTC (rev 13712) +++ csw/mgar/pkg/cpan/Pod-POM/trunk/files/htmlview.diff 2011-03-09 17:14:34 UTC (rev 13713) @@ -1,27 +0,0 @@ -diff -Nru --minimal --speed-large-files Pod-POM-0.17.orig/t/htmlview.t Pod-POM-0.17/t/htmlview.t ---- Pod-POM-0.17.orig/t/htmlview.t 2003-10-16 15:01:19.084170000 -0700 -+++ Pod-POM-0.17/t/htmlview.t 2003-10-16 15:01:36.589343000 -0700 -@@ -164,11 +164,6 @@ - - =head1 TESTING FOR AND BEGIN - --=for html
--

--blah blah --

-- - intermediate text - - =begin html -@@ -280,11 +275,6 @@ -

Destructor method

-

TESTING FOR AND BEGIN

- --
--

--blah blah --

-- -

intermediate text

-

- HTML 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 Mar 9 18:30:10 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 09 Mar 2011 17:30:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[13714] csw/mgar/pkg/cpan/Config-IniFiles/trunk Message-ID: Revision: 13714 http://gar.svn.sourceforge.net/gar/?rev=13714&view=rev Author: bonivart Date: 2011-03-09 17:30:10 +0000 (Wed, 09 Mar 2011) Log Message: ----------- cpan/Config-IniFiles/trunk: Update to 2.66. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/Config-IniFiles/trunk/Makefile csw/mgar/pkg/cpan/Config-IniFiles/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Config-IniFiles/trunk/files/COPYING csw/mgar/pkg/cpan/Config-IniFiles/trunk/files/CSWpm-config-inifiles.cswreleasenotes Removed Paths: ------------- csw/mgar/pkg/cpan/Config-IniFiles/trunk/files/CSWpmcfginifls.depend csw/mgar/pkg/cpan/Config-IniFiles/trunk/files/CSWpmcfginifls.gspec csw/mgar/pkg/cpan/Config-IniFiles/trunk/files/CSWpmcfginifls.prototype Modified: csw/mgar/pkg/cpan/Config-IniFiles/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Config-IniFiles/trunk/Makefile 2011-03-09 17:14:34 UTC (rev 13713) +++ csw/mgar/pkg/cpan/Config-IniFiles/trunk/Makefile 2011-03-09 17:30:10 UTC (rev 13714) @@ -1,15 +1,27 @@ NAME = Config-IniFiles -VERSION = 2.38 +VERSION = 2.66 CATEGORIES = cpan -AUTHOR = WADG +AUTHOR = SHLOMIF -DESCRIPTION = a module for reading .ini-style configuration files. +DESCRIPTION = A module for reading .ini-style configuration files. define BLURB Config::IniFiles provides a way to have readable configuration files outside your Perl script. Configurations can be imported (inherited, stacked,...), sections can be grouped, and settings can be accessed from a tied hash. endef -DISTFILES += $(call admfiles,CSWpmcfginifls,depend prototype) +DISTFILES += COPYING +DISTFILES += CSWpm-config-inifiles.cswreleasenotes +PACKAGES = CSWpm-config-inifiles +CATALOGNAME_CSWpm-config-inifiles = pm_config_inifiles +SPKG_DESC_CSWpm-config-inifiles = $(DESCRIPTION) +OBSOLETES_CSWpm-config-inifiles = CSWpmcfginifls +CATALOGNAME_CSWpmcfginifls = pm_configinifiles + +ARCHALL = 1 + +CHECKPKG_OVERRIDES_CSWpm-config-inifiles += file-with-bad-content|/usr/share|root/opt/csw/share/perl/csw/Config/IniFiles.pm +CHECKPKG_OVERRIDES_CSWpm-config-inifiles += file-with-bad-content|/usr/share|root/opt/csw/share/man/man3/Config::IniFiles.3perl + include gar/category.mk Modified: csw/mgar/pkg/cpan/Config-IniFiles/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Config-IniFiles/trunk/checksums 2011-03-09 17:14:34 UTC (rev 13713) +++ csw/mgar/pkg/cpan/Config-IniFiles/trunk/checksums 2011-03-09 17:30:10 UTC (rev 13714) @@ -1,4 +1 @@ -f498253007748d242a225893aa353623 download/CSWpmcfginifls.gspec -6e0d583c86d7f74b43769810714242aa download/CSWpmcfginifls.depend -9f6ddfabd67c5c072dfb6f3dd9b41396 download/CSWpmcfginifls.prototype -17e39e4244ede0061939dcb80ab6294e download/Config-IniFiles-2.38.tar.gz +b03be17e0e2b4257f97808384ebdbeb9 Config-IniFiles-2.66.tar.gz Added: csw/mgar/pkg/cpan/Config-IniFiles/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Config-IniFiles/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Config-IniFiles/trunk/files/COPYING 2011-03-09 17:30:10 UTC (rev 13714) @@ -0,0 +1,2 @@ +This program is free software; you can redistribute it and/or +modify it under the same terms as Perl itself. Added: csw/mgar/pkg/cpan/Config-IniFiles/trunk/files/CSWpm-config-inifiles.cswreleasenotes =================================================================== --- csw/mgar/pkg/cpan/Config-IniFiles/trunk/files/CSWpm-config-inifiles.cswreleasenotes (rev 0) +++ csw/mgar/pkg/cpan/Config-IniFiles/trunk/files/CSWpm-config-inifiles.cswreleasenotes 2011-03-09 17:30:10 UTC (rev 13714) @@ -0,0 +1 @@ +The two /usr/share references are both in the docs. Deleted: csw/mgar/pkg/cpan/Config-IniFiles/trunk/files/CSWpmcfginifls.depend =================================================================== Deleted: csw/mgar/pkg/cpan/Config-IniFiles/trunk/files/CSWpmcfginifls.gspec =================================================================== --- csw/mgar/pkg/cpan/Config-IniFiles/trunk/files/CSWpmcfginifls.gspec 2011-03-09 17:14:34 UTC (rev 13713) +++ csw/mgar/pkg/cpan/Config-IniFiles/trunk/files/CSWpmcfginifls.gspec 2011-03-09 17:30:10 UTC (rev 13714) @@ -1,4 +0,0 @@ -%var bitname pm_configinifiles -%var pkgname CSWpmcfginifls -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec Deleted: csw/mgar/pkg/cpan/Config-IniFiles/trunk/files/CSWpmcfginifls.prototype =================================================================== --- csw/mgar/pkg/cpan/Config-IniFiles/trunk/files/CSWpmcfginifls.prototype 2011-03-09 17:14:34 UTC (rev 13713) +++ csw/mgar/pkg/cpan/Config-IniFiles/trunk/files/CSWpmcfginifls.prototype 2011-03-09 17:30:10 UTC (rev 13714) @@ -1,15 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Config 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Config/IniFiles 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Config/IniFiles/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Config::IniFiles.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/Config 0755 root bin -f none /opt/csw/share/perl/csw/Config/IniFiles.pm 0555 root bin 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 Mar 9 18:43:38 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 09 Mar 2011 17:43:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[13715] csw/mgar/pkg/cpan/CGI-Application/trunk Message-ID: Revision: 13715 http://gar.svn.sourceforge.net/gar/?rev=13715&view=rev Author: bonivart Date: 2011-03-09 17:43:38 +0000 (Wed, 09 Mar 2011) Log Message: ----------- cpan/CGI-Application/trunk: Update to 4.31. Rename. Modified Paths: -------------- csw/mgar/pkg/cpan/CGI-Application/trunk/Makefile csw/mgar/pkg/cpan/CGI-Application/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/CGI-Application/trunk/files/CSWpmcgiapp.depend csw/mgar/pkg/cpan/CGI-Application/trunk/files/CSWpmcgiapp.gspec csw/mgar/pkg/cpan/CGI-Application/trunk/files/CSWpmcgiapp.prototype Modified: csw/mgar/pkg/cpan/CGI-Application/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/CGI-Application/trunk/Makefile 2011-03-09 17:30:10 UTC (rev 13714) +++ csw/mgar/pkg/cpan/CGI-Application/trunk/Makefile 2011-03-09 17:43:38 UTC (rev 13715) @@ -1,5 +1,5 @@ NAME = CGI-Application -VERSION = 4.06 +VERSION = 4.31 CATEGORIES = cpan AUTHOR = MARKSTOS @@ -11,8 +11,16 @@ document, easier to write, and easier to evolve. endef -DISTFILES += $(call admfiles,CSWpmcgiapp,depend prototype) +LICENSE = ARTISTIC -DEPENDS += cpan/HTML-Template +PACKAGES = CSWpm-cgi-application +CATALOGNAME_CSWpm-cgi-application = pm_cgi_application +SPKG_DESC_CSWpm-cgi-application = $(DESCRIPTION) +OBSOLETES_CSWpm-cgi-application = CSWpmcgiapp +CATALOGNAME_CSWpmcgiapp = pm_cgiapp +ARCHALL = 1 + +RUNTIME_DEP_PKGS += CSWpmhtmltmpl + include gar/category.mk Modified: csw/mgar/pkg/cpan/CGI-Application/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/CGI-Application/trunk/checksums 2011-03-09 17:30:10 UTC (rev 13714) +++ csw/mgar/pkg/cpan/CGI-Application/trunk/checksums 2011-03-09 17:43:38 UTC (rev 13715) @@ -1,4 +1 @@ -55723b1dc95e75842978cb467944bbe0 download/CSWpmcgiapp.gspec -bc180a2b96d07803c6828b73294f24c9 download/CSWpmcgiapp.depend -f7965c56e453c8fcafba4db2cf9d3a9f download/CSWpmcgiapp.prototype -1bdba93d7eae2253caf016c1c0f95d1c download/CGI-Application-4.06.tar.gz +502cb5785a291ed65869eb663eb01999 CGI-Application-4.31.tar.gz Deleted: csw/mgar/pkg/cpan/CGI-Application/trunk/files/CSWpmcgiapp.depend =================================================================== --- csw/mgar/pkg/cpan/CGI-Application/trunk/files/CSWpmcgiapp.depend 2011-03-09 17:30:10 UTC (rev 13714) +++ csw/mgar/pkg/cpan/CGI-Application/trunk/files/CSWpmcgiapp.depend 2011-03-09 17:43:38 UTC (rev 13715) @@ -1 +0,0 @@ -P CSWpmhtmltmpl pm_htmltemplate - Perl module to use HTML Templates from CGI scripts Deleted: csw/mgar/pkg/cpan/CGI-Application/trunk/files/CSWpmcgiapp.gspec =================================================================== --- csw/mgar/pkg/cpan/CGI-Application/trunk/files/CSWpmcgiapp.gspec 2011-03-09 17:30:10 UTC (rev 13714) +++ csw/mgar/pkg/cpan/CGI-Application/trunk/files/CSWpmcgiapp.gspec 2011-03-09 17:43:38 UTC (rev 13715) @@ -1,5 +0,0 @@ -%var bitname pm_cgiapp -%var pkgname CSWpmcgiapp -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright url file://%{WORKSRC}/ARTISTIC Deleted: csw/mgar/pkg/cpan/CGI-Application/trunk/files/CSWpmcgiapp.prototype =================================================================== --- csw/mgar/pkg/cpan/CGI-Application/trunk/files/CSWpmcgiapp.prototype 2011-03-09 17:30:10 UTC (rev 13714) +++ csw/mgar/pkg/cpan/CGI-Application/trunk/files/CSWpmcgiapp.prototype 2011-03-09 17:43:38 UTC (rev 13715) @@ -1,18 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/CGI 0755 ? ? -d none /opt/csw/lib/perl/csw/auto/CGI/Application 0755 ? ? -f none /opt/csw/lib/perl/csw/auto/CGI/Application/.packlist 0644 ? ? -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/CGI::Application.3perl 0444 ? ? -f none /opt/csw/share/man/man3/CGI::Application::Mailform.3perl 0444 ? ? -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/CGI 0755 root bin -d none /opt/csw/share/perl/csw/CGI/Application 0755 ? ? -f none /opt/csw/share/perl/csw/CGI/Application.pm 0444 ? ? -f none /opt/csw/share/perl/csw/CGI/Application/Mailform.pm 0444 ? ? 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 Mar 9 22:52:30 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 09 Mar 2011 21:52:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[13716] csw/mgar/pkg/cpan/JSON/trunk/Makefile Message-ID: Revision: 13716 http://gar.svn.sourceforge.net/gar/?rev=13716&view=rev Author: bonivart Date: 2011-03-09 21:52:30 +0000 (Wed, 09 Mar 2011) Log Message: ----------- cpan/JSON/trunk: Change stub name to pm_json_stub Modified Paths: -------------- csw/mgar/pkg/cpan/JSON/trunk/Makefile Modified: csw/mgar/pkg/cpan/JSON/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/JSON/trunk/Makefile 2011-03-09 17:43:38 UTC (rev 13715) +++ csw/mgar/pkg/cpan/JSON/trunk/Makefile 2011-03-09 21:52:30 UTC (rev 13716) @@ -15,6 +15,6 @@ SPKG_DESC_CSWpm-json = $(DESCRIPTION) ARCHALL = 1 OBSOLETES_CSWpm-json = CSWpmjson -CATALOGNAME_CSWpmjson = pm_json2 +CATALOGNAME_CSWpmjson = pm_json_stub include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Mar 9 22:55:12 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 09 Mar 2011 21:55:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[13717] csw/mgar/pkg/cpan/DBI/trunk/Makefile Message-ID: Revision: 13717 http://gar.svn.sourceforge.net/gar/?rev=13717&view=rev Author: bonivart Date: 2011-03-09 21:55:12 +0000 (Wed, 09 Mar 2011) Log Message: ----------- cpan/DBI/trunk: Change stub name to pm_dbi_stub Modified Paths: -------------- csw/mgar/pkg/cpan/DBI/trunk/Makefile Modified: csw/mgar/pkg/cpan/DBI/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBI/trunk/Makefile 2011-03-09 21:52:30 UTC (rev 13716) +++ csw/mgar/pkg/cpan/DBI/trunk/Makefile 2011-03-09 21:55:12 UTC (rev 13717) @@ -18,7 +18,7 @@ CATALOGNAME = pm_dbi SPKG_DESC_CSWpm-dbi = $(DESCRIPTION) OBSOLETES_CSWpm-dbi = CSWpmdbi -CATALOGNAME_CSWpmdbi = pm_dbi2 +CATALOGNAME_CSWpmdbi = pm_dbi_stub CHECKPKG_OVERRIDES_CSWpm-dbi += file-with-bad-content|/usr/local|root/opt/csw/lib/perl/csw/DBD/File.pm CHECKPKG_OVERRIDES_CSWpm-dbi += file-with-bad-content|/usr/local|root/opt/csw/lib/perl/csw/DBI/ProfileDumper/Apache.pm 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 Mar 9 23:04:18 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 09 Mar 2011 22:04:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[13718] csw/mgar/pkg/cpan/perl-ldap/trunk/Makefile Message-ID: Revision: 13718 http://gar.svn.sourceforge.net/gar/?rev=13718&view=rev Author: bonivart Date: 2011-03-09 22:04:17 +0000 (Wed, 09 Mar 2011) Log Message: ----------- cpan/perl-ldap/trunk: Change stub name to pm_ldap_stub Modified Paths: -------------- csw/mgar/pkg/cpan/perl-ldap/trunk/Makefile Modified: csw/mgar/pkg/cpan/perl-ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/perl-ldap/trunk/Makefile 2011-03-09 21:55:12 UTC (rev 13717) +++ csw/mgar/pkg/cpan/perl-ldap/trunk/Makefile 2011-03-09 22:04:17 UTC (rev 13718) @@ -18,7 +18,7 @@ SPKG_DESC_CSWpm-ldap = $(DESCRIPTION) ARCHALL = 1 OBSOLETES_CSWpm-ldap = CSWpmldap -CATALOGNAME_CSWpmldap = pm_ldap2 +CATALOGNAME_CSWpmldap = pm_ldap_stub # Harmless /usr/local references CHECKPKG_OVERRIDES_CSWpm-ldap += file-with-bad-content 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 Mar 9 23:07:49 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 09 Mar 2011 22:07:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[13719] csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile Message-ID: Revision: 13719 http://gar.svn.sourceforge.net/gar/?rev=13719&view=rev Author: bonivart Date: 2011-03-09 22:07:49 +0000 (Wed, 09 Mar 2011) Log Message: ----------- cpan/GSSAPI/trunk: Change stub name to pm_gssapi_stub Modified Paths: -------------- csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile Modified: csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile 2011-03-09 22:04:17 UTC (rev 13718) +++ csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile 2011-03-09 22:07:49 UTC (rev 13719) @@ -14,7 +14,7 @@ CATALOGNAME = pm_gssapi SPKG_DESC_CSWpm-gssapi = $(DESCRIPTION) OBSOLETES_CSWpm-gssapi = CSWpmgssapi -CATALOGNAME_CSWpmgssapi = pm_gssapi2 +CATALOGNAME_CSWpmgssapi = pm_gssapi_stub RUNTIME_DEP_PKGS = CSWkrb5lib 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 Mar 9 23:41:16 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 09 Mar 2011 22:41:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[13720] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 13720 http://gar.svn.sourceforge.net/gar/?rev=13720&view=rev Author: bonivart Date: 2011-03-09 22:41:16 +0000 (Wed, 09 Mar 2011) Log Message: ----------- pkgutil: 2.4 beta 1 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2011-03-09 22:07:49 UTC (rev 13719) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2011-03-09 22:41:16 UTC (rev 13720) @@ -2,7 +2,7 @@ # svn co -r 9999 https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 gar NAME = pkgutil -VERSION = 2.3 +VERSION = 2.4b1 GARVERSION = $(VERSION) CATEGORIES = utils @@ -18,7 +18,7 @@ COMMON_PKG_DEPENDS = #MASTER_SITES = $(SF_MIRRORS) -MASTER_SITES = http://sourceforge.net/projects/pkgutil/files/pkgutil/2.3/ +MASTER_SITES = http://sourceforge.net/projects/pkgutil/files/pkgutil/2.4/ DISTFILES = $(NAME)-$(VERSION).zip DISTFILES += $(call admfiles,CSWpkgutil,prototype preremove postinstall) @@ -62,9 +62,6 @@ ARCHALL_CSWpkgutilplus = 1 -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).zip - CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2011-03-09 22:07:49 UTC (rev 13719) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2011-03-09 22:41:16 UTC (rev 13720) @@ -1,8 +1,8 @@ a16c6f81bc537d6172fd65d8da1aeecc CSWpkgutil.gspec -2ce2761890775e7f658ed8233fda0148 CSWpkgutil.postinstall +27c7b032074b150935681e921b7b5774 CSWpkgutil.postinstall 9f8c677877f3c86c41dc3955c9c36ea0 CSWpkgutil.preremove ce3d565aaf32be17716a9869087dec5c CSWpkgutil.prototype b5fffa0be100ddbb7262ce3a0a4e3bb7 build_sun_catalog.py 7ad27336f90e73da3254a61d91025ee5 cswcatalog 3a6b789b3d5e05f41d2363dd26a92acf opencsw.py -9c643c7b65ce4a241b523f360324c8f2 pkgutil-2.3.zip +f31fdba65b6b38d3f6c9fd728ebee72b pkgutil-2.4b1.zip Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall 2011-03-09 22:07:49 UTC (rev 13719) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall 2011-03-09 22:41:16 UTC (rev 13720) @@ -22,7 +22,7 @@ fi if [ ! -f "$VAR2/admin" ]; then - echo "Copying sample admin to /var/opt/csw/pkgutil." + echo "Copying sample admin from /opt/csw/var/pkgutil to /var/opt/csw/pkgutil." cp -p $VAR1/admin.CSW $VAR2/admin else echo "/var/opt/csw/pkutil/admin already exists, will not copy admin.CSW to it." 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 Mar 10 04:22:38 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 10 Mar 2011 03:22:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[13721] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 13721 http://gar.svn.sourceforge.net/gar/?rev=13721&view=rev Author: bdwalton Date: 2011-03-10 03:22:38 +0000 (Thu, 10 Mar 2011) Log Message: ----------- coreutils/trunk: override default path to allow using system touch until gtouch not borked Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2011-03-09 22:41:16 UTC (rev 13720) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2011-03-10 03:22:38 UTC (rev 13721) @@ -59,7 +59,7 @@ include gar/category.mk -PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH) +PATH := ~/bin:/opt/csw/gnu:/opt/csw/bin:$(PATH) post-install-modulated: @echo Cleaning up install directory... This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Thu Mar 10 12:34:19 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Thu, 10 Mar 2011 11:34:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[13722] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 13722 http://gar.svn.sourceforge.net/gar/?rev=13722&view=rev Author: phipsy Date: 2011-03-10 11:34:18 +0000 (Thu, 10 Mar 2011) Log Message: ----------- Updated puppet to 2.6.6 Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums Added Paths: ----------- csw/mgar/pkg/puppet/trunk/files/pkgutil.rb Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2011-03-10 03:22:38 UTC (rev 13721) +++ csw/mgar/pkg/puppet/trunk/Makefile 2011-03-10 11:34:18 UTC (rev 13722) @@ -7,7 +7,7 @@ # [1] http://garylaw.net/packages/puppet-build.sh NAME = puppet -VERSION = 2.6.4 +VERSION = 2.6.6 CATEGORIES = apps define BLURB @@ -26,6 +26,9 @@ DISTFILES += cswpuppetmasterd DISTFILES += cswusergroup DISTFILES += CSWpuppet.postinstall +# pkgutil.rb is from https://github.com/gw42/puppet/blob/tickets%2Fmaster%2F4258-dev/lib/puppet/provider/package/pkgutil.rb +# Dom Cleal of RedHat has advised this is a good working version +DISTFILES += pkgutil.rb SPKG_SOURCEURL = http://puppetlabs.com/ INITSMF += $(sysconfdir)/init\.d/cswpuppetd @@ -53,16 +56,18 @@ ARCHALL = 1 -sysconfdir = /etc$(prefix) -localstatedir = /var$(prefix) +sysconfdir = /etc$(prefix) +localstatedir = /var$(prefix) +rubysitelibdir = $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = INSTALL_SCRIPTS = puppet -PATCHFILES = 0001-pkgutil-support.patch -PATCHFILES += 0002-Using-the-single-option-of-pkgutil.patch +# Not required. As soon as I've confirmed the downloaded version works well, I'll cut this fromt he Makefile. +# PATCHFILES = 0001-pkgutil-support.patch +# PATCHFILES += 0002-Using-the-single-option-of-pkgutil.patch PATCHFILES += 0003-Use-opt-csw-share-puppet-modules-as-default.patch CHECKPKG_OVERRIDES_CSWpuppet += surplus-dependency|CSWfacter @@ -92,6 +97,7 @@ --bindir=$(bindir) \ --sbindir=$(sbindir) \ --full + ginstall -m 755 $(FILEDIR)/pkgutil.rb $(DESTDIR)$(rubysitelibdir)/puppet/provider/package cd $(DESTDIR)$(mandir)/man8 && gunzip * (cd $(WORKSRC)/examples/etc/puppet && \ for f in *; do \ Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2011-03-10 03:22:38 UTC (rev 13721) +++ csw/mgar/pkg/puppet/trunk/checksums 2011-03-10 11:34:18 UTC (rev 13722) @@ -1,2 +1,3 @@ c0b86f40c8000dae2f0f7f2f91579c2a puppet-2.6.4.tar.gz 645543a18050f1d991796d865c53f9a4 puppet-2.6.5.tar.gz +58315e94ff00aedc4a19177877c3e865 puppet-2.6.6.tar.gz Added: csw/mgar/pkg/puppet/trunk/files/pkgutil.rb =================================================================== --- csw/mgar/pkg/puppet/trunk/files/pkgutil.rb (rev 0) +++ csw/mgar/pkg/puppet/trunk/files/pkgutil.rb 2011-03-10 11:34:18 UTC (rev 13722) @@ -0,0 +1,127 @@ +# Packaging using Peter Bonivart's pkgutil program. +Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun do + desc "Package management using Peter Bonivart's ``pkgutil`` command on Solaris." + pkguti = "pkgutil" + if FileTest.executable?("/opt/csw/bin/pkgutil") + pkguti = "/opt/csw/bin/pkgutil" + end + + confine :operatingsystem => :solaris + + commands :pkguti => pkguti + + def self.extended(mod) + unless command(:pkguti) != "pkgutil" + raise Puppet::Error, + "The pkgutil command is missing; pkgutil packaging unavailable" + end + + unless FileTest.exists?("/var/opt/csw/pkgutil/admin") + Puppet.notice "It is highly recommended you create '/var/opt/csw/pkgutil/admin'." + Puppet.notice "See /var/opt/csw/pkgutil" + end + end + + def self.instances(hash = {}) + pkglist(hash).collect do |bhash| + bhash.delete(:avail) + new(bhash) + end + end + + # Turn our pkgutil -c listing into a bunch of hashes. + # Supports :justme => packagename, which uses the optimised --single arg + def self.pkglist(hash) + command = ["-c"] + + if hash[:justme] + # The --single option speeds up the execution, because it queries + # the package managament system for one package only. + command << "--single" + command << hash[:justme] + end + + output = pkguti command + + list = output.split("\n").collect do |line| + next if line =~ /^#/ + next if line =~ /installed\s+catalog/ # header of package list + next if line =~ /^Checking integrity / # use_gpg + next if line =~ /^gpg: / # gpg verification + next if line =~ /^=+> / # catalog fetch + next if line =~ /\d+:\d+:\d+ URL:/ # wget without -q + + pkgsplit(line, hash[:justme]) + end.reject { |h| h.nil? } + + if hash[:justme] + # Ensure we picked up the package line, not any pkgutil noise. + list.reject! { |h| h[:name] != hash[:justme] } + return list[-1] + else + list.reject! { |h| h[:ensure] == :absent } + return list + end + + end + + # Split the different lines into hashes. + def self.pkgsplit(line, justme) + if line == "Not in catalog" + Puppet.warning "Package not in pkgutil catalog: %s" % justme + return nil + elsif line =~ /\s*(\S+)\s+(\S+)\s+(.*)/ + hash = {} + hash[:name] = $1 + hash[:ensure] = if $2 == "notinst" + :absent + else + $2 + end + hash[:avail] = $3 + + if justme + hash[:name] = justme + end + + if hash[:avail] =~ /^SAME\s*$/ + hash[:avail] = hash[:ensure] + end + + # Use the name method, so it works with subclasses. + hash[:provider] = self.name + + return hash + else + Puppet.warning "Cannot match %s" % line + return nil + end + end + + def install + pkguti "-y", "-i", @resource[:name] + end + + # Retrieve the version from the current package file. + def latest + hash = self.class.pkglist(:justme => @resource[:name]) + hash[:avail] if hash + end + + def query + if hash = self.class.pkglist(:justme => @resource[:name]) + hash + else + {:ensure => :absent} + end + end + + def update + pkguti "-y", "-u", @resource[:name] + end + + def uninstall + pkguti "-y", "-r", @resource[:name] + end +end + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Thu Mar 10 14:05:40 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Thu, 10 Mar 2011 13:05:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[13723] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 13723 http://gar.svn.sourceforge.net/gar/?rev=13723&view=rev Author: phipsy Date: 2011-03-10 13:05:39 +0000 (Thu, 10 Mar 2011) Log Message: ----------- Additional patch to puppet to cater for issue 6324 Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/puppet/trunk/files/0004-patch-to-smf-provider-6324.patch Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2011-03-10 11:34:18 UTC (rev 13722) +++ csw/mgar/pkg/puppet/trunk/Makefile 2011-03-10 13:05:39 UTC (rev 13723) @@ -68,7 +68,9 @@ # Not required. As soon as I've confirmed the downloaded version works well, I'll cut this fromt he Makefile. # PATCHFILES = 0001-pkgutil-support.patch # PATCHFILES += 0002-Using-the-single-option-of-pkgutil.patch -PATCHFILES += 0003-Use-opt-csw-share-puppet-modules-as-default.patch +PATCHFILES = 0003-Use-opt-csw-share-puppet-modules-as-default.patch +# https://projects.puppetlabs.com/issues/6324 +PATCHFILES += 0004-patch-to-smf-provider-6324.patch CHECKPKG_OVERRIDES_CSWpuppet += surplus-dependency|CSWfacter CHECKPKG_OVERRIDES_CSWpuppet += missing-dependency|CSWpython Added: csw/mgar/pkg/puppet/trunk/files/0004-patch-to-smf-provider-6324.patch =================================================================== --- csw/mgar/pkg/puppet/trunk/files/0004-patch-to-smf-provider-6324.patch (rev 0) +++ csw/mgar/pkg/puppet/trunk/files/0004-patch-to-smf-provider-6324.patch 2011-03-10 13:05:39 UTC (rev 13723) @@ -0,0 +1,14 @@ +--- a/lib/puppet/provider/service/smf.rb ++++ b/lib/puppet/provider/service/smf.rb +@@ -54,10 +54,10 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do + def startcmd + self.setupservice + case self.status +- when :stopped +- [command(:adm), :enable, @resource[:name]] + when :maintenance + [command(:adm), :clear, @resource[:name]] ++ else ++ [command(:adm), :enable, @resource[:name]] + end + end 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 Mar 10 14:47:38 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 10 Mar 2011 13:47:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[13724] csw/mgar/pkg/readline43/trunk/Makefile Message-ID: Revision: 13724 http://gar.svn.sourceforge.net/gar/?rev=13724&view=rev Author: dmichelsen Date: 2011-03-10 13:47:38 +0000 (Thu, 10 Mar 2011) Log Message: ----------- readline43: Fix typo Modified Paths: -------------- csw/mgar/pkg/readline43/trunk/Makefile Modified: csw/mgar/pkg/readline43/trunk/Makefile =================================================================== --- csw/mgar/pkg/readline43/trunk/Makefile 2011-03-10 13:05:39 UTC (rev 13723) +++ csw/mgar/pkg/readline43/trunk/Makefile 2011-03-10 13:47:38 UTC (rev 13724) @@ -24,7 +24,7 @@ PACKAGES += CSWlibreadline4 CATALOGNAME_CSWlibreadline4 = libreadline4 -SPKG_DESC_CSWlibreadline4 = GNU readline library, libreadline4.so.4 +SPKG_DESC_CSWlibreadline4 = GNU readline library, libreadline.so.4 PKGFILES_CSWlibreadline4 = $(call pkgfiles_lib,libreadline.so.4) BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 10 14:49:15 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 10 Mar 2011 13:49:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[13725] csw/mgar/pkg/readline Message-ID: Revision: 13725 http://gar.svn.sourceforge.net/gar/?rev=13725&view=rev Author: dmichelsen Date: 2011-03-10 13:49:14 +0000 (Thu, 10 Mar 2011) Log Message: ----------- readline: General relayout and splitting Modified Paths: -------------- csw/mgar/pkg/readline/trunk/Makefile csw/mgar/pkg/readline/trunk/checksums Added Paths: ----------- csw/mgar/pkg/readline/tags/legacy/ Removed Paths: ------------- csw/mgar/pkg/readline/trunk/legacy/ Modified: csw/mgar/pkg/readline/trunk/Makefile =================================================================== --- csw/mgar/pkg/readline/trunk/Makefile 2011-03-10 13:47:38 UTC (rev 13724) +++ csw/mgar/pkg/readline/trunk/Makefile 2011-03-10 13:49:14 UTC (rev 13725) @@ -1,10 +1,7 @@ NAME = readline -VERSION = 6.1 +VERSION = 6.2 CATEGORIES = lib -EXTRA_MODULATORS = VERSION -MODULATIONS_VERSION = 4.3 5.2 6.1 - DESCRIPTION = GNU readline define BLURB The Readline library provides a set of functions for use by applications @@ -16,20 +13,47 @@ endef MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(foreach V,$(MODULATIONS_VERSION),$(NAME)-$(V).tar.gz) +DISTFILES = $(NAME)-$(VERSION).tar.gz +PATCHFILES += patch-history.3.diff -PATCHFILES_isa-sparcv8-garversion-6.1 = patch-history.3.diff -PATCHFILES_isa-sparcv9-garversion-6.1 = patch-history.3.diff -PATCHFILES_isa-i386-garversion-6.1 = patch-history.3.diff -PATCHFILES_isa-amd64-garversion-6.1 = patch-history.3.diff +VENDOR_URL = http://tiswww.case.edu/php/chet/readline/rltop.html -RUNTIME_DEP_PKGS = CSWncurses +# From pkg/readline43 +FOREIGN_PACKAGES += CSWlibhistory4 +OBSOLETES_CSWlibhistory4 = CSWreadline +FOREIGN_PACKAGES += CSWlibreadline4 +OBSOLETES_CSWlibhreadline4 = CSWreadline -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +# From pkg/readline52 +FOREIGN_PACKAGES += CSWlibhistory5 +OBSOLETES_CSWlibhistory5 = CSWreadline +FOREIGN_PACKAGES += CSWlibreadline5 +OBSOLETES_CSWlibhreadline5 = CSWreadline +PACKAGES += CSWlibhistory6 +CATALOGNAME_CSWlibhistory6 = libhistory6 +SPKG_DESC_CSWlibhistory6 = GNU readline library, libhistory.so.6 +PKGFILES_CSWlibhistory6 = $(call pkgfiles_lib,libhistory.so.6) +# This dependency is not really necessary, just because we unconditionally add +# "-lncurses" to LDFLAGS as this does not happen automatically. +RUNTIME_DEP_PKGS_CSWlibhistory6 += CSWncurses +OBSOLETES_CSWlibhistory6 = CSWreadline + +PACKAGES += CSWlibreadline6 +CATALOGNAME_CSWlibreadline6 = libreadline6 +SPKG_DESC_CSWlibreadline6 = GNU readline library, libreadline.so.6 +PKGFILES_CSWlibreadline6 = $(call pkgfiles_lib,libreadline.so.6) +RUNTIME_DEP_PKGS_CSWlibreadline6 += CSWncurses +OBSOLETES_CSWlibhreadline6 = CSWreadline + +PACKAGES += CSWlibreadline-dev +CATALOGNAME_CSWlibreadline-dev = libreadline_dev +SPKG_DESC_CSWlibreadline-dev = GNU readline development files +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibreadline-dev += CSWlibhistory6 +RUNTIME_DEP_PKGS_CSWlibreadline-dev += CSWlibreadline6 + BUILD64 = 1 - NORUNPATH = 1 CONFIGURE_ARGS = $(DIRPATHS) @@ -37,26 +61,11 @@ TEST_TARGET = check -MERGE_SCRIPTS_isa-default-garversion-4.3 = copy-only -MERGE_DIRS_isa-default-garversion-4.3 = $(libdir) -MERGE_SCRIPTS_isa-default64-garversion-4.3 = copy-relocated-only -MERGE_DIRS_isa-default64-garversion-4.3 = $(libdir) - -MERGE_SCRIPTS_isa-default-garversion-5.2 = copy-only -MERGE_DIRS_isa-default-garversion-5.2 = $(libdir) -MERGE_SCRIPTS_isa-default64-garversion-5.2 = copy-relocated-only -MERGE_DIRS_isa-default64-garversion-5.2 = $(libdir) - -MERGE_SCRIPTS_isa-default-garversion-6.1 = copy-all -MERGE_SCRIPTS_isa-default64-garversion-6.1 = copy-relocated-only -MERGE_DIRS_isa-default64-garversion-6.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir) - -SPKG_SOURCEURL = http://tiswww.case.edu/php/chet/readline/rltop.html - include gar/category.mk -post-install: - @chmod 555 $(DESTDIR)$(libdir)/libhistory.* - @chmod 555 $(DESTDIR)$(libdir)/libreadline.* +post-install-modulated: + perl -pi -e 's,/usr/local/lib,$(libdir),' \ + $(DESTDIR)/opt/csw/share/readline/rl-fgets.c + @$(MAKECOOKIE) LDFLAGS := $(filter-out -xarch=%,$(filter-out -m%,$(LDFLAGS))) -R$(libdir) -lncurses Modified: csw/mgar/pkg/readline/trunk/checksums =================================================================== --- csw/mgar/pkg/readline/trunk/checksums 2011-03-10 13:47:38 UTC (rev 13724) +++ csw/mgar/pkg/readline/trunk/checksums 2011-03-10 13:49:14 UTC (rev 13725) @@ -1,4 +1 @@ -8db909e6af79c3f5c266fad1972b4e41 patch-history.3.diff -f86f7cb717ab321fe15f1bbcb058c11e readline-4.3.tar.gz -e39331f32ad14009b9ff49cc10c5e751 readline-5.2.tar.gz -fc2f7e714fe792db1ce6ddc4c9fb4ef3 readline-6.1.tar.gz +67948acb2ca081f23359d0256e9a271c readline-6.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 Thu Mar 10 14:56:18 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 10 Mar 2011 13:56:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[13726] csw/mgar/pkg Message-ID: Revision: 13726 http://gar.svn.sourceforge.net/gar/?rev=13726&view=rev Author: dmichelsen Date: 2011-03-10 13:56:18 +0000 (Thu, 10 Mar 2011) Log Message: ----------- readline52: General relayout and splitting Modified Paths: -------------- csw/mgar/pkg/readline52/trunk/checksums Added Paths: ----------- csw/mgar/pkg/readline52/ csw/mgar/pkg/readline52/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/readline52/trunk/Makefile Deleted: csw/mgar/pkg/readline52/trunk/Makefile =================================================================== --- csw/mgar/pkg/readline43/trunk/Makefile 2011-03-10 03:22:38 UTC (rev 13721) +++ csw/mgar/pkg/readline52/trunk/Makefile 2011-03-10 13:56:18 UTC (rev 13726) @@ -1,40 +0,0 @@ -NAME = readline -VERSION = 4.3 -CATEGORIES = lib - -DESCRIPTION = GNU readline -define BLURB - The Readline library provides a set of functions for use by applications - that allow users to edit command lines as they are typed in. Both - Emacs and vi editing modes are available. The Readline library includes - additional functions to maintain a list of previously-entered command - lines, to recall and perhaps reedit those lines, and perform csh-like - history expansion on previous commands. -endef - -MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.gz - -VENDOR_URL = http://tiswww.case.edu/php/chet/readline/rltop.html - -PACKAGES += CSWlibhistory4 -CATALOGNAME_CSWlibhistory4 = libhistory4 -SPKG_DESC_CSWlibhistory4 = GNU readline library, libhistory.so.4 -PKGFILES_CSWlibhistory4 = $(call pkgfiles_lib,libhistory.so.4) - -PACKAGES += CSWlibreadline4 -CATALOGNAME_CSWlibreadline4 = libreadline4 -SPKG_DESC_CSWlibreadline4 = GNU readline library, libreadline4.so.4 -PKGFILES_CSWlibreadline4 = $(call pkgfiles_lib,libreadline.so.4) - -BUILD64 = 1 -NORUNPATH = 1 - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-curses - -TEST_TARGET = check - -MERGE_DIRS_isa-extra = $(libdir) - -include gar/category.mk Copied: csw/mgar/pkg/readline52/trunk/Makefile (from rev 13724, csw/mgar/pkg/readline43/trunk/Makefile) =================================================================== --- csw/mgar/pkg/readline52/trunk/Makefile (rev 0) +++ csw/mgar/pkg/readline52/trunk/Makefile 2011-03-10 13:56:18 UTC (rev 13726) @@ -0,0 +1,46 @@ +NAME = readline +VERSION = 5.2 +CATEGORIES = lib + +DESCRIPTION = GNU readline +define BLURB + The Readline library provides a set of functions for use by applications + that allow users to edit command lines as they are typed in. Both + Emacs and vi editing modes are available. The Readline library includes + additional functions to maintain a list of previously-entered command + lines, to recall and perhaps reedit those lines, and perform csh-like + history expansion on previous commands. +endef + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(NAME)-$(VERSION).tar.gz + +VENDOR_URL = http://tiswww.case.edu/php/chet/readline/rltop.html + +PACKAGES += CSWlibhistory5 +CATALOGNAME_CSWlibhistory5 = libhistory5 +SPKG_DESC_CSWlibhistory5 = GNU readline library, libhistory.so.5 +PKGFILES_CSWlibhistory5 = $(call pkgfiles_lib,libhistory.so.5) +# This dependency is not really necessary, just because we unconditionally add +# "-lncurses" to LDFLAGS as this does not happen automatically. +RUNTIME_DEP_PKGS_CSWlibhistory5 += CSWncurses + +PACKAGES += CSWlibreadline5 +CATALOGNAME_CSWlibreadline5 = libreadline5 +SPKG_DESC_CSWlibreadline5 = GNU readline library, libreadline.so.5 +PKGFILES_CSWlibreadline5 = $(call pkgfiles_lib,libreadline.so.5) +RUNTIME_DEP_PKGS_CSWlibreadline5 += CSWncurses + +BUILD64 = 1 +NORUNPATH = 1 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-curses + +TEST_TARGET = check + +MERGE_DIRS_isa-extra = $(libdir) + +include gar/category.mk + +LDFLAGS := $(filter-out -xarch=%,$(filter-out -m%,$(LDFLAGS))) -R$(libdir) -lncurses Modified: csw/mgar/pkg/readline52/trunk/checksums =================================================================== --- csw/mgar/pkg/readline43/trunk/checksums 2011-03-10 03:22:38 UTC (rev 13721) +++ csw/mgar/pkg/readline52/trunk/checksums 2011-03-10 13:56:18 UTC (rev 13726) @@ -1 +1 @@ -f86f7cb717ab321fe15f1bbcb058c11e readline-4.3.tar.gz +e39331f32ad14009b9ff49cc10c5e751 readline-5.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 Thu Mar 10 15:01:27 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 10 Mar 2011 14:01:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[13727] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 13727 http://gar.svn.sourceforge.net/gar/?rev=13727&view=rev Author: dmichelsen Date: 2011-03-10 14:01:27 +0000 (Thu, 10 Mar 2011) Log Message: ----------- mGAR v2: Take out -norunpath, -xnorunpath Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2011-03-10 13:56:18 UTC (rev 13726) +++ csw/mgar/gar/v2/gar.conf.mk 2011-03-10 14:01:27 UTC (rev 13727) @@ -493,14 +493,14 @@ GCC3_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS) GCC4_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS) - SOS11_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) -xnorunpath - SOS12_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) -xnorunpath - SOS12U1_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) -xnorunpath + SOS11_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) + SOS12_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) + SOS12U1_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) GCC3_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS) GCC4_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS) - SOS11_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) -norunpath - SOS12_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) -norunpath -SOS12U1_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) -norunpath + SOS11_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) + SOS12_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) +SOS12U1_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) GCC3_AS_FLAGS ?= $(EXTRA_GCC3_AS_FLAGS) $(EXTRA_GCC_AS_FLAGS) $(EXTRA_AS_FLAGS) GCC4_AS_FLAGS ?= $(EXTRA_GCC4_AS_FLAGS) $(EXTRA_GCC_AS_FLAGS) $(EXTRA_AS_FLAGS) SOS11_AS_FLAGS ?= $(EXTRA_SOS11_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS) @@ -508,19 +508,19 @@ 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) -norunpath -xnorunpath - 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 + 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) GCC3_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_FFLAGS) $(EXTRA_GCC_FFLAGS) $(EXTRA_FFLAGS) GCC4_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_FFLAGS) $(EXTRA_GCC_FFLAGS) $(EXTRA_FFLAGS) - SOS11_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS) -norunpath - SOS12_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS) -norunpath - SOS12U1_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS) -norunpath + SOS11_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS) + SOS12_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS) + SOS12U1_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS) GCC3_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_FCFLAGS) $(EXTRA_GCC_FCFLAGS) $(EXTRA_FCFLAGS) GCC4_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_FCFLAGS) $(EXTRA_GCC_FCFLAGS) $(EXTRA_FCFLAGS) - SOS11_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS) -norunpath - SOS12_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS) -norunpath - SOS12U1_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS) -norunpath + SOS11_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS) + SOS12_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS) + SOS12U1_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS) # 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 dmichelsen at users.sourceforge.net Thu Mar 10 15:28:59 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 10 Mar 2011 14:28:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[13728] csw/mgar/pkg/readline/trunk/Makefile Message-ID: Revision: 13728 http://gar.svn.sourceforge.net/gar/?rev=13728&view=rev Author: dmichelsen Date: 2011-03-10 14:28:59 +0000 (Thu, 10 Mar 2011) Log Message: ----------- readline: Fix typo Modified Paths: -------------- csw/mgar/pkg/readline/trunk/Makefile Modified: csw/mgar/pkg/readline/trunk/Makefile =================================================================== --- csw/mgar/pkg/readline/trunk/Makefile 2011-03-10 14:01:27 UTC (rev 13727) +++ csw/mgar/pkg/readline/trunk/Makefile 2011-03-10 14:28:59 UTC (rev 13728) @@ -22,13 +22,13 @@ FOREIGN_PACKAGES += CSWlibhistory4 OBSOLETES_CSWlibhistory4 = CSWreadline FOREIGN_PACKAGES += CSWlibreadline4 -OBSOLETES_CSWlibhreadline4 = CSWreadline +OBSOLETES_CSWlibreadline4 = CSWreadline # From pkg/readline52 FOREIGN_PACKAGES += CSWlibhistory5 OBSOLETES_CSWlibhistory5 = CSWreadline FOREIGN_PACKAGES += CSWlibreadline5 -OBSOLETES_CSWlibhreadline5 = CSWreadline +OBSOLETES_CSWlibreadline5 = CSWreadline PACKAGES += CSWlibhistory6 CATALOGNAME_CSWlibhistory6 = libhistory6 @@ -44,7 +44,7 @@ SPKG_DESC_CSWlibreadline6 = GNU readline library, libreadline.so.6 PKGFILES_CSWlibreadline6 = $(call pkgfiles_lib,libreadline.so.6) RUNTIME_DEP_PKGS_CSWlibreadline6 += CSWncurses -OBSOLETES_CSWlibhreadline6 = CSWreadline +OBSOLETES_CSWlibreadline6 = CSWreadline PACKAGES += CSWlibreadline-dev CATALOGNAME_CSWlibreadline-dev = libreadline_dev 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 Mar 10 17:09:07 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 10 Mar 2011 16:09:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[13729] csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile Message-ID: Revision: 13729 http://gar.svn.sourceforge.net/gar/?rev=13729&view=rev Author: bonivart Date: 2011-03-10 16:09:06 +0000 (Thu, 10 Mar 2011) Log Message: ----------- cpan/HTML-Parser/trunk: Fix dep Modified Paths: -------------- csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile Modified: csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile 2011-03-10 14:28:59 UTC (rev 13728) +++ csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile 2011-03-10 16:09:06 UTC (rev 13729) @@ -19,10 +19,8 @@ OBSOLETES_CSWpm-html-parser = CSWpmhtmlparser CATALOGNAME_CSWpmhtmlparser = pm_htmlparser -RUNTIME_DEP_PKGS = CSWpm-html-tagset +RUNTIME_DEP_PKGS = CSWpmhtmltagset -CHECKPKG_OVERRIDES_CSWpm-html-parser += unidentified-dependency|CSWpm-html-tagset - CONFIGURE_ARGS = -n include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Mar 10 17:21:09 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 10 Mar 2011 16:21:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[13730] csw/mgar/pkg/cpan/HTML-Tagset/trunk/Makefile Message-ID: Revision: 13730 http://gar.svn.sourceforge.net/gar/?rev=13730&view=rev Author: bonivart Date: 2011-03-10 16:21:09 +0000 (Thu, 10 Mar 2011) Log Message: ----------- cpan/HTML-Tagset/trunk: Rename Modified Paths: -------------- csw/mgar/pkg/cpan/HTML-Tagset/trunk/Makefile Modified: csw/mgar/pkg/cpan/HTML-Tagset/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/HTML-Tagset/trunk/Makefile 2011-03-10 16:09:06 UTC (rev 13729) +++ csw/mgar/pkg/cpan/HTML-Tagset/trunk/Makefile 2011-03-10 16:21:09 UTC (rev 13730) @@ -11,8 +11,11 @@ DISTFILES = COPYING -PACKAGES = CSWpmhtmltagset -CATALOGNAME = pm_htmltagset +PACKAGES = CSWpm-html-tagset +CATALOGNAME = pm_html_tagset +SPKG_DESC_CSWpm-html-tagset = $(DESCRIPTION) +OBSOLETES_CSWpm-html-tagset = CSWpmhtmltagset +CATALOGNAME_CSWpmhtmltagset = pm_htmltagset # CONFIGURE_ARGS = -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 Thu Mar 10 17:31:39 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 10 Mar 2011 16:31:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[13731] csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile Message-ID: Revision: 13731 http://gar.svn.sourceforge.net/gar/?rev=13731&view=rev Author: bonivart Date: 2011-03-10 16:31:38 +0000 (Thu, 10 Mar 2011) Log Message: ----------- cpan/HTML-Parser/trunk: Reverse dep fix, rebuilt pm_html_tagset instead Modified Paths: -------------- csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile Modified: csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile 2011-03-10 16:21:09 UTC (rev 13730) +++ csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile 2011-03-10 16:31:38 UTC (rev 13731) @@ -19,8 +19,10 @@ OBSOLETES_CSWpm-html-parser = CSWpmhtmlparser CATALOGNAME_CSWpmhtmlparser = pm_htmlparser -RUNTIME_DEP_PKGS = CSWpmhtmltagset +RUNTIME_DEP_PKGS = CSWpm-html-tagset +CHECKPKG_OVERRIDES_CSWpm-html-parser += unidentified-dependency|CSWpm-html-tagset + CONFIGURE_ARGS = -n include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Thu Mar 10 17:36:15 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Thu, 10 Mar 2011 16:36:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[13732] csw/mgar/pkg/puppet/trunk/files/cswpuppetd Message-ID: Revision: 13732 http://gar.svn.sourceforge.net/gar/?rev=13732&view=rev Author: phipsy Date: 2011-03-10 16:36:15 +0000 (Thu, 10 Mar 2011) Log Message: ----------- Removed getprop values from cswpuppetd Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/files/cswpuppetd Modified: csw/mgar/pkg/puppet/trunk/files/cswpuppetd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2011-03-10 16:31:38 UTC (rev 13731) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2011-03-10 16:36:15 UTC (rev 13732) @@ -32,9 +32,9 @@ start_puppetd() { cd / - confdir=`getprop puppet/confdir` - vardir=`getprop puppet/vardir` - ssldir=`getprop puppet/ssldir` + #confdir=`getprop puppet/confdir` + #vardir=`getprop puppet/vardir` + #ssldir=`getprop puppet/ssldir` # Start daemons. #${sbindir}/puppetd --confdir=$confdir --vardir=$vardir --ssldir=$ssldir 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 Mar 10 17:47:31 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 10 Mar 2011 16:47:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[13733] csw/mgar/pkg Message-ID: Revision: 13733 http://gar.svn.sourceforge.net/gar/?rev=13733&view=rev Author: skayser Date: 2011-03-10 16:47:31 +0000 (Thu, 10 Mar 2011) Log Message: ----------- pdftk: initial commit Added Paths: ----------- csw/mgar/pkg/pdftk/ csw/mgar/pkg/pdftk/Makefile csw/mgar/pkg/pdftk/branches/ csw/mgar/pkg/pdftk/tags/ csw/mgar/pkg/pdftk/trunk/ csw/mgar/pkg/pdftk/trunk/Makefile csw/mgar/pkg/pdftk/trunk/checksums csw/mgar/pkg/pdftk/trunk/files/ Copied: csw/mgar/pkg/pdftk/Makefile (from rev 13436, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/pdftk/Makefile (rev 0) +++ csw/mgar/pkg/pdftk/Makefile 2011-03-10 16:47:31 UTC (rev 13733) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/pdftk/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/pdftk/trunk/Makefile =================================================================== --- csw/mgar/pkg/pdftk/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pdftk/trunk/Makefile 2011-03-10 16:47:31 UTC (rev 13733) @@ -0,0 +1,22 @@ +# TODO (release-critical prefixed with !, non release-critical with *) +# +# ! Initial stub, needs someone to look into the build process (req. gcj) +# with its platform dependent Makefiles +# +NAME = pdftk +VERSION = 1.44 +CATEGORIES = apps + +DESCRIPTION = Tool for manipulating PDF documents. +define BLURB + Long description +endef + +VENDOR_URL = http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/ +MASTER_SITES = http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/ +DISTFILES = $(NAME)-$(VERSION)-src.zip +DISTNAME = $(NAME)-$(VERSION)-dist + +CONFIGURE_SCRIPTS = + +include gar/category.mk Property changes on: csw/mgar/pkg/pdftk/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/pdftk/trunk/checksums =================================================================== --- csw/mgar/pkg/pdftk/trunk/checksums (rev 0) +++ csw/mgar/pkg/pdftk/trunk/checksums 2011-03-10 16:47:31 UTC (rev 13733) @@ -0,0 +1 @@ +9eb50fffcd621a627d387750c60982b4 pdftk-1.44-src.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 10 21:57:24 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 10 Mar 2011 20:57:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[13734] csw/mgar/pkg/mysql5/branches/mysql-5.5.x Message-ID: Revision: 13734 http://gar.svn.sourceforge.net/gar/?rev=13734&view=rev Author: dmichelsen Date: 2011-03-10 20:57:24 +0000 (Thu, 10 Mar 2011) Log Message: ----------- mysql-5.5.x: Minor bump, update to CMake pending Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-03-10 16:47:31 UTC (rev 13733) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-03-10 20:57:24 UTC (rev 13734) @@ -3,9 +3,9 @@ # $Id$ PROJ_NAME = mysql -NAME = $(PROJ_NAME)51 -BASE_VERSION = 5.1 -PATCHLEVEL = 49 +NAME = $(PROJ_NAME)55 +BASE_VERSION = 5.5 +PATCHLEVEL = 9 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server @@ -39,10 +39,10 @@ PACKAGES += CSW$(NAME)rt PACKAGES += CSW$(NAME)test -PATCHFILES = 0001-Use-libc-not-libcrypt.patch -PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch -PATCHFILES += 0003-OpenCSW-perl-for-tests.patch -PATCHFILES += 0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch +#PATCHFILES = 0001-Use-libc-not-libcrypt.patch +#PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch +#PATCHFILES += 0003-OpenCSW-perl-for-tests.patch +#PATCHFILES += 0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch SPKG_DESC_CSW$(NAME) = Multithreaded SQL database SPKG_DESC_CSW$(NAME)bench = MySQL $(BASE_VERSION) benchmarking @@ -163,6 +163,8 @@ # EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ # EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ +# TBD: MySQL 5.5 uses CMake :-( + # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-assembler Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2011-03-10 16:47:31 UTC (rev 13733) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2011-03-10 20:57:24 UTC (rev 13734) @@ -1,12 +1 @@ -8940e0673e599689932e94fec906aec9 0001-Use-libc-not-libcrypt.patch -1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch -5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch -0cea0d771ff324ccdd31de4b6311b12f 0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch -a1008df3aee0528449eb18f39bc21603 CSWmysql51.postinstall -fe58fe0af20a51143893495b56964682 CSWmysql51.preinstall -e691b0cf00a3925ac55c1844045d6e30 ChangeLog -59f9d5aa04d8e8d3806bec666d01e096 README.CSW -22a8164a101fa7e4be35fd6aa674d272 cswmysql51 -e3000190fef8aa4cfbd527bb5e40d9a6 cswusergroup -a90d87a71fa3c23dff6d78afc8e3184c mysql-5.1.49.tar.gz -028a9f9167edee23d2e946239af5a2fb quick_start-csw +701c0c44b7f1c2300adc0dc45729f903 mysql-5.5.9.tar.gz 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 Mar 11 09:32:01 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 11 Mar 2011 08:32:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[13735] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 13735 http://gar.svn.sourceforge.net/gar/?rev=13735&view=rev Author: wahwah Date: 2011-03-11 08:32:01 +0000 (Fri, 11 Mar 2011) Log Message: ----------- mGAR v2: README.CSW support, base directories Before copying README.CSW, make sure that the base directory already exists. Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-03-10 20:57:24 UTC (rev 13734) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-03-11 08:32:01 UTC (rev 13735) @@ -700,6 +700,7 @@ merge-README.CSW: $(WORKDIR) $(_DBG)if test -f $(WORKDIR)/README.CSW; then \ + $(foreach P,$(_PKG_SPECS),mkdir -p $(PKGROOT)$(docdir)/$(call catalogname,$P);) \ $(foreach P,$(_PKG_SPECS),cp $(WORKDIR)/README.CSW $(PKGROOT)$(docdir)/$(call catalogname,$P)/README.CSW;) \ fi @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Fri Mar 11 09:32:16 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Fri, 11 Mar 2011 08:32:16 +0000 Subject: [csw-devel] [PATCH] mGAR v2: README.CSW support, base directories In-Reply-To: <1299320298-16373-1-git-send-email-maciej@opencsw.org> References: <1299320298-16373-1-git-send-email-maciej@opencsw.org> Message-ID: For the record, the error I was getting was: gmake[1]: Leaving directory `/home/maciej/src/opencsw/pkg/mysql5/branches/mysql-5.1.x' [merge-license] complete for mysql51. [ Generating checkpkg override for package CSWmysql5rt ] cp: cannot create /home/maciej/src/opencsw/pkg/mysql5/branches/mysql-5.1.x/work/solaris9-sparc/pkgroot/opt/csw/mysql51/share/doc/libmysqlclient_r16/README.CSW: No such file or directory cp: cannot create /home/maciej/src/opencsw/pkg/mysql5/branches/mysql-5.1.x/work/solaris9-sparc/pkgroot/opt/csw/mysql51/share/doc/libmysqlclient16/README.CSW: No such file or directory cp: cannot create /home/maciej/src/opencsw/pkg/mysql5/branches/mysql-5.1.x/work/solaris9-sparc/pkgroot/opt/csw/mysql51/share/doc/mysql51/README.CSW: No such file or directory cp: cannot create /home/maciej/src/opencsw/pkg/mysql5/branches/mysql-5.1.x/work/solaris9-sparc/pkgroot/opt/csw/mysql51/share/doc/mysql51bench/README.CSW: No such file or directory cp: cannot create /home/maciej/src/opencsw/pkg/mysql5/branches/mysql-5.1.x/work/solaris9-sparc/pkgroot/opt/csw/mysql51/share/doc/mysql51client/README.CSW: No such file or directory cp: cannot create /home/maciej/src/opencsw/pkg/mysql5/branches/mysql-5.1.x/work/solaris9-sparc/pkgroot/opt/csw/mysql51/share/doc/mysql51devel/README.CSW: No such file or directory cp: cannot create /home/maciej/src/opencsw/pkg/mysql5/branches/mysql-5.1.x/work/solaris9-sparc/pkgroot/opt/csw/mysql51/share/doc/mysql51test/README.CSW: No such file or directory cp: cannot create /home/maciej/src/opencsw/pkg/mysql5/branches/mysql-5.1.x/work/solaris9-sparc/pkgroot/opt/csw/mysql51/share/doc/mysql5rt/README.CSW: No such file or directory gmake: *** [merge-README.CSW] Error 2 I'm submitting the change. Maciej From rthurner at users.sourceforge.net Fri Mar 11 10:28:25 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 11 Mar 2011 09:28:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[13736] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 13736 http://gar.svn.sourceforge.net/gar/?rev=13736&view=rev Author: rthurner Date: 2011-03-11 09:28:25 +0000 (Fri, 11 Mar 2011) Log Message: ----------- mercurial: upgrade to hg-1.8.1 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 2011-03-11 08:32:01 UTC (rev 13735) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2011-03-11 09:28:25 UTC (rev 13736) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 1.8 +VERSION = 1.8.1 CATEGORIES = python DESCRIPTION = Fast, lightweight Source Control Management system Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2011-03-11 08:32:01 UTC (rev 13735) +++ csw/mgar/pkg/mercurial/trunk/checksums 2011-03-11 09:28:25 UTC (rev 13736) @@ -1 +1 @@ -c97b39832f2da60f951d1b7701688bd2 mercurial-1.8.tar.gz +e0a8cfca69aa4003ea3187aed609d5e0 mercurial-1.8.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 Fri Mar 11 11:10:31 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Mar 2011 10:10:31 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[354] buildfarm/bin Message-ID: Revision: 354 http://opencsw.svn.sourceforge.net/opencsw/?rev=354&view=rev Author: dmichelsen Date: 2011-03-11 10:10:30 +0000 (Fri, 11 Mar 2011) Log Message: ----------- Adding a wrapper script for opencsw-future updates. Modified Paths: -------------- buildfarm/bin/generate-unstable Added Paths: ----------- buildfarm/bin/opencsw-future-update Modified: buildfarm/bin/generate-unstable =================================================================== --- buildfarm/bin/generate-unstable 2011-03-02 13:16:35 UTC (rev 353) +++ buildfarm/bin/generate-unstable 2011-03-11 10:10:30 UTC (rev 354) @@ -9,6 +9,7 @@ set -u set -e +set -x /home/web/bin/gar/bin/pkgdb \ gen-cat --catalog-release unstable \ @@ -19,7 +20,19 @@ pushd "${arch}" for osrel in 5.9 5.10 5.11; do pushd "${osrel}" - bldcat . + # bldcat prints a lot of output + if ! bldcat --fast . >/dev/null + then + echo "bldcat failed in $(pwd)." + false + fi + ## chkcat cannot be used like this, because it returns non-zero even if + ## there are no errors. + # if ! chkcat -e catalog + # then + # echo "chkcat returned an error in $(pwd)." + # false + # fi popd done popd Added: buildfarm/bin/opencsw-future-update =================================================================== --- buildfarm/bin/opencsw-future-update (rev 0) +++ buildfarm/bin/opencsw-future-update 2011-03-11 10:10:30 UTC (rev 354) @@ -0,0 +1,19 @@ +#!/opt/csw/bin/bash + +# A wrapper around a list of scripts. + +set -x +set -e +set -u + +declare -r BASE_DIR=$(dirname $0) + +${BASE_DIR}/sync-mirror +${BASE_DIR}/sync-checkpkg +${BASE_DIR}/sync-opencsw-future +${BASE_DIR}/generate-unstable +${BASE_DIR}/make-snapshot-README +${BASE_DIR}/push-opencsw-future +${BASE_DIR}/send-catalog-update-notifications + +echo "$0 completed successfully" Property changes on: buildfarm/bin/opencsw-future-update ___________________________________________________________________ Added: svn:executable + * 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 Mar 11 11:24:06 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Mar 2011 10:24:06 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[355] buildfarm/bin/generate-unstable Message-ID: Revision: 355 http://opencsw.svn.sourceforge.net/opencsw/?rev=355&view=rev Author: dmichelsen Date: 2011-03-11 10:24:06 +0000 (Fri, 11 Mar 2011) Log Message: ----------- Testing for exit code 2 in chkcat. chkcat returns 1 on warnings and 2 on errors. Testing only for 2; if chkcat returns 1, the process continues. Modified Paths: -------------- buildfarm/bin/generate-unstable Modified: buildfarm/bin/generate-unstable =================================================================== --- buildfarm/bin/generate-unstable 2011-03-11 10:10:30 UTC (rev 354) +++ buildfarm/bin/generate-unstable 2011-03-11 10:24:06 UTC (rev 355) @@ -26,13 +26,16 @@ echo "bldcat failed in $(pwd)." false fi - ## chkcat cannot be used like this, because it returns non-zero even if - ## there are no errors. - # if ! chkcat -e catalog - # then - # echo "chkcat returned an error in $(pwd)." - # false - # fi + if chkcat -e catalog + then + echo chkcat returned no errors + else + r="$?" + if [[ "${r}" -eq 2 ]]; then + echo "chkcat returned an error in $(pwd)." + false + fi + fi popd done popd 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 Mar 11 11:32:41 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Mar 2011 10:32:41 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[356] buildfarm/bin/make-experimental-browsable Message-ID: Revision: 356 http://opencsw.svn.sourceforge.net/opencsw/?rev=356&view=rev Author: dmichelsen Date: 2011-03-11 10:32:41 +0000 (Fri, 11 Mar 2011) Log Message: ----------- make-experimental-browsable: Check files by md5sum Modified Paths: -------------- buildfarm/bin/make-experimental-browsable Modified: buildfarm/bin/make-experimental-browsable =================================================================== --- buildfarm/bin/make-experimental-browsable 2011-03-11 10:24:06 UTC (rev 355) +++ buildfarm/bin/make-experimental-browsable 2011-03-11 10:32:41 UTC (rev 356) @@ -105,8 +105,32 @@ if( %pkglist ) { print "Packages for project '$project' found, making check results browsable\n"; tryadd( keys %pkglist ); - system( "/home/web/bin/gar/bin/checkpkg", keys %pkglist ); - system( "/home/web/bin/gar/bin/pkgdb -t $templatefile gen-html " . join( " ", values %pkglist ) . " >/export/mirror/pkgbrowser/reports/pkgbrowse-$project.html"); + + my %todo; + foreach my $file (keys %pkglist) { + my ($os, $arch) = ($file =~ /-(SunOS\d+\.\d+)-(all|sparc|i386)/); + if( !defined $os || !defined $arch ) { + print STDERR "Unknown os and arch for file '$file'\n"; + delete $pkglist{$file}; + next; + } + push @{$todo{$os}{$arch}}, $file; + } + + my @md5s2check; + foreach my $os (keys %todo) { + next if( $os !~ /^SunOS5\.(9|10)$/ ); + foreach my $arch (qw(sparc i386)) { + my @files = @{$todo{$os}{$arch} || []}; + push @files, @{$todo{$os}{all}} if( defined $todo{$os}{all} ); + print join( " ", "/home/web/bin/gar/bin/checkpkg", "--debug", "--os-releases", $os, "--architecture", $arch, @files ), "\n"; + system( "/home/web/bin/gar/bin/checkpkg", "--debug", "--os-releases", $os, "--architecture", $arch, @files ); + push @md5s2check, map { $pkglist{$_} } @files; + } + } + + print "/home/web/bin/gar/bin/pkgdb -t $templatefile gen-html " . join( " ", @md5s2check ) . " >$reportfile", "\n"; + system( "/home/web/bin/gar/bin/pkgdb -t $templatefile gen-html " . join( " ", @md5s2check ) . " >$reportfile"); } } 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 Mar 11 11:33:28 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Mar 2011 10:33:28 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[357] buildfarm/bin Message-ID: Revision: 357 http://opencsw.svn.sourceforge.net/opencsw/?rev=357&view=rev Author: dmichelsen Date: 2011-03-11 10:33:27 +0000 (Fri, 11 Mar 2011) Log Message: ----------- cswrepo: Some more work Modified Paths: -------------- buildfarm/bin/cswrepo Added Paths: ----------- buildfarm/bin/CSW/ buildfarm/bin/CSW/Catalog.pm Added: buildfarm/bin/CSW/Catalog.pm =================================================================== --- buildfarm/bin/CSW/Catalog.pm (rev 0) +++ buildfarm/bin/CSW/Catalog.pm 2011-03-11 10:33:27 UTC (rev 357) @@ -0,0 +1,178 @@ +package CSW::Catalog; + +sub new { + my ($class,$catalogfile) = @_; + + my %catalog; + + open F, $catalogfile or die "Cannot open $catalogfile"; + while( ) { + # 9menu 1.8,REV=2006.05.19 CSW9menu 9menu-1.8,REV=2006.05.19-SunOS5.8-i386-CSW.pkg.gz 51eaeee15a71a4290789729feb956759 12196 CSWcommon non + + last if( /^-----BEGIN PGP SIGNATURE-----/ ); + next if( /^(----.*|Hash:.*|#.*|)$/ ); + + chomp; + my @fields = split(/\s+/); + if( @fields < 5 || @fields > 9 ) { + print "ERROR: ", scalar( @fields ), " $_\n"; + next; + } + + my ($cname,$version,$pkgname,$pkgfile,$md5,$size,$deps,$ideps,$category) = split(/\s+/); + $catalog{$cname} = { + catalogname => $cname, + version => $version, + pkgname => $pkgname, + pkgfile => $pkgfile, + md5 => $md5, + size => $size, + deps => ($deps eq 'none' ? [] : [ sort split( /\|/, $deps ) ]), + ideps => ($ideps eq 'none' ? [] : [ sort split( /\|/, $ideps ) ]), + }; + } + close F; + + return bless \%catalog, ref( $class ) || $class; +} + +sub _equal { + my ($e1, $e2) = @_; + return ($e1->{version} eq $e2->{version} && + $e1->{pkgname} eq $e2->{pkgname} && + $e1->{pkgfile} eq $e2->{pkgfile} && + $e1->{md5} eq $e2->{md5} && + $e1->{size} eq $e2->{size} && + join('|', @{$e1->{deps}}) eq join('|', @{$e2->{deps}}) && + join('|', @{$e1->{ideps}}) eq join('|', @{$e2->{ideps}}) + ); +} + +sub _depcompare { + my ($a1, $a2) = @_; + + my %a1; + my (@additions, at removals); + foreach my $a1 (@$a1) { + $a1{$a1} = 1; + } + foreach my $a2 (@$a2) { + if( exists $a1{$a2} ) { + delete $a1{$a2}; + } else { + push @additions, $a2; + } + } + @removals = keys %a1; + return [\@removals,\@additions]; +} + +sub _extract_version { + my ($v) = @_; + $v =~ s/,REV=\d{4}\.\d{2}\.\d{2}//; + return $v; +} + +sub _eq_version { + # 2009.09.09,REV=2009.09.09 + my ($v1,$v2) = @_; + $v1 = _extract_version( $v1 ); + $v2 = _extract_version( $v2 ); + + return $v1 eq $v2; +} + +sub _compare_rev { + # 2009.09.09,REV=2009.09.09 + my ($v1,$v2) = @_; + + my ($y1,$m1,$d1) = ($v1 =~ /,REV=(\d{4})\.(\d{2})\.(\d{2})/); + my ($y2,$m2,$d2) = ($v2 =~ /,REV=(\d{4})\.(\d{2})\.(\d{2})/); + + if( !defined $y1 || !defined $m1 || !defined $d1 ) { + return 0 if( !defined $y2 || !defined $m2 || !defined $d2 ); + return 1; + } + return -1 if( !defined $y2 || !defined $m2 || !defined $d2 ); + + return ($y1 cmp $y2)*4 + ($m1 cmp $m2)*2 + ($d1 cmp $d2); +} + +sub compare { + my ($co1, $co2) = @_; + my %c1 = %$co1; + my %c2 = %$co2; + + my %hchanges; + + my (%pc1, %pc2); + $pc1{$_->{pkgname}} = $_ foreach (values %c1); + $pc2{$_->{pkgname}} = $_ foreach (values %c2); + + # 1. Find differences in attributes for packages with same catalog name + # (additions, updates, removals) + foreach my $p1 (keys %c1) { + if( exists( $c2{$p1} ) ) { + # Entries with same catalog name exist in catalog 1 and 2 + if( !_equal( $c1{$p1}, $c2{$p1} ) ) { + # Package as been updated + $hchanges{$p1}->{_pkgname} = $c1{$p1}->{pkgname}; + my %e1 = %{$c1{$p1}}; + my %e2 = %{$c2{$p1}}; + my $versiondiff = $e1{version} ne $e2{version}; + my $pkgnamediff = $e1{pkgname} ne $e2{pkgname}; + my $pkgfilediff = $e1{pkgfile} ne $e2{pkgfile}; + my $md5diff = $e1{md5} ne $e2{md5}; + my $sizediff = $e1{size} ne $e2{size}; + if( $versiondiff ) { + my ($v1,$v2) = ($e1{version}, $e2{version}); + if( _eq_version( $v1, $v2 ) ) { + $hchanges{$p1}->{version} = { type => "Respin", from => $e1{version}, to => $e2{version} }; + } elsif( _compare_rev( $v1, $v2 ) ) { + $hchanges{$p1}->{version} = { type => "Update", from => $e1{version}, to => $e2{version} }; + } else { + $hchanges{$p1}->{version} = { type => "Sameday update", from => $e1{version}, to => $e2{version} }; + } + } else { + # If the version has been updated we have another package, so differences on the other fields are pretty obvious + $hchanges{$p1}->{pkgname} = { type => "Changed", from => $e1{pkgname}, to => $e2{pkgname} } if( $pkgnamediff ); + $hchanges{$p1}->{pkgfile} = { type => "Changed", from => $e1{pkgfile}, to => $e2{pkgfile} } if( $pkgfilediff ); + $hchanges{$p1}->{md5} = { type => "Changed", from => $e1{md5}, to => $e2{md5} } if( $md5diff ); + $hchanges{$p1}->{size} = { type => "Changed", from => $e1{size}, to => $e2{size} } if( $sizediff ); + } + my $dep = _depcompare( $e1{deps}, $e2{deps} ); + if( @{$dep->[0]} > 0 || @{$dep->[1]} > 0 ) { + $hchanges{$p1}->{deps} = { type => "Changed", removed => $dep->[0], added => $dep->[1] }; + } + my $idep = _depcompare( $e1{ideps}, $e2{ideps} ); + if( @{$idep->[0]} > 0 || @{$idep->[1]} > 0 ) { + $hchanges{$p1}->{ideps} = { type => "Changed", removed => $idep->[0], added => $idep->[1] }; + } + } else { + # Package is same, ignore. + } + delete $c2{$p1}; + } else { + # Catalogname is in catalog 1 only, deletion + my $pkgname = $c1{$p1}->{pkgname}; + $hchanges{$p1}->{_pkgname} = $pkgname; + if( exists $pc2{$pkgname} && $pc2{$pkgname}->{catalogname} ne $c1{$p1}->{catalogname} ) { + $hchanges{$p1}->{catalogname} = { type => "Changed", from => $c1{$p1}->{catalogname}, to => $pc2{$pkgname}->{catalogname} }; + # If it was a rename we processed it, so remove it here + delete $c2{$pc2{$pkgname}->{catalogname}}; + } else { + $hchanges{$p1}->{package} = { type => "Deleted", pkg => $c1{$p1}->{pkgname} }; + } + } + } + + # What is left in catalog 2 are additions + foreach my $p2 (keys %c2) { + $hchanges{$p2}->{_pkgname} = $c2{$p2}->{pkgname}; + $hchanges{$p2}->{package} = { type => "Added", pkg => $c2{$p2}->{pkgname} }; + } + + return \%hchanges; +} + +1; Property changes on: buildfarm/bin/CSW/Catalog.pm ___________________________________________________________________ Added: svn:executable + * Modified: buildfarm/bin/cswrepo =================================================================== --- buildfarm/bin/cswrepo 2011-03-11 10:32:41 UTC (rev 356) +++ buildfarm/bin/cswrepo 2011-03-11 10:33:27 UTC (rev 357) @@ -217,18 +217,22 @@ sub compare { my ($co1, $co2) = @_; - my %c1 = %$co1; - my %c2 = %$co2; + my @c1 = $co1->entries(); + my @c2 = $co2->entries(); + my %hchanges; my (%pc1, %pc2); - $pc1{$_->{pkgname}} = $_ foreach (values %c1); - $pc2{$_->{pkgname}} = $_ foreach (values %c2); + $pc1{$_->{pkgname}} = $_ foreach (@c1); + $pc2{$_->{pkgname}} = $_ foreach (@c2); # 1. Find differences in attributes for packages with same catalog name # (additions, updates, removals) - foreach my $p1 (keys %c1) { + foreach my $po1 (@c1) { +use Data::Dumper; +print Dumper( $po1 ); + my $p1 = $po1->catalogname; if( exists( $c2{$p1} ) ) { # Entries with same catalog name exist in catalog 1 and 2 if( !_equal( $c1{$p1}, $c2{$p1} ) ) { @@ -284,7 +288,8 @@ } # What is left in catalog 2 are additions - foreach my $p2 (keys %c2) { + foreach my $po2 (keys %c2) { + my $p2 = $po2->catalogname; $hchanges{$p2}->{_pkgname} = $c2{$p2}->{pkgname}; $hchanges{$p2}->{package} = { type => "Added", pkg => $c2{$p2}->{pkgname} }; } @@ -749,11 +754,14 @@ } sub diff { - my ($name, $c1, $c2) = @ARGV; + my ($c1, $c2) = @ARGV; my $cf1 = CSW::Catalog->new( $c1 ); my $cf2 = CSW::Catalog->new( $c2 ); + #my %hchanges = %{$cf1->compare( $cf2 )}; +use Data::Dumper; + #print Dumper( $cf1->compare( $cf2 )) ; my %hchanges = %{$cf1->compare( $cf2 )}; my ($npackageadded, $npackagedeleted, $nversion, $npkgname, $npkgfile, $nmd5, $nsize, $ndeps, $nideps) = (0,0,0,0,0,0,0,0,0); @@ -772,8 +780,6 @@ } print < Revision: 358 http://opencsw.svn.sourceforge.net/opencsw/?rev=358&view=rev Author: dmichelsen Date: 2011-03-11 10:35:05 +0000 (Fri, 11 Mar 2011) Log Message: ----------- Separate out unstable Modified Paths: -------------- buildfarm/bin/make-snapshot-README buildfarm/bin/sync-opencsw-future Modified: buildfarm/bin/make-snapshot-README =================================================================== --- buildfarm/bin/make-snapshot-README 2011-03-11 10:33:27 UTC (rev 357) +++ buildfarm/bin/make-snapshot-README 2011-03-11 10:35:05 UTC (rev 358) @@ -18,12 +18,12 @@ foreach my $A (qw(sparc i386)) { foreach my $R (qw(5.8 5.9 5.10)) { system( '/opt/csw/bin/figlet -w 120 "Snapshot ' . $pair->[1] . "\" > $base/snapshots/" . $pair->[1] . "/$A/$R/HEADER.txt" ); - system( "/home/web/bin/cswrepo" . - " \"Snapshot " . $pair->[0] . "\"" . - " $base/snapshots/" . $pair->[0] . "/$A/$R/catalog" . - " $base/snapshots/" . $pair->[1] . "/$A/$R/catalog" . - " >> $base/snapshots//" . $pair->[1] . "/$A/$R/HEADER.txt" - ); +# system( "/home/web/bin/cswrepo" . +# " \"Snapshot " . $pair->[0] . "\"" . +# " $base/snapshots/" . $pair->[0] . "/$A/$R/catalog" . +# " $base/snapshots/" . $pair->[1] . "/$A/$R/catalog" . +# " >> $base/snapshots//" . $pair->[1] . "/$A/$R/HEADER.txt" +# ); } } } @@ -34,12 +34,12 @@ foreach my $A (qw(sparc i386)) { foreach my $R (qw(5.8 5.9 5.10)) { system( "/opt/csw/bin/figlet -w 120 Unstable > $base/unstable/$A/$R/HEADER.txt" ); - system( "/home/web/bin/cswrepo" . - " \"Snapshot $lastsnap\"" . - " $base/snapshots/$lastsnap/$A/$R/catalog" . - " $base/unstable/$A/$R/catalog" . - " >> $base/unstable/$A/$R/HEADER.txt" - ); +# system( "/home/web/bin/cswrepo" . +# " \"Snapshot $lastsnap\"" . +# " $base/snapshots/$lastsnap/$A/$R/catalog" . +# " $base/unstable/$A/$R/catalog" . +# " >> $base/unstable/$A/$R/HEADER.txt" +# ); } } @@ -47,11 +47,11 @@ foreach my $A (qw(sparc i386)) { foreach my $R (qw(5.8 5.9 5.10)) { system( "/opt/csw/bin/figlet -w 120 Experimental > $base/experimental/$A/$R/HEADER.txt" ); - system( "/home/web/bin/cswrepo" . - " Unstable" . - " $base/unstable/$A/$R/catalog" . - " $base/experimental/$A/$R/catalog" . - " >> $base/experimental/$A/$R/HEADER.txt" - ); +# system( "/home/web/bin/cswrepo" . +# " Unstable" . +# " $base/unstable/$A/$R/catalog" . +# " $base/experimental/$A/$R/catalog" . +# " >> $base/experimental/$A/$R/HEADER.txt" +# ); } } Modified: buildfarm/bin/sync-opencsw-future =================================================================== --- buildfarm/bin/sync-opencsw-future 2011-03-11 10:33:27 UTC (rev 357) +++ buildfarm/bin/sync-opencsw-future 2011-03-11 10:35:05 UTC (rev 358) @@ -6,10 +6,10 @@ system( "/opt/csw/bin/rsync", "-Hrav", "--delete", "/export/mirror/opencsw/official/current/", - "/export/mirror/opencsw-future/unstable" ); + "/export/mirror/opencsw-future/current" ); # Make sure all packages are properly archived to allpkgs -foreach my $T (qw(unstable)) { +foreach my $T (qw(current)) { foreach my $A (qw(sparc i386)) { foreach my $V (qw(5.8 5.9 5.10)) { opendir D, "$BASE/$T/$A/$V" or die "Cannot open $BASE/$T/$A/$V"; @@ -18,6 +18,7 @@ foreach my $p (@pkgs) { if( ! -e "$BASE/allpkgs/$p" ) { + print "Linking $p\n"; link( "$BASE/$T/$A/$V/$p", "$BASE/allpkgs/$p" ); } } @@ -25,8 +26,13 @@ } } +exit 0; + # Analyze all packages in the catalogs + +# This bit needs a rewrite, because checkpkg works now differently. + my @snapshots = map { s,^$BASE/,, } glob("$BASE/snapshots/*"); foreach my $T (qw(experimental unstable), @snapshots) { foreach my $A (qw(sparc i386)) { 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 Mar 11 13:50:09 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 11 Mar 2011 12:50:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[13737] csw/mgar/gar/v2/lib/python/inspective_package.py Message-ID: Revision: 13737 http://gar.svn.sourceforge.net/gar/?rev=13737&view=rev Author: wahwah Date: 2011-03-11 12:50:09 +0000 (Fri, 11 Mar 2011) Log Message: ----------- checkpkg: Support libmagic-5.05 Python bindings Names of constants in libmagic Python bindings have changed. http://mx.gw.com/pipermail/file/2011/000693.html Signed-off-by: Maciej Blizinski Modified Paths: -------------- csw/mgar/gar/v2/lib/python/inspective_package.py Modified: csw/mgar/gar/v2/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package.py 2011-03-11 09:28:25 UTC (rev 13736) +++ csw/mgar/gar/v2/lib/python/inspective_package.py 2011-03-11 12:50:09 UTC (rev 13737) @@ -299,7 +299,11 @@ magic_cookie = magic.open(self.cookie_count) self.cookie_count += 1 magic_cookie.load() - magic_cookie.setflags(magic.MAGIC_MIME) + if "MAGIC_MIME" in dir(magic): + flag = magic.MAGIC_MIME + elif "MIME" in dir(magic): + flag = magic.MIME + magic_cookie.setflags(flag) return magic_cookie def _LazyInit(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 Mar 11 14:17:38 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Mar 2011 13:17:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[13738] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 13738 http://gar.svn.sourceforge.net/gar/?rev=13738&view=rev Author: dmichelsen Date: 2011-03-11 13:17:37 +0000 (Fri, 11 Mar 2011) Log Message: ----------- mGAR v2: Tweak obsoletions Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-03-11 12:50:09 UTC (rev 13737) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-03-11 13:17:37 UTC (rev 13738) @@ -68,10 +68,12 @@ PKGFILES_$(1) = NOFILES ARCHALL_$(1) = 1 # For legacy packages we know that the dependency is correct because we deliberately set it +# A legacy dependency from another package may not have been released # The catalog name may not match for legacy packages # The overridden package may be a devel package, as it is empty it is ok to be archall $(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETES_$P)), CHECKPKG_OVERRIDES_$(1) += surplus-dependency|$P +$(if $(filter $P,$(FOREIGN_PACKAGES)),CHECKPKG_OVERRIDES_$(1) += unidentified-dependency|$P) )) CHECKPKG_OVERRIDES_$(1) += catalogname-does-not-match-pkgname CHECKPKG_OVERRIDES_$(1) += archall-devel-package @@ -710,11 +712,11 @@ $(_DBG)rm -f $(COOKIEDIR)/merge-README.CSW $(foreach SPEC,$(_PKG_SPECS),$(PKGROOT)$(docdir)/$(call catalogname,$(SPEC))/README.CSW) merge-obsolete: $(WORKDIR_GLOBAL) - $(_DBG)$(foreach P,$(OBSOLETED_PKGS),$(foreach Q,$(OBSOLETING_PACKAGES),$(if $(filter $P,$(OBSOLETES_$Q)), \ - $(if $(SPKG_DESC_$Q), \ - echo "$Q $(call catalogname,$Q) - $(SPKG_DESC_$Q)" >> $(WORKDIR_GLOBAL)/$P.obsolete;, \ - echo "$(shell (/usr/bin/pkginfo $Q || echo "$Q - ") | $(GAWK) '{ $$1 = "P"; print } ')" $(WORKDIR_GLOBAL)/$P.obsolete; \ - ) \ + $(_DBG)$(foreach P,$(OBSOLETED_PKGS),$(foreach Q,$(OBSOLETING_PKGS),$(if $(filter $P,$(OBSOLETES_$Q)), \ + ($(if $(SPKG_DESC_$Q), \ + echo "$Q $(call catalogname,$Q) - $(SPKG_DESC_$Q)";, \ + echo "$(shell (/usr/bin/pkginfo $Q || echo "$Q - ") | $(GAWK) '{ $$1 = "P"; print }')"; \ + )) > $(WORKDIR_GLOBAL)/$P.obsolete; \ ))) @$(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 Fri Mar 11 14:21:10 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Mar 2011 13:21:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[13739] csw/mgar/pkg Message-ID: Revision: 13739 http://gar.svn.sourceforge.net/gar/?rev=13739&view=rev Author: dmichelsen Date: 2011-03-11 13:21:10 +0000 (Fri, 11 Mar 2011) Log Message: ----------- cdrdao: Initial commit, does not build cleanly Added Paths: ----------- csw/mgar/pkg/cdrdao/ csw/mgar/pkg/cdrdao/Makefile csw/mgar/pkg/cdrdao/branches/ csw/mgar/pkg/cdrdao/tags/ csw/mgar/pkg/cdrdao/trunk/ csw/mgar/pkg/cdrdao/trunk/Makefile csw/mgar/pkg/cdrdao/trunk/checksums csw/mgar/pkg/cdrdao/trunk/files/ Copied: csw/mgar/pkg/cdrdao/Makefile (from rev 13734, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/cdrdao/Makefile (rev 0) +++ csw/mgar/pkg/cdrdao/Makefile 2011-03-11 13:21:10 UTC (rev 13739) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/cdrdao/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/cdrdao/trunk/Makefile =================================================================== --- csw/mgar/pkg/cdrdao/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cdrdao/trunk/Makefile 2011-03-11 13:21:10 UTC (rev 13739) @@ -0,0 +1,20 @@ +# $Id$ +NAME = cdrdao +VERSION = 1.2.3 +CATEGORIES = apps + +DESCRIPTION = CD recording in DAO mode +define BLURB +endef + +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(DISTNAME).tar.bz2 + +# TBD: X GUI, requires gtkmm2 and libguimm2 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --without-xdao +# May use external scglib later +CONFIGURE_ARGS += --with-scglib=yes + +include gar/category.mk Property changes on: csw/mgar/pkg/cdrdao/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/cdrdao/trunk/checksums =================================================================== --- csw/mgar/pkg/cdrdao/trunk/checksums (rev 0) +++ csw/mgar/pkg/cdrdao/trunk/checksums 2011-03-11 13:21:10 UTC (rev 13739) @@ -0,0 +1 @@ +8d15ba6280bb7ba2f4d6be31d28b3c0c cdrdao-1.2.3.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 11 14:23:38 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Mar 2011 13:23:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[13740] csw/mgar/pkg/libmad/trunk/Makefile Message-ID: Revision: 13740 http://gar.svn.sourceforge.net/gar/?rev=13740&view=rev Author: dmichelsen Date: 2011-03-11 13:23:38 +0000 (Fri, 11 Mar 2011) Log Message: ----------- libmad: Split library Modified Paths: -------------- csw/mgar/pkg/libmad/trunk/Makefile Modified: csw/mgar/pkg/libmad/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmad/trunk/Makefile 2011-03-11 13:21:10 UTC (rev 13739) +++ csw/mgar/pkg/libmad/trunk/Makefile 2011-03-11 13:23:38 UTC (rev 13740) @@ -17,11 +17,22 @@ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_SOURCEURL = http://www.underbit.com/products/mad/ +VENDOR_URL = http://www.underbit.com/products/mad/ -CONFIGURE_ARGS = $(DIRPATHS) +PACKAGES += CSWlibmad0 +CATALOGNAME_CSWlibmad0 = libmad0 +SPKG_DESC_CSWlibmad0 = MPEG audio decoder library, libmad.so.0 +PKGFILES_CSWlibmad0 += $(call pkgfiles_lib,libmad.so.0) +OBSOLETES_CSWlibmad0 = CSWlibmad +PACKAGES += CSWlibmad-dev +CATALOGNAME_CSWlibmad-dev = libmad_dev +SPKG_DESC_CSWlibmad-dev = Development files for libmad.so.0 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibmad-dev = CSWlibmad0 + BUILD64 = 1 +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 phipsy at users.sourceforge.net Fri Mar 11 15:30:31 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Fri, 11 Mar 2011 14:30:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[13741] csw/mgar/pkg/ruby-augeas/ Message-ID: Revision: 13741 http://gar.svn.sourceforge.net/gar/?rev=13741&view=rev Author: phipsy Date: 2011-03-11 14:30:31 +0000 (Fri, 11 Mar 2011) Log Message: ----------- Added ruby-augeas Added Paths: ----------- csw/mgar/pkg/ruby-augeas/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Fri Mar 11 15:43:58 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Fri, 11 Mar 2011 14:43:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[13742] csw/mgar/pkg/ruby-augeas Message-ID: Revision: 13742 http://gar.svn.sourceforge.net/gar/?rev=13742&view=rev Author: phipsy Date: 2011-03-11 14:43:57 +0000 (Fri, 11 Mar 2011) Log Message: ----------- Framework for ruby-augeas Added Paths: ----------- csw/mgar/pkg/ruby-augeas/Makefile csw/mgar/pkg/ruby-augeas/branches/ csw/mgar/pkg/ruby-augeas/tags/ csw/mgar/pkg/ruby-augeas/trunk/ csw/mgar/pkg/ruby-augeas/trunk/Makefile csw/mgar/pkg/ruby-augeas/trunk/checksums Added: csw/mgar/pkg/ruby-augeas/Makefile =================================================================== --- csw/mgar/pkg/ruby-augeas/Makefile (rev 0) +++ csw/mgar/pkg/ruby-augeas/Makefile 2011-03-11 14:43:57 UTC (rev 13742) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/ruby-augeas/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/ruby-augeas/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby-augeas/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ruby-augeas/trunk/Makefile 2011-03-11 14:43:57 UTC (rev 13742) @@ -0,0 +1,26 @@ +NAME = ruby-augeas +VERSION = 0.3.0 +CATEGORIES = ruby + +DESCRIPTION = Augeas Ruby Bindings +define BLURB +endef + +MASTER_SITES = http://augeas.net/download/ruby/ +DISTFILES = $(NAME)-$(VERSION).tar.gz + +VENDOR_URL = http://augeas.net + +PACKAGES = CSWrubyaugeas +CATALOGNAME = ruby_augeas +DEP_PKGS = CSWaugeas +DEP_PKGS += CSWruby + +BUILD_DEP_PKGS = CSWrake +TEST_SCRIPTS = +# TEST_TARGET = check + +include gar/category.mk + +install-ruby-augeas: + Added: csw/mgar/pkg/ruby-augeas/trunk/checksums =================================================================== --- csw/mgar/pkg/ruby-augeas/trunk/checksums (rev 0) +++ csw/mgar/pkg/ruby-augeas/trunk/checksums 2011-03-11 14:43:57 UTC (rev 13742) @@ -0,0 +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 Fri Mar 11 19:11:25 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 11 Mar 2011 18:11:25 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[359] gar-wrapper/bash_completion.mgar Message-ID: Revision: 359 http://opencsw.svn.sourceforge.net/opencsw/?rev=359&view=rev Author: skayser Date: 2011-03-11 18:11:25 +0000 (Fri, 11 Mar 2011) Log Message: ----------- mgar: add bash autocompletion Added Paths: ----------- gar-wrapper/bash_completion.mgar Added: gar-wrapper/bash_completion.mgar =================================================================== --- gar-wrapper/bash_completion.mgar (rev 0) +++ gar-wrapper/bash_completion.mgar 2011-03-11 18:11:25 UTC (rev 359) @@ -0,0 +1,38 @@ +# +# bash autocompletion prototype for mgar. Valid cmds assembled manually. +# Ideally, we could derive them from mgar & GAR in an automated fashion +# or at least verify that they are - with changing versions - actually +# supported in mgar or GAR. This will do for now though. +# + +_mgar() { + local cur prev opts + COMPREPLY=() + cur="${COMP_WORDS[COMP_CWORD]}" + prev="${COMP_WORDS[COMP_CWORD-1]}" + + buildtgts="fetch makesum extract configure build package clean spotless" + buildtgts="${buildtgts} makesums makepatch patch merge install platforms" + buildtgts="${buildtgts} reinstall remerge repackage" + + for t in ${buildtgts}; do + [ $t == "platforms" ] && continue + buildtgts="${buildtgts} platforms-${t}" + done + + misctgts="modenv ccenv" + + mgarcmds="help init index locate up commit show-srcdir show-stagedir" + mgarcmds="${mgarcmds} find-file edit-file show-buildsys show-pkgtree version" + + opts="${buildtgts} ${misctgts} ${mgarcmds}" + + if [[ ${prev} == "mgar" ]] ; then + COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) + return 0 + else + COMPREPLY=( $(compgen -f ${cur}) ) + fi +} + +complete -F _mgar mgar This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Fri Mar 11 20:30:09 2011 From: bwalton at opencsw.org (Ben Walton) Date: Fri, 11 Mar 2011 14:30:09 -0500 Subject: [csw-devel] SF.net SVN: opencsw:[359] gar-wrapper/bash_completion.mgar In-Reply-To: References: Message-ID: <1299871785-sup-2312@pinkfloyd.chass.utoronto.ca> Excerpts from skayser's message of Fri Mar 11 13:11:25 -0500 2011: > Log Message: > ----------- > mgar: add bash autocompletion Now you're talkin'! :) Nice feature. Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bonivart at users.sourceforge.net Fri Mar 11 20:43:30 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 11 Mar 2011 19:43:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[13743] csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile Message-ID: Revision: 13743 http://gar.svn.sourceforge.net/gar/?rev=13743&view=rev Author: bonivart Date: 2011-03-11 19:43:30 +0000 (Fri, 11 Mar 2011) Log Message: ----------- cpan/Compress-Raw-Zlib/trunk: Fix catalogname for obsoleted package Modified Paths: -------------- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile Modified: csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile 2011-03-11 14:43:57 UTC (rev 13742) +++ csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile 2011-03-11 19:43:30 UTC (rev 13743) @@ -15,7 +15,7 @@ CATALOGNAME = pm_compress_raw_zlib SPKG_DESC_CSWpm-compress-raw-zlib = $(DESCRIPTION) OBSOLETES_CSWpm-compress-raw-zlib = CSWpmcompressrawzlib -CATALOGNAME_CSWpmcompressrawzlib = pmcompressrawzlib +CATALOGNAME_CSWpmcompressrawzlib = pm_compressrawzlib EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* .*\/man\/man1.* 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 Mar 11 21:16:14 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 11 Mar 2011 20:16:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[13744] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 13744 http://gar.svn.sourceforge.net/gar/?rev=13744&view=rev Author: bonivart Date: 2011-03-11 20:16:14 +0000 (Fri, 11 Mar 2011) Log Message: ----------- pkgutil: 2.4 beta 2 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2011-03-11 19:43:30 UTC (rev 13743) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2011-03-11 20:16:14 UTC (rev 13744) @@ -2,7 +2,7 @@ # svn co -r 9999 https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 gar NAME = pkgutil -VERSION = 2.4b1 +VERSION = 2.4b2 GARVERSION = $(VERSION) CATEGORIES = utils Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2011-03-11 19:43:30 UTC (rev 13743) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2011-03-11 20:16:14 UTC (rev 13744) @@ -5,4 +5,4 @@ b5fffa0be100ddbb7262ce3a0a4e3bb7 build_sun_catalog.py 7ad27336f90e73da3254a61d91025ee5 cswcatalog 3a6b789b3d5e05f41d2363dd26a92acf opencsw.py -f31fdba65b6b38d3f6c9fd728ebee72b pkgutil-2.4b1.zip +ce6064a86016e22d93d65077abd14bc2 pkgutil-2.4b2.zip 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 Mar 12 11:49:03 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 12 Mar 2011 10:49:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[13745] csw/mgar/pkg/lang-python/python/trunk Message-ID: Revision: 13745 http://gar.svn.sourceforge.net/gar/?rev=13745&view=rev Author: wahwah Date: 2011-03-12 10:49:03 +0000 (Sat, 12 Mar 2011) Log Message: ----------- python: Using system ffi and some more fixes /usr/local fixes, among others. Modified Paths: -------------- csw/mgar/pkg/lang-python/python/trunk/Makefile csw/mgar/pkg/lang-python/python/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/python/trunk/files/0010-Hardcoding-the-use-of-libffi.patch csw/mgar/pkg/lang-python/python/trunk/files/0011-OpenCSW-specific-libffi-include-dir.patch csw/mgar/pkg/lang-python/python/trunk/files/0013-Use-opt-csw-bin-python-in-cgi.py.patch csw/mgar/pkg/lang-python/python/trunk/files/0015-Adding-opt-csw-lib-to-dyld.py.patch csw/mgar/pkg/lang-python/python/trunk/files/0016-CSW-mimetypes.patch csw/mgar/pkg/lang-python/python/trunk/files/0017-Random-insignificant-removals-of-usr-local.patch csw/mgar/pkg/lang-python/python/trunk/files/0018-Removing-usr-local-from-mailcap.patch Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/Makefile 2011-03-11 20:16:14 UTC (rev 13744) +++ csw/mgar/pkg/lang-python/python/trunk/Makefile 2011-03-12 10:49:03 UTC (rev 13745) @@ -3,6 +3,11 @@ NAME = Python VERSION = 2.6.6 CATEGORIES = lang +VER = 2.6 +DVER = 2-6 +UVER = 2_6 +PVER = python$(VER) +CVER = # Known issues: # @@ -30,7 +35,6 @@ DISTFILES = $(DISTNAME).tar.bz2 -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 # Patches @@ -43,6 +47,14 @@ PATCHFILES += python-config-in.diff PATCHFILES += setup.diff PATCHFILES += 0001-FFI_DEFAULT_ABI-to-use-__i386.patch +# PATCHFILES += 0010-Hardcoding-the-use-of-libffi.patch +# PATCHFILES += 0011-OpenCSW-specific-libffi-include-dir.patch +# PATCHFILES += 0012-temporary-hack-to-compile-against-system-ffi.patch +PATCHFILES += 0013-Use-opt-csw-bin-python-in-cgi.py.patch +PATCHFILES += 0015-Adding-opt-csw-lib-to-dyld.py.patch +PATCHFILES += 0016-CSW-mimetypes.patch +PATCHFILES += 0017-Random-insignificant-removals-of-usr-local.patch +PATCHFILES += 0018-Removing-usr-local-from-mailcap.patch # Test for sunaudiodev fails. SKIPTEST = 1 @@ -50,6 +62,14 @@ EXTRA_INC += $(prefix)/bdb47/include EXTRA_LIB += $(prefix)/bdb47/lib +# There is a file name conflict over libffi.so symlink between libffi package +# and a gcc-java package. While it will ultimately belong to libffi_dev, the +# symlink is currently under a subdirectory. +# pkgchk -L CSWlibffi-dev +# (...) +# /opt/csw/lib/ffi/libffi.so=../libffi.so.5.0.10 s none CSWlibffi-dev +EXTRA_LIB += $(libdir)/ffi + BASECFLAGS = $(CFLAGS) EXTRA_COMMON_EXPORTS = BASECFLAGS @@ -69,92 +89,109 @@ # use prototype filters to set the class PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' -PACKAGES = CSWidle -PACKAGES += CSWpython -PACKAGES += CSWpython-devel -PACKAGES += CSWpython-test -PACKAGES += CSWpython-tk -PACKAGES += CSWlibpython2-6-1-0 +PACKAGES = CSWidle$(CVER) +PACKAGES += CSWpython$(CVER) +PACKAGES += CSWpython$(CVER)-devel +PACKAGES += CSWpython$(CVER)-test +PACKAGES += CSWpython$(CVER)-tk +PACKAGES += CSWlibpython$(DVER)-1-0 -INCOMPATIBLE_PKGS_CSWpython = CSWpydistutils +INCOMPATIBLE_PKGS_CSWpython$(CVER) = CSWpydistutils -PKGFILES_CSWidle = $(libdir)/.*/idlelib/.* -PKGFILES_CSWidle += $(bindir)/idle -PKGFILES_CSWpython-devel = $(includedir)/.* -PKGFILES_CSWpython-devel += $(libdir)/.*/config/.* -PKGFILES_CSWpython-devel += $(bindir)/.*config.* -PKGFILES_CSWpython-devel += $(libdir)/libpython2.6.so +PKGFILES_CSWidle$(CVER) = $(libdir)/.*/idlelib/.* +PKGFILES_CSWidle$(CVER) += $(bindir)/idle +PKGFILES_CSWpython$(CVER)-devel = $(includedir)/.* +PKGFILES_CSWpython$(CVER)-devel += $(libdir)/.*/config/.* +PKGFILES_CSWpython$(CVER)-devel += $(bindir)/.*config.* +PKGFILES_CSWpython-devel += $(libdir)/libpython$(VER).so # No idea why would this be in CSWpython, and no good idea for a better package # to put it. -PKGFILES_CSWpython-devel += $(bindir)/smtpd.py -PKGFILES_CSWpython-tk = $(libdir)/.*/lib-tk/.* -PKGFILES_CSWpython-tk += $(libdir)/.*/lib-dynload/_tkinter.so.* -PKGFILES_CSWpython-test = $(libdir)/python/test/.* -PKGFILES_CSWpython-test += $(libdir)/python/bsddb/test.* -PKGFILES_CSWpython-test += $(libdir)/python/ctypes/test.* -PKGFILES_CSWpython-test += $(libdir)/python/email/test.* -PKGFILES_CSWpython-test += $(libdir)/python/distutils/tests.* -PKGFILES_CSWpython-test += $(libdir)/python/json/tests.* -PKGFILES_CSWpython-test += $(libdir)/python/lib2to3/tests.* -PKGFILES_CSWpython-test += $(libdir)/python/sqlite3/test.* -PKGFILES_CSWlibpython2-6-1-0 += $(libdir)/libpython2\.6\.so\..* +PKGFILES_CSWpython$(CVER)-devel += $(bindir)/smtpd.py +PKGFILES_CSWpython$(CVER)-tk = $(libdir)/.*/lib-tk/.* +PKGFILES_CSWpython$(CVER)-tk += $(libdir)/.*/lib-dynload/_tkinter.so.* +PKGFILES_CSWpython$(CVER)-test = $(libdir)/python/test/.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/bsddb/test.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/ctypes/test.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/email/test.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/distutils/tests.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/json/tests.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/lib2to3/tests.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/sqlite3/test.* +PKGFILES_CSWlibpython$(DVER)-1-0 += $(libdir)/libpython$(VER)\.so\.[0-9\.]+ -ARCHALL_CSWpython-test = 1 -ARCHALL_CSWidle = 1 +ARCHALL_CSWpython$(CVER)-test = 1 +ARCHALL_CSWidle$(CVER) = 1 -RUNTIME_DEP_PKGS_CSWidle += CSWpython -RUNTIME_DEP_PKGS_CSWidle += CSWpython-tk -RUNTIME_DEP_PKGS_CSWpython += CSWbdb47 -RUNTIME_DEP_PKGS_CSWpython += CSWbzip2 -RUNTIME_DEP_PKGS_CSWpython += CSWgdbm -RUNTIME_DEP_PKGS_CSWpython += CSWggettextrt -RUNTIME_DEP_PKGS_CSWpython += CSWlibpython2-6-1-0 -RUNTIME_DEP_PKGS_CSWpython += CSWncurses -RUNTIME_DEP_PKGS_CSWpython += CSWosslrt -RUNTIME_DEP_PKGS_CSWpython += CSWreadline -RUNTIME_DEP_PKGS_CSWpython += CSWsqlite3rt -RUNTIME_DEP_PKGS_CSWpython += CSWzlib -RUNTIME_DEP_PKGS_CSWpython-tk += CSWlibpython2-6-1-0 -RUNTIME_DEP_PKGS_CSWpython-tk += CSWpython -RUNTIME_DEP_PKGS_CSWpython-tk += CSWtcl -RUNTIME_DEP_PKGS_CSWpython-tk += CSWtk -RUNTIME_DEP_PKGS_CSWpython-devel += CSWpython -RUNTIME_DEP_PKGS_CSWpython-test += CSWpython +RUNTIME_DEP_PKGS_CSWidle$(CVER) += CSWpython$(CVER) +RUNTIME_DEP_PKGS_CSWidle$(CVER) += CSWpython$(CVER)-tk +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWbdb47 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWbzip2 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibgdbm3 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpython$(DVER)-1-0 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWncurses +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWosslrt +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWreadline +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWsqlite3rt +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWzlib +RUNTIME_DEP_PKGS_CSWpython$(CVER)-devel += CSWlibpython$(DVER)-1-0 +RUNTIME_DEP_PKGS_CSWpython$(CVER)-devel += CSWpython$(CVER) +RUNTIME_DEP_PKGS_CSWpython$(CVER)-test += CSWpython$(CVER) +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibpython$(DVER)-1-0 +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWpython$(CVER) +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWtcl +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWtk # There are packages depending on libpython2.5, and listing CSWpython as the # dependency. RUNTIME_DEP_PKGS_CSWpython += CSWlibpython2-5-1-0 +CHECKPKG_OVERRIDES_CSWpython += surplus-dependency|CSWlibpython2-5-1-0 # This could be handled by automatic dependency detection -CHECKPKG_OVERRIDES_CSWidle += surplus-dependency|CSWpython-tk +CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython$(CVER)-tk -CATALOGNAME_CSWidle = idle -CATALOGNAME_CSWpython = python -CATALOGNAME_CSWpython-devel = python_devel -CATALOGNAME_CSWpython-tk = python_tk -CATALOGNAME_CSWpython-test = python_test -CATALOGNAME_CSWlibpython2-6-1-0 = libpython2_6_1_0 +# This package is not meant to be released +CHECKPKG_OVERRIDES_CSWpython-test += file-with-bad-content -SPKG_DESC_CSWidle = Python IDE -SPKG_DESC_CSWpython = A high-level scripting language. -SPKG_DESC_CSWpython-devel = Development Files for Python -SPKG_DESC_CSWpython-tk = Python Tk Interface (TkInter) -SPKG_DESC_CSWpython-test = Python Test modules -SPKG_DESC_CSWlibpython2-6-1-0 = Python shared library (2.6) +CATALOGNAME_CSWidle$(CVER) = idle +CATALOGNAME_CSWpython$(CVER) = python +CATALOGNAME_CSWpython$(CVER)-devel = python$(CVER)_devel +CATALOGNAME_CSWpython$(CVER)-tk = python$(CVER)_tk +CATALOGNAME_CSWpython$(CVER)-test = python$(CVER)_test +CATALOGNAME_CSWlibpython$(DVER)-1-0 = libpython$(UVER)_1_0 +SPKG_DESC_CSWidle$(CVER) = Python IDE +SPKG_DESC_CSWpython$(CVER) = A high-level scripting language, $(VER) series +SPKG_DESC_CSWpython$(CVER)-devel = Development Files for Python +SPKG_DESC_CSWpython$(CVER)-tk = Python Tk Interface (TkInter) +SPKG_DESC_CSWpython$(CVER)-test = Python Test modules +SPKG_DESC_CSWlibpython$(DVER)-1-0 = Python shared library ($(VER)) + LICENSE = LICENSE # This is an exception, since these are original Python packages. -CHECKPKG_OVERRIDES_CSWpython-test += pkgname-does-not-start-with-CSWpy- -CHECKPKG_OVERRIDES_CSWpython-test += catalogname-does-not-start-with-py_ -CHECKPKG_OVERRIDES_CSWpython-tk += pkgname-does-not-start-with-CSWpy- -CHECKPKG_OVERRIDES_CSWpython-tk += catalogname-does-not-start-with-py_ -CHECKPKG_OVERRIDES_CSWidle += pkgname-does-not-start-with-CSWpy- -CHECKPKG_OVERRIDES_CSWidle += catalogname-does-not-start-with-py_ -CHECKPKG_OVERRIDES_CSWpython-devel += pkgname-does-not-start-with-CSWpy- -CHECKPKG_OVERRIDES_CSWpython-devel += catalogname-does-not-start-with-py_ -CHECKPKG_OVERRIDES_CSWpython += pkgname-does-not-start-with-CSWpy- -CHECKPKG_OVERRIDES_CSWpython += catalogname-does-not-start-with-py_ -CHECKPKG_OVERRIDES_CSWpython += surplus-dependency|CSWlibpython2-5-1-0 +CHECKPKG_OVERRIDES_CSWidle$(CVER) += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWidle$(CVER) += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWpython$(CVER)-devel += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWpython$(CVER)-devel += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWpython$(CVER) += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWpython$(CVER) += catalogname-does-not-start-with-py_ include gar/category.mk + +post-configure-modulated: + for f in Modules/Setup \ + Makefile \ + Makefile.pre \ + Lib/idlelib/EditorWindow.py \ + Lib/idlelib/config-main.def \ + ; do \ + gsed -i -e 's+/usr/local+/opt/csw+g' $(WORKSRC)/$${f}; \ + gsed -i -e 's+/usr/share+/opt/csw/share+g' $(WORKSRC)/$${f}; \ + done + @$(MAKECOOKIE) Modified: csw/mgar/pkg/lang-python/python/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/checksums 2011-03-11 20:16:14 UTC (rev 13744) +++ csw/mgar/pkg/lang-python/python/trunk/checksums 2011-03-12 10:49:03 UTC (rev 13745) @@ -1,12 +1 @@ -62c1cbc3527d042195699edd2f4993b7 0001-FFI_DEFAULT_ABI-to-use-__i386.patch cf4e6881bb84a7ce6089e4a307f71f14 Python-2.6.6.tar.bz2 -42dd6523beb94a805d5764ae1276091c faqwiz.diff -5664b3970307d7d39d8d4061e7dccbb0 libpython2.5.so.1.0-isa-i386 -a87896c48b2f61b32053e6d02b07b022 libpython2.5.so.1.0-isa-sparcv8 -33f4094ee46ce865d3973a197f3fb4a0 makesetup.diff -22c5f741b1744213eaef0818ab280ad5 modules.diff -afcc79a94e2f8a576c7906a9700e35a0 multiprocess.diff -05724da367b025ce525de2bb704af6e3 pyport.diff -a1d114e8a20870675649aeef007a9cac python-config-in.diff -1d2763e140ff30a491b3ce11d1a44f97 setup.diff -d6c86beae46033be70c44c8e0e4c1908 site.diff Added: csw/mgar/pkg/lang-python/python/trunk/files/0010-Hardcoding-the-use-of-libffi.patch =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/files/0010-Hardcoding-the-use-of-libffi.patch (rev 0) +++ csw/mgar/pkg/lang-python/python/trunk/files/0010-Hardcoding-the-use-of-libffi.patch 2011-03-12 10:49:03 UTC (rev 13745) @@ -0,0 +1,33 @@ +From 57e87768fd28a35e762ceb0b467f501933faf60d Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 6 Feb 2011 00:19:42 +0100 +Subject: [PATCH] Hardcoding the use of libffi + +--- + setup.py | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/setup.py b/setup.py +index f875e6f..86f112a 100644 +--- a/setup.py ++++ b/setup.py +@@ -1812,7 +1812,7 @@ class PyBuildExt(build_ext): + return True + + def configure_ctypes(self, ext): +- if not self.use_system_libffi: ++ if not True: + if sys.platform == 'darwin': + return self.configure_ctypes_darwin(ext) + +@@ -1904,6 +1904,7 @@ class PyBuildExt(build_ext): + ext_test = Extension('_ctypes_test', + sources=['_ctypes/_ctypes_test.c']) + self.extensions.extend([ext, ext_test]) ++ ext.libraries.append('ffi') + + if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"): + return +-- +1.7.3.2 + Added: csw/mgar/pkg/lang-python/python/trunk/files/0011-OpenCSW-specific-libffi-include-dir.patch =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/files/0011-OpenCSW-specific-libffi-include-dir.patch (rev 0) +++ csw/mgar/pkg/lang-python/python/trunk/files/0011-OpenCSW-specific-libffi-include-dir.patch 2011-03-12 10:49:03 UTC (rev 13745) @@ -0,0 +1,25 @@ +From 3df52cf4b79e361ce963afb88fa4df8d6bbddcd7 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 6 Feb 2011 00:39:32 +0100 +Subject: [PATCH] OpenCSW-specific libffi include dir + +--- + setup.py | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/setup.py b/setup.py +index 86f112a..c6f9d5b 100644 +--- a/setup.py ++++ b/setup.py +@@ -358,6 +358,8 @@ class PyBuildExt(build_ext): + # Ensure that /opt/csw is always used + add_dir_to_list(self.compiler.library_dirs, '/opt/csw/lib') + add_dir_to_list(self.compiler.include_dirs, '/opt/csw/include') ++ # OpenCSW-specific include dir for libffi. ++ add_dir_to_list(self.compiler.include_dirs, '/opt/csw/lib/libffi-3.0.8/include') + + # Add paths specified in the environment variables LDFLAGS and + # CPPFLAGS for header and library files. +-- +1.7.3.2 + Added: csw/mgar/pkg/lang-python/python/trunk/files/0013-Use-opt-csw-bin-python-in-cgi.py.patch =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/files/0013-Use-opt-csw-bin-python-in-cgi.py.patch (rev 0) +++ csw/mgar/pkg/lang-python/python/trunk/files/0013-Use-opt-csw-bin-python-in-cgi.py.patch 2011-03-12 10:49:03 UTC (rev 13745) @@ -0,0 +1,30 @@ +From aa2f27e4f0ccee85cad628807e4ae86f050eb32a Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 6 Feb 2011 11:28:12 +0100 +Subject: [PATCH] Use /opt/csw/bin/python in cgi.py + +--- + Lib/cgi.py | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Lib/cgi.py b/Lib/cgi.py +index db10a62..ec4c702 100755 +--- a/Lib/cgi.py ++++ b/Lib/cgi.py +@@ -1,9 +1,9 @@ +-#! /usr/local/bin/python ++#! /opt/csw/bin/python + +-# NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is ++# NOTE: the above "/opt/csw/bin/python" is NOT a mistake. It is + # intentionally NOT "/usr/bin/env python". On many systems +-# (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI +-# scripts, and /usr/local/bin is the default directory where Python is ++# (e.g. Solaris), /opt/csw/bin is not in $PATH as passed to CGI ++# scripts, and /opt/csw/bin is the default directory where Python is + # installed, so /usr/bin/env would be unable to find python. Granted, + # binary installations by Linux vendors often install Python in + # /usr/bin. So let those vendors patch cgi.py to match their choice +-- +1.7.3.2 + Added: csw/mgar/pkg/lang-python/python/trunk/files/0015-Adding-opt-csw-lib-to-dyld.py.patch =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/files/0015-Adding-opt-csw-lib-to-dyld.py.patch (rev 0) +++ csw/mgar/pkg/lang-python/python/trunk/files/0015-Adding-opt-csw-lib-to-dyld.py.patch 2011-03-12 10:49:03 UTC (rev 13745) @@ -0,0 +1,27 @@ +From e3772e5060312a6f925b9747713d9d523a804f5f Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 6 Feb 2011 16:22:42 +0100 +Subject: [PATCH 15/15] Adding /opt/csw/lib to dyld.py + +--- + Lib/ctypes/macholib/dyld.py | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Lib/ctypes/macholib/dyld.py b/Lib/ctypes/macholib/dyld.py +index 9714ec6..32cac3f 100644 +--- a/Lib/ctypes/macholib/dyld.py ++++ b/Lib/ctypes/macholib/dyld.py +@@ -26,9 +26,9 @@ DEFAULT_FRAMEWORK_FALLBACK = [ + + DEFAULT_LIBRARY_FALLBACK = [ + os.path.expanduser("~/lib"), +- "/usr/local/lib", + "/lib", + "/usr/lib", ++ "/opt/csw/lib", + ] + + def ensure_utf8(s): +-- +1.7.3.2 + Added: csw/mgar/pkg/lang-python/python/trunk/files/0016-CSW-mimetypes.patch =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/files/0016-CSW-mimetypes.patch (rev 0) +++ csw/mgar/pkg/lang-python/python/trunk/files/0016-CSW-mimetypes.patch 2011-03-12 10:49:03 UTC (rev 13745) @@ -0,0 +1,30 @@ +From ca1537af5fa31adaae862911f508abfe12083c3b Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 6 Feb 2011 17:51:16 +0100 +Subject: [PATCH] CSW mimetypes + +--- + Lib/mimetypes.py | 7 +++---- + 1 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py +index f0a5ecf..f9f31cc 100644 +--- a/Lib/mimetypes.py ++++ b/Lib/mimetypes.py +@@ -37,10 +37,9 @@ knownfiles = [ + "/etc/httpd/conf/mime.types", # Apache + "/etc/apache/mime.types", # Apache 1 + "/etc/apache2/mime.types", # Apache 2 +- "/usr/local/etc/httpd/conf/mime.types", +- "/usr/local/lib/netscape/mime.types", +- "/usr/local/etc/httpd/conf/mime.types", # Apache 1.2 +- "/usr/local/etc/mime.types", # Apache 1.3 ++ "/opt/csw/apache2/etc/mime.types", # .CSW CSWapache2c, CSWapache2 ++ "/etc/opt/csw/nginx/mime.types", # .CSW CSWnginx ++ "/etc/opt/csw/mime.types", # .CSW CSWmutt-base + ] + + inited = False +-- +1.7.3.2 + Added: csw/mgar/pkg/lang-python/python/trunk/files/0017-Random-insignificant-removals-of-usr-local.patch =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/files/0017-Random-insignificant-removals-of-usr-local.patch (rev 0) +++ csw/mgar/pkg/lang-python/python/trunk/files/0017-Random-insignificant-removals-of-usr-local.patch 2011-03-12 10:49:03 UTC (rev 13745) @@ -0,0 +1,117 @@ +From ea64a94a70a7d6714160d78be6c55c914a6a1980 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 6 Feb 2011 16:24:39 +0100 +Subject: [PATCH 17/17] Random insignificant removals of /usr/local + +--- + Lib/distutils/unixccompiler.py | 2 +- + Lib/pydoc_topics.py | 2 +- + Lib/site.py | 8 ++++---- + Lib/trace.py | 8 ++++---- + Misc/python.man | 4 ++-- + 5 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py +index 7330303..004ae5d 100644 +--- a/Lib/distutils/unixccompiler.py ++++ b/Lib/distutils/unixccompiler.py +@@ -325,7 +325,7 @@ class UnixCCompiler(CCompiler): + + if sys.platform == 'darwin' and ( + dir.startswith('/System/') or ( +- dir.startswith('/usr/') and not dir.startswith('/usr/local/'))): ++ dir.startswith('/usr/') and not dir.startswith('/usr' '/local/'))): + + shared = os.path.join(sysroot, dir[1:], shared_f) + dylib = os.path.join(sysroot, dir[1:], dylib_f) +diff --git a/Lib/pydoc_topics.py b/Lib/pydoc_topics.py +index 572879f..e5fdbf5 100644 +--- a/Lib/pydoc_topics.py ++++ b/Lib/pydoc_topics.py +@@ -74,7 +74,7 @@ topics = {'assert': u'\nThe ``assert`` statement\n************************\n\nAs + 'typesfunctions': u'\nFunctions\n*********\n\nFunction objects are created by function definitions. The only\noperation on a function object is to call it: ``func(argument-list)``.\n\nThere are really two flavors of function objects: built-in functions\nand user-defined functions. Both support the same operation (to call\nthe function), but the implementation is different, hence the\ndifferent object types.\n\nSee *Function definitions* for more information.\n', + 'typesmapping': u'\nMapping Types --- ``dict``\n**************************\n\nA *mapping* object maps *hashable* values to arbitrary objects.\nMappings are mutable objects. There is currently only one standard\nmapping type, the *dictionary*. (For other containers see the built\nin ``list``, ``set``, and ``tuple`` classes, and the ``collections``\nmodule.)\n\nA dictionary\'s keys are *almost* arbitrary values. Values that are\nnot *hashable*, that is, values containing lists, dictionaries or\nother mutable types (that are compared by value rather than by object\nidentity) may not be used as keys. Numeric types used for keys obey\nthe normal rules for numeric comparison: if two numbers compare equal\n(such as ``1`` and ``1.0``) then they can be used interchangeably to\nindex the same dictionary entry. (Note however, that since computers\nstore floating-point numbers as approximations it is usually unwise to\nuse them as dictionary keys.)\n\nDictionaries can be created by placing a comma-separated list of\n``key: value`` pairs within braces, for example: ``{\'jack\': 4098,\n\'sjoerd\': 4127}`` or ``{4098: \'jack\', 4127: \'sjoerd\'}``, or by the\n``dict`` constructor.\n\nclass class dict([arg])\n\n Return a new dictionary initialized from an optional positional\n argument or from a set of keyword arguments. If no arguments are\n given, return a new empty dictionary. If the positional argument\n *arg* is a mapping object, return a dictionary mapping the same\n keys to the same values as does the mapping object. Otherwise the\n positional argument must be a sequence, a container that supports\n iteration, or an iterator object. The elements of the argument\n must each also be of one of those kinds, and each must in turn\n contain exactly two objects. The first is used as a key in the new\n dictionary, and the second as the key\'s value. If a given key is\n seen more than once, the last value associated with it is reta ined\n in the new dictionary.\n\n If keyword arguments are given, the keywords themselves with their\n associated values are added as items to the dictionary. If a key is\n specified both in the positional argument and as a keyword\n argument, the value associated with the keyword is retained in the\n dictionary. For example, these all return a dictionary equal to\n ``{"one": 2, "two": 3}``:\n\n * ``dict(one=2, two=3)``\n\n * ``dict({\'one\': 2, \'two\': 3})``\n\n * ``dict(zip((\'one\', \'two\'), (2, 3)))``\n\n * ``dict([[\'two\', 3], [\'one\', 2]])``\n\n The first example only works for keys that are valid Python\n identifiers; the others work with any valid keys.\n\n New in version 2.2.\n\n Changed in version 2.3: Support for building a dictionary from\n keyword arguments added.\n\n These are the operations that dictionaries support (and therefore,\n custom mapping types should support too):\n\n len(d)\n\n Return the number of ite ms in the dictionary *d*.\n\n d[key]\n\n Return the item of *d* with key *key*. Raises a ``KeyError`` if\n *key* is not in the map.\n\n New in version 2.5: If a subclass of dict defines a method\n ``__missing__()``, if the key *key* is not present, the\n ``d[key]`` operation calls that method with the key *key* as\n argument. The ``d[key]`` operation then returns or raises\n whatever is returned or raised by the ``__missing__(key)`` call\n if the key is not present. No other operations or methods invoke\n ``__missing__()``. If ``__missing__()`` is not defined,\n ``KeyError`` is raised. ``__missing__()`` must be a method; it\n cannot be an instance variable. For an example, see\n ``collections.defaultdict``.\n\n d[key] = value\n\n Set ``d[key]`` to *value*.\n\n del d[key]\n\n Remove ``d[key]`` from *d*. Raises a ``KeyError`` if *key* is\n not in the map.\n\n key in d\n\n Return ``True` ` if *d* has a key *key*, else ``False``.\n\n New in version 2.2.\n\n key not in d\n\n Equivalent to ``not key in d``.\n\n New in version 2.2.\n\n iter(d)\n\n Return an iterator over the keys of the dictionary. This is a\n shortcut for ``iterkeys()``.\n\n clear()\n\n Remove all items from the dictionary.\n\n copy()\n\n Return a shallow copy of the dictionary.\n\n fromkeys(seq[, value])\n\n Create a new dictionary with keys from *seq* and values set to\n *value*.\n\n ``fromkeys()`` is a class method that returns a new dictionary.\n *value* defaults to ``None``.\n\n New in version 2.3.\n\n get(key[, default])\n\n Return the value for *key* if *key* is in the dictionary, else\n *default*. If *default* is not given, it defaults to ``None``,\n so that this method never raises a ``KeyError``.\n\n has_key(key)\n\n Test for the presence of *key* in the dictionary. ``has_key()``\n is deprecated in favor of ``key in d``.\n\n items()\n\n Return a copy of the dictionary\'s list of ``(key, value)``\n pairs.\n\n **CPython implementation detail:** Keys and values are listed in\n an arbitrary order which is non-random, varies across Python\n implementations, and depends on the dictionary\'s history of\n insertions and deletions.\n\n If ``items()``, ``keys()``, ``values()``, ``iteritems()``,\n ``iterkeys()``, and ``itervalues()`` are called with no\n intervening modifications to the dictionary, the lists will\n directly correspond. This allows the creation of ``(value,\n key)`` pairs using ``zip()``: ``pairs = zip(d.values(),\n d.keys())``. The same relationship holds for the ``iterkeys()``\n and ``itervalues()`` methods: ``pairs = zip(d.itervalues(),\n d.iterkeys())`` provides the same value for ``pairs``. Another\n way to create the same list is ``pairs = [(v, k) for (k, v) in\n d.iteritems()]``.\n\n iteritems()\n\n Return an iterator over the dictionary\'s ``(key, value)`` pairs.\n See the note for ``dict.items()``.\n\n Using ``iteritems()`` while adding or deleting entries in the\n dictionary may raise a ``RuntimeError`` or fail to iterate over\n all entries.\n\n New in version 2.2.\n\n iterkeys()\n\n Return an iterator over the dictionary\'s keys. See the note for\n ``dict.items()``.\n\n Using ``iterkeys()`` while adding or deleting entries in the\n dictionary may raise a ``RuntimeError`` or fail to iterate over\n all entries.\n\n New in version 2.2.\n\n itervalues()\n\n Return an iterator over the dictionary\'s values. See the note\n for ``dict.items()``.\n\n Using ``itervalues()`` while adding or deleting entries in the\n dictionary may raise a ``RuntimeError`` or fail to iterate over\n all entries.\n\n New in version 2.2.\n\n keys()\n\n R eturn a copy of the dictionary\'s list of keys. See the note\n for ``dict.items()``.\n\n pop(key[, default])\n\n If *key* is in the dictionary, remove it and return its value,\n else return *default*. If *default* is not given and *key* is\n not in the dictionary, a ``KeyError`` is raised.\n\n New in version 2.3.\n\n popitem()\n\n Remove and return an arbitrary ``(key, value)`` pair from the\n dictionary.\n\n ``popitem()`` is useful to destructively iterate over a\n dictionary, as often used in set algorithms. If the dictionary\n is empty, calling ``popitem()`` raises a ``KeyError``.\n\n setdefault(key[, default])\n\n If *key* is in the dictionary, return its value. If not, insert\n *key* with a value of *default* and return *default*. *default*\n defaults to ``None``.\n\n update([other])\n\n Update the dictionary with the key/value pairs from *other*,\n overwriting existing keys. Return ``None``.\n\n ``update()`` accepts either another dictionary object or an\n iterable of key/value pairs (as a tuple or other iterable of\n length two). If keyword arguments are specified, the dictionary\n is then updated with those key/value pairs: ``d.update(red=1,\n blue=2)``.\n\n Changed in version 2.4: Allowed the argument to be an iterable\n of key/value pairs and allowed keyword arguments.\n\n values()\n\n Return a copy of the dictionary\'s list of values. See the note\n for ``dict.items()``.\n', + 'typesmethods': u"\nMethods\n*******\n\nMethods are functions that are called using the attribute notation.\nThere are two flavors: built-in methods (such as ``append()`` on\nlists) and class instance methods. Built-in methods are described\nwith the types that support them.\n\nThe implementation adds two special read-only attributes to class\ninstance methods: ``m.im_self`` is the object on which the method\noperates, and ``m.im_func`` is the function implementing the method.\nCalling ``m(arg-1, arg-2, ..., arg-n)`` is completely equivalent to\ncalling ``m.im_func(m.im_self, arg-1, arg-2, ..., arg-n)``.\n\nClass instance methods are either *bound* or *unbound*, referring to\nwhether the method was accessed through an instance or a class,\nrespectively. When a method is unbound, its ``im_self`` attribute\nwill be ``None`` and if called, an explicit ``self`` object must be\npassed as the first argument. In this case, ``self`` must be an\ninstance of the unbound method's class (or a subclass of that class),\notherwise a ``TypeError`` is raised.\n\nLike function objects, methods objects support getting arbitrary\nattributes. However, since method attributes are actually stored on\nthe underlying function object (``meth.im_func``), setting method\nattributes on either bound or unbound methods is disallowed.\nAttempting to set a method attribute results in a ``TypeError`` being\nraised. In order to set a method attribute, you need to explicitly\nset it on the underlying function object:\n\n class C:\n def method(self):\n pass\n\n c = C()\n c.method.im_func.whoami = 'my name is c'\n\nSee *The standard type hierarchy* for more information.\n", +- 'typesmodules': u"\nModules\n*******\n\nThe only special operation on a module is attribute access:\n``m.name``, where *m* is a module and *name* accesses a name defined\nin *m*'s symbol table. Module attributes can be assigned to. (Note\nthat the ``import`` statement is not, strictly speaking, an operation\non a module object; ``import foo`` does not require a module object\nnamed *foo* to exist, rather it requires an (external) *definition*\nfor a module named *foo* somewhere.)\n\nA special member of every module is ``__dict__``. This is the\ndictionary containing the module's symbol table. Modifying this\ndictionary will actually change the module's symbol table, but direct\nassignment to the ``__dict__`` attribute is not possible (you can\nwrite ``m.__dict__['a'] = 1``, which defines ``m.a`` to be ``1``, but\nyou can't write ``m.__dict__ = {}``). Modifying ``__dict__`` directly\nis not recommended.\n\nModules built into the interpreter are written like this: ````. If loaded from a file, they are written as\n````.\n", ++ 'typesmodules': u"\nModules\n*******\n\nThe only special operation on a module is attribute access:\n``m.name``, where *m* is a module and *name* accesses a name defined\nin *m*'s symbol table. Module attributes can be assigned to. (Note\nthat the ``import`` statement is not, strictly speaking, an operation\non a module object; ``import foo`` does not require a module object\nnamed *foo* to exist, rather it requires an (external) *definition*\nfor a module named *foo* somewhere.)\n\nA special member of every module is ``__dict__``. This is the\ndictionary containing the module's symbol table. Modifying this\ndictionary will actually change the module's symbol table, but direct\nassignment to the ``__dict__`` attribute is not possible (you can\nwrite ``m.__dict__['a'] = 1``, which defines ``m.a`` to be ``1``, but\nyou can't write ``m.__dict__ = {}``). Modifying ``__dict__`` directly\nis not recommended.\n\nModules built into the interpreter are written like this: ````. If loaded from a file, they are written as\n````.\n", + 'typesseq': u'\nSequence Types --- ``str``, ``unicode``, ``list``, ``tuple``, ``buffer``, ``xrange``\n************************************************************************************\n\nThere are six sequence types: strings, Unicode strings, lists, tuples,\nbuffers, and xrange objects.\n\nFor other containers see the built in ``dict`` and ``set`` classes,\nand the ``collections`` module.\n\nString literals are written in single or double quotes: ``\'xyzzy\'``,\n``"frobozz"``. See *String literals* for more about string literals.\nUnicode strings are much like strings, but are specified in the syntax\nusing a preceding ``\'u\'`` character: ``u\'abc\'``, ``u"def"``. In\naddition to the functionality described here, there are also string-\nspecific methods described in the *String Methods* section. Lists are\nconstructed with square brackets, separating items with commas: ``[a,\nb, c]``. Tuples are constructed by the comma operator (not within\nsquare brackets), with or without enclosing parentheses, but an empty\ntuple must have the enclosing parentheses, such as ``a, b, c`` or\n``()``. A single item tuple must have a trailing comma, such as\n``(d,)``.\n\nBuffer objects are not directly supported by Python syntax, but can be\ncreated by calling the built-in function ``buffer()``. They don\'t\nsupport concatenation or repetition.\n\nObjects of type xrange are similar to buffers in that there is no\nspecific syntax to create them, but they are created using the\n``xrange()`` function. They don\'t support slicing, concatenation or\nrepetition, and using ``in``, ``not in``, ``min()`` or ``max()`` on\nthem is inefficient.\n\nMost sequence types support the following operations. The ``in`` and\n``not in`` operations have the same priorities as the comparison\noperations. The ``+`` and ``*`` operations have the same priority as\nthe corresponding numeric operations. [3] Additional methods are\nprovided for *Mutable Sequence Types*.\n\nThis t able lists the sequence operations sorted in ascending priority\n(operations in the same box have the same priority). In the table,\n*s* and *t* are sequences of the same type; *n*, *i* and *j* are\nintegers:\n\n+--------------------+----------------------------------+------------+\n| Operation | Result | Notes |\n+====================+==================================+============+\n| ``x in s`` | ``True`` if an item of *s* is | (1) |\n| | equal to *x*, else ``False`` | |\n+--------------------+----------------------------------+------------+\n| ``x not in s`` | ``False`` if an item of *s* is | (1) |\n| | equal to *x*, else ``True`` | |\n+--------------------+----------------------------------+------------+\n| ``s + t`` | the concatenation of *s* and *t* | (6) |\n+--------------------+---------------------------------- +------------+\n| ``s * n, n * s`` | *n* shallow copies of *s* | (2) |\n| | concatenated | |\n+--------------------+----------------------------------+------------+\n| ``s[i]`` | *i*\'th item of *s*, origin 0 | (3) |\n+--------------------+----------------------------------+------------+\n| ``s[i:j]`` | slice of *s* from *i* to *j* | (3)(4) |\n+--------------------+----------------------------------+------------+\n| ``s[i:j:k]`` | slice of *s* from *i* to *j* | (3)(5) |\n| | with step *k* | |\n+--------------------+----------------------------------+------------+\n| ``len(s)`` | length of *s* | |\n+--------------------+----------------------------------+------------+\n| ``min(s)`` | smallest item of *s* | |\n+--------------------+-------------- --------------------+------------+\n| ``max(s)`` | largest item of *s* | |\n+--------------------+----------------------------------+------------+\n\nSequence types also support comparisons. In particular, tuples and\nlists are compared lexicographically by comparing corresponding\nelements. This means that to compare equal, every element must compare\nequal and the two sequences must be of the same type and have the same\nlength. (For full details see *Comparisons* in the language\nreference.)\n\nNotes:\n\n1. When *s* is a string or Unicode string object the ``in`` and ``not\n in`` operations act like a substring test. In Python versions\n before 2.3, *x* had to be a string of length 1. In Python 2.3 and\n beyond, *x* may be a string of any length.\n\n2. Values of *n* less than ``0`` are treated as ``0`` (which yields an\n empty sequence of the same type as *s*). Note also that the copies\n are shallow; nested structures are not c opied. This often haunts\n new Python programmers; consider:\n\n >>> lists = [[]] * 3\n >>> lists\n [[], [], []]\n >>> lists[0].append(3)\n >>> lists\n [[3], [3], [3]]\n\n What has happened is that ``[[]]`` is a one-element list containing\n an empty list, so all three elements of ``[[]] * 3`` are (pointers\n to) this single empty list. Modifying any of the elements of\n ``lists`` modifies this single list. You can create a list of\n different lists this way:\n\n >>> lists = [[] for i in range(3)]\n >>> lists[0].append(3)\n >>> lists[1].append(5)\n >>> lists[2].append(7)\n >>> lists\n [[3], [5], [7]]\n\n3. If *i* or *j* is negative, the index is relative to the end of the\n string: ``len(s) + i`` or ``len(s) + j`` is substituted. But note\n that ``-0`` is still ``0``.\n\n4. The slice of *s* from *i* to *j* is defined as the sequence of\n items with index *k* such that ``i <= k < j``. If *i* or *j* is\n greater than ``len(s)``, use ``len(s)``. If *i* is omitted or\n ``None``, use ``0``. If *j* is omitted or ``None``, use\n ``len(s)``. If *i* is greater than or equal to *j*, the slice is\n empty.\n\n5. The slice of *s* from *i* to *j* with step *k* is defined as the\n sequence of items with index ``x = i + n*k`` such that ``0 <= n <\n (j-i)/k``. In other words, the indices are ``i``, ``i+k``,\n ``i+2*k``, ``i+3*k`` and so on, stopping when *j* is reached (but\n never including *j*). If *i* or *j* is greater than ``len(s)``,\n use ``len(s)``. If *i* or *j* are omitted or ``None``, they become\n "end" values (which end depends on the sign of *k*). Note, *k*\n cannot be zero. If *k* is ``None``, it is treated like ``1``.\n\n6. **CPython implementation detail:** If *s* and *t* are both strings,\n some Python implementations such as CPython can usually perform an\n in-place optimization for assignments of the form ``s = s + t`` or\n ``s += t``. When applicable, this opt imization makes quadratic\n run-time much less likely. This optimization is both version and\n implementation dependent. For performance sensitive code, it is\n preferable to use the ``str.join()`` method which assures\n consistent linear concatenation performance across versions and\n implementations.\n\n Changed in version 2.4: Formerly, string concatenation never\n occurred in-place.\n\n\nString Methods\n==============\n\nBelow are listed the string methods which both 8-bit strings and\nUnicode objects support. Note that none of these methods take keyword\narguments.\n\nIn addition, Python\'s strings support the sequence type methods\ndescribed in the *Sequence Types --- str, unicode, list, tuple,\nbuffer, xrange* section. To output formatted strings use template\nstrings or the ``%`` operator described in the *String Formatting\nOperations* section. Also, see the ``re`` module for string functions\nbased on regular expressions.\n\nstr.capitalize()\n\n R eturn a copy of the string with its first character capitalized\n and the rest lowercased.\n\n For 8-bit strings, this method is locale-dependent.\n\nstr.center(width[, fillchar])\n\n Return centered in a string of length *width*. Padding is done\n using the specified *fillchar* (default is a space).\n\n Changed in version 2.4: Support for the *fillchar* argument.\n\nstr.count(sub[, start[, end]])\n\n Return the number of non-overlapping occurrences of substring *sub*\n in the range [*start*, *end*]. Optional arguments *start* and\n *end* are interpreted as in slice notation.\n\nstr.decode([encoding[, errors]])\n\n Decodes the string using the codec registered for *encoding*.\n *encoding* defaults to the default string encoding. *errors* may\n be given to set a different error handling scheme. The default is\n ``\'strict\'``, meaning that encoding errors raise ``UnicodeError``.\n Other possible values are ``\'ignore\'``, ``\'replace\'`` and any o ther\n name registered via ``codecs.register_error()``, see section *Codec\n Base Classes*.\n\n New in version 2.2.\n\n Changed in version 2.3: Support for other error handling schemes\n added.\n\nstr.encode([encoding[, errors]])\n\n Return an encoded version of the string. Default encoding is the\n current default string encoding. *errors* may be given to set a\n different error handling scheme. The default for *errors* is\n ``\'strict\'``, meaning that encoding errors raise a\n ``UnicodeError``. Other possible values are ``\'ignore\'``,\n ``\'replace\'``, ``\'xmlcharrefreplace\'``, ``\'backslashreplace\'`` and\n any other name registered via ``codecs.register_error()``, see\n section *Codec Base Classes*. For a list of possible encodings, see\n section *Standard Encodings*.\n\n New in version 2.0.\n\n Changed in version 2.3: Support for ``\'xmlcharrefreplace\'`` and\n ``\'backslashreplace\'`` and other error handling schemes added.\n\n str.endswith(suffix[, start[, end]])\n\n Return ``True`` if the string ends with the specified *suffix*,\n otherwise return ``False``. *suffix* can also be a tuple of\n suffixes to look for. With optional *start*, test beginning at\n that position. With optional *end*, stop comparing at that\n position.\n\n Changed in version 2.5: Accept tuples as *suffix*.\n\nstr.expandtabs([tabsize])\n\n Return a copy of the string where all tab characters are replaced\n by one or more spaces, depending on the current column and the\n given tab size. The column number is reset to zero after each\n newline occurring in the string. If *tabsize* is not given, a tab\n size of ``8`` characters is assumed. This doesn\'t understand other\n non-printing characters or escape sequences.\n\nstr.find(sub[, start[, end]])\n\n Return the lowest index in the string where substring *sub* is\n found, such that *sub* is contained in the slice ``s[start:end]``.\n Optional a rguments *start* and *end* are interpreted as in slice\n notation. Return ``-1`` if *sub* is not found.\n\nstr.format(*args, **kwargs)\n\n Perform a string formatting operation. The string on which this\n method is called can contain literal text or replacement fields\n delimited by braces ``{}``. Each replacement field contains either\n the numeric index of a positional argument, or the name of a\n keyword argument. Returns a copy of the string where each\n replacement field is replaced with the string value of the\n corresponding argument.\n\n >>> "The sum of 1 + 2 is {0}".format(1+2)\n \'The sum of 1 + 2 is 3\'\n\n See *Format String Syntax* for a description of the various\n formatting options that can be specified in format strings.\n\n This method of string formatting is the new standard in Python 3.0,\n and should be preferred to the ``%`` formatting described in\n *String Formatting Operations* in new code.\n\n New in version 2.6.\ n\nstr.index(sub[, start[, end]])\n\n Like ``find()``, but raise ``ValueError`` when the substring is not\n found.\n\nstr.isalnum()\n\n Return true if all characters in the string are alphanumeric and\n there is at least one character, false otherwise.\n\n For 8-bit strings, this method is locale-dependent.\n\nstr.isalpha()\n\n Return true if all characters in the string are alphabetic and\n there is at least one character, false otherwise.\n\n For 8-bit strings, this method is locale-dependent.\n\nstr.isdigit()\n\n Return true if all characters in the string are digits and there is\n at least one character, false otherwise.\n\n For 8-bit strings, this method is locale-dependent.\n\nstr.islower()\n\n Return true if all cased characters in the string are lowercase and\n there is at least one cased character, false otherwise.\n\n For 8-bit strings, this method is locale-dependent.\n\nstr.isspace()\n\n Return true if there are only whitespace chara cters in the string\n and there is at least one character, false otherwise.\n\n For 8-bit strings, this method is locale-dependent.\n\nstr.istitle()\n\n Return true if the string is a titlecased string and there is at\n least one character, for example uppercase characters may only\n follow uncased characters and lowercase characters only cased ones.\n Return false otherwise.\n\n For 8-bit strings, this method is locale-dependent.\n\nstr.isupper()\n\n Return true if all cased characters in the string are uppercase and\n there is at least one cased character, false otherwise.\n\n For 8-bit strings, this method is locale-dependent.\n\nstr.join(iterable)\n\n Return a string which is the concatenation of the strings in the\n *iterable* *iterable*. The separator between elements is the\n string providing this method.\n\nstr.ljust(width[, fillchar])\n\n Return the string left justified in a string of length *width*.\n Padding is done using the specif ied *fillchar* (default is a\n space). The original string is returned if *width* is less than\n ``len(s)``.\n\n Changed in version 2.4: Support for the *fillchar* argument.\n\nstr.lower()\n\n Return a copy of the string converted to lowercase.\n\n For 8-bit strings, this method is locale-dependent.\n\nstr.lstrip([chars])\n\n Return a copy of the string with leading characters removed. The\n *chars* argument is a string specifying the set of characters to be\n removed. If omitted or ``None``, the *chars* argument defaults to\n removing whitespace. The *chars* argument is not a prefix; rather,\n all combinations of its values are stripped:\n\n >>> \' spacious \'.lstrip()\n \'spacious \'\n >>> \'www.example.com\'.lstrip(\'cmowz.\')\n \'example.com\'\n\n Changed in version 2.2.2: Support for the *chars* argument.\n\nstr.partition(sep)\n\n Split the string at the first occurrence of *sep*, and return a\n 3-tuple containing the part bef ore the separator, the separator\n itself, and the part after the separator. If the separator is not\n found, return a 3-tuple containing the string itself, followed by\n two empty strings.\n\n New in version 2.5.\n\nstr.replace(old, new[, count])\n\n Return a copy of the string with all occurrences of substring *old*\n replaced by *new*. If the optional argument *count* is given, only\n the first *count* occurrences are replaced.\n\nstr.rfind(sub[, start[, end]])\n\n Return the highest index in the string where substring *sub* is\n found, such that *sub* is contained within ``s[start:end]``.\n Optional arguments *start* and *end* are interpreted as in slice\n notation. Return ``-1`` on failure.\n\nstr.rindex(sub[, start[, end]])\n\n Like ``rfind()`` but raises ``ValueError`` when the substring *sub*\n is not found.\n\nstr.rjust(width[, fillchar])\n\n Return the string right justified in a string of length *width*.\n Padding is done using the specified *fillchar* (default is a\n space). The original string is returned if *width* is less than\n ``len(s)``.\n\n Changed in version 2.4: Support for the *fillchar* argument.\n\nstr.rpartition(sep)\n\n Split the string at the last occurrence of *sep*, and return a\n 3-tuple containing the part before the separator, the separator\n itself, and the part after the separator. If the separator is not\n found, return a 3-tuple containing two empty strings, followed by\n the string itself.\n\n New in version 2.5.\n\nstr.rsplit([sep[, maxsplit]])\n\n Return a list of the words in the string, using *sep* as the\n delimiter string. If *maxsplit* is given, at most *maxsplit* splits\n are done, the *rightmost* ones. If *sep* is not specified or\n ``None``, any whitespace string is a separator. Except for\n splitting from the right, ``rsplit()`` behaves like ``split()``\n which is described in detail below.\n\n New in version 2.4.\n\nstr.rstrip([c hars])\n\n Return a copy of the string with trailing characters removed. The\n *chars* argument is a string specifying the set of characters to be\n removed. If omitted or ``None``, the *chars* argument defaults to\n removing whitespace. The *chars* argument is not a suffix; rather,\n all combinations of its values are stripped:\n\n >>> \' spacious \'.rstrip()\n \' spacious\'\n >>> \'mississippi\'.rstrip(\'ipz\')\n \'mississ\'\n\n Changed in version 2.2.2: Support for the *chars* argument.\n\nstr.split([sep[, maxsplit]])\n\n Return a list of the words in the string, using *sep* as the\n delimiter string. If *maxsplit* is given, at most *maxsplit*\n splits are done (thus, the list will have at most ``maxsplit+1``\n elements). If *maxsplit* is not specified, then there is no limit\n on the number of splits (all possible splits are made).\n\n If *sep* is given, consecutive delimiters are not grouped together\n and are deemed to delim it empty strings (for example,\n ``\'1,,2\'.split(\',\')`` returns ``[\'1\', \'\', \'2\']``). The *sep*\n argument may consist of multiple characters (for example,\n ``\'1<>2<>3\'.split(\'<>\')`` returns ``[\'1\', \'2\', \'3\']``). Splitting\n an empty string with a specified separator returns ``[\'\']``.\n\n If *sep* is not specified or is ``None``, a different splitting\n algorithm is applied: runs of consecutive whitespace are regarded\n as a single separator, and the result will contain no empty strings\n at the start or end if the string has leading or trailing\n whitespace. Consequently, splitting an empty string or a string\n consisting of just whitespace with a ``None`` separator returns\n ``[]``.\n\n For example, ``\' 1 2 3 \'.split()`` returns ``[\'1\', \'2\', \'3\']``,\n and ``\' 1 2 3 \'.split(None, 1)`` returns ``[\'1\', \'2 3 \']``.\n\nstr.splitlines([keepends])\n\n Return a list of the lines in the string, breaking at line\n boundaries. Line breaks are not included in the resulting list\n unless *keepends* is given and true.\n\nstr.startswith(prefix[, start[, end]])\n\n Return ``True`` if string starts with the *prefix*, otherwise\n return ``False``. *prefix* can also be a tuple of prefixes to look\n for. With optional *start*, test string beginning at that\n position. With optional *end*, stop comparing string at that\n position.\n\n Changed in version 2.5: Accept tuples as *prefix*.\n\nstr.strip([chars])\n\n Return a copy of the string with the leading and trailing\n characters removed. The *chars* argument is a string specifying the\n set of characters to be removed. If omitted or ``None``, the\n *chars* argument defaults to removing whitespace. The *chars*\n argument is not a prefix or suffix; rather, all combinations of its\n values are stripped:\n\n >>> \' spacious \'.strip()\n \'spacious\'\n >>> \'www.example.com\'.strip(\'cmowz.\')\n \'ex ample\'\n\n Changed in version 2.2.2: Support for the *chars* argument.\n\nstr.swapcase()\n\n Return a copy of the string with uppercase characters converted to\n lowercase and vice versa.\n\n For 8-bit strings, this method is locale-dependent.\n\nstr.title()\n\n Return a titlecased version of the string where words start with an\n uppercase character and the remaining characters are lowercase.\n\n The algorithm uses a simple language-independent definition of a\n word as groups of consecutive letters. The definition works in\n many contexts but it means that apostrophes in contractions and\n possessives form word boundaries, which may not be the desired\n result:\n\n >>> "they\'re bill\'s friends from the UK".title()\n "They\'Re Bill\'S Friends From The Uk"\n\n A workaround for apostrophes can be constructed using regular\n expressions:\n\n >>> import re\n >>> def titlecase(s):\n return re.sub(r"[A-Za-z]+(\'[A-Za-z ]+)?",\n lambda mo: mo.group(0)[0].upper() +\n mo.group(0)[1:].lower(),\n s)\n\n >>> titlecase("they\'re bill\'s friends.")\n "They\'re Bill\'s Friends."\n\n For 8-bit strings, this method is locale-dependent.\n\nstr.translate(table[, deletechars])\n\n Return a copy of the string where all characters occurring in the\n optional argument *deletechars* are removed, and the remaining\n characters have been mapped through the given translation table,\n which must be a string of length 256.\n\n You can use the ``maketrans()`` helper function in the ``string``\n module to create a translation table. For string objects, set the\n *table* argument to ``None`` for translations that only delete\n characters:\n\n >>> \'read this short text\'.translate(None, \'aeiou\')\n \'rd ths shrt txt\'\n\n New in version 2.6: Support for a ``None`` *table* argument.\n\n Fo r Unicode objects, the ``translate()`` method does not accept the\n optional *deletechars* argument. Instead, it returns a copy of the\n *s* where all characters have been mapped through the given\n translation table which must be a mapping of Unicode ordinals to\n Unicode ordinals, Unicode strings or ``None``. Unmapped characters\n are left untouched. Characters mapped to ``None`` are deleted.\n Note, a more flexible approach is to create a custom character\n mapping codec using the ``codecs`` module (see ``encodings.cp1251``\n for an example).\n\nstr.upper()\n\n Return a copy of the string converted to uppercase.\n\n For 8-bit strings, this method is locale-dependent.\n\nstr.zfill(width)\n\n Return the numeric string left filled with zeros in a string of\n length *width*. A sign prefix is handled correctly. The original\n string is returned if *width* is less than ``len(s)``.\n\n New in version 2.2.2.\n\nThe following methods are present only on unicode objects:\n\nunicode.isnumeric()\n\n Return ``True`` if there are only numeric characters in S,\n ``False`` otherwise. Numeric characters include digit characters,\n and all characters that have the Unicode numeric value property,\n e.g. U+2155, VULGAR FRACTION ONE FIFTH.\n\nunicode.isdecimal()\n\n Return ``True`` if there are only decimal characters in S,\n ``False`` otherwise. Decimal characters include digit characters,\n and all characters that that can be used to form decimal-radix\n numbers, e.g. U+0660, ARABIC-INDIC DIGIT ZERO.\n\n\nString Formatting Operations\n============================\n\nString and Unicode objects have one unique built-in operation: the\n``%`` operator (modulo). This is also known as the string\n*formatting* or *interpolation* operator. Given ``format % values``\n(where *format* is a string or Unicode object), ``%`` conversion\nspecifications in *format* are replaced with zero or more elements of\n*values*. The effe ct is similar to the using ``sprintf()`` in the C\nlanguage. If *format* is a Unicode object, or if any of the objects\nbeing converted using the ``%s`` conversion are Unicode objects, the\nresult will also be a Unicode object.\n\nIf *format* requires a single argument, *values* may be a single non-\ntuple object. [4] Otherwise, *values* must be a tuple with exactly\nthe number of items specified by the format string, or a single\nmapping object (for example, a dictionary).\n\nA conversion specifier contains two or more characters and has the\nfollowing components, which must occur in this order:\n\n1. The ``\'%\'`` character, which marks the start of the specifier.\n\n2. Mapping key (optional), consisting of a parenthesised sequence of\n characters (for example, ``(somename)``).\n\n3. Conversion flags (optional), which affect the result of some\n conversion types.\n\n4. Minimum field width (optional). If specified as an ``\'*\'``\n (asterisk), the actual width is r ead from the next element of the\n tuple in *values*, and the object to convert comes after the\n minimum field width and optional precision.\n\n5. Precision (optional), given as a ``\'.\'`` (dot) followed by the\n precision. If specified as ``\'*\'`` (an asterisk), the actual width\n is read from the next element of the tuple in *values*, and the\n value to convert comes after the precision.\n\n6. Length modifier (optional).\n\n7. Conversion type.\n\nWhen the right argument is a dictionary (or other mapping type), then\nthe formats in the string *must* include a parenthesised mapping key\ninto that dictionary inserted immediately after the ``\'%\'`` character.\nThe mapping key selects the value to be formatted from the mapping.\nFor example:\n\n>>> print \'%(language)s has %(#)03d quote types.\' % \\\n... {\'language\': "Python", "#": 2}\nPython has 002 quote types.\n\nIn this case no ``*`` specifiers may occur in a format (since they\nrequire a sequential parameter list).\n\nThe conversion flag characters are:\n\n+-----------+-----------------------------------------------------------------------+\n| Flag | Meaning |\n+===========+=======================================================================+\n| ``\'#\'`` | The value conversion will use the "alternate form" (where defined |\n| | below). |\n+-----------+-----------------------------------------------------------------------+\n| ``\'0\'`` | The conversion will be zero padded for numeric values. |\n+-----------+-----------------------------------------------------------------------+\n| ``\'-\'`` | The converted value is left adjusted (overrides the ``\'0\'`` |\n| | conversion if both are given). |\n+-----------+--------------------------------------- --------------------------------+\n| ``\' \'`` | (a space) A blank should be left before a positive number (or empty |\n| | string) produced by a signed conversion. |\n+-----------+-----------------------------------------------------------------------+\n| ``\'+\'`` | A sign character (``\'+\'`` or ``\'-\'``) will precede the conversion |\n| | (overrides a "space" flag). |\n+-----------+-----------------------------------------------------------------------+\n\nA length modifier (``h``, ``l``, or ``L``) may be present, but is\nignored as it is not necessary for Python -- so e.g. ``%ld`` is\nidentical to ``%d``.\n\nThe conversion types are:\n\n+--------------+-------------------------------------------------------+---------+\n| Conversion | Meaning | Notes |\n+==============+===================================================== ==+=========+\n| ``\'d\'`` | Signed integer decimal. | |\n+--------------+-------------------------------------------------------+---------+\n| ``\'i\'`` | Signed integer decimal. | |\n+--------------+-------------------------------------------------------+---------+\n| ``\'o\'`` | Signed octal value. | (1) |\n+--------------+-------------------------------------------------------+---------+\n| ``\'u\'`` | Obsolete type -- it is identical to ``\'d\'``. | (7) |\n+--------------+-------------------------------------------------------+---------+\n| ``\'x\'`` | Signed hexadecimal (lowercase). | (2) |\n+--------------+-------------------------------------------------------+---------+\n| ``\'X\'`` | Signed hexadecimal (uppercase). | (2) |\n+--------------+-------------------- -----------------------------------+---------+\n| ``\'e\'`` | Floating point exponential format (lowercase). | (3) |\n+--------------+-------------------------------------------------------+---------+\n| ``\'E\'`` | Floating point exponential format (uppercase). | (3) |\n+--------------+-------------------------------------------------------+---------+\n| ``\'f\'`` | Floating point decimal format. | (3) |\n+--------------+-------------------------------------------------------+---------+\n| ``\'F\'`` | Floating point decimal format. | (3) |\n+--------------+-------------------------------------------------------+---------+\n| ``\'g\'`` | Floating point format. Uses lowercase exponential | (4) |\n| | format if exponent is less than -4 or not less than | |\n| | precision, decimal format otherwise. | |\n+------ --------+-------------------------------------------------------+---------+\n| ``\'G\'`` | Floating point format. Uses uppercase exponential | (4) |\n| | format if exponent is less than -4 or not less than | |\n| | precision, decimal format otherwise. | |\n+--------------+-------------------------------------------------------+---------+\n| ``\'c\'`` | Single character (accepts integer or single character | |\n| | string). | |\n+--------------+-------------------------------------------------------+---------+\n| ``\'r\'`` | String (converts any Python object using ``repr()``). | (5) |\n+--------------+-------------------------------------------------------+---------+\n| ``\'s\'`` | String (converts any Python object using ``str()``). | (6) |\n+--------------+------------------------------------------------ -------+---------+\n| ``\'%\'`` | No argument is converted, results in a ``\'%\'`` | |\n| | character in the result. | |\n+--------------+-------------------------------------------------------+---------+\n\nNotes:\n\n1. The alternate form causes a leading zero (``\'0\'``) to be inserted\n between left-hand padding and the formatting of the number if the\n leading character of the result is not already a zero.\n\n2. The alternate form causes a leading ``\'0x\'`` or ``\'0X\'`` (depending\n on whether the ``\'x\'`` or ``\'X\'`` format was used) to be inserted\n between left-hand padding and the formatting of the number if the\n leading character of the result is not already a zero.\n\n3. The alternate form causes the result to always contain a decimal\n point, even if no digits follow it.\n\n The precision determines the number of digits after the decimal\n point and defaults to 6.\n\n4. The alternate form causes the result to always contain a decimal\n point, and trailing zeroes are not removed as they would otherwise\n be.\n\n The precision determines the number of significant digits before\n and after the decimal point and defaults to 6.\n\n5. The ``%r`` conversion was added in Python 2.0.\n\n The precision determines the maximal number of characters used.\n\n6. If the object or format provided is a ``unicode`` string, the\n resulting string will also be ``unicode``.\n\n The precision determines the maximal number of characters used.\n\n7. See **PEP 237**.\n\nSince Python strings have an explicit length, ``%s`` conversions do\nnot assume that ``\'\\0\'`` is the end of the string.\n\nFor safety reasons, floating point precisions are clipped to 50;\n``%f`` conversions for numbers whose absolute value is over 1e50 are\nreplaced by ``%g`` conversions. [5] All other errors raise\nexceptions.\n\nAdditional string operations are defined in standard mo dules\n``string`` and ``re``.\n\n\nXRange Type\n===========\n\nThe ``xrange`` type is an immutable sequence which is commonly used\nfor looping. The advantage of the ``xrange`` type is that an\n``xrange`` object will always take the same amount of memory, no\nmatter the size of the range it represents. There are no consistent\nperformance advantages.\n\nXRange objects have very little behavior: they only support indexing,\niteration, and the ``len()`` function.\n\n\nMutable Sequence Types\n======================\n\nList objects support additional operations that allow in-place\nmodification of the object. Other mutable sequence types (when added\nto the language) should also support these operations. Strings and\ntuples are immutable sequence types: such objects cannot be modified\nonce created. The following operations are defined on mutable sequence\ntypes (where *x* is an arbitrary object):\n\n+--------------------------------+----------------------------------+-------- ---------------+\n| Operation | Result | Notes |\n+================================+==================================+=======================+\n| ``s[i] = x`` | item *i* of *s* is replaced by | |\n| | *x* | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s[i:j] = t`` | slice of *s* from *i* to *j* is | |\n| | replaced by the contents of the | |\n| | iterable *t* | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``del s[i:j]`` | same as ``s[i:j] = []`` | |\n+-------------------- ------------+----------------------------------+-----------------------+\n| ``s[i:j:k] = t`` | the elements of ``s[i:j:k]`` are | (1) |\n| | replaced by those of *t* | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``del s[i:j:k]`` | removes the elements of | |\n| | ``s[i:j:k]`` from the list | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.append(x)`` | same as ``s[len(s):len(s)] = | (2) |\n| | [x]`` | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.extend(x)`` | same as ``s[len(s):len(s) ] = x`` | (3) |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.count(x)`` | return number of *i*\'s for which | |\n| | ``s[i] == x`` | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.index(x[, i[, j]])`` | return smallest *k* such that | (4) |\n| | ``s[k] == x`` and ``i <= k < j`` | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.insert(i, x)`` | same as ``s[i:i] = [x]`` | (5) |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.pop([i])`` | same as ``x = s[i]; del s[i]; | (6) |\n| | return x`` | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.remove(x)`` | same as ``del s[s.index(x)]`` | (4) |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.reverse()`` | reverses the items of *s* in | (7) |\n| | place | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.sort([cmp[, key[, | sort the items of *s* in place | (7)(8)(9)(10) |\n| reverse]]])`` | | |\n+--------------------------------+----------------------------------+-----------------------+\n\nNotes:\n\n1. *t* must have the same leng th as the slice it is replacing.\n\n2. The C implementation of Python has historically accepted multiple\n parameters and implicitly joined them into a tuple; this no longer\n works in Python 2.0. Use of this misfeature has been deprecated\n since Python 1.4.\n\n3. *x* can be any iterable object.\n\n4. Raises ``ValueError`` when *x* is not found in *s*. When a negative\n index is passed as the second or third parameter to the ``index()``\n method, the list length is added, as for slice indices. If it is\n still negative, it is truncated to zero, as for slice indices.\n\n Changed in version 2.3: Previously, ``index()`` didn\'t have\n arguments for specifying start and stop positions.\n\n5. When a negative index is passed as the first parameter to the\n ``insert()`` method, the list length is added, as for slice\n indices. If it is still negative, it is truncated to zero, as for\n slice indices.\n\n Changed in version 2.3: Previously, all negative i ndices were\n truncated to zero.\n\n6. The ``pop()`` method is only supported by the list and array types.\n The optional argument *i* defaults to ``-1``, so that by default\n the last item is removed and returned.\n\n7. The ``sort()`` and ``reverse()`` methods modify the list in place\n for economy of space when sorting or reversing a large list. To\n remind you that they operate by side effect, they don\'t return the\n sorted or reversed list.\n\n8. The ``sort()`` method takes optional arguments for controlling the\n comparisons.\n\n *cmp* specifies a custom comparison function of two arguments (list\n items) which should return a negative, zero or positive number\n depending on whether the first argument is considered smaller than,\n equal to, or larger than the second argument: ``cmp=lambda x,y:\n cmp(x.lower(), y.lower())``. The default value is ``None``.\n\n *key* specifies a function of one argument that is used to extract\n a comparison key from each list element: ``key=str.lower``. The\n default value is ``None``.\n\n *reverse* is a boolean value. If set to ``True``, then the list\n elements are sorted as if each comparison were reversed.\n\n In general, the *key* and *reverse* conversion processes are much\n faster than specifying an equivalent *cmp* function. This is\n because *cmp* is called multiple times for each list element while\n *key* and *reverse* touch each element only once.\n\n Changed in version 2.3: Support for ``None`` as an equivalent to\n omitting *cmp* was added.\n\n Changed in version 2.4: Support for *key* and *reverse* was added.\n\n9. Starting with Python 2.3, the ``sort()`` method is guaranteed to be\n stable. A sort is stable if it guarantees not to change the\n relative order of elements that compare equal --- this is helpful\n for sorting in multiple passes (for example, sort by department,\n then by salary grade).\n\n10. **CPython implementation detail:** While a list is being sorted,\n the effect of attempting to mutate, or even inspect, the list is\n undefined. The C implementation of Python 2.3 and newer makes the\n list appear empty for the duration, and raises ``ValueError`` if\n it can detect that the list has been mutated during a sort.\n', + 'typesseq-mutable': u"\nMutable Sequence Types\n**********************\n\nList objects support additional operations that allow in-place\nmodification of the object. Other mutable sequence types (when added\nto the language) should also support these operations. Strings and\ntuples are immutable sequence types: such objects cannot be modified\nonce created. The following operations are defined on mutable sequence\ntypes (where *x* is an arbitrary object):\n\n+--------------------------------+----------------------------------+-----------------------+\n| Operation | Result | Notes |\n+================================+==================================+=======================+\n| ``s[i] = x`` | item *i* of *s* is replaced by | |\n| | *x* | |\n+--------------------------------+--------------- -------------------+-----------------------+\n| ``s[i:j] = t`` | slice of *s* from *i* to *j* is | |\n| | replaced by the contents of the | |\n| | iterable *t* | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``del s[i:j]`` | same as ``s[i:j] = []`` | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s[i:j:k] = t`` | the elements of ``s[i:j:k]`` are | (1) |\n| | replaced by those of *t* | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``del s[i:j:k]`` | removes the elements of | |\n| | ``s[i:j:k]`` from the list | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.append(x)`` | same as ``s[len(s):len(s)] = | (2) |\n| | [x]`` | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.extend(x)`` | same as ``s[len(s):len(s)] = x`` | (3) |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.count(x)`` | return number of *i*'s for which | |\n| | ``s[i] == x`` | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.index(x[, i[, j]])`` | return smallest *k* such that | (4) |\n| | ``s[k] == x`` and ``i <= k < j`` | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.insert(i, x)`` | same as ``s[i:i] = [x]`` | (5) |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.pop([i])`` | same as ``x = s[i]; del s[i]; | (6) |\n| | return x`` | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.remove(x)`` | same as ``del s[s.index(x)]`` | (4) |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.reverse()`` | reverses the items of *s* in | ( 7) |\n| | place | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.sort([cmp[, key[, | sort the items of *s* in place | (7)(8)(9)(10) |\n| reverse]]])`` | | |\n+--------------------------------+----------------------------------+-----------------------+\n\nNotes:\n\n1. *t* must have the same length as the slice it is replacing.\n\n2. The C implementation of Python has historically accepted multiple\n parameters and implicitly joined them into a tuple; this no longer\n works in Python 2.0. Use of this misfeature has been deprecated\n since Python 1.4.\n\n3. *x* can be any iterable object.\n\n4. Raises ``ValueError`` when *x* is not found in *s*. When a negative\n index is passed as the second or third parameter to the ``index( )``\n method, the list length is added, as for slice indices. If it is\n still negative, it is truncated to zero, as for slice indices.\n\n Changed in version 2.3: Previously, ``index()`` didn't have\n arguments for specifying start and stop positions.\n\n5. When a negative index is passed as the first parameter to the\n ``insert()`` method, the list length is added, as for slice\n indices. If it is still negative, it is truncated to zero, as for\n slice indices.\n\n Changed in version 2.3: Previously, all negative indices were\n truncated to zero.\n\n6. The ``pop()`` method is only supported by the list and array types.\n The optional argument *i* defaults to ``-1``, so that by default\n the last item is removed and returned.\n\n7. The ``sort()`` and ``reverse()`` methods modify the list in place\n for economy of space when sorting or reversing a large list. To\n remind you that they operate by side effect, they don't return the\n sorted or re versed list.\n\n8. The ``sort()`` method takes optional arguments for controlling the\n comparisons.\n\n *cmp* specifies a custom comparison function of two arguments (list\n items) which should return a negative, zero or positive number\n depending on whether the first argument is considered smaller than,\n equal to, or larger than the second argument: ``cmp=lambda x,y:\n cmp(x.lower(), y.lower())``. The default value is ``None``.\n\n *key* specifies a function of one argument that is used to extract\n a comparison key from each list element: ``key=str.lower``. The\n default value is ``None``.\n\n *reverse* is a boolean value. If set to ``True``, then the list\n elements are sorted as if each comparison were reversed.\n\n In general, the *key* and *reverse* conversion processes are much\n faster than specifying an equivalent *cmp* function. This is\n because *cmp* is called multiple times for each list element while\n *key* and *reverse* to uch each element only once.\n\n Changed in version 2.3: Support for ``None`` as an equivalent to\n omitting *cmp* was added.\n\n Changed in version 2.4: Support for *key* and *reverse* was added.\n\n9. Starting with Python 2.3, the ``sort()`` method is guaranteed to be\n stable. A sort is stable if it guarantees not to change the\n relative order of elements that compare equal --- this is helpful\n for sorting in multiple passes (for example, sort by department,\n then by salary grade).\n\n10. **CPython implementation detail:** While a list is being sorted,\n the effect of attempting to mutate, or even inspect, the list is\n undefined. The C implementation of Python 2.3 and newer makes the\n list appear empty for the duration, and raises ``ValueError`` if\n it can detect that the list has been mutated during a sort.\n", + 'unary': u'\nUnary arithmetic and bitwise operations\n***************************************\n\nAll unary arithmetic and bitwise operations have the same priority:\n\n u_expr ::= power | "-" u_expr | "+" u_expr | "~" u_expr\n\nThe unary ``-`` (minus) operator yields the negation of its numeric\nargument.\n\nThe unary ``+`` (plus) operator yields its numeric argument unchanged.\n\nThe unary ``~`` (invert) operator yields the bitwise inversion of its\nplain or long integer argument. The bitwise inversion of ``x`` is\ndefined as ``-(x+1)``. It only applies to integral numbers.\n\nIn all three cases, if the argument does not have the proper type, a\n``TypeError`` exception is raised.\n', +diff --git a/Lib/site.py b/Lib/site.py +index ff41408..c4ebfe2 100644 +--- a/Lib/site.py ++++ b/Lib/site.py +@@ -27,7 +27,7 @@ sys.path more than once. Blank lines and lines beginning with + '#' are skipped. Lines starting with 'import' are executed. + + For example, suppose sys.prefix and sys.exec_prefix are set to +-/usr/local and there is a directory /usr/local/lib/python2.5/site-packages ++/opt/csw and there is a directory /opt/csw/lib/python2.5/site-packages + with three subdirectories, foo, bar and spam, and two path + configuration files, foo.pth and bar.pth. Assume foo.pth contains the + following: +@@ -44,8 +44,8 @@ and bar.pth contains: + + Then the following directories are added to sys.path, in this order: + +- /usr/local/lib/python2.5/site-packages/bar +- /usr/local/lib/python2.5/site-packages/foo ++ /opt/csw/lib/python2.5/site-packages/bar ++ /opt/csw/lib/python2.5/site-packages/foo + + Note that bletch is omitted because it doesn't exist; bar precedes foo + because bar.pth comes alphabetically before foo.pth; and spam is +@@ -62,7 +62,7 @@ import sys + import os + import __builtin__ + +-# Prefixes for site-packages; add additional prefixes like /usr/local here ++# Prefixes for site-packages; add additional prefixes like /opt/csw here + PREFIXES = [sys.prefix, sys.exec_prefix] + # Enable per user site-packages directory + # set it to False to disable the feature or True to force the feature +diff --git a/Lib/trace.py b/Lib/trace.py +index 3611f88..93eaf11 100644 +--- a/Lib/trace.py ++++ b/Lib/trace.py +@@ -155,11 +155,11 @@ class Ignore: + for d in self._dirs: + # The '+ os.sep' is to ensure that d is a parent directory, + # as compared to cases like: +- # d = "/usr/local" +- # filename = "/usr/local.py" ++ # d = "/opt/csw" ++ # filename = "/opt/csw.py" + # or +- # d = "/usr/local.py" +- # filename = "/usr/local.py" ++ # d = "/opt/csw.py" ++ # filename = "/opt/csw.py" + if filename.startswith(d + os.sep): + self._ignore[modulename] = 1 + return 1 +diff --git a/Misc/python.man b/Misc/python.man +index b9aa72f..ae719ff 100644 +--- a/Misc/python.man ++++ b/Misc/python.man +@@ -323,7 +323,7 @@ exception). Error messages are written to stderr. + These are subject to difference depending on local installation + conventions; ${prefix} and ${exec_prefix} are installation-dependent + and should be interpreted as for GNU software; they may be the same. +-The default for both is \fI/usr/local\fP. ++The default for both is \fI/opt/csw\fP. + .IP \fI${exec_prefix}/bin/python\fP + Recommended location of the interpreter. + .PP +@@ -352,7 +352,7 @@ Change the location of the standard Python libraries. By default, the + libraries are searched in ${prefix}/lib/python and + ${exec_prefix}/lib/python, where ${prefix} and ${exec_prefix} + are installation-dependent directories, both defaulting to +-\fI/usr/local\fP. When $PYTHONHOME is set to a single directory, its value ++\fI/opt/csw\fP. When $PYTHONHOME is set to a single directory, its value + replaces both ${prefix} and ${exec_prefix}. To specify different values + for these, set $PYTHONHOME to ${prefix}:${exec_prefix}. + .IP PYTHONPATH +-- +1.7.3.2 + Added: csw/mgar/pkg/lang-python/python/trunk/files/0018-Removing-usr-local-from-mailcap.patch =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/files/0018-Removing-usr-local-from-mailcap.patch (rev 0) +++ csw/mgar/pkg/lang-python/python/trunk/files/0018-Removing-usr-local-from-mailcap.patch 2011-03-12 10:49:03 UTC (rev 13745) @@ -0,0 +1,25 @@ +From 212f5d4caf3a89b375688e907b42d833cd8b1a8c Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 6 Feb 2011 17:56:46 +0100 +Subject: [PATCH 18/18] Removing /usr/local from mailcap + +--- + Lib/mailcap.py | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Lib/mailcap.py b/Lib/mailcap.py +index b2ddacd..299ea35 100644 +--- a/Lib/mailcap.py ++++ b/Lib/mailcap.py +@@ -44,7 +44,7 @@ def listmailcapfiles(): + # Don't bother with getpwuid() + home = '.' # Last resort + mailcaps = [home + '/.mailcap', '/etc/mailcap', +- '/usr/etc/mailcap', '/usr/local/etc/mailcap'] ++ '/usr/etc/mailcap'] + return mailcaps + + +-- +1.7.3.2 + 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 Mar 12 11:59:18 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 12 Mar 2011 10:59:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[13746] csw/mgar/pkg/lang-python/python/trunk Message-ID: Revision: 13746 http://gar.svn.sourceforge.net/gar/?rev=13746&view=rev Author: wahwah Date: 2011-03-12 10:59:18 +0000 (Sat, 12 Mar 2011) Log Message: ----------- python: Renamed -devel to -dev Plus removed a big chunk of a patch. Modified Paths: -------------- csw/mgar/pkg/lang-python/python/trunk/Makefile csw/mgar/pkg/lang-python/python/trunk/files/0017-Random-insignificant-removals-of-usr-local.patch Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/Makefile 2011-03-12 10:49:03 UTC (rev 13745) +++ csw/mgar/pkg/lang-python/python/trunk/Makefile 2011-03-12 10:59:18 UTC (rev 13746) @@ -35,8 +35,6 @@ DISTFILES = $(DISTNAME).tar.bz2 -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 - # Patches PATCHFILES += faqwiz.diff PATCHFILES += makesetup.diff @@ -91,22 +89,23 @@ PACKAGES = CSWidle$(CVER) PACKAGES += CSWpython$(CVER) -PACKAGES += CSWpython$(CVER)-devel +PACKAGES += CSWpython$(CVER)-dev PACKAGES += CSWpython$(CVER)-test PACKAGES += CSWpython$(CVER)-tk PACKAGES += CSWlibpython$(DVER)-1-0 INCOMPATIBLE_PKGS_CSWpython$(CVER) = CSWpydistutils +OBSOLETES_CSWpython$(CVER)-dev = CSWpython$(CVER)-devel PKGFILES_CSWidle$(CVER) = $(libdir)/.*/idlelib/.* PKGFILES_CSWidle$(CVER) += $(bindir)/idle -PKGFILES_CSWpython$(CVER)-devel = $(includedir)/.* -PKGFILES_CSWpython$(CVER)-devel += $(libdir)/.*/config/.* -PKGFILES_CSWpython$(CVER)-devel += $(bindir)/.*config.* -PKGFILES_CSWpython-devel += $(libdir)/libpython$(VER).so +PKGFILES_CSWpython$(CVER)-dev = $(includedir)/.* +PKGFILES_CSWpython$(CVER)-dev += $(libdir)/.*/config/.* +PKGFILES_CSWpython$(CVER)-dev += $(bindir)/.*config.* +PKGFILES_CSWpython$(CVER)-dev += $(libdir)/libpython$(VER).so # No idea why would this be in CSWpython, and no good idea for a better package # to put it. -PKGFILES_CSWpython$(CVER)-devel += $(bindir)/smtpd.py +PKGFILES_CSWpython$(CVER)-dev += $(bindir)/smtpd.py PKGFILES_CSWpython$(CVER)-tk = $(libdir)/.*/lib-tk/.* PKGFILES_CSWpython$(CVER)-tk += $(libdir)/.*/lib-dynload/_tkinter.so.* PKGFILES_CSWpython$(CVER)-test = $(libdir)/python/test/.* @@ -135,8 +134,8 @@ RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWreadline RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWsqlite3rt RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWzlib -RUNTIME_DEP_PKGS_CSWpython$(CVER)-devel += CSWlibpython$(DVER)-1-0 -RUNTIME_DEP_PKGS_CSWpython$(CVER)-devel += CSWpython$(CVER) +RUNTIME_DEP_PKGS_CSWpython$(CVER)-dev += CSWlibpython$(DVER)-1-0 +RUNTIME_DEP_PKGS_CSWpython$(CVER)-dev += CSWpython$(CVER) RUNTIME_DEP_PKGS_CSWpython$(CVER)-test += CSWpython$(CVER) RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibpython$(DVER)-1-0 RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWpython$(CVER) @@ -156,14 +155,14 @@ CATALOGNAME_CSWidle$(CVER) = idle CATALOGNAME_CSWpython$(CVER) = python -CATALOGNAME_CSWpython$(CVER)-devel = python$(CVER)_devel +CATALOGNAME_CSWpython$(CVER)-dev = python$(CVER)_devel CATALOGNAME_CSWpython$(CVER)-tk = python$(CVER)_tk CATALOGNAME_CSWpython$(CVER)-test = python$(CVER)_test CATALOGNAME_CSWlibpython$(DVER)-1-0 = libpython$(UVER)_1_0 SPKG_DESC_CSWidle$(CVER) = Python IDE SPKG_DESC_CSWpython$(CVER) = A high-level scripting language, $(VER) series -SPKG_DESC_CSWpython$(CVER)-devel = Development Files for Python +SPKG_DESC_CSWpython$(CVER)-dev = Development Files for Python SPKG_DESC_CSWpython$(CVER)-tk = Python Tk Interface (TkInter) SPKG_DESC_CSWpython$(CVER)-test = Python Test modules SPKG_DESC_CSWlibpython$(DVER)-1-0 = Python shared library ($(VER)) @@ -175,8 +174,8 @@ CHECKPKG_OVERRIDES_CSWidle$(CVER) += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += catalogname-does-not-start-with-py_ -CHECKPKG_OVERRIDES_CSWpython$(CVER)-devel += pkgname-does-not-start-with-CSWpy- -CHECKPKG_OVERRIDES_CSWpython$(CVER)-devel += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWpython$(CVER) += pkgname-does-not-start-with-CSWpy- @@ -189,6 +188,7 @@ Makefile \ Makefile.pre \ Lib/idlelib/EditorWindow.py \ + Lib/pydoc_topics.py \ Lib/idlelib/config-main.def \ ; do \ gsed -i -e 's+/usr/local+/opt/csw+g' $(WORKSRC)/$${f}; \ Modified: csw/mgar/pkg/lang-python/python/trunk/files/0017-Random-insignificant-removals-of-usr-local.patch =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/files/0017-Random-insignificant-removals-of-usr-local.patch 2011-03-12 10:49:03 UTC (rev 13745) +++ csw/mgar/pkg/lang-python/python/trunk/files/0017-Random-insignificant-removals-of-usr-local.patch 2011-03-12 10:59:18 UTC (rev 13746) @@ -24,19 +24,6 @@ shared = os.path.join(sysroot, dir[1:], shared_f) dylib = os.path.join(sysroot, dir[1:], dylib_f) -diff --git a/Lib/pydoc_topics.py b/Lib/pydoc_topics.py -index 572879f..e5fdbf5 100644 ---- a/Lib/pydoc_topics.py -+++ b/Lib/pydoc_topics.py -@@ -74,7 +74,7 @@ topics = {'assert': u'\nThe ``assert`` statement\n************************\n\nAs - 'typesfunctions': u'\nFunctions\n*********\n\nFunction objects are created by function definitions. The only\noperation on a function object is to call it: ``func(argument-list)``.\n\nThere are really two flavors of function objects: built-in functions\nand user-defined functions. Both support the same operation (to call\nthe function), but the implementation is different, hence the\ndifferent object types.\n\nSee *Function definitions* for more information.\n', - 'typesmapping': u'\nMapping Types --- ``dict``\n**************************\n\nA *mapping* object maps *hashable* values to arbitrary objects.\nMappings are mutable objects. There is currently only one standard\nmapping type, the *dictionary*. (For other containers see the built\nin ``list``, ``set``, and ``tuple`` classes, and the ``collections``\nmodule.)\n\nA dictionary\'s keys are *almost* arbitrary values. Values that are\nnot *hashable*, that is, values containing lists, dictionaries or\nother mutable types (that are compared by value rather than by object\nidentity) may not be used as keys. Numeric types used for keys obey\nthe normal rules for numeric comparison: if two numbers compare equal\n(such as ``1`` and ``1.0``) then they can be used interchangeably to\nindex the same dictionary entry. (Note however, that since computers\nstore floating-point numbers as approximations it is usually unwise to\nuse them as dictionary keys.)\n\nDictionaries can be created by placing a comma-separated list of\n``key: value`` pairs within braces, for example: ``{\'jack\': 4098,\n\'sjoerd\': 4127}`` or ``{4098: \'jack\', 4127: \'sjoerd\'}``, or by the\n``dict`` constructor.\n\nclass class dict([arg])\n\n Return a new dictionary initialized from an optional positional\n argument or from a set of keyword arguments. If no arguments are\n given, return a new empty dictionary. If the positional argument\n *arg* is a mapping object, return a dictionary mapping the same\n keys to the same values as does the mapping object. Otherwise the\n positional argument must be a sequence, a container that supports\n iteration, or an iterator object. The elements of the argument\n must each also be of one of those kinds, and each must in turn\n contain exactly two objects. The first is used as a key in the new\n dictionary, and the second as the key\'s value. If a given key is\n seen more than once, the last value associated with it is reta ined\n in the new dictionary.\n\n If keyword arguments are given, the keywords themselves with their\n associated values are added as items to the dictionary. If a key is\n specified both in the positional argument and as a keyword\n argument, the value associated with the keyword is retained in the\n dictionary. For example, these all return a dictionary equal to\n ``{"one": 2, "two": 3}``:\n\n * ``dict(one=2, two=3)``\n\n * ``dict({\'one\': 2, \'two\': 3})``\n\n * ``dict(zip((\'one\', \'two\'), (2, 3)))``\n\n * ``dict([[\'two\', 3], [\'one\', 2]])``\n\n The first example only works for keys that are valid Python\n identifiers; the others work with any valid keys.\n\n New in version 2.2.\n\n Changed in version 2.3: Support for building a dictionary from\n keyword arguments added.\n\n These are the operations that dictionaries support (and therefore,\n custom mapping types should support too):\n\n len(d)\n\n Return the number of ite ms in the dictionary *d*.\n\n d[key]\n\n Return the item of *d* with key *key*. Raises a ``KeyError`` if\n *key* is not in the map.\n\n New in version 2.5: If a subclass of dict defines a method\n ``__missing__()``, if the key *key* is not present, the\n ``d[key]`` operation calls that method with the key *key* as\n argument. The ``d[key]`` operation then returns or raises\n whatever is returned or raised by the ``__missing__(key)`` call\n if the key is not present. No other operations or methods invoke\n ``__missing__()``. If ``__missing__()`` is not defined,\n ``KeyError`` is raised. ``__missing__()`` must be a method; it\n cannot be an instance variable. For an example, see\n ``collections.defaultdict``.\n\n d[key] = value\n\n Set ``d[key]`` to *value*.\n\n del d[key]\n\n Remove ``d[key]`` from *d*. Raises a ``KeyError`` if *key* is\n not in the map.\n\n key in d\n\n Return ``True` ` if *d* has a key *key*, else ``False``.\n\n New in version 2.2.\n\n key not in d\n\n Equivalent to ``not key in d``.\n\n New in version 2.2.\n\n iter(d)\n\n Return an iterator over the keys of the dictionary. This is a\n shortcut for ``iterkeys()``.\n\n clear()\n\n Remove all items from the dictionary.\n\n copy()\n\n Return a shallow copy of the dictionary.\n\n fromkeys(seq[, value])\n\n Create a new dictionary with keys from *seq* and values set to\n *value*.\n\n ``fromkeys()`` is a class method that returns a new dictionary.\n *value* defaults to ``None``.\n\n New in version 2.3.\n\n get(key[, default])\n\n Return the value for *key* if *key* is in the dictionary, else\n *default*. If *default* is not given, it defaults to ``None``,\n so that this method never raises a ``KeyError``.\n\n has_key(key)\n\n Test for the presence of *key* in the dictionary. ``has_key()``\n is deprecated in favor of ``key in d``.\n\n items()\n\n Return a copy of the dictionary\'s list of ``(key, value)``\n pairs.\n\n **CPython implementation detail:** Keys and values are listed in\n an arbitrary order which is non-random, varies across Python\n implementations, and depends on the dictionary\'s history of\n insertions and deletions.\n\n If ``items()``, ``keys()``, ``values()``, ``iteritems()``,\n ``iterkeys()``, and ``itervalues()`` are called with no\n intervening modifications to the dictionary, the lists will\n directly correspond. This allows the creation of ``(value,\n key)`` pairs using ``zip()``: ``pairs = zip(d.values(),\n d.keys())``. The same relationship holds for the ``iterkeys()``\n and ``itervalues()`` methods: ``pairs = zip(d.itervalues(),\n d.iterkeys())`` provides the same value for ``pairs``. Another\n way to create the same list is ``pairs = [(v, k) for (k, v) in\n d.iteritems()]``.\n\n iteritems()\n\n Return an iterator over the dictionary\'s ``(key, value)`` pairs.\n See the note for ``dict.items()``.\n\n Using ``iteritems()`` while adding or deleting entries in the\n dictionary may raise a ``RuntimeError`` or fail to iterate over\n all entries.\n\n New in version 2.2.\n\n iterkeys()\n\n Return an iterator over the dictionary\'s keys. See the note for\n ``dict.items()``.\n\n Using ``iterkeys()`` while adding or deleting entries in the\n dictionary may raise a ``RuntimeError`` or fail to iterate over\n all entries.\n\n New in version 2.2.\n\n itervalues()\n\n Return an iterator over the dictionary\'s values. See the note\n for ``dict.items()``.\n\n Using ``itervalues()`` while adding or deleting entries in the\n dictionary may raise a ``RuntimeError`` or fail to iterate over\n all entries.\n\n New in version 2.2.\n\n keys()\n\n R eturn a copy of the dictionary\'s list of keys. See the note\n for ``dict.items()``.\n\n pop(key[, default])\n\n If *key* is in the dictionary, remove it and return its value,\n else return *default*. If *default* is not given and *key* is\n not in the dictionary, a ``KeyError`` is raised.\n\n New in version 2.3.\n\n popitem()\n\n Remove and return an arbitrary ``(key, value)`` pair from the\n dictionary.\n\n ``popitem()`` is useful to destructively iterate over a\n dictionary, as often used in set algorithms. If the dictionary\n is empty, calling ``popitem()`` raises a ``KeyError``.\n\n setdefault(key[, default])\n\n If *key* is in the dictionary, return its value. If not, insert\n *key* with a value of *default* and return *default*. *default*\n defaults to ``None``.\n\n update([other])\n\n Update the dictionary with the key/value pairs from *other*,\n overwriting existing keys. Return ``None``.\n\n ``update()`` accepts either another dictionary object or an\n iterable of key/value pairs (as a tuple or other iterable of\n length two). If keyword arguments are specified, the dictionary\n is then updated with those key/value pairs: ``d.update(red=1,\n blue=2)``.\n\n Changed in version 2.4: Allowed the argument to be an iterable\n of key/value pairs and allowed keyword arguments.\n\n values()\n\n Return a copy of the dictionary\'s list of values. See the note\n for ``dict.items()``.\n', - 'typesmethods': u"\nMethods\n*******\n\nMethods are functions that are called using the attribute notation.\nThere are two flavors: built-in methods (such as ``append()`` on\nlists) and class instance methods. Built-in methods are described\nwith the types that support them.\n\nThe implementation adds two special read-only attributes to class\ninstance methods: ``m.im_self`` is the object on which the method\noperates, and ``m.im_func`` is the function implementing the method.\nCalling ``m(arg-1, arg-2, ..., arg-n)`` is completely equivalent to\ncalling ``m.im_func(m.im_self, arg-1, arg-2, ..., arg-n)``.\n\nClass instance methods are either *bound* or *unbound*, referring to\nwhether the method was accessed through an instance or a class,\nrespectively. When a method is unbound, its ``im_self`` attribute\nwill be ``None`` and if called, an explicit ``self`` object must be\npassed as the first argument. In this case, ``self`` must be an\ninstance of the unbound method's class (or a subclass of that class),\notherwise a ``TypeError`` is raised.\n\nLike function objects, methods objects support getting arbitrary\nattributes. However, since method attributes are actually stored on\nthe underlying function object (``meth.im_func``), setting method\nattributes on either bound or unbound methods is disallowed.\nAttempting to set a method attribute results in a ``TypeError`` being\nraised. In order to set a method attribute, you need to explicitly\nset it on the underlying function object:\n\n class C:\n def method(self):\n pass\n\n c = C()\n c.method.im_func.whoami = 'my name is c'\n\nSee *The standard type hierarchy* for more information.\n", -- 'typesmodules': u"\nModules\n*******\n\nThe only special operation on a module is attribute access:\n``m.name``, where *m* is a module and *name* accesses a name defined\nin *m*'s symbol table. Module attributes can be assigned to. (Note\nthat the ``import`` statement is not, strictly speaking, an operation\non a module object; ``import foo`` does not require a module object\nnamed *foo* to exist, rather it requires an (external) *definition*\nfor a module named *foo* somewhere.)\n\nA special member of every module is ``__dict__``. This is the\ndictionary containing the module's symbol table. Modifying this\ndictionary will actually change the module's symbol table, but direct\nassignment to the ``__dict__`` attribute is not possible (you can\nwrite ``m.__dict__['a'] = 1``, which defines ``m.a`` to be ``1``, but\nyou can't write ``m.__dict__ = {}``). Modifying ``__dict__`` directly\nis not recommended.\n\nModules built into the interpreter are written like this: ````. If loaded from a file, they are written as\n````.\n", -+ 'typesmodules': u"\nModules\n*******\n\nThe only special operation on a module is attribute access:\n``m.name``, where *m* is a module and *name* accesses a name defined\nin *m*'s symbol table. Module attributes can be assigned to. (Note\nthat the ``import`` statement is not, strictly speaking, an operation\non a module object; ``import foo`` does not require a module object\nnamed *foo* to exist, rather it requires an (external) *definition*\nfor a module named *foo* somewhere.)\n\nA special member of every module is ``__dict__``. This is the\ndictionary containing the module's symbol table. Modifying this\ndictionary will actually change the module's symbol table, but direct\nassignment to the ``__dict__`` attribute is not possible (you can\nwrite ``m.__dict__['a'] = 1``, which defines ``m.a`` to be ``1``, but\nyou can't write ``m.__dict__ = {}``). Modifying ``__dict__`` directly\nis not recommended.\n\nModules built into the interpreter are written like this: ````. If loaded from a file, they are written as\n````.\n", - 'typesseq': u'\nSequence Types --- ``str``, ``unicode``, ``list``, ``tuple``, ``buffer``, ``xrange``\n************************************************************************************\n\nThere are six sequence types: strings, Unicode strings, lists, tuples,\nbuffers, and xrange objects.\n\nFor other containers see the built in ``dict`` and ``set`` classes,\nand the ``collections`` module.\n\nString literals are written in single or double quotes: ``\'xyzzy\'``,\n``"frobozz"``. See *String literals* for more about string literals.\nUnicode strings are much like strings, but are specified in the syntax\nusing a preceding ``\'u\'`` character: ``u\'abc\'``, ``u"def"``. In\naddition to the functionality described here, there are also string-\nspecific methods described in the *String Methods* section. Lists are\nconstructed with square brackets, separating items with commas: ``[a,\nb, c]``. Tuples are constructed by the comma operator (not within\nsquare brackets), with or without enclosing parentheses, but an empty\ntuple must have the enclosing parentheses, such as ``a, b, c`` or\n``()``. A single item tuple must have a trailing comma, such as\n``(d,)``.\n\nBuffer objects are not directly supported by Python syntax, but can be\ncreated by calling the built-in function ``buffer()``. They don\'t\nsupport concatenation or repetition.\n\nObjects of type xrange are similar to buffers in that there is no\nspecific syntax to create them, but they are created using the\n``xrange()`` function. They don\'t support slicing, concatenation or\nrepetition, and using ``in``, ``not in``, ``min()`` or ``max()`` on\nthem is inefficient.\n\nMost sequence types support the following operations. The ``in`` and\n``not in`` operations have the same priorities as the comparison\noperations. The ``+`` and ``*`` operations have the same priority as\nthe corresponding numeric operations. [3] Additional methods are\nprovided for *Mutable Sequence Types*.\n\nThis t able lists the sequence operations sorted in ascending priority\n(operations in the same box have the same priority). In the table,\n*s* and *t* are sequences of the same type; *n*, *i* and *j* are\nintegers:\n\n+--------------------+----------------------------------+------------+\n| Operation | Result | Notes |\n+====================+==================================+============+\n| ``x in s`` | ``True`` if an item of *s* is | (1) |\n| | equal to *x*, else ``False`` | |\n+--------------------+----------------------------------+------------+\n| ``x not in s`` | ``False`` if an item of *s* is | (1) |\n| | equal to *x*, else ``True`` | |\n+--------------------+----------------------------------+------------+\n| ``s + t`` | the concatenation of *s* and *t* | (6) |\n+--------------------+---------------------------------- +------------+\n| ``s * n, n * s`` | *n* shallow copies of *s* | (2) |\n| | concatenated | |\n+--------------------+----------------------------------+------------+\n| ``s[i]`` | *i*\'th item of *s*, origin 0 | (3) |\n+--------------------+----------------------------------+------------+\n| ``s[i:j]`` | slice of *s* from *i* to *j* | (3)(4) |\n+--------------------+----------------------------------+------------+\n| ``s[i:j:k]`` | slice of *s* from *i* to *j* | (3)(5) |\n| | with step *k* | |\n+--------------------+----------------------------------+------------+\n| ``len(s)`` | length of *s* | |\n+--------------------+----------------------------------+------------+\n| ``min(s)`` | smallest item of *s* | |\n+--------------------+-------------- --------------------+------------+\n| ``max(s)`` | largest item of *s* | |\n+--------------------+----------------------------------+------------+\n\nSequence types also support comparisons. In particular, tuples and\nlists are compared lexicographically by comparing corresponding\nelements. This means that to compare equal, every element must compare\nequal and the two sequences must be of the same type and have the same\nlength. (For full details see *Comparisons* in the language\nreference.)\n\nNotes:\n\n1. When *s* is a string or Unicode string object the ``in`` and ``not\n in`` operations act like a substring test. In Python versions\n before 2.3, *x* had to be a string of length 1. In Python 2.3 and\n beyond, *x* may be a string of any length.\n\n2. Values of *n* less than ``0`` are treated as ``0`` (which yields an\n empty sequence of the same type as *s*). Note also that the copies\n are shallow; nested structures are not c opied. This often haunts\n new Python programmers; consider:\n\n >>> lists = [[]] * 3\n >>> lists\n [[], [], []]\n >>> lists[0].append(3)\n >>> lists\n [[3], [3], [3]]\n\n What has happened is that ``[[]]`` is a one-element list containing\n an empty list, so all three elements of ``[[]] * 3`` are (pointers\n to) this single empty list. Modifying any of the elements of\n ``lists`` modifies this single list. You can create a list of\n different lists this way:\n\n >>> lists = [[] for i in range(3)]\n >>> lists[0].append(3)\n >>> lists[1].append(5)\n >>> lists[2].append(7)\n >>> lists\n [[3], [5], [7]]\n\n3. If *i* or *j* is negative, the index is relative to the end of the\n string: ``len(s) + i`` or ``len(s) + j`` is substituted. But note\n that ``-0`` is still ``0``.\n\n4. The slice of *s* from *i* to *j* is defined as the sequence of\n items with index *k* such that ``i <= k < j``. If *i* or *j* is\n greater than ``len(s)``, use ``len(s)``. If *i* is omitted or\n ``None``, use ``0``. If *j* is omitted or ``None``, use\n ``len(s)``. If *i* is greater than or equal to *j*, the slice is\n empty.\n\n5. The slice of *s* from *i* to *j* with step *k* is defined as the\n sequence of items with index ``x = i + n*k`` such that ``0 <= n <\n (j-i)/k``. In other words, the indices are ``i``, ``i+k``,\n ``i+2*k``, ``i+3*k`` and so on, stopping when *j* is reached (but\n never including *j*). If *i* or *j* is greater than ``len(s)``,\n use ``len(s)``. If *i* or *j* are omitted or ``None``, they become\n "end" values (which end depends on the sign of *k*). Note, *k*\n cannot be zero. If *k* is ``None``, it is treated like ``1``.\n\n6. **CPython implementation detail:** If *s* and *t* are both strings,\n some Python implementations such as CPython can usually perform an\n in-place optimization for assignments of the form ``s = s + t`` or\n ``s += t``. When applicable, this opt imization makes quadratic\n run-time much less likely. This optimization is both version and\n implementation dependent. For performance sensitive code, it is\n preferable to use the ``str.join()`` method which assures\n consistent linear concatenation performance across versions and\n implementations.\n\n Changed in version 2.4: Formerly, string concatenation never\n occurred in-place.\n\n\nString Methods\n==============\n\nBelow are listed the string methods which both 8-bit strings and\nUnicode objects support. Note that none of these methods take keyword\narguments.\n\nIn addition, Python\'s strings support the sequence type methods\ndescribed in the *Sequence Types --- str, unicode, list, tuple,\nbuffer, xrange* section. To output formatted strings use template\nstrings or the ``%`` operator described in the *String Formatting\nOperations* section. Also, see the ``re`` module for string functions\nbased on regular expressions.\n\nstr.capitalize()\n\n R eturn a copy of the string with its first character capitalized\n and the rest lowercased.\n\n For 8-bit strings, this method is locale-dependent.\n\nstr.center(width[, fillchar])\n\n Return centered in a string of length *width*. Padding is done\n using the specified *fillchar* (default is a space).\n\n Changed in version 2.4: Support for the *fillchar* argument.\n\nstr.count(sub[, start[, end]])\n\n Return the number of non-overlapping occurrences of substring *sub*\n in the range [*start*, *end*]. Optional arguments *start* and\n *end* are interpreted as in slice notation.\n\nstr.decode([encoding[, errors]])\n\n Decodes the string using the codec registered for *encoding*.\n *encoding* defaults to the default string encoding. *errors* may\n be given to set a different error handling scheme. The default is\n ``\'strict\'``, meaning that encoding errors raise ``UnicodeError``.\n Other possible values are ``\'ignore\'``, ``\'replace\'`` and any o ther\n name registered via ``codecs.register_error()``, see section *Codec\n Base Classes*.\n\n New in version 2.2.\n\n Changed in version 2.3: Support for other error handling schemes\n added.\n\nstr.encode([encoding[, errors]])\n\n Return an encoded version of the string. Default encoding is the\n current default string encoding. *errors* may be given to set a\n different error handling scheme. The default for *errors* is\n ``\'strict\'``, meaning that encoding errors raise a\n ``UnicodeError``. Other possible values are ``\'ignore\'``,\n ``\'replace\'``, ``\'xmlcharrefreplace\'``, ``\'backslashreplace\'`` and\n any other name registered via ``codecs.register_error()``, see\n section *Codec Base Classes*. For a list of possible encodings, see\n section *Standard Encodings*.\n\n New in version 2.0.\n\n Changed in version 2.3: Support for ``\'xmlcharrefreplace\'`` and\n ``\'backslashreplace\'`` and other error handling schemes added.\n\n str.endswith(suffix[, start[, end]])\n\n Return ``True`` if the string ends with the specified *suffix*,\n otherwise return ``False``. *suffix* can also be a tuple of\n suffixes to look for. With optional *start*, test beginning at\n that position. With optional *end*, stop comparing at that\n position.\n\n Changed in version 2.5: Accept tuples as *suffix*.\n\nstr.expandtabs([tabsize])\n\n Return a copy of the string where all tab characters are replaced\n by one or more spaces, depending on the current column and the\n given tab size. The column number is reset to zero after each\n newline occurring in the string. If *tabsize* is not given, a tab\n size of ``8`` characters is assumed. This doesn\'t understand other\n non-printing characters or escape sequences.\n\nstr.find(sub[, start[, end]])\n\n Return the lowest index in the string where substring *sub* is\n found, such that *sub* is contained in the slice ``s[start:end]``.\n Optional a rguments *start* and *end* are interpreted as in slice\n notation. Return ``-1`` if *sub* is not found.\n\nstr.format(*args, **kwargs)\n\n Perform a string formatting operation. The string on which this\n method is called can contain literal text or replacement fields\n delimited by braces ``{}``. Each replacement field contains either\n the numeric index of a positional argument, or the name of a\n keyword argument. Returns a copy of the string where each\n replacement field is replaced with the string value of the\n corresponding argument.\n\n >>> "The sum of 1 + 2 is {0}".format(1+2)\n \'The sum of 1 + 2 is 3\'\n\n See *Format String Syntax* for a description of the various\n formatting options that can be specified in format strings.\n\n This method of string formatting is the new standard in Python 3.0,\n and should be preferred to the ``%`` formatting described in\n *String Formatting Operations* in new code.\n\n New in version 2.6.\ n\nstr.index(sub[, start[, end]])\n\n Like ``find()``, but raise ``ValueError`` when the substring is not\n found.\n\nstr.isalnum()\n\n Return true if all characters in the string are alphanumeric and\n there is at least one character, false otherwise.\n\n For 8-bit strings, this method is locale-dependent.\n\nstr.isalpha()\n\n Return true if all characters in the string are alphabetic and\n there is at least one character, false otherwise.\n\n For 8-bit strings, this method is locale-dependent.\n\nstr.isdigit()\n\n Return true if all characters in the string are digits and there is\n at least one character, false otherwise.\n\n For 8-bit strings, this method is locale-dependent.\n\nstr.islower()\n\n Return true if all cased characters in the string are lowercase and\n there is at least one cased character, false otherwise.\n\n For 8-bit strings, this method is locale-dependent.\n\nstr.isspace()\n\n Return true if there are only whitespace chara cters in the string\n and there is at least one character, false otherwise.\n\n For 8-bit strings, this method is locale-dependent.\n\nstr.istitle()\n\n Return true if the string is a titlecased string and there is at\n least one character, for example uppercase characters may only\n follow uncased characters and lowercase characters only cased ones.\n Return false otherwise.\n\n For 8-bit strings, this method is locale-dependent.\n\nstr.isupper()\n\n Return true if all cased characters in the string are uppercase and\n there is at least one cased character, false otherwise.\n\n For 8-bit strings, this method is locale-dependent.\n\nstr.join(iterable)\n\n Return a string which is the concatenation of the strings in the\n *iterable* *iterable*. The separator between elements is the\n string providing this method.\n\nstr.ljust(width[, fillchar])\n\n Return the string left justified in a string of length *width*.\n Padding is done using the specif ied *fillchar* (default is a\n space). The original string is returned if *width* is less than\n ``len(s)``.\n\n Changed in version 2.4: Support for the *fillchar* argument.\n\nstr.lower()\n\n Return a copy of the string converted to lowercase.\n\n For 8-bit strings, this method is locale-dependent.\n\nstr.lstrip([chars])\n\n Return a copy of the string with leading characters removed. The\n *chars* argument is a string specifying the set of characters to be\n removed. If omitted or ``None``, the *chars* argument defaults to\n removing whitespace. The *chars* argument is not a prefix; rather,\n all combinations of its values are stripped:\n\n >>> \' spacious \'.lstrip()\n \'spacious \'\n >>> \'www.example.com\'.lstrip(\'cmowz.\')\n \'example.com\'\n\n Changed in version 2.2.2: Support for the *chars* argument.\n\nstr.partition(sep)\n\n Split the string at the first occurrence of *sep*, and return a\n 3-tuple containing the part bef ore the separator, the separator\n itself, and the part after the separator. If the separator is not\n found, return a 3-tuple containing the string itself, followed by\n two empty strings.\n\n New in version 2.5.\n\nstr.replace(old, new[, count])\n\n Return a copy of the string with all occurrences of substring *old*\n replaced by *new*. If the optional argument *count* is given, only\n the first *count* occurrences are replaced.\n\nstr.rfind(sub[, start[, end]])\n\n Return the highest index in the string where substring *sub* is\n found, such that *sub* is contained within ``s[start:end]``.\n Optional arguments *start* and *end* are interpreted as in slice\n notation. Return ``-1`` on failure.\n\nstr.rindex(sub[, start[, end]])\n\n Like ``rfind()`` but raises ``ValueError`` when the substring *sub*\n is not found.\n\nstr.rjust(width[, fillchar])\n\n Return the string right justified in a string of length *width*.\n Padding is done using the specified *fillchar* (default is a\n space). The original string is returned if *width* is less than\n ``len(s)``.\n\n Changed in version 2.4: Support for the *fillchar* argument.\n\nstr.rpartition(sep)\n\n Split the string at the last occurrence of *sep*, and return a\n 3-tuple containing the part before the separator, the separator\n itself, and the part after the separator. If the separator is not\n found, return a 3-tuple containing two empty strings, followed by\n the string itself.\n\n New in version 2.5.\n\nstr.rsplit([sep[, maxsplit]])\n\n Return a list of the words in the string, using *sep* as the\n delimiter string. If *maxsplit* is given, at most *maxsplit* splits\n are done, the *rightmost* ones. If *sep* is not specified or\n ``None``, any whitespace string is a separator. Except for\n splitting from the right, ``rsplit()`` behaves like ``split()``\n which is described in detail below.\n\n New in version 2.4.\n\nstr.rstrip([c hars])\n\n Return a copy of the string with trailing characters removed. The\n *chars* argument is a string specifying the set of characters to be\n removed. If omitted or ``None``, the *chars* argument defaults to\n removing whitespace. The *chars* argument is not a suffix; rather,\n all combinations of its values are stripped:\n\n >>> \' spacious \'.rstrip()\n \' spacious\'\n >>> \'mississippi\'.rstrip(\'ipz\')\n \'mississ\'\n\n Changed in version 2.2.2: Support for the *chars* argument.\n\nstr.split([sep[, maxsplit]])\n\n Return a list of the words in the string, using *sep* as the\n delimiter string. If *maxsplit* is given, at most *maxsplit*\n splits are done (thus, the list will have at most ``maxsplit+1``\n elements). If *maxsplit* is not specified, then there is no limit\n on the number of splits (all possible splits are made).\n\n If *sep* is given, consecutive delimiters are not grouped together\n and are deemed to delim it empty strings (for example,\n ``\'1,,2\'.split(\',\')`` returns ``[\'1\', \'\', \'2\']``). The *sep*\n argument may consist of multiple characters (for example,\n ``\'1<>2<>3\'.split(\'<>\')`` returns ``[\'1\', \'2\', \'3\']``). Splitting\n an empty string with a specified separator returns ``[\'\']``.\n\n If *sep* is not specified or is ``None``, a different splitting\n algorithm is applied: runs of consecutive whitespace are regarded\n as a single separator, and the result will contain no empty strings\n at the start or end if the string has leading or trailing\n whitespace. Consequently, splitting an empty string or a string\n consisting of just whitespace with a ``None`` separator returns\n ``[]``.\n\n For example, ``\' 1 2 3 \'.split()`` returns ``[\'1\', \'2\', \'3\']``,\n and ``\' 1 2 3 \'.split(None, 1)`` returns ``[\'1\', \'2 3 \']``.\n\nstr.splitlines([keepends])\n\n Return a list of the lines in the string, breaking at line\n boundaries. Line breaks are not included in the resulting list\n unless *keepends* is given and true.\n\nstr.startswith(prefix[, start[, end]])\n\n Return ``True`` if string starts with the *prefix*, otherwise\n return ``False``. *prefix* can also be a tuple of prefixes to look\n for. With optional *start*, test string beginning at that\n position. With optional *end*, stop comparing string at that\n position.\n\n Changed in version 2.5: Accept tuples as *prefix*.\n\nstr.strip([chars])\n\n Return a copy of the string with the leading and trailing\n characters removed. The *chars* argument is a string specifying the\n set of characters to be removed. If omitted or ``None``, the\n *chars* argument defaults to removing whitespace. The *chars*\n argument is not a prefix or suffix; rather, all combinations of its\n values are stripped:\n\n >>> \' spacious \'.strip()\n \'spacious\'\n >>> \'www.example.com\'.strip(\'cmowz.\')\n \'ex ample\'\n\n Changed in version 2.2.2: Support for the *chars* argument.\n\nstr.swapcase()\n\n Return a copy of the string with uppercase characters converted to\n lowercase and vice versa.\n\n For 8-bit strings, this method is locale-dependent.\n\nstr.title()\n\n Return a titlecased version of the string where words start with an\n uppercase character and the remaining characters are lowercase.\n\n The algorithm uses a simple language-independent definition of a\n word as groups of consecutive letters. The definition works in\n many contexts but it means that apostrophes in contractions and\n possessives form word boundaries, which may not be the desired\n result:\n\n >>> "they\'re bill\'s friends from the UK".title()\n "They\'Re Bill\'S Friends From The Uk"\n\n A workaround for apostrophes can be constructed using regular\n expressions:\n\n >>> import re\n >>> def titlecase(s):\n return re.sub(r"[A-Za-z]+(\'[A-Za-z ]+)?",\n lambda mo: mo.group(0)[0].upper() +\n mo.group(0)[1:].lower(),\n s)\n\n >>> titlecase("they\'re bill\'s friends.")\n "They\'re Bill\'s Friends."\n\n For 8-bit strings, this method is locale-dependent.\n\nstr.translate(table[, deletechars])\n\n Return a copy of the string where all characters occurring in the\n optional argument *deletechars* are removed, and the remaining\n characters have been mapped through the given translation table,\n which must be a string of length 256.\n\n You can use the ``maketrans()`` helper function in the ``string``\n module to create a translation table. For string objects, set the\n *table* argument to ``None`` for translations that only delete\n characters:\n\n >>> \'read this short text\'.translate(None, \'aeiou\')\n \'rd ths shrt txt\'\n\n New in version 2.6: Support for a ``None`` *table* argument.\n\n Fo r Unicode objects, the ``translate()`` method does not accept the\n optional *deletechars* argument. Instead, it returns a copy of the\n *s* where all characters have been mapped through the given\n translation table which must be a mapping of Unicode ordinals to\n Unicode ordinals, Unicode strings or ``None``. Unmapped characters\n are left untouched. Characters mapped to ``None`` are deleted.\n Note, a more flexible approach is to create a custom character\n mapping codec using the ``codecs`` module (see ``encodings.cp1251``\n for an example).\n\nstr.upper()\n\n Return a copy of the string converted to uppercase.\n\n For 8-bit strings, this method is locale-dependent.\n\nstr.zfill(width)\n\n Return the numeric string left filled with zeros in a string of\n length *width*. A sign prefix is handled correctly. The original\n string is returned if *width* is less than ``len(s)``.\n\n New in version 2.2.2.\n\nThe following methods are present only on unicode objects:\n\nunicode.isnumeric()\n\n Return ``True`` if there are only numeric characters in S,\n ``False`` otherwise. Numeric characters include digit characters,\n and all characters that have the Unicode numeric value property,\n e.g. U+2155, VULGAR FRACTION ONE FIFTH.\n\nunicode.isdecimal()\n\n Return ``True`` if there are only decimal characters in S,\n ``False`` otherwise. Decimal characters include digit characters,\n and all characters that that can be used to form decimal-radix\n numbers, e.g. U+0660, ARABIC-INDIC DIGIT ZERO.\n\n\nString Formatting Operations\n============================\n\nString and Unicode objects have one unique built-in operation: the\n``%`` operator (modulo). This is also known as the string\n*formatting* or *interpolation* operator. Given ``format % values``\n(where *format* is a string or Unicode object), ``%`` conversion\nspecifications in *format* are replaced with zero or more elements of\n*values*. The effe ct is similar to the using ``sprintf()`` in the C\nlanguage. If *format* is a Unicode object, or if any of the objects\nbeing converted using the ``%s`` conversion are Unicode objects, the\nresult will also be a Unicode object.\n\nIf *format* requires a single argument, *values* may be a single non-\ntuple object. [4] Otherwise, *values* must be a tuple with exactly\nthe number of items specified by the format string, or a single\nmapping object (for example, a dictionary).\n\nA conversion specifier contains two or more characters and has the\nfollowing components, which must occur in this order:\n\n1. The ``\'%\'`` character, which marks the start of the specifier.\n\n2. Mapping key (optional), consisting of a parenthesised sequence of\n characters (for example, ``(somename)``).\n\n3. Conversion flags (optional), which affect the result of some\n conversion types.\n\n4. Minimum field width (optional). If specified as an ``\'*\'``\n (asterisk), the actual width is r ead from the next element of the\n tuple in *values*, and the object to convert comes after the\n minimum field width and optional precision.\n\n5. Precision (optional), given as a ``\'.\'`` (dot) followed by the\n precision. If specified as ``\'*\'`` (an asterisk), the actual width\n is read from the next element of the tuple in *values*, and the\n value to convert comes after the precision.\n\n6. Length modifier (optional).\n\n7. Conversion type.\n\nWhen the right argument is a dictionary (or other mapping type), then\nthe formats in the string *must* include a parenthesised mapping key\ninto that dictionary inserted immediately after the ``\'%\'`` character.\nThe mapping key selects the value to be formatted from the mapping.\nFor example:\n\n>>> print \'%(language)s has %(#)03d quote types.\' % \\\n... {\'language\': "Python", "#": 2}\nPython has 002 quote types.\n\nIn this case no ``*`` specifiers may occur in a format (since they\nrequire a sequential parameter list).\n\nThe conversion flag characters are:\n\n+-----------+-----------------------------------------------------------------------+\n| Flag | Meaning |\n+===========+=======================================================================+\n| ``\'#\'`` | The value conversion will use the "alternate form" (where defined |\n| | below). |\n+-----------+-----------------------------------------------------------------------+\n| ``\'0\'`` | The conversion will be zero padded for numeric values. |\n+-----------+-----------------------------------------------------------------------+\n| ``\'-\'`` | The converted value is left adjusted (overrides the ``\'0\'`` |\n| | conversion if both are given). |\n+-----------+--------------------------------------- --------------------------------+\n| ``\' \'`` | (a space) A blank should be left before a positive number (or empty |\n| | string) produced by a signed conversion. |\n+-----------+-----------------------------------------------------------------------+\n| ``\'+\'`` | A sign character (``\'+\'`` or ``\'-\'``) will precede the conversion |\n| | (overrides a "space" flag). |\n+-----------+-----------------------------------------------------------------------+\n\nA length modifier (``h``, ``l``, or ``L``) may be present, but is\nignored as it is not necessary for Python -- so e.g. ``%ld`` is\nidentical to ``%d``.\n\nThe conversion types are:\n\n+--------------+-------------------------------------------------------+---------+\n| Conversion | Meaning | Notes |\n+==============+===================================================== ==+=========+\n| ``\'d\'`` | Signed integer decimal. | |\n+--------------+-------------------------------------------------------+---------+\n| ``\'i\'`` | Signed integer decimal. | |\n+--------------+-------------------------------------------------------+---------+\n| ``\'o\'`` | Signed octal value. | (1) |\n+--------------+-------------------------------------------------------+---------+\n| ``\'u\'`` | Obsolete type -- it is identical to ``\'d\'``. | (7) |\n+--------------+-------------------------------------------------------+---------+\n| ``\'x\'`` | Signed hexadecimal (lowercase). | (2) |\n+--------------+-------------------------------------------------------+---------+\n| ``\'X\'`` | Signed hexadecimal (uppercase). | (2) |\n+--------------+-------------------- -----------------------------------+---------+\n| ``\'e\'`` | Floating point exponential format (lowercase). | (3) |\n+--------------+-------------------------------------------------------+---------+\n| ``\'E\'`` | Floating point exponential format (uppercase). | (3) |\n+--------------+-------------------------------------------------------+---------+\n| ``\'f\'`` | Floating point decimal format. | (3) |\n+--------------+-------------------------------------------------------+---------+\n| ``\'F\'`` | Floating point decimal format. | (3) |\n+--------------+-------------------------------------------------------+---------+\n| ``\'g\'`` | Floating point format. Uses lowercase exponential | (4) |\n| | format if exponent is less than -4 or not less than | |\n| | precision, decimal format otherwise. | |\n+------ --------+-------------------------------------------------------+---------+\n| ``\'G\'`` | Floating point format. Uses uppercase exponential | (4) |\n| | format if exponent is less than -4 or not less than | |\n| | precision, decimal format otherwise. | |\n+--------------+-------------------------------------------------------+---------+\n| ``\'c\'`` | Single character (accepts integer or single character | |\n| | string). | |\n+--------------+-------------------------------------------------------+---------+\n| ``\'r\'`` | String (converts any Python object using ``repr()``). | (5) |\n+--------------+-------------------------------------------------------+---------+\n| ``\'s\'`` | String (converts any Python object using ``str()``). | (6) |\n+--------------+------------------------------------------------ -------+---------+\n| ``\'%\'`` | No argument is converted, results in a ``\'%\'`` | |\n| | character in the result. | |\n+--------------+-------------------------------------------------------+---------+\n\nNotes:\n\n1. The alternate form causes a leading zero (``\'0\'``) to be inserted\n between left-hand padding and the formatting of the number if the\n leading character of the result is not already a zero.\n\n2. The alternate form causes a leading ``\'0x\'`` or ``\'0X\'`` (depending\n on whether the ``\'x\'`` or ``\'X\'`` format was used) to be inserted\n between left-hand padding and the formatting of the number if the\n leading character of the result is not already a zero.\n\n3. The alternate form causes the result to always contain a decimal\n point, even if no digits follow it.\n\n The precision determines the number of digits after the decimal\n point and defaults to 6.\n\n4. The alternate form causes the result to always contain a decimal\n point, and trailing zeroes are not removed as they would otherwise\n be.\n\n The precision determines the number of significant digits before\n and after the decimal point and defaults to 6.\n\n5. The ``%r`` conversion was added in Python 2.0.\n\n The precision determines the maximal number of characters used.\n\n6. If the object or format provided is a ``unicode`` string, the\n resulting string will also be ``unicode``.\n\n The precision determines the maximal number of characters used.\n\n7. See **PEP 237**.\n\nSince Python strings have an explicit length, ``%s`` conversions do\nnot assume that ``\'\\0\'`` is the end of the string.\n\nFor safety reasons, floating point precisions are clipped to 50;\n``%f`` conversions for numbers whose absolute value is over 1e50 are\nreplaced by ``%g`` conversions. [5] All other errors raise\nexceptions.\n\nAdditional string operations are defined in standard mo dules\n``string`` and ``re``.\n\n\nXRange Type\n===========\n\nThe ``xrange`` type is an immutable sequence which is commonly used\nfor looping. The advantage of the ``xrange`` type is that an\n``xrange`` object will always take the same amount of memory, no\nmatter the size of the range it represents. There are no consistent\nperformance advantages.\n\nXRange objects have very little behavior: they only support indexing,\niteration, and the ``len()`` function.\n\n\nMutable Sequence Types\n======================\n\nList objects support additional operations that allow in-place\nmodification of the object. Other mutable sequence types (when added\nto the language) should also support these operations. Strings and\ntuples are immutable sequence types: such objects cannot be modified\nonce created. The following operations are defined on mutable sequence\ntypes (where *x* is an arbitrary object):\n\n+--------------------------------+----------------------------------+-------- ---------------+\n| Operation | Result | Notes |\n+================================+==================================+=======================+\n| ``s[i] = x`` | item *i* of *s* is replaced by | |\n| | *x* | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s[i:j] = t`` | slice of *s* from *i* to *j* is | |\n| | replaced by the contents of the | |\n| | iterable *t* | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``del s[i:j]`` | same as ``s[i:j] = []`` | |\n+-------------------- ------------+----------------------------------+-----------------------+\n| ``s[i:j:k] = t`` | the elements of ``s[i:j:k]`` are | (1) |\n| | replaced by those of *t* | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``del s[i:j:k]`` | removes the elements of | |\n| | ``s[i:j:k]`` from the list | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.append(x)`` | same as ``s[len(s):len(s)] = | (2) |\n| | [x]`` | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.extend(x)`` | same as ``s[len(s):len(s) ] = x`` | (3) |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.count(x)`` | return number of *i*\'s for which | |\n| | ``s[i] == x`` | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.index(x[, i[, j]])`` | return smallest *k* such that | (4) |\n| | ``s[k] == x`` and ``i <= k < j`` | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.insert(i, x)`` | same as ``s[i:i] = [x]`` | (5) |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.pop([i])`` | same as ``x = s[i]; del s[i]; | (6) |\n| | return x`` | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.remove(x)`` | same as ``del s[s.index(x)]`` | (4) |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.reverse()`` | reverses the items of *s* in | (7) |\n| | place | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.sort([cmp[, key[, | sort the items of *s* in place | (7)(8)(9)(10) |\n| reverse]]])`` | | |\n+--------------------------------+----------------------------------+-----------------------+\n\nNotes:\n\n1. *t* must have the same leng th as the slice it is replacing.\n\n2. The C implementation of Python has historically accepted multiple\n parameters and implicitly joined them into a tuple; this no longer\n works in Python 2.0. Use of this misfeature has been deprecated\n since Python 1.4.\n\n3. *x* can be any iterable object.\n\n4. Raises ``ValueError`` when *x* is not found in *s*. When a negative\n index is passed as the second or third parameter to the ``index()``\n method, the list length is added, as for slice indices. If it is\n still negative, it is truncated to zero, as for slice indices.\n\n Changed in version 2.3: Previously, ``index()`` didn\'t have\n arguments for specifying start and stop positions.\n\n5. When a negative index is passed as the first parameter to the\n ``insert()`` method, the list length is added, as for slice\n indices. If it is still negative, it is truncated to zero, as for\n slice indices.\n\n Changed in version 2.3: Previously, all negative i ndices were\n truncated to zero.\n\n6. The ``pop()`` method is only supported by the list and array types.\n The optional argument *i* defaults to ``-1``, so that by default\n the last item is removed and returned.\n\n7. The ``sort()`` and ``reverse()`` methods modify the list in place\n for economy of space when sorting or reversing a large list. To\n remind you that they operate by side effect, they don\'t return the\n sorted or reversed list.\n\n8. The ``sort()`` method takes optional arguments for controlling the\n comparisons.\n\n *cmp* specifies a custom comparison function of two arguments (list\n items) which should return a negative, zero or positive number\n depending on whether the first argument is considered smaller than,\n equal to, or larger than the second argument: ``cmp=lambda x,y:\n cmp(x.lower(), y.lower())``. The default value is ``None``.\n\n *key* specifies a function of one argument that is used to extract\n a comparison key from each list element: ``key=str.lower``. The\n default value is ``None``.\n\n *reverse* is a boolean value. If set to ``True``, then the list\n elements are sorted as if each comparison were reversed.\n\n In general, the *key* and *reverse* conversion processes are much\n faster than specifying an equivalent *cmp* function. This is\n because *cmp* is called multiple times for each list element while\n *key* and *reverse* touch each element only once.\n\n Changed in version 2.3: Support for ``None`` as an equivalent to\n omitting *cmp* was added.\n\n Changed in version 2.4: Support for *key* and *reverse* was added.\n\n9. Starting with Python 2.3, the ``sort()`` method is guaranteed to be\n stable. A sort is stable if it guarantees not to change the\n relative order of elements that compare equal --- this is helpful\n for sorting in multiple passes (for example, sort by department,\n then by salary grade).\n\n10. **CPython implementation detail:** While a list is being sorted,\n the effect of attempting to mutate, or even inspect, the list is\n undefined. The C implementation of Python 2.3 and newer makes the\n list appear empty for the duration, and raises ``ValueError`` if\n it can detect that the list has been mutated during a sort.\n', - 'typesseq-mutable': u"\nMutable Sequence Types\n**********************\n\nList objects support additional operations that allow in-place\nmodification of the object. Other mutable sequence types (when added\nto the language) should also support these operations. Strings and\ntuples are immutable sequence types: such objects cannot be modified\nonce created. The following operations are defined on mutable sequence\ntypes (where *x* is an arbitrary object):\n\n+--------------------------------+----------------------------------+-----------------------+\n| Operation | Result | Notes |\n+================================+==================================+=======================+\n| ``s[i] = x`` | item *i* of *s* is replaced by | |\n| | *x* | |\n+--------------------------------+--------------- -------------------+-----------------------+\n| ``s[i:j] = t`` | slice of *s* from *i* to *j* is | |\n| | replaced by the contents of the | |\n| | iterable *t* | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``del s[i:j]`` | same as ``s[i:j] = []`` | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s[i:j:k] = t`` | the elements of ``s[i:j:k]`` are | (1) |\n| | replaced by those of *t* | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``del s[i:j:k]`` | removes the elements of | |\n| | ``s[i:j:k]`` from the list | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.append(x)`` | same as ``s[len(s):len(s)] = | (2) |\n| | [x]`` | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.extend(x)`` | same as ``s[len(s):len(s)] = x`` | (3) |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.count(x)`` | return number of *i*'s for which | |\n| | ``s[i] == x`` | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.index(x[, i[, j]])`` | return smallest *k* such that | (4) |\n| | ``s[k] == x`` and ``i <= k < j`` | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.insert(i, x)`` | same as ``s[i:i] = [x]`` | (5) |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.pop([i])`` | same as ``x = s[i]; del s[i]; | (6) |\n| | return x`` | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.remove(x)`` | same as ``del s[s.index(x)]`` | (4) |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.reverse()`` | reverses the items of *s* in | ( 7) |\n| | place | |\n+--------------------------------+----------------------------------+-----------------------+\n| ``s.sort([cmp[, key[, | sort the items of *s* in place | (7)(8)(9)(10) |\n| reverse]]])`` | | |\n+--------------------------------+----------------------------------+-----------------------+\n\nNotes:\n\n1. *t* must have the same length as the slice it is replacing.\n\n2. The C implementation of Python has historically accepted multiple\n parameters and implicitly joined them into a tuple; this no longer\n works in Python 2.0. Use of this misfeature has been deprecated\n since Python 1.4.\n\n3. *x* can be any iterable object.\n\n4. Raises ``ValueError`` when *x* is not found in *s*. When a negative\n index is passed as the second or third parameter to the ``index( )``\n method, the list length is added, as for slice indices. If it is\n still negative, it is truncated to zero, as for slice indices.\n\n Changed in version 2.3: Previously, ``index()`` didn't have\n arguments for specifying start and stop positions.\n\n5. When a negative index is passed as the first parameter to the\n ``insert()`` method, the list length is added, as for slice\n indices. If it is still negative, it is truncated to zero, as for\n slice indices.\n\n Changed in version 2.3: Previously, all negative indices were\n truncated to zero.\n\n6. The ``pop()`` method is only supported by the list and array types.\n The optional argument *i* defaults to ``-1``, so that by default\n the last item is removed and returned.\n\n7. The ``sort()`` and ``reverse()`` methods modify the list in place\n for economy of space when sorting or reversing a large list. To\n remind you that they operate by side effect, they don't return the\n sorted or re versed list.\n\n8. The ``sort()`` method takes optional arguments for controlling the\n comparisons.\n\n *cmp* specifies a custom comparison function of two arguments (list\n items) which should return a negative, zero or positive number\n depending on whether the first argument is considered smaller than,\n equal to, or larger than the second argument: ``cmp=lambda x,y:\n cmp(x.lower(), y.lower())``. The default value is ``None``.\n\n *key* specifies a function of one argument that is used to extract\n a comparison key from each list element: ``key=str.lower``. The\n default value is ``None``.\n\n *reverse* is a boolean value. If set to ``True``, then the list\n elements are sorted as if each comparison were reversed.\n\n In general, the *key* and *reverse* conversion processes are much\n faster than specifying an equivalent *cmp* function. This is\n because *cmp* is called multiple times for each list element while\n *key* and *reverse* to uch each element only once.\n\n Changed in version 2.3: Support for ``None`` as an equivalent to\n omitting *cmp* was added.\n\n Changed in version 2.4: Support for *key* and *reverse* was added.\n\n9. Starting with Python 2.3, the ``sort()`` method is guaranteed to be\n stable. A sort is stable if it guarantees not to change the\n relative order of elements that compare equal --- this is helpful\n for sorting in multiple passes (for example, sort by department,\n then by salary grade).\n\n10. **CPython implementation detail:** While a list is being sorted,\n the effect of attempting to mutate, or even inspect, the list is\n undefined. The C implementation of Python 2.3 and newer makes the\n list appear empty for the duration, and raises ``ValueError`` if\n it can detect that the list has been mutated during a sort.\n", - 'unary': u'\nUnary arithmetic and bitwise operations\n***************************************\n\nAll unary arithmetic and bitwise operations have the same priority:\n\n u_expr ::= power | "-" u_expr | "+" u_expr | "~" u_expr\n\nThe unary ``-`` (minus) operator yields the negation of its numeric\nargument.\n\nThe unary ``+`` (plus) operator yields its numeric argument unchanged.\n\nThe unary ``~`` (invert) operator yields the bitwise inversion of its\nplain or long integer argument. The bitwise inversion of ``x`` is\ndefined as ``-(x+1)``. It only applies to integral numbers.\n\nIn all three cases, if the argument does not have the proper type, a\n``TypeError`` exception is raised.\n', diff --git a/Lib/site.py b/Lib/site.py index ff41408..c4ebfe2 100644 --- a/Lib/site.py 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 Mar 12 12:02:10 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 12 Mar 2011 11:02:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[13747] csw/mgar/pkg/lang-python/python/trunk/Makefile Message-ID: Revision: 13747 http://gar.svn.sourceforge.net/gar/?rev=13747&view=rev Author: wahwah Date: 2011-03-12 11:02:10 +0000 (Sat, 12 Mar 2011) Log Message: ----------- python: Adding CSWlibffi-dev as a build dependency Modified Paths: -------------- csw/mgar/pkg/lang-python/python/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/Makefile 2011-03-12 10:59:18 UTC (rev 13746) +++ csw/mgar/pkg/lang-python/python/trunk/Makefile 2011-03-12 11:02:10 UTC (rev 13747) @@ -142,6 +142,8 @@ RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWtcl RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWtk +BUILD_DEP_PKGS += CSWlibffi-dev + # There are packages depending on libpython2.5, and listing CSWpython as the # dependency. RUNTIME_DEP_PKGS_CSWpython += CSWlibpython2-5-1-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 Mar 12 12:22:54 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 12 Mar 2011 11:22:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[13748] csw/mgar/pkg/lang-python/python/trunk/Makefile Message-ID: Revision: 13748 http://gar.svn.sourceforge.net/gar/?rev=13748&view=rev Author: wahwah Date: 2011-03-12 11:22:54 +0000 (Sat, 12 Mar 2011) Log Message: ----------- python: Fix for the _dev catalogname Modified Paths: -------------- csw/mgar/pkg/lang-python/python/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/Makefile 2011-03-12 11:02:10 UTC (rev 13747) +++ csw/mgar/pkg/lang-python/python/trunk/Makefile 2011-03-12 11:22:54 UTC (rev 13748) @@ -157,7 +157,7 @@ CATALOGNAME_CSWidle$(CVER) = idle CATALOGNAME_CSWpython$(CVER) = python -CATALOGNAME_CSWpython$(CVER)-dev = python$(CVER)_devel +CATALOGNAME_CSWpython$(CVER)-dev = python$(CVER)_dev CATALOGNAME_CSWpython$(CVER)-tk = python$(CVER)_tk CATALOGNAME_CSWpython$(CVER)-test = python$(CVER)_test CATALOGNAME_CSWlibpython$(DVER)-1-0 = libpython$(UVER)_1_0 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 Mar 12 17:27:33 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 12 Mar 2011 16:27:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[13749] csw/mgar/pkg/coreutils/trunk Message-ID: Revision: 13749 http://gar.svn.sourceforge.net/gar/?rev=13749&view=rev Author: bdwalton Date: 2011-03-12 16:27:33 +0000 (Sat, 12 Mar 2011) Log Message: ----------- coreutils/trunk: add proposed upstream patch to correct for *utimens function handling; mantis id 4671 Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/coreutils/trunk/files/0001-Apply-proposed-upstream-patch-to-fix-a-utimens-gnuli.patch Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2011-03-12 11:22:54 UTC (rev 13748) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2011-03-12 16:27:33 UTC (rev 13749) @@ -28,6 +28,7 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz +PATCHFILES += 0001-Apply-proposed-upstream-patch-to-fix-a-utimens-gnuli.patch # We define upstream file regex so we can be notifed of new upstream # software release Added: csw/mgar/pkg/coreutils/trunk/files/0001-Apply-proposed-upstream-patch-to-fix-a-utimens-gnuli.patch =================================================================== --- csw/mgar/pkg/coreutils/trunk/files/0001-Apply-proposed-upstream-patch-to-fix-a-utimens-gnuli.patch (rev 0) +++ csw/mgar/pkg/coreutils/trunk/files/0001-Apply-proposed-upstream-patch-to-fix-a-utimens-gnuli.patch 2011-03-12 16:27:33 UTC (rev 13749) @@ -0,0 +1,71 @@ +From d698357000bbfba7443cab845a6aa426658c2bac Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sat, 12 Mar 2011 15:22:48 +0100 +Subject: [PATCH] Apply proposed upstream patch to fix a *utimens gnulib bug + +This patch changes the the use of some *futimens definitions to use +the rpl_ prefix to avoid cyclic function calls on solaris 10. + +This patch was imported from: +http://www.mail-archive.com/bug-gnulib at gnu.org/msg21995.html + +It addresses Mantis ID 4671. + +Signed-off-by: Ben Walton +--- + lib/sys_stat.in.h | 16 ++++++++++++++-- + 1 files changed, 14 insertions(+), 2 deletions(-) + +diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h +index f175bcb..89d9c08 100644 +--- a/lib/sys_stat.in.h ++++ b/lib/sys_stat.in.h +@@ -357,7 +357,11 @@ _GL_WARN_ON_USE (fstatat, "fstatat is not portable - " + + + #if @GNULIB_FUTIMENS@ +-# if @REPLACE_FUTIMENS@ ++/* Use the rpl_ prefix also on Solaris <= 9, because on Solaris 9 our ++ futimens implementation relies on futimesat, which on Solaris 10 ++ makes an invocation to futimens that is meant to invoke the libc's ++ futimens(), not gnulib's futimens(). */ ++# if @REPLACE_FUTIMENS@ || defined __sun + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # undef futimens + # define futimens rpl_futimens +@@ -370,7 +374,9 @@ _GL_FUNCDECL_SYS (futimens, int, (int fd, struct timespec const times[2])); + # endif + _GL_CXXALIAS_SYS (futimens, int, (int fd, struct timespec const times[2])); + # endif ++# if @HAVE_FUTIMENS@ + _GL_CXXALIASWARN (futimens); ++# endif + #elif defined GNULIB_POSIXCHECK + # undef futimens + # if HAVE_RAW_DECL_FUTIMENS +@@ -611,7 +617,11 @@ _GL_WARN_ON_USE (stat, "stat is unportable - " + + + #if @GNULIB_UTIMENSAT@ +-# if @REPLACE_UTIMENSAT@ ++/* Use the rpl_ prefix also on Solaris <= 9, because on Solaris 9 our ++ utimensat implementation relies on futimesat, which on Solaris 10 ++ makes an invocation to utimensat that is meant to invoke the libc's ++ utimensat(), not gnulib's utimensat(). */ ++# if @REPLACE_UTIMENSAT@ || defined __sun + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # undef utimensat + # define utimensat rpl_utimensat +@@ -630,7 +640,9 @@ _GL_FUNCDECL_SYS (utimensat, int, (int fd, char const *name, + _GL_CXXALIAS_SYS (utimensat, int, (int fd, char const *name, + struct timespec const times[2], int flag)); + # endif ++# if @HAVE_UTIMENSAT@ + _GL_CXXALIASWARN (utimensat); ++# endif + #elif defined GNULIB_POSIXCHECK + # undef utimensat + # if HAVE_RAW_DECL_UTIMENSAT +-- +1.7.3.2 + 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 Mar 12 17:29:53 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 12 Mar 2011 16:29:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[13750] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 13750 http://gar.svn.sourceforge.net/gar/?rev=13750&view=rev Author: bdwalton Date: 2011-03-12 16:29:52 +0000 (Sat, 12 Mar 2011) Log Message: ----------- coreutils/trunk: note that the applied patch is a feature/backport Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2011-03-12 16:27:33 UTC (rev 13749) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2011-03-12 16:29:52 UTC (rev 13750) @@ -30,6 +30,9 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz PATCHFILES += 0001-Apply-proposed-upstream-patch-to-fix-a-utimens-gnuli.patch +# patch ...apply proposed upstream... is a deviation from stock 8.10 +VERSION_FLAG_PATCH = 1 + # We define upstream file regex so we can be notifed of new upstream # software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz 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 Mar 12 19:38:50 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 12 Mar 2011 18:38:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[13751] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 13751 http://gar.svn.sourceforge.net/gar/?rev=13751&view=rev Author: wahwah Date: 2011-03-12 18:38:49 +0000 (Sat, 12 Mar 2011) Log Message: ----------- cups: Renaming -devel to -dev Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2011-03-12 16:29:52 UTC (rev 13750) +++ csw/mgar/pkg/cups/trunk/Makefile 2011-03-12 18:38:49 UTC (rev 13751) @@ -169,30 +169,34 @@ RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibcupsimage2 PACKAGES += CSWcupsdoc +CHECKPKG_OVERRIDES_CSWcupsdoc += file-with-bad-content # Devel package -PACKAGES += CSWcups-devel -SPKG_DESC_CSWcups-devel = CUPS header files -CATALOGNAME_CSWcups-devel = cups_devel -PKGFILES_CSWcups-devel = $(includedir)/cups/?.* -PKGFILES_CSWcups-devel += $(mandir)/man1/cups-config.1 -PKGFILES_CSWcups-devel += $(bindir)/cups-config -PKGFILES_CSWcups-devel += $(datadir)/cups/ppdc.* -PKGFILES_CSWcups-devel += $(datadir)/cups/drv.* -PKGFILES_CSWcups-devel += $(libdir)/libcups.so -PKGFILES_CSWcups-devel += $(libdir)/libcupscgi.so -PKGFILES_CSWcups-devel += $(libdir)/libcupsdriver.so -PKGFILES_CSWcups-devel += $(libdir)/libcupsimage.so -PKGFILES_CSWcups-devel += $(libdir)/libcupsmime.so -PKGFILES_CSWcups-devel += $(libdir)/libcupsppdc.so +PACKAGES += CSWcups-dev +SPKG_DESC_CSWcups-dev = CUPS header files +CATALOGNAME_CSWcups-dev = cups_dev +PKGFILES_CSWcups-dev = $(includedir)/cups/?.* +PKGFILES_CSWcups-dev += $(mandir)/man1/cups-config.1 +PKGFILES_CSWcups-dev += $(bindir)/cups-config +PKGFILES_CSWcups-dev += $(datadir)/cups/ppdc.* +PKGFILES_CSWcups-dev += $(datadir)/cups/drv.* +PKGFILES_CSWcups-dev += $(libdir)/libcups.so +PKGFILES_CSWcups-dev += $(libdir)/libcupscgi.so +PKGFILES_CSWcups-dev += $(libdir)/libcupsdriver.so +PKGFILES_CSWcups-dev += $(libdir)/libcupsimage.so +PKGFILES_CSWcups-dev += $(libdir)/libcupsmime.so +PKGFILES_CSWcups-dev += $(libdir)/libcupsppdc.so # The development package needs all the libraries -RUNTIME_DEP_PKGS_CSWcups-devel += CSWlibcupsppdc1 -RUNTIME_DEP_PKGS_CSWcups-devel += CSWlibcupsdriver1 -RUNTIME_DEP_PKGS_CSWcups-devel += CSWlibcups2 -RUNTIME_DEP_PKGS_CSWcups-devel += CSWlibcupsmime1 -RUNTIME_DEP_PKGS_CSWcups-devel += CSWlibcupsimage2 -RUNTIME_DEP_PKGS_CSWcups-devel += CSWlibcupscgi1 +RUNTIME_DEP_PKGS_CSWcups-dev += CSWlibcupsppdc1 +RUNTIME_DEP_PKGS_CSWcups-dev += CSWlibcupsdriver1 +RUNTIME_DEP_PKGS_CSWcups-dev += CSWlibcups2 +RUNTIME_DEP_PKGS_CSWcups-dev += CSWlibcupsmime1 +RUNTIME_DEP_PKGS_CSWcups-dev += CSWlibcupsimage2 +RUNTIME_DEP_PKGS_CSWcups-dev += CSWlibcupscgi1 +OBSOLETES_CSWcups-dev += CSWcups-devel +OBSOLETES_CSWcups-dev += CSWcupsdev + # Former devel package PACKAGES += CSWcupsdev SPKG_DESC_CSWcupsdev = Empty transitional package This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Mar 12 21:18:58 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 12 Mar 2011 20:18:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[13752] csw/mgar/pkg/GeoIP/trunk/Makefile Message-ID: Revision: 13752 http://gar.svn.sourceforge.net/gar/?rev=13752&view=rev Author: bonivart Date: 2011-03-12 20:18:57 +0000 (Sat, 12 Mar 2011) Log Message: ----------- GeoIP/trunk: Prepare for devel to dev rename Modified Paths: -------------- csw/mgar/pkg/GeoIP/trunk/Makefile Modified: csw/mgar/pkg/GeoIP/trunk/Makefile =================================================================== --- csw/mgar/pkg/GeoIP/trunk/Makefile 2011-03-12 18:38:49 UTC (rev 13751) +++ csw/mgar/pkg/GeoIP/trunk/Makefile 2011-03-12 20:18:57 UTC (rev 13752) @@ -10,28 +10,27 @@ MASTER_SITES = http://geolite.maxmind.com/download/geoip/api/c/ DISTFILES = $(NAME)-$(VERSION).tar.gz -PACKAGES = CSWgeoip CSWgeoipdevel -RUNTIME_DEP_PKGS_CSWgeoip = CSWgeolitedb CSWzlib CSWgcc3corert -RUNTIME_DEP_PKGS_CSWgeoipdevel = CSWgeoip +PACKAGES += CSWgeoip CATALOGNAME_CSWgeoip = geoip -CATALOGNAME_CSWgeoipdevel = geoip_devel SPKG_DESC_CSWgeoip = $(DESCRIPTION) -SPKG_DESC_CSWgeoipdevel = GeoIP C API development support +RUNTIME_DEP_PKGS_CSWgeoip = CSWgeolitedb CSWzlib CSWgcc3corert -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES += CSWgeoip-dev +CATALOGNAME_CSWgeoip-dev = geoip_dev +SPKG_DESC_CSWgeoip-dev = GeoIP C API development support +RUNTIME_DEP_PKGS_CSWgeoip-dev = CSWgeoip GARCOMPILER = GCC4 TEST_TARGET = check -PKGFILES_CSWgeoipdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWgeoip-dev = $(PKGFILES_DEVEL) EXTRA_MERGE_EXCLUDE_FILES = .*GeoIP.dat$ # Do not exclude static libs (needed for devel package) MERGE_EXCLUDE_STATICLIBS = -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Mar 12 21:19:44 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 12 Mar 2011 20:19:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[13753] csw/mgar/pkg/bind/trunk/Makefile Message-ID: Revision: 13753 http://gar.svn.sourceforge.net/gar/?rev=13753&view=rev Author: bonivart Date: 2011-03-12 20:19:44 +0000 (Sat, 12 Mar 2011) Log Message: ----------- bind/trunk: Prepare for devel to dev rename Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2011-03-12 20:18:57 UTC (rev 13752) +++ csw/mgar/pkg/bind/trunk/Makefile 2011-03-12 20:19:44 UTC (rev 13753) @@ -30,31 +30,34 @@ DISTFILES += CSWbindchroot.postinstall -PACKAGES = CSWbind CSWbinddevel CSWlibbind CSWbindutils CSWbindchroot +LICENSE = COPYRIGHT -CATALOGNAME_CSWbinddevel = bind_devel -CATALOGNAME_CSWbindutils = bind_utils -CATALOGNAME_CSWbindchroot = bind_chroot +PACKAGES = CSWbind +CATALOGNAME_CSWbind = bind +SPKG_DESC_CSWbind = ISC BIND DNS main package +RUNTIME_DEP_PKGS_CSWbind = CSWlibbind CSWbindutils CSWiconv CSWlibxml2 CSWosslrt CSWzlib -ARCHALL_CSWbindchroot = 1 +PACKAGES = CSWbind-dev +CATALOGNAME_CSWbind-dev = bind_dev +SPKG_DESC_CSWbind-dev = ISC BIND DNS development package +RUNTIME_DEP_PKGS_CSWbind-dev = CSWbind CSWlibbind -LICENSE = COPYRIGHT +PACKAGES = CSWlibbind +CATALOGNAME_CSWlibbind = libbind +SPKG_DESC_CSWlibbind = ISC BIND DNS library package +RUNTIME_DEP_PKGS_CSWlibbind = CSWiconv CSWlibxml2 CSWosslrt CSWzlib -SPKG_DESC_CSWbind = ISC BIND DNS main package -SPKG_DESC_CSWbinddevel = ISC BIND DNS development package -SPKG_DESC_CSWlibbind = ISC BIND DNS library package +PACKAGES = CSWbindutils +CATALOGNAME_CSWbindutils = bind_utils SPKG_DESC_CSWbindutils = ISC BIND DNS utilities package +RUNTIME_DEP_PKGS_CSWbindutils = CSWlibbind CSWiconv CSWlibxml2 CSWosslrt CSWzlib + +PACKAGES = CSWbindchroot +CATALOGNAME_CSWbindchroot = bind_chroot SPKG_DESC_CSWbindchroot = ISC BIND DNS chroot package - -RUNTIME_DEP_PKGS_CSWbind = CSWlibbind CSWbindutils CSWiconv CSWlibxml2 CSWosslrt CSWzlib -RUNTIME_DEP_PKGS_CSWbinddevel = CSWbind CSWlibbind -RUNTIME_DEP_PKGS_CSWlibbind = CSWiconv CSWlibxml2 CSWosslrt CSWzlib -RUNTIME_DEP_PKGS_CSWbindutils = CSWlibbind CSWiconv CSWlibxml2 CSWosslrt CSWzlib RUNTIME_DEP_PKGS_CSWbindchroot = CSWbind +ARCHALL_CSWbindchroot = 1 -UPSTREAM_MASTER_SITES = http://ftp.isc.org/isc/bind9/ -UFILES_REGEX = (\d+(?:\.\d+)*) - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libtool CONFIGURE_ARGS += --with-openssl=/opt/csw @@ -65,25 +68,25 @@ EXTRA_MERGE_EXCLUDE_FILES = .*~ $(libdir)/.*\.a $(libdir)/.*\.la -PKGFILES_CSWbinddevel = $(PKGFILES_DEVEL) -PKGFILES_CSWbinddevel += .*\.so -PKGFILES_CSWlibbind = .*\.so\..* -PKGFILES_CSWbindutils = $(bindir)/.* +PKGFILES_CSWbind-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWbind-dev += .*\.so +PKGFILES_CSWlibbind = .*\.so\..* +PKGFILES_CSWbindutils = $(bindir)/.* PKGFILES_CSWbindchroot = .*chroot.* INSTALL_SCRIPTS = custom PROTOTYPE_MODIFIERS = 1 -PROTOTYPE_FILES_1 = /var/opt/csw/named.* -PROTOTYPE_CLASS_1 = ugfiles -PROTOTYPE_USER_1 = named -PROTOTYPE_GROUP_1 = named +PROTOTYPE_FILES_1 = /var/opt/csw/named.* +PROTOTYPE_CLASS_1 = ugfiles +PROTOTYPE_USER_1 = named +PROTOTYPE_GROUP_1 = named -INITSMF = /etc/opt/csw/init.d/cswnamed +INITSMF = /etc/opt/csw/init.d/cswnamed SAMPLECONF = /etc/opt/csw/named.conf SAMPLECONF += /etc/opt/csw/bind.keys SAMPLECONF += /etc/opt/csw/pkg/CSWbind/bind -USERGROUP = /etc/opt/csw/pkg/CSWbind/cswusergroup +USERGROUP = /etc/opt/csw/pkg/CSWbind/cswusergroup SPKG_SOURCEURL = http://www.isc.org/software/bind @@ -91,7 +94,7 @@ CHECKPKG_OVERRIDES_CSWlibbind += non-uniform-lib-versions-in-package|sonames=libbind9.so.60,libdns.so.69,libisc.so.62,libisccc.so.60,libisccfg.so.62,liblwres.so.60 CHECKPKG_OVERRIDES_CSWbindchroot += catalogname-does-not-match-pkgname|pkgname=CSWbindchroot|catalogname=bind_chroot|expected-catalogname=bindchroot CHECKPKG_OVERRIDES_CSWbindutils += catalogname-does-not-match-pkgname|pkgname=CSWbindutils|catalogname=bind_utils|expected-catalogname=bindutils -CHECKPKG_OVERRIDES_CSWbinddevel += catalogname-does-not-match-pkgname|pkgname=CSWbinddevel|catalogname=bind_devel|expected-catalogname=binddevel +CHECKPKG_OVERRIDES_CSWbind-dev += catalogname-does-not-match-pkgname|pkgname=CSWbinddevel|catalogname=bind_dev|expected-catalogname=binddev include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Mar 12 21:20:17 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 12 Mar 2011 20:20:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[13754] csw/mgar/pkg/dhcp/trunk/Makefile Message-ID: Revision: 13754 http://gar.svn.sourceforge.net/gar/?rev=13754&view=rev Author: bonivart Date: 2011-03-12 20:20:17 +0000 (Sat, 12 Mar 2011) Log Message: ----------- dhcp/trunk: Prepare for devel to dev rename Modified Paths: -------------- csw/mgar/pkg/dhcp/trunk/Makefile Modified: csw/mgar/pkg/dhcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/dhcp/trunk/Makefile 2011-03-12 20:19:44 UTC (rev 13753) +++ csw/mgar/pkg/dhcp/trunk/Makefile 2011-03-12 20:20:17 UTC (rev 13754) @@ -21,15 +21,15 @@ LICENSE = LICENSE -PACKAGES = CSWdhcp CSWdhcpdevel - +PACKAGES += CSWdhcp RUNTIME_DEP_PKGS_CSWdhcp = CSWosslrt SPKG_DESC_CSWdhcp = ISC DHCP reference implementation -RUNTIME_DEP_PKGS_CSWdhcpdevel = CSWdhcp -SPKG_DESC_CSWdhcpdevel = ISC DHCP development package -CATALOGNAME_CSWdhcpdevel = dhcp_devel -ARCHALL_CSWdhcpdevel = 1 +PACKAGES += CSWdhcp-dev +RUNTIME_DEP_PKGS_CSWdhcp-dev = CSWdhcp +SPKG_DESC_CSWdhcp-dev = ISC DHCP development package +CATALOGNAME_CSWdhcp-dev = dhcp_dev +ARCHALL_CSWdhcp-dev = 1 UFILES_REGEX = ($(NAME)-\d+(?:\.\d+)*).tar.gz @@ -42,18 +42,20 @@ EXTRA_MERGE_EXCLUDE_FILES = .*~ $(libdir)/.*\.a $(libdir)/.*\.la -PKGFILES_CSWdhcpdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWdhcp-dev = $(PKGFILES_DEVEL) #ENABLE_CHECK = 0 INSTALL_SCRIPTS = custom -INITSMF = /etc/opt/csw/init.d/cswdhcpd -SAMPLECONF = /etc/opt/csw/dhcpd.conf /etc/opt/csw/dhclient.conf /var/opt/csw/dhcp/db/dhcpd.leases +INITSMF = /etc/opt/csw/init.d/cswdhcpd +SAMPLECONF = /etc/opt/csw/dhcpd.conf +SAMPLECONF += /etc/opt/csw/dhclient.conf +SAMPLECONF += /var/opt/csw/dhcp/db/dhcpd.leases SPKG_SOURCEURL = https://www.isc.org/software/dhcp -CHECKPKG_OVERRIDES_CSWdhcpdevel += archall-devel-package +CHECKPKG_OVERRIDES_CSWdhcp-dev += archall-devel-package include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Mar 12 21:20:53 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 12 Mar 2011 20:20:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[13755] csw/mgar/pkg/clamav/trunk/Makefile Message-ID: Revision: 13755 http://gar.svn.sourceforge.net/gar/?rev=13755&view=rev Author: bonivart Date: 2011-03-12 20:20:52 +0000 (Sat, 12 Mar 2011) Log Message: ----------- clamav/trunk: Prepare for devel to dev rename Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2011-03-12 20:20:17 UTC (rev 13754) +++ csw/mgar/pkg/clamav/trunk/Makefile 2011-03-12 20:20:52 UTC (rev 13755) @@ -20,30 +20,25 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz #DISTFILES = $(NAME)-devel-latest.tar.gz -PACKAGES = CSWclamav CSWlibclam6 CSWlibclam6-devel - +PACKAGES += CSWclamav CATALOGNAME_CSWclamav = clamav SPKG_DESC_CSWclamav = $(DESCRIPTION) - -CATALOGNAME_CSWlibclam6 = libclam6 -SPKG_DESC_CSWlibclam6 = $(DESCRIPTION) Library - -CATALOGNAME_CSWlibclam6-devel = libclam6_devel -SPKG_DESC_CSWlibclam6-devel = $(DESCRIPTION) Development - RUNTIME_DEP_PKGS_CSWclamav = CSWlibclam6 CSWzlib CSWbzip2 CSWiconv CSWncurses RUNTIME_DEP_PKGS_CSWclamav += CSWlibltdl7 +PACKAGES += CSWlibclam6 +CATALOGNAME_CSWlibclam6 = libclam6 +SPKG_DESC_CSWlibclam6 = $(DESCRIPTION) Library RUNTIME_DEP_PKGS_CSWlibclam6 = CSWzlib CSWbzip2 CSWiconv RUNTIME_DEP_PKGS_CSWlibclam6 += CSWlibltdl7 INCOMPATIBLE_PKGS_CSWlibclam6 = CSWlibclamav -RUNTIME_DEP_PKGS_CSWlibclam6-devel = CSWlibclam6 -INCOMPATIBLE_PKGS_CSWlibclam6-devel = CSWlibclamav-devel +PACKAGES += CSWlibclam6-dev +CATALOGNAME_CSWlibclam6-dev = libclam6_dev +SPKG_DESC_CSWlibclam6-dev = $(DESCRIPTION) Development +RUNTIME_DEP_PKGS_CSWlibclam6-dev = CSWlibclam6 +INCOMPATIBLE_PKGS_CSWlibclam6-dev = CSWlibclamav-devel -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - PATCHFILES = CSWclamav.freshclam.conf.p PATCHFILES += CSWclamav.clamd.conf.p PATCHFILES += CSWclamav.clamav-milter.conf.p @@ -75,29 +70,29 @@ EXTRA_MERGE_EXCLUDE_FILES = .*~ $(libdir)/.*\.a $(libdir)/.*\.la -PKGFILES_CSWlibclam6-devel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibclam6 = $(PKGFILES_RT) -PKGFILES_CSWlibclam6 += $(docdir)/libclamav/.* +PKGFILES_CSWlibclam6-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWlibclam6 = $(PKGFILES_RT) +PKGFILES_CSWlibclam6 += $(docdir)/libclamav/.* PROTOTYPE_MODIFIERS = 1 -PROTOTYPE_FILES_1 = \/var\/opt\/csw\/clamav.* -PROTOTYPE_CLASS_1 = ugfiles -PROTOTYPE_USER_1 = clamav +PROTOTYPE_FILES_1 = \/var\/opt\/csw\/clamav.* +PROTOTYPE_CLASS_1 = ugfiles +PROTOTYPE_USER_1 = clamav -INITSMF = /etc/opt/csw/init.d/cswclamd -INITSMF += /etc/opt/csw/init.d/cswclamav-milter +INITSMF = /etc/opt/csw/init.d/cswclamd +INITSMF += /etc/opt/csw/init.d/cswclamav-milter SAMPLECONF = /etc/opt/csw/clamd.conf SAMPLECONF += /etc/opt/csw/clamav-milter.conf SAMPLECONF += /etc/opt/csw/freshclam.conf -USERGROUP = /etc/opt/csw/pkg/CSWclamav/cswusergroup +USERGROUP = /etc/opt/csw/pkg/CSWclamav/cswusergroup -MIGRATE_FILES_CSWclamav = clamd.conf clamav-milter.conf freshclam.conf +MIGRATE_FILES_CSWclamav = clamd.conf clamav-milter.conf freshclam.conf MIGRATE_SOURCE_DIR_CSWclamav = /opt/csw/etc -MIGRATE_DEST_DIR_CSWclamav = /etc/opt/csw +MIGRATE_DEST_DIR_CSWclamav = /etc/opt/csw SPKG_SOURCEURL = http://www.clamav.net -SKIPTEST = 1 +#SKIPTEST = 1 TEST_TARGET = check CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/etc/opt/csw/clamd.conf.CSW 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 Mar 12 22:06:55 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 12 Mar 2011 21:06:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[13756] csw/mgar/pkg/lang-python/nose/trunk Message-ID: Revision: 13756 http://gar.svn.sourceforge.net/gar/?rev=13756&view=rev Author: wahwah Date: 2011-03-12 21:06:55 +0000 (Sat, 12 Mar 2011) Log Message: ----------- nose: Version bump up to 0.11.3 Modified Paths: -------------- csw/mgar/pkg/lang-python/nose/trunk/Makefile csw/mgar/pkg/lang-python/nose/trunk/checksums Modified: csw/mgar/pkg/lang-python/nose/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/nose/trunk/Makefile 2011-03-12 20:20:52 UTC (rev 13755) +++ csw/mgar/pkg/lang-python/nose/trunk/Makefile 2011-03-12 21:06:55 UTC (rev 13756) @@ -1,5 +1,7 @@ +# $Id$ + NAME = nose -VERSION = 0.11.2 +VERSION = 0.11.3 CATEGORIES = python DESCRIPTION = Nose extends unittest to make testing easier @@ -11,17 +13,15 @@ other common use cases. endef -MASTER_SITES = http://somethingaboutorange.com/mrl/projects/$(NAME)/ +SPKG_SOURCEURL = http://code.google.com/p/python-nose/ +GOOGLE_PROJECT = python-nose +MASTER_SITES = $(GOOGLE_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz PACKAGES = CSWpy-nose CATALOGNAME = py_nose SPKG_DESC = $(DESCRIPTION) -EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc - -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - TEST_SCRIPTS = # tests fail because some multiprocessing module doesn't like Solaris sem_open # TEST_SCRIPTS = $(WORKSRC)/selftest.py @@ -31,4 +31,9 @@ include gar/category.mk -INSTALL_ARGS += --install-data=$(prefix)/share +post-install-modulated: + ginstall -d -m 755 $(DESTDIR)$(datadir)/man/man1 + gmv -v $(DESTDIR)$(prefix)/man/man1/nosetests.1 $(DESTDIR)$(datadir)/man/man1 + grmdir -v $(DESTDIR)$(prefix)/man/man1 + grmdir -v $(DESTDIR)$(prefix)/man + @$(MAKECOOKIE) Modified: csw/mgar/pkg/lang-python/nose/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/nose/trunk/checksums 2011-03-12 20:20:52 UTC (rev 13755) +++ csw/mgar/pkg/lang-python/nose/trunk/checksums 2011-03-12 21:06:55 UTC (rev 13756) @@ -1 +1 @@ -cae8bb7a080871886602489677474036 nose-0.11.2.tar.gz +fbf6bc7b7c2bbb535d8ea9a931a1e65b nose-0.11.3.tar.gz 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 Mar 12 22:35:05 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 12 Mar 2011 21:35:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[13757] csw/mgar/pkg/lang-python/mysql-python/trunk Message-ID: Revision: 13757 http://gar.svn.sourceforge.net/gar/?rev=13757&view=rev Author: wahwah Date: 2011-03-12 21:35:04 +0000 (Sat, 12 Mar 2011) Log Message: ----------- python-mysql: Version bump to 1.2.3 Modified Paths: -------------- csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile csw/mgar/pkg/lang-python/mysql-python/trunk/checksums Modified: csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile 2011-03-12 21:06:55 UTC (rev 13756) +++ csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile 2011-03-12 21:35:04 UTC (rev 13757) @@ -1,8 +1,9 @@ +# $Id$ + NAME = MySQL-python -VERSION = 1.2.2 -CATEGORIES = lang +VERSION = 1.2.3 +CATEGORIES = python -DESCRIPTION = MySQL support for Python define BLURB MySQL support for Python endef @@ -11,34 +12,23 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.gz -PACKAGES = CSWpymysql -RUNTIME_DEP_PKGS_CSWpymysql = CSWmysql5rt CSWpython-rt CSWosslrt CSWzlib -CATALOGNAME_CSWpymysql = pymysql -SPKG_DESC = MySQL Support for Python +PACKAGES = CSWpy-mysql +CATALOGNAME_CSWpy-mysql = py_mysql +RUNTIME_DEP_PKGS_CSWpy-mysql += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-mysql += CSWzlib +RUNTIME_DEP_PKGS_CSWpy-mysql += CSWlibmysqlclient-r15 -# We define upstream file regex so we can be notifed of -# new upstream software release -UFILES_REGEX = (\d+(?:\.\d+)*) +SPKG_DESC_CSWpy-mysql = MySQL Support for Python -EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc -PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' -SPKG_CLASSES = none cswpycompile -RUNTIME_DEP_PKGS += CSWcswclassutils +OBSOLETES_CSWpy-mysql = CSWpymysql +CATALOGNAME_CSWpymysql = pymysql -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = $(WORKSRC)/setup.py -TEST_SCRIPTS = -INSTALL_SCRIPTS = $(WORKSRC)/setup.py +mysql_prefix = $(prefix)/mysql5 +mysql_bindir = $(mysql_prefix)/bin/$(ISA_DEFAULT_$(GARCH)) -INSTALL_ARGS = --root=$(DESTDIR) -INSTALL_ARGS += --prefix=$(prefix) +CHECKPKG_OVERRIDES_CSWpymysql += surplus-dependency|CSWpython include gar/category.mk -mysql_prefix = $(prefix)/mysql5 -mysql_bindir = $(mysql_prefix)/bin - -EXTRA_LD_OPTIONS = -R/opt/csw/mysql5/lib/mysql/\$$ISALIST PATH := $(mysql_bindir):$(PATH) export PATH - Modified: csw/mgar/pkg/lang-python/mysql-python/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/mysql-python/trunk/checksums 2011-03-12 21:06:55 UTC (rev 13756) +++ csw/mgar/pkg/lang-python/mysql-python/trunk/checksums 2011-03-12 21:35:04 UTC (rev 13757) @@ -1 +1 @@ -532268f02870bea18c1d465e88afff30 download/MySQL-python-1.2.2.tar.gz +215eddb6d853f6f4be5b4afc4154292f MySQL-python-1.2.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 13 01:38:23 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 13 Mar 2011 00:38:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[13758] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 13758 http://gar.svn.sourceforge.net/gar/?rev=13758&view=rev Author: bdwalton Date: 2011-03-13 00:38:23 +0000 (Sun, 13 Mar 2011) Log Message: ----------- coreutils/trunk: depend on the new gettext dev package, not just gettext Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2011-03-12 21:35:04 UTC (rev 13757) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2011-03-13 00:38:23 UTC (rev 13758) @@ -12,7 +12,7 @@ SHELL = /opt/csw/bin/bash -BUILD_DEP_PKGS = CSWautomake CSWautoconf CSWbison CSWggettext CSWgit +BUILD_DEP_PKGS = CSWautomake CSWautoconf CSWbison CSWggettext-dev CSWgit BUILD_DEP_PKGS += CSWgperf CSWgzip CSWperl CSWrsync CSWgtar CSWbash RUNTIME_DEP_PKGS = CSWiconv CSWlibintl8 CSWlibgmp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 13 03:40:04 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 13 Mar 2011 02:40:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[13759] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13759 http://gar.svn.sourceforge.net/gar/?rev=13759&view=rev Author: bdwalton Date: 2011-03-13 02:40:04 +0000 (Sun, 13 Mar 2011) Log Message: ----------- ruby18/trunk: correct alternatives handling for rbconfig.rb Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-13 00:38:23 UTC (rev 13758) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-13 02:40:04 UTC (rev 13759) @@ -27,10 +27,10 @@ ALTERNATIVES_CSWruby18 = ruby rbconfig18 ALTERNATIVE_ruby = $(bindir)/ruby ruby $(bindir)/ruby18 10 $(bindir)/irb irb $(bindir)/irb18 $(bindir)/erb erb $(bindir)/erb18 $(bindir)/rdoc rdoc $(bindir)/rdoc18 $(bindir)/ri ri $(bindir)/ri18 $(bindir)/testrb testrb $(bindir)/testrb18 $(mandir)/man1/ruby.1 ruby.1 $(mandir)/man1/ruby18.1 -ALTERNATIVE_rbconfig18 += $(libdir)/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb rbconfig18 $(libdir)/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb.sun 5 +ALTERNATIVE_rbconfig18 = $(libdir)/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb rbconfig18 $(libdir)/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb.sun 5 -ALTERNATIVES_CSWruby18-gcc4 = rbconfig18 -ALTERNATIVE_rbconfig18 += $(libdir)/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb rbconfig18 $(libdir)/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb.gcc4 10 +ALTERNATIVES_CSWruby18-gcc4 = rbconfig18_gcc +ALTERNATIVE_rbconfig18_gcc = $(libdir)/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb rbconfig18 $(libdir)/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb.gcc4 10 ARCHALL_CSWruby18-doc = 1 ARCHALL_CSWruby18-mode = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 13 05:45:37 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 13 Mar 2011 04:45:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[13760] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 13760 http://gar.svn.sourceforge.net/gar/?rev=13760&view=rev Author: bdwalton Date: 2011-03-13 04:45:37 +0000 (Sun, 13 Mar 2011) Log Message: ----------- gar/v2: fix issue with obsoletes pkg description Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-03-13 02:40:04 UTC (rev 13759) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-03-13 04:45:37 UTC (rev 13760) @@ -63,7 +63,7 @@ CATALOGNAME_$(1) ?= $(call catalogname,$(1)) # The length of the description has been limited to 100 characters, # the string is cut (no longer on word boundaries). -SPKG_DESC_$(1) ?= $(shell echo Transitional package. Content moved to $(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETES_$P)),$P)) | perl -npe 's/(.{0,97}\s|\S{0,97})(.+)/$$1.../') +SPKG_DESC_$(1) ?= $(shell echo Transitional package. Content moved to $(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETES_$P)),$P)) | perl -npe 's/(.{100}).+/substr($$1,96) . " ..."/e') RUNTIME_DEP_PKGS_$(1) = $(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETES_$P)),$P)) PKGFILES_$(1) = NOFILES ARCHALL_$(1) = 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 Sun Mar 13 09:18:38 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Mar 2011 08:18:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[13761] csw/mgar/gar/v2/lib/python/README Message-ID: Revision: 13761 http://gar.svn.sourceforge.net/gar/?rev=13761&view=rev Author: wahwah Date: 2011-03-13 08:18:38 +0000 (Sun, 13 Mar 2011) Log Message: ----------- checkpkg: An idea for ugfiles check Modified Paths: -------------- csw/mgar/gar/v2/lib/python/README Modified: csw/mgar/gar/v2/lib/python/README =================================================================== --- csw/mgar/gar/v2/lib/python/README 2011-03-13 04:45:37 UTC (rev 13760) +++ csw/mgar/gar/v2/lib/python/README 2011-03-13 08:18:38 UTC (rev 13761) @@ -12,6 +12,8 @@ ('transitional', 'stub', 'legacy') - Dependency on CSWcas-initsmf + rc* files --> error - A package must not be incompatible with itself + - If a pkgmap entry has username or group outside the default list of users, + the file's class needs to be 'ugfiles' Checks implemented: - foo_bar != CSWfoo-bar -> error This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Mar 13 10:36:55 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 13 Mar 2011 09:36:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[13762] csw/mgar/pkg/dhcp/trunk Message-ID: Revision: 13762 http://gar.svn.sourceforge.net/gar/?rev=13762&view=rev Author: bonivart Date: 2011-03-13 09:36:54 +0000 (Sun, 13 Mar 2011) Log Message: ----------- dhcp/trunk: Update to 4.2.1 Modified Paths: -------------- csw/mgar/pkg/dhcp/trunk/Makefile csw/mgar/pkg/dhcp/trunk/checksums Modified: csw/mgar/pkg/dhcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/dhcp/trunk/Makefile 2011-03-13 08:18:38 UTC (rev 13761) +++ csw/mgar/pkg/dhcp/trunk/Makefile 2011-03-13 09:36:54 UTC (rev 13762) @@ -1,10 +1,10 @@ NAME = dhcp -VERSION = 4.2.0 -RELEASE = P2 -DISTVERSION = $(VERSION)-$(RELEASE) -SPKG_VERSION = $(VERSION)$(RELEASE) -DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) -WORKSRC = $(WORKDIR)/$(DISTNAME) +VERSION = 4.2.1 +#RELEASE = P2 +#DISTVERSION = $(VERSION)-$(RELEASE) +#SPKG_VERSION = $(VERSION)$(RELEASE) +#DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) +#WORKSRC = $(WORKDIR)/$(DISTNAME) CATEGORIES = net DESCRIPTION = ISC DHCP reference implementation @@ -29,10 +29,7 @@ RUNTIME_DEP_PKGS_CSWdhcp-dev = CSWdhcp SPKG_DESC_CSWdhcp-dev = ISC DHCP development package CATALOGNAME_CSWdhcp-dev = dhcp_dev -ARCHALL_CSWdhcp-dev = 1 -UFILES_REGEX = ($(NAME)-\d+(?:\.\d+)*).tar.gz - GARCOMPILER = GNU TEST_TARGET = check @@ -55,7 +52,8 @@ SPKG_SOURCEURL = https://www.isc.org/software/dhcp -CHECKPKG_OVERRIDES_CSWdhcp-dev += archall-devel-package +CHECKPKG_OVERRIDES_CSWdhcp-dev += file-collision +CHECKPKG_OVERRIDES_CSWdhcp += surplus-dependency|CSWosslrt include gar/category.mk Modified: csw/mgar/pkg/dhcp/trunk/checksums =================================================================== --- csw/mgar/pkg/dhcp/trunk/checksums 2011-03-13 08:18:38 UTC (rev 13761) +++ csw/mgar/pkg/dhcp/trunk/checksums 2011-03-13 09:36:54 UTC (rev 13762) @@ -1 +1 @@ -a98f4ce3ca651e7e28a5a1ae6398689e dhcp-4.2.0-P2.tar.gz +bddce8a23551f009fd0ac840afc89780 dhcp-4.2.1.tar.gz 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 Mar 13 10:49:22 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Mar 2011 09:49:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[13763] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 13763 http://gar.svn.sourceforge.net/gar/?rev=13763&view=rev Author: wahwah Date: 2011-03-13 09:49:22 +0000 (Sun, 13 Mar 2011) Log Message: ----------- cups: Fix runpath for the ppdc library Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2011-03-13 09:36:54 UTC (rev 13762) +++ csw/mgar/pkg/cups/trunk/Makefile 2011-03-13 09:49:22 UTC (rev 13763) @@ -72,7 +72,7 @@ BUILD_DEP_PKGS += SUNWlibm BUILD_DEP_PKGS += SUNWslpu -UFILES_REGEX = cups-(\d+(?:\.\d+)*)-source.tar.bz2 +EXTRA_CXXFLAGS += -norunpath # The main metapackage PACKAGES += CSWcups This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Mar 13 10:54:06 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 13 Mar 2011 09:54:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[13764] csw/mgar/pkg/bind/trunk Message-ID: Revision: 13764 http://gar.svn.sourceforge.net/gar/?rev=13764&view=rev Author: bonivart Date: 2011-03-13 09:54:05 +0000 (Sun, 13 Mar 2011) Log Message: ----------- bind/trunk: Update to 9.8.0 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 2011-03-13 09:49:22 UTC (rev 13763) +++ csw/mgar/pkg/bind/trunk/Makefile 2011-03-13 09:54:05 UTC (rev 13764) @@ -2,7 +2,7 @@ # owner/group for device files? (root:sys) NAME = bind -VERSION = 9.7.3 +VERSION = 9.8.0 CATEGORIES = net # Enable these for Px-releases @@ -32,27 +32,27 @@ LICENSE = COPYRIGHT -PACKAGES = CSWbind +PACKAGES += CSWbind CATALOGNAME_CSWbind = bind SPKG_DESC_CSWbind = ISC BIND DNS main package RUNTIME_DEP_PKGS_CSWbind = CSWlibbind CSWbindutils CSWiconv CSWlibxml2 CSWosslrt CSWzlib -PACKAGES = CSWbind-dev +PACKAGES += CSWbind-dev CATALOGNAME_CSWbind-dev = bind_dev SPKG_DESC_CSWbind-dev = ISC BIND DNS development package RUNTIME_DEP_PKGS_CSWbind-dev = CSWbind CSWlibbind -PACKAGES = CSWlibbind +PACKAGES += CSWlibbind CATALOGNAME_CSWlibbind = libbind SPKG_DESC_CSWlibbind = ISC BIND DNS library package RUNTIME_DEP_PKGS_CSWlibbind = CSWiconv CSWlibxml2 CSWosslrt CSWzlib -PACKAGES = CSWbindutils +PACKAGES += CSWbindutils CATALOGNAME_CSWbindutils = bind_utils SPKG_DESC_CSWbindutils = ISC BIND DNS utilities package RUNTIME_DEP_PKGS_CSWbindutils = CSWlibbind CSWiconv CSWlibxml2 CSWosslrt CSWzlib -PACKAGES = CSWbindchroot +PACKAGES += CSWbindchroot CATALOGNAME_CSWbindchroot = bind_chroot SPKG_DESC_CSWbindchroot = ISC BIND DNS chroot package RUNTIME_DEP_PKGS_CSWbindchroot = CSWbind @@ -90,11 +90,13 @@ SPKG_SOURCEURL = http://www.isc.org/software/bind +# Temporary override since package is being renamed +CHECKPKG_OVERRIDES_CSWbind-dev += file-collision + CHECKPKG_OVERRIDES_CSWbind += surplus-dependency|CSWbindutils -CHECKPKG_OVERRIDES_CSWlibbind += non-uniform-lib-versions-in-package|sonames=libbind9.so.60,libdns.so.69,libisc.so.62,libisccc.so.60,libisccfg.so.62,liblwres.so.60 +CHECKPKG_OVERRIDES_CSWlibbind += non-uniform-lib-versions-in-package|sonames=libbind9.so.80,libdns.so.81,libisc.so.81,libisccc.so.80,libisccfg.so.80,liblwres.so.80 +CHECKPKG_OVERRIDES_CSWbindutils += catalogname-does-not-match-pkgname|pkgname=CSWbindutils|catalogname=bind_utils|expected-catalogname=bindutils CHECKPKG_OVERRIDES_CSWbindchroot += catalogname-does-not-match-pkgname|pkgname=CSWbindchroot|catalogname=bind_chroot|expected-catalogname=bindchroot -CHECKPKG_OVERRIDES_CSWbindutils += catalogname-does-not-match-pkgname|pkgname=CSWbindutils|catalogname=bind_utils|expected-catalogname=bindutils -CHECKPKG_OVERRIDES_CSWbind-dev += catalogname-does-not-match-pkgname|pkgname=CSWbinddevel|catalogname=bind_dev|expected-catalogname=binddev include gar/category.mk Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2011-03-13 09:49:22 UTC (rev 13763) +++ csw/mgar/pkg/bind/trunk/checksums 2011-03-13 09:54:05 UTC (rev 13764) @@ -1 +1 @@ -207477c4cf95f2db5be0ded8a22669e0 bind-9.7.3.tar.gz +e802ac97ca419c2ddfc043509bcb17bc bind-9.8.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sun Mar 13 13:00:16 2011 From: maciej at opencsw.org (Maciej Blizinski) Date: Sun, 13 Mar 2011 13:00:16 +0100 Subject: [csw-devel] [POLICY] opencsw-policy: Copyright notice In-Reply-To: <4D6D0A3C.9010500@opencsw.org> References: <4D6D0A3C.9010500@opencsw.org> Message-ID: <1300017617-18242-1-git-send-email-maciej@opencsw.org> Here's an update for the policy patch, setting the license to GPL-3.0. Debian's license is 2.0+, so it is compatible with Debian's policy manual's license. From maciej at opencsw.org Sun Mar 13 13:00:17 2011 From: maciej at opencsw.org (Maciej Blizinski) Date: Sun, 13 Mar 2011 13:00:17 +0100 Subject: [csw-devel] =?utf-8?q?=5BPATCH=5D_opencsw-policy=3A_Copyright_not?= =?utf-8?q?ice?= In-Reply-To: <4D6D0A3C.9010500@opencsw.org> References: <4D6D0A3C.9010500@opencsw.org> Message-ID: <1300017617-18242-2-git-send-email-maciej@opencsw.org> This patch sets the copyright of policy package and policy documents to GPL-3.0. Signed-off-by: Maciej Blizinski --- pkg/opencsw-policy/trunk/Makefile | 4 ++-- pkg/opencsw-policy/trunk/checksums | 2 +- pkg/opencsw-policy/trunk/files/index.txt | 21 ++++++++++++++++++++- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/pkg/opencsw-policy/trunk/Makefile b/pkg/opencsw-policy/trunk/Makefile index e2f2c18..1d8cf0e 100644 --- a/pkg/opencsw-policy/trunk/Makefile +++ b/pkg/opencsw-policy/trunk/Makefile @@ -10,14 +10,14 @@ define BLURB endef SPKG_SOURCEURL = http://www.opencsw.org MASTER_SITES = http://www.gnu.org/licenses/ -DISTFILES = fdl-1.3.txt +DISTFILES = gpl-3.0.txt CONFIGURE_SCRIPTS = BUILD_SCRIPTS = policy INSTALL_SCRIPTS = policy TEST_SCRIPTS = ARCHALL_CSWopencsw-policy = 1 CATALOGNAME_CSWopencsw-policy = opencsw_policy -LICENSE = fdl-1.3.txt +LICENSE = gpl-3.0.txt BUILD_DEP_PKGS = CSWasciidoc diff --git a/pkg/opencsw-policy/trunk/checksums b/pkg/opencsw-policy/trunk/checksums index e6fa4f0..6986890 100644 --- a/pkg/opencsw-policy/trunk/checksums +++ b/pkg/opencsw-policy/trunk/checksums @@ -1 +1 @@ -10b9de612d532fdeeb7fe8fcd1435cc6 fdl-1.3.txt +b234ee4d69f5fce4486a80fdaf4a4263 gpl-2.0.txt diff --git a/pkg/opencsw-policy/trunk/files/index.txt b/pkg/opencsw-policy/trunk/files/index.txt index 7e9ee64..e4caf9d 100644 --- a/pkg/opencsw-policy/trunk/files/index.txt +++ b/pkg/opencsw-policy/trunk/files/index.txt @@ -3,5 +3,24 @@ OpenCSW packaging policy $Id: Makefile 11888 2010-12-12 12:43:48Z skayser $ :toc: :website: http://www.opencsw.org - :leveloffset: 1 + +Copyright Notice +================ + +Copyright ? 2011 OpenCSW + +Parts of this manual are copied from the Debian GNU/Linux policy manual. +This manual is released with compliance with Debian manual's licensing +terms. + +This manual 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, version 3 of the License. + +This manual 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 . -- 1.7.3.2 From maciej at opencsw.org Sun Mar 13 13:06:15 2011 From: maciej at opencsw.org (Maciej Blizinski) Date: Sun, 13 Mar 2011 13:06:15 +0100 Subject: [csw-devel] =?utf-8?q?=5BPATCH=5D_opencsw-policy=3A_Copyright_not?= =?utf-8?q?ice?= In-Reply-To: <4D6D0A3C.9010500@opencsw.org> References: <4D6D0A3C.9010500@opencsw.org> Message-ID: <1300017975-19993-2-git-send-email-maciej@opencsw.org> This patch sets the copyright of policy package and policy documents to GPL-3.0. Signed-off-by: Maciej Blizinski --- pkg/opencsw-policy/trunk/Makefile | 4 ++-- pkg/opencsw-policy/trunk/checksums | 2 +- pkg/opencsw-policy/trunk/files/index.txt | 21 ++++++++++++++++++++- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/pkg/opencsw-policy/trunk/Makefile b/pkg/opencsw-policy/trunk/Makefile index e2f2c18..1d8cf0e 100644 --- a/pkg/opencsw-policy/trunk/Makefile +++ b/pkg/opencsw-policy/trunk/Makefile @@ -10,14 +10,14 @@ define BLURB endef SPKG_SOURCEURL = http://www.opencsw.org MASTER_SITES = http://www.gnu.org/licenses/ -DISTFILES = fdl-1.3.txt +DISTFILES = gpl-3.0.txt CONFIGURE_SCRIPTS = BUILD_SCRIPTS = policy INSTALL_SCRIPTS = policy TEST_SCRIPTS = ARCHALL_CSWopencsw-policy = 1 CATALOGNAME_CSWopencsw-policy = opencsw_policy -LICENSE = fdl-1.3.txt +LICENSE = gpl-3.0.txt BUILD_DEP_PKGS = CSWasciidoc diff --git a/pkg/opencsw-policy/trunk/checksums b/pkg/opencsw-policy/trunk/checksums index e6fa4f0..6986890 100644 --- a/pkg/opencsw-policy/trunk/checksums +++ b/pkg/opencsw-policy/trunk/checksums @@ -1 +1 @@ -10b9de612d532fdeeb7fe8fcd1435cc6 fdl-1.3.txt +b234ee4d69f5fce4486a80fdaf4a4263 gpl-2.0.txt diff --git a/pkg/opencsw-policy/trunk/files/index.txt b/pkg/opencsw-policy/trunk/files/index.txt index 7e9ee64..e4caf9d 100644 --- a/pkg/opencsw-policy/trunk/files/index.txt +++ b/pkg/opencsw-policy/trunk/files/index.txt @@ -3,5 +3,24 @@ OpenCSW packaging policy $Id: Makefile 11888 2010-12-12 12:43:48Z skayser $ :toc: :website: http://www.opencsw.org - :leveloffset: 1 + +Copyright Notice +================ + +Copyright ? 2011 OpenCSW + +Parts of this manual are copied from the Debian GNU/Linux policy manual. +This manual is released with compliance with Debian manual's licensing +terms. + +This manual 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, version 3 of the License. + +This manual 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 . -- 1.7.3.2 From maciej at opencsw.org Sun Mar 13 13:06:14 2011 From: maciej at opencsw.org (Maciej Blizinski) Date: Sun, 13 Mar 2011 13:06:14 +0100 Subject: [csw-devel] [PATCH] opencsw-policy: Copyright notice In-Reply-To: <4D6D0A3C.9010500@opencsw.org> References: <4D6D0A3C.9010500@opencsw.org> Message-ID: <1300017975-19993-1-git-send-email-maciej@opencsw.org> Here's an update for the policy patch, setting the license to GPL-3.0. Debian's license is 2.0+, so it is compatible with Debian's policy manual's license. From bwalton at opencsw.org Sun Mar 13 13:46:15 2011 From: bwalton at opencsw.org (Ben Walton) Date: Sun, 13 Mar 2011 08:46:15 -0400 Subject: [csw-devel] SF.net SVN: gar:[13761] csw/mgar/gar/v2/lib/python/README In-Reply-To: References: Message-ID: <1300020360-sup-1474@pinkfloyd.chass.utoronto.ca> Excerpts from wahwah's message of Sun Mar 13 04:18:38 -0400 2011: > checkpkg: An idea for ugfiles check Looks like a reasonable check to me. -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bdwalton at users.sourceforge.net Sun Mar 13 13:49:22 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 13 Mar 2011 12:49:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[13765] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: Revision: 13765 http://gar.svn.sourceforge.net/gar/?rev=13765&view=rev Author: bdwalton Date: 2011-03-13 12:49:22 +0000 (Sun, 13 Mar 2011) Log Message: ----------- gettext/trunk: set -norunpath for our build (re: r13727) Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2011-03-13 09:54:05 UTC (rev 13764) +++ csw/mgar/pkg/gettext/trunk/Makefile 2011-03-13 12:49:22 UTC (rev 13765) @@ -207,6 +207,7 @@ BUILD64 = 1 NOISAEXEC = 1 STRIP_LIBTOOL = 1 +EXTRA_LINKER_FLAGS = -norunpath #NOTE: gettext tests are sensitive to bash environment variables, make sure # custom paths are prefixed by $PATH, may be better to set aside This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sun Mar 13 14:04:10 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Sun, 13 Mar 2011 13:04:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[13765] csw/mgar/pkg/gettext/trunk/Makefile In-Reply-To: References: Message-ID: 2011/3/13 : > +EXTRA_LINKER_FLAGS = -norunpath I'm wondering whether EXTRA_LINKER_FLAGS are passed to both C and C++ programs. There's incompatibility between Sun C and C++ compilers wrt -norunpath vs -xnorunpath. I don't remember exactly in which direction it is, though. I think it's C that accepts -xnorunpath only, and C++ accepts -norunpath only. Maciej From bdwalton at users.sourceforge.net Sun Mar 13 14:09:37 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 13 Mar 2011 13:09:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[13766] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: Revision: 13766 http://gar.svn.sourceforge.net/gar/?rev=13766&view=rev Author: bdwalton Date: 2011-03-13 13:09:37 +0000 (Sun, 13 Mar 2011) Log Message: ----------- gettext/trunk: use xnorunpath, not norunpath Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2011-03-13 12:49:22 UTC (rev 13765) +++ csw/mgar/pkg/gettext/trunk/Makefile 2011-03-13 13:09:37 UTC (rev 13766) @@ -207,7 +207,7 @@ BUILD64 = 1 NOISAEXEC = 1 STRIP_LIBTOOL = 1 -EXTRA_LINKER_FLAGS = -norunpath +EXTRA_LINKER_FLAGS = -xnorunpath #NOTE: gettext tests are sensitive to bash environment variables, make sure # custom paths are prefixed by $PATH, may be better to set aside This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 13 15:04:02 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 13 Mar 2011 14:04:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[13767] csw/mgar/pkg/sed/trunk Message-ID: Revision: 13767 http://gar.svn.sourceforge.net/gar/?rev=13767&view=rev Author: bdwalton Date: 2011-03-13 14:04:02 +0000 (Sun, 13 Mar 2011) Log Message: ----------- sed/trunk: patch the gnulib code to handle some extra errno codes; mantis id 4705 Modified Paths: -------------- csw/mgar/pkg/sed/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/sed/trunk/files/ csw/mgar/pkg/sed/trunk/files/0001-Enhance-Solaris-ACL-error-handling.patch Modified: csw/mgar/pkg/sed/trunk/Makefile =================================================================== --- csw/mgar/pkg/sed/trunk/Makefile 2011-03-13 13:09:37 UTC (rev 13766) +++ csw/mgar/pkg/sed/trunk/Makefile 2011-03-13 14:04:02 UTC (rev 13767) @@ -14,7 +14,8 @@ SPKG_DESC_CSWgsed = $(DESCRIPTION) MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(NAME)-$(VERSION).tar.gz +PATCHFILES += 0001-Enhance-Solaris-ACL-error-handling.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz Added: csw/mgar/pkg/sed/trunk/files/0001-Enhance-Solaris-ACL-error-handling.patch =================================================================== --- csw/mgar/pkg/sed/trunk/files/0001-Enhance-Solaris-ACL-error-handling.patch (rev 0) +++ csw/mgar/pkg/sed/trunk/files/0001-Enhance-Solaris-ACL-error-handling.patch 2011-03-13 14:04:02 UTC (rev 13767) @@ -0,0 +1,58 @@ +From 0f12f3e3f629d05ae8ca63d8e3820875e73be453 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sun, 13 Mar 2011 14:57:11 +0100 +Subject: [PATCH] Enhance Solaris ACL error handling + +Gracefully handle EOPNOTSUPP in qcopy_acl and qset_acl. These +functions, as used in coreutils, were causing the test suite to fail +on Solaris 8 i386 with ZFS-backed NFSv3 mounts. The failures included +errors such as: + +gsed -i -e '/^##/d' Makefile +gsed: preserving permissions for `./sedYtai3X': Operation not +supported on transport endpoint + +Signed-off-by: Ben Walton +--- + lib/copy-acl.c | 4 ++-- + lib/set-mode-acl.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/copy-acl.c b/lib/copy-acl.c +index af85a08..55999ec 100644 +--- a/lib/copy-acl.c ++++ b/lib/copy-acl.c +@@ -253,7 +253,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, + + if (ace_count < 0) + { +- if (errno == ENOSYS || errno == EINVAL) ++ if (errno == ENOSYS || errno == EINVAL || errno == EOPNOTSUPP) + { + ace_count = 0; + ace_entries = NULL; +@@ -358,7 +358,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, + if (ret < 0 && saved_errno == 0) + { + saved_errno = errno; +- if (errno == ENOSYS && !acl_nontrivial (count, entries)) ++ if ((errno == ENOSYS || errno == EOPNOTSUPP) && !acl_nontrivial (count, entries)) + saved_errno = 0; + } + else +diff --git a/lib/set-mode-acl.c b/lib/set-mode-acl.c +index a24b9f3..28c6d4e 100644 +--- a/lib/set-mode-acl.c ++++ b/lib/set-mode-acl.c +@@ -387,7 +387,7 @@ qset_acl (char const *name, int desc, mode_t mode) + ret = acl (name, SETACL, sizeof (entries) / sizeof (aclent_t), entries); + if (ret < 0) + { +- if (errno == ENOSYS) ++ if (errno == ENOSYS || errno == EOPNOTSUPP) + return chmod_or_fchmod (name, desc, mode); + return -1; + } +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 13 15:04:52 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 13 Mar 2011 14:04:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[13768] csw/mgar/pkg/sed/trunk/Makefile Message-ID: Revision: 13768 http://gar.svn.sourceforge.net/gar/?rev=13768&view=rev Author: bdwalton Date: 2011-03-13 14:04:52 +0000 (Sun, 13 Mar 2011) Log Message: ----------- sed/trunk: note bugfix/feature patch Modified Paths: -------------- csw/mgar/pkg/sed/trunk/Makefile Modified: csw/mgar/pkg/sed/trunk/Makefile =================================================================== --- csw/mgar/pkg/sed/trunk/Makefile 2011-03-13 14:04:02 UTC (rev 13767) +++ csw/mgar/pkg/sed/trunk/Makefile 2011-03-13 14:04:52 UTC (rev 13768) @@ -17,6 +17,9 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz PATCHFILES += 0001-Enhance-Solaris-ACL-error-handling.patch +# the patch above is not stock, but fixes mantis id 4705 +VERSION_FLAG_PATCH = 1 + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 13 16:12:05 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 13 Mar 2011 15:12:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[13769] csw/mgar/pkg/sed/trunk/Makefile Message-ID: Revision: 13769 http://gar.svn.sourceforge.net/gar/?rev=13769&view=rev Author: bdwalton Date: 2011-03-13 15:12:04 +0000 (Sun, 13 Mar 2011) Log Message: ----------- sed/trunk: update dependencies: libintl8 instead of ggettextrt Modified Paths: -------------- csw/mgar/pkg/sed/trunk/Makefile Modified: csw/mgar/pkg/sed/trunk/Makefile =================================================================== --- csw/mgar/pkg/sed/trunk/Makefile 2011-03-13 14:04:52 UTC (rev 13768) +++ csw/mgar/pkg/sed/trunk/Makefile 2011-03-13 15:12:04 UTC (rev 13769) @@ -28,7 +28,7 @@ GARCOMPILER = GNU RUNTIME_DEP_PKGS = CSWiconv -RUNTIME_DEP_PKGS += CSWggettextrt +RUNTIME_DEP_PKGS += CSWlibintl8 # No special platform optimization NOISALIST = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 13 16:39:10 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 13 Mar 2011 15:39:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[13770] csw/mgar/pkg/sed/trunk/Makefile Message-ID: Revision: 13770 http://gar.svn.sourceforge.net/gar/?rev=13770&view=rev Author: bdwalton Date: 2011-03-13 15:39:10 +0000 (Sun, 13 Mar 2011) Log Message: ----------- sed/trunk: we do not use libiconv directly, but rather via libintl8, drop dependency Modified Paths: -------------- csw/mgar/pkg/sed/trunk/Makefile Modified: csw/mgar/pkg/sed/trunk/Makefile =================================================================== --- csw/mgar/pkg/sed/trunk/Makefile 2011-03-13 15:12:04 UTC (rev 13769) +++ csw/mgar/pkg/sed/trunk/Makefile 2011-03-13 15:39:10 UTC (rev 13770) @@ -27,7 +27,6 @@ # See http://markmail.org/message/7ki46iiok3ddu3sa GARCOMPILER = GNU -RUNTIME_DEP_PKGS = CSWiconv RUNTIME_DEP_PKGS += CSWlibintl8 # No special platform optimization This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 13 16:40:07 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 13 Mar 2011 15:40:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[13771] csw/mgar/pkg/sed/trunk/Makefile Message-ID: Revision: 13771 http://gar.svn.sourceforge.net/gar/?rev=13771&view=rev Author: bdwalton Date: 2011-03-13 15:40:06 +0000 (Sun, 13 Mar 2011) Log Message: ----------- sed/trunk: drop checkpkg override on iconv dep Modified Paths: -------------- csw/mgar/pkg/sed/trunk/Makefile Modified: csw/mgar/pkg/sed/trunk/Makefile =================================================================== --- csw/mgar/pkg/sed/trunk/Makefile 2011-03-13 15:39:10 UTC (rev 13770) +++ csw/mgar/pkg/sed/trunk/Makefile 2011-03-13 15:40:06 UTC (rev 13771) @@ -43,10 +43,6 @@ EXTRA_MERGE_EXCLUDE_FILES = $(sharedstatedir)/.*locale.alias EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/charset.alias -# this shouldn't be required, but until I know why checkpkg isn't happy, -# i'll put it here so I can get this going... -CHECKPKG_OVERRIDES_CSWgsed += surplus-dependency|CSWiconv - include gar/category.mk # Make sure we are using gnu tools (esp. sed) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 13 16:49:27 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 13 Mar 2011 15:49:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[13772] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: Revision: 13772 http://gar.svn.sourceforge.net/gar/?rev=13772&view=rev Author: bdwalton Date: 2011-03-13 15:49:26 +0000 (Sun, 13 Mar 2011) Log Message: ----------- gettext/trunk: update flag variable use to ensure ,p is added to the version string in the package filename Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2011-03-13 15:40:06 UTC (rev 13771) +++ csw/mgar/pkg/gettext/trunk/Makefile 2011-03-13 15:49:26 UTC (rev 13772) @@ -192,7 +192,7 @@ #This patch is not a simple 'make it compile' so we flag the feature #patch below PATCHFILES += 0003-Patch-around-thread-handling-differences-between-9-a.patch -FLAG_PATCH = 1 +VERSION_FLAG_PATCH = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --program-prefix=g This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 13 16:56:45 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 13 Mar 2011 15:56:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[13773] csw/mgar/pkg/gettext/trunk Message-ID: Revision: 13773 http://gar.svn.sourceforge.net/gar/?rev=13773&view=rev Author: bdwalton Date: 2011-03-13 15:56:45 +0000 (Sun, 13 Mar 2011) Log Message: ----------- gettext/trunk: override usr/share and usr/local refs in the doc package Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gettext/trunk/files/CSWggettextdoc.cswreleasenotes Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2011-03-13 15:49:26 UTC (rev 13772) +++ csw/mgar/pkg/gettext/trunk/Makefile 2011-03-13 15:56:45 UTC (rev 13773) @@ -176,6 +176,8 @@ CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWlibgettextlib0-14-1 CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWlibgettextlib0-17 +CHECKPKG_OVERRIDES_CSWggettextdoc += file-with-bad-content + ARCHALL_CSWggettextrt = 1 ARCHALL_CSWggettext-data = 1 ARCHALL_CSWggettextdoc = 1 @@ -185,6 +187,7 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += CSWggettextdoc.cswreleasenotes PATCHFILES += 0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch PATCHFILES += 0002-Update-ltmain.sh-to-prevent-libtool-stripping-runpat.patch Added: csw/mgar/pkg/gettext/trunk/files/CSWggettextdoc.cswreleasenotes =================================================================== --- csw/mgar/pkg/gettext/trunk/files/CSWggettextdoc.cswreleasenotes (rev 0) +++ csw/mgar/pkg/gettext/trunk/files/CSWggettextdoc.cswreleasenotes 2011-03-13 15:56:45 UTC (rev 13773) @@ -0,0 +1 @@ +usr/local, usr/share references: samples, overridden 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 Mar 13 21:09:47 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Mar 2011 20:09:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[13774] csw/mgar/pkg/lang-python Message-ID: Revision: 13774 http://gar.svn.sourceforge.net/gar/?rev=13774&view=rev Author: wahwah Date: 2011-03-13 20:09:46 +0000 (Sun, 13 Mar 2011) Log Message: ----------- dbutils: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/dbutils/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/dbutils/ csw/mgar/pkg/lang-python/dbutils/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/lang-python/dbutils/trunk/Makefile Deleted: csw/mgar/pkg/lang-python/dbutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2011-02-15 08:22:56 UTC (rev 13317) +++ csw/mgar/pkg/lang-python/dbutils/trunk/Makefile 2011-03-13 20:09:46 UTC (rev 13774) @@ -1,186 +0,0 @@ -# Copyright 2009 OpenCSW -# 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 -## -NAME = mypkg -VERSION = 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. -define BLURB - -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), -## $(PYPI_MIRROR) -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(NAME). 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 = $(NAME)-$(VERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\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)/$(NAME)-$(VERSION) -## -## 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 Copied: csw/mgar/pkg/lang-python/dbutils/trunk/Makefile (from rev 13576, csw/mgar/pkg/template/trunk/Makefile) =================================================================== --- csw/mgar/pkg/lang-python/dbutils/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/dbutils/trunk/Makefile 2011-03-13 20:09:46 UTC (rev 13774) @@ -0,0 +1,16 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +NAME = DBUtils +VERSION = 1.0 +CATEGORIES = python +DESCRIPTION = Database connection pooling for Python +define BLURB +endef +SPKG_SOURCEURL = http://pypi.python.org/pypi/DBUtils/ +DISTFILES = $(DISTNAME).tar.gz +PACKAGES = CSWpy-dbutils +CATALOGNAME_CSWpy-dbutils = py_dbutils +ARCHALL_CSWpy-dbutils = 1 +include gar/category.mk Modified: csw/mgar/pkg/lang-python/dbutils/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2011-02-15 08:22:56 UTC (rev 13317) +++ csw/mgar/pkg/lang-python/dbutils/trunk/checksums 2011-03-13 20:09:46 UTC (rev 13774) @@ -0,0 +1 @@ +33cad7d8dcfff07dea8600de9ed4119f DBUtils-1.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Sun Mar 13 21:29:47 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Sun, 13 Mar 2011 20:29:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[13775] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 13775 http://gar.svn.sourceforge.net/gar/?rev=13775&view=rev Author: phipsy Date: 2011-03-13 20:29:47 +0000 (Sun, 13 Mar 2011) Log Message: ----------- Cut of puppet 2.6.6 before release Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/puppet/trunk/files/README.CSW csw/mgar/pkg/puppet/trunk/files/puppet.conf.example-CSW Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2011-03-13 20:09:46 UTC (rev 13774) +++ csw/mgar/pkg/puppet/trunk/Makefile 2011-03-13 20:29:47 UTC (rev 13775) @@ -29,6 +29,8 @@ # pkgutil.rb is from https://github.com/gw42/puppet/blob/tickets%2Fmaster%2F4258-dev/lib/puppet/provider/package/pkgutil.rb # Dom Cleal of RedHat has advised this is a good working version DISTFILES += pkgutil.rb +DISTFILES += README.CSW +DISTFILES += puppet.conf.example-CSW SPKG_SOURCEURL = http://puppetlabs.com/ INITSMF += $(sysconfdir)/init\.d/cswpuppetd @@ -65,9 +67,6 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = puppet -# Not required. As soon as I've confirmed the downloaded version works well, I'll cut this fromt he Makefile. -# PATCHFILES = 0001-pkgutil-support.patch -# PATCHFILES += 0002-Using-the-single-option-of-pkgutil.patch PATCHFILES = 0003-Use-opt-csw-share-puppet-modules-as-default.patch # https://projects.puppetlabs.com/issues/6324 PATCHFILES += 0004-patch-to-smf-provider-6324.patch @@ -76,18 +75,26 @@ CHECKPKG_OVERRIDES_CSWpuppet += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWpuppetmaster += surplus-dependency|CSWpuppet -# CRONDIR = $(sysconfdir)/pkg/CSWpuppet/crontabs -# CRONTABS = $(CRONDIR)/root CHECKPKG_OVERRIDES_CSWpuppet += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/cswpuppetd|class=none CHECKPKG_OVERRIDES_CSWpuppetmaster += surplus-dependency|CSWruby # Puppet has hardcoded paths to look at for many OSes, many of which involve # /usr/share and /usr/local. CHECKPKG_OVERRIDES_CSWpuppet += file-with-bad-content +# These two files are quite deliberate - without them users will not get +# CSW behaviour. The README explains +CHECKPKG_OVERRIDES_CSWpuppet += bad-location-of-file|file=/etc/puppet +CHECKPKG_OVERRIDES_CSWpuppet += bad-location-of-file|file=/etc/puppet/README.CSW +CHECKPKG_OVERRIDES_CSWpuppet += bad-location-of-file|file=/etc/puppet/puppet.conf.example-CSW + + include gar/category.mk install-puppet: ginstall -m 755 -d $(DESTDIR) + ginstall -m 755 -d $(DESTDIR)/etc/puppet + ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)/etc/puppet/README.CSW + ginstall -m 644 $(FILEDIR)/puppet.conf.example-CSW $(DESTDIR)/etc/puppet/puppet.conf.example-CSW ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/puppet ginstall -m 755 -d $(DESTDIR)$(localstatedir)/puppet/run ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/init.d @@ -108,6 +115,8 @@ chmod 644 $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \ fi; \ done) + mv $(DESTDIR)$(sysconfdir)/puppet/auth.conf $(DESTDIR)$(sysconfdir)/puppet/auth.conf.example + ginstall -m 644 $(FILEDIR)/puppet.conf.example-CSW $(DESTDIR)$(sysconfdir)/puppet/puppet.conf.example ginstall -d -m 755 $(DESTDIR)$(sysconfdir)/pkg/puppet ginstall -m 644 $(FILEDIR)/cswusergroup \ $(DESTDIR)$(sysconfdir)/pkg/puppet/cswusergroup Added: csw/mgar/pkg/puppet/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/puppet/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/puppet/trunk/files/README.CSW 2011-03-13 20:29:47 UTC (rev 13775) @@ -0,0 +1,14 @@ +README.CSW + +Puppet will insist on /etc/puppet and /var/lib/puppet being directories, it's +no good making them symlinks, Puppet will just change them to actual +directories - this does not fit with the OpenCSW paths, so in /etc/puppet you +will find an example skeleton puppet.conf that is designed to make the product +confirm to our paths. To use the daemon with CSW paths, put the puppet.conf +examples in /etc/puppet and /etc/opt/csw/puppet into place and start the +daemon. + +Naturally you're free to discard the examples and use the product's own +preferred paths. If no puppet.conf is present in /etc/puppet this is how the +program will behave. + Added: csw/mgar/pkg/puppet/trunk/files/puppet.conf.example-CSW =================================================================== --- csw/mgar/pkg/puppet/trunk/files/puppet.conf.example-CSW (rev 0) +++ csw/mgar/pkg/puppet/trunk/files/puppet.conf.example-CSW 2011-03-13 20:29:47 UTC (rev 13775) @@ -0,0 +1,9 @@ +# puppet.conf +# +# points puppet at OpenCSW default paths + +[main] + confdir = /etc/opt/csw/puppet + config = $confdir/puppet.conf + vardir = /var/opt/csw/puppet + ssldir = $vardir/ssl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Mar 13 21:39:12 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 13 Mar 2011 20:39:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[13776] csw/mgar/pkg Message-ID: Revision: 13776 http://gar.svn.sourceforge.net/gar/?rev=13776&view=rev Author: dmichelsen Date: 2011-03-13 20:39:12 +0000 (Sun, 13 Mar 2011) Log Message: ----------- xymon: Initial commit, stub, does not compile Added Paths: ----------- csw/mgar/pkg/xymon/ csw/mgar/pkg/xymon/Makefile csw/mgar/pkg/xymon/branches/ csw/mgar/pkg/xymon/tags/ csw/mgar/pkg/xymon/trunk/ csw/mgar/pkg/xymon/trunk/Makefile csw/mgar/pkg/xymon/trunk/checksums csw/mgar/pkg/xymon/trunk/files/ Copied: csw/mgar/pkg/xymon/Makefile (from rev 13760, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/xymon/Makefile (rev 0) +++ csw/mgar/pkg/xymon/Makefile 2011-03-13 20:39:12 UTC (rev 13776) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/xymon/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/xymon/trunk/Makefile =================================================================== --- csw/mgar/pkg/xymon/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xymon/trunk/Makefile 2011-03-13 20:39:12 UTC (rev 13776) @@ -0,0 +1,16 @@ +# $Id$ +NAME = xymon +VERSION = 4.3.0 +CATEGORIES = utils + +DESCRIPTION = Systems and network monitor +define BLURB +endef + +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(DISTNAME).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --server + +include gar/category.mk Property changes on: csw/mgar/pkg/xymon/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/xymon/trunk/checksums =================================================================== --- csw/mgar/pkg/xymon/trunk/checksums (rev 0) +++ csw/mgar/pkg/xymon/trunk/checksums 2011-03-13 20:39:12 UTC (rev 13776) @@ -0,0 +1 @@ +5972786d7102403674c12d97380d00e1 xymon-4.3.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Sun Mar 13 21:52:43 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Sun, 13 Mar 2011 20:52:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[13777] csw/mgar/pkg/ruby-augeas/trunk Message-ID: Revision: 13777 http://gar.svn.sourceforge.net/gar/?rev=13777&view=rev Author: phipsy Date: 2011-03-13 20:52:43 +0000 (Sun, 13 Mar 2011) Log Message: ----------- Added ruby-augeas; not quite working Modified Paths: -------------- csw/mgar/pkg/ruby-augeas/trunk/Makefile csw/mgar/pkg/ruby-augeas/trunk/checksums Modified: csw/mgar/pkg/ruby-augeas/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby-augeas/trunk/Makefile 2011-03-13 20:39:12 UTC (rev 13776) +++ csw/mgar/pkg/ruby-augeas/trunk/Makefile 2011-03-13 20:52:43 UTC (rev 13777) @@ -1,26 +1,41 @@ -NAME = ruby-augeas -VERSION = 0.3.0 -CATEGORIES = ruby +NAME = ruby-augeas +VERSION = 0.3.0 +CATEGORIES = lang DESCRIPTION = Augeas Ruby Bindings define BLURB endef MASTER_SITES = http://augeas.net/download/ruby/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(NAME)-$(VERSION).tgz +VENDOR_URL = http://augeas.net -VENDOR_URL = http://augeas.net - -PACKAGES = CSWrubyaugeas +PACKAGES = CSWrubyaugeas CATALOGNAME = ruby_augeas -DEP_PKGS = CSWaugeas -DEP_PKGS += CSWruby -BUILD_DEP_PKGS = CSWrake -TEST_SCRIPTS = -# TEST_TARGET = check +PATCHFILES = 0001-Does-this-fix-the-building-issues.patch +RUNTIME_DEP_PKGS_CSWrubyaugeas += CSWaugeas +RUNTIME_DEP_PKGS_CSWrubyaugeas += CSWruby +CHECKPKG_OVERRIDES_CSWrubyaugeas += catalogname-does-not-match-pkgname|pkgname=CSWrubyaugeas|catalogname=ruby_augeas|expected-catalogname=rubyaugeas +CHECKPKG_OVERRIDES_CSWrubyaugeas += missing-dependency|CSWlibruby1 + +BUILD_DEP_PKGS = CSWrake +BUILD_SCRIPTS = +CONFIGURE_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = ruby-augeas + +sitelibdir = $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") +sitearchdir = $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']") + include gar/category.mk install-ruby-augeas: - + ginstall -m 755 -d $(DESTDIR) + ginstall -m 755 -d $(DESTDIR)$(sitearchdir) + ginstall -m 755 -d $(DESTDIR)$(sitelibdir) + cd $(WORKSRC) && $(INSTALL_ENV) rake build + ginstall -m 755 $(WORKSRC)/lib/augeas.rb $(DESTDIR)$(sitelibdir) + ginstall -m 755 $(WORKSRC)/ext/augeas/_augeas.so $(DESTDIR)$(sitearchdir) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/ruby-augeas/trunk/checksums =================================================================== --- csw/mgar/pkg/ruby-augeas/trunk/checksums 2011-03-13 20:39:12 UTC (rev 13776) +++ csw/mgar/pkg/ruby-augeas/trunk/checksums 2011-03-13 20:52:43 UTC (rev 13777) @@ -1 +1 @@ - +bdeeb2b99f962a453259748073495d3f ruby-augeas-0.3.0.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 Sun Mar 13 22:50:57 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 13 Mar 2011 21:50:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[13778] csw/mgar/pkg Message-ID: Revision: 13778 http://gar.svn.sourceforge.net/gar/?rev=13778&view=rev Author: dmichelsen Date: 2011-03-13 21:50:57 +0000 (Sun, 13 Mar 2011) Log Message: ----------- libao2: Initial creation Modified Paths: -------------- csw/mgar/pkg/libao2/trunk/Makefile csw/mgar/pkg/libao2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libao2/ Modified: csw/mgar/pkg/libao2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libao/trunk/Makefile 2011-03-13 04:45:37 UTC (rev 13760) +++ csw/mgar/pkg/libao2/trunk/Makefile 2011-03-13 21:50:57 UTC (rev 13778) @@ -1,5 +1,5 @@ NAME = libao -VERSION = 1.0.0 +VERSION = 0.8.8 CATEGORIES = lib DESCRIPTION = Cross-platform audio library @@ -12,15 +12,14 @@ MASTER_SITES = http://downloads.xiph.org/releases/ao/ DISTFILES = $(NAME)-$(VERSION).tar.gz -SPKG_SOURCEURL = http://www.xiph.org/ao/ +VENDOR_URL = http://www.xiph.org/ao/ -DEP_PKGS = CSWesound +PACKAGES += CSWlibao2 +CATALOGNAME_CSWlibao2 = libao2 +SPKG_DESC_CSWlibao2 = Cross-platform audio library, libao.so.2 +PKGFILES_CSWlibao2 = $(call pkgfiles_lib,libao.so.2) -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - BUILD64 = 1 - CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/libao2/trunk/checksums =================================================================== --- csw/mgar/pkg/libao/trunk/checksums 2011-03-13 04:45:37 UTC (rev 13760) +++ csw/mgar/pkg/libao2/trunk/checksums 2011-03-13 21:50:57 UTC (rev 13778) @@ -1 +1 @@ -08283fbe1f587619053a156254afecec libao-1.0.0.tar.gz +b92cba3cbcf1ee9bc221118a85d23dcd libao-0.8.8.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Mar 13 23:20:04 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 13 Mar 2011 22:20:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[13779] csw/mgar/pkg/libao2/trunk/Makefile Message-ID: Revision: 13779 http://gar.svn.sourceforge.net/gar/?rev=13779&view=rev Author: dmichelsen Date: 2011-03-13 22:20:04 +0000 (Sun, 13 Mar 2011) Log Message: ----------- libao2: Add plugins Modified Paths: -------------- csw/mgar/pkg/libao2/trunk/Makefile Modified: csw/mgar/pkg/libao2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libao2/trunk/Makefile 2011-03-13 21:50:57 UTC (rev 13778) +++ csw/mgar/pkg/libao2/trunk/Makefile 2011-03-13 22:20:04 UTC (rev 13779) @@ -17,7 +17,10 @@ PACKAGES += CSWlibao2 CATALOGNAME_CSWlibao2 = libao2 SPKG_DESC_CSWlibao2 = Cross-platform audio library, libao.so.2 -PKGFILES_CSWlibao2 = $(call pkgfiles_lib,libao.so.2) +PKGFILES_CSWlibao2 += $(call pkgfiles_lib,libao.so.2) +# These are private libraries +PKGFILES_CSWlibao2 += $(call baseisadirs,$(libdir),ao/.*) +RUNTIME_DEP_PKGS_CSWlibao2 += CSWesound BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Mar 13 23:20:20 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 13 Mar 2011 22:20:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[13780] csw/mgar/pkg/libao/trunk Message-ID: Revision: 13780 http://gar.svn.sourceforge.net/gar/?rev=13780&view=rev Author: dmichelsen Date: 2011-03-13 22:20:20 +0000 (Sun, 13 Mar 2011) Log Message: ----------- libao: Update to 1.1.0 and split packages Modified Paths: -------------- csw/mgar/pkg/libao/trunk/Makefile csw/mgar/pkg/libao/trunk/checksums Modified: csw/mgar/pkg/libao/trunk/Makefile =================================================================== --- csw/mgar/pkg/libao/trunk/Makefile 2011-03-13 22:20:04 UTC (rev 13779) +++ csw/mgar/pkg/libao/trunk/Makefile 2011-03-13 22:20:20 UTC (rev 13780) @@ -1,5 +1,5 @@ NAME = libao -VERSION = 1.0.0 +VERSION = 1.1.0 CATEGORIES = lib DESCRIPTION = Cross-platform audio library @@ -12,15 +12,27 @@ MASTER_SITES = http://downloads.xiph.org/releases/ao/ DISTFILES = $(NAME)-$(VERSION).tar.gz -SPKG_SOURCEURL = http://www.xiph.org/ao/ +VENDOR_URL = http://www.xiph.org/ao/ -DEP_PKGS = CSWesound +FOREIGN_PACKAGES += CSWlibao2 +OBSOLETES_CSWlibao2 = CSWlibao -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES += CSWlibao4 +CATALOGNAME_CSWlibao4 = libao4 +SPKG_DESC_CSWlibao4 = Cross-platform audio library, libao.so.4 +PKGFILES_CSWlibao4 += $(call pkgfiles_lib,libao.so.4) +# These are private libraries +PKGFILES_CSWlibao4 += $(call baseisadirs,$(libdir),ao/.*) +RUNTIME_DEP_PKGS_CSWlibao4 += CSWesound +OBSOLETES_CSWlibao4 = CSWlibao +PACKAGES += CSWlibao-dev +CATALOGNAME_CSWlibao-dev = libao_dev +SPKG_DESC_CSWlibao-dev = Development files for libao.so.4 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibao-dev = CSWlibao4 + BUILD64 = 1 - CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/libao/trunk/checksums =================================================================== --- csw/mgar/pkg/libao/trunk/checksums 2011-03-13 22:20:04 UTC (rev 13779) +++ csw/mgar/pkg/libao/trunk/checksums 2011-03-13 22:20:20 UTC (rev 13780) @@ -1 +1 @@ -08283fbe1f587619053a156254afecec libao-1.0.0.tar.gz +2b2508c29bc97e4dc218fa162cf883c8 libao-1.1.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 Sun Mar 13 23:27:38 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 13 Mar 2011 22:27:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[13781] csw/mgar/pkg/audiofile/trunk/Makefile Message-ID: Revision: 13781 http://gar.svn.sourceforge.net/gar/?rev=13781&view=rev Author: dmichelsen Date: 2011-03-13 22:27:38 +0000 (Sun, 13 Mar 2011) Log Message: ----------- audiofile: Split packages Modified Paths: -------------- csw/mgar/pkg/audiofile/trunk/Makefile Modified: csw/mgar/pkg/audiofile/trunk/Makefile =================================================================== --- csw/mgar/pkg/audiofile/trunk/Makefile 2011-03-13 22:20:20 UTC (rev 13780) +++ csw/mgar/pkg/audiofile/trunk/Makefile 2011-03-13 22:27:38 UTC (rev 13781) @@ -18,18 +18,33 @@ # Delivered from the Michael Pruett (upstream author) PATCHFILES = 0001-Add-missing-headers-for-C99.patch -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES += CSWlibaudiofile0 +CATALOGNAME_CSWlibaudiofile0 = libaudiofile0 +SPKG_DESC_CSWlibaudiofile0 = Silican Graphics audio file library, libaudiofile.so.0 +PKGFILES_CSWlibaudiofile0 = $(call pkgfiles_lib,libaudiofile.so.0) +OBSOLETES_CSWlibaudiofile0 = CSWaudiofile +PACKAGES += CSWlibaudiofile-utils +CATALOGNAME_CSWlibaudiofile-utils = libaudiofile_utils +SPKG_DESC_CSWlibaudiofile-utils = Utility programs from Silicon Graphics audio file library +PKGFILES_CSWlibaudiofile-utils = $(call baseisadirs,$(bindir),.*) +RUNTIME_DEP_PKGS_CSWlibaudiofile-utils += CSWlibaudiofile0 +OBSOLETES_CSWlibaudiofile-utils = CSWaudiofile + +PACKAGES += CSWlibaudiofile-dev +CATALOGNAME_CSWlibaudiofile-dev = libaudiofile_dev +SPKG_DESC_CSWlibaudiofile-dev = Development files for libaudiofile.so.0 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibaudiofile-dev = CSWlibaudiofile0 + BUILD64 = 1 - +NOISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check -# amd64 on i386 -CHECKPKG_OVERRIDES_CSWaudiofile += soname-not-found|libm.so.2 -CHECKPKG_OVERRIDES_CSWaudiofile += soname-not-found|libm.so.2 -CHECKPKG_OVERRIDES_CSWaudiofile += soname-not-found|libm.so.2 +MERGE_SCRIPTS_isa-extra += copy-config-only +MERGE_SCRIPTS_isa-extra += copy-relocated-only +MERGE_DIRS_isa-extra = $(libdir) 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 Sun Mar 13 23:28:58 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 13 Mar 2011 22:28:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[13782] csw/mgar/pkg/audiofile/trunk/checksums Message-ID: Revision: 13782 http://gar.svn.sourceforge.net/gar/?rev=13782&view=rev Author: dmichelsen Date: 2011-03-13 22:28:58 +0000 (Sun, 13 Mar 2011) Log Message: ----------- audiofile: Checksum format adjustment Modified Paths: -------------- csw/mgar/pkg/audiofile/trunk/checksums Modified: csw/mgar/pkg/audiofile/trunk/checksums =================================================================== --- csw/mgar/pkg/audiofile/trunk/checksums 2011-03-13 22:27:38 UTC (rev 13781) +++ csw/mgar/pkg/audiofile/trunk/checksums 2011-03-13 22:28:58 UTC (rev 13782) @@ -1,2 +1 @@ -70963dd33ff7d1586491815669a38d36 0001-Add-missing-headers-for-C99.patch a39be317a7b1971b408805dc5e371862 audiofile-0.2.7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Mar 13 23:33:05 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 13 Mar 2011 22:33:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[13783] csw/mgar/pkg/audiofile/trunk/Makefile Message-ID: Revision: 13783 http://gar.svn.sourceforge.net/gar/?rev=13783&view=rev Author: dmichelsen Date: 2011-03-13 22:33:05 +0000 (Sun, 13 Mar 2011) Log Message: ----------- audiofile: Make sure *-config belongs to -dev package Modified Paths: -------------- csw/mgar/pkg/audiofile/trunk/Makefile Modified: csw/mgar/pkg/audiofile/trunk/Makefile =================================================================== --- csw/mgar/pkg/audiofile/trunk/Makefile 2011-03-13 22:28:58 UTC (rev 13782) +++ csw/mgar/pkg/audiofile/trunk/Makefile 2011-03-13 22:33:05 UTC (rev 13783) @@ -27,7 +27,7 @@ PACKAGES += CSWlibaudiofile-utils CATALOGNAME_CSWlibaudiofile-utils = libaudiofile_utils SPKG_DESC_CSWlibaudiofile-utils = Utility programs from Silicon Graphics audio file library -PKGFILES_CSWlibaudiofile-utils = $(call baseisadirs,$(bindir),.*) +PKGFILES_CSWlibaudiofile-utils = $(call baseisadirs,$(bindir),sf.*) RUNTIME_DEP_PKGS_CSWlibaudiofile-utils += CSWlibaudiofile0 OBSOLETES_CSWlibaudiofile-utils = CSWaudiofile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Mar 14 00:10:28 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 13 Mar 2011 23:10:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[13784] csw/mgar/pkg/perl/trunk Message-ID: Revision: 13784 http://gar.svn.sourceforge.net/gar/?rev=13784&view=rev Author: bonivart Date: 2011-03-13 23:10:28 +0000 (Sun, 13 Mar 2011) Log Message: ----------- perl/trunk: Update to 5.12.3. Builds, passes tests and installs. Packaging needs more work. INC-reorder patch temporarily disabled, needs to be reworked for 5.12.3. Depends on CSWlibgdbm3. Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile csw/mgar/pkg/perl/trunk/checksums Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2011-03-13 22:33:05 UTC (rev 13783) +++ csw/mgar/pkg/perl/trunk/Makefile 2011-03-13 23:10:28 UTC (rev 13784) @@ -1,5 +1,5 @@ NAME = perl -VERSION = 5.10.1 +VERSION = 5.12.3 CATEGORIES = lang DESCRIPTION = A high-level, general-purpose programming language @@ -17,22 +17,24 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz -PACKAGES = CSWperl CSWperldoc -ARCHALL_CSWperldoc = 1 -RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWgdbm -RUNTIME_DEP_PKGS_CSWperldoc = CSWperl +PACKAGES += CSWperl +SPKG_DESC_CSWperl = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm3 INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags -SPKG_DESC_CSWperl = $(DESCRIPTION) +PACKAGES += CSWperldoc SPKG_DESC_CSWperldoc = Perl documentation +RUNTIME_DEP_PKGS_CSWperldoc = CSWperl +ARCHALL_CSWperldoc = 1 LICENSE = Copying -PATCHFILES += 0001-change-inc-based-on-rhel5-patch.patch +# Will need to fix this patch to make it apply to 5.12.3 +#PATCHFILES += 0001-change-inc-based-on-rhel5-patch.patch +CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content|/usr/share CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWperl += surplus-dependency|CSWgdbm -CHECKPKG_OVERRIDES_CSWperl += soname-not-found|libgdbm.so.3|is|needed|by|opt/csw/lib/perl/5.10.1/auto/GDBM_File/GDBM_File.so +##CHECKPKG_OVERRIDES_CSWperl += soname-not-found|libgdbm.so.3|is|needed|by|opt/csw/lib/perl/5.10.1/auto/GDBM_File/GDBM_File.so # Core module updates # Not used at the moment, leave one as example @@ -113,7 +115,7 @@ EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod # Tests take a long time -TEST_SCRIPTS = +#TEST_SCRIPTS = # Make sure we don't include the path to the newly built perl as the # library is not in place yet. @@ -124,14 +126,15 @@ # Splitting of a separate libperl.so requires more work and careful planning. # Override for now. -CHECKPKG_OVERRIDES_CSWperl += shared-lib-pkgname-mismatch|file=opt/csw/lib/libperl.so.5.10.1|soname=libperl.so.5.10.1|pkgname=CSWperl|expected=CSWlibperl5-10-1 CHECKPKG_OVERRIDES_CSWperl += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libperl.so +CHECKPKG_OVERRIDES_CSWperl += shared-lib-pkgname-mismatch|file=opt/csw/lib/libperl.so.5.12.3|soname=libperl.so.5.12.3|pkgname=CSWperl|expected=CSWlibperl5-12-3 +CHECKPKG_OVERRIDES_CSWperl += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libperl.so include gar/category.mk post-extract-modulated: mkdir -p $(WORKSRC) - gln -s libperl.so.5.10.1 $(WORKSRC)/libperl.so + gln -s libperl.so.5.12.3 $(WORKSRC)/libperl.so @$(MAKECOOKIE) ifneq ($(CORE_UPDATES),) Modified: csw/mgar/pkg/perl/trunk/checksums =================================================================== --- csw/mgar/pkg/perl/trunk/checksums 2011-03-13 22:33:05 UTC (rev 13783) +++ csw/mgar/pkg/perl/trunk/checksums 2011-03-13 23:10:28 UTC (rev 13784) @@ -1 +1 @@ -b9b2fdb957f50ada62d73f43ee75d044 perl-5.10.1.tar.gz +29975a69dce54e47fcd6331c085c6c99 perl-5.12.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 14 03:13:26 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 14 Mar 2011 02:13:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[13785] csw/mgar/pkg/gettext/trunk Message-ID: Revision: 13785 http://gar.svn.sourceforge.net/gar/?rev=13785&view=rev Author: bdwalton Date: 2011-03-14 02:13:26 +0000 (Mon, 14 Mar 2011) Log Message: ----------- gettext/trunk: override usr/local references in ggettext package, add release notes Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gettext/trunk/files/CSWggettext.cswreleasenotes Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2011-03-13 23:10:28 UTC (rev 13784) +++ csw/mgar/pkg/gettext/trunk/Makefile 2011-03-14 02:13:26 UTC (rev 13785) @@ -175,6 +175,8 @@ CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWlibintl3 CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWlibgettextlib0-14-1 CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWlibgettextlib0-17 +CHECKPKG_OVERRIDES_CSWggettext += file-with-bad-content|/usr/local|root/opt/csw/share/aclocal/lib-prefix.m4 +CHECKPKG_OVERRIDES_CSWggettext += file-with-bad-content|/usr/local|root/opt/csw/share/aclocal/lib-link.m4 CHECKPKG_OVERRIDES_CSWggettextdoc += file-with-bad-content @@ -188,6 +190,7 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += CSWggettextdoc.cswreleasenotes +DISTFILES += CSWggettext.cswreleasenotes PATCHFILES += 0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch PATCHFILES += 0002-Update-ltmain.sh-to-prevent-libtool-stripping-runpat.patch Added: csw/mgar/pkg/gettext/trunk/files/CSWggettext.cswreleasenotes =================================================================== --- csw/mgar/pkg/gettext/trunk/files/CSWggettext.cswreleasenotes (rev 0) +++ csw/mgar/pkg/gettext/trunk/files/CSWggettext.cswreleasenotes 2011-03-14 02:13:26 UTC (rev 13785) @@ -0,0 +1 @@ +usr/local references: stock checks in aclocal inputs. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 14 03:16:41 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 14 Mar 2011 02:16:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[13786] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: Revision: 13786 http://gar.svn.sourceforge.net/gar/?rev=13786&view=rev Author: bdwalton Date: 2011-03-14 02:16:40 +0000 (Mon, 14 Mar 2011) Log Message: ----------- gettext/trunk: override soname-equals-filename in libgettextsrc0-17 (it is legacy and will not be fixed) Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2011-03-14 02:13:26 UTC (rev 13785) +++ csw/mgar/pkg/gettext/trunk/Makefile 2011-03-14 02:16:40 UTC (rev 13786) @@ -163,6 +163,7 @@ CHECKPKG_OVERRIDES_CSWlibgettextlib0-17 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libgettextlib-0.17.so CHECKPKG_OVERRIDES_CSWlibgettextlib0-17 += soname-equals-filename|file=/opt/csw/lib/libgettextlib-0.17.so CHECKPKG_OVERRIDES_CSWlibgettextsrc0-17 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libgettextsrc-0.17.so +CHECKPKG_OVERRIDES_CSWlibgettextsrc0-17 += soname-equals-filename|file=/opt/csw/lib/libgettextsrc-0.17.so CHECKPKG_OVERRIDES_CSWlibgettextpo0 += surplus-dependency|CSWggettext-data CHECKPKG_OVERRIDES_CSWlibgettextsrc0-18-1 += surplus-dependency|CSWggettext-data CHECKPKG_OVERRIDES_CSWlibgettextlib0-18-1 += surplus-dependency|CSWggettext-data 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 Mar 14 08:10:59 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 14 Mar 2011 07:10:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[13787] csw/mgar/pkg/libffi/trunk Message-ID: Revision: 13787 http://gar.svn.sourceforge.net/gar/?rev=13787&view=rev Author: wahwah Date: 2011-03-14 07:10:58 +0000 (Mon, 14 Mar 2011) Log Message: ----------- libffi: Make libffi.pc point at /opt/csw/include Modified Paths: -------------- csw/mgar/pkg/libffi/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libffi/trunk/files/0005-libffi.pc-should-point-at-opt-csw-include.patch Modified: csw/mgar/pkg/libffi/trunk/Makefile =================================================================== --- csw/mgar/pkg/libffi/trunk/Makefile 2011-03-14 02:16:40 UTC (rev 13786) +++ csw/mgar/pkg/libffi/trunk/Makefile 2011-03-14 07:10:58 UTC (rev 13787) @@ -27,6 +27,7 @@ # found at http://software.intel.com/en-us/forums/showthread.php?t=56652 # originally for icc, but at least get the stuff to compile PATCHFILES += ffi64.c.patch +PATCHFILES += 0005-libffi.pc-should-point-at-opt-csw-include.patch PACKAGES += CSWlibffi CATALOGNAME_CSWlibffi = libffi @@ -56,8 +57,6 @@ LICENSE = LICENSE -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) Added: csw/mgar/pkg/libffi/trunk/files/0005-libffi.pc-should-point-at-opt-csw-include.patch =================================================================== --- csw/mgar/pkg/libffi/trunk/files/0005-libffi.pc-should-point-at-opt-csw-include.patch (rev 0) +++ csw/mgar/pkg/libffi/trunk/files/0005-libffi.pc-should-point-at-opt-csw-include.patch 2011-03-14 07:10:58 UTC (rev 13787) @@ -0,0 +1,25 @@ +From f67593e5e96dfc0becb3dc3a2272f4b3cabc4e13 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Mon, 14 Mar 2011 08:07:09 +0100 +Subject: [PATCH] libffi.pc should point at /opt/csw/include + +--- + libffi.pc.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/libffi.pc.in b/libffi.pc.in +index c2e1c7b..5f0e9db 100644 +--- a/libffi.pc.in ++++ b/libffi.pc.in +@@ -1,7 +1,7 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ +-includedir=${libdir}/@PACKAGE_NAME at -@PACKAGE_VERSION@/include ++includedir=${libdir}/include + + Name: @PACKAGE_NAME@ + Description: Library supporting Foreign Function Interfaces +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Mon Mar 14 08:32:18 2011 From: maciej at opencsw.org (Maciej Blizinski) Date: Mon, 14 Mar 2011 08:32:18 +0100 Subject: [csw-devel] [PATCH] mGAR v2: Set CATALOG_RELEASE based on hostname Message-ID: <1300087938-11695-1-git-send-email-maciej@opencsw.org> Checkpkg needs to know, against which catalog release should given packages be checked. Since GAR invokes checkpkg, GAR needs to know that too. On the OpenCSW buildfarm, hosts are named after catalog releases, for example 'current9s' is a host with packages from 'current'. This patch makes gar determine the checking catalog release based on the host name. A solution for off-buildfarm use has not been determined. Signed-off-by: Maciej Blizinski --- gar/v2/gar.pkg.mk | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/gar/v2/gar.pkg.mk b/gar/v2/gar.pkg.mk index d34308c..4c2a706 100644 --- a/gar/v2/gar.pkg.mk +++ b/gar/v2/gar.pkg.mk @@ -57,7 +57,10 @@ GARSYSTEMVERSION ?= $(shell $(SVN) propget svn:externals $(CURDIR) | perl -ane ' GARPKG_v1 = CSWgar-v1 GARPKG_v2 = CSWgar-v2 RUNTIME_DEP_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown)) -CATALOG_RELEASE ?= current + +# Set the catalog release based on hostname. E.g. building on current9s will +# set CATALOG_RELEASE to 'current'. +CATALOG_RELEASE ?= $(shell hostname | gsed -e 's/[0-9].*$$//') define obsoleted_pkg CATALOGNAME_$(1) ?= $(call catalogname,$(1)) -- 1.7.3.2 From wahwah at users.sourceforge.net Mon Mar 14 08:51:26 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 14 Mar 2011 07:51:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[13788] csw/mgar/pkg/mod_wsgi/trunk Message-ID: Revision: 13788 http://gar.svn.sourceforge.net/gar/?rev=13788&view=rev Author: wahwah Date: 2011-03-14 07:51:26 +0000 (Mon, 14 Mar 2011) Log Message: ----------- mod_wsgi: Version bump to 3.3 Also, a couple of minor modifications of the build description. Modified Paths: -------------- csw/mgar/pkg/mod_wsgi/trunk/Makefile csw/mgar/pkg/mod_wsgi/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/mod_wsgi/trunk/Makefile Modified: csw/mgar/pkg/mod_wsgi/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_wsgi/trunk/Makefile 2011-03-14 07:10:58 UTC (rev 13787) +++ csw/mgar/pkg/mod_wsgi/trunk/Makefile 2011-03-14 07:51:26 UTC (rev 13788) @@ -1,5 +1,7 @@ +# $Id$ + NAME = mod_wsgi -VERSION = 3.2 +VERSION = 3.3 CATEGORIES = lib @@ -8,7 +10,8 @@ Mod_wsgi is a python WSGI adapter module for Apache. endef -MASTER_SITES = http://modwsgi.googlecode.com/files/ +GOOGLE_PROJECT = modwsgi +MASTER_SITES = $(GOOGLE_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += postinstall preremove space LICENSE = LICENCE @@ -18,24 +21,29 @@ RUNTIME_DEP_PKGS_CSWap2modwsgi = CSWpython CATALOGNAME_CSWap2modwsgi = ap2_modwsgi -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = (\d+(?:\.\d+)*) - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-apxs=$(prefix)/apache2/sbin/apxs CONFIGURE_ARGS += --with-python=$(bindir)/python CONFIGURE_ARGS += --with-python-src=../python ## There are no tests for this -TEST_SCRIPTS = skip +TEST_SCRIPTS = -test-skip: - $(DONADA) +RUNTIME_DEP_PKGS_CSWap2modwsgi += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWap2modwsgi += CSWapache2 +# If the pkgname is CSWap2modwsgi, catalogname should be ap2modwsgi +# If the catalogname is ap2_modwsgi, the pkgname should be CSWap2-modwsgi +CHECKPKG_OVERRIDES_CSWap2modwsgi += catalogname-does-not-match-pkgname|pkgname=CSWap2modwsgi|catalogname=ap2_modwsgi|expected-catalogname=ap2modwsgi + +# checkpkg doesn't know why CSWpython is needed +CHECKPKG_OVERRIDES_CSWap2modwsgi += surplus-dependency|CSWpython + +# : As far as I can tell, python-config returns good values +# ## Fix Makefile LDFLAGS to correct broken python-config return values -post-configure-modulated: - @( perl -i -plne 's|^LDFLAGS = .*|LDFLAGS = -L/opt/csw/lib|' \ - $(WORKSRC)/Makefile ) +# post-configure-modulated: +# @( perl -i -plne 's|^LDFLAGS = .*|LDFLAGS = -L/opt/csw/lib|' \ +# $(WORKSRC)/Makefile ) include gar/category.mk - Property changes on: csw/mgar/pkg/mod_wsgi/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/mod_wsgi/trunk/checksums =================================================================== --- csw/mgar/pkg/mod_wsgi/trunk/checksums 2011-03-14 07:10:58 UTC (rev 13787) +++ csw/mgar/pkg/mod_wsgi/trunk/checksums 2011-03-14 07:51:26 UTC (rev 13788) @@ -1,4 +1 @@ -7e4f7f443f562f21f61d1bd06defa1d8 mod_wsgi-3.2.tar.gz -a2e8679f45232e56efbc352597ffe456 postinstall -a67766841dedbaba0d7b15e7f08c8658 preremove -0dd379f20ceb32fc77bb3a9bf045097f space +6172bb2bbabcd0c25867c2bc06f99dbb mod_wsgi-3.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 Mon Mar 14 11:27:39 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 14 Mar 2011 10:27:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[13789] csw/mgar/pkg/nautilus Message-ID: Revision: 13789 http://gar.svn.sourceforge.net/gar/?rev=13789&view=rev Author: dmichelsen Date: 2011-03-14 10:27:39 +0000 (Mon, 14 Mar 2011) Log Message: ----------- nautilus: Move legacy to tags Added Paths: ----------- csw/mgar/pkg/nautilus/tags/ csw/mgar/pkg/nautilus/tags/legacy/ Removed Paths: ------------- csw/mgar/pkg/nautilus/trunk/legacy/ 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 Mar 14 12:41:39 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 14 Mar 2011 11:41:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[13790] csw/mgar/pkg/nautilus Message-ID: Revision: 13790 http://gar.svn.sourceforge.net/gar/?rev=13790&view=rev Author: dmichelsen Date: 2011-03-14 11:41:39 +0000 (Mon, 14 Mar 2011) Log Message: ----------- nautilus: Initial commit, does not compile, needs newer glib Added Paths: ----------- csw/mgar/pkg/nautilus/branches/ csw/mgar/pkg/nautilus/trunk/Makefile csw/mgar/pkg/nautilus/trunk/checksums csw/mgar/pkg/nautilus/trunk/files/ Property Changed: ---------------- csw/mgar/pkg/nautilus/trunk/ Property changes on: csw/mgar/pkg/nautilus/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/nautilus/trunk/Makefile =================================================================== --- csw/mgar/pkg/nautilus/trunk/Makefile (rev 0) +++ csw/mgar/pkg/nautilus/trunk/Makefile 2011-03-14 11:41:39 UTC (rev 13790) @@ -0,0 +1,15 @@ +# $Id: Makefile 13420 2011-02-20 21:04:03Z bdwalton $ +NAME = nautilus +VERSION = 2.91.91 +CATEGORIES = gnome + +DESCRIPTION = File manager for the GNOME desktop +define BLURB +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(DISTNAME).tar.bz2 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/nautilus/trunk/checksums =================================================================== --- csw/mgar/pkg/nautilus/trunk/checksums (rev 0) +++ csw/mgar/pkg/nautilus/trunk/checksums 2011-03-14 11:41:39 UTC (rev 13790) @@ -0,0 +1 @@ +471760344a7395c41288ac1f287b91f2 nautilus-2.91.91.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Mar 14 12:44:04 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 14 Mar 2011 11:44:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[13791] csw/mgar/pkg/xz/trunk/Makefile Message-ID: Revision: 13791 http://gar.svn.sourceforge.net/gar/?rev=13791&view=rev Author: dmichelsen Date: 2011-03-14 11:44:04 +0000 (Mon, 14 Mar 2011) Log Message: ----------- xz: Adjust dependency to gettext Modified Paths: -------------- csw/mgar/pkg/xz/trunk/Makefile Modified: csw/mgar/pkg/xz/trunk/Makefile =================================================================== --- csw/mgar/pkg/xz/trunk/Makefile 2011-03-14 11:41:39 UTC (rev 13790) +++ csw/mgar/pkg/xz/trunk/Makefile 2011-03-14 11:44:04 UTC (rev 13791) @@ -20,7 +20,7 @@ PACKAGES += CSWxz CATALOGNAME_CSWxz = xz SPKG_DESC_CSWxz = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWxz += CSWggettextrt +RUNTIME_DEP_PKGS_CSWxz += CSWlibintl8 RUNTIME_DEP_PKGS_CSWxz += CSWliblzma5 PACKAGES += CSWlzma 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 Mar 14 13:02:32 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 14 Mar 2011 12:02:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[13792] csw/mgar/pkg/esound/trunk/Makefile Message-ID: Revision: 13792 http://gar.svn.sourceforge.net/gar/?rev=13792&view=rev Author: dmichelsen Date: 2011-03-14 12:02:31 +0000 (Mon, 14 Mar 2011) Log Message: ----------- esound: Package split Modified Paths: -------------- csw/mgar/pkg/esound/trunk/Makefile Modified: csw/mgar/pkg/esound/trunk/Makefile =================================================================== --- csw/mgar/pkg/esound/trunk/Makefile 2011-03-14 11:44:04 UTC (rev 13791) +++ csw/mgar/pkg/esound/trunk/Makefile 2011-03-14 12:02:31 UTC (rev 13792) @@ -14,19 +14,43 @@ MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.bz2 -RUNTIME_DEP_PKGS = CSWaudiofile +VENDOR_URL = http://www.tux.org/~ricdude/EsounD.html +LICENSE = COPYING.LIB -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 +PACKAGES += CSWlibesd0 +CATALOGNAME_CSWlibesd0 = libesd0 +SPKG_DESC_CSWlibesd0 = The enlightened sound daemon library, libesd.so.0 +PKGFILES_CSWlibesd0 = $(call pkgfiles_lib,libesd.so.0) +RUNTIME_DEP_PKGS_CSWlibesd0 += CSWlibaudiofile0 -# TODO on next release: -# - Move config file from /opt/csw/etc to /etc/opt/csw -# - Document the location in esd(1) -# - Skip 64 binaries +PACKAGES += CSWlibesd-dev +CATALOGNAME_CSWlibesd-dev = libesd_dev +SPKG_DESC_CSWlibesd-dev = Development files for libesd.so.0 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibesd-dev += CSWlibesd0 +ESD_BINS += esd +ESD_BINS += esdcat +ESD_BINS += esdctl +ESD_BINS += esdfilt +ESD_BINS += esdloop +ESD_BINS += esdmon +ESD_BINS += esdplay +ESD_BINS += esdrec +ESD_BINS += esdsample + +PACKAGES += CSWesound +CATALOGNAME_CSWesound = esound +SPKG_DESC_CSWesound = The enlightened sound daemon +PKGFILES_CSWesound += $(foreach B,$(ESD_BINS),$(bindir)/$B $(mandir)/man1/$(B).1) +PKGFILES_CSWesound += $(sysconfdir)/.* +RUNTIME_DEP_PKGS_CSWesound += CSWlibesd0 +RUNTIME_DEP_PKGS_CSWesound += CSWlibaudiofile0 + sysconfdir = /etc/opt/csw PRESERVECONF = $(sysconfdir)/esd.conf -MIGRATE_FILES = esd.conf +MIGRATE_FILES_CSWesound = esd.conf BUILD64 = 1 NOISAEXEC = 1 @@ -34,6 +58,8 @@ TEST_TARGET = check +MERGE_SCRIPTS_isa-extra += copy-relocated-only +MERGE_SCRIPTS_isa-extra += copy-config-only MERGE_DIRS_isa-extra = $(libdir) 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 Mon Mar 14 13:28:32 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 14 Mar 2011 12:28:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[13793] csw/mgar/pkg/libiconv/trunk Message-ID: Revision: 13793 http://gar.svn.sourceforge.net/gar/?rev=13793&view=rev Author: dmichelsen Date: 2011-03-14 12:28:32 +0000 (Mon, 14 Mar 2011) Log Message: ----------- libiconv: Work towards package split, has checkpkg issues Modified Paths: -------------- csw/mgar/pkg/libiconv/trunk/Makefile csw/mgar/pkg/libiconv/trunk/checksums Modified: csw/mgar/pkg/libiconv/trunk/Makefile =================================================================== --- csw/mgar/pkg/libiconv/trunk/Makefile 2011-03-14 12:02:31 UTC (rev 13792) +++ csw/mgar/pkg/libiconv/trunk/Makefile 2011-03-14 12:28:32 UTC (rev 13793) @@ -25,11 +25,32 @@ # Package naming is a bit unfortunate CSWiconv vs. libiconv :/ but # that's not something i want to change right now. CSWiconv has # heaps of dependents. -PACKAGES = CSWiconv -CATALOGNAME_CSWiconv = libiconv +#PACKAGES = CSWiconv +#CATALOGNAME_CSWiconv = libiconv -# The current 1.12 only has a 32-Bit iconv binary, leave it that way -EXTRA_MERGE_EXCLUDE_FILES = /opt/csw/bin/.*/iconv +PACKAGES += CSWlibiconv2 +CATALOGNAME_CSWlibiconv2 = libiconv2 +SPKG_DESC_CSWlibiconv2 = GNU iconv library, libiconv.so.2 +PKGFILES_CSWlibiconv2 += $(call pkgfiles_lib,libiconv.so.2) +PKGFILES_CSWlibiconv2 += $(libdir)/preloadable_libiconv.so + +PACKAGES += CSWlibcharset1 +CATALOGNAME_CSWlibcharset1 = libcharset1 +SPKG_DESC_CSWlibcharset1 = GNU iconv charset library, libcharset.so.1 +PKGFILES_CSWlibcharset1 += $(call pkgfiles_lib,libcharset.so.1) +# Now *this* time it is ok, iconv is the only package that is allowed to ship this! +CHECKPKG_OVERRIDES_CSWlibcharset1 += disallowed-path|opt/csw/lib/charset.alias +PKGFILES_CSWlibcharset1 += $(libdir)/charset.alias + +PACKAGES += CSWlibiconv-utils +CATALOGNAME_CSWlibiconv-utils = libiconv_utils +SPKG_DESC_CSWlibiconv-utils = GNU iconv utility programs +PKGFILES_CSWlibiconv-utils += $(bindir)/.* +PKGFILES_CSWlibiconv-utils += .*iconv\.1.* +RUNTIME_DEP_PKGS_CSWlibiconv-utils += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibiconv-utils += CSWlibcharset1 +OBSOLETES_CSWlibiconv-utils = CSWiconv + NOISAEXEC = 1 BUILD64 = 1 @@ -59,6 +80,8 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-rpath +MERGE_DIRS_isa-extra = $(libdir) + include gar/category.mk post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(NAME) Modified: csw/mgar/pkg/libiconv/trunk/checksums =================================================================== --- csw/mgar/pkg/libiconv/trunk/checksums 2011-03-14 12:02:31 UTC (rev 13792) +++ csw/mgar/pkg/libiconv/trunk/checksums 2011-03-14 12:28:32 UTC (rev 13793) @@ -1,2 +1 @@ -7ab33ebd26687c744a37264a330bbe9a download/libiconv-1.13.1.tar.gz -9c66308f6f3bfe70afc4fc67c07d7de3 download/patch-configure-stdbool.diff +7ab33ebd26687c744a37264a330bbe9a libiconv-1.13.1.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 Mon Mar 14 14:53:21 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 14 Mar 2011 13:53:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[13794] csw/mgar/pkg/perl/trunk/Makefile Message-ID: Revision: 13794 http://gar.svn.sourceforge.net/gar/?rev=13794&view=rev Author: bonivart Date: 2011-03-14 13:53:21 +0000 (Mon, 14 Mar 2011) Log Message: ----------- perl/trunk: Add override about bad content in CSWperldoc Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2011-03-14 12:28:32 UTC (rev 13793) +++ csw/mgar/pkg/perl/trunk/Makefile 2011-03-14 13:53:21 UTC (rev 13794) @@ -32,9 +32,9 @@ # Will need to fix this patch to make it apply to 5.12.3 #PATCHFILES += 0001-change-inc-based-on-rhel5-patch.patch -CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content|/usr/share +CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content +CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl -##CHECKPKG_OVERRIDES_CSWperl += soname-not-found|libgdbm.so.3|is|needed|by|opt/csw/lib/perl/5.10.1/auto/GDBM_File/GDBM_File.so # Core module updates # Not used at the moment, leave one as example 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 Mar 14 16:42:00 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 14 Mar 2011 15:42:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[13795] csw/mgar/pkg/libiconv/trunk/Makefile Message-ID: Revision: 13795 http://gar.svn.sourceforge.net/gar/?rev=13795&view=rev Author: dmichelsen Date: 2011-03-14 15:42:00 +0000 (Mon, 14 Mar 2011) Log Message: ----------- libiconv: Advances in package split Modified Paths: -------------- csw/mgar/pkg/libiconv/trunk/Makefile Modified: csw/mgar/pkg/libiconv/trunk/Makefile =================================================================== --- csw/mgar/pkg/libiconv/trunk/Makefile 2011-03-14 13:53:21 UTC (rev 13794) +++ csw/mgar/pkg/libiconv/trunk/Makefile 2011-03-14 15:42:00 UTC (rev 13795) @@ -22,17 +22,10 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -# Package naming is a bit unfortunate CSWiconv vs. libiconv :/ but -# that's not something i want to change right now. CSWiconv has -# heaps of dependents. -#PACKAGES = CSWiconv -#CATALOGNAME_CSWiconv = libiconv - PACKAGES += CSWlibiconv2 CATALOGNAME_CSWlibiconv2 = libiconv2 SPKG_DESC_CSWlibiconv2 = GNU iconv library, libiconv.so.2 PKGFILES_CSWlibiconv2 += $(call pkgfiles_lib,libiconv.so.2) -PKGFILES_CSWlibiconv2 += $(libdir)/preloadable_libiconv.so PACKAGES += CSWlibcharset1 CATALOGNAME_CSWlibcharset1 = libcharset1 @@ -42,13 +35,27 @@ CHECKPKG_OVERRIDES_CSWlibcharset1 += disallowed-path|opt/csw/lib/charset.alias PKGFILES_CSWlibcharset1 += $(libdir)/charset.alias +PACKAGES += CSWlibiconv-dev +CATALOGNAME_CSWlibiconv-dev = libiconv_dev +SPKG_DESC_CSWlibiconv-dev = Development files for libiconv.so.2 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibiconv-dev += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibiconv-dev += CSWlibcharset1 +# This is from an example in a comment +CHECKPKG_OVERRIDES_CSWlibiconv-dev += file-with-bad-content|/usr/local|root/opt/csw/include/iconv.h + PACKAGES += CSWlibiconv-utils CATALOGNAME_CSWlibiconv-utils = libiconv_utils SPKG_DESC_CSWlibiconv-utils = GNU iconv utility programs PKGFILES_CSWlibiconv-utils += $(bindir)/.* PKGFILES_CSWlibiconv-utils += .*iconv\.1.* +PKGFILES_CSWlibiconv-utils += $(call baseisadirs,$(libdir),preloadable_libiconv\.so) +# The SONAME of preloadable_libiconv.so is set to libiconv.so.0, although it doesn't +# matter in any way as this library is only used for LD_PRELOAD and is never being +# linked against during compile time. +CHECKPKG_OVERRIDES_CSWlibiconv-utils += soname-not-part-of-filename|soname=libiconv.so.0|filename=preloadable_libiconv.so +CHECKPKG_OVERRIDES_CSWlibiconv-utils += shared-lib-pkgname-mismatch|sonames=libiconv.so.0|pkgname=CSWlibiconv-utils|expected=CSWlibiconv0| RUNTIME_DEP_PKGS_CSWlibiconv-utils += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibiconv-utils += CSWlibcharset1 OBSOLETES_CSWlibiconv-utils = CSWiconv NOISAEXEC = 1 @@ -91,3 +98,9 @@ ginstall -D $(WORKSRC)/srcm4/iconv.m4 \ $(DESTDIR)$(datadir)/aclocal/iconv.m4 @$(MAKECOOKIE) + +post-merge: + @# Make the 64 bit charset-alias the same as the one for 32 bit + rm -f $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/charset.alias + gln -s ../charset.alias $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/charset.alias + @$(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 Mon Mar 14 17:43:05 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 14 Mar 2011 16:43:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[13796] csw/mgar/pkg Message-ID: Revision: 13796 http://gar.svn.sourceforge.net/gar/?rev=13796&view=rev Author: dmichelsen Date: 2011-03-14 16:43:04 +0000 (Mon, 14 Mar 2011) Log Message: ----------- libkate: Initial commit, some tests fail Added Paths: ----------- csw/mgar/pkg/libkate/ csw/mgar/pkg/libkate/Makefile csw/mgar/pkg/libkate/branches/ csw/mgar/pkg/libkate/tags/ csw/mgar/pkg/libkate/trunk/ csw/mgar/pkg/libkate/trunk/Makefile csw/mgar/pkg/libkate/trunk/checksums csw/mgar/pkg/libkate/trunk/files/ csw/mgar/pkg/libkate/trunk/files/0001-Reformat-null-test-string.patch csw/mgar/pkg/libkate/trunk/files/0002-Use-inttypes-when-stdint-is-not-available.patch Copied: csw/mgar/pkg/libkate/Makefile (from rev 13599, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libkate/Makefile (rev 0) +++ csw/mgar/pkg/libkate/Makefile 2011-03-14 16:43:04 UTC (rev 13796) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/libkate/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/libkate/trunk/Makefile =================================================================== --- csw/mgar/pkg/libkate/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libkate/trunk/Makefile 2011-03-14 16:43:04 UTC (rev 13796) @@ -0,0 +1,29 @@ +# $Id$ +NAME = libkate +VERSION = 0.3.8 +CATEGORIES = lib + +DESCRIPTION = A karaoke and text codec for embedding in ogg +define BLURB +endef + +MASTER_SITES = $(GOOGLE_MIRROR) +DISTFILES = $(DISTNAME).tar.gz + +PATCHFILES += 0001-Reformat-null-test-string.patch +PATCHFILES += 0002-Use-inttypes-when-stdint-is-not-available.patch + +VENDOR_URL = http://code.google.com/p/libkate/ + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +post-configure-modulated: + perl -pi -e 's,-Wall -W,,g' \ + $(WORKSRC)/Makefile \ + $(WORKSRC)/tools/Makefile + Property changes on: csw/mgar/pkg/libkate/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/libkate/trunk/checksums =================================================================== --- csw/mgar/pkg/libkate/trunk/checksums (rev 0) +++ csw/mgar/pkg/libkate/trunk/checksums 2011-03-14 16:43:04 UTC (rev 13796) @@ -0,0 +1 @@ +7489ddebedf8d9888a05496dedf83c71 libkate-0.3.8.tar.gz Added: csw/mgar/pkg/libkate/trunk/files/0001-Reformat-null-test-string.patch =================================================================== --- csw/mgar/pkg/libkate/trunk/files/0001-Reformat-null-test-string.patch (rev 0) +++ csw/mgar/pkg/libkate/trunk/files/0001-Reformat-null-test-string.patch 2011-03-14 16:43:04 UTC (rev 13796) @@ -0,0 +1,21 @@ +From 031abef771ed1ed9120a1329cee3ac3acfdc3308 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 14 Mar 2011 17:25:39 +0100 +Subject: [PATCH] Reformat null test string + +--- + tests/text.c | Bin 5917 -> 5920 bytes + 1 files changed, 0 insertions(+), 0 deletions(-) + +diff --git a/tests/text.c b/tests/text.c +index 253112ae77c45d6dba033c4d5ebcfe3653622bd7..b107bf08ed0fa1ea1d7dc8808e49e4a7c2c51de4 100644 +GIT binary patch +delta 17 +YcmbQMw?J=$8!t;tg at M6lciwB905%i_y8r+H + +delta 14 +VcmZ3WH&<_i8!scnW-s1roB$-k1cv|s + +-- +1.7.3.2 + Added: csw/mgar/pkg/libkate/trunk/files/0002-Use-inttypes-when-stdint-is-not-available.patch =================================================================== --- csw/mgar/pkg/libkate/trunk/files/0002-Use-inttypes-when-stdint-is-not-available.patch (rev 0) +++ csw/mgar/pkg/libkate/trunk/files/0002-Use-inttypes-when-stdint-is-not-available.patch 2011-03-14 16:43:04 UTC (rev 13796) @@ -0,0 +1,30 @@ +From 990b5dc885670acfc13eac4db0fc06e800c0cc6e Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 14 Mar 2011 14:43:03 +0100 +Subject: [PATCH] Use inttypes when stdint is not available + +--- + tests/check_sizes.c | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) + +diff --git a/tests/check_sizes.c b/tests/check_sizes.c +index a99cc73..45c25a0 100644 +--- a/tests/check_sizes.c ++++ b/tests/check_sizes.c +@@ -7,7 +7,13 @@ + file 'COPYING'. Please read these terms before distributing. */ + + ++#ifdef HAVE_STDINT_H + #include ++#else ++#ifdef HAVE_INTTYPES_H ++#include ++#endif ++#endif + #include + #include "kate/kate.h" + +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Mon Mar 14 18:35:41 2011 From: dam at opencsw.org (Dagobert Michelsen) Date: Mon, 14 Mar 2011 18:35:41 +0100 Subject: [csw-devel] SF.net SVN: gar:[13765] csw/mgar/pkg/gettext/trunk/Makefile In-Reply-To: References: Message-ID: <39256133-DB19-4A1B-8CF7-E2B46C9B72E2@opencsw.org> Hi Maciej, Am 13.03.2011 um 14:04 schrieb Maciej Blizi?ski: > 2011/3/13 : >> +EXTRA_LINKER_FLAGS = -norunpath > > I'm wondering whether EXTRA_LINKER_FLAGS are passed to both C and C++ > programs. There's incompatibility between Sun C and C++ compilers wrt > -norunpath vs -xnorunpath. I don't remember exactly in which > direction it is, though. I think it's C that accepts -xnorunpath > only, and C++ accepts -norunpath only. Yes, and if "ld" is used for linking instead of "cc" or "CC" it completely bails out. It is really just wild guessing and best set on a per-package basis. Best regards -- Dago From bonivart at users.sourceforge.net Mon Mar 14 19:36:39 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 14 Mar 2011 18:36:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[13797] csw/mgar/pkg/cpan Message-ID: Revision: 13797 http://gar.svn.sourceforge.net/gar/?rev=13797&view=rev Author: bonivart Date: 2011-03-14 18:36:38 +0000 (Mon, 14 Mar 2011) Log Message: ----------- cpan/Devel-NYTProf: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Devel-NYTProf/ csw/mgar/pkg/cpan/Devel-NYTProf/branches/ csw/mgar/pkg/cpan/Devel-NYTProf/tags/ csw/mgar/pkg/cpan/Devel-NYTProf/trunk/ csw/mgar/pkg/cpan/Devel-NYTProf/trunk/Makefile csw/mgar/pkg/cpan/Devel-NYTProf/trunk/checksums csw/mgar/pkg/cpan/Devel-NYTProf/trunk/files/ csw/mgar/pkg/cpan/Devel-NYTProf/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Devel-NYTProf/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/cpan/Devel-NYTProf/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Devel-NYTProf/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Devel-NYTProf/trunk/Makefile 2011-03-14 18:36:38 UTC (rev 13797) @@ -0,0 +1,21 @@ +NAME = Devel-NYTProf +VERSION = 4.06 +CATEGORIES = cpan +AUTHOR = TIMB + +DESCRIPTION = Powerful fast feature-rich perl source code profiler +define BLURB + Powerful fast feature-rich perl source code profiler +endef + +DISTFILES += COPYING + +PACKAGES = CSWpm-devel-nytprof +CATALOGNAME = pm_devel_nytprof + +RUNTIME_DEP_PKGS += CSWpm-json-any + +# Temporary override since CSWpm-json-any is not released yet, remove this next time +CHECKPKG_OVERRIDES_CSWpm-devel-nytprof += unidentified-dependency|CSWpm-json-any + +include gar/category.mk Added: csw/mgar/pkg/cpan/Devel-NYTProf/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Devel-NYTProf/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Devel-NYTProf/trunk/checksums 2011-03-14 18:36:38 UTC (rev 13797) @@ -0,0 +1 @@ +6a945649e49d353ddd083a4427f9f96c Devel-NYTProf-4.06.tar.gz Added: csw/mgar/pkg/cpan/Devel-NYTProf/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Devel-NYTProf/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Devel-NYTProf/trunk/files/COPYING 2011-03-14 18:36:38 UTC (rev 13797) @@ -0,0 +1,7 @@ +Copyright (C) 2008 Adam J. Kaplan, NYTimes.com, akaplan aat nytimes dotcom. +Copyright (C) 2008 The New York Times Company. +Copyright (C) 2008 Tim Bunce, Ireland. + +This library is free software; you can redistribute it and/or modify +it under the same terms as Perl itself, either Perl version 5.8.8 or, +at your option, any later version of Perl 5 you may have available. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Mar 14 19:39:07 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 14 Mar 2011 18:39:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[13798] csw/mgar/pkg/perl/trunk/Makefile Message-ID: Revision: 13798 http://gar.svn.sourceforge.net/gar/?rev=13798&view=rev Author: bonivart Date: 2011-03-14 18:39:07 +0000 (Mon, 14 Mar 2011) Log Message: ----------- perl/trunk: DTrace support Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2011-03-14 18:36:38 UTC (rev 13797) +++ csw/mgar/pkg/perl/trunk/Makefile 2011-03-14 18:39:07 UTC (rev 13798) @@ -17,6 +17,8 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + PACKAGES += CSWperl SPKG_DESC_CSWperl = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm3 @@ -52,7 +54,7 @@ CONFIGURE_SCRIPTS = perl # Compatable with all prior patch revs -INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 +INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 5.10.1 5.12.0 5.12.1 # Force use of db-4.8 PERL_LIBS += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc -lperl @@ -86,6 +88,11 @@ CONFIGURE_ARGS += -Duseshrplib CONFIGURE_ARGS += -Dusesitecustomize CONFIGURE_ARGS += -Dusethreads + +ifeq ($(shell uname -r), 5.10) + CONFIGURE_ARGS += -Dusedtrace +endif + #CONFIGURE_ARGS += -Dusedtrace CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl/csw CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl/csw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Mar 14 19:46:35 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 14 Mar 2011 18:46:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[13799] csw/mgar/pkg/cpan Message-ID: Revision: 13799 http://gar.svn.sourceforge.net/gar/?rev=13799&view=rev Author: bonivart Date: 2011-03-14 18:46:35 +0000 (Mon, 14 Mar 2011) Log Message: ----------- cpan/JSON-Any: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/JSON-Any/ csw/mgar/pkg/cpan/JSON-Any/branches/ csw/mgar/pkg/cpan/JSON-Any/tags/ csw/mgar/pkg/cpan/JSON-Any/trunk/ csw/mgar/pkg/cpan/JSON-Any/trunk/Makefile csw/mgar/pkg/cpan/JSON-Any/trunk/checksums csw/mgar/pkg/cpan/JSON-Any/trunk/files/ csw/mgar/pkg/cpan/JSON-Any/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/JSON-Any/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/cpan/JSON-Any/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/JSON-Any/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/JSON-Any/trunk/Makefile 2011-03-14 18:46:35 UTC (rev 13799) @@ -0,0 +1,18 @@ +NAME = JSON-Any +VERSION = 1.25 +CATEGORIES = cpan +AUTHOR = PERIGRIN + +DESCRIPTION = Wrapper Class for the various JSON classes +define BLURB + Wrapper Class for the various JSON classes +endef + +DISTFILES += COPYING + +PACKAGES = CSWpm-json-any +CATALOGNAME = pm_json_any + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/JSON-Any/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/JSON-Any/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/JSON-Any/trunk/checksums 2011-03-14 18:46:35 UTC (rev 13799) @@ -0,0 +1 @@ +10de13ce9ee9ec14336ee1d3b70b3ab0 JSON-Any-1.25.tar.gz Added: csw/mgar/pkg/cpan/JSON-Any/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/JSON-Any/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/JSON-Any/trunk/files/COPYING 2011-03-14 18:46:35 UTC (rev 13799) @@ -0,0 +1,4 @@ + Copyright 2007-2009 Chris Thompson, some rights reserved. + + This program is free software; you can redistribute it and/or modify it + under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Mar 14 22:10:29 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 14 Mar 2011 21:10:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[13800] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 13800 http://gar.svn.sourceforge.net/gar/?rev=13800&view=rev Author: rthurner Date: 2011-03-14 21:10:28 +0000 (Mon, 14 Mar 2011) Log Message: ----------- subversion: update to svn-1.6.16 Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile csw/mgar/pkg/subversion/trunk/checksums Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-03-14 18:46:35 UTC (rev 13799) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-03-14 21:10:28 UTC (rev 13800) @@ -22,7 +22,7 @@ # http://subversion.apache.org/mailing-lists.html NAME = subversion -VERSION = 1.6.15 +VERSION = 1.6.16 CATEGORIES = utils DESCRIPTION = Version control rethought Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2011-03-14 18:46:35 UTC (rev 13799) +++ csw/mgar/pkg/subversion/trunk/checksums 2011-03-14 21:10:28 UTC (rev 13800) @@ -1 +1 @@ -113fca1d9e4aa389d7dc2b210010fa69 subversion-1.6.15.tar.bz2 +32f25a6724559fe8691d1f57a63f636e subversion-1.6.16.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 Tue Mar 15 00:00:21 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 14 Mar 2011 23:00:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[13801] csw/mgar/pkg Message-ID: Revision: 13801 http://gar.svn.sourceforge.net/gar/?rev=13801&view=rev Author: wahwah Date: 2011-03-14 23:00:20 +0000 (Mon, 14 Mar 2011) Log Message: ----------- tre: Initial commit Modified Paths: -------------- csw/mgar/pkg/tre/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tre/ csw/mgar/pkg/tre/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/tre/trunk/Makefile Deleted: csw/mgar/pkg/tre/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2011-02-15 08:22:56 UTC (rev 13317) +++ csw/mgar/pkg/tre/trunk/Makefile 2011-03-14 23:00:20 UTC (rev 13801) @@ -1,186 +0,0 @@ -# Copyright 2009 OpenCSW -# 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 -## -NAME = mypkg -VERSION = 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. -define BLURB - -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), -## $(PYPI_MIRROR) -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(NAME). 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 = $(NAME)-$(VERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\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)/$(NAME)-$(VERSION) -## -## 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 Copied: csw/mgar/pkg/tre/trunk/Makefile (from rev 13576, csw/mgar/pkg/template/trunk/Makefile) =================================================================== --- csw/mgar/pkg/tre/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tre/trunk/Makefile 2011-03-14 23:00:20 UTC (rev 13801) @@ -0,0 +1,41 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +NAME = tre +VERSION = 0.8.0 +CATEGORIES = lib +DESCRIPTION = Approximate regex matching library +define BLURB +endef +SPKG_SOURCEURL = http://laurikari.net/tre/ +MASTER_SITES = http://laurikari.net/tre/ +DISTFILES = $(NAME)-$(VERSION).tar.bz2 +BUILD64 = 1 +NOISAEXEC = 1 +# agrep needs getopt_long +# TODO: Solve the getopt_long problem and build agrep. +# PATCHFILES += 0001-gnulib-import-getopt-gnu.patch +# PATCHFILES += 0002-manual-gnulib-integration-steps.patch +# EXTRA_LD_OPTIONS = -lgnugetopt +CONFIGURE_ARGS = $(DIRPATHS) --disable-agrep +TEST_TARGET = check + +PACKAGES += CSWlibtre5 +SPKG_DESC_CSWlibtre5 = Approximate regex matching library (libtre.so.5) +PKGFILES_CSWlibtre5 = /opt/csw/lib/.*libtre\.so\.5.* +RUNTIME_DEP_PKGS_CSWlibtre5 += CSWlibintl8 + +PACKAGES += CSWtre-dev +CATALOGNAME_CSWtre-dev = tre_dev +# PKGFILES_CSWtre-dev += $(PKGFILES_DEVEL) +SPKG_DESC_CSWtre-dev = Development files for tre +RUNTIME_DEP_PKGS_CSWtre-dev += CSWlibtre5 + +LICENSE = LICENSE + +include gar/category.mk + +# pre-configure-modulated: +# @(cd $(WORKSRC); autoreconf -i ) +# @$(MAKECOOKIE) Modified: csw/mgar/pkg/tre/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2011-02-15 08:22:56 UTC (rev 13317) +++ csw/mgar/pkg/tre/trunk/checksums 2011-03-14 23:00:20 UTC (rev 13801) @@ -0,0 +1 @@ +b4d3232593dadf6746f4727bdda20b41 tre-0.8.0.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 Tue Mar 15 00:35:06 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 14 Mar 2011 23:35:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[13802] csw/mgar/pkg/tre/trunk/files Message-ID: Revision: 13802 http://gar.svn.sourceforge.net/gar/?rev=13802&view=rev Author: wahwah Date: 2011-03-14 23:35:05 +0000 (Mon, 14 Mar 2011) Log Message: ----------- tre: patches Added Paths: ----------- csw/mgar/pkg/tre/trunk/files/0001-gnulib-import-getopt-gnu.patch csw/mgar/pkg/tre/trunk/files/0002-manual-gnulib-integration-steps.patch Added: csw/mgar/pkg/tre/trunk/files/0001-gnulib-import-getopt-gnu.patch =================================================================== --- csw/mgar/pkg/tre/trunk/files/0001-gnulib-import-getopt-gnu.patch (rev 0) +++ csw/mgar/pkg/tre/trunk/files/0001-gnulib-import-getopt-gnu.patch 2011-03-14 23:35:05 UTC (rev 13802) @@ -0,0 +1,4721 @@ +From d482ea9ccf3f449a627e30750b209b5983fc6aca Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Mon, 14 Mar 2011 22:16:29 +0100 +Subject: [PATCH 1/2] gnulib import getopt-gnu + +--- + lib/Makefile.am | 254 ++++++++++-- + lib/Makefile.am~ | 34 ++ + lib/dummy.c | 42 ++ + lib/getopt.c | 1187 ++++++++++++++++++++++++++++++++++++++++++++++++++ + lib/getopt.in.h | 247 +++++++++++ + lib/getopt1.c | 170 +++++++ + lib/getopt_int.h | 132 ++++++ + lib/gettext.h | 279 ++++++++++++ + lib/stddef.in.h | 86 ++++ + lib/unistd.in.h | 810 ++++++++++++++++++++++++++++++++++ + m4/00gnulib.m4 | 30 ++ + m4/extensions.m4 | 104 +++++ + m4/getopt.m4 | 250 +++++++++++ + m4/gnulib-cache.m4 | 36 ++ + m4/gnulib-common.m4 | 124 ++++++ + m4/gnulib-comp.m4 | 197 +++++++++ + m4/gnulib-tool.m4 | 57 +++ + m4/include_next.m4 | 187 ++++++++ + m4/onceonly.m4 | 90 ++++ + m4/stddef_h.m4 | 45 ++ + m4/unistd_h.m4 | 119 +++++ + m4/wchar_t.m4 | 20 + + utils/link-warning.h | 28 ++ + 23 files changed, 4494 insertions(+), 34 deletions(-) + create mode 100644 lib/Makefile.am~ + create mode 100644 lib/dummy.c + create mode 100644 lib/getopt.c + create mode 100644 lib/getopt.in.h + create mode 100644 lib/getopt1.c + create mode 100644 lib/getopt_int.h + create mode 100644 lib/gettext.h + create mode 100644 lib/stddef.in.h + create mode 100644 lib/unistd.in.h + create mode 100644 m4/00gnulib.m4 + create mode 100644 m4/extensions.m4 + create mode 100644 m4/getopt.m4 + create mode 100644 m4/gnulib-cache.m4 + create mode 100644 m4/gnulib-common.m4 + create mode 100644 m4/gnulib-comp.m4 + create mode 100644 m4/gnulib-tool.m4 + create mode 100644 m4/include_next.m4 + create mode 100644 m4/onceonly.m4 + create mode 100644 m4/stddef_h.m4 + create mode 100644 m4/unistd_h.m4 + create mode 100644 m4/wchar_t.m4 + create mode 100644 utils/link-warning.h + +diff --git a/lib/Makefile.am b/lib/Makefile.am +index 2c5b4df..09b655c 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -1,34 +1,220 @@ +-## Process this file with automake to produce Makefile.in +- +-lib_LTLIBRARIES = libtre.la +-libtre_la_LDFLAGS = -no-undefined -version-info 5:0:0 $(LDFLAGS) +-libtre_la_LIBADD = $(LTLIBINTL) +- +-noinst_HEADERS = \ +- tre-ast.h \ +- tre-compile.h \ +- tre-internal.h \ +- tre-match-utils.h \ +- tre-mem.h \ +- tre-parse.h \ +- tre-stack.h \ +- xmalloc.h +- +-libtre_la_SOURCES = \ +- tre-ast.c \ +- tre-compile.c \ +- tre-match-backtrack.c \ +- tre-match-parallel.c \ +- tre-mem.c \ +- tre-parse.c \ +- tre-stack.c \ +- regcomp.c \ +- regexec.c \ +- regerror.c +- +-if TRE_APPROX +-libtre_la_SOURCES += tre-match-approx.c +-endif TRE_APPROX +- +-dist_pkginclude_HEADERS = tre.h regex.h +-nodist_pkginclude_HEADERS = tre-config.h ++## DO NOT EDIT! GENERATED AUTOMATICALLY! ++## Process this file with automake to produce Makefile.in. ++# Copyright (C) 2002-2009 Free Software Foundation, Inc. ++# ++# This file is free software, distributed under the terms of the GNU ++# General Public License. As a special exception to the GNU General ++# Public License, this file may be distributed as part of a program ++# that contains a configuration script generated by Autoconf, under ++# the same distribution terms as the rest of that program. ++# ++# Generated by gnulib-tool. ++# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=utils --libtool --macro-prefix=gl --no-vc-files getopt-gnu ++ ++AUTOMAKE_OPTIONS = 1.5 gnits ++ ++SUBDIRS = ++noinst_HEADERS = ++noinst_LIBRARIES = ++noinst_LTLIBRARIES = ++EXTRA_DIST = ++BUILT_SOURCES = ++SUFFIXES = ++MOSTLYCLEANFILES = core *.stackdump ++MOSTLYCLEANDIRS = ++CLEANFILES = ++DISTCLEANFILES = ++MAINTAINERCLEANFILES = ++ ++AM_CPPFLAGS = ++AM_CFLAGS = ++ ++noinst_LTLIBRARIES += libgnu.la ++ ++libgnu_la_SOURCES = ++libgnu_la_LIBADD = $(gl_LTLIBOBJS) ++libgnu_la_DEPENDENCIES = $(gl_LTLIBOBJS) ++EXTRA_libgnu_la_SOURCES = ++libgnu_la_LDFLAGS = $(AM_LDFLAGS) ++ ++## begin gnulib module getopt-posix ++ ++BUILT_SOURCES += $(GETOPT_H) ++ ++# We need the following in order to create when the system ++# doesn't have one that works with the given compiler. ++getopt.h: getopt.in.h ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ ++ sed -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \ ++ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ ++ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ ++ -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \ ++ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ ++ < $(srcdir)/getopt.in.h; \ ++ } > $@-t && \ ++ mv -f $@-t $@ ++MOSTLYCLEANFILES += getopt.h getopt.h-t ++ ++EXTRA_DIST += getopt.c getopt.in.h getopt1.c getopt_int.h ++ ++EXTRA_libgnu_la_SOURCES += getopt.c getopt1.c ++ ++## end gnulib module getopt-posix ++ ++## begin gnulib module gettext-h ++ ++libgnu_la_SOURCES += gettext.h ++ ++## end gnulib module gettext-h ++ ++## begin gnulib module link-warning ++ ++LINK_WARNING_H=$(top_srcdir)/utils/link-warning.h ++ ++EXTRA_DIST += $(top_srcdir)/utils/link-warning.h ++ ++## end gnulib module link-warning ++ ++## begin gnulib module stddef ++ ++BUILT_SOURCES += $(STDDEF_H) ++ ++# We need the following in order to create when the system ++# doesn't have one that works with the given compiler. ++stddef.h: stddef.in.h ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ ++ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ ++ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ ++ -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ ++ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ ++ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ ++ < $(srcdir)/stddef.in.h; \ ++ } > $@-t && \ ++ mv $@-t $@ ++MOSTLYCLEANFILES += stddef.h stddef.h-t ++ ++EXTRA_DIST += stddef.in.h ++ ++## end gnulib module stddef ++ ++## begin gnulib module unistd ++ ++BUILT_SOURCES += unistd.h ++ ++# We need the following in order to create an empty placeholder for ++# when the system doesn't have one. ++unistd.h: unistd.in.h ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ ++ sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \ ++ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ ++ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ ++ -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ ++ -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \ ++ -e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \ ++ -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \ ++ -e 's|@''GNULIB_DUP3''@|$(GNULIB_DUP3)|g' \ ++ -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \ ++ -e 's|@''GNULIB_EUIDACCESS''@|$(GNULIB_EUIDACCESS)|g' \ ++ -e 's|@''GNULIB_FACCESSAT''@|$(GNULIB_FACCESSAT)|g' \ ++ -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \ ++ -e 's|@''GNULIB_FCHOWNAT''@|$(GNULIB_FCHOWNAT)|g' \ ++ -e 's|@''GNULIB_FSYNC''@|$(GNULIB_FSYNC)|g' \ ++ -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \ ++ -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \ ++ -e 's|@''GNULIB_GETDOMAINNAME''@|$(GNULIB_GETDOMAINNAME)|g' \ ++ -e 's|@''GNULIB_GETDTABLESIZE''@|$(GNULIB_GETDTABLESIZE)|g' \ ++ -e 's|@''GNULIB_GETGROUPS''@|$(GNULIB_GETGROUPS)|g' \ ++ -e 's|@''GNULIB_GETHOSTNAME''@|$(GNULIB_GETHOSTNAME)|g' \ ++ -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \ ++ -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \ ++ -e 's|@''GNULIB_GETUSERSHELL''@|$(GNULIB_GETUSERSHELL)|g' \ ++ -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \ ++ -e 's|@''GNULIB_LINK''@|$(GNULIB_LINK)|g' \ ++ -e 's|@''GNULIB_LINKAT''@|$(GNULIB_LINKAT)|g' \ ++ -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \ ++ -e 's|@''GNULIB_PIPE2''@|$(GNULIB_PIPE2)|g' \ ++ -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \ ++ -e 's|@''GNULIB_READLINKAT''@|$(GNULIB_READLINKAT)|g' \ ++ -e 's|@''GNULIB_RMDIR''@|$(GNULIB_RMDIR)|g' \ ++ -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \ ++ -e 's|@''GNULIB_SYMLINK''@|$(GNULIB_SYMLINK)|g' \ ++ -e 's|@''GNULIB_SYMLINKAT''@|$(GNULIB_SYMLINKAT)|g' \ ++ -e 's|@''GNULIB_UNISTD_H_GETOPT''@|$(GNULIB_UNISTD_H_GETOPT)|g' \ ++ -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \ ++ -e 's|@''GNULIB_UNLINK''@|$(GNULIB_UNLINK)|g' \ ++ -e 's|@''GNULIB_UNLINKAT''@|$(GNULIB_UNLINKAT)|g' \ ++ -e 's|@''GNULIB_WRITE''@|$(GNULIB_WRITE)|g' \ ++ -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \ ++ -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \ ++ -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ ++ -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \ ++ -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \ ++ -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ ++ -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ ++ -e 's|@''HAVE_GETDOMAINNAME''@|$(HAVE_GETDOMAINNAME)|g' \ ++ -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ ++ -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ ++ -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ ++ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ ++ -e 's|@''HAVE_GETUSERSHELL''@|$(HAVE_GETUSERSHELL)|g' \ ++ -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ ++ -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \ ++ -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \ ++ -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \ ++ -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \ ++ -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ ++ -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ ++ -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ ++ -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ ++ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ ++ -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ ++ -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ ++ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ ++ -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ ++ -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ ++ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ ++ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ ++ -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ ++ -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ ++ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ ++ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ ++ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ ++ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ ++ -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \ ++ -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \ ++ -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \ ++ -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ ++ -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ ++ -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ ++ -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ ++ -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ ++ -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \ ++ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \ ++ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \ ++ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ ++ < $(srcdir)/unistd.in.h; \ ++ } > $@-t && \ ++ mv $@-t $@ ++MOSTLYCLEANFILES += unistd.h unistd.h-t ++ ++EXTRA_DIST += unistd.in.h ++ ++## end gnulib module unistd ++ ++## begin gnulib module dummy ++ ++libgnu_la_SOURCES += dummy.c ++ ++## end gnulib module dummy ++ ++ ++mostlyclean-local: mostlyclean-generic ++ @for dir in '' $(MOSTLYCLEANDIRS); do \ ++ if test -n "$$dir" && test -d $$dir; then \ ++ echo "rmdir $$dir"; rmdir $$dir; \ ++ fi; \ ++ done; \ ++ : +diff --git a/lib/Makefile.am~ b/lib/Makefile.am~ +new file mode 100644 +index 0000000..2c5b4df +--- /dev/null ++++ b/lib/Makefile.am~ +@@ -0,0 +1,34 @@ ++## Process this file with automake to produce Makefile.in ++ ++lib_LTLIBRARIES = libtre.la ++libtre_la_LDFLAGS = -no-undefined -version-info 5:0:0 $(LDFLAGS) ++libtre_la_LIBADD = $(LTLIBINTL) ++ ++noinst_HEADERS = \ ++ tre-ast.h \ ++ tre-compile.h \ ++ tre-internal.h \ ++ tre-match-utils.h \ ++ tre-mem.h \ ++ tre-parse.h \ ++ tre-stack.h \ ++ xmalloc.h ++ ++libtre_la_SOURCES = \ ++ tre-ast.c \ ++ tre-compile.c \ ++ tre-match-backtrack.c \ ++ tre-match-parallel.c \ ++ tre-mem.c \ ++ tre-parse.c \ ++ tre-stack.c \ ++ regcomp.c \ ++ regexec.c \ ++ regerror.c ++ ++if TRE_APPROX ++libtre_la_SOURCES += tre-match-approx.c ++endif TRE_APPROX ++ ++dist_pkginclude_HEADERS = tre.h regex.h ++nodist_pkginclude_HEADERS = tre-config.h +diff --git a/lib/dummy.c b/lib/dummy.c +new file mode 100644 +index 0000000..ccb5c26 +--- /dev/null ++++ b/lib/dummy.c +@@ -0,0 +1,42 @@ ++/* A dummy file, to prevent empty libraries from breaking builds. ++ Copyright (C) 2004, 2007 Free Software Foundation, Inc. ++ ++ 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 . */ ++ ++/* Some systems, reportedly OpenBSD and Mac OS X, refuse to create ++ libraries without any object files. You might get an error like: ++ ++ > ar cru .libs/libgl.a ++ > ar: no archive members specified ++ ++ Compiling this file, and adding its object file to the library, will ++ prevent the library from being empty. */ ++ ++/* Some systems, such as Solaris with cc 5.0, refuse to work with libraries ++ that don't export any symbol. You might get an error like: ++ ++ > cc ... libgnu.a ++ > ild: (bad file) garbled symbol table in archive ../gllib/libgnu.a ++ ++ Compiling this file, and adding its object file to the library, will ++ prevent the library from exporting no symbols. */ ++ ++#ifdef __sun ++/* This declaration ensures that the library will export at least 1 symbol. */ ++int gl_dummy_symbol; ++#else ++/* This declaration is solely to ensure that after preprocessing ++ this file is never empty. */ ++typedef int dummy; ++#endif +diff --git a/lib/getopt.c b/lib/getopt.c +new file mode 100644 +index 0000000..797d166 +--- /dev/null ++++ b/lib/getopt.c +@@ -0,0 +1,1187 @@ ++/* Getopt for GNU. ++ NOTE: getopt is now part of the C library, so if you don't know what ++ "Keep this file name-space clean" means, talk to drepper at gnu.org ++ before changing it! ++ Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002,2003,2004,2006,2008,2009 ++ Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ 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 . */ ++ ++#ifndef _LIBC ++# include ++#endif ++ ++#include "getopt.h" ++ ++#include ++#include ++#include ++#include ++ ++#ifdef _LIBC ++# include ++#else ++# include "gettext.h" ++# define _(msgid) gettext (msgid) ++#endif ++ ++#if defined _LIBC && defined USE_IN_LIBIO ++# include ++#endif ++ ++#ifndef attribute_hidden ++# define attribute_hidden ++#endif ++ ++/* Unlike standard Unix `getopt', functions like `getopt_long' ++ let the user intersperse the options with the other arguments. ++ ++ As `getopt_long' works, it permutes the elements of ARGV so that, ++ when it is done, all the options precede everything else. Thus ++ all application programs are extended to handle flexible argument order. ++ ++ Using `getopt' or setting the environment variable POSIXLY_CORRECT ++ disables permutation. ++ Then the application's behavior is completely standard. ++ ++ GNU application programs can use a third alternative mode in which ++ they can distinguish the relative order of options and other arguments. */ ++ ++#include "getopt_int.h" ++ ++/* For communication from `getopt' to the caller. ++ When `getopt' finds an option that takes an argument, ++ the argument value is returned here. ++ Also, when `ordering' is RETURN_IN_ORDER, ++ each non-option ARGV-element is returned here. */ ++ ++char *optarg; ++ ++/* Index in ARGV of the next element to be scanned. ++ This is used for communication to and from the caller ++ and for communication between successive calls to `getopt'. ++ ++ On entry to `getopt', zero means this is the first call; initialize. ++ ++ When `getopt' returns -1, this is the index of the first of the ++ non-option elements that the caller should itself scan. ++ ++ Otherwise, `optind' communicates from one call to the next ++ how much of ARGV has been scanned so far. */ ++ ++/* 1003.2 says this must be 1 before any call. */ ++int optind = 1; ++ ++/* Callers store zero here to inhibit the error message ++ for unrecognized options. */ ++ ++int opterr = 1; ++ ++/* Set to an option character which was unrecognized. ++ This must be initialized on some systems to avoid linking in the ++ system's own getopt implementation. */ ++ ++int optopt = '?'; ++ ++/* Keep a global copy of all internal members of getopt_data. */ ++ ++static struct _getopt_data getopt_data; ++ ++ ++#if defined HAVE_DECL_GETENV && !HAVE_DECL_GETENV ++extern char *getenv (); ++#endif ++ ++#ifdef _LIBC ++/* Stored original parameters. ++ XXX This is no good solution. We should rather copy the args so ++ that we can compare them later. But we must not use malloc(3). */ ++extern int __libc_argc; ++extern char **__libc_argv; ++ ++/* Bash 2.0 gives us an environment variable containing flags ++ indicating ARGV elements that should not be considered arguments. */ ++ ++# ifdef USE_NONOPTION_FLAGS ++/* Defined in getopt_init.c */ ++extern char *__getopt_nonoption_flags; ++# endif ++ ++# ifdef USE_NONOPTION_FLAGS ++# define SWAP_FLAGS(ch1, ch2) \ ++ if (d->__nonoption_flags_len > 0) \ ++ { \ ++ char __tmp = __getopt_nonoption_flags[ch1]; \ ++ __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \ ++ __getopt_nonoption_flags[ch2] = __tmp; \ ++ } ++# else ++# define SWAP_FLAGS(ch1, ch2) ++# endif ++#else /* !_LIBC */ ++# define SWAP_FLAGS(ch1, ch2) ++#endif /* _LIBC */ ++ ++/* Exchange two adjacent subsequences of ARGV. ++ One subsequence is elements [first_nonopt,last_nonopt) ++ which contains all the non-options that have been skipped so far. ++ The other is elements [last_nonopt,optind), which contains all ++ the options processed since those non-options were skipped. ++ ++ `first_nonopt' and `last_nonopt' are relocated so that they describe ++ the new indices of the non-options in ARGV after they are moved. */ ++ ++static void ++exchange (char **argv, struct _getopt_data *d) ++{ ++ int bottom = d->__first_nonopt; ++ int middle = d->__last_nonopt; ++ int top = d->optind; ++ char *tem; ++ ++ /* Exchange the shorter segment with the far end of the longer segment. ++ That puts the shorter segment into the right place. ++ It leaves the longer segment in the right place overall, ++ but it consists of two parts that need to be swapped next. */ ++ ++#if defined _LIBC && defined USE_NONOPTION_FLAGS ++ /* First make sure the handling of the `__getopt_nonoption_flags' ++ string can work normally. Our top argument must be in the range ++ of the string. */ ++ if (d->__nonoption_flags_len > 0 && top >= d->__nonoption_flags_max_len) ++ { ++ /* We must extend the array. The user plays games with us and ++ presents new arguments. */ ++ char *new_str = malloc (top + 1); ++ if (new_str == NULL) ++ d->__nonoption_flags_len = d->__nonoption_flags_max_len = 0; ++ else ++ { ++ memset (__mempcpy (new_str, __getopt_nonoption_flags, ++ d->__nonoption_flags_max_len), ++ '\0', top + 1 - d->__nonoption_flags_max_len); ++ d->__nonoption_flags_max_len = top + 1; ++ __getopt_nonoption_flags = new_str; ++ } ++ } ++#endif ++ ++ while (top > middle && middle > bottom) ++ { ++ if (top - middle > middle - bottom) ++ { ++ /* Bottom segment is the short one. */ ++ int len = middle - bottom; ++ register int i; ++ ++ /* Swap it with the top part of the top segment. */ ++ for (i = 0; i < len; i++) ++ { ++ tem = argv[bottom + i]; ++ argv[bottom + i] = argv[top - (middle - bottom) + i]; ++ argv[top - (middle - bottom) + i] = tem; ++ SWAP_FLAGS (bottom + i, top - (middle - bottom) + i); ++ } ++ /* Exclude the moved bottom segment from further swapping. */ ++ top -= len; ++ } ++ else ++ { ++ /* Top segment is the short one. */ ++ int len = top - middle; ++ register int i; ++ ++ /* Swap it with the bottom part of the bottom segment. */ ++ for (i = 0; i < len; i++) ++ { ++ tem = argv[bottom + i]; ++ argv[bottom + i] = argv[middle + i]; ++ argv[middle + i] = tem; ++ SWAP_FLAGS (bottom + i, middle + i); ++ } ++ /* Exclude the moved top segment from further swapping. */ ++ bottom += len; ++ } ++ } ++ ++ /* Update records for the slots the non-options now occupy. */ ++ ++ d->__first_nonopt += (d->optind - d->__last_nonopt); ++ d->__last_nonopt = d->optind; ++} ++ ++/* Initialize the internal data when the first call is made. */ ++ ++static const char * ++_getopt_initialize (int argc _UNUSED_PARAMETER_, ++ char **argv _UNUSED_PARAMETER_, const char *optstring, ++ int posixly_correct, struct _getopt_data *d) ++{ ++ /* Start processing options with ARGV-element 1 (since ARGV-element 0 ++ is the program name); the sequence of previously skipped ++ non-option ARGV-elements is empty. */ ++ ++ d->__first_nonopt = d->__last_nonopt = d->optind; ++ ++ d->__nextchar = NULL; ++ ++ d->__posixly_correct = posixly_correct || !!getenv ("POSIXLY_CORRECT"); ++ ++ /* Determine how to handle the ordering of options and nonoptions. */ ++ ++ if (optstring[0] == '-') ++ { ++ d->__ordering = RETURN_IN_ORDER; ++ ++optstring; ++ } ++ else if (optstring[0] == '+') ++ { ++ d->__ordering = REQUIRE_ORDER; ++ ++optstring; ++ } ++ else if (d->__posixly_correct) ++ d->__ordering = REQUIRE_ORDER; ++ else ++ d->__ordering = PERMUTE; ++ ++#if defined _LIBC && defined USE_NONOPTION_FLAGS ++ if (!d->__posixly_correct ++ && argc == __libc_argc && argv == __libc_argv) ++ { ++ if (d->__nonoption_flags_max_len == 0) ++ { ++ if (__getopt_nonoption_flags == NULL ++ || __getopt_nonoption_flags[0] == '\0') ++ d->__nonoption_flags_max_len = -1; ++ else ++ { ++ const char *orig_str = __getopt_nonoption_flags; ++ int len = d->__nonoption_flags_max_len = strlen (orig_str); ++ if (d->__nonoption_flags_max_len < argc) ++ d->__nonoption_flags_max_len = argc; ++ __getopt_nonoption_flags = ++ (char *) malloc (d->__nonoption_flags_max_len); ++ if (__getopt_nonoption_flags == NULL) ++ d->__nonoption_flags_max_len = -1; ++ else ++ memset (__mempcpy (__getopt_nonoption_flags, orig_str, len), ++ '\0', d->__nonoption_flags_max_len - len); ++ } ++ } ++ d->__nonoption_flags_len = d->__nonoption_flags_max_len; ++ } ++ else ++ d->__nonoption_flags_len = 0; ++#endif ++ ++ return optstring; ++} ++ ++/* Scan elements of ARGV (whose length is ARGC) for option characters ++ given in OPTSTRING. ++ ++ If an element of ARGV starts with '-', and is not exactly "-" or "--", ++ then it is an option element. The characters of this element ++ (aside from the initial '-') are option characters. If `getopt' ++ is called repeatedly, it returns successively each of the option characters ++ from each of the option elements. ++ ++ If `getopt' finds another option character, it returns that character, ++ updating `optind' and `nextchar' so that the next call to `getopt' can ++ resume the scan with the following option character or ARGV-element. ++ ++ If there are no more option characters, `getopt' returns -1. ++ Then `optind' is the index in ARGV of the first ARGV-element ++ that is not an option. (The ARGV-elements have been permuted ++ so that those that are not options now come last.) ++ ++ OPTSTRING is a string containing the legitimate option characters. ++ If an option character is seen that is not listed in OPTSTRING, ++ return '?' after printing an error message. If you set `opterr' to ++ zero, the error message is suppressed but we still return '?'. ++ ++ If a char in OPTSTRING is followed by a colon, that means it wants an arg, ++ so the following text in the same ARGV-element, or the text of the following ++ ARGV-element, is returned in `optarg'. Two colons mean an option that ++ wants an optional arg; if there is text in the current ARGV-element, ++ it is returned in `optarg', otherwise `optarg' is set to zero. ++ ++ If OPTSTRING starts with `-' or `+', it requests different methods of ++ handling the non-option ARGV-elements. ++ See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above. ++ ++ Long-named options begin with `--' instead of `-'. ++ Their names may be abbreviated as long as the abbreviation is unique ++ or is an exact match for some defined option. If they have an ++ argument, it follows the option name in the same ARGV-element, separated ++ from the option name by a `=', or else the in next ARGV-element. ++ When `getopt' finds a long-named option, it returns 0 if that option's ++ `flag' field is nonzero, the value of the option's `val' field ++ if the `flag' field is zero. ++ ++ LONGOPTS is a vector of `struct option' terminated by an ++ element containing a name which is zero. ++ ++ LONGIND returns the index in LONGOPT of the long-named option found. ++ It is only valid when a long-named option has been found by the most ++ recent call. ++ ++ If LONG_ONLY is nonzero, '-' as well as '--' can introduce ++ long-named options. ++ ++ If POSIXLY_CORRECT is nonzero, behave as if the POSIXLY_CORRECT ++ environment variable were set. */ ++ ++int ++_getopt_internal_r (int argc, char **argv, const char *optstring, ++ const struct option *longopts, int *longind, ++ int long_only, int posixly_correct, struct _getopt_data *d) ++{ ++ int print_errors = d->opterr; ++ if (optstring[0] == ':') ++ print_errors = 0; ++ ++ if (argc < 1) ++ return -1; ++ ++ d->optarg = NULL; ++ ++ if (d->optind == 0 || !d->__initialized) ++ { ++ if (d->optind == 0) ++ d->optind = 1; /* Don't scan ARGV[0], the program name. */ ++ optstring = _getopt_initialize (argc, argv, optstring, ++ posixly_correct, d); ++ d->__initialized = 1; ++ } ++ ++ /* Test whether ARGV[optind] points to a non-option argument. ++ Either it does not have option syntax, or there is an environment flag ++ from the shell indicating it is not an option. The later information ++ is only used when the used in the GNU libc. */ ++#if defined _LIBC && defined USE_NONOPTION_FLAGS ++# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0' \ ++ || (d->optind < d->__nonoption_flags_len \ ++ && __getopt_nonoption_flags[d->optind] == '1')) ++#else ++# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0') ++#endif ++ ++ if (d->__nextchar == NULL || *d->__nextchar == '\0') ++ { ++ /* Advance to the next ARGV-element. */ ++ ++ /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been ++ moved back by the user (who may also have changed the arguments). */ ++ if (d->__last_nonopt > d->optind) ++ d->__last_nonopt = d->optind; ++ if (d->__first_nonopt > d->optind) ++ d->__first_nonopt = d->optind; ++ ++ if (d->__ordering == PERMUTE) ++ { ++ /* If we have just processed some options following some non-options, ++ exchange them so that the options come first. */ ++ ++ if (d->__first_nonopt != d->__last_nonopt ++ && d->__last_nonopt != d->optind) ++ exchange ((char **) argv, d); ++ else if (d->__last_nonopt != d->optind) ++ d->__first_nonopt = d->optind; ++ ++ /* Skip any additional non-options ++ and extend the range of non-options previously skipped. */ ++ ++ while (d->optind < argc && NONOPTION_P) ++ d->optind++; ++ d->__last_nonopt = d->optind; ++ } ++ ++ /* The special ARGV-element `--' means premature end of options. ++ Skip it like a null option, ++ then exchange with previous non-options as if it were an option, ++ then skip everything else like a non-option. */ ++ ++ if (d->optind != argc && !strcmp (argv[d->optind], "--")) ++ { ++ d->optind++; ++ ++ if (d->__first_nonopt != d->__last_nonopt ++ && d->__last_nonopt != d->optind) ++ exchange ((char **) argv, d); ++ else if (d->__first_nonopt == d->__last_nonopt) ++ d->__first_nonopt = d->optind; ++ d->__last_nonopt = argc; ++ ++ d->optind = argc; ++ } ++ ++ /* If we have done all the ARGV-elements, stop the scan ++ and back over any non-options that we skipped and permuted. */ ++ ++ if (d->optind == argc) ++ { ++ /* Set the next-arg-index to point at the non-options ++ that we previously skipped, so the caller will digest them. */ ++ if (d->__first_nonopt != d->__last_nonopt) ++ d->optind = d->__first_nonopt; ++ return -1; ++ } ++ ++ /* If we have come to a non-option and did not permute it, ++ either stop the scan or describe it to the caller and pass it by. */ ++ ++ if (NONOPTION_P) ++ { ++ if (d->__ordering == REQUIRE_ORDER) ++ return -1; ++ d->optarg = argv[d->optind++]; ++ return 1; ++ } ++ ++ /* We have found another option-ARGV-element. ++ Skip the initial punctuation. */ ++ ++ d->__nextchar = (argv[d->optind] + 1 ++ + (longopts != NULL && argv[d->optind][1] == '-')); ++ } ++ ++ /* Decode the current option-ARGV-element. */ ++ ++ /* Check whether the ARGV-element is a long option. ++ ++ If long_only and the ARGV-element has the form "-f", where f is ++ a valid short option, don't consider it an abbreviated form of ++ a long option that starts with f. Otherwise there would be no ++ way to give the -f short option. ++ ++ On the other hand, if there's a long option "fubar" and ++ the ARGV-element is "-fu", do consider that an abbreviation of ++ the long option, just like "--fu", and not "-f" with arg "u". ++ ++ This distinction seems to be the most useful approach. */ ++ ++ if (longopts != NULL ++ && (argv[d->optind][1] == '-' ++ || (long_only && (argv[d->optind][2] ++ || !strchr (optstring, argv[d->optind][1]))))) ++ { ++ char *nameend; ++ const struct option *p; ++ const struct option *pfound = NULL; ++ int exact = 0; ++ int ambig = 0; ++ int indfound = -1; ++ int option_index; ++ ++ for (nameend = d->__nextchar; *nameend && *nameend != '='; nameend++) ++ /* Do nothing. */ ; ++ ++ /* Test all long options for either exact match ++ or abbreviated matches. */ ++ for (p = longopts, option_index = 0; p->name; p++, option_index++) ++ if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar)) ++ { ++ if ((unsigned int) (nameend - d->__nextchar) ++ == (unsigned int) strlen (p->name)) ++ { ++ /* Exact match found. */ ++ pfound = p; ++ indfound = option_index; ++ exact = 1; ++ break; ++ } ++ else if (pfound == NULL) ++ { ++ /* First nonexact match found. */ ++ pfound = p; ++ indfound = option_index; ++ } ++ else if (long_only ++ || pfound->has_arg != p->has_arg ++ || pfound->flag != p->flag ++ || pfound->val != p->val) ++ /* Second or later nonexact match found. */ ++ ambig = 1; ++ } ++ ++ if (ambig && !exact) ++ { ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ ++ if (__asprintf (&buf, _("%s: option `%s' is ambiguous\n"), ++ argv[0], argv[d->optind]) >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#else ++ fprintf (stderr, _("%s: option `%s' is ambiguous\n"), ++ argv[0], argv[d->optind]); ++#endif ++ } ++ d->__nextchar += strlen (d->__nextchar); ++ d->optind++; ++ d->optopt = 0; ++ return '?'; ++ } ++ ++ if (pfound != NULL) ++ { ++ option_index = indfound; ++ d->optind++; ++ if (*nameend) ++ { ++ /* Don't test has_arg with >, because some C compilers don't ++ allow it to be used on enums. */ ++ if (pfound->has_arg) ++ d->optarg = nameend + 1; ++ else ++ { ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ int n; ++#endif ++ ++ if (argv[d->optind - 1][1] == '-') ++ { ++ /* --option */ ++#if defined _LIBC && defined USE_IN_LIBIO ++ n = __asprintf (&buf, _("\ ++%s: option `--%s' doesn't allow an argument\n"), ++ argv[0], pfound->name); ++#else ++ fprintf (stderr, _("\ ++%s: option `--%s' doesn't allow an argument\n"), ++ argv[0], pfound->name); ++#endif ++ } ++ else ++ { ++ /* +option or -option */ ++#if defined _LIBC && defined USE_IN_LIBIO ++ n = __asprintf (&buf, _("\ ++%s: option `%c%s' doesn't allow an argument\n"), ++ argv[0], argv[d->optind - 1][0], ++ pfound->name); ++#else ++ fprintf (stderr, _("\ ++%s: option `%c%s' doesn't allow an argument\n"), ++ argv[0], argv[d->optind - 1][0], ++ pfound->name); ++#endif ++ } ++ ++#if defined _LIBC && defined USE_IN_LIBIO ++ if (n >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 ++ |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#endif ++ } ++ ++ d->__nextchar += strlen (d->__nextchar); ++ ++ d->optopt = pfound->val; ++ return '?'; ++ } ++ } ++ else if (pfound->has_arg == 1) ++ { ++ if (d->optind < argc) ++ d->optarg = argv[d->optind++]; ++ else ++ { ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ ++ if (__asprintf (&buf, _("\ ++%s: option `%s' requires an argument\n"), ++ argv[0], argv[d->optind - 1]) >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 ++ |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#else ++ fprintf (stderr, ++ _("%s: option `%s' requires an argument\n"), ++ argv[0], argv[d->optind - 1]); ++#endif ++ } ++ d->__nextchar += strlen (d->__nextchar); ++ d->optopt = pfound->val; ++ return optstring[0] == ':' ? ':' : '?'; ++ } ++ } ++ d->__nextchar += strlen (d->__nextchar); ++ if (longind != NULL) ++ *longind = option_index; ++ if (pfound->flag) ++ { ++ *(pfound->flag) = pfound->val; ++ return 0; ++ } ++ return pfound->val; ++ } ++ ++ /* Can't find it as a long option. If this is not getopt_long_only, ++ or the option starts with '--' or is not a valid short ++ option, then it's an error. ++ Otherwise interpret it as a short option. */ ++ if (!long_only || argv[d->optind][1] == '-' ++ || strchr (optstring, *d->__nextchar) == NULL) ++ { ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ int n; ++#endif ++ ++ if (argv[d->optind][1] == '-') ++ { ++ /* --option */ ++#if defined _LIBC && defined USE_IN_LIBIO ++ n = __asprintf (&buf, _("%s: unrecognized option `--%s'\n"), ++ argv[0], d->__nextchar); ++#else ++ fprintf (stderr, _("%s: unrecognized option `--%s'\n"), ++ argv[0], d->__nextchar); ++#endif ++ } ++ else ++ { ++ /* +option or -option */ ++#if defined _LIBC && defined USE_IN_LIBIO ++ n = __asprintf (&buf, _("%s: unrecognized option `%c%s'\n"), ++ argv[0], argv[d->optind][0], d->__nextchar); ++#else ++ fprintf (stderr, _("%s: unrecognized option `%c%s'\n"), ++ argv[0], argv[d->optind][0], d->__nextchar); ++#endif ++ } ++ ++#if defined _LIBC && defined USE_IN_LIBIO ++ if (n >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#endif ++ } ++ d->__nextchar = (char *) ""; ++ d->optind++; ++ d->optopt = 0; ++ return '?'; ++ } ++ } ++ ++ /* Look at and handle the next short option-character. */ ++ ++ { ++ char c = *d->__nextchar++; ++ char *temp = strchr (optstring, c); ++ ++ /* Increment `optind' when we start to process its last character. */ ++ if (*d->__nextchar == '\0') ++ ++d->optind; ++ ++ if (temp == NULL || c == ':') ++ { ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ int n; ++#endif ++ ++ if (d->__posixly_correct) ++ { ++ /* 1003.2 specifies the format of this message. */ ++#if defined _LIBC && defined USE_IN_LIBIO ++ n = __asprintf (&buf, _("%s: illegal option -- %c\n"), ++ argv[0], c); ++#else ++ fprintf (stderr, _("%s: illegal option -- %c\n"), argv[0], c); ++#endif ++ } ++ else ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ n = __asprintf (&buf, _("%s: invalid option -- %c\n"), ++ argv[0], c); ++#else ++ fprintf (stderr, _("%s: invalid option -- %c\n"), argv[0], c); ++#endif ++ } ++ ++#if defined _LIBC && defined USE_IN_LIBIO ++ if (n >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#endif ++ } ++ d->optopt = c; ++ return '?'; ++ } ++ /* Convenience. Treat POSIX -W foo same as long option --foo */ ++ if (temp[0] == 'W' && temp[1] == ';') ++ { ++ char *nameend; ++ const struct option *p; ++ const struct option *pfound = NULL; ++ int exact = 0; ++ int ambig = 0; ++ int indfound = 0; ++ int option_index; ++ ++ /* This is an option that requires an argument. */ ++ if (*d->__nextchar != '\0') ++ { ++ d->optarg = d->__nextchar; ++ /* If we end this ARGV-element by taking the rest as an arg, ++ we must advance to the next element now. */ ++ d->optind++; ++ } ++ else if (d->optind == argc) ++ { ++ if (print_errors) ++ { ++ /* 1003.2 specifies the format of this message. */ ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ ++ if (__asprintf (&buf, ++ _("%s: option requires an argument -- %c\n"), ++ argv[0], c) >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#else ++ fprintf (stderr, _("%s: option requires an argument -- %c\n"), ++ argv[0], c); ++#endif ++ } ++ d->optopt = c; ++ if (optstring[0] == ':') ++ c = ':'; ++ else ++ c = '?'; ++ return c; ++ } ++ else ++ /* We already incremented `d->optind' once; ++ increment it again when taking next ARGV-elt as argument. */ ++ d->optarg = argv[d->optind++]; ++ ++ /* optarg is now the argument, see if it's in the ++ table of longopts. */ ++ ++ for (d->__nextchar = nameend = d->optarg; *nameend && *nameend != '='; ++ nameend++) ++ /* Do nothing. */ ; ++ ++ /* Test all long options for either exact match ++ or abbreviated matches. */ ++ for (p = longopts, option_index = 0; p->name; p++, option_index++) ++ if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar)) ++ { ++ if ((unsigned int) (nameend - d->__nextchar) == strlen (p->name)) ++ { ++ /* Exact match found. */ ++ pfound = p; ++ indfound = option_index; ++ exact = 1; ++ break; ++ } ++ else if (pfound == NULL) ++ { ++ /* First nonexact match found. */ ++ pfound = p; ++ indfound = option_index; ++ } ++ else ++ /* Second or later nonexact match found. */ ++ ambig = 1; ++ } ++ if (ambig && !exact) ++ { ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ ++ if (__asprintf (&buf, _("%s: option `-W %s' is ambiguous\n"), ++ argv[0], argv[d->optind]) >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#else ++ fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"), ++ argv[0], argv[d->optind]); ++#endif ++ } ++ d->__nextchar += strlen (d->__nextchar); ++ d->optind++; ++ return '?'; ++ } ++ if (pfound != NULL) ++ { ++ option_index = indfound; ++ if (*nameend) ++ { ++ /* Don't test has_arg with >, because some C compilers don't ++ allow it to be used on enums. */ ++ if (pfound->has_arg) ++ d->optarg = nameend + 1; ++ else ++ { ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ ++ if (__asprintf (&buf, _("\ ++%s: option `-W %s' doesn't allow an argument\n"), ++ argv[0], pfound->name) >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 ++ |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#else ++ fprintf (stderr, _("\ ++%s: option `-W %s' doesn't allow an argument\n"), ++ argv[0], pfound->name); ++#endif ++ } ++ ++ d->__nextchar += strlen (d->__nextchar); ++ return '?'; ++ } ++ } ++ else if (pfound->has_arg == 1) ++ { ++ if (d->optind < argc) ++ d->optarg = argv[d->optind++]; ++ else ++ { ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ ++ if (__asprintf (&buf, _("\ ++%s: option `%s' requires an argument\n"), ++ argv[0], argv[d->optind - 1]) >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 ++ |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#else ++ fprintf (stderr, ++ _("%s: option `%s' requires an argument\n"), ++ argv[0], argv[d->optind - 1]); ++#endif ++ } ++ d->__nextchar += strlen (d->__nextchar); ++ return optstring[0] == ':' ? ':' : '?'; ++ } ++ } ++ d->__nextchar += strlen (d->__nextchar); ++ if (longind != NULL) ++ *longind = option_index; ++ if (pfound->flag) ++ { ++ *(pfound->flag) = pfound->val; ++ return 0; ++ } ++ return pfound->val; ++ } ++ d->__nextchar = NULL; ++ return 'W'; /* Let the application handle it. */ ++ } ++ if (temp[1] == ':') ++ { ++ if (temp[2] == ':') ++ { ++ /* This is an option that accepts an argument optionally. */ ++ if (*d->__nextchar != '\0') ++ { ++ d->optarg = d->__nextchar; ++ d->optind++; ++ } ++ else ++ d->optarg = NULL; ++ d->__nextchar = NULL; ++ } ++ else ++ { ++ /* This is an option that requires an argument. */ ++ if (*d->__nextchar != '\0') ++ { ++ d->optarg = d->__nextchar; ++ /* If we end this ARGV-element by taking the rest as an arg, ++ we must advance to the next element now. */ ++ d->optind++; ++ } ++ else if (d->optind == argc) ++ { ++ if (print_errors) ++ { ++ /* 1003.2 specifies the format of this message. */ ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ ++ if (__asprintf (&buf, _("\ ++%s: option requires an argument -- %c\n"), ++ argv[0], c) >= 0) ++ { ++ _IO_flockfile (stderr); ++ ++ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; ++ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; ++ ++ __fxprintf (NULL, "%s", buf); ++ ++ ((_IO_FILE *) stderr)->_flags2 = old_flags2; ++ _IO_funlockfile (stderr); ++ ++ free (buf); ++ } ++#else ++ fprintf (stderr, ++ _("%s: option requires an argument -- %c\n"), ++ argv[0], c); ++#endif ++ } ++ d->optopt = c; ++ if (optstring[0] == ':') ++ c = ':'; ++ else ++ c = '?'; ++ } ++ else ++ /* We already incremented `optind' once; ++ increment it again when taking next ARGV-elt as argument. */ ++ d->optarg = argv[d->optind++]; ++ d->__nextchar = NULL; ++ } ++ } ++ return c; ++ } ++} ++ ++int ++_getopt_internal (int argc, char **argv, const char *optstring, ++ const struct option *longopts, int *longind, ++ int long_only, int posixly_correct) ++{ ++ int result; ++ ++ getopt_data.optind = optind; ++ getopt_data.opterr = opterr; ++ ++ result = _getopt_internal_r (argc, argv, optstring, longopts, longind, ++ long_only, posixly_correct, &getopt_data); ++ ++ optind = getopt_data.optind; ++ optarg = getopt_data.optarg; ++ optopt = getopt_data.optopt; ++ ++ return result; ++} ++ ++/* glibc gets a LSB-compliant getopt. ++ Standalone applications get a POSIX-compliant getopt. */ ++#if _LIBC ++enum { POSIXLY_CORRECT = 0 }; ++#else ++enum { POSIXLY_CORRECT = 1 }; ++#endif ++ ++int ++getopt (int argc, char *const *argv, const char *optstring) ++{ ++ return _getopt_internal (argc, (char **) argv, optstring, NULL, NULL, 0, ++ POSIXLY_CORRECT); ++} ++ ++ ++#ifdef TEST ++ ++/* Compile with -DTEST to make an executable for use in testing ++ the above definition of `getopt'. */ ++ ++int ++main (int argc, char **argv) ++{ ++ int c; ++ int digit_optind = 0; ++ ++ while (1) ++ { ++ int this_option_optind = optind ? optind : 1; ++ ++ c = getopt (argc, argv, "abc:d:0123456789"); ++ if (c == -1) ++ break; ++ ++ switch (c) ++ { ++ case '0': ++ case '1': ++ case '2': ++ case '3': ++ case '4': ++ case '5': ++ case '6': ++ case '7': ++ case '8': ++ case '9': ++ if (digit_optind != 0 && digit_optind != this_option_optind) ++ printf ("digits occur in two different argv-elements.\n"); ++ digit_optind = this_option_optind; ++ printf ("option %c\n", c); ++ break; ++ ++ case 'a': ++ printf ("option a\n"); ++ break; ++ ++ case 'b': ++ printf ("option b\n"); ++ break; ++ ++ case 'c': ++ printf ("option c with value `%s'\n", optarg); ++ break; ++ ++ case '?': ++ break; ++ ++ default: ++ printf ("?? getopt returned character code 0%o ??\n", c); ++ } ++ } ++ ++ if (optind < argc) ++ { ++ printf ("non-option ARGV-elements: "); ++ while (optind < argc) ++ printf ("%s ", argv[optind++]); ++ printf ("\n"); ++ } ++ ++ exit (0); ++} ++ ++#endif /* TEST */ +diff --git a/lib/getopt.in.h b/lib/getopt.in.h +new file mode 100644 +index 0000000..7377f3c +--- /dev/null ++++ b/lib/getopt.in.h +@@ -0,0 +1,247 @@ ++/* Declarations for getopt. ++ Copyright (C) 1989-1994,1996-1999,2001,2003,2004,2005,2006,2007,2009 ++ Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ 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 . */ ++ ++#ifndef _GL_GETOPT_H ++ ++#if __GNUC__ >= 3 ++ at PRAGMA_SYSTEM_HEADER@ ++#endif ++ ++/* The include_next requires a split double-inclusion guard. We must ++ also inform the replacement unistd.h to not recursively use ++ ; our definitions will be present soon enough. */ ++#if @HAVE_GETOPT_H@ ++# define _GL_SYSTEM_GETOPT ++# @INCLUDE_NEXT@ @NEXT_GETOPT_H@ ++# undef _GL_SYSTEM_GETOPT ++#endif ++ ++#ifndef _GL_GETOPT_H ++ ++#ifndef __need_getopt ++# define _GL_GETOPT_H 1 ++#endif ++ ++/* Standalone applications should #define __GETOPT_PREFIX to an ++ identifier that prefixes the external functions and variables ++ defined in this header. When this happens, include the ++ headers that might declare getopt so that they will not cause ++ confusion if included after this file (if the system had , ++ we have already included it). Then systematically rename ++ identifiers so that they do not collide with the system functions ++ and variables. Renaming avoids problems with some compilers and ++ linkers. */ ++#if defined __GETOPT_PREFIX && !defined __need_getopt ++# if !@HAVE_GETOPT_H@ ++# include ++# include ++# include ++# endif ++# undef __need_getopt ++# undef getopt ++# undef getopt_long ++# undef getopt_long_only ++# undef optarg ++# undef opterr ++# undef optind ++# undef optopt ++# undef option ++# define __GETOPT_CONCAT(x, y) x ## y ++# define __GETOPT_XCONCAT(x, y) __GETOPT_CONCAT (x, y) ++# define __GETOPT_ID(y) __GETOPT_XCONCAT (__GETOPT_PREFIX, y) ++# define getopt __GETOPT_ID (getopt) ++# define getopt_long __GETOPT_ID (getopt_long) ++# define getopt_long_only __GETOPT_ID (getopt_long_only) ++# define optarg __GETOPT_ID (optarg) ++# define opterr __GETOPT_ID (opterr) ++# define optind __GETOPT_ID (optind) ++# define optopt __GETOPT_ID (optopt) ++# define option __GETOPT_ID (option) ++# define _getopt_internal __GETOPT_ID (getopt_internal) ++#endif ++ ++/* Standalone applications get correct prototypes for getopt_long and ++ getopt_long_only; they declare "char **argv". libc uses prototypes ++ with "char *const *argv" that are incorrect because getopt_long and ++ getopt_long_only can permute argv; this is required for backward ++ compatibility (e.g., for LSB 2.0.1). ++ ++ This used to be `#if defined __GETOPT_PREFIX && !defined __need_getopt', ++ but it caused redefinition warnings if both unistd.h and getopt.h were ++ included, since unistd.h includes getopt.h having previously defined ++ __need_getopt. ++ ++ The only place where __getopt_argv_const is used is in definitions ++ of getopt_long and getopt_long_only below, but these are visible ++ only if __need_getopt is not defined, so it is quite safe to rewrite ++ the conditional as follows: ++*/ ++#if !defined __need_getopt ++# if defined __GETOPT_PREFIX ++# define __getopt_argv_const /* empty */ ++# else ++# define __getopt_argv_const const ++# endif ++#endif ++ ++/* If __GNU_LIBRARY__ is not already defined, either we are being used ++ standalone, or this is the first header included in the source file. ++ If we are being used with glibc, we need to include , but ++ that does not exist if we are standalone. So: if __GNU_LIBRARY__ is ++ not defined, include , which will pull in for us ++ if it's from glibc. (Why ctype.h? It's guaranteed to exist and it ++ doesn't flood the namespace with stuff the way some other headers do.) */ ++#if !defined __GNU_LIBRARY__ ++# include ++#endif ++ ++#ifndef __THROW ++# ifndef __GNUC_PREREQ ++# define __GNUC_PREREQ(maj, min) (0) ++# endif ++# if defined __cplusplus && __GNUC_PREREQ (2,8) ++# define __THROW throw () ++# else ++# define __THROW ++# endif ++#endif ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++/* For communication from `getopt' to the caller. ++ When `getopt' finds an option that takes an argument, ++ the argument value is returned here. ++ Also, when `ordering' is RETURN_IN_ORDER, ++ each non-option ARGV-element is returned here. */ ++ ++extern char *optarg; ++ ++/* Index in ARGV of the next element to be scanned. ++ This is used for communication to and from the caller ++ and for communication between successive calls to `getopt'. ++ ++ On entry to `getopt', zero means this is the first call; initialize. ++ ++ When `getopt' returns -1, this is the index of the first of the ++ non-option elements that the caller should itself scan. ++ ++ Otherwise, `optind' communicates from one call to the next ++ how much of ARGV has been scanned so far. */ ++ ++extern int optind; ++ ++/* Callers store zero here to inhibit the error message `getopt' prints ++ for unrecognized options. */ ++ ++extern int opterr; ++ ++/* Set to an option character which was unrecognized. */ ++ ++extern int optopt; ++ ++#ifndef __need_getopt ++/* Describe the long-named options requested by the application. ++ The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector ++ of `struct option' terminated by an element containing a name which is ++ zero. ++ ++ The field `has_arg' is: ++ no_argument (or 0) if the option does not take an argument, ++ required_argument (or 1) if the option requires an argument, ++ optional_argument (or 2) if the option takes an optional argument. ++ ++ If the field `flag' is not NULL, it points to a variable that is set ++ to the value given in the field `val' when the option is found, but ++ left unchanged if the option is not found. ++ ++ To have a long-named option do something other than set an `int' to ++ a compiled-in constant, such as set a value from `optarg', set the ++ option's `flag' field to zero and its `val' field to a nonzero ++ value (the equivalent single-letter option character, if there is ++ one). For long options that have a zero `flag' field, `getopt' ++ returns the contents of the `val' field. */ ++ ++struct option ++{ ++ const char *name; ++ /* has_arg can't be an enum because some compilers complain about ++ type mismatches in all the code that assumes it is an int. */ ++ int has_arg; ++ int *flag; ++ int val; ++}; ++ ++/* Names for the values of the `has_arg' field of `struct option'. */ ++ ++# define no_argument 0 ++# define required_argument 1 ++# define optional_argument 2 ++#endif /* need getopt */ ++ ++ ++/* Get definitions and prototypes for functions to process the ++ arguments in ARGV (ARGC of them, minus the program name) for ++ options given in OPTS. ++ ++ Return the option character from OPTS just read. Return -1 when ++ there are no more options. For unrecognized options, or options ++ missing arguments, `optopt' is set to the option letter, and '?' is ++ returned. ++ ++ The OPTS string is a list of characters which are recognized option ++ letters, optionally followed by colons, specifying that that letter ++ takes an argument, to be placed in `optarg'. ++ ++ If a letter in OPTS is followed by two colons, its argument is ++ optional. This behavior is specific to the GNU `getopt'. ++ ++ The argument `--' causes premature termination of argument ++ scanning, explicitly telling `getopt' that there are no more ++ options. ++ ++ If OPTS begins with `-', then non-option arguments are treated as ++ arguments to the option '\1'. This behavior is specific to the GNU ++ `getopt'. If OPTS begins with `+', or POSIXLY_CORRECT is set in ++ the environment, then do not permute arguments. */ ++ ++extern int getopt (int ___argc, char *const *___argv, const char *__shortopts) ++ __THROW; ++ ++#ifndef __need_getopt ++extern int getopt_long (int ___argc, char *__getopt_argv_const *___argv, ++ const char *__shortopts, ++ const struct option *__longopts, int *__longind) ++ __THROW; ++extern int getopt_long_only (int ___argc, char *__getopt_argv_const *___argv, ++ const char *__shortopts, ++ const struct option *__longopts, int *__longind) ++ __THROW; ++ ++#endif ++ ++#ifdef __cplusplus ++} ++#endif ++ ++/* Make sure we later can get all the definitions and declarations. */ ++#undef __need_getopt ++ ++#endif /* getopt.h */ ++#endif /* getopt.h */ +diff --git a/lib/getopt1.c b/lib/getopt1.c +new file mode 100644 +index 0000000..ba115c4 +--- /dev/null ++++ b/lib/getopt1.c +@@ -0,0 +1,170 @@ ++/* getopt_long and getopt_long_only entry points for GNU getopt. ++ Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2004,2006,2009 ++ Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ 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 . */ ++ ++#ifdef _LIBC ++# include ++#else ++# include ++# include "getopt.h" ++#endif ++#include "getopt_int.h" ++ ++#include ++ ++/* This needs to come after some library #include ++ to get __GNU_LIBRARY__ defined. */ ++#ifdef __GNU_LIBRARY__ ++#include ++#endif ++ ++#ifndef NULL ++#define NULL 0 ++#endif ++ ++int ++getopt_long (int argc, char *__getopt_argv_const *argv, const char *options, ++ const struct option *long_options, int *opt_index) ++{ ++ return _getopt_internal (argc, (char **) argv, options, long_options, ++ opt_index, 0, 0); ++} ++ ++int ++_getopt_long_r (int argc, char **argv, const char *options, ++ const struct option *long_options, int *opt_index, ++ struct _getopt_data *d) ++{ ++ return _getopt_internal_r (argc, argv, options, long_options, opt_index, ++ 0, 0, d); ++} ++ ++/* Like getopt_long, but '-' as well as '--' can indicate a long option. ++ If an option that starts with '-' (not '--') doesn't match a long option, ++ but does match a short option, it is parsed as a short option ++ instead. */ ++ ++int ++getopt_long_only (int argc, char *__getopt_argv_const *argv, ++ const char *options, ++ const struct option *long_options, int *opt_index) ++{ ++ return _getopt_internal (argc, (char **) argv, options, long_options, ++ opt_index, 1, 0); ++} ++ ++int ++_getopt_long_only_r (int argc, char **argv, const char *options, ++ const struct option *long_options, int *opt_index, ++ struct _getopt_data *d) ++{ ++ return _getopt_internal_r (argc, argv, options, long_options, opt_index, ++ 1, 0, d); ++} ++ ++ ++#ifdef TEST ++ ++#include ++ ++int ++main (int argc, char **argv) ++{ ++ int c; ++ int digit_optind = 0; ++ ++ while (1) ++ { ++ int this_option_optind = optind ? optind : 1; ++ int option_index = 0; ++ static const struct option long_options[] = ++ { ++ {"add", 1, 0, 0}, ++ {"append", 0, 0, 0}, ++ {"delete", 1, 0, 0}, ++ {"verbose", 0, 0, 0}, ++ {"create", 0, 0, 0}, ++ {"file", 1, 0, 0}, ++ {0, 0, 0, 0} ++ }; ++ ++ c = getopt_long (argc, argv, "abc:d:0123456789", ++ long_options, &option_index); ++ if (c == -1) ++ break; ++ ++ switch (c) ++ { ++ case 0: ++ printf ("option %s", long_options[option_index].name); ++ if (optarg) ++ printf (" with arg %s", optarg); ++ printf ("\n"); ++ break; ++ ++ case '0': ++ case '1': ++ case '2': ++ case '3': ++ case '4': ++ case '5': ++ case '6': ++ case '7': ++ case '8': ++ case '9': ++ if (digit_optind != 0 && digit_optind != this_option_optind) ++ printf ("digits occur in two different argv-elements.\n"); ++ digit_optind = this_option_optind; ++ printf ("option %c\n", c); ++ break; ++ ++ case 'a': ++ printf ("option a\n"); ++ break; ++ ++ case 'b': ++ printf ("option b\n"); ++ break; ++ ++ case 'c': ++ printf ("option c with value `%s'\n", optarg); ++ break; ++ ++ case 'd': ++ printf ("option d with value `%s'\n", optarg); ++ break; ++ ++ case '?': ++ break; ++ ++ default: ++ printf ("?? getopt returned character code 0%o ??\n", c); ++ } ++ } ++ ++ if (optind < argc) ++ { ++ printf ("non-option ARGV-elements: "); ++ while (optind < argc) ++ printf ("%s ", argv[optind++]); ++ printf ("\n"); ++ } ++ ++ exit (0); ++} ++ ++#endif /* TEST */ +diff --git a/lib/getopt_int.h b/lib/getopt_int.h +new file mode 100644 +index 0000000..69cdf0d +--- /dev/null ++++ b/lib/getopt_int.h +@@ -0,0 +1,132 @@ ++/* Internal declarations for getopt. ++ Copyright (C) 1989-1994,1996-1999,2001,2003,2004,2009 ++ Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ 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 . */ ++ ++#ifndef _GETOPT_INT_H ++#define _GETOPT_INT_H 1 ++ ++#include ++ ++extern int _getopt_internal (int ___argc, char **___argv, ++ const char *__shortopts, ++ const struct option *__longopts, int *__longind, ++ int __long_only, int __posixly_correct); ++ ++ ++/* Reentrant versions which can handle parsing multiple argument ++ vectors at the same time. */ ++ ++/* Data type for reentrant functions. */ ++struct _getopt_data ++{ ++ /* These have exactly the same meaning as the corresponding global ++ variables, except that they are used for the reentrant ++ versions of getopt. */ ++ int optind; ++ int opterr; ++ int optopt; ++ char *optarg; ++ ++ /* Internal members. */ ++ ++ /* True if the internal members have been initialized. */ ++ int __initialized; ++ ++ /* The next char to be scanned in the option-element ++ in which the last option character we returned was found. ++ This allows us to pick up the scan where we left off. ++ ++ If this is zero, or a null string, it means resume the scan ++ by advancing to the next ARGV-element. */ ++ char *__nextchar; ++ ++ /* Describe how to deal with options that follow non-option ARGV-elements. ++ ++ If the caller did not specify anything, ++ the default is REQUIRE_ORDER if the environment variable ++ POSIXLY_CORRECT is defined, PERMUTE otherwise. ++ ++ REQUIRE_ORDER means don't recognize them as options; ++ stop option processing when the first non-option is seen. ++ This is what Unix does. ++ This mode of operation is selected by either setting the environment ++ variable POSIXLY_CORRECT, or using `+' as the first character ++ of the list of option characters, or by calling getopt. ++ ++ PERMUTE is the default. We permute the contents of ARGV as we ++ scan, so that eventually all the non-options are at the end. ++ This allows options to be given in any order, even with programs ++ that were not written to expect this. ++ ++ RETURN_IN_ORDER is an option available to programs that were ++ written to expect options and other ARGV-elements in any order ++ and that care about the ordering of the two. We describe each ++ non-option ARGV-element as if it were the argument of an option ++ with character code 1. Using `-' as the first character of the ++ list of option characters selects this mode of operation. ++ ++ The special argument `--' forces an end of option-scanning regardless ++ of the value of `ordering'. In the case of RETURN_IN_ORDER, only ++ `--' can cause `getopt' to return -1 with `optind' != ARGC. */ ++ ++ enum ++ { ++ REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER ++ } __ordering; ++ ++ /* If the POSIXLY_CORRECT environment variable is set ++ or getopt was called. */ ++ int __posixly_correct; ++ ++ ++ /* Handle permutation of arguments. */ ++ ++ /* Describe the part of ARGV that contains non-options that have ++ been skipped. `first_nonopt' is the index in ARGV of the first ++ of them; `last_nonopt' is the index after the last of them. */ ++ ++ int __first_nonopt; ++ int __last_nonopt; ++ ++#if defined _LIBC && defined USE_NONOPTION_FLAGS ++ int __nonoption_flags_max_len; ++ int __nonoption_flags_len; ++# endif ++}; ++ ++/* The initializer is necessary to set OPTIND and OPTERR to their ++ default values and to clear the initialization flag. */ ++#define _GETOPT_DATA_INITIALIZER { 1, 1 } ++ ++extern int _getopt_internal_r (int ___argc, char **___argv, ++ const char *__shortopts, ++ const struct option *__longopts, int *__longind, ++ int __long_only, int __posixly_correct, ++ struct _getopt_data *__data); ++ ++extern int _getopt_long_r (int ___argc, char **___argv, ++ const char *__shortopts, ++ const struct option *__longopts, int *__longind, ++ struct _getopt_data *__data); ++ ++extern int _getopt_long_only_r (int ___argc, char **___argv, ++ const char *__shortopts, ++ const struct option *__longopts, ++ int *__longind, ++ struct _getopt_data *__data); ++ ++#endif /* getopt_int.h */ +diff --git a/lib/gettext.h b/lib/gettext.h +new file mode 100644 +index 0000000..a5b85c7 +--- /dev/null ++++ b/lib/gettext.h +@@ -0,0 +1,279 @@ ++/* Convenience header for conditional use of GNU . ++ Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009 Free Software Foundation, Inc. ++ ++ 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. */ ++ ++#ifndef _LIBGETTEXT_H ++#define _LIBGETTEXT_H 1 ++ ++/* NLS can be disabled through the configure --disable-nls option. */ ++#if ENABLE_NLS ++ ++/* Get declarations of GNU message catalog functions. */ ++# include ++ ++/* You can set the DEFAULT_TEXT_DOMAIN macro to specify the domain used by ++ the gettext() and ngettext() macros. This is an alternative to calling ++ textdomain(), and is useful for libraries. */ ++# ifdef DEFAULT_TEXT_DOMAIN ++# undef gettext ++# define gettext(Msgid) \ ++ dgettext (DEFAULT_TEXT_DOMAIN, Msgid) ++# undef ngettext ++# define ngettext(Msgid1, Msgid2, N) \ ++ dngettext (DEFAULT_TEXT_DOMAIN, Msgid1, Msgid2, N) ++# endif ++ ++#else ++ ++/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which ++ chokes if dcgettext is defined as a macro. So include it now, to make ++ later inclusions of a NOP. We don't include ++ as well because people using "gettext.h" will not include , ++ and also including would fail on SunOS 4, whereas ++ is OK. */ ++#if defined(__sun) ++# include ++#endif ++ ++/* Many header files from the libstdc++ coming with g++ 3.3 or newer include ++ , which chokes if dcgettext is defined as a macro. So include ++ it now, to make later inclusions of a NOP. */ ++#if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3) ++# include ++# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H ++# include ++# endif ++#endif ++ ++/* Disabled NLS. ++ The casts to 'const char *' serve the purpose of producing warnings ++ for invalid uses of the value returned from these functions. ++ On pre-ANSI systems without 'const', the config.h file is supposed to ++ contain "#define const". */ ++# undef gettext ++# define gettext(Msgid) ((const char *) (Msgid)) ++# undef dgettext ++# define dgettext(Domainname, Msgid) ((void) (Domainname), gettext (Msgid)) ++# undef dcgettext ++# define dcgettext(Domainname, Msgid, Category) \ ++ ((void) (Category), dgettext (Domainname, Msgid)) ++# undef ngettext ++# define ngettext(Msgid1, Msgid2, N) \ ++ ((N) == 1 \ ++ ? ((void) (Msgid2), (const char *) (Msgid1)) \ ++ : ((void) (Msgid1), (const char *) (Msgid2))) ++# undef dngettext ++# define dngettext(Domainname, Msgid1, Msgid2, N) \ ++ ((void) (Domainname), ngettext (Msgid1, Msgid2, N)) ++# undef dcngettext ++# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \ ++ ((void) (Category), dngettext(Domainname, Msgid1, Msgid2, N)) ++# undef textdomain ++# define textdomain(Domainname) ((const char *) (Domainname)) ++# undef bindtextdomain ++# define bindtextdomain(Domainname, Dirname) \ ++ ((void) (Domainname), (const char *) (Dirname)) ++# undef bind_textdomain_codeset ++# define bind_textdomain_codeset(Domainname, Codeset) \ ++ ((void) (Domainname), (const char *) (Codeset)) ++ ++#endif ++ ++/* A pseudo function call that serves as a marker for the automated ++ extraction of messages, but does not call gettext(). The run-time ++ translation is done at a different place in the code. ++ The argument, String, should be a literal string. Concatenated strings ++ and other string expressions won't work. ++ The macro's expansion is not parenthesized, so that it is suitable as ++ initializer for static 'char[]' or 'const char[]' variables. */ ++#define gettext_noop(String) String ++ ++/* The separator between msgctxt and msgid in a .mo file. */ ++#define GETTEXT_CONTEXT_GLUE "\004" ++ ++/* Pseudo function calls, taking a MSGCTXT and a MSGID instead of just a ++ MSGID. MSGCTXT and MSGID must be string literals. MSGCTXT should be ++ short and rarely need to change. ++ The letter 'p' stands for 'particular' or 'special'. */ ++#ifdef DEFAULT_TEXT_DOMAIN ++# define pgettext(Msgctxt, Msgid) \ ++ pgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES) ++#else ++# define pgettext(Msgctxt, Msgid) \ ++ pgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES) ++#endif ++#define dpgettext(Domainname, Msgctxt, Msgid) \ ++ pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES) ++#define dcpgettext(Domainname, Msgctxt, Msgid, Category) \ ++ pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, Category) ++#ifdef DEFAULT_TEXT_DOMAIN ++# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \ ++ npgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES) ++#else ++# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \ ++ npgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES) ++#endif ++#define dnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N) \ ++ npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES) ++#define dcnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N, Category) \ ++ npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, Category) ++ ++#ifdef __GNUC__ ++__inline ++#else ++#ifdef __cplusplus ++inline ++#endif ++#endif ++static const char * ++pgettext_aux (const char *domain, ++ const char *msg_ctxt_id, const char *msgid, ++ int category) ++{ ++ const char *translation = dcgettext (domain, msg_ctxt_id, category); ++ if (translation == msg_ctxt_id) ++ return msgid; ++ else ++ return translation; ++} ++ ++#ifdef __GNUC__ ++__inline ++#else ++#ifdef __cplusplus ++inline ++#endif ++#endif ++static const char * ++npgettext_aux (const char *domain, ++ const char *msg_ctxt_id, const char *msgid, ++ const char *msgid_plural, unsigned long int n, ++ int category) ++{ ++ const char *translation = ++ dcngettext (domain, msg_ctxt_id, msgid_plural, n, category); ++ if (translation == msg_ctxt_id || translation == msgid_plural) ++ return (n == 1 ? msgid : msgid_plural); ++ else ++ return translation; ++} ++ ++/* The same thing extended for non-constant arguments. Here MSGCTXT and MSGID ++ can be arbitrary expressions. But for string literals these macros are ++ less efficient than those above. */ ++ ++#include ++ ++#define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \ ++ (((__GNUC__ >= 3 || __GNUG__ >= 2) && !__STRICT_ANSI__) \ ++ /* || __STDC_VERSION__ >= 199901L */ ) ++ ++#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS ++#include ++#endif ++ ++#define pgettext_expr(Msgctxt, Msgid) \ ++ dcpgettext_expr (NULL, Msgctxt, Msgid, LC_MESSAGES) ++#define dpgettext_expr(Domainname, Msgctxt, Msgid) \ ++ dcpgettext_expr (Domainname, Msgctxt, Msgid, LC_MESSAGES) ++ ++#ifdef __GNUC__ ++__inline ++#else ++#ifdef __cplusplus ++inline ++#endif ++#endif ++static const char * ++dcpgettext_expr (const char *domain, ++ const char *msgctxt, const char *msgid, ++ int category) ++{ ++ size_t msgctxt_len = strlen (msgctxt) + 1; ++ size_t msgid_len = strlen (msgid) + 1; ++ const char *translation; ++#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS ++ char msg_ctxt_id[msgctxt_len + msgid_len]; ++#else ++ char buf[1024]; ++ char *msg_ctxt_id = ++ (msgctxt_len + msgid_len <= sizeof (buf) ++ ? buf ++ : (char *) malloc (msgctxt_len + msgid_len)); ++ if (msg_ctxt_id != NULL) ++#endif ++ { ++ memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1); ++ msg_ctxt_id[msgctxt_len - 1] = '\004'; ++ memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len); ++ translation = dcgettext (domain, msg_ctxt_id, category); ++#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS ++ if (msg_ctxt_id != buf) ++ free (msg_ctxt_id); ++#endif ++ if (translation != msg_ctxt_id) ++ return translation; ++ } ++ return msgid; ++} ++ ++#define npgettext_expr(Msgctxt, Msgid, MsgidPlural, N) \ ++ dcnpgettext_expr (NULL, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES) ++#define dnpgettext_expr(Domainname, Msgctxt, Msgid, MsgidPlural, N) \ ++ dcnpgettext_expr (Domainname, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES) ++ ++#ifdef __GNUC__ ++__inline ++#else ++#ifdef __cplusplus ++inline ++#endif ++#endif ++static const char * ++dcnpgettext_expr (const char *domain, ++ const char *msgctxt, const char *msgid, ++ const char *msgid_plural, unsigned long int n, ++ int category) ++{ ++ size_t msgctxt_len = strlen (msgctxt) + 1; ++ size_t msgid_len = strlen (msgid) + 1; ++ const char *translation; ++#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS ++ char msg_ctxt_id[msgctxt_len + msgid_len]; ++#else ++ char buf[1024]; ++ char *msg_ctxt_id = ++ (msgctxt_len + msgid_len <= sizeof (buf) ++ ? buf ++ : (char *) malloc (msgctxt_len + msgid_len)); ++ if (msg_ctxt_id != NULL) ++#endif ++ { ++ memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1); ++ msg_ctxt_id[msgctxt_len - 1] = '\004'; ++ memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len); ++ translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category); ++#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS ++ if (msg_ctxt_id != buf) ++ free (msg_ctxt_id); ++#endif ++ if (!(translation == msg_ctxt_id || translation == msgid_plural)) ++ return translation; ++ } ++ return (n == 1 ? msgid : msgid_plural); ++} ++ ++#endif /* _LIBGETTEXT_H */ +diff --git a/lib/stddef.in.h b/lib/stddef.in.h +new file mode 100644 +index 0000000..8744207 +--- /dev/null ++++ b/lib/stddef.in.h +@@ -0,0 +1,86 @@ ++/* A substitute for POSIX 2008 , for platforms that have issues. ++ ++ Copyright (C) 2009 Free Software Foundation, Inc. ++ ++ 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. */ ++ ++/* Written by Eric Blake. */ ++ ++/* ++ * POSIX 2008 for platforms that have issues. ++ * ++ */ ++ ++#if __GNUC__ >= 3 ++ at PRAGMA_SYSTEM_HEADER@ ++#endif ++ ++#if defined __need_wchar_t || defined __need_size_t \ ++ || defined __need_ptrdiff_t || defined __need_NULL \ ++ || defined __need_wint_t ++/* Special invocation convention inside gcc header files. In ++ particular, gcc provides a version of that blindly ++ redefines NULL even when __need_wint_t was defined, even though ++ wint_t is not normally provided by . Hence, we must ++ remember if special invocation has ever been used to obtain wint_t, ++ in which case we need to clean up NULL yet again. */ ++ ++# if !(defined _GL_STDDEF_H && defined _GL_STDDEF_WINT_T) ++# ifdef __need_wint_t ++# undef _GL_STDDEF_H ++# define _GL_STDDEF_WINT_T ++# endif ++# @INCLUDE_NEXT@ @NEXT_STDDEF_H@ ++# endif ++ ++#else ++/* Normal invocation convention. */ ++ ++# ifndef _GL_STDDEF_H ++ ++/* The include_next requires a split double-inclusion guard. */ ++ ++# @INCLUDE_NEXT@ @NEXT_STDDEF_H@ ++ ++# ifndef _GL_STDDEF_H ++# define _GL_STDDEF_H ++ ++/* On NetBSD 5.0, the definition of NULL lacks proper parentheses. */ ++#if @REPLACE_NULL@ ++# undef NULL ++# ifdef __cplusplus ++ /* ISO C++ says that the macro NULL must expand to an integer constant ++ expression, hence '((void *) 0)' is not allowed in C++. */ ++# if __GNUG__ >= 3 ++ /* GNU C++ has a __null macro that behaves like an integer ('int' or ++ 'long') but has the same size as a pointer. Use that, to avoid ++ warnings. */ ++# define NULL __null ++# else ++# define NULL 0L ++# endif ++# else ++# define NULL ((void *) 0) ++# endif ++#endif ++ ++/* Some platforms lack wchar_t. */ ++#if !@HAVE_WCHAR_T@ ++# define wchar_t int ++#endif ++ ++# endif /* _GL_STDDEF_H */ ++# endif /* _GL_STDDEF_H */ ++#endif /* __need_XXX */ +diff --git a/lib/unistd.in.h b/lib/unistd.in.h +new file mode 100644 +index 0000000..c321987 +--- /dev/null ++++ b/lib/unistd.in.h +@@ -0,0 +1,810 @@ ++/* Substitute for and wrapper around . ++ Copyright (C) 2003-2009 Free Software Foundation, Inc. ++ ++ 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. */ ++ ++#ifndef _GL_UNISTD_H ++ ++#if __GNUC__ >= 3 ++ at PRAGMA_SYSTEM_HEADER@ ++#endif ++ ++/* The include_next requires a split double-inclusion guard. */ ++#if @HAVE_UNISTD_H@ ++# @INCLUDE_NEXT@ @NEXT_UNISTD_H@ ++#endif ++ ++#ifndef _GL_UNISTD_H ++#define _GL_UNISTD_H ++ ++/* NetBSD 5.0 mis-defines NULL. Also get size_t. */ ++#include ++ ++/* mingw doesn't define the SEEK_* or *_FILENO macros in . */ ++#if !(defined SEEK_CUR && defined SEEK_END && defined SEEK_SET) ++# include ++#endif ++ ++/* mingw fails to declare _exit in . */ ++/* mingw, BeOS, Haiku declare environ in , not in . */ ++#include ++ ++#if ((@GNULIB_WRITE@ && @REPLACE_WRITE@ && @GNULIB_UNISTD_H_SIGPIPE@) \ ++ || (@GNULIB_READLINK@ && (!@HAVE_READLINK@ || @REPLACE_READLINK@)) \ ++ || (@GNULIB_READLINKAT@ && !@HAVE_READLINKAT@)) ++/* Get ssize_t. */ ++# include ++#endif ++ ++/* Get getopt(), optarg, optind, opterr, optopt. */ ++#if @GNULIB_UNISTD_H_GETOPT@ && !defined _GL_SYSTEM_GETOPT ++# include ++#endif ++ ++#if @GNULIB_GETHOSTNAME@ ++/* Get all possible declarations of gethostname(). */ ++# if @UNISTD_H_HAVE_WINSOCK2_H@ ++# include ++# if !defined _GL_SYS_SOCKET_H ++# undef socket ++# define socket socket_used_without_including_sys_socket_h ++# undef connect ++# define connect connect_used_without_including_sys_socket_h ++# undef accept ++# define accept accept_used_without_including_sys_socket_h ++# undef bind ++# define bind bind_used_without_including_sys_socket_h ++# undef getpeername ++# define getpeername getpeername_used_without_including_sys_socket_h ++# undef getsockname ++# define getsockname getsockname_used_without_including_sys_socket_h ++# undef getsockopt ++# define getsockopt getsockopt_used_without_including_sys_socket_h ++# undef listen ++# define listen listen_used_without_including_sys_socket_h ++# undef recv ++# define recv recv_used_without_including_sys_socket_h ++# undef send ++# define send send_used_without_including_sys_socket_h ++# undef recvfrom ++# define recvfrom recvfrom_used_without_including_sys_socket_h ++# undef sendto ++# define sendto sendto_used_without_including_sys_socket_h ++# undef setsockopt ++# define setsockopt setsockopt_used_without_including_sys_socket_h ++# undef shutdown ++# define shutdown shutdown_used_without_including_sys_socket_h ++# endif ++# if !defined _GL_SYS_SELECT_H ++# undef select ++# define select select_used_without_including_sys_select_h ++# endif ++# endif ++#endif ++ ++/* The definition of GL_LINK_WARNING is copied here. */ ++ ++ ++/* OS/2 EMX lacks these macros. */ ++#ifndef STDIN_FILENO ++# define STDIN_FILENO 0 ++#endif ++#ifndef STDOUT_FILENO ++# define STDOUT_FILENO 1 ++#endif ++#ifndef STDERR_FILENO ++# define STDERR_FILENO 2 ++#endif ++ ++/* Ensure *_OK macros exist. */ ++#ifndef F_OK ++# define F_OK 0 ++# define X_OK 1 ++# define W_OK 2 ++# define R_OK 4 ++#endif ++ ++ ++/* Declare overridden functions. */ ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++ ++#if @GNULIB_CHOWN@ ++# if @REPLACE_CHOWN@ ++# ifndef REPLACE_CHOWN ++# define REPLACE_CHOWN 1 ++# endif ++# if REPLACE_CHOWN ++/* Change the owner of FILE to UID (if UID is not -1) and the group of FILE ++ to GID (if GID is not -1). Follow symbolic links. ++ Return 0 if successful, otherwise -1 and errno set. ++ See the POSIX:2001 specification ++ . */ ++# define chown rpl_chown ++extern int chown (const char *file, uid_t uid, gid_t gid); ++# endif ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef chown ++# define chown(f,u,g) \ ++ (GL_LINK_WARNING ("chown fails to follow symlinks on some systems and " \ ++ "doesn't treat a uid or gid of -1 on some systems - " \ ++ "use gnulib module chown for portability"), \ ++ chown (f, u, g)) ++#endif ++ ++ ++#if @GNULIB_CLOSE@ ++# if @REPLACE_CLOSE@ ++/* Automatically included by modules that need a replacement for close. */ ++# undef close ++# define close rpl_close ++extern int close (int); ++# endif ++#elif @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ ++# undef close ++# define close close_used_without_requesting_gnulib_module_close ++#elif defined GNULIB_POSIXCHECK ++# undef close ++# define close(f) \ ++ (GL_LINK_WARNING ("close does not portably work on sockets - " \ ++ "use gnulib module close for portability"), \ ++ close (f)) ++#endif ++ ++ ++#if @REPLACE_DUP@ ++# define dup rpl_dup ++extern int dup (int); ++#endif ++ ++ ++#if @GNULIB_DUP2@ ++# if @REPLACE_DUP2@ ++# define dup2 rpl_dup2 ++# endif ++# if !@HAVE_DUP2@ || @REPLACE_DUP2@ ++/* Copy the file descriptor OLDFD into file descriptor NEWFD. Do nothing if ++ NEWFD = OLDFD, otherwise close NEWFD first if it is open. ++ Return newfd if successful, otherwise -1 and errno set. ++ See the POSIX:2001 specification ++ . */ ++extern int dup2 (int oldfd, int newfd); ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef dup2 ++# define dup2(o,n) \ ++ (GL_LINK_WARNING ("dup2 is unportable - " \ ++ "use gnulib module dup2 for portability"), \ ++ dup2 (o, n)) ++#endif ++ ++ ++#if @GNULIB_DUP3@ ++/* Copy the file descriptor OLDFD into file descriptor NEWFD, with the ++ specified flags. ++ The flags are a bitmask, possibly including O_CLOEXEC (defined in ) ++ and O_TEXT, O_BINARY (defined in "binary-io.h"). ++ Close NEWFD first if it is open. ++ Return newfd if successful, otherwise -1 and errno set. ++ See the Linux man page at ++ . */ ++# if @HAVE_DUP3@ ++# define dup3 rpl_dup3 ++# endif ++extern int dup3 (int oldfd, int newfd, int flags); ++#elif defined GNULIB_POSIXCHECK ++# undef dup3 ++# define dup3(o,n,f) \ ++ (GL_LINK_WARNING ("dup3 is unportable - " \ ++ "use gnulib module dup3 for portability"), \ ++ dup3 (o, n, f)) ++#endif ++ ++ ++#if @GNULIB_ENVIRON@ ++# if !@HAVE_DECL_ENVIRON@ ++/* Set of environment variables and values. An array of strings of the form ++ "VARIABLE=VALUE", terminated with a NULL. */ ++# if defined __APPLE__ && defined __MACH__ ++# include ++# define environ (*_NSGetEnviron ()) ++# else ++extern char **environ; ++# endif ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef environ ++# define environ \ ++ (GL_LINK_WARNING ("environ is unportable - " \ ++ "use gnulib module environ for portability"), \ ++ environ) ++#endif ++ ++ ++#if @GNULIB_EUIDACCESS@ ++# if !@HAVE_EUIDACCESS@ ++/* Like access(), except that it uses the effective user id and group id of ++ the current process. */ ++extern int euidaccess (const char *filename, int mode); ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef euidaccess ++# define euidaccess(f,m) \ ++ (GL_LINK_WARNING ("euidaccess is unportable - " \ ++ "use gnulib module euidaccess for portability"), \ ++ euidaccess (f, m)) ++#endif ++ ++ ++#if @GNULIB_FACCESSAT@ ++# if !@HAVE_FACCESSAT@ ++int faccessat (int fd, char const *file, int mode, int flag); ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef faccessat ++# define faccessat(d,n,m,f) \ ++ (GL_LINK_WARNING ("faccessat is not portable - " \ ++ "use gnulib module faccessat for portability"), \ ++ faccessat (d, n, m, f)) ++#endif ++ ++ ++#if @GNULIB_FCHDIR@ ++# if @REPLACE_FCHDIR@ ++/* Change the process' current working directory to the directory on which ++ the given file descriptor is open. ++ Return 0 if successful, otherwise -1 and errno set. ++ See the POSIX:2001 specification ++ . */ ++extern int fchdir (int /*fd*/); ++ ++/* Gnulib internal hooks needed to maintain the fchdir metadata. */ ++extern int _gl_register_fd (int fd, const char *filename); ++extern void _gl_unregister_fd (int fd); ++extern int _gl_register_dup (int oldfd, int newfd); ++extern const char *_gl_directory_name (int fd); ++ ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef fchdir ++# define fchdir(f) \ ++ (GL_LINK_WARNING ("fchdir is unportable - " \ ++ "use gnulib module fchdir for portability"), \ ++ fchdir (f)) ++#endif ++ ++ ++#if @GNULIB_FCHOWNAT@ ++# if @REPLACE_FCHOWNAT@ ++# undef fchownat ++# define fchownat rpl_fchownat ++# endif ++# if !@HAVE_FCHOWNAT@ || @REPLACE_FCHOWNAT@ ++extern int fchownat (int fd, char const *file, uid_t owner, gid_t group, int flag); ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef fchownat ++# define fchownat(d,n,o,g,f) \ ++ (GL_LINK_WARNING ("fchownat is not portable - " \ ++ "use gnulib module openat for portability"), \ ++ fchownat (d, n, o, g, f)) ++#endif ++ ++ ++#if @GNULIB_FSYNC@ ++/* Synchronize changes to a file. ++ Return 0 if successful, otherwise -1 and errno set. ++ See POSIX:2001 specification ++ . */ ++# if !@HAVE_FSYNC@ ++extern int fsync (int fd); ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef fsync ++# define fsync(fd) \ ++ (GL_LINK_WARNING ("fsync is unportable - " \ ++ "use gnulib module fsync for portability"), \ ++ fsync (fd)) ++#endif ++ ++ ++#if @GNULIB_FTRUNCATE@ ++# if !@HAVE_FTRUNCATE@ ++/* Change the size of the file to which FD is opened to become equal to LENGTH. ++ Return 0 if successful, otherwise -1 and errno set. ++ See the POSIX:2001 specification ++ . */ ++extern int ftruncate (int fd, off_t length); ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef ftruncate ++# define ftruncate(f,l) \ ++ (GL_LINK_WARNING ("ftruncate is unportable - " \ ++ "use gnulib module ftruncate for portability"), \ ++ ftruncate (f, l)) ++#endif ++ ++ ++#if @GNULIB_GETCWD@ ++/* Include the headers that might declare getcwd so that they will not ++ cause confusion if included after this file. */ ++# include ++# if @REPLACE_GETCWD@ ++/* Get the name of the current working directory, and put it in SIZE bytes ++ of BUF. ++ Return BUF if successful, or NULL if the directory couldn't be determined ++ or SIZE was too small. ++ See the POSIX:2001 specification ++ . ++ Additionally, the gnulib module 'getcwd' guarantees the following GNU ++ extension: If BUF is NULL, an array is allocated with 'malloc'; the array ++ is SIZE bytes long, unless SIZE == 0, in which case it is as big as ++ necessary. */ ++# define getcwd rpl_getcwd ++extern char * getcwd (char *buf, size_t size); ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef getcwd ++# define getcwd(b,s) \ ++ (GL_LINK_WARNING ("getcwd is unportable - " \ ++ "use gnulib module getcwd for portability"), \ ++ getcwd (b, s)) ++#endif ++ ++ ++#if @GNULIB_GETDOMAINNAME@ ++/* Return the NIS domain name of the machine. ++ WARNING! The NIS domain name is unrelated to the fully qualified host name ++ of the machine. It is also unrelated to email addresses. ++ WARNING! The NIS domain name is usually the empty string or "(none)" when ++ not using NIS. ++ ++ Put up to LEN bytes of the NIS domain name into NAME. ++ Null terminate it if the name is shorter than LEN. ++ If the NIS domain name is longer than LEN, set errno = EINVAL and return -1. ++ Return 0 if successful, otherwise set errno and return -1. */ ++# if !@HAVE_GETDOMAINNAME@ ++extern int getdomainname(char *name, size_t len); ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef getdomainname ++# define getdomainname(n,l) \ ++ (GL_LINK_WARNING ("getdomainname is unportable - " \ ++ "use gnulib module getdomainname for portability"), \ ++ getdomainname (n, l)) ++#endif ++ ++ ++#if @GNULIB_GETDTABLESIZE@ ++# if !@HAVE_GETDTABLESIZE@ ++/* Return the maximum number of file descriptors in the current process. ++ In POSIX, this is same as sysconf (_SC_OPEN_MAX). */ ++extern int getdtablesize (void); ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef getdtablesize ++# define getdtablesize() \ ++ (GL_LINK_WARNING ("getdtablesize is unportable - " \ ++ "use gnulib module getdtablesize for portability"), \ ++ getdtablesize ()) ++#endif ++ ++ ++#if @GNULIB_GETGROUPS@ ++# if @REPLACE_GETGROUPS@ ++# undef getgroups ++# define getgroups rpl_getgroups ++# endif ++# if !@HAVE_GETGROUPS@ || @REPLACE_GETGROUPS@ ++/* Return the supplemental groups that the current process belongs to. ++ It is unspecified whether the effective group id is in the list. ++ If N is 0, return the group count; otherwise, N describes how many ++ entries are available in GROUPS. Return -1 and set errno if N is ++ not 0 and not large enough. Fails with ENOSYS on some systems. */ ++int getgroups (int n, gid_t *groups); ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef getgroups ++# define getgroups(n,g) \ ++ (GL_LINK_WARNING ("getgroups is unportable - " \ ++ "use gnulib module getgroups for portability"), \ ++ getgroups (n, g)) ++#endif ++ ++ ++#if @GNULIB_GETHOSTNAME@ ++/* Return the standard host name of the machine. ++ WARNING! The host name may or may not be fully qualified. ++ ++ Put up to LEN bytes of the host name into NAME. ++ Null terminate it if the name is shorter than LEN. ++ If the host name is longer than LEN, set errno = EINVAL and return -1. ++ Return 0 if successful, otherwise set errno and return -1. */ ++# if @UNISTD_H_HAVE_WINSOCK2_H@ ++# undef gethostname ++# define gethostname rpl_gethostname ++# endif ++# if @UNISTD_H_HAVE_WINSOCK2_H@ || !@HAVE_GETHOSTNAME@ ++extern int gethostname(char *name, size_t len); ++# endif ++#elif @UNISTD_H_HAVE_WINSOCK2_H@ ++# undef gethostname ++# define gethostname gethostname_used_without_requesting_gnulib_module_gethostname ++#elif defined GNULIB_POSIXCHECK ++# undef gethostname ++# define gethostname(n,l) \ ++ (GL_LINK_WARNING ("gethostname is unportable - " \ ++ "use gnulib module gethostname for portability"), \ ++ gethostname (n, l)) ++#endif ++ ++ ++#if @GNULIB_GETLOGIN_R@ ++/* Copies the user's login name to NAME. ++ The array pointed to by NAME has room for SIZE bytes. ++ ++ Returns 0 if successful. Upon error, an error number is returned, or -1 in ++ the case that the login name cannot be found but no specific error is ++ provided (this case is hopefully rare but is left open by the POSIX spec). ++ ++ See . ++ */ ++# if !@HAVE_DECL_GETLOGIN_R@ ++extern int getlogin_r (char *name, size_t size); ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef getlogin_r ++# define getlogin_r(n,s) \ ++ (GL_LINK_WARNING ("getlogin_r is unportable - " \ ++ "use gnulib module getlogin_r for portability"), \ ++ getlogin_r (n, s)) ++#endif ++ ++ ++#if @GNULIB_GETPAGESIZE@ ++# if @REPLACE_GETPAGESIZE@ ++# define getpagesize rpl_getpagesize ++extern int getpagesize (void); ++# elif !@HAVE_GETPAGESIZE@ ++/* This is for POSIX systems. */ ++# if !defined getpagesize && defined _SC_PAGESIZE ++# if ! (defined __VMS && __VMS_VER < 70000000) ++# define getpagesize() sysconf (_SC_PAGESIZE) ++# endif ++# endif ++/* This is for older VMS. */ ++# if !defined getpagesize && defined __VMS ++# ifdef __ALPHA ++# define getpagesize() 8192 ++# else ++# define getpagesize() 512 ++# endif ++# endif ++/* This is for BeOS. */ ++# if !defined getpagesize && @HAVE_OS_H@ ++# include ++# if defined B_PAGE_SIZE ++# define getpagesize() B_PAGE_SIZE ++# endif ++# endif ++/* This is for AmigaOS4.0. */ ++# if !defined getpagesize && defined __amigaos4__ ++# define getpagesize() 2048 ++# endif ++/* This is for older Unix systems. */ ++# if !defined getpagesize && @HAVE_SYS_PARAM_H@ ++# include ++# ifdef EXEC_PAGESIZE ++# define getpagesize() EXEC_PAGESIZE ++# else ++# ifdef NBPG ++# ifndef CLSIZE ++# define CLSIZE 1 ++# endif ++# define getpagesize() (NBPG * CLSIZE) ++# else ++# ifdef NBPC ++# define getpagesize() NBPC ++# endif ++# endif ++# endif ++# endif ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef getpagesize ++# define getpagesize() \ ++ (GL_LINK_WARNING ("getpagesize is unportable - " \ ++ "use gnulib module getpagesize for portability"), \ ++ getpagesize ()) ++#endif ++ ++ ++#if @GNULIB_GETUSERSHELL@ ++# if !@HAVE_GETUSERSHELL@ ++/* Return the next valid login shell on the system, or NULL when the end of ++ the list has been reached. */ ++extern char *getusershell (void); ++/* Rewind to pointer that is advanced at each getusershell() call. */ ++extern void setusershell (void); ++/* Free the pointer that is advanced at each getusershell() call and ++ associated resources. */ ++extern void endusershell (void); ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef getusershell ++# define getusershell() \ ++ (GL_LINK_WARNING ("getusershell is unportable - " \ ++ "use gnulib module getusershell for portability"), \ ++ getusershell ()) ++# undef setusershell ++# define setusershell() \ ++ (GL_LINK_WARNING ("setusershell is unportable - " \ ++ "use gnulib module getusershell for portability"), \ ++ setusershell ()) ++# undef endusershell ++# define endusershell() \ ++ (GL_LINK_WARNING ("endusershell is unportable - " \ ++ "use gnulib module getusershell for portability"), \ ++ endusershell ()) ++#endif ++ ++ ++#if @GNULIB_LCHOWN@ ++# if @REPLACE_LCHOWN@ ++/* Change the owner of FILE to UID (if UID is not -1) and the group of FILE ++ to GID (if GID is not -1). Do not follow symbolic links. ++ Return 0 if successful, otherwise -1 and errno set. ++ See the POSIX:2001 specification ++ . */ ++# define lchown rpl_lchown ++extern int lchown (char const *file, uid_t owner, gid_t group); ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef lchown ++# define lchown(f,u,g) \ ++ (GL_LINK_WARNING ("lchown is unportable to pre-POSIX.1-2001 " \ ++ "systems - use gnulib module lchown for portability"), \ ++ lchown (f, u, g)) ++#endif ++ ++ ++#if @GNULIB_LINK@ ++# if @REPLACE_LINK@ ++# define link rpl_link ++# endif ++/* Create a new hard link for an existing file. ++ Return 0 if successful, otherwise -1 and errno set. ++ See POSIX:2001 specification ++ . */ ++# if !@HAVE_LINK@ || @REPLACE_LINK@ ++extern int link (const char *path1, const char *path2); ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef link ++# define link(path1,path2) \ ++ (GL_LINK_WARNING ("link is unportable - " \ ++ "use gnulib module link for portability"), \ ++ link (path1, path2)) ++#endif ++ ++#if @GNULIB_LINKAT@ ++# if @REPLACE_LINKAT@ ++# undef linkat ++# define linkat rpl_linkat ++# endif ++/* Create a new hard link for an existing file, relative to two ++ directories. FLAG controls whether symlinks are followed. ++ Return 0 if successful, otherwise -1 and errno set. */ ++# if !@HAVE_LINKAT@ || @REPLACE_LINKAT@ ++extern int linkat (int fd1, const char *path1, int fd2, const char *path2, ++ int flag); ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef linkat @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Mar 15 02:55:47 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 15 Mar 2011 01:55:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[13803] csw/mgar/pkg/apache2/branches/open-bug-squash/ Makefile Message-ID: Revision: 13803 http://gar.svn.sourceforge.net/gar/?rev=13803&view=rev Author: bdwalton Date: 2011-03-15 01:55:47 +0000 (Tue, 15 Mar 2011) Log Message: ----------- apache2/branches/open-bug-squash: a rearrangement of the apache2c depend ordering to see if pkg-get can cope Modified Paths: -------------- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-14 23:35:05 UTC (rev 13802) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-15 01:55:47 UTC (rev 13803) @@ -58,8 +58,8 @@ PACKAGES = CSWapache2 CSWapache2-dev CSWapache2-manual CSWap2-suexec PACKAGES += CSWap2-worker # These packages are dummy versions to make dependencies nicer -# as various things depend on CSWap2prefork currently -PACKAGES += CSWap2-prefork CSWapache2rt +# as various things depend on them currently +PACKAGES += CSWap2-prefork CSWapache2rt CSWapache2c OBSOLETES_CSWap2-suexec = CSWap2suexec OBSOLETES_CSWap2-prefork = CSWap2prefork @@ -69,9 +69,8 @@ ARCHALL_CSWapache2-manual = 1 ARCHALL_CSWap2-prefork = 1 ARCHALL_CSWapache2rt = 1 +ARCHALL_CSWapache2c = 1 -OBSOLETES_CSWapache2 = CSWapache2c - CATALOGNAME_CSWapache2 = apache2 CATALOGNAME_CSWapache2-dev = apache2_dev CATALOGNAME_CSWapache2-manual = apache2_manual @@ -87,10 +86,12 @@ SPKG_DESC_CSWap2-worker = The apache worker mpm. SPKG_DESC_CSWap2-prefork = A stub for the old prefork mpm package. SPKG_DESC_CSWapache2rt = A stub for the old apache2rt package. +SPKG_DESC_CSWapache2c = A stub for the old apache2c package. RUNTIME_DEP_PKGS_CSWapache2 += CSWexpat CSWiconv CSWosslutils RUNTIME_DEP_PKGS_CSWapache2 += CSWoldaprt CSWosslrt CSWzlib RUNTIME_DEP_PKGS_CSWapache2 += CSWapr CSWapr-util CSWbdb48 +RUNTIME_DEP_PKGS_CSWapache2 += CSWapache2c RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2 RUNTIME_DEP_PKGS_CSWapache2-dev = CSWapache2 RUNTIME_DEP_PKGS_CSWap2-suexec = CSWapache2 @@ -214,6 +215,7 @@ PKGFILES_CSWap2-prefork = .*share/doc/ap2_prefork.* PKGFILES_CSWap2-worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker PKGFILES_CSWapache2rt = .*share/doc/apache2rt.* +PKGFILES_CSWapache2c = .*share/doc/apache2c.* #PROTOTYPE_FILTER = awk '$$$$3 == "/opt/csw/apache2/sbin/suexec" { $$$$4 = "4755" }; $$$$3 ~ /cswap2mod/ { $$$$4 = "0555" }; { 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 Tue Mar 15 03:22:18 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 15 Mar 2011 02:22:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[13804] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13804 http://gar.svn.sourceforge.net/gar/?rev=13804&view=rev Author: bdwalton Date: 2011-03-15 02:22:18 +0000 (Tue, 15 Mar 2011) Log Message: ----------- php5/trunk: add idn dev package as a build dep Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-15 01:55:47 UTC (rev 13803) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-15 02:22:18 UTC (rev 13804) @@ -86,7 +86,7 @@ PACKAGES += CSWphp5-zip PACKAGES += CSWmod-php5 -BUILD_DEP_PKGS += CSWlibgdbm-dev +BUILD_DEP_PKGS += CSWlibgdbm-dev CSWlibidn-dev CATALOGNAME_CSWmod-php5 = mod_php5 SPKG_DESC_CSWmod-php5 = The apache 1.3.x php5 module 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 Mar 15 03:26:26 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 15 Mar 2011 02:26:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[13805] csw/mgar/pkg/apache2/branches/open-bug-squash/ Makefile Message-ID: Revision: 13805 http://gar.svn.sourceforge.net/gar/?rev=13805&view=rev Author: bdwalton Date: 2011-03-15 02:26:25 +0000 (Tue, 15 Mar 2011) Log Message: ----------- apache2/branches/open-bug-squash: override the false dep that apache places on stub apache2c Modified Paths: -------------- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-15 02:22:18 UTC (rev 13804) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-15 02:26:25 UTC (rev 13805) @@ -102,6 +102,7 @@ CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWalternatives CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWosslutils +CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWapache2c CHECKPKG_OVERRIDES_CSWap2-prefork += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWap2-worker += surplus-dependency|CSWap2-prefork CHECKPKG_OVERRIDES_CSWap2-worker += surplus-dependency|CSWalternatives 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 Mar 15 03:40:11 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 15 Mar 2011 02:40:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[13806] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: Revision: 13806 http://gar.svn.sourceforge.net/gar/?rev=13806&view=rev Author: bdwalton Date: 2011-03-15 02:40:11 +0000 (Tue, 15 Mar 2011) Log Message: ----------- gettext/trunk: override filename equals soname for the 0.18.1 version of the libs (still unique) Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2011-03-15 02:26:25 UTC (rev 13805) +++ csw/mgar/pkg/gettext/trunk/Makefile 2011-03-15 02:40:11 UTC (rev 13806) @@ -166,7 +166,9 @@ CHECKPKG_OVERRIDES_CSWlibgettextsrc0-17 += soname-equals-filename|file=/opt/csw/lib/libgettextsrc-0.17.so CHECKPKG_OVERRIDES_CSWlibgettextpo0 += surplus-dependency|CSWggettext-data CHECKPKG_OVERRIDES_CSWlibgettextsrc0-18-1 += surplus-dependency|CSWggettext-data +CHECKPKG_OVERRIDES_CSWlibgettextsrc0-18-1 += soname-equals-filename CHECKPKG_OVERRIDES_CSWlibgettextlib0-18-1 += surplus-dependency|CSWggettext-data +CHECKPKG_OVERRIDES_CSWlibgettextlib0-18-1 += soname-equals-filename CHECKPKG_OVERRIDES_CSWlibintl2 += surplus-dependency|CSWggettext-data CHECKPKG_OVERRIDES_CSWlibintl3 += surplus-dependency|CSWggettext-data CHECKPKG_OVERRIDES_CSWlibintl8 += surplus-dependency|CSWggettext-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 Tue Mar 15 03:45:16 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 15 Mar 2011 02:45:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[13807] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13807 http://gar.svn.sourceforge.net/gar/?rev=13807&view=rev Author: bdwalton Date: 2011-03-15 02:45:16 +0000 (Tue, 15 Mar 2011) Log Message: ----------- php5/trunk: depend on libgd devel package at build time Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-15 02:40:11 UTC (rev 13806) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-15 02:45:16 UTC (rev 13807) @@ -86,7 +86,7 @@ PACKAGES += CSWphp5-zip PACKAGES += CSWmod-php5 -BUILD_DEP_PKGS += CSWlibgdbm-dev CSWlibidn-dev +BUILD_DEP_PKGS += CSWlibgdbm-dev CSWlibidn-dev CSWlibgd-dev CATALOGNAME_CSWmod-php5 = mod_php5 SPKG_DESC_CSWmod-php5 = The apache 1.3.x php5 module 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 Mar 15 09:21:57 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 15 Mar 2011 08:21:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[13808] csw/mgar Message-ID: Revision: 13808 http://gar.svn.sourceforge.net/gar/?rev=13808&view=rev Author: dmichelsen Date: 2011-03-15 08:21:57 +0000 (Tue, 15 Mar 2011) Log Message: ----------- mGAR v2: Rename ISAEXEC_EXCLUDE_FILES to EXTRA_ISAEXEC_EXCLUDE_FILES Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk csw/mgar/pkg/pango/trunk/Makefile csw/mgar/pkg/proftpd/trunk/Makefile csw/mgar/pkg/unbound/trunk/Makefile Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-03-15 02:45:16 UTC (rev 13807) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-03-15 08:21:57 UTC (rev 13808) @@ -866,8 +866,8 @@ # The files in ISAEXEC get relocated and will be replaced by the isaexec-wrapper. # The trick is to delay the calculcation of the variable values until that time # when PKGROOT has already been populated. -_ISAEXEC_EXCLUDE_FILES = $(bindir)/%-config $(bindir)/%/%-config -_buildpackage: _ISAEXEC_FILES=$(filter-out $(foreach F,$(_ISAEXEC_EXCLUDE_FILES) $(ISAEXEC_EXCLUDE_FILES),$(PKGROOT)$(F)), \ +ISAEXEC_EXCLUDE_FILES ?= $(bindir)/%-config $(bindir)/%/%-config +_buildpackage: _ISAEXEC_FILES=$(filter-out $(foreach F,$(ISAEXEC_EXCLUDE_FILES) $(EXTRA_ISAEXEC_EXCLUDE_FILES),$(PKGROOT)$(F)), \ $(wildcard $(foreach D,$(ISAEXEC_DIRS),$(PKGROOT)$(D)/* )) \ ) _buildpackage: ISAEXEC_FILES ?= $(if $(_ISAEXEC_FILES),$(patsubst $(PKGROOT)%,%, \ Modified: csw/mgar/pkg/pango/trunk/Makefile =================================================================== --- csw/mgar/pkg/pango/trunk/Makefile 2011-03-15 02:45:16 UTC (rev 13807) +++ csw/mgar/pkg/pango/trunk/Makefile 2011-03-15 08:21:57 UTC (rev 13808) @@ -43,7 +43,7 @@ BUILD64 = 1 NOISALIST = 1 -ISAEXEC_EXCLUDE_FILES = $(bindir)/pango-querymodules +EXTRA_ISAEXEC_EXCLUDE_FILES = $(bindir)/pango-querymodules CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-x --enable-gtk-doc CONFIGURE_ARGS += --x-include=$(prefix)/X11/include Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2011-03-15 02:45:16 UTC (rev 13807) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2011-03-15 08:21:57 UTC (rev 13808) @@ -26,8 +26,8 @@ EXTRA_BUILD_ISAS_i386 = amd64 EXTRA_BUILD_ISAS_sparc = sparcv9 -ISAEXEC_DIRS = $(bindir) $(sbindir) -ISAEXEC_EXCLUDE_FILES = $(bindir)/ftpasswd $(bindir)/ftpmail $(bindir)/ftpquota $(bindir)/prxs +ISAEXEC_DIRS = $(bindir) $(sbindir) +EXTRA_ISAEXEC_EXCLUDE_FILES = $(bindir)/ftpasswd $(bindir)/ftpmail $(bindir)/ftpquota $(bindir)/prxs EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = $(prefix)/bin/amd64/ftpasswd $(prefix)/bin/amd64/ftpmail $(prefix)/bin/amd64/ftpquota $(prefix)/bin/amd64/prxs EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = $(prefix)/bin/sparcv9/ftpasswd $(prefix)/bin/sparcv9/ftpmail $(prefix)/bin/sparcv9/ftpquota $(prefix)/bin/sparcv9/prxs Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2011-03-15 02:45:16 UTC (rev 13807) +++ csw/mgar/pkg/unbound/trunk/Makefile 2011-03-15 08:21:57 UTC (rev 13808) @@ -51,12 +51,12 @@ MERGE_DIRS_isa-pentium_pro = $(libdir) MERGE_DIRS_isa-pentium_pro += $(sbindir) -ISAXEC_DIRS = $(sbindir) -ISAEXEC_EXCLUDE_FILES = $(sbindir)/unbound-anchor -ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-checkconf -ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-control -ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-control-setup -ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-host +ISAXEC_DIRS = $(sbindir) +EXTRA_ISAEXEC_EXCLUDE_FILES = $(sbindir)/unbound-anchor +EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-checkconf +EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-control +EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-control-setup +EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-host EXTRA_MERGE_EXCLUDE_FILES_isa-pentium_pro = $(prefix)/sbin/unbound-anchor EXTRA_MERGE_EXCLUDE_FILES_isa-pentium_pro += $(prefix)/sbin/unbound-checkconf 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 Mar 15 10:13:14 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 15 Mar 2011 09:13:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[13809] csw/mgar/pkg/libkate/trunk/Makefile Message-ID: Revision: 13809 http://gar.svn.sourceforge.net/gar/?rev=13809&view=rev Author: dmichelsen Date: 2011-03-15 09:13:14 +0000 (Tue, 15 Mar 2011) Log Message: ----------- libkate: Package split Modified Paths: -------------- csw/mgar/pkg/libkate/trunk/Makefile Modified: csw/mgar/pkg/libkate/trunk/Makefile =================================================================== --- csw/mgar/pkg/libkate/trunk/Makefile 2011-03-15 08:21:57 UTC (rev 13808) +++ csw/mgar/pkg/libkate/trunk/Makefile 2011-03-15 09:13:14 UTC (rev 13809) @@ -10,20 +10,73 @@ MASTER_SITES = $(GOOGLE_MIRROR) DISTFILES = $(DISTNAME).tar.gz +# Skip NUL test until this is fixed: +# http://code.google.com/p/libkate/issues/detail?id=21 PATCHFILES += 0001-Reformat-null-test-string.patch + +# Use inttypes.h if stdint.h is not available until this is fixed: +# http://code.google.com/p/libkate/issues/detail?id=19 PATCHFILES += 0002-Use-inttypes-when-stdint-is-not-available.patch VENDOR_URL = http://code.google.com/p/libkate/ +PACKAGES += CSWlibkate1 +CATALOGNAME_CSWlibkate1 = libkate1 +SPKG_DESC_CSWlibkate1 = A karaoke and text codec for embedding in ogg, libkate.so.1 +PKGFILES_CSWlibkate1 += $(call pkgfiles_lib,libkate.so.1) + +PACKAGES += CSWliboggkate1 +CATALOGNAME_CSWliboggkate1 = liboggkate1 +SPKG_DESC_CSWliboggkate1 = A karaoke and text codec for embedding in ogg, liboggkate.so.1 +PKGFILES_CSWliboggkate1 += $(call pkgfiles_lib,liboggkate.so.1) +RUNTIME_DEP_PKGS_CSWliboggkate1 += CSWlibkate1 + +PACKAGES += CSWlibkate-dev +CATALOGNAME_CSWlibkate-dev = libkate_dev +SPKG_DESC_CSWlibkate-dev = Development files for libkate.so.1, liboggkate.so.1 +PKGFILES_CSWlibkate-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibkate-dev += $(docdir)/.* +RUNTIME_DEP_PKGS_CSWlibkate-dev += CSWlibkate1 +RUNTIME_DEP_PKGS_CSWlibkate-dev += CSWliboggkate1 + +PACKAGES += CSWlibkate-utils +CATALOGNAME_CSWlibkate-utils = libkate_utils +SPKG_DESC_CSWlibkate-utils = Utility programs for libkate +PKGFILES_CSWlibkate-utils += $(bindir)/.* +PKGFILES_CSWlibkate-utils += $(mandir)/man1/.* +RUNTIME_DEP_PKGS_CSWlibkate-utils += CSWlibogg0 +RUNTIME_DEP_PKGS_CSWlibkate-utils += CSWpng +RUNTIME_DEP_PKGS_CSWlibkate-utils += CSWlibkate1 +RUNTIME_DEP_PKGS_CSWlibkate-utils += CSWliboggkate1 + +PACKAGES += CSWpy-libkate +CATALOGNAME_CSWpy-libkate = py_libkate +SPKG_DESC_CSWpy-libkate = Python binding for libkate.so.1 +# PKGFILES is catchall +ARCHALL_CSWpy-libkate = 1 +RUNTIME_DEP_PKGS_CSWpy-libkate += CSWpython +PYCOMPILE = 1 + BUILD64 = 1 +NOISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check +# Disable testsuite until this is fixed: +# http://code.google.com/p/libkate/issues/detail?id=20 +SKIPTEST ?= 1 + +MERGE_DIRS_isa-extra = $(libdir) + include gar/category.mk post-configure-modulated: + @# Replace gcc-specific flags until this is fixed: + @# http://code.google.com/p/libkate/issues/detail?id=18 perl -pi -e 's,-Wall -W,,g' \ $(WORKSRC)/Makefile \ $(WORKSRC)/tools/Makefile - + perl -pi -e 's,/usr/local,$(prefix),g' \ + $(WORKSRC)/tools/KateDJ/kdj/tools.py + @$(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 Tue Mar 15 11:19:01 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 15 Mar 2011 10:19:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[13810] csw/mgar/pkg Message-ID: Revision: 13810 http://gar.svn.sourceforge.net/gar/?rev=13810&view=rev Author: wahwah Date: 2011-03-15 10:19:00 +0000 (Tue, 15 Mar 2011) Log Message: ----------- unrealircd: Initial commit, does not build yet. Modified Paths: -------------- csw/mgar/pkg/unrealircd/trunk/checksums Added Paths: ----------- csw/mgar/pkg/unrealircd/ csw/mgar/pkg/unrealircd/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/unrealircd/trunk/Makefile Deleted: csw/mgar/pkg/unrealircd/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2011-02-15 08:22:56 UTC (rev 13317) +++ csw/mgar/pkg/unrealircd/trunk/Makefile 2011-03-15 10:19:00 UTC (rev 13810) @@ -1,186 +0,0 @@ -# Copyright 2009 OpenCSW -# 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 -## -NAME = mypkg -VERSION = 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. -define BLURB - -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), -## $(PYPI_MIRROR) -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(NAME). 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 = $(NAME)-$(VERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\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)/$(NAME)-$(VERSION) -## -## 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 Copied: csw/mgar/pkg/unrealircd/trunk/Makefile (from rev 13576, csw/mgar/pkg/template/trunk/Makefile) =================================================================== --- csw/mgar/pkg/unrealircd/trunk/Makefile (rev 0) +++ csw/mgar/pkg/unrealircd/trunk/Makefile 2011-03-15 10:19:00 UTC (rev 13810) @@ -0,0 +1,23 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# Preliminary work done. It does not compile with Sun CC, there's a syntax +# error. With GCC, it fails when it doesn't find tre/regex.h, even though +# it's available in /opt/csw/include/tre/regex.h. The unrealircd build system +# seems to ignore CPPFLAGS. To be investigated. + +NAME = Unreal +VERSION = 3.2.8.1 +CATEGORIES = lib +DESCRIPTION = Open Source IRC Server +DISTNAME = $(NAME)3.2 +define BLURB +endef +SPKG_SOURCEURL = http://www.unrealircd.com +MASTER_SITES = http://www.unrealircd.com/downloads/ +DISTFILES = $(NAME)$(VERSION).tar.gz +CONFIGURE_ARGS = $(DIRPATHS) +BUILD_DEP_PKGS = CSWtre-dev +GARCOMPILER = GNU +include gar/category.mk Modified: csw/mgar/pkg/unrealircd/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2011-02-15 08:22:56 UTC (rev 13317) +++ csw/mgar/pkg/unrealircd/trunk/checksums 2011-03-15 10:19:00 UTC (rev 13810) @@ -0,0 +1 @@ +7b741e94e867c0a7370553fd01506c66 Unreal3.2.8.1.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 Mar 15 14:55:28 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 15 Mar 2011 13:55:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[13811] csw/mgar/gar/v2 Message-ID: Revision: 13811 http://gar.svn.sourceforge.net/gar/?rev=13811&view=rev Author: skayser Date: 2011-03-15 13:55:28 +0000 (Tue, 15 Mar 2011) Log Message: ----------- gar/v2: for platform builds use explicit -I $(GARDIR) instead of $(MAKEFLAGS) to avoid build errors Modified Paths: -------------- csw/mgar/gar/v2/gar.mk csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2011-03-15 10:19:00 UTC (rev 13810) +++ csw/mgar/gar/v2/gar.mk 2011-03-15 13:55:28 UTC (rev 13811) @@ -121,6 +121,9 @@ endef +# Heads up: Don't use MAKEFLAGS to propagate -I to remote GAR invocations as +# this will also make it visible to the build environment. Some software builds +# use hard-coded non-GNU make which then errs out on -I (unknown option). define _modulate_merge $(foreach ASSIGNMENT,$(3), merge-$(2): $(ASSIGNMENT) @@ -129,7 +132,7 @@ merge-$(2): @echo "[===== Building modulation '$(2)' on host '$$(BUILDHOST)' =====]" $$(if $$(and $$(BUILDHOST),$$(filter-out $$(THISHOST),$$(BUILDHOST))),\ - $(SSH) $$(BUILDHOST) "PATH=$$(PATH) MAKEFLAGS=\"$$(MAKEFLAGS)\" $(MAKE) -C $$(CURDIR) $(if $(GAR_PLATFORM),GAR_PLATFORM=$(GAR_PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\ + $(SSH) $$(BUILDHOST) "PATH=$$(PATH) $(MAKE) -I $$(GARDIR) -C $$(CURDIR) $(if $(GAR_PLATFORM),GAR_PLATFORM=$(GAR_PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\ $(MAKE) $(if $(GAR_PLATFORM),GAR_PLATFORM=$(GAR_PLATFORM)) MODULATION=$(2) $(3) merge-modulated\ ) @# The next line has intentionally been left blank to explicitly terminate this make rule Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-03-15 10:19:00 UTC (rev 13810) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-03-15 13:55:28 UTC (rev 13811) @@ -957,13 +957,18 @@ # This rule automatically logs into every host where a package for this software should # be built. It is especially suited for automated build bots. + +# Heads up: Don't use MAKEFLAGS to propagate -I to remote GAR invocations as +# this will also make it visible to the build environment. Some software builds +# use hard-coded non-GNU make which then errs out on -I (unknown option). + platforms: _PACKAGING_PLATFORMS=$(if $(ARCHALL),$(firstword $(PACKAGING_PLATFORMS)),$(PACKAGING_PLATFORMS)) platforms: $(foreach P,$(_PACKAGING_PLATFORMS),\ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ $(MAKE) GAR_PLATFORM=$P _package && ,\ - $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin MAKEFLAGS=\"$(MAKEFLAGS)\" $(MAKE) -C $(CURDIR) GAR_PLATFORM=$P _package" && \ + $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -I $(GARDIR) -C $(CURDIR) GAR_PLATFORM=$P _package" && \ ),\ $(error *** No host has been defined for platform $P)\ )\ @@ -978,7 +983,7 @@ echo " (built on this host)";\ $(MAKE) -s GAR_PLATFORM=$P _pkgshow;echo;,\ echo " (built on host '$(PACKAGING_HOST_$P)')";\ - $(SSH) $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin MAKEFLAGS=\"$(MAKEFLAGS)\" $(MAKE) -C $(CURDIR) -s GAR_PLATFORM=$P _pkgshow";echo;\ + $(SSH) $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -I $(GARDIR) -C $(CURDIR) -s GAR_PLATFORM=$P _pkgshow";echo;\ )\ ) @$(MAKECOOKIE) @@ -989,7 +994,7 @@ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ $(MAKE) -s GAR_PLATFORM=$P $* && ,\ - $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin MAKEFLAGS=\"$(MAKEFLAGS)\" $(MAKE) -C $(CURDIR) GAR_PLATFORM=$P $*" && \ + $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -I $(GARDIR) -C $(CURDIR) GAR_PLATFORM=$P $*" && \ ),\ $(error *** No host has been defined for platform $P)\ )\ 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 Mar 15 15:10:26 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 15 Mar 2011 14:10:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[13812] csw/mgar/pkg/libiconv/trunk/Makefile Message-ID: Revision: 13812 http://gar.svn.sourceforge.net/gar/?rev=13812&view=rev Author: dmichelsen Date: 2011-03-15 14:10:26 +0000 (Tue, 15 Mar 2011) Log Message: ----------- libiconv: Update gettext dependency Modified Paths: -------------- csw/mgar/pkg/libiconv/trunk/Makefile Modified: csw/mgar/pkg/libiconv/trunk/Makefile =================================================================== --- csw/mgar/pkg/libiconv/trunk/Makefile 2011-03-15 13:55:28 UTC (rev 13811) +++ csw/mgar/pkg/libiconv/trunk/Makefile 2011-03-15 14:10:26 UTC (rev 13812) @@ -54,8 +54,9 @@ # matter in any way as this library is only used for LD_PRELOAD and is never being # linked against during compile time. CHECKPKG_OVERRIDES_CSWlibiconv-utils += soname-not-part-of-filename|soname=libiconv.so.0|filename=preloadable_libiconv.so -CHECKPKG_OVERRIDES_CSWlibiconv-utils += shared-lib-pkgname-mismatch|sonames=libiconv.so.0|pkgname=CSWlibiconv-utils|expected=CSWlibiconv0| +CHECKPKG_OVERRIDES_CSWlibiconv-utils += shared-lib-pkgname-mismatch|sonames=libiconv.so.0|pkgname=CSWlibiconv-utils|expected=CSWlibiconv0 RUNTIME_DEP_PKGS_CSWlibiconv-utils += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibiconv-utils += CSWlibintl8 OBSOLETES_CSWlibiconv-utils = CSWiconv NOISAEXEC = 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 Mar 15 16:32:01 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 15 Mar 2011 15:32:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[13813] csw/mgar/pkg/libiconv/trunk/Makefile Message-ID: Revision: 13813 http://gar.svn.sourceforge.net/gar/?rev=13813&view=rev Author: dmichelsen Date: 2011-03-15 15:32:01 +0000 (Tue, 15 Mar 2011) Log Message: ----------- libiconv: Reorganize split Modified Paths: -------------- csw/mgar/pkg/libiconv/trunk/Makefile Modified: csw/mgar/pkg/libiconv/trunk/Makefile =================================================================== --- csw/mgar/pkg/libiconv/trunk/Makefile 2011-03-15 14:10:26 UTC (rev 13812) +++ csw/mgar/pkg/libiconv/trunk/Makefile 2011-03-15 15:32:01 UTC (rev 13813) @@ -33,7 +33,7 @@ PKGFILES_CSWlibcharset1 += $(call pkgfiles_lib,libcharset.so.1) # Now *this* time it is ok, iconv is the only package that is allowed to ship this! CHECKPKG_OVERRIDES_CSWlibcharset1 += disallowed-path|opt/csw/lib/charset.alias -PKGFILES_CSWlibcharset1 += $(libdir)/charset.alias +PKGFILES_CSWlibcharset1 += $(call baseisadirs,$(libdir),charset\.alias) PACKAGES += CSWlibiconv-dev CATALOGNAME_CSWlibiconv-dev = libiconv_dev @@ -49,6 +49,7 @@ SPKG_DESC_CSWlibiconv-utils = GNU iconv utility programs PKGFILES_CSWlibiconv-utils += $(bindir)/.* PKGFILES_CSWlibiconv-utils += .*iconv\.1.* +PKGFILES_CSWlibiconv-utils += .*/libiconv\.mo PKGFILES_CSWlibiconv-utils += $(call baseisadirs,$(libdir),preloadable_libiconv\.so) # The SONAME of preloadable_libiconv.so is set to libiconv.so.0, although it doesn't # matter in any way as this library is only used for LD_PRELOAD and is never being 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 Mar 15 17:36:58 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 15 Mar 2011 16:36:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[13814] csw/mgar/pkg/gnulinks/trunk/Makefile Message-ID: Revision: 13814 http://gar.svn.sourceforge.net/gar/?rev=13814&view=rev Author: bdwalton Date: 2011-03-15 16:36:57 +0000 (Tue, 15 Mar 2011) Log Message: ----------- gnulinks/trunk: drop the gettext packages from gnulinks Modified Paths: -------------- csw/mgar/pkg/gnulinks/trunk/Makefile Modified: csw/mgar/pkg/gnulinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnulinks/trunk/Makefile 2011-03-15 15:32:01 UTC (rev 13813) +++ csw/mgar/pkg/gnulinks/trunk/Makefile 2011-03-15 16:36:57 UTC (rev 13814) @@ -4,8 +4,7 @@ VENDOR_URL = http://opencsw.org -GLINKPKGS = CSWggettext CSWggettextrt CSWbinutils -GLINKPKGS += CSWggetopt CSWgwhois +GLINKPKGS = CSWbinutils CSWggetopt CSWgwhois 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 phipsy at users.sourceforge.net Tue Mar 15 18:36:32 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Tue, 15 Mar 2011 17:36:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[13815] csw/mgar/pkg/ruby-augeas/trunk/Makefile Message-ID: Revision: 13815 http://gar.svn.sourceforge.net/gar/?rev=13815&view=rev Author: phipsy Date: 2011-03-15 17:36:31 +0000 (Tue, 15 Mar 2011) Log Message: ----------- Working ruby-augeas Modified Paths: -------------- csw/mgar/pkg/ruby-augeas/trunk/Makefile Modified: csw/mgar/pkg/ruby-augeas/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby-augeas/trunk/Makefile 2011-03-15 16:36:57 UTC (rev 13814) +++ csw/mgar/pkg/ruby-augeas/trunk/Makefile 2011-03-15 17:36:31 UTC (rev 13815) @@ -35,7 +35,7 @@ ginstall -m 755 -d $(DESTDIR) ginstall -m 755 -d $(DESTDIR)$(sitearchdir) ginstall -m 755 -d $(DESTDIR)$(sitelibdir) - cd $(WORKSRC) && $(INSTALL_ENV) rake build + cd $(WORKSRC) && rake build ginstall -m 755 $(WORKSRC)/lib/augeas.rb $(DESTDIR)$(sitelibdir) ginstall -m 755 $(WORKSRC)/ext/augeas/_augeas.so $(DESTDIR)$(sitearchdir) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Tue Mar 15 18:37:30 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Tue, 15 Mar 2011 17:37:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[13816] csw/mgar/pkg/puppet/trunk/files/cswpuppetd Message-ID: Revision: 13816 http://gar.svn.sourceforge.net/gar/?rev=13816&view=rev Author: phipsy Date: 2011-03-15 17:37:29 +0000 (Tue, 15 Mar 2011) Log Message: ----------- Fixed cswpuppetd SMF method Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/files/cswpuppetd Modified: csw/mgar/pkg/puppet/trunk/files/cswpuppetd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2011-03-15 17:36:31 UTC (rev 13815) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2011-03-15 17:37:29 UTC (rev 13816) @@ -75,9 +75,9 @@ } get_pid_file() { - # The default pid file is /var/opt/csw/puppet/run/puppetd.pid + # The default pid file is /var/opt/csw/puppet/run/agent.pid # but a different pid file can be set in puppet.conf. - __pidfile="/var/opt/csw/puppet/run/puppetd.pid" + __pidfile="/var/opt/csw/puppet/run/agent.pid" conffile="/etc/opt/csw/puppet/puppet.conf" if [ -r "$conffile" ]; then pid_line=`get_line_with pidfile ${conffile}` 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 Mar 15 19:28:59 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 15 Mar 2011 18:28:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[13817] csw/mgar/pkg/perl/trunk/Makefile Message-ID: Revision: 13817 http://gar.svn.sourceforge.net/gar/?rev=13817&view=rev Author: bonivart Date: 2011-03-15 18:28:59 +0000 (Tue, 15 Mar 2011) Log Message: ----------- perl/trunk: Added missing platforms Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2011-03-15 17:37:29 UTC (rev 13816) +++ csw/mgar/pkg/perl/trunk/Makefile 2011-03-15 18:28:59 UTC (rev 13817) @@ -17,6 +17,7 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 PACKAGES += CSWperl 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 Mar 15 20:03:30 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 15 Mar 2011 19:03:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[13818] csw/mgar/pkg/mgar/trunk/Makefile Message-ID: Revision: 13818 http://gar.svn.sourceforge.net/gar/?rev=13818&view=rev Author: skayser Date: 2011-03-15 19:03:30 +0000 (Tue, 15 Mar 2011) Log Message: ----------- mgar: add bash auto completion Modified Paths: -------------- csw/mgar/pkg/mgar/trunk/Makefile Modified: csw/mgar/pkg/mgar/trunk/Makefile =================================================================== --- csw/mgar/pkg/mgar/trunk/Makefile 2011-03-15 18:28:59 UTC (rev 13817) +++ csw/mgar/pkg/mgar/trunk/Makefile 2011-03-15 19:03:30 UTC (rev 13818) @@ -1,10 +1,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) -# ! Check man pages for formatting/spelling bugs. Edit getting started to -# include some common tasks (see mgar wiki page). -# ! Add a license -# * Add bash auto-completion configuration +# NAME = mgar -VERSION = 0.90 +VERSION = 0.91 CATEGORIES = apps DESCRIPTION = Command line interface to the OpenCSW build system @@ -14,7 +11,7 @@ VENDOR_URL = http://gar.opencsw.org SVNROOT = https://opencsw.svn.sourceforge.net/svnroot/opencsw/gar-wrapper -SVNREV = 317 +SVNREV = 329 ARCHALL = 1 @@ -23,6 +20,7 @@ RUNTIME_DEP_PKGS += CSWfindutils RUNTIME_DEP_PKGS += CSWgmake RUNTIME_DEP_PKGS += CSWsvn +RUNTIME_DEP_PKGS += CSWbashcmplt RUNTIME_DEP_PKGS += CSWgardevel # Meta pkg. Pulls in deps required by GAR. CHECKPKG_OVERRIDES_CSWmgar += surplus-dependency @@ -37,13 +35,13 @@ build-custom: svn export --force -r $(SVNREV) $(SVNROOT)/ $(WORKSRC) a2x -d manpage -f manpage $(WORKSRC)/mgar.1.txt - a2x -d manpage -f manpage $(WORKSRC)/mgar.5.txt $(MAKECOOKIE) install-custom: mkdir -p $(DESTDIR)$(bindir) mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 + mkdir -p $(DESTDIR)$(prefix)/etc/bash_completion.d cp $(WORKSRC)/mgar $(DESTDIR)$(bindir) cp $(WORKSRC)/mgar.1 $(DESTDIR)$(mandir)/man1/ - cp $(WORKSRC)/mgar.5 $(DESTDIR)$(mandir)/man5/ + cp $(WORKSRC)/bash_completion.mgar $(DESTDIR)$(prefix)/etc/bash_completion.d $(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 Tue Mar 15 20:18:38 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 15 Mar 2011 19:18:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[13819] csw/mgar/pkg/mgar/trunk/Makefile Message-ID: Revision: 13819 http://gar.svn.sourceforge.net/gar/?rev=13819&view=rev Author: skayser Date: 2011-03-15 19:18:38 +0000 (Tue, 15 Mar 2011) Log Message: ----------- mgar/trunk: correct SVNREV Modified Paths: -------------- csw/mgar/pkg/mgar/trunk/Makefile Modified: csw/mgar/pkg/mgar/trunk/Makefile =================================================================== --- csw/mgar/pkg/mgar/trunk/Makefile 2011-03-15 19:03:30 UTC (rev 13818) +++ csw/mgar/pkg/mgar/trunk/Makefile 2011-03-15 19:18:38 UTC (rev 13819) @@ -11,7 +11,7 @@ VENDOR_URL = http://gar.opencsw.org SVNROOT = https://opencsw.svn.sourceforge.net/svnroot/opencsw/gar-wrapper -SVNREV = 329 +SVNREV = 359 ARCHALL = 1 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 Mar 15 20:50:37 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 15 Mar 2011 19:50:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[13820] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13820 http://gar.svn.sourceforge.net/gar/?rev=13820&view=rev Author: bdwalton Date: 2011-03-15 19:50:36 +0000 (Tue, 15 Mar 2011) Log Message: ----------- php5/trunk: update a few deps for new library splits Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-15 19:18:38 UTC (rev 13819) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-15 19:50:36 UTC (rev 13820) @@ -130,7 +130,7 @@ CATALOGNAME_CSWphp5-curl = php5_curl SPKG_DESC_CSWphp5-curl = The curl extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-curl = CSWphp5 CSWcurlrt CSWlibidn +RUNTIME_DEP_PKGS_CSWphp5-curl = CSWphp5 CSWcurlrt CSWlibidn11 RUNTIME_DEP_PKGS_CSWphp5-curl += CSWoldaprt CSWosslrt CSWzlib CSWlibcares OBSOLETES_CSWphp5-curl = CSWphp5curl @@ -161,13 +161,13 @@ CATALOGNAME_CSWphp5-gd = php5_gd SPKG_DESC_CSWphp5-gd = The gd extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-gd = CSWphp5 CSWftype2 CSWgd CSWjpeg +RUNTIME_DEP_PKGS_CSWphp5-gd = CSWphp5 CSWftype2 CSWlibgd2 CSWjpeg RUNTIME_DEP_PKGS_CSWphp5-gd += CSWpng CSWt1lib CSWxpm CSWzlib OBSOLETES_CSWphp5-gd = CSWphp5gd CATALOGNAME_CSWphp5-gettext = php5_gettext SPKG_DESC_CSWphp5-gettext = The gettext extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-gettext = CSWphp5 CSWggettextrt +RUNTIME_DEP_PKGS_CSWphp5-gettext = CSWphp5 CSWlibintl8 OBSOLETES_CSWphp5-gettext = CSWphp5gettext CATALOGNAME_CSWphp5-gmp = php5_gmp 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 Mar 15 20:53:22 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 15 Mar 2011 19:53:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[13821] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13821 http://gar.svn.sourceforge.net/gar/?rev=13821&view=rev Author: bdwalton Date: 2011-03-15 19:53:22 +0000 (Tue, 15 Mar 2011) Log Message: ----------- php5/trunk: move to -dev suffix, correct runtime dep lines for that split Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-15 19:50:36 UTC (rev 13820) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-15 19:53:22 UTC (rev 13821) @@ -28,7 +28,7 @@ DISTFILES += $(DISTNAME).tar.bz2 DISTFILES += php.ini.CSW phpext pear.conf.CSW CSWphp5.postinstall -PACKAGES = CSWphp5 CSWphp5devel +PACKAGES = CSWphp5 CSWphp5-dev PACKAGES += CSWap2-modphp5 PACKAGES += CSWphp5-bcmath PACKAGES += CSWphp5-bz2 @@ -97,10 +97,10 @@ SPKG_DESC_CSWphp5 = A High-Level Scripting Language INCOMPATIBLE_PKGS_CSWphp5 = CSWphp5mimemagic -CATALOGNAME_CSWphp5devel = php5_devel +CATALOGNAME_CSWphp5-dev = php5_dev SPKG_DESC_CSWphp5devel = Development files for php5 -RUNTIME_DEP_PKGS_CSWphp5 = CSWiconv -RUNTIME_DEP_PKGS_CSWphp5 += CSWlibxml2 CSWzlib +RUNTIME_DEP_PKGS_CSWphp5-dev = CSWphp5 +OBSOLETES_CSWphp5-dev = CSWphp5devel CATALOGNAME_CSWap2-modphp5 = ap2_modphp5 SPKG_DESC_CSWap2-modphp5 = The apache 2.2.x php5 module 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 Mar 15 20:57:31 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 15 Mar 2011 19:57:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[13822] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13822 http://gar.svn.sourceforge.net/gar/?rev=13822&view=rev Author: bdwalton Date: 2011-03-15 19:57:31 +0000 (Tue, 15 Mar 2011) Log Message: ----------- php5/trunk: complete the devel to dev switch Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-15 19:53:22 UTC (rev 13821) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-15 19:57:31 UTC (rev 13822) @@ -98,7 +98,7 @@ INCOMPATIBLE_PKGS_CSWphp5 = CSWphp5mimemagic CATALOGNAME_CSWphp5-dev = php5_dev -SPKG_DESC_CSWphp5devel = Development files for php5 +SPKG_DESC_CSWphp5-dev = Development files for php5 RUNTIME_DEP_PKGS_CSWphp5-dev = CSWphp5 OBSOLETES_CSWphp5-dev = CSWphp5devel @@ -380,24 +380,24 @@ RUNTIME_DEP_PKGS_CSWphp5-zip = CSWphp5 CSWzlib OBSOLETES_CSWphp5-zip = CSWphp5zip -PKGFILES_CSWphp5devel = $(bindir)/php-config -PKGFILES_CSWphp5devel += $(bindir)/phpize -PKGFILES_CSWphp5devel += $(bindir)/peardev -PKGFILES_CSWphp5devel += $(libdir)/php/build/.* -PKGFILES_CSWphp5devel += $(includedir)/php/TSRM.* -PKGFILES_CSWphp5devel += $(includedir)/php/Zend.* -PKGFILES_CSWphp5devel += $(includedir)/php/include.* -PKGFILES_CSWphp5devel += $(includedir)/php/main.* -PKGFILES_CSWphp5devel += $(includedir)/php/regex.* -PKGFILES_CSWphp5devel += $(includedir)/php/ext/date.* -PKGFILES_CSWphp5devel += $(includedir)/php/ext/filter.* -PKGFILES_CSWphp5devel += $(includedir)/php/ext/libxml.* -PKGFILES_CSWphp5devel += $(includedir)/php/ext/pcre.* -PKGFILES_CSWphp5devel += $(includedir)/php/ext/spl.* -PKGFILES_CSWphp5devel += $(includedir)/php/ext/standard.* -PKGFILES_CSWphp5devel += $(includedir)/php/ext/xml.* -PKGFILES_CSWphp5devel += $(mandir)/man1/php-config.1 -PKGFILES_CSWphp5devel += $(mandir)/man1/phpize.1 +PKGFILES_CSWphp5-dev = $(bindir)/php-config +PKGFILES_CSWphp5-dev += $(bindir)/phpize +PKGFILES_CSWphp5-dev += $(bindir)/peardev +PKGFILES_CSWphp5-dev += $(libdir)/php/build/.* +PKGFILES_CSWphp5-dev += $(includedir)/php/TSRM.* +PKGFILES_CSWphp5-dev += $(includedir)/php/Zend.* +PKGFILES_CSWphp5-dev += $(includedir)/php/include.* +PKGFILES_CSWphp5-dev += $(includedir)/php/main.* +PKGFILES_CSWphp5-dev += $(includedir)/php/regex.* +PKGFILES_CSWphp5-dev += $(includedir)/php/ext/date.* +PKGFILES_CSWphp5-dev += $(includedir)/php/ext/filter.* +PKGFILES_CSWphp5-dev += $(includedir)/php/ext/libxml.* +PKGFILES_CSWphp5-dev += $(includedir)/php/ext/pcre.* +PKGFILES_CSWphp5-dev += $(includedir)/php/ext/spl.* +PKGFILES_CSWphp5-dev += $(includedir)/php/ext/standard.* +PKGFILES_CSWphp5-dev += $(includedir)/php/ext/xml.* +PKGFILES_CSWphp5-dev += $(mandir)/man1/php-config.1 +PKGFILES_CSWphp5-dev += $(mandir)/man1/phpize.1 PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.* 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 Mar 15 23:45:53 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 15 Mar 2011 22:45:53 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[360] gar-wrapper Message-ID: Revision: 360 http://opencsw.svn.sourceforge.net/opencsw/?rev=360&view=rev Author: skayser Date: 2011-03-15 22:45:53 +0000 (Tue, 15 Mar 2011) Log Message: ----------- mgar: add license Modified Paths: -------------- gar-wrapper/mgar Added Paths: ----------- gar-wrapper/COPYING Added: gar-wrapper/COPYING =================================================================== --- gar-wrapper/COPYING (rev 0) +++ gar-wrapper/COPYING 2011-03-15 22:45:53 UTC (rev 360) @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. Modified: gar-wrapper/mgar =================================================================== --- gar-wrapper/mgar 2011-03-11 18:11:25 UTC (rev 359) +++ gar-wrapper/mgar 2011-03-15 22:45:53 UTC (rev 360) @@ -14,7 +14,25 @@ # # ---------------------------------------------------------------------------- # +# 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, see . +# +# Copyright (C) Sebastian Kayser , 2011 +# +# ---------------------------------------------------------------------------- +# # Todos: +# * Add template for ~/.garrc (think new users) # * Integrate the creation of a new package (with sanity check whether # package already exists). Use per-directory Makefile.template files. # * When packaging mgar, shield mgar up --self so that it won't override @@ -30,14 +48,6 @@ # * mgar commit: check for and warn on stale checksums file # * stuff that's indexed by namazu is overkill, reduce to speed up index? # -# Possible issues: -# * Make propagates a set of command line arguments to sub-invocations -# of make, among these arguments is -I. Which is fine as long as the -# invoked make is a gmake, if it's a hardcoded non-GNU make, it doesn't -# understand the -I option and the build will fail. -# http://www.gnu.org/software/automake/manual/make/Options_002fRecursion.html -# https://gar.svn.sf.net/svnroot/gar/csw/mgar/pkg/mairix/trunk/files/0001-Use-MAKE-instead-of-a-hardcoded-make.patch -# set -u set -e 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 Mar 15 23:46:53 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 15 Mar 2011 22:46:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[13823] csw/mgar/pkg/mgar/trunk/Makefile Message-ID: Revision: 13823 http://gar.svn.sourceforge.net/gar/?rev=13823&view=rev Author: skayser Date: 2011-03-15 22:46:53 +0000 (Tue, 15 Mar 2011) Log Message: ----------- mgar/trunk: bump upstream version to 360 (includes license) Modified Paths: -------------- csw/mgar/pkg/mgar/trunk/Makefile Modified: csw/mgar/pkg/mgar/trunk/Makefile =================================================================== --- csw/mgar/pkg/mgar/trunk/Makefile 2011-03-15 19:57:31 UTC (rev 13822) +++ csw/mgar/pkg/mgar/trunk/Makefile 2011-03-15 22:46:53 UTC (rev 13823) @@ -11,7 +11,7 @@ VENDOR_URL = http://gar.opencsw.org SVNROOT = https://opencsw.svn.sourceforge.net/svnroot/opencsw/gar-wrapper -SVNREV = 359 +SVNREV = 360 ARCHALL = 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 Mar 15 23:55:25 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 15 Mar 2011 22:55:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[13824] csw/mgar/pkg/mgar/trunk/Makefile Message-ID: Revision: 13824 http://gar.svn.sourceforge.net/gar/?rev=13824&view=rev Author: skayser Date: 2011-03-15 22:55:25 +0000 (Tue, 15 Mar 2011) Log Message: ----------- mgar/trunk: rename delivered bash_completion file to mgar Modified Paths: -------------- csw/mgar/pkg/mgar/trunk/Makefile Modified: csw/mgar/pkg/mgar/trunk/Makefile =================================================================== --- csw/mgar/pkg/mgar/trunk/Makefile 2011-03-15 22:46:53 UTC (rev 13823) +++ csw/mgar/pkg/mgar/trunk/Makefile 2011-03-15 22:55:25 UTC (rev 13824) @@ -43,5 +43,6 @@ mkdir -p $(DESTDIR)$(prefix)/etc/bash_completion.d cp $(WORKSRC)/mgar $(DESTDIR)$(bindir) cp $(WORKSRC)/mgar.1 $(DESTDIR)$(mandir)/man1/ - cp $(WORKSRC)/bash_completion.mgar $(DESTDIR)$(prefix)/etc/bash_completion.d + cp $(WORKSRC)/bash_completion.mgar \ + $(DESTDIR)$(prefix)/etc/bash_completion.d/mgar $(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 Mar 16 00:21:12 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 15 Mar 2011 23:21:12 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[361] gar-wrapper/mgar Message-ID: Revision: 361 http://opencsw.svn.sourceforge.net/opencsw/?rev=361&view=rev Author: skayser Date: 2011-03-15 23:21:12 +0000 (Tue, 15 Mar 2011) Log Message: ----------- mgar: restrict functions variables to local scope Modified Paths: -------------- gar-wrapper/mgar Modified: gar-wrapper/mgar =================================================================== --- gar-wrapper/mgar 2011-03-15 22:45:53 UTC (rev 360) +++ gar-wrapper/mgar 2011-03-15 23:21:12 UTC (rev 361) @@ -64,6 +64,7 @@ REQ_PKGS="findutils ggrep gmake namazu svn" function assert_required_tools { + local tool dir for tool in $REQ_TOOLS; do for dir in ${PATH//:/ }; do [ -x $dir/$tool ] && continue 2 @@ -79,29 +80,29 @@ } function update_self { - __rev=${1:-HEAD} + local __rev=${1:-HEAD} - [ -f $0.tmp ] && rm $0.tmp - svn export -r $__rev $SVN_SELF $0.tmp >/dev/null + [ -f $0.tmp ] && rm $0.tmp + svn export -r $__rev $SVN_SELF $0.tmp >/dev/null - if [ $? -ne 0 ]; then - echo "Error: Retrieval from SVN failed. Script untouched." >&2 - exit 1; - fi + if [ $? -ne 0 ]; then + echo "Error: Retrieval from SVN failed. Script untouched." >&2 + exit 1; + fi - oldv=`grep '# $Id' $0 | head -1` - newv=`grep '# $Id' $0.tmp | head -1` + oldv=`grep '# $Id' $0 | head -1` + newv=`grep '# $Id' $0.tmp | head -1` - if [ "$oldv" == "$newv" ]; then - echo "Script is already at the desired version. No replacement needed." - echo "Current version: $oldv" - rm $0.tmp - exit; - fi + if [ "$oldv" == "$newv" ]; then + echo "Script is already at the desired version. No replacement needed." + echo "Current version: $oldv" + rm $0.tmp + exit; + fi - mv $0.tmp $0 + mv $0.tmp $0 - cat <&2 @@ -199,7 +201,7 @@ } function init_buildtree { - __buildtree="$1" + local __buildtree="$1" if [ -a "$__buildtree" ]; then echo "The directory $__buildtree already exists. Please remove it." >&2 @@ -224,14 +226,14 @@ } function create_legacy_gar_link { - __buildsys="$1" + local __buildsys="$1" if [ ! -h "$__buildsys"/gar ]; then ( cd "$__buildsys" && ln -s . gar ) fi } function assert_multi_buildsys_tree { - __buildsys_tree="$1" + local __buildsys_tree="$1" # migrate from single-buildsys to multi-buildsys (<= mgar version 297) if [ -f "$__buildsys_tree"/category.mk ]; then @@ -247,7 +249,7 @@ # Commit working files (prefixes pkg path and checks for untracked changes) function verify_local_status_and_commit() { - + local opts __forceflag __logmsg __untracked # Beware: getopts stops on the first non-option argument, thus # "mgar . -m foo -f" won't see any getopts handling while getopts "fm:" opts ; do @@ -298,7 +300,7 @@ function get_pkg_buildsysdir() { # fallback to svn:externals until builds are adjusted to carry GARYTPE - __gartype=`read_makefile_value GARTYPE`; + local __gartype=`read_makefile_value GARTYPE`; if [ -z "$__gartype" ]; then __gartype=`svn pg svn:externals . | awk -F/ '/^gar/ { print $NF }'` fi @@ -307,7 +309,7 @@ # Build the index for locating Makefiles within the package build tree function build_index() { - __buildtree=$1 + local __buildtree=$1 [ -d "$__buildtree/.index" ] || mkdir "$__buildtree/.index" cd "$__buildtree" && mknmz \ -Ux \ @@ -320,9 +322,9 @@ # why we do a keyword search first and then - if a specific search "field" was # requested - narrow down the result set with grep. function search_index() { - __buildtree=${1-} - __term="$2" - __searchby="" + local __buildtree=${1-} + local __term="$2" + local __searchby="" [ -d "$__buildtree/.index" ] || \ { echo "Index not found, create it with: mgar index" >&2; exit 2; } 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 Mar 16 00:28:15 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 15 Mar 2011 23:28:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[13825] csw/mgar/pkg/bdb3/tags/ bdb3-stub-to-bdb33-UNRELEASED/ Message-ID: Revision: 13825 http://gar.svn.sourceforge.net/gar/?rev=13825&view=rev Author: skayser Date: 2011-03-15 23:28:15 +0000 (Tue, 15 Mar 2011) Log Message: ----------- bdb3/tags: remove checksum-error-prone tag directory http://www.mail-archive.com/maintainers at lists.opencsw.org/msg04628.html Removed Paths: ------------- csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/ 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 Mar 16 00:29:49 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 15 Mar 2011 23:29:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[13826] csw/mgar/pkg/bdb3/tags Message-ID: Revision: 13826 http://gar.svn.sourceforge.net/gar/?rev=13826&view=rev Author: skayser Date: 2011-03-15 23:29:49 +0000 (Tue, 15 Mar 2011) Log Message: ----------- bdb3/tags: restore bdb3-stub-to-bdb33-UNRELEASED, let's see whether problems re-occur Added Paths: ----------- csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/ csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/Makefile csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/checksums Added: csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/Makefile =================================================================== --- csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/Makefile (rev 0) +++ csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/Makefile 2011-03-15 23:29:49 UTC (rev 13826) @@ -0,0 +1,33 @@ +GARNAME = db +GARVERSION = 3.3.11 +CATEGORIES = lib + +DESCRIPTION = Stub package as contents moved to CSWbdb33 +define BLURB + Berkeley DB (libdb) is a programmatic toolkit that provides embedded database + support for both traditional and client/server applications. It includes + b+tree, queue, extended linear hashing, fixed, and variable-length record + access methods, transactions, locking, logging, shared memory caching and + database recovery. DB supports C, C++, Java, and Perl APIs. It is available + for a wide variety of UNIX platforms as well as Windows NT and Windows 95 + (MSVC 4, 5 and 6). +endef + +PACKAGES = CSWbdb3 +CATALOGNAME = berkeleydb3 + +ARCHALL = 1 +RUNTIME_DEP_PKGS = CSWbdb33 + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = custom + +TEST_SCRIPTS = + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(libdir) + ln -s ../bdb33/lib/libdb-3.3.so $(DESTDIR)$(libdir) + @$(MAKECOOKIE) Added: csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/checksums =================================================================== 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 Mar 16 01:07:54 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 16 Mar 2011 00:07:54 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[362] gar-wrapper/mgar Message-ID: Revision: 362 http://opencsw.svn.sourceforge.net/opencsw/?rev=362&view=rev Author: skayser Date: 2011-03-16 00:07:53 +0000 (Wed, 16 Mar 2011) Log Message: ----------- mgar: make show-buildsys fail gracefully on non-svn copies Modified Paths: -------------- gar-wrapper/mgar Modified: gar-wrapper/mgar =================================================================== --- gar-wrapper/mgar 2011-03-15 23:21:12 UTC (rev 361) +++ gar-wrapper/mgar 2011-03-16 00:07:53 UTC (rev 362) @@ -290,6 +290,18 @@ svn commit "${__log_args[@]:-}" "$@" } +function get_rev() { + local __file="$1" + ( svn info "$__file" || echo "Revision: unknown" ) | grep "Revision:" | \ + cut -d: -f2- | tr -d " " +} + +function get_repourl() { + local __file="$1" + ( svn info "$__file" || echo "URL: unknown" ) | grep ^URL: | \ + cut -d: -f2- | tr -d " " +} + function get_srcdir() { $0 -f <( cat Makefile; echo -e '\nsrcdir:\n\t at echo $(WORKSRC_FIRSTMOD)' ) srcdir } @@ -435,9 +447,9 @@ # per-pkg-cmds edit-file) $EDITOR `gfind \`get_srcdir\` -name "$2"`;; find-file) gfind "`get_srcdir`" -name "$2";; - show-buildsys) __rev="`svn info "$BUILDSYS" | grep ^Revision:`" - __branch=`svn info "$BUILDSYS" | grep ^URL: | awk -F/ '{ print $(NF-1)"/"$NF }'` - echo -e "$BUILDSYS\t($__rev, Branch: $__branch)" + show-buildsys) __rev=`get_rev "$BUILDSYS"` + __branch=`get_repourl "$BUILDSYS" | sed -e "s,$GAR_REPO,,"` + echo -e "$BUILDSYS\t(Revision: $__rev, Branch: $__branch)" ;; show-srcdir) echo `get_srcdir`;; show-stagedir) echo `get_stagedir`;; 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 Mar 16 01:08:37 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 16 Mar 2011 00:08:37 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[363] gar-wrapper/mgar Message-ID: Revision: 363 http://opencsw.svn.sourceforge.net/opencsw/?rev=363&view=rev Author: skayser Date: 2011-03-16 00:08:37 +0000 (Wed, 16 Mar 2011) Log Message: ----------- mgar: make show-buildsys fail gracefully on non-svn copies (add.) Modified Paths: -------------- gar-wrapper/mgar Modified: gar-wrapper/mgar =================================================================== --- gar-wrapper/mgar 2011-03-16 00:07:53 UTC (rev 362) +++ gar-wrapper/mgar 2011-03-16 00:08:37 UTC (rev 363) @@ -292,7 +292,7 @@ function get_rev() { local __file="$1" - ( svn info "$__file" || echo "Revision: unknown" ) | grep "Revision:" | \ + ( svn info "$__file" || echo "Revision: unknown" ) | grep "^Revision:" | \ cut -d: -f2- | tr -d " " } 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 Mar 16 01:49:50 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 16 Mar 2011 00:49:50 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[364] gar-wrapper/mgar Message-ID: Revision: 364 http://opencsw.svn.sourceforge.net/opencsw/?rev=364&view=rev Author: skayser Date: 2011-03-16 00:49:49 +0000 (Wed, 16 Mar 2011) Log Message: ----------- mgar: add newpkg-* to the recognized global commands Modified Paths: -------------- gar-wrapper/mgar Modified: gar-wrapper/mgar =================================================================== --- gar-wrapper/mgar 2011-03-16 00:08:37 UTC (rev 363) +++ gar-wrapper/mgar 2011-03-16 00:49:49 UTC (rev 364) @@ -35,6 +35,9 @@ # * Add template for ~/.garrc (think new users) # * Integrate the creation of a new package (with sanity check whether # package already exists). Use per-directory Makefile.template files. +# Example: +# mgar newpkg foo (picks up Makefile.tmpl) +# mgar newpkg --documented foo (picks up Makefile.tmpl-documented) # * When packaging mgar, shield mgar up --self so that it won't override # the package binary, but place it somewhere else. # * In commit mode, if (pwd.endswith('trunk') and svn.rev -eq 0) commit .. @@ -165,8 +168,12 @@ __global_cmds=`sed -ne '/^# global-cmds/,/^# \/global-cmds/p' $0 | \ ggrep -E '^\s*[^)]+\) ' | cut -d\) -f1 | tr '|' '\n'` + # Use a case construct to also match wildcard items from the global + # command list (e.g. newpkg-foo should match newpkg-* from the list) while read cmd; do - [ "$cmd" == "$1" ] && return 1 + case $1 in + $cmd) return 1;; + esac done < <( echo "$__global_cmds" ) return 0 @@ -424,6 +431,7 @@ # global-cmds index) build_index "$BUILDTREE";; locate) shift; search_index "$BUILDTREE" "${1-}";; + newpkg-*) gmake "$@";; # temporary, should be replaced, see TODO show-pkgtree) echo "$BUILDTREE";; commit|ci) shift; verify_local_status_and_commit "$@";; scm) shift; svn $@;; 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 Mar 16 04:12:41 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 16 Mar 2011 03:12:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[13827] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13827 http://gar.svn.sourceforge.net/gar/?rev=13827&view=rev Author: bdwalton Date: 2011-03-16 03:12:40 +0000 (Wed, 16 Mar 2011) Log Message: ----------- php5/trunk: override a few gmp checkpkg issues for now (lib found, is valid) Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-15 23:29:49 UTC (rev 13826) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-16 03:12:40 UTC (rev 13827) @@ -698,6 +698,8 @@ CHECKPKG_OVERRIDES_CSWphp5-pspell += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-wddx += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-gmp += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-gmp += soname-not-found|libgmp.so.3|is|needed|by|opt/csw/php5/lib/php/extensions/no-debug-non-zts-20090626/gmp.so +CHECKPKG_OVERRIDES_CSWphp5-gmp += surplus-dependency|CSWlibgmp CHECKPKG_OVERRIDES_CSWphp5-mssql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pcntl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-zip += surplus-dependency|CSWphp5 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 Mar 16 04:23:27 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 16 Mar 2011 03:23:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[13828] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13828 http://gar.svn.sourceforge.net/gar/?rev=13828&view=rev Author: bdwalton Date: 2011-03-16 03:23:27 +0000 (Wed, 16 Mar 2011) Log Message: ----------- php5/trunk: drop the mhash module, mark primary package I with it (now included in hash module with full bc) Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-16 03:12:40 UTC (rev 13827) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-16 03:23:27 UTC (rev 13828) @@ -50,7 +50,6 @@ PACKAGES += CSWphp5-ldap PACKAGES += CSWphp5-mbstring PACKAGES += CSWphp5-mcrypt -PACKAGES += CSWphp5-mhash PACKAGES += CSWphp5-mssql PACKAGES += CSWphp5-mysql PACKAGES += CSWphp5-mysqli @@ -95,7 +94,7 @@ CATALOGNAME_CSWphp5 = php5 SPKG_DESC_CSWphp5 = A High-Level Scripting Language -INCOMPATIBLE_PKGS_CSWphp5 = CSWphp5mimemagic +INCOMPATIBLE_PKGS_CSWphp5 = CSWphp5mimemagic CSWphp5mhash CATALOGNAME_CSWphp5-dev = php5_dev SPKG_DESC_CSWphp5-dev = Development files for php5 @@ -209,11 +208,6 @@ RUNTIME_DEP_PKGS_CSWphp5-mcrypt = CSWphp5 CSWlibmcrypt CSWlibltdl7 OBSOLETES_CSWphp5-mcrypt = CSWphp5mcrypt -CATALOGNAME_CSWphp5-mhash = php5_mhash -SPKG_DESC_CSWphp5-mhash = The mhash extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-mhash = CSWphp5 CSWlibmhash -OBSOLETES_CSWphp5-mhash = CSWphp5mhash - CATALOGNAME_CSWphp5-mssql = php5_mssql SPKG_DESC_CSWphp5-mssql = The mssql extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-mssql = CSWphp5 CSWfreetds @@ -448,8 +442,6 @@ PKGFILES_CSWphp5-mcrypt = .*/lib/php/extensions/.*/mcrypt.* -PKGFILES_CSWphp5-mhash = .*/lib/php/extensions/.*/mhash.* - PKGFILES_CSWphp5-mimemagic = .*/lib/php/extensions/.*/mime_magic.* PKGFILES_CSWphp5-mssql = .*/lib/php/extensions/.*/mssql.* @@ -714,7 +706,6 @@ CHECKPKG_OVERRIDES_CSWphp5-xmlrpc += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pgsql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-shmop += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-mhash += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-session += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5-pdo CHECKPKG_OVERRIDES_CSWphp5-sysvsem += surplus-dependency|CSWphp5 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 Mar 16 04:26:12 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 16 Mar 2011 03:26:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[13829] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13829 http://gar.svn.sourceforge.net/gar/?rev=13829&view=rev Author: bdwalton Date: 2011-03-16 03:26:12 +0000 (Wed, 16 Mar 2011) Log Message: ----------- php5/trunk: override a few more dep warnings Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-16 03:23:27 UTC (rev 13828) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-16 03:26:12 UTC (rev 13829) @@ -653,6 +653,9 @@ SKIPTEST = 1 #ENABLE_CHECK = 0 +CHECKPKG_OVERRIDES_CSWphp5-dev += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWmod-php5 += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWmod-php5 += surplus-dependency|CSWapache CHECKPKG_OVERRIDES_CSWphp5-pdo += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-bcmath += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-gd += surplus-dependency|CSWphp5 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 Mar 16 07:41:07 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Wed, 16 Mar 2011 06:41:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[13830] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 13830 http://gar.svn.sourceforge.net/gar/?rev=13830&view=rev Author: rthurner Date: 2011-03-16 06:41:07 +0000 (Wed, 16 Mar 2011) Log Message: ----------- subversion: checkpkg .... Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-03-16 03:26:12 UTC (rev 13829) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-03-16 06:41:07 UTC (rev 13830) @@ -45,7 +45,7 @@ CATALOGNAME_CSWsvn = subversion RUNTIME_DEP_PKGS_CSWsvn = CSWbdb48 RUNTIME_DEP_PKGS_CSWsvn += CSWexpat -RUNTIME_DEP_PKGS_CSWsvn += CSWggettextrt +RUNTIME_DEP_PKGS_CSWsvn += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsvn += CSWiconv RUNTIME_DEP_PKGS_CSWsvn += CSWneon RUNTIME_DEP_PKGS_CSWsvn += CSWlibserf0-0 @@ -71,7 +71,20 @@ CHECKPKG_OVERRIDES_CSWsvn-contrib += missing-dependency|CSWperl CHECKPKG_OVERRIDES_CSWsvn-contrib += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWsvn-contrib += missing-dependency|CSWemacscommon +CHECKPKG_OVERRIDES_CSWsvn-contrib += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/contrib/cgi/tweak-log.cgi +CHECKPKG_OVERRIDES_CSWsvn-contrib += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/contrib/hook-scripts/commit-block-joke.py +CHECKPKG_OVERRIDES_CSWsvn-contrib += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/contrib/hook-scripts/case-insensitive.py +CHECKPKG_OVERRIDES_CSWsvn-contrib += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/contrib/server-side/backup-recipe.sh +CHECKPKG_OVERRIDES_CSWsvn-contrib += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/contrib/server-side/svnstsw/README +CHECKPKG_OVERRIDES_CSWsvn-contrib += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/contrib/server-side/svnstsw/INSTALL +CHECKPKG_OVERRIDES_CSWsvn-contrib += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/contrib/server-side/svnstsw/conf/find_apr.m4 +CHECKPKG_OVERRIDES_CSWsvn-contrib += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/contrib/client-side/svnmerge/svnmerge-migrate-test.sh +CHECKPKG_OVERRIDES_CSWsvn-contrib += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/contrib/client-side/svncopy/svncopy.README +CHECKPKG_OVERRIDES_CSWsvn-contrib += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/contrib/client-side/svn2cl/README +CHECKPKG_OVERRIDES_CSWsvn-contrib += file-with-bad-content|/export/home|root/opt/csw/share/doc/subversion/contrib/cgi/mirror_dir_through_svn.cgi +CHECKPKG_OVERRIDES_CSWsvn-contrib += catalogname-does-not-match-pkgname|pkgname=CSWsvn-contrib|catalogname=subversion_contrib|expected-catalogname=svn_contrib + SPKG_DESC_CSWsvn-tools = Additional subversion tools CATALOGNAME_CSWsvn-tools = subversion_tools PKGFILES_CSWsvn-tools = $(docdir)/subversion/tools.* @@ -80,12 +93,24 @@ CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWruby CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWemacscommon +CHECKPKG_OVERRIDES_CSWsvn-tools += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/tools/examples/testwrite.c +CHECKPKG_OVERRIDES_CSWsvn-tools += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/tools/examples/svnput.c +CHECKPKG_OVERRIDES_CSWsvn-tools += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/tools/examples/headrev.c +CHECKPKG_OVERRIDES_CSWsvn-tools += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/tools/examples/minimal_client.c +CHECKPKG_OVERRIDES_CSWsvn-tools += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/tools/examples/getlocks_test.c +CHECKPKG_OVERRIDES_CSWsvn-tools += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/tools/dev/prebuild-cleanup.sh +CHECKPKG_OVERRIDES_CSWsvn-tools += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/tools/buildbot/slaves/i686-debian-sarge1/svnbuild.sh +CHECKPKG_OVERRIDES_CSWsvn-tools += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnbuild.sh +CHECKPKG_OVERRIDES_CSWsvn-tools += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh +CHECKPKG_OVERRIDES_CSWsvn-tools += file-with-bad-content|/usr/share|root/opt/csw/share/doc/subversion/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh +CHECKPKG_OVERRIDES_CSWsvn-tools += catalogname-does-not-match-pkgname|pkgname=CSWsvn-tools|catalogname=subversion_tools|expected-catalogname=svn_tools + SPKG_DESC_CSWap2svn = Subversion Modules for Apache 2.2 CATALOGNAME_CSWap2svn = ap2_subversion RUNTIME_DEP_PKGS_CSWap2svn = CSWsvn RUNTIME_DEP_PKGS_CSWap2svn += CSWapache2 -RUNTIME_DEP_PKGS_CSWap2svn += CSWggettextrt +RUNTIME_DEP_PKGS_CSWap2svn += CSWlibintl8 RUNTIME_DEP_PKGS_CSWap2svn += CSWiconv PKGFILES_CSWap2svn = $(prefix)/apache2.* PKGFILES_CSWap2svn += $(docdir)/$(CATALOGNAME_CSWap2svn)/changelog.CSW @@ -97,7 +122,7 @@ RUNTIME_DEP_PKGS_CSWjavasvn += CSWexpat RUNTIME_DEP_PKGS_CSWjavasvn += CSWsvn RUNTIME_DEP_PKGS_CSWjavasvn += CSWiconv -RUNTIME_DEP_PKGS_CSWjavasvn += CSWggettextrt +RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibintl8 RUNTIME_DEP_PKGS_CSWjavasvn += CSWneon RUNTIME_DEP_PKGS_CSWjavasvn += CSWoldaprt RUNTIME_DEP_PKGS_CSWjavasvn += CSWapr-util @@ -118,7 +143,7 @@ RUNTIME_DEP_PKGS_CSWpmsvn += CSWexpat RUNTIME_DEP_PKGS_CSWpmsvn += CSWsvn RUNTIME_DEP_PKGS_CSWpmsvn += CSWiconv -RUNTIME_DEP_PKGS_CSWpmsvn += CSWggettextrt +RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibintl8 RUNTIME_DEP_PKGS_CSWpmsvn += CSWoldaprt RUNTIME_DEP_PKGS_CSWpmsvn += CSWapr-util RUNTIME_DEP_PKGS_CSWpmsvn += CSWbdb48 @@ -129,7 +154,7 @@ PKGFILES_CSWrbsvn = $(libdir)/ruby.* PKGFILES_CSWrbsvn += $(SVNLIB)/.*swig_ruby.* PKGFILES_CSWrbsvn += $(docdir)/$(CATALOGNAME_CSWrbsvn)/changelog.CSW -RUNTIME_DEP_PKGS_CSWrbsvn += CSWggettextrt +RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibintl8 RUNTIME_DEP_PKGS_CSWrbsvn += CSWsvn RUNTIME_DEP_PKGS_CSWrbsvn += CSWiconv RUNTIME_DEP_PKGS_CSWrbsvn += CSWruby @@ -150,7 +175,7 @@ RUNTIME_DEP_PKGS_CSWpythonsvn += CSWpython RUNTIME_DEP_PKGS_CSWpythonsvn += CSWsvn RUNTIME_DEP_PKGS_CSWpythonsvn += CSWiconv -RUNTIME_DEP_PKGS_CSWpythonsvn += CSWggettextrt +RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibintl8 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWoldaprt RUNTIME_DEP_PKGS_CSWpythonsvn += CSWapr-util RUNTIME_DEP_PKGS_CSWpythonsvn += CSWbdb48 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 Mar 16 07:53:11 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Wed, 16 Mar 2011 06:53:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[13831] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 13831 http://gar.svn.sourceforge.net/gar/?rev=13831&view=rev Author: rthurner Date: 2011-03-16 06:53:11 +0000 (Wed, 16 Mar 2011) Log Message: ----------- subversion: checkpkg Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-03-16 06:41:07 UTC (rev 13830) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-03-16 06:53:11 UTC (rev 13831) @@ -63,6 +63,7 @@ PKGFILES_CSWsvn-devel = $(PKGFILES_DEVEL) PKGFILES_CSWsvn-devel += $(docdir)/$(CATALOGNAME_CSWsvn-devel)/changelog.CSW CHECKPKG_OVERRIDES_CSWsvn-devel += archall-devel-package +CHECKPKG_OVERRIDES_CSWsvn-devel += catalogname-does-not-match-pkgname|pkgname=CSWsvn-devel|catalogname=subversion_devel|expected-catalogname=svn_devel SPKG_DESC_CSWsvn-contrib = Contributed subversion scripts CATALOGNAME_CSWsvn-contrib = subversion_contrib @@ -114,7 +115,9 @@ RUNTIME_DEP_PKGS_CSWap2svn += CSWiconv PKGFILES_CSWap2svn = $(prefix)/apache2.* PKGFILES_CSWap2svn += $(docdir)/$(CATALOGNAME_CSWap2svn)/changelog.CSW +CHECKPKG_OVERRIDES_CSWap2svn += catalogname-does-not-match-pkgname|pkgname=CSWap2svn|catalogname=ap2_subversion|expected-catalogname=ap2svn + SPKG_DESC_CSWjavasvn = Subversion Java Language Binding CATALOGNAME_CSWjavasvn = javasvn PKGFILES_CSWjavasvn = $(SVNLIB)/.*java.* 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 Mar 16 09:19:14 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 16 Mar 2011 08:19:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[13832] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 13832 http://gar.svn.sourceforge.net/gar/?rev=13832&view=rev Author: wahwah Date: 2011-03-16 08:19:14 +0000 (Wed, 16 Mar 2011) Log Message: ----------- mGAR v2: Set CATALOG_RELEASE based on hostname Checkpkg needs to know, against which catalog release should given packages be checked. Since GAR invokes checkpkg, GAR needs to know that too. On the OpenCSW buildfarm, hosts are named after catalog releases, for example 'current9s' is a host with packages from 'current'. This patch makes gar determine the checking catalog release based on the host name. A solution for off-buildfarm use has not been determined. Signed-off-by: Maciej Blizinski Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-03-16 06:53:11 UTC (rev 13831) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-03-16 08:19:14 UTC (rev 13832) @@ -57,8 +57,11 @@ GARPKG_v1 = CSWgar-v1 GARPKG_v2 = CSWgar-v2 RUNTIME_DEP_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown)) -CATALOG_RELEASE ?= current +# Set the catalog release based on hostname. E.g. building on current9s will +# set CATALOG_RELEASE to 'current'. +CATALOG_RELEASE ?= $(shell hostname | gsed -e 's/[0-9].*$$//') + define obsoleted_pkg CATALOGNAME_$(1) ?= $(call catalogname,$(1)) # The length of the description has been limited to 100 characters, 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 Mar 16 09:19:51 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 16 Mar 2011 08:19:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[13833] csw/mgar/gar/v2/lib/python Message-ID: Revision: 13833 http://gar.svn.sourceforge.net/gar/?rev=13833&view=rev Author: wahwah Date: 2011-03-16 08:19:51 +0000 (Wed, 16 Mar 2011) Log Message: ----------- checkpkg: /opt/csw/lib/sparcv8 -> /opt/csw/lib Some packages have pkgmap entries such as /opt/csw/lib/sparcv8/libfoo.so.1. However, /opt/csw/lib/sparcv8 is a symlink, not a directory, so physical files end up elsewhere: in /opt/csw/lib. This mismatch between the pkgmap entry and physical file on disk needs to be tackled in checkpkg. Signed-off-by: Maciej Blizinski Modified Paths: -------------- csw/mgar/gar/v2/lib/python/common_constants.py csw/mgar/gar/v2/lib/python/ldd_emul_test.py Property Changed: ---------------- csw/mgar/gar/v2/lib/python/ldd_emul_test.py Modified: csw/mgar/gar/v2/lib/python/common_constants.py =================================================================== --- csw/mgar/gar/v2/lib/python/common_constants.py 2011-03-16 08:19:14 UTC (rev 13832) +++ csw/mgar/gar/v2/lib/python/common_constants.py 2011-03-16 08:19:51 UTC (rev 13833) @@ -14,6 +14,7 @@ ("/opt/csw/bdb4", ("/opt/csw/bdb42",)), ("/64", ("/amd64", "/sparcv9")), ("/opt/csw/lib/i386", ("/opt/csw/lib",)), + ("/opt/csw/lib/sparcv8", ("/opt/csw/lib",)), ) DEFAULT_INSTALL_CONTENTS_FILE = "/var/sadm/install/contents" Modified: csw/mgar/gar/v2/lib/python/ldd_emul_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/ldd_emul_test.py 2011-03-16 08:19:14 UTC (rev 13832) +++ csw/mgar/gar/v2/lib/python/ldd_emul_test.py 2011-03-16 08:19:51 UTC (rev 13833) @@ -1,3 +1,5 @@ +#!/usr/bin/env python2.6 + import unittest import ldd_emul import mox @@ -123,25 +125,37 @@ self.assertFalse(not_expected in result, "%s is in %s" % (not_expected, result)) - def testEmulateSymlinks_5(self): + def SystemLibSymlinkExpansion_LibPresent(self, lib_symlink): """Install time symlink expansion.""" - runpath_list = ["/opt/csw/lib/i386"] + runpath_list = [lib_symlink] expected = "/opt/csw/lib" result = self.e.Emulate64BitSymlinks(runpath_list) self.assertTrue(expected in result, "%s not in %s" % (expected, result)) - def testEmulateSymlinks_6(self): + def SystemLibSymlinkExpansion_LibSubdirAbsent(self, lib_symlink): """ExpandSymlink for /opt/csw/lib/i386.""" - runpath_list = ["/opt/csw/lib/i386"] + runpath_list = [lib_symlink] expected = "/opt/csw/lib" - not_expected = "/opt/csw/lib/i386" - result = self.e.ExpandSymlink("/opt/csw/lib/i386", - "/opt/csw/lib", - "/opt/csw/lib/i386") + not_expected = lib_symlink + result = self.e.ExpandSymlink(lib_symlink, + "/opt/csw/lib", + lib_symlink) self.assertTrue(expected in result, "%s not in %s" % (expected, result)) self.assertFalse(not_expected in result, "%s is in %s" % (not_expected, result)) + def testLibPresent_i386(self): + self.SystemLibSymlinkExpansion_LibPresent("/opt/csw/lib/i386") + + def testLibPresent_sparcv8(self): + self.SystemLibSymlinkExpansion_LibPresent("/opt/csw/lib/sparcv8") + + def testLibSubdirAbsent_i386(self): + self.SystemLibSymlinkExpansion_LibSubdirAbsent("/opt/csw/lib/i386") + + def testLibSubdirAbsent_sparcv8(self): + self.SystemLibSymlinkExpansion_LibSubdirAbsent("/opt/csw/lib/sparcv8") + def testSanitizeRunpath_1(self): self.assertEqual("/opt/csw/lib", self.e.SanitizeRunpath("/opt/csw/lib/")) Property changes on: csw/mgar/gar/v2/lib/python/ldd_emul_test.py ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Wed Mar 16 09:33:22 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Wed, 16 Mar 2011 08:33:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[13827] csw/mgar/pkg/php5/trunk/Makefile In-Reply-To: References: Message-ID: This is caused by incorrect pkgmap entries in libgmp. I've added a workaround to checkpkg in r13833. http://sourceforge.net/apps/trac/gar/changeset/13833 Maciej From bonivart at users.sourceforge.net Wed Mar 16 10:04:40 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 16 Mar 2011 09:04:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[13834] csw/mgar/pkg/perl/trunk Message-ID: Revision: 13834 http://gar.svn.sourceforge.net/gar/?rev=13834&view=rev Author: bonivart Date: 2011-03-16 09:04:40 +0000 (Wed, 16 Mar 2011) Log Message: ----------- perl/trunk: Clean up Makefile. Remove INC-reorder patch (not needed). Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/perl/trunk/files/0001-change-inc-based-on-rhel5-patch.patch Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2011-03-16 08:19:51 UTC (rev 13833) +++ csw/mgar/pkg/perl/trunk/Makefile 2011-03-16 09:04:40 UTC (rev 13834) @@ -20,22 +20,19 @@ PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -PACKAGES += CSWperl -SPKG_DESC_CSWperl = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm3 +PACKAGES += CSWperl +SPKG_DESC_CSWperl = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm3 INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags -PACKAGES += CSWperldoc -SPKG_DESC_CSWperldoc = Perl documentation +PACKAGES += CSWperldoc +SPKG_DESC_CSWperldoc = Perl documentation RUNTIME_DEP_PKGS_CSWperldoc = CSWperl -ARCHALL_CSWperldoc = 1 +ARCHALL_CSWperldoc = 1 LICENSE = Copying -# Will need to fix this patch to make it apply to 5.12.3 -#PATCHFILES += 0001-change-inc-based-on-rhel5-patch.patch - -CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content +CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl @@ -90,11 +87,11 @@ CONFIGURE_ARGS += -Dusesitecustomize CONFIGURE_ARGS += -Dusethreads +# When built on Solaris 10, enable DTrace support ifeq ($(shell uname -r), 5.10) CONFIGURE_ARGS += -Dusedtrace endif -#CONFIGURE_ARGS += -Dusedtrace CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl/csw CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl/csw CONFIGURE_ARGS += -Dvendorprefix=$(prefix) @@ -122,7 +119,7 @@ EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod -# Tests take a long time +# Tests take a long time, run once for every release #TEST_SCRIPTS = # Make sure we don't include the path to the newly built perl as the @@ -167,18 +164,6 @@ ln -s libperl.so.$(VERSION) libperl.so.$(LIB_MINOR) ; \ ln -s libperl.so.$(VERSION) libperl.so ) @$(MAKECOOKIE) -# echo YOUAREHERE -# ( cd $(DESTDIR)$(libdir)/perl/$(VERSION)/${TARGET}/CORE ; \ -# chmod 755 libperl.so.$(VERSION) ; \ -# rm libperl.so.$(LIB_MINOR) libperl.so ; \ -# ln -s libperl.so.$(VERSION) libperl.so.$(LIB_MINOR) ; \ -# ln -s libperl.so.$(VERSION) libperl.so ) -# ( cd $(DESTDIR)$(libdir)/perl/$(VERSION)/${TARGET} ; \ -# rm libperl* ; \ -# ln -s CORE/libperl.so.$(VERSION) libperl.so.$(VERSION) ; \ -# ln -s CORE/libperl.so.$(VERSION) libperl.so.$(LIB_MINOR) ; \ -# ln -s CORE/libperl.so.$(VERSION) libperl.so ) -# $(MAKECOOKIE) # Remove build paths from Config POST_TARGETS += perlconf Deleted: csw/mgar/pkg/perl/trunk/files/0001-change-inc-based-on-rhel5-patch.patch =================================================================== --- csw/mgar/pkg/perl/trunk/files/0001-change-inc-based-on-rhel5-patch.patch 2011-03-16 08:19:51 UTC (rev 13833) +++ csw/mgar/pkg/perl/trunk/files/0001-change-inc-based-on-rhel5-patch.patch 2011-03-16 09:04:40 UTC (rev 13834) @@ -1,60 +0,0 @@ -From 621b2f69f661118c3f35bed411259d08cc984a20 Mon Sep 17 00:00:00 2001 -From: Peter Bonivart -Date: Wed, 5 Jan 2011 17:57:25 +0100 -Subject: [PATCH] change-inc-based-on-rhel5-patch - ---- - perl.c | 23 ++++++++++++----------- - 1 files changed, 12 insertions(+), 11 deletions(-) - -diff --git a/perl.c b/perl.c -index 94f2b13..a29dcc3 100644 ---- a/perl.c -+++ b/perl.c -@@ -4879,9 +4879,6 @@ S_init_perllib(pTHX) - incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE); - #endif - --#ifdef ARCHLIB_EXP -- incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE); --#endif - #ifdef MACOS_TRADITIONAL - { - Stat_t tmpstatbuf; -@@ -4903,14 +4900,6 @@ S_init_perllib(pTHX) - if (!PL_tainting) - incpush(":", FALSE, FALSE, TRUE, FALSE); - #else --#ifndef PRIVLIB_EXP --# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl" --#endif --#if defined(WIN32) -- incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE); --#else -- incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE); --#endif - - #ifdef SITEARCH_EXP - /* sitearch is always relative to sitelib on Windows for -@@ -4958,6 +4947,18 @@ S_init_perllib(pTHX) - incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE, TRUE); - #endif - -+#ifdef ARCHLIB_EXP -+ incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE); -+#endif -+#ifndef PRIVLIB_EXP -+# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl" -+#endif -+#if defined(WIN32) -+ incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE); -+#else -+ incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE); -+#endif -+ - if (!PL_tainting) - incpush(".", FALSE, FALSE, TRUE, FALSE); - #endif /* MACOS_TRADITIONAL */ --- -1.7.3.2 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Mar 16 13:44:30 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 16 Mar 2011 12:44:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[13835] csw/mgar/pkg/libdbi/trunk/Makefile Message-ID: Revision: 13835 http://gar.svn.sourceforge.net/gar/?rev=13835&view=rev Author: dmichelsen Date: 2011-03-16 12:44:30 +0000 (Wed, 16 Mar 2011) Log Message: ----------- libdbi: Some restructuring and minor cleanup Modified Paths: -------------- csw/mgar/pkg/libdbi/trunk/Makefile Modified: csw/mgar/pkg/libdbi/trunk/Makefile =================================================================== --- csw/mgar/pkg/libdbi/trunk/Makefile 2011-03-16 09:04:40 UTC (rev 13834) +++ csw/mgar/pkg/libdbi/trunk/Makefile 2011-03-16 12:44:30 UTC (rev 13835) @@ -16,16 +16,17 @@ # File name regex to get notifications about upstream software releases UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWlibdbi1 CSWlibdbi-devel - +PACKAGES += CSWlibdbi1 CATALOGNAME_CSWlibdbi1 = libdbi1 -CATALOGNAME_CSWlibdbi-devel = libdbi_devel +SPKG_DESC_CSWlibdbi1 = A database-independent abstraction layer, libdbi.so.1 +PKGFILES_CSWlibdbi1 = $(call pkgfiles_lib,libdbi.so.1) -SPKG_DESC_CSWlibdbi1 = $(DESCRIPTION) containing libdbi.so.1 -SPKG_DESC_CSWlibdbi-devel = Development files for libdbi +PACKAGES += CSWlibdbi-dev +CATALOGNAME_CSWlibdbi-dev = libdbi_dev +SPKG_DESC_CSWlibdbi-dev = Development files for libdbi.so.1 +RUNTIME_DEP_PKGS_CSWlibdbi-dev = CSWlibdbi1 +OBSOLETES_CSWlibdbi-dev = CSWlibdbi-devel -RUNTIME_DEP_PKGS_CSWlibdbi-devel = CSWlibdbi1 - BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --docdir=$(docdir)/libdbi @@ -41,8 +42,12 @@ TEST_TARGET = check INSTALL_OVERRIDE_VARS = docdir -INSTALL_OVERRIDE_VAR_docdir = $(docdir)/libdbi-devel +INSTALL_OVERRIDE_VAR_docdir = $(docdir)/libdbi_dev -PKGFILES_CSWlibdbi1 = $(PKGFILES_RT) +include gar/category.mk -include gar/category.mk +post-install-modulated: + perl -pi -e 's,/usr/local,$(prefix),g' \ + $(DESTDIR)$(docdir)/libdbi_dev/programmers-guide/x276.html \ + $(DESTDIR)$(docdir)/libdbi_dev/programmers-guide/quickstart-code.html + @$(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 Mar 16 14:53:00 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 16 Mar 2011 13:53:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[13836] csw/mgar/pkg/rrdtool/trunk Message-ID: Revision: 13836 http://gar.svn.sourceforge.net/gar/?rev=13836&view=rev Author: dmichelsen Date: 2011-03-16 13:52:59 +0000 (Wed, 16 Mar 2011) Log Message: ----------- rrdtool: Update to 1.4.5, massive restructuring Modified Paths: -------------- csw/mgar/pkg/rrdtool/trunk/Makefile csw/mgar/pkg/rrdtool/trunk/checksums Modified: csw/mgar/pkg/rrdtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/trunk/Makefile 2011-03-16 12:44:30 UTC (rev 13835) +++ csw/mgar/pkg/rrdtool/trunk/Makefile 2011-03-16 13:52:59 UTC (rev 13836) @@ -1,5 +1,5 @@ NAME = rrdtool -VERSION = 1.4.4 +VERSION = 1.4.5 CATEGORIES = utils DESCRIPTION = Time-series data logging and graphing @@ -12,50 +12,89 @@ MASTER_SITES = http://oss.oetiker.ch/$(NAME)/pub/ DISTFILES = $(NAME)-$(VERSION).tar.gz -# Use patch until this is fixed: -# http://oss.oetiker.ch/rrdtool-trac/ticket/284 -PATCHFILES += patch-bindings-ruby-extconf.rb - # Make sure to link against libperl.so to make shared libraries self-contained. PATCHFILES += patch-bindings-perl-piped-Makefile.PL PATCHFILES += patch-bindings-perl-shared-Makefile.PL -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES += CSWrrdtool +CATALOGNAME_CSWrrdtool = rrdtool +SPKG_DESC_CSWrrdtool = Time-series data logging and graphing +RUNTIME_DEP_PKGS_CSWrrdtool += CSWglib2 +RUNTIME_DEP_PKGS_CSWrrdtool += CSWpango +RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibcairo +RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWrrdtool += CSWtcpwrap +RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibdbi1 +RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd4 +RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd-th4 +OBSOLETES_CSWrrdtool = CSWrrd -PACKAGES = CSWrrd CSWrrdtool CSWrrdtool-devel CSWlibrrd4 CSWpm-rrdtool CSWpy-rrdtool CSWrb-rrdtool +PACKAGES += CSWrrdtool-dev +CATALOGNAME_CSWrrdtool-dev = rrdtool_dev +SPKG_DESC_CSWrrdtool-dev = Development files for librrd.so.4 +PKGFILES_CSWrrdtool-dev = $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWrrdtool-dev += CSWlibrrd4 +RUNTIME_DEP_PKGS_CSWrrdtool-dev += CSWlibrrd-th4 -CATALOGNAME_CSWrrd = rrd -CATALOGNAME_CSWrrdtool = rrdtool -CATALOGNAME_CSWrrdtool-devel = rrdtool_devel +PACKAGES += CSWlibrrd4 CATALOGNAME_CSWlibrrd4 = librrd4 +SPKG_DESC_CSWlibrrd4 = Runtime library for RRDtool, librrd.so.4 +PKGFILES_CSWlibrrd4 += $(call pkgfiles_lib,librrd.so.4) +RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWglib2 +RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibcairo +RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWpango +RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWtcpwrap +RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibdbi1 + +PACKAGES += CSWlibrrd-th4 +CATALOGNAME_CSWlibrrd-th4 = librrd_th4 +SPKG_DESC_CSWlibrrd-th4 = Runtime library for RRDtool, librrd_th.so.4 +PKGFILES_CSWlibrrd-th4 += $(call pkgfiles_lib,librrd_th.so.4) +RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWtcpwrap +RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibcairo +RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWpango +RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWglib2 +RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibdbi1 + +PACKAGES += CSWpm-rrdtool CATALOGNAME_CSWpm-rrdtool = pm_rrdtool -CATALOGNAME_CSWpy-rrdtool = py_rrdtool -CATALOGNAME_CSWrb-rrdtool = rb_rrdtool - -SPKG_DESC_CSWrrd = Stub package as contents now moved to CSWrrdtool -SPKG_DESC_CSWrrdtool = $(DESCRIPTION) -SPKG_DESC_CSWrrdtool-devel = Development Files for RRDTool -SPKG_DESC_CSWlibrrd4 = Runtime libraries for RRDtool providing librrd_th.so.4 SPKG_DESC_CSWpm-rrdtool = RRDs: Access RRDtool as a shared module (part of RRDtool) -SPKG_DESC_CSWpy-rrdtool = Python egg for RRD access (part of RRDtool) -SPKG_DESC_CSWrb-rrdtool = Ruby binding for RRD access (part of RRDtool) - -RUNTIME_DEP_PKGS_CSWrrd = CSWrrdtool CSWpm-rrdtool CSWpy-rrdtool CSWrb-rrdtool -RUNTIME_DEP_PKGS_CSWrrdtool = CSWglib2 CSWpango CSWggettextrt CSWlibxml2 CSWlibcairo -RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd4 -RUNTIME_DEP_PKGS_CSWrrdtool-devel = CSWlibrrd4 -RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWggettextrt CSWglib2 CSWlibcairo CSWpango CSWlibxml2 +PKGFILES_CSWpm-rrdtool += $(libdir)/perl/.* +PKGFILES_CSWpm-rrdtool += $(sharedstatedir)/perl/.* +PKGFILES_CSWpm-rrdtool += $(sharedstatedir)/rrdtool/examples/.* +PKGFILES_CSWpm-rrdtool += .*\.3perl RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWperl RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWlibrrd4 +OBSOLETES_CSWpm-rrdtool = CSWrrd + +PACKAGES += CSWpy-rrdtool +CATALOGNAME_CSWpy-rrdtool = py_rrdtool +SPKG_DESC_CSWrb-rrdtool = Ruby binding for RRD access (part of RRDtool) +PKGFILES_CSWpy-rrdtool = $(libdir)/python/.* RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibrrd4 -RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWggettextrt +RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibintl8 +OBSOLETES_CSWpy-rrdtool = CSWrrd + +PACKAGES += CSWrb-rrdtool +CATALOGNAME_CSWrb-rrdtool = rb_rrdtool +SPKG_DESC_CSWpy-rrdtool = Python egg for RRD access (part of RRDtool) +PKGFILES_CSWrb-rrdtool = $(libdir)/ruby/.* RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibruby1 RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibrrd4 +OBSOLETES_CSWrb-rrdtool = CSWrrd +# This is crappy and needs fixing, unfortunately inside extconf.rb which is hard. +CHECKPKG_OVERRIDES_CSWrb-rrdtool += bad-rpath-entry|/home/dam/mgar/pkg/rrdtool/trunk/work/solaris9-sparc/install-isa-sparcv8/opt/csw/lib|opt/csw/lib/ruby/site_ruby/1.8/sparc-solaris2.9/RRD.so BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWlibrrd4) -BUILD_DEP_PKGS += CSWpangodevel CSWlibcairodevel CSWglib2devel +BUILD_DEP_PKGS += CSWpangodevel +BUILD_DEP_PKGS += CSWlibcairodevel +BUILD_DEP_PKGS += CSWglib2devel BUILD_DEP_PKGS += CSWperl BUILD_DEP_PKGS += CSWpython-devel BUILD_DEP_PKGS += CSWrubydev @@ -69,12 +108,20 @@ NOISAEXEC = 1 STRIP_LIBTOOL = 1 -CONFIGURE_ARGS_32 = --enable-python --enable-ruby --with-ruby-options=CFLAGS= --enable-perl --with-perl-options=INSTALLDIRS=vendor -CONFIGURE_ARGS_64 = --disable-python --disable-ruby --disable-perl +CONFIGURE_ARGS_32 += --enable-python +CONFIGURE_ARGS_32 += --enable-ruby +CONFIGURE_ARGS_32 += --with-ruby-options=RUBY_MAKE_OPTIONS=DESTDIR=$(DESTDIR) +CONFIGURE_ARGS_32 += --enable-perl +CONFIGURE_ARGS_32 += --with-perl-options=INSTALLDIRS=vendor +# We don't have any of these in 64 bit (yet!) +CONFIGURE_ARGS_64 += --disable-python +CONFIGURE_ARGS_64 += --disable-ruby +CONFIGURE_ARGS_64 += --disable-perl CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --docdir=$(sharedstatedir)/doc/$(NAME) -CONFIGURE_ARGS += --disable-lua --disable-tcl +CONFIGURE_ARGS += --disable-lua +CONFIGURE_ARGS += --disable-tcl CONFIGURE_ARGS += --with-libintl-prefix=$(libdir) CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MEMORYMODEL)) @@ -83,29 +130,32 @@ MERGE_DIRS_isa-extra = $(libdir) MERGE_SCRIPTS_isa-extra = copy-relocated-only copy-config-only EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod .*/\.packlist -EXTRA_PAX_ARGS += -s ',^\.$(docdir)/$(NAME)-$(VERSION),.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME),' +EXTRA_PAX_ARGS += -s ',^\.$(docdir)/$(NAME)-$(VERSION),.$(BUILD_PREFIX)/share/doc/rrdtool,' -ARCHALL_CSWrrd = 1 +include gar/category.mk -PKGFILES_CSWrrd = NOFILES -PKGFILES_CSWrrdtool-devel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibrrd4 = $(PKGFILES_RT) -PKGFILES_CSWpm-rrdtool += $(libdir)/perl/.* -PKGFILES_CSWpm-rrdtool += $(sharedstatedir)/perl/.* -PKGFILES_CSWpm-rrdtool += $(sharedstatedir)/rrdtool/examples/.* -PKGFILES_CSWpm-rrdtool += .*\.3perl -PKGFILES_CSWpy-rrdtool = $(libdir)/python/.* -PKGFILES_CSWrb-rrdtool = $(libdir)/ruby/.* +post-install-modulated: + perl -pi -e 's,/usr/local,$(prefix),g' \ + $(addprefix $(DESTDIR), \ + /opt/csw/share/perl/csw/RRDp.pm \ + /opt/csw/share/man/man3/RRDp.3perl \ + /opt/csw/share/man/man1/rrd-beginners.1 \ + /opt/csw/share/man/man1/rrdcgi.1 \ + /opt/csw/share/doc/rrdtool-1.4.5/txt/rrd-beginners.pod \ + /opt/csw/share/doc/rrdtool-1.4.5/txt/rrdcgi.pod \ + /opt/csw/share/doc/rrdtool-1.4.5/txt/rrd-beginners.txt \ + /opt/csw/share/doc/rrdtool-1.4.5/txt/rrdcgi.txt \ + /opt/csw/share/doc/rrdtool-1.4.5/html/rrd-beginners.html \ + /opt/csw/share/doc/rrdtool-1.4.5/html/RRDp.html \ + /opt/csw/share/doc/rrdtool-1.4.5/html/rrdcgi.html \ + ) -# Make legacy package depend on all new ones -CHECKPKG_OVERRIDES_CSWrrd += surplus-dependency|CSWpm-rrdtool -CHECKPKG_OVERRIDES_CSWrrd += surplus-dependency|CSWpy-rrdtool -CHECKPKG_OVERRIDES_CSWrrd += surplus-dependency|CSWrb-rrdtool -CHECKPKG_OVERRIDES_CSWrrd += surplus-dependency|CSWrrdtool + perl -pi -e 's,/usr/share,$(prefix),g' \ + $(addprefix $(DESTDIR), \ + /opt/csw/share/man/man1/rrdbuild.1 \ + /opt/csw/share/doc/rrdtool-1.4.5/txt/rrdbuild.txt \ + /opt/csw/share/doc/rrdtool-1.4.5/txt/rrdbuild.pod \ + /opt/csw/share/doc/rrdtool-1.4.5/html/rrdbuild.html \ + ) -# These libraries always come in pairs, bundle them also -CHECKPKG_OVERRIDES_CSWlibrrd4 += shared-lib-pkgname-mismatch|file=opt/csw/lib/librrd_th.so.4.1.4|soname=librrd_th.so.4|pkgname=CSWlibrrd4|expected=CSWlibrrd-th4 -CHECKPKG_OVERRIDES_CSWlibrrd4 += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/librrd_th.so.4.1.4|soname=librrd_th.so.4|pkgname=CSWlibrrd4|expected=CSWlibrrd-th4 - -include gar/category.mk - + @$(MAKECOOKIE) Modified: csw/mgar/pkg/rrdtool/trunk/checksums =================================================================== --- csw/mgar/pkg/rrdtool/trunk/checksums 2011-03-16 12:44:30 UTC (rev 13835) +++ csw/mgar/pkg/rrdtool/trunk/checksums 2011-03-16 13:52:59 UTC (rev 13836) @@ -1 +1 @@ -93ad2fc2e9ddcd7d99c611fe30284a54 rrdtool-1.4.4.tar.gz +4d116dba9a0888d8aaac179e35d3980a rrdtool-1.4.5.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 Mar 16 15:10:31 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 16 Mar 2011 14:10:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[13837] csw/mgar/pkg/rrdtool/trunk/Makefile Message-ID: Revision: 13837 http://gar.svn.sourceforge.net/gar/?rev=13837&view=rev Author: dmichelsen Date: 2011-03-16 14:10:31 +0000 (Wed, 16 Mar 2011) Log Message: ----------- rrdtool: Generalize rpath override Modified Paths: -------------- csw/mgar/pkg/rrdtool/trunk/Makefile Modified: csw/mgar/pkg/rrdtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/trunk/Makefile 2011-03-16 13:52:59 UTC (rev 13836) +++ csw/mgar/pkg/rrdtool/trunk/Makefile 2011-03-16 14:10:31 UTC (rev 13837) @@ -89,7 +89,7 @@ RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibrrd4 OBSOLETES_CSWrb-rrdtool = CSWrrd # This is crappy and needs fixing, unfortunately inside extconf.rb which is hard. -CHECKPKG_OVERRIDES_CSWrb-rrdtool += bad-rpath-entry|/home/dam/mgar/pkg/rrdtool/trunk/work/solaris9-sparc/install-isa-sparcv8/opt/csw/lib|opt/csw/lib/ruby/site_ruby/1.8/sparc-solaris2.9/RRD.so +CHECKPKG_OVERRIDES_CSWrb-rrdtool += bad-rpath-entry BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWlibrrd4) BUILD_DEP_PKGS += CSWpangodevel 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 Mar 16 15:18:34 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 16 Mar 2011 14:18:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[13838] csw/mgar/pkg/rrdtool/trunk/Makefile Message-ID: Revision: 13838 http://gar.svn.sourceforge.net/gar/?rev=13838&view=rev Author: dmichelsen Date: 2011-03-16 14:18:34 +0000 (Wed, 16 Mar 2011) Log Message: ----------- rrdtool: Fix typo Modified Paths: -------------- csw/mgar/pkg/rrdtool/trunk/Makefile Modified: csw/mgar/pkg/rrdtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/trunk/Makefile 2011-03-16 14:10:31 UTC (rev 13837) +++ csw/mgar/pkg/rrdtool/trunk/Makefile 2011-03-16 14:18:34 UTC (rev 13838) @@ -150,7 +150,7 @@ /opt/csw/share/doc/rrdtool-1.4.5/html/rrdcgi.html \ ) - perl -pi -e 's,/usr/share,$(prefix),g' \ + perl -pi -e 's,/usr/share,$(sharedstatedir),g' \ $(addprefix $(DESTDIR), \ /opt/csw/share/man/man1/rrdbuild.1 \ /opt/csw/share/doc/rrdtool-1.4.5/txt/rrdbuild.txt \ 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 Mar 16 19:31:57 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 16 Mar 2011 18:31:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[13839] csw/mgar/pkg/libiconv/trunk/Makefile Message-ID: Revision: 13839 http://gar.svn.sourceforge.net/gar/?rev=13839&view=rev Author: dmichelsen Date: 2011-03-16 18:31:57 +0000 (Wed, 16 Mar 2011) Log Message: ----------- libiconv: Make library reentrant, this hopefully fixes #4726 Modified Paths: -------------- csw/mgar/pkg/libiconv/trunk/Makefile Modified: csw/mgar/pkg/libiconv/trunk/Makefile =================================================================== --- csw/mgar/pkg/libiconv/trunk/Makefile 2011-03-16 14:18:34 UTC (rev 13838) +++ csw/mgar/pkg/libiconv/trunk/Makefile 2011-03-16 18:31:57 UTC (rev 13839) @@ -86,6 +86,8 @@ # and can safely be ignored as it is a failure in the testsuite. TEST_TARGET = check +EXTRA_CPPFLAGS = -D_REENTRANT + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-rpath 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 Mar 16 19:36:52 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 16 Mar 2011 18:36:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[13840] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 13840 http://gar.svn.sourceforge.net/gar/?rev=13840&view=rev Author: bdwalton Date: 2011-03-16 18:36:52 +0000 (Wed, 16 Mar 2011) Log Message: ----------- ruby18/trunk: the gcc4 package should depend on gcc4 core Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-16 18:31:57 UTC (rev 13839) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-16 18:36:52 UTC (rev 13840) @@ -41,7 +41,7 @@ RUNTIME_DEP_PKGS_CSWruby18 = CSWbdb48 CSWlibgdbm3 CSWiconv CSWlibruby18-1 RUNTIME_DEP_PKGS_CSWruby18 += CSWncurses CSWosslrt CSWreadline CSWzlib -RUNTIME_DEP_PKGS_CSWruby18-gcc4 = CSWruby18 +RUNTIME_DEP_PKGS_CSWruby18-gcc4 = CSWruby18 CSWgcc4core RUNTIME_DEP_PKGS_CSWruby18-doc = CSWruby18 @@ -164,6 +164,7 @@ CHECKPKG_OVERRIDES_CSWruby18-doc += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWruby18-gcc4 += surplus-dependency|CSWalternatives +CHECKPKG_OVERRIDES_CSWruby18-gcc4 += surplus-dependency|CSWgcc4core CHECKPKG_OVERRIDES_CSWruby18 += surplus-dependency|CSWalternatives 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 Mar 16 20:18:35 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 16 Mar 2011 19:18:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[13841] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 13841 http://gar.svn.sourceforge.net/gar/?rev=13841&view=rev Author: dmichelsen Date: 2011-03-16 19:18:35 +0000 (Wed, 16 Mar 2011) Log Message: ----------- mGAR v2: Depend on isaexec only iff there are files in the prototype to be isaexec'ed. This fixes #4718 Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-03-16 18:36:52 UTC (rev 13840) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-03-16 19:18:35 UTC (rev 13841) @@ -523,9 +523,9 @@ # actually matching the _TEXINFO_FILTER. This is done at the prototype-level. $(WORKDIR)/%.depend: $(WORKDIR)/$*.prototype $(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(_CATEGORY_RUNTIME_DEP_PKGS) +$(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach I,$(ISAEXEC_FILES),print "yes" if( $$F[2] =~ m(^\Q$I\E(=.*)?$$));)')),CSWisaexec) $(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane 'print "yes" if( $$F[1] eq "cswalternatives")')),CSWalternatives) $(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(foreach P,$(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach C,$(filter-out ugfiles,$(_CSWCLASSES)),print "$C " if( $$F[1] eq "$C");)')),CSWcas-$(subst csw,,$(P))) - $(WORKDIR)/%.depend: _DEP_PKGS=$(or $(RUNTIME_DEP_PKGS_ONLY_$*),$(RUNTIME_DEP_PKGS_ONLY),$(sort $(_EXTRA_GAR_PKGS)) $(or $(RUNTIME_DEP_PKGS_$*),$(RUNTIME_DEP_PKGS),$(DEP_PKGS_$*),$(DEP_PKGS))) $(WORKDIR)/%.depend: $(WORKDIR) # The final "true" is for packages without dependencies to make the shell happy as "( )" is not allowed. @@ -877,7 +877,6 @@ $(shell for F in $(_ISAEXEC_FILES); do \ if test -f "$$F" -a \! -h "$$F"; then echo $$F; fi; \ done)),) -_buildpackage: _EXTRA_GAR_PKGS += $(if $(ISAEXEC_FILES),CSWisaexec) _buildpackage: pre-package $(PACKAGE_TARGETS) post-package $(if $(filter-out 0,$(ENABLE_CHECK)),pkgcheck) _package: validateplatform extract-global merge $(SPKG_DESTDIRS) _buildpackage 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 Mar 16 21:00:18 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 16 Mar 2011 20:00:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[13842] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13842 http://gar.svn.sourceforge.net/gar/?rev=13842&view=rev Author: bdwalton Date: 2011-03-16 20:00:18 +0000 (Wed, 16 Mar 2011) Log Message: ----------- php5/trunk: set PATH to prefer /opt/csw/gnu and depend on coreutils at build time Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-16 19:18:35 UTC (rev 13841) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-16 20:00:18 UTC (rev 13842) @@ -18,6 +18,9 @@ available. endef +# at least for a decent echo used during build. +PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH) + VENDOR_URL = http://www.php.net/ MASTER_SITES = http://us.php.net/distributions/ INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) @@ -85,7 +88,7 @@ PACKAGES += CSWphp5-zip PACKAGES += CSWmod-php5 -BUILD_DEP_PKGS += CSWlibgdbm-dev CSWlibidn-dev CSWlibgd-dev +BUILD_DEP_PKGS += CSWlibgdbm-dev CSWlibidn-dev CSWlibgd-dev CSWcoreutils CATALOGNAME_CSWmod-php5 = mod_php5 SPKG_DESC_CSWmod-php5 = The apache 1.3.x php5 module 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 Mar 16 21:25:03 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 16 Mar 2011 20:25:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[13843] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13843 http://gar.svn.sourceforge.net/gar/?rev=13843&view=rev Author: bdwalton Date: 2011-03-16 20:25:03 +0000 (Wed, 16 Mar 2011) Log Message: ----------- php5/trunk: comment out patches until we prove their usefulness/requirement Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-16 20:00:18 UTC (rev 13842) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-16 20:25:03 UTC (rev 13843) @@ -516,10 +516,10 @@ PKGFILES_CSWphp5-zip = .*/lib/php/extensions/.*/zip.* -PATCHFILES += configure.diff -PATCHFILES += odbc.diff -PATCHFILES += pdopgsql.diff -PATCHFILES += pgsql.diff +# PATCHFILES += configure.diff +# PATCHFILES += odbc.diff +# PATCHFILES += pdopgsql.diff +# PATCHFILES += pgsql.diff # PHP Extensions, currently deactivated # 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 Mar 17 00:45:49 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Wed, 16 Mar 2011 23:45:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[13844] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 13844 http://gar.svn.sourceforge.net/gar/?rev=13844&view=rev Author: rthurner Date: 2011-03-16 23:45:48 +0000 (Wed, 16 Mar 2011) Log Message: ----------- subversion, remove catalogname to leave it default Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-03-16 20:25:03 UTC (rev 13843) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-03-16 23:45:48 UTC (rev 13844) @@ -42,7 +42,6 @@ PACKAGES += CSWsvn-contrib CSWsvn-tools SPKG_DESC_CSWsvn = Version control rethought -CATALOGNAME_CSWsvn = subversion RUNTIME_DEP_PKGS_CSWsvn = CSWbdb48 RUNTIME_DEP_PKGS_CSWsvn += CSWexpat RUNTIME_DEP_PKGS_CSWsvn += CSWlibintl8 @@ -58,12 +57,10 @@ SPKG_DESC_CSWsvn-devel = Subversion Development Support -CATALOGNAME_CSWsvn-devel = subversion_devel ARCHALL_CSWsvn-devel = 1 PKGFILES_CSWsvn-devel = $(PKGFILES_DEVEL) PKGFILES_CSWsvn-devel += $(docdir)/$(CATALOGNAME_CSWsvn-devel)/changelog.CSW CHECKPKG_OVERRIDES_CSWsvn-devel += archall-devel-package -CHECKPKG_OVERRIDES_CSWsvn-devel += catalogname-does-not-match-pkgname|pkgname=CSWsvn-devel|catalogname=subversion_devel|expected-catalogname=svn_devel SPKG_DESC_CSWsvn-contrib = Contributed subversion scripts CATALOGNAME_CSWsvn-contrib = subversion_contrib @@ -137,7 +134,6 @@ CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 SPKG_DESC_CSWpmsvn = Subversion Perl Language Binding -CATALOGNAME_CSWpmsvn = pm_subversion PKGFILES_CSWpmsvn = $(libdir)/perl.* PKGFILES_CSWpmsvn += $(SVNLIB)/.*perl.* PKGFILES_CSWpmsvn += $(mandir)/.*swig_perl.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Thu Mar 17 02:08:49 2011 From: bwalton at opencsw.org (Ben Walton) Date: Wed, 16 Mar 2011 21:08:49 -0400 Subject: [csw-devel] SF.net SVN: gar:[13827] csw/mgar/pkg/php5/trunk/Makefile In-Reply-To: References: Message-ID: <1300324120-sup-9306@pinkfloyd.chass.utoronto.ca> Excerpts from Maciej Blizi?ski's message of Wed Mar 16 04:33:22 -0400 2011: > This is caused by incorrect pkgmap entries in libgmp. I've added a > workaround to checkpkg in r13833. > > http://sourceforge.net/apps/trac/gar/changeset/13833 Cool! Thanks. -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bdwalton at users.sourceforge.net Thu Mar 17 04:21:48 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 17 Mar 2011 03:21:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[13845] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13845 http://gar.svn.sourceforge.net/gar/?rev=13845&view=rev Author: bdwalton Date: 2011-03-17 03:21:47 +0000 (Thu, 17 Mar 2011) Log Message: ----------- php5/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-16 23:45:48 UTC (rev 13844) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-17 03:21:47 UTC (rev 13845) @@ -1,5 +1,5 @@ NAME = php5 -VERSION = 5.3.5 +VERSION = 5.3.6 CATEGORIES = lang SF_PROJ = $(shell echo $(NAME) | sed -e 's/[0-9]//g') DISTNAME = $(SF_PROJ)-$(VERSION) 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 Mar 17 04:26:55 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 17 Mar 2011 03:26:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[13846] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13846 http://gar.svn.sourceforge.net/gar/?rev=13846&view=rev Author: bdwalton Date: 2011-03-17 03:26:54 +0000 (Thu, 17 Mar 2011) Log Message: ----------- php5/trunk: drop back to 5.3.5; 5.3.6 is not available yet despite what CVE-2011-1092 says Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-17 03:21:47 UTC (rev 13845) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-17 03:26:54 UTC (rev 13846) @@ -1,5 +1,5 @@ NAME = php5 -VERSION = 5.3.6 +VERSION = 5.3.5 CATEGORIES = lang SF_PROJ = $(shell echo $(NAME) | sed -e 's/[0-9]//g') DISTNAME = $(SF_PROJ)-$(VERSION) 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 Mar 17 09:42:47 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 17 Mar 2011 08:42:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[13847] csw/mgar/pkg/libiconv/trunk/Makefile Message-ID: Revision: 13847 http://gar.svn.sourceforge.net/gar/?rev=13847&view=rev Author: dmichelsen Date: 2011-03-17 08:42:47 +0000 (Thu, 17 Mar 2011) Log Message: ----------- libiconv: Add libcharset1 as obsoletion for CSWiconv Modified Paths: -------------- csw/mgar/pkg/libiconv/trunk/Makefile Modified: csw/mgar/pkg/libiconv/trunk/Makefile =================================================================== --- csw/mgar/pkg/libiconv/trunk/Makefile 2011-03-17 03:26:54 UTC (rev 13846) +++ csw/mgar/pkg/libiconv/trunk/Makefile 2011-03-17 08:42:47 UTC (rev 13847) @@ -26,6 +26,7 @@ CATALOGNAME_CSWlibiconv2 = libiconv2 SPKG_DESC_CSWlibiconv2 = GNU iconv library, libiconv.so.2 PKGFILES_CSWlibiconv2 += $(call pkgfiles_lib,libiconv.so.2) +OBSOLETES_CSWlibiconv2 += CSWiconv PACKAGES += CSWlibcharset1 CATALOGNAME_CSWlibcharset1 = libcharset1 @@ -34,6 +35,7 @@ # Now *this* time it is ok, iconv is the only package that is allowed to ship this! CHECKPKG_OVERRIDES_CSWlibcharset1 += disallowed-path|opt/csw/lib/charset.alias PKGFILES_CSWlibcharset1 += $(call baseisadirs,$(libdir),charset\.alias) +OBSOLETES_CSWlibcharset1 += CSWiconv PACKAGES += CSWlibiconv-dev CATALOGNAME_CSWlibiconv-dev = libiconv_dev @@ -58,7 +60,7 @@ CHECKPKG_OVERRIDES_CSWlibiconv-utils += shared-lib-pkgname-mismatch|sonames=libiconv.so.0|pkgname=CSWlibiconv-utils|expected=CSWlibiconv0 RUNTIME_DEP_PKGS_CSWlibiconv-utils += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibiconv-utils += CSWlibintl8 -OBSOLETES_CSWlibiconv-utils = CSWiconv +OBSOLETES_CSWlibiconv-utils += CSWiconv NOISAEXEC = 1 BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Thu Mar 17 09:59:34 2011 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 17 Mar 2011 08:59:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[13848] csw/mgar/pkg/libldns/trunk Message-ID: Revision: 13848 http://gar.svn.sourceforge.net/gar/?rev=13848&view=rev Author: idogan23 Date: 2011-03-17 08:59:34 +0000 (Thu, 17 Mar 2011) Log Message: ----------- libldns: bump version to 1.6.9 Modified Paths: -------------- csw/mgar/pkg/libldns/trunk/Makefile csw/mgar/pkg/libldns/trunk/checksums Modified: csw/mgar/pkg/libldns/trunk/Makefile =================================================================== --- csw/mgar/pkg/libldns/trunk/Makefile 2011-03-17 08:42:47 UTC (rev 13847) +++ csw/mgar/pkg/libldns/trunk/Makefile 2011-03-17 08:59:34 UTC (rev 13848) @@ -1,5 +1,5 @@ NAME = ldns -VERSION = 1.6.8 +VERSION = 1.6.9 CATEGORIES = lib DESCRIPTION = A library for programs conforming to DNS RFCs and drafts Modified: csw/mgar/pkg/libldns/trunk/checksums =================================================================== --- csw/mgar/pkg/libldns/trunk/checksums 2011-03-17 08:42:47 UTC (rev 13847) +++ csw/mgar/pkg/libldns/trunk/checksums 2011-03-17 08:59:34 UTC (rev 13848) @@ -1 +1 @@ -17d15e0d185a6258eed2c3806d8fc7c5 ldns-1.6.8.tar.gz +fc9db99cfe7c9d7f86da8f53efdbbbd6 ldns-1.6.9.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 Mar 17 14:02:15 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 17 Mar 2011 13:02:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[13849] csw/mgar/pkg/tig/trunk Message-ID: Revision: 13849 http://gar.svn.sourceforge.net/gar/?rev=13849&view=rev Author: dmichelsen Date: 2011-03-17 13:02:14 +0000 (Thu, 17 Mar 2011) Log Message: ----------- tig: Update to 0.17 Modified Paths: -------------- csw/mgar/pkg/tig/trunk/Makefile csw/mgar/pkg/tig/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/tig/trunk/files/0001-add-install-detection-to-the-autoconf-setup.patch Modified: csw/mgar/pkg/tig/trunk/Makefile =================================================================== --- csw/mgar/pkg/tig/trunk/Makefile 2011-03-17 08:59:34 UTC (rev 13848) +++ csw/mgar/pkg/tig/trunk/Makefile 2011-03-17 13:02:14 UTC (rev 13849) @@ -1,10 +1,7 @@ NAME = tig -VERSION = 0.14.1 +VERSION = 0.17 CATEGORIES = utils -PATCHLEVEL = 1e69632 -VENDOR_URL = http://jonas.nitro.dk/tig/ - DESCRIPTION = A git repository browser define BLURB Tig is a git repository browser that additionally can act as a pager @@ -17,19 +14,28 @@ Using it as a pager, it will display input from stdin and colorize it. endef -GARCOMPILER = GNU +MASTER_SITES = http://jonas.nitro.dk/tig/releases/ +DISTFILES = $(NAME)-$(VERSION).tar.gz -BUILD_DEP_PKGS = CSWncurses CSWasciidoc CSWxmlto CSWiconv +VENDOR_URL = http://jonas.nitro.dk/tig/ -RUNTIME_DEP_PKGS = CSWncurses CSWiconv CSWgit +BUILD_DEP_PKGS += CSWncurses +BUILD_DEP_PKGS += CSWasciidoc +BUILD_DEP_PKGS += CSWxmlto +BUILD_DEP_PKGS += CSWiconv -GIT_REPOS = http://jonas.nitro.dk/tig/tig.git -GIT_TREEISH_tig.git = $(PATCHLEVEL) +RUNTIME_DEP_PKGS += CSWncurses +RUNTIME_DEP_PKGS += CSWiconv +RUNTIME_DEP_PKGS += CSWgit +# Yes, we do need git +CHECKPKG_OVERRIDES_CSWtig += surplus-dependency|CSWgit -PATCHFILES = 0001-add-install-detection-to-the-autoconf-setup.patch +GARCOMPILER = GNU sysconfdir = /etc/opt/csw +EXTRA_CPPFLAGS = -I$(includedir)/ncursesw + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libiconv=$(prefix) @@ -39,11 +45,5 @@ include gar/category.mk -# Set a slightly altered revstamp to indicate that we're not using a -# pressed release. -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(PATCHLEVEL) - -# automake isn't used, but we want install-sh. automake exits 1, so -# we run true after to keep gmake happy -pre-configure-modulated: - @(cd $(WORKSRC); autoreconf; automake --add-missing; true) \ No newline at end of file +# For GNU install to be available as "install" +PATH := /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/tig/trunk/checksums =================================================================== --- csw/mgar/pkg/tig/trunk/checksums 2011-03-17 08:59:34 UTC (rev 13848) +++ csw/mgar/pkg/tig/trunk/checksums 2011-03-17 13:02:14 UTC (rev 13849) @@ -1 +1 @@ -5fe966f3db6c641cc10dbef40913dddf 0001-add-install-detection-to-the-autoconf-setup.patch +f373343199422c59518776db448dec0e tig-0.17.tar.gz Deleted: csw/mgar/pkg/tig/trunk/files/0001-add-install-detection-to-the-autoconf-setup.patch =================================================================== --- csw/mgar/pkg/tig/trunk/files/0001-add-install-detection-to-the-autoconf-setup.patch 2011-03-17 08:59:34 UTC (rev 13848) +++ csw/mgar/pkg/tig/trunk/files/0001-add-install-detection-to-the-autoconf-setup.patch 2011-03-17 13:02:14 UTC (rev 13849) @@ -1,73 +0,0 @@ -From d12d5d6f186ac25d83324c6cd87eaef87d6df6bb Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Mon, 12 Oct 2009 02:03:17 +0200 -Subject: [PATCH] add install detection to the autoconf setup - ---- - Makefile | 8 ++++---- - config.make.in | 2 ++ - configure.ac | 2 ++ - 3 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index d764644..cf0771b 100644 ---- a/Makefile -+++ b/Makefile -@@ -68,7 +68,7 @@ doc-html: $(HTMLDOC) - install: all - mkdir -p $(DESTDIR)$(bindir) && \ - for prog in $(PROGS); do \ -- install -p -m 0755 "$$prog" "$(DESTDIR)$(bindir)"; \ -+ $(INSTALL) -p -m 0755 "$$prog" "$(DESTDIR)$(bindir)"; \ - done - - install-doc-man: doc-man -@@ -77,8 +77,8 @@ install-doc-man: doc-man - for doc in $(MANDOC); do \ - sed 's#++SYSCONFDIR++#$(sysconfdir)#' < "$$doc" > "$$doc+"; \ - case "$$doc" in \ -- *.1) install -p -m 0644 "$$doc+" "$(DESTDIR)$(mandir)/man1/$$doc" ;; \ -- *.5) install -p -m 0644 "$$doc+" "$(DESTDIR)$(mandir)/man5/$$doc" ;; \ -+ *.1) $(INSTALL) -p -m 0644 "$$doc+" "$(DESTDIR)$(mandir)/man1/$$doc" ;; \ -+ *.5) $(INSTALL) -p -m 0644 "$$doc+" "$(DESTDIR)$(mandir)/man5/$$doc" ;; \ - esac; \ - $(RM) "$$doc+"; \ - done -@@ -88,7 +88,7 @@ install-doc-html: doc-html - for doc in $(HTMLDOC); do \ - sed 's#++SYSCONFDIR++#$(sysconfdir)#' < "$$doc" > "$$doc+"; \ - case "$$doc" in \ -- *.html) install -p -m 0644 "$$doc+" "$(DESTDIR)$(docdir)/tig/$$doc" ;; \ -+ *.html) $(INSTALL) -p -m 0644 "$$doc+" "$(DESTDIR)$(docdir)/tig/$$doc" ;; \ - esac; \ - $(RM) "$$doc+"; \ - done -diff --git a/config.make.in b/config.make.in -index 3962050..a5621e9 100644 ---- a/config.make.in -+++ b/config.make.in -@@ -12,6 +12,8 @@ CPPFLAGS = @CPPFLAGS@ -DHAVE_CONFIG_H - LDFLAGS = @LDFLAGS@ - LDLIBS = @LIBS@ - -+INSTALL = @INSTALL@ -+ - ASCIIDOC = @ASCIIDOC@ - XMLTO = @XMLTO@ - DOCBOOK2PDF = @DOCBOOK2PDF@ -diff --git a/configure.ac b/configure.ac -index b179389..5225c7c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -23,6 +23,8 @@ AM_ICONV - - AC_PROG_CC - -+AC_PROG_INSTALL -+ - AC_CHECK_PROG(GIT, [git], [git], [AC_ERROR([git not found])]) - AC_MSG_CHECKING([which config subcommand git supports]) - GIT_CONFIG="repo-config" --- -1.6.3.2 - 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 Mar 17 16:45:11 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 17 Mar 2011 15:45:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[13850] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13850 http://gar.svn.sourceforge.net/gar/?rev=13850&view=rev Author: bdwalton Date: 2011-03-17 15:45:11 +0000 (Thu, 17 Mar 2011) Log Message: ----------- php5/trunk: 5.3.6 is out now (thanks woody!) Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-17 13:02:14 UTC (rev 13849) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-17 15:45:11 UTC (rev 13850) @@ -1,5 +1,5 @@ NAME = php5 -VERSION = 5.3.5 +VERSION = 5.3.6 CATEGORIES = lang SF_PROJ = $(shell echo $(NAME) | sed -e 's/[0-9]//g') DISTNAME = $(SF_PROJ)-$(VERSION) 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 Mar 17 16:52:20 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 17 Mar 2011 15:52:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[13851] csw/mgar/pkg/php5/trunk/checksums Message-ID: Revision: 13851 http://gar.svn.sourceforge.net/gar/?rev=13851&view=rev Author: bdwalton Date: 2011-03-17 15:52:20 +0000 (Thu, 17 Mar 2011) Log Message: ----------- php5/trunk: update checksums for 5.3.6 Modified Paths: -------------- csw/mgar/pkg/php5/trunk/checksums Modified: csw/mgar/pkg/php5/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/trunk/checksums 2011-03-17 15:45:11 UTC (rev 13850) +++ csw/mgar/pkg/php5/trunk/checksums 2011-03-17 15:52:20 UTC (rev 13851) @@ -1 +1 @@ -8aaf20c95e91f25c5b6a591e5d6d61b9 php-5.3.5.tar.bz2 +2286f5a82a6e8397955a0025c1c2ad98 php-5.3.6.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Thu Mar 17 18:56:16 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Thu, 17 Mar 2011 17:56:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[13852] csw/mgar/pkg/ruby-augeas/trunk/Makefile Message-ID: Revision: 13852 http://gar.svn.sourceforge.net/gar/?rev=13852&view=rev Author: phipsy Date: 2011-03-17 17:56:16 +0000 (Thu, 17 Mar 2011) Log Message: ----------- ruby_augeas: works Modified Paths: -------------- csw/mgar/pkg/ruby-augeas/trunk/Makefile Modified: csw/mgar/pkg/ruby-augeas/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby-augeas/trunk/Makefile 2011-03-17 15:52:20 UTC (rev 13851) +++ csw/mgar/pkg/ruby-augeas/trunk/Makefile 2011-03-17 17:56:16 UTC (rev 13852) @@ -13,8 +13,6 @@ PACKAGES = CSWrubyaugeas CATALOGNAME = ruby_augeas -PATCHFILES = 0001-Does-this-fix-the-building-issues.patch - RUNTIME_DEP_PKGS_CSWrubyaugeas += CSWaugeas RUNTIME_DEP_PKGS_CSWrubyaugeas += CSWruby CHECKPKG_OVERRIDES_CSWrubyaugeas += catalogname-does-not-match-pkgname|pkgname=CSWrubyaugeas|catalogname=ruby_augeas|expected-catalogname=rubyaugeas This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Mar 18 03:55:09 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 18 Mar 2011 02:55:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[13853] csw/mgar/pkg/ruby19/trunk Message-ID: Revision: 13853 http://gar.svn.sourceforge.net/gar/?rev=13853&view=rev Author: bdwalton Date: 2011-03-18 02:55:09 +0000 (Fri, 18 Mar 2011) Log Message: ----------- ruby19/trunk: version bump, update checksums Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile csw/mgar/pkg/ruby19/trunk/checksums Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2011-03-17 17:56:16 UTC (rev 13852) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2011-03-18 02:55:09 UTC (rev 13853) @@ -1,6 +1,6 @@ NAME = ruby19 -VERSION = 1.9.1 -PATCHLEVEL = p376 +VERSION = 1.9.2 +PATCHLEVEL = p180 CATEGORIES = lang # Working with Jens Deppe, we've determined that the two failing tests Modified: csw/mgar/pkg/ruby19/trunk/checksums =================================================================== --- csw/mgar/pkg/ruby19/trunk/checksums 2011-03-17 17:56:16 UTC (rev 13852) +++ csw/mgar/pkg/ruby19/trunk/checksums 2011-03-18 02:55:09 UTC (rev 13853) @@ -1 +1 @@ -ebb20550a11e7f1a2fbd6fdec2a3e0a3 ruby-1.9.1-p376.tar.gz +0d6953820c9918820dd916e79f4bfde8 ruby-1.9.2-p180.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Mar 18 04:01:12 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 18 Mar 2011 03:01:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[13854] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 13854 http://gar.svn.sourceforge.net/gar/?rev=13854&view=rev Author: bdwalton Date: 2011-03-18 03:01:12 +0000 (Fri, 18 Mar 2011) Log Message: ----------- ruby19/trunk: update package names to be compliant with new standards Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2011-03-18 02:55:09 UTC (rev 13853) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2011-03-18 03:01:12 UTC (rev 13854) @@ -29,50 +29,51 @@ closures. endef -PACKAGES = CSWruby19 CSWruby19samples CSWruby19ri CSWruby19tk CSWruby19dev +PACKAGES = CSWruby19 CSWruby19-samples CSWruby19-ri CSWruby19-tk +PACKAGES += CSWruby19dev ARCHALL_CSWruby19samples = 1 ARCHALL_CSWruby19ri = 1 # checkpkg overrides -CHECKPKG_OVERRIDES_CSWruby19dev += missing-dependency|CSWruby -CHECKPKG_OVERRIDES_CSWruby19dev += surplus-dependency|CSWruby19 -CHECKPKG_OVERRIDES_CSWruby19samples += missing-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWruby19samples += missing-dependency|CSWruby -CHECKPKG_OVERRIDES_CSWruby19samples += missing-dependency|CSWpython -CHECKPKG_OVERRIDES_CSWruby19samples += surplus-dependency|CSWruby19 -CHECKPKG_OVERRIDES_CSWruby19tk += missing-dependency|CSWruby -CHECKPKG_OVERRIDES_CSWruby19tk += surplus-dependency|CSWruby19 +CHECKPKG_OVERRIDES_CSWruby19-dev += missing-dependency|CSWruby +CHECKPKG_OVERRIDES_CSWruby19-dev += surplus-dependency|CSWruby19 +CHECKPKG_OVERRIDES_CSWruby19-samples += missing-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWruby19-samples += missing-dependency|CSWruby +CHECKPKG_OVERRIDES_CSWruby19-samples += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWruby19-samples += surplus-dependency|CSWruby19 +CHECKPKG_OVERRIDES_CSWruby19-tk += missing-dependency|CSWruby +CHECKPKG_OVERRIDES_CSWruby19-tk += surplus-dependency|CSWruby19 CHECKPKG_OVERRIDES_CSWruby19 += missing-dependency|CSWruby -CHECKPKG_OVERRIDES_CSWruby19ri += surplus-dependency|CSWruby19 -CHECKPKG_OVERRIDES_CSWruby19tk += linked-against-discouraged-library|tcltklib.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWruby19tk += soname-not-found|libruby19.so +CHECKPKG_OVERRIDES_CSWruby19-ri += surplus-dependency|CSWruby19 +CHECKPKG_OVERRIDES_CSWruby19-tk += linked-against-discouraged-library|tcltklib.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWruby19-tk += soname-not-found|libruby19.so CHECKPKG_OVERRIDES_CSWruby19 += soname-not-found|libruby19.so RUNTIME_DEP_PKGS_CSWruby19 = CSWgdbm CSWiconv CSWncurses CSWosslrt RUNTIME_DEP_PKGS_CSWruby19 += CSWreadline CSWzlib -RUNTIME_DEP_PKGS_CSWruby19samples = CSWruby19 -RUNTIME_DEP_PKGS_CSWruby19tk = CSWruby19 CSWtk CSWtcl -RUNTIME_DEP_PKGS_CSWruby19dev = CSWruby19 -RUNTIME_DEP_PKGS_CSWruby19ri = CSWruby19 +RUNTIME_DEP_PKGS_CSWruby19-samples = CSWruby19 +RUNTIME_DEP_PKGS_CSWruby19-tk = CSWruby19 CSWtk CSWtcl +RUNTIME_DEP_PKGS_CSWruby19-dev = CSWruby19 +RUNTIME_DEP_PKGS_CSWruby19-ri = CSWruby19 SPKG_DESC_CSWruby19 = $(DESCRIPTION) -SPKG_DESC_CSWruby19samples = Example programs for Ruby 1.9 +SPKG_DESC_CSWruby19-samples = Example programs for Ruby 1.9 -SPKG_DESC_CSWruby19ri = Ruby 1.9 Interactive Reference +SPKG_DESC_CSWruby19-ri = Ruby 1.9 Interactive Reference -SPKG_DESC_CSWruby19tk = Ruby 1.9 Tcl/TK Extension +SPKG_DESC_CSWruby19-tk = Ruby 1.9 Tcl/TK Extension -SPKG_DESC_CSWruby19dev = Ruby 1.9 Extension Development Files +SPKG_DESC_CSWruby19-dev = Ruby 1.9 Extension Development Files -PKGFILES_CSWruby19samples = $(docdir)/ruby19/sample.* +PKGFILES_CSWruby19-samples = $(docdir)/ruby19/sample.* -PKGFILES_CSWruby19ri = $(datadir)/ri19.* $(bindir)/ri19 +PKGFILES_CSWruby19-ri = $(datadir)/ri19.* $(bindir)/ri19 -PKGFILES_CSWruby19tk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb +PKGFILES_CSWruby19-tk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb -PKGFILES_CSWruby19dev = $(includedir)/.*\.h $(libdir)/.*\.h $(libdir)/.*/mkmf.rb $(libdir)/.*static.a +PKGFILES_CSWruby19-dev = $(includedir)/.*\.h $(libdir)/.*\.h $(libdir)/.*/mkmf.rb $(libdir)/.*static.a MASTER_SITES = ftp://ftp.ruby-lang.org/pub/ruby/1.9/ DISTFILES = $(DISTNAME).tar.gz @@ -97,7 +98,7 @@ ifdef USEGCC GARCOMPILER = GCC4 RUNTIME_DEP_PKGS_CSWruby19 += CSWgcc4corert -RUNTIME_DEP_PKGS_CSWruby19dev += CSWgcc4core +RUNTIME_DEP_PKGS_CSWruby19-dev += CSWgcc4core # This is for rbconfig.rb: without this, modules built may not get a # proper setting. EXTRA_LDFLAGS = -R $(abspath /opt/csw/gcc4/lib/$(MM_LIBDIR)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Mar 18 04:02:10 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 18 Mar 2011 03:02:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[13855] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 13855 http://gar.svn.sourceforge.net/gar/?rev=13855&view=rev Author: bdwalton Date: 2011-03-18 03:02:10 +0000 (Fri, 18 Mar 2011) Log Message: ----------- ruby19/trunk: catch a few missed name changes Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2011-03-18 03:01:12 UTC (rev 13854) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2011-03-18 03:02:10 UTC (rev 13855) @@ -30,10 +30,10 @@ endef PACKAGES = CSWruby19 CSWruby19-samples CSWruby19-ri CSWruby19-tk -PACKAGES += CSWruby19dev +PACKAGES += CSWruby19-dev -ARCHALL_CSWruby19samples = 1 -ARCHALL_CSWruby19ri = 1 +ARCHALL_CSWruby19-samples = 1 +ARCHALL_CSWruby19-ri = 1 # checkpkg overrides CHECKPKG_OVERRIDES_CSWruby19-dev += missing-dependency|CSWruby This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Fri Mar 18 11:46:49 2011 From: dam at opencsw.org (Dagobert Michelsen) Date: Fri, 18 Mar 2011 11:46:49 +0100 Subject: [csw-devel] SF.net SVN: gar:[13852] csw/mgar/pkg/ruby-augeas/trunk/Makefile In-Reply-To: References: Message-ID: <90A9F70B-2918-49A1-9A59-BC1CD34D3C2F@opencsw.org> Hi, Am 17.03.2011 um 18:56 schrieb phipsy at users.sourceforge.net: > Revision: 13852 > http://gar.svn.sourceforge.net/gar/?rev=13852&view=rev > Author: phipsy > Date: 2011-03-17 17:56:16 +0000 (Thu, 17 Mar 2011) > > Log Message: > ----------- > ruby_augeas: works > > Modified Paths: > -------------- > csw/mgar/pkg/ruby-augeas/trunk/Makefile > > Modified: csw/mgar/pkg/ruby-augeas/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/ruby-augeas/trunk/Makefile 2011-03-17 15:52:20 UTC (rev 13851) > +++ csw/mgar/pkg/ruby-augeas/trunk/Makefile 2011-03-17 17:56:16 UTC (rev 13852) > @@ -13,8 +13,6 @@ > PACKAGES = CSWrubyaugeas > CATALOGNAME = ruby_augeas > > -PATCHFILES = 0001-Does-this-fix-the-building-issues.patch > - > RUNTIME_DEP_PKGS_CSWrubyaugeas += CSWaugeas > RUNTIME_DEP_PKGS_CSWrubyaugeas += CSWruby > CHECKPKG_OVERRIDES_CSWrubyaugeas += catalogname-does-not-match-pkgname|pkgname=CSWrubyaugeas|catalogname=ruby_augeas|expected-catalogname=rubyaugeas Please note that this does not conform to naming standards, which would be CSWrb-augeas and rb_augeas Best regards -- Dago > > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel From phipsy at users.sourceforge.net Fri Mar 18 16:05:31 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Fri, 18 Mar 2011 15:05:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[13856] csw/mgar/pkg/ruby-augeas/tags/ruby-augeas-0.3.0, REV =2011.03.18/ Message-ID: Revision: 13856 http://gar.svn.sourceforge.net/gar/?rev=13856&view=rev Author: phipsy Date: 2011-03-18 15:05:31 +0000 (Fri, 18 Mar 2011) Log Message: ----------- ruby-augeas: Tag as release 0.3.0,REV=2011.03.18 Added Paths: ----------- csw/mgar/pkg/ruby-augeas/tags/ruby-augeas-0.3.0,REV=2011.03.18/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Fri Mar 18 16:11:33 2011 From: bwalton at opencsw.org (Ben Walton) Date: Fri, 18 Mar 2011 11:11:33 -0400 Subject: [csw-devel] SF.net SVN: gar:[13856] csw/mgar/pkg/ruby-augeas/tags/ruby-augeas-0.3.0, REV =2011.03.18/ In-Reply-To: References: Message-ID: <1300461064-sup-1966@pinkfloyd.chass.utoronto.ca> Excerpts from phipsy's message of Fri Mar 18 11:05:31 -0400 2011: Hi Mark, Mind holding off your release of this until the new CSWlibruby18-1 hits the streets? Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bdwalton at users.sourceforge.net Sat Mar 19 02:19:27 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 19 Mar 2011 01:19:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[13857] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 13857 http://gar.svn.sourceforge.net/gar/?rev=13857&view=rev Author: bdwalton Date: 2011-03-19 01:19:27 +0000 (Sat, 19 Mar 2011) Log Message: ----------- git/trunk: update naming conventions to current standards, provide obsolete versions Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2011-03-18 15:05:31 UTC (rev 13856) +++ csw/mgar/pkg/git/trunk/Makefile 2011-03-19 01:19:27 UTC (rev 13857) @@ -12,26 +12,33 @@ TEST_SCRIPTS = -PACKAGES = CSWgit CSWgitk CSWgitgui CSWgitsvn CSWgitcvs CSWgitemacs CSWgitdoc -PACKAGES += CSWgitcompletion CSWgitdevel +PACKAGES = CSWgit CSWgitk CSWgit-gui CSWgit-svn CSWgit-cvs +PACKAGES += CSWgit-emacs CSWgit-doc CSWgit-completion CSWgit-dev +OBSOLETES_CSWgit-gui = CSWgitgui +OBSOLETES_CSWgit-svn = CSWgitsvn +OBSOLETES_CSWgit-emacs = CSWgitemacs +OBSOLETES_CSWgit-doc = CSWgitdoc +OBSOLETES_CSWgit-completion = CSWgitcompletion +OBSOLETES_CSWgit-dev = CSWgitdevel + CATALOGNAME_CSWgit = git -CATALOGNAME_CSWgitcvs = git_cvs -CATALOGNAME_CSWgitsvn = git_svn -CATALOGNAME_CSWgitemacs = git_emacs -CATALOGNAME_CSWgitgui = git_gui -CATALOGNAME_CSWgitdoc = git_doc +CATALOGNAME_CSWgit-cvs = git_cvs +CATALOGNAME_CSWgit-svn = git_svn +CATALOGNAME_CSWgit-emacs = git_emacs +CATALOGNAME_CSWgit-gui = git_gui +CATALOGNAME_CSWgit-doc = git_doc CATALOGNAME_CSWgitk = gitk -CATALOGNAME_CSWgitcompletion = git_completion -CATALOGNAME_CSWgitdevel = git_devel +CATALOGNAME_CSWgit-completion = git_completion +CATALOGNAME_CSWgit-dev = git_devel -ARCHALL_CSWgitsvn = 1 -ARCHALL_CSWgitcvs = 1 +ARCHALL_CSWgit-svn = 1 +ARCHALL_CSWgit-cvs = 1 ARCHALL_CSWgitk = 1 -ARCHALL_CSWgitgui = 1 -ARCHALL_CSWgitemacs = 1 -ARCHALL_CSWgitdoc = 1 -ARCHALL_CSWgitcompletion = 1 +ARCHALL_CSWgit-gui = 1 +ARCHALL_CSWgit-emacs = 1 +ARCHALL_CSWgit-doc = 1 +ARCHALL_CSWgit-completion = 1 BUILD_DEP_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWcurldevel BUILD_DEP_PKGS += CSWgsed CSWgnulinks CSWperl CSWtk CSWexpat @@ -44,21 +51,21 @@ RUNTIME_DEP_PKGS_CSWgitk = CSWgit CSWtk -RUNTIME_DEP_PKGS_CSWgitgui = CSWgit CSWtk +RUNTIME_DEP_PKGS_CSWgit-gui = CSWgit CSWtk -RUNTIME_DEP_PKGS_CSWgitsvn = CSWgit CSWpmsvn +RUNTIME_DEP_PKGS_CSWgit-svn = CSWgit CSWpmsvn -RUNTIME_DEP_PKGS_CSWgitcvs = CSWgit CSWcvs CSWcvsps +RUNTIME_DEP_PKGS_CSWgit-cvs = CSWgit CSWcvs CSWcvsps -RUNTIME_DEP_PKGS_CSWgitemacs = CSWgit CSWemacscommon +RUNTIME_DEP_PKGS_CSWgit-emacs = CSWgit CSWemacscommon -RUNTIME_DEP_PKGS_CSWgitdoc = CSWgit +RUNTIME_DEP_PKGS_CSWgit-doc = CSWgit -RUNTIME_DEP_PKGS_CSWgitdevel = CSWgit +RUNTIME_DEP_PKGS_CSWgit-dev = CSWgit # We include bash here even though git itself depends on it because in theory # git could use any other POSIX compliant shell and drop the dependency... -RUNTIME_DEP_PKGS_CSWgitcompletion = CSWgit CSWbash CSWbashcmplt +RUNTIME_DEP_PKGS_CSWgit-completion = CSWgit CSWbash CSWbashcmplt LICENSE = COPYING @@ -71,13 +78,13 @@ SPKG_DESC_CSWgit = Fast Version Control System SPKG_DESC_CSWgitk = Git revision tree visualiser -SPKG_DESC_CSWgitgui = Git GUI tool -SPKG_DESC_CSWgitsvn = Git tools for working with Subversion repositories -SPKG_DESC_CSWgitcvs = Git tools for working with CVS repositories -SPKG_DESC_CSWgitdoc = Documentation for Git -SPKG_DESC_CSWgitemacs = Git VCS support for Emacs -SPKG_DESC_CSWgitcompletion = Bash completion support for Git -SPKG_DESC_CSWgitdevel = Headers and static libraries for Git +SPKG_DESC_CSWgit-gui = Git GUI tool +SPKG_DESC_CSWgit-svn = Git tools for working with Subversion repositories +SPKG_DESC_CSWgit-cvs = Git tools for working with CVS repositories +SPKG_DESC_CSWgit-doc = Documentation for Git +SPKG_DESC_CSWgit-emacs = Git VCS support for Emacs +SPKG_DESC_CSWgit-completion = Bash completion support for Git +SPKG_DESC_CSWgit-dev = Headers and static libraries for Git #NOTE: If you need to proxy git:// connections, set GIT_USE_PROXY in # your .garrc file. (That leaves this recipe in a more generic form.) @@ -97,14 +104,14 @@ $(foreach d,$(fdirs),$(d)/.*$(1).*) $(sharedstatedir)/$(1).* endef -PKGFILES_CSWgitsvn = $(call _git_files,git-svn) -PKGFILES_CSWgitgui = $(call _git_files,git-gui) $(call _git_files,git-citool) +PKGFILES_CSWgit-svn = $(call _git_files,git-svn) +PKGFILES_CSWgit-gui = $(call _git_files,git-gui) $(call _git_files,git-citool) PKGFILES_CSWgitk = $(call _git_files,gitk) -PKGFILES_CSWgitcvs = $(foreach d,$(fdirs),$(d)/.*cvs.*) -PKGFILES_CSWgitemacs = .*emacs.* -PKGFILES_CSWgitdoc = $(docdir)/.* -PKGFILES_CSWgitcompletion = .*/bash_completion.d/.* -PKGFILES_CSWgitdevel = $(includedir)/.* $(libdir)/.* +PKGFILES_CSWgit-cvs = $(foreach d,$(fdirs),$(d)/.*cvs.*) +PKGFILES_CSWgit-emacs = .*emacs.* +PKGFILES_CSWgit-doc = $(docdir)/.* +PKGFILES_CSWgit-completion = .*/bash_completion.d/.* +PKGFILES_CSWgit-dev = $(includedir)/.* $(libdir)/.* # We define upstream file regex so we can be notifed of new upstream # software release @@ -139,14 +146,14 @@ ETCSERVICES = /opt/csw/etc/pkg/CSWgit/services -CHECKPKG_OVERRIDES_CSWgitcompletion += surplus-dependency|CSWbash -CHECKPKG_OVERRIDES_CSWgitcompletion += surplus-dependency|CSWbashcmplt -CHECKPKG_OVERRIDES_CSWgitcompletion += surplus-dependency|CSWgit -CHECKPKG_OVERRIDES_CSWgitdoc += surplus-dependency|CSWgit -CHECKPKG_OVERRIDES_CSWgitdoc += file-with-bad-content -CHECKPKG_OVERRIDES_CSWgitdevel += discouraged-path-in-pkgmap|/opt/csw/lib/git/libgit.a -CHECKPKG_OVERRIDES_CSWgitdevel += discouraged-path-in-pkgmap|/opt/csw/lib/git/libxdiff.a -CHECKPKG_OVERRIDES_CSWgitdevel += surplus-dependency|CSWgit +CHECKPKG_OVERRIDES_CSWgit-completion += surplus-dependency|CSWbash +CHECKPKG_OVERRIDES_CSWgit-completion += surplus-dependency|CSWbashcmplt +CHECKPKG_OVERRIDES_CSWgit-completion += surplus-dependency|CSWgit +CHECKPKG_OVERRIDES_CSWgit-doc += surplus-dependency|CSWgit +CHECKPKG_OVERRIDES_CSWgit-doc += file-with-bad-content +CHECKPKG_OVERRIDES_CSWgit-dev += discouraged-path-in-pkgmap|/opt/csw/lib/git/libgit.a +CHECKPKG_OVERRIDES_CSWgit-dev += discouraged-path-in-pkgmap|/opt/csw/lib/git/libxdiff.a +CHECKPKG_OVERRIDES_CSWgit-dev += surplus-dependency|CSWgit CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWpmerror CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWbash CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWosshclient @@ -158,16 +165,16 @@ CHECKPKG_OVERRIDES_CSWgit += file-with-bad-content|/usr/share|root/opt/csw/libexec/git-core/git-send-email CHECKPKG_OVERRIDES_CSWgit += file-with-bad-content|/usr/share|root/opt/csw/share/gitweb/gitweb.cgi CHECKPKG_OVERRIDES_CSWgit += file-with-bad-content|/usr/local|root/opt/csw/libexec/git-core/git-instaweb -CHECKPKG_OVERRIDES_CSWgitgui += surplus-dependency|CSWtk -CHECKPKG_OVERRIDES_CSWgitgui += surplus-dependency|CSWgit -CHECKPKG_OVERRIDES_CSWgitemacs += surplus-dependency|CSWgit -CHECKPKG_OVERRIDES_CSWgitcvs += surplus-dependency|CSWcvsps -CHECKPKG_OVERRIDES_CSWgitcvs += surplus-dependency|CSWgit -CHECKPKG_OVERRIDES_CSWgitcvs += surplus-dependency|CSWcvs +CHECKPKG_OVERRIDES_CSWgit-gui += surplus-dependency|CSWtk +CHECKPKG_OVERRIDES_CSWgit-gui += surplus-dependency|CSWgit +CHECKPKG_OVERRIDES_CSWgit-emacs += surplus-dependency|CSWgit +CHECKPKG_OVERRIDES_CSWgit-cvs += surplus-dependency|CSWcvsps +CHECKPKG_OVERRIDES_CSWgit-cvs += surplus-dependency|CSWgit +CHECKPKG_OVERRIDES_CSWgit-cvs += surplus-dependency|CSWcvs CHECKPKG_OVERRIDES_CSWgitk += surplus-dependency|CSWtk CHECKPKG_OVERRIDES_CSWgitk += surplus-dependency|CSWgit -CHECKPKG_OVERRIDES_CSWgitsvn += surplus-dependency|CSWgit -CHECKPKG_OVERRIDES_CSWgitsvn += surplus-dependency|CSWpmsvn +CHECKPKG_OVERRIDES_CSWgit-svn += surplus-dependency|CSWgit +CHECKPKG_OVERRIDES_CSWgit-svn += surplus-dependency|CSWpmsvn include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Sat Mar 19 04:18:07 2011 From: bwalton at opencsw.org (Ben Walton) Date: Fri, 18 Mar 2011 23:18:07 -0400 Subject: [csw-devel] Fwd: Problem with GIT patching when WORKSRC != WORKDIR/DISTNAME Message-ID: <1300504378-sup-975@pinkfloyd.chass.utoronto.ca> Hi Dago, The attached patch fixes your issue and should be, I think compatible with existing build recipes. I'm putting the patch out for review before committing it though in case anyone spots something that may break a recipe they've worked on. For reference, Dago's recipe set both WORKSRC ($(WORKDIR)/$(NAME)-$(VERSION)/build_unix) and PATCHDIR ($(WORKSRC)/..). The GARPATCH command is defined to use -d$(PATCHDIR) and the git patch code was doing cd $(WORKSRC) prior to git init, git apply, etc. In the case of the 'old style' patches, this results in trying to apply the patch with a working directory one level above where git created it's .git directory. The patch applies fine, but the subsequent git commit fails. PATCHDIR is likely a good choice for use in the git commands anyway and in normal recipes, it defaults to WORKSRC. Anyone see issues with the attached patch? Thanks -Ben --- Begin forwarded message from Dagobert Michelsen --- I noticed that GIT patching does not work when $WORKSRC != $WORKDIR/$DISTNAME: > [===== NOW BUILDING: db-3.3.11 MODULATION isa-sparcv8: ISA=sparcv8 =====] > ==> Extracting work/solaris9-sparc/download/db-3.3.11.tar.gz > ==> Snapshotting extracted source tree with git > Initialized empty Git repository in /home/dam/mgar/pkg/bdb3/trunk/work/solaris9-sparc/build-isa-sparcv8/db-3.3.11/build_unix/.git/ > [master (root-commit) c62b7da] Upstream 3.3.11 > 2 files changed, 4 insertions(+), 0 deletions(-) > create mode 100644 .IGNORE_ME > create mode 120000 tags > Switched to a new branch 'csw' > [extract-modulated] complete for db. > ==> Applying patch work/solaris9-sparc/download/patch.3.3.11.2 > Adding old-style patch... > patching file build_vxworks/db.h > Hunk #1 succeeded at 21 (offset -11 lines). > # On branch csw > nothing to commit (working directory clean) > gmake[1]: *** [normal-patch-patch.3.3.11.2] Error 1 > gmake[1]: Leaving directory `/home/dam/mgar/pkg/bdb3/trunk' > gmake: *** [merge-isa-sparcv8] Error 2 > current9s% > current9s% This is important as WORKSRC is meant to be the directory with the configuration stuff in there. I don't have a smart idea on how to fix this. Maybe GIT patching should start at WORKDIR/PATCHDIR which defaults to DISTNAME and which is resettable... Best regards -- Dago --- End forwarded message --- -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 -------------- next part -------------- A non-text attachment was scrubbed... Name: gitpatch.diff Type: application/octet-stream Size: 2879 bytes Desc: not available URL: From bdwalton at users.sourceforge.net Sat Mar 19 04:29:31 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 19 Mar 2011 03:29:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[13858] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 13858 http://gar.svn.sourceforge.net/gar/?rev=13858&view=rev Author: bdwalton Date: 2011-03-19 03:29:31 +0000 (Sat, 19 Mar 2011) Log Message: ----------- git/trunk: update one more catalog name Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2011-03-19 01:19:27 UTC (rev 13857) +++ csw/mgar/pkg/git/trunk/Makefile 2011-03-19 03:29:31 UTC (rev 13858) @@ -30,7 +30,7 @@ CATALOGNAME_CSWgit-doc = git_doc CATALOGNAME_CSWgitk = gitk CATALOGNAME_CSWgit-completion = git_completion -CATALOGNAME_CSWgit-dev = git_devel +CATALOGNAME_CSWgit-dev = git_dev ARCHALL_CSWgit-svn = 1 ARCHALL_CSWgit-cvs = 1 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 Mar 19 04:30:40 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 19 Mar 2011 03:30:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[13859] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 13859 http://gar.svn.sourceforge.net/gar/?rev=13859&view=rev Author: bdwalton Date: 2011-03-19 03:30:40 +0000 (Sat, 19 Mar 2011) Log Message: ----------- git/trunk: add a missing obsoletion Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2011-03-19 03:29:31 UTC (rev 13858) +++ csw/mgar/pkg/git/trunk/Makefile 2011-03-19 03:30:40 UTC (rev 13859) @@ -21,6 +21,7 @@ OBSOLETES_CSWgit-doc = CSWgitdoc OBSOLETES_CSWgit-completion = CSWgitcompletion OBSOLETES_CSWgit-dev = CSWgitdevel +OBSOLETES_CSWgit-cvs = CSWgitcvs CATALOGNAME_CSWgit = git CATALOGNAME_CSWgit-cvs = git_cvs This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sat Mar 19 12:12:22 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Sat, 19 Mar 2011 11:12:22 +0000 Subject: [csw-devel] Atom feed with releases to unstable Message-ID: Hey guys, You all know about the catalog notifier I wrote[1]. It downloads catalogs from HTTP, parses them, compares to previous versions, and sends e-mail notifications. It's great for people to get feedback about their packages being published, but it doesn't help other people know about the published packages. I'm thinking about something like this feed: http://pkgrelease.opencsw.org/cgi-feed/releasedpkgs.atom ...but generated from data available via HTTP, for both opencsw and opencsw-future catalogs. Implementing the atom feed would require setting up a new feed served by http, and a glue code between the catalog notifier and the feed data backend (e.g. mysql). I think it's a reasonably sized self-contained task that another person could take on, and learn about the new infrastructure. I'll offer all the help and guidance I can. Would anyone like to implement that feed? Maciej [1] http://sourceforge.net/apps/trac/gar/browser/csw/mgar/gar/v2/lib/python/catalog_notifier.py From bwalton at opencsw.org Sat Mar 19 14:06:40 2011 From: bwalton at opencsw.org (Ben Walton) Date: Sat, 19 Mar 2011 09:06:40 -0400 Subject: [csw-devel] Atom feed with releases to unstable In-Reply-To: References: Message-ID: <1300539104-sup-2628@pinkfloyd.chass.utoronto.ca> Excerpts from Maciej Blizi?ski's message of Sat Mar 19 07:12:22 -0400 2011: > Implementing the atom feed would require setting up a new feed > served by http, and a glue code between the catalog notifier and the > feed data backend (e.g. mysql). It seems to me that this could be done by the notifier itself. The catalog parser and comparator parts would remain the same. The data that generates the email notification from the template would just need a second step that appends to the xml atom feed...or maybe calls out to a separate tool that does this. At that point, it's just a matter of making the atom feed visible. I think that right around here[1] a bit of code would be added that uses the catalog comparator code (already self contained) and spits makes the appropriate changes to the feed. It might make sense to factor out the calls to catalog comparator from the NotificationFormatter too, but I didn't look too deeply at that. Maciej, is this roughly accurate? Thanks -Ben [1] http://sourceforge.net/apps/trac/gar/browser/csw/mgar/gar/v2/lib/python/catalog_notifier.py#L251 -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From maciej at opencsw.org Sat Mar 19 14:54:32 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Sat, 19 Mar 2011 13:54:32 +0000 Subject: [csw-devel] Atom feed with releases to unstable In-Reply-To: <1300539104-sup-2628@pinkfloyd.chass.utoronto.ca> References: <1300539104-sup-2628@pinkfloyd.chass.utoronto.ca> Message-ID: 2011/3/19 Ben Walton : > Excerpts from Maciej Blizi?ski's message of Sat Mar 19 07:12:22 -0400 2011: > >> Implementing the atom feed would require setting up a new feed >> served by http, and a glue code between the catalog notifier and the >> feed data backend (e.g. mysql). > > It seems to me that this could be done by the notifier itself. ?The > catalog parser and comparator parts would remain the same. ?The data > that generates the email notification from the template would just > need a second step that appends to the xml atom feed...or maybe calls > out to a separate tool that does this. > > At that point, it's just a matter of making the atom feed visible. > > I think that right around here[1] a bit of code would be added that > uses the catalog comparator code (already self contained) and spits > makes the appropriate changes to the feed. ?It might make sense to > factor out the calls to catalog comparator from the > NotificationFormatter too, but I didn't look too deeply at that. > > Maciej, is this roughly accurate? Yes, that's it. Catalog downloading and comparing results are best reused. The comparator class only compares a single catalog, specific to an architecture and OS release. During one run, the notifier downloads and compares 6 (2 architectures ? 3 OS releases) catalogs and stores all diffs in a single data structure. This data structure could be reused. You could for instance memoize the _GetPkgsByMaintainer function and call it again, reusing the data. You could add a new method, similar to FormatNotifications, calling memoized _GetPkgsByMaintainer and doing something else with the data. I've packaged an atom formatting library for Python: py_atomixlib. To persist data between runs, the same simple method could be used: pickle the data on disk, and read them during the next. Something like: unpickle old feed data get new information by comparing catalogs add new entries to the feed remove old items from the feed format feed save feed save data Maciej From bdwalton at users.sourceforge.net Sat Mar 19 16:28:05 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 19 Mar 2011 15:28:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[13860] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 13860 http://gar.svn.sourceforge.net/gar/?rev=13860&view=rev Author: bdwalton Date: 2011-03-19 15:28:05 +0000 (Sat, 19 Mar 2011) Log Message: ----------- git/trunk: clean up the CSWgit-doc pkgfiles split statement; remove 2 usr/share refs for a contributed hook (both comments) Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2011-03-19 03:30:40 UTC (rev 13859) +++ csw/mgar/pkg/git/trunk/Makefile 2011-03-19 15:28:05 UTC (rev 13860) @@ -110,7 +110,7 @@ PKGFILES_CSWgitk = $(call _git_files,gitk) PKGFILES_CSWgit-cvs = $(foreach d,$(fdirs),$(d)/.*cvs.*) PKGFILES_CSWgit-emacs = .*emacs.* -PKGFILES_CSWgit-doc = $(docdir)/.* +PKGFILES_CSWgit-doc = $(docdir)/git-doc.* PKGFILES_CSWgit-completion = .*/bash_completion.d/.* PKGFILES_CSWgit-dev = $(includedir)/.* $(libdir)/.* @@ -228,6 +228,7 @@ cp contrib/completion/* \ $(BD)/ ) @( cd $(WORKSRC)/contrib/hooks; \ + perl -pi -e 's!/usr/share/doc/git-core!/opt/csw/share/doc/git!' post-receive-email ginstall -c -d -m 0755 $(CONTHOOKS); \ ginstall -c -m 0644 post-receive-email $(CONTHOOKS) ) @$(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 Mar 19 16:57:42 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 19 Mar 2011 15:57:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[13861] csw/mgar/pkg/php5/trunk Message-ID: Revision: 13861 http://gar.svn.sourceforge.net/gar/?rev=13861&view=rev Author: bdwalton Date: 2011-03-19 15:57:41 +0000 (Sat, 19 Mar 2011) Log Message: ----------- php5/trunk: patch out some usr/ucblib stuff and correct a non-portable grep option in configure Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/php5/trunk/files/0001-Strip-usr-ucblib-references.patch csw/mgar/pkg/php5/trunk/files/0002-Correct-non-portable-use-of-grep-q-in-configure.patch Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-19 15:28:05 UTC (rev 13860) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-19 15:57:41 UTC (rev 13861) @@ -31,6 +31,9 @@ DISTFILES += $(DISTNAME).tar.bz2 DISTFILES += php.ini.CSW phpext pear.conf.CSW CSWphp5.postinstall +PATCHFILES += 0001-Strip-usr-ucblib-references.patch +PATCHFILES += 0002-Correct-non-portable-use-of-grep-q-in-configure.patch + PACKAGES = CSWphp5 CSWphp5-dev PACKAGES += CSWap2-modphp5 PACKAGES += CSWphp5-bcmath Added: csw/mgar/pkg/php5/trunk/files/0001-Strip-usr-ucblib-references.patch =================================================================== --- csw/mgar/pkg/php5/trunk/files/0001-Strip-usr-ucblib-references.patch (rev 0) +++ csw/mgar/pkg/php5/trunk/files/0001-Strip-usr-ucblib-references.patch 2011-03-19 15:57:41 UTC (rev 13861) @@ -0,0 +1,114 @@ +From 4e2ddc9551f0ceb91f000463812b3c6ba6d395ec Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Fri, 18 Mar 2011 01:43:02 +0100 +Subject: [PATCH] Strip /usr/ucblib references + +Remove all occurrences of /usr/ucblib that exist. + +Signed-off-by: Ben Walton +--- + acinclude.m4 | 2 +- + aclocal.m4 | 2 +- + configure | 39 +-------------------------------------- + configure.in | 2 -- + 4 files changed, 3 insertions(+), 42 deletions(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index 557722f..28d8b1c 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -2051,7 +2051,7 @@ dnl + dnl Search for the sendmail binary + dnl + AC_DEFUN([PHP_PROG_SENDMAIL], [ +- PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib ++ PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/lib + AC_PATH_PROG(PROG_SENDMAIL, sendmail,[], $PATH:$PHP_ALT_PATH) + PHP_SUBST(PROG_SENDMAIL) + ]) +diff --git a/aclocal.m4 b/aclocal.m4 +index cde7793..bb24bf9 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -2051,7 +2051,7 @@ dnl + dnl Search for the sendmail binary + dnl + AC_DEFUN([PHP_PROG_SENDMAIL], [ +- PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib ++ PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/lib + AC_PATH_PROG(PROG_SENDMAIL, sendmail,[], $PATH:$PHP_ALT_PATH) + PHP_SUBST(PROG_SENDMAIL) + ]) +diff --git a/configure b/configure +index 5658cd7..65da668 100755 +--- a/configure ++++ b/configure +@@ -13963,7 +13963,7 @@ fi + + + +- PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib ++ PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/lib + # Extract the first word of "sendmail", so it can be a program name with args. + set dummy sendmail; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +@@ -14166,43 +14166,6 @@ if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then + CPPFLAGS="$CPPFLAGS -I/usr/pkg/include" + LDFLAGS="$LDFLAGS -L/usr/pkg/lib" + fi +-test -d /usr/ucblib && +- if test "/usr/ucblib" != "/usr/$PHP_LIBDIR" && test "/usr/ucblib" != "/usr/lib"; then +- +- if test -z "/usr/ucblib" || echo "/usr/ucblib" | grep '^/' >/dev/null ; then +- ai_p=/usr/ucblib +- else +- +- ep_dir="`echo /usr/ucblib|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"/usr/ucblib\"`" +- fi +- +- +- +- +- +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +- +- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "LIBPATH$unique=set" +- +- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" +- LDFLAGS="$LDFLAGS -L$ai_p" +- PHP_RPATHS="$PHP_RPATHS $ai_p" +- +- fi +- +- +- +- fi +- +- +- +- +- + + unset ac_cv_func_socket + unset ac_cv_func___socket +diff --git a/configure.in b/configure.in +index 7b6e2a8..7568ed7 100644 +--- a/configure.in ++++ b/configure.in +@@ -359,8 +359,6 @@ if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then + CPPFLAGS="$CPPFLAGS -I/usr/pkg/include" + LDFLAGS="$LDFLAGS -L/usr/pkg/lib" + fi +-test -d /usr/ucblib && PHP_ADD_LIBPATH(/usr/ucblib) +- + + dnl First, library checks. + dnl ------------------------------------------------------------------------- +-- +1.7.3.2 + Added: csw/mgar/pkg/php5/trunk/files/0002-Correct-non-portable-use-of-grep-q-in-configure.patch =================================================================== --- csw/mgar/pkg/php5/trunk/files/0002-Correct-non-portable-use-of-grep-q-in-configure.patch (rev 0) +++ csw/mgar/pkg/php5/trunk/files/0002-Correct-non-portable-use-of-grep-q-in-configure.patch 2011-03-19 15:57:41 UTC (rev 13861) @@ -0,0 +1,29 @@ +From 15a1fff863652aa6575aa1dcd44a5f31e4424873 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sat, 19 Mar 2011 16:55:06 +0100 +Subject: [PATCH] Correct non-portable use of grep -q in configure + +Discard the stdout/stderr and test exit status instead. + +Signed-off-by: Ben Walton +--- + configure | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index 65da668..503369a 100755 +--- a/configure ++++ b/configure +@@ -73068,7 +73068,8 @@ EOF + + echo $ac_n "checking for openssl dependencies""... $ac_c" 1>&6 + echo "configure:73108: checking for openssl dependencies" >&5 +- if grep -q openssl $PGSQL_INCLUDE/libpq-fe.h ; then ++grep openssl $PGSQL_INCLUDE/libpq-fe.h >/dev/null 2>&1 ++ if [ $? -eq 0 ] ; then + echo "$ac_t""yes" 1>&6 + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Mar 19 17:16:27 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 19 Mar 2011 16:16:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[13862] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 13862 http://gar.svn.sourceforge.net/gar/?rev=13862&view=rev Author: bonivart Date: 2011-03-19 16:16:26 +0000 (Sat, 19 Mar 2011) Log Message: ----------- cswclassutils/trunk: testing a patch for initsmf Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2011-03-19 15:57:41 UTC (rev 13861) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2011-03-19 16:16:26 UTC (rev 13862) @@ -1,10 +1,10 @@ # $HeadURL$ NAME = cswclassutils -VERSION = 1.42 +VERSION = 1.43 CATEGORIES = utils -# a few handy functions for defining 'generic' things dynmaically +# a few handy functions for defining 'generic' things dynamically set = $(eval $1 := $2) define cas_shortname Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf 2011-03-19 15:57:41 UTC (rev 13861) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf 2011-03-19 16:16:26 UTC (rev 13862) @@ -235,14 +235,16 @@ if [ "`grep '^#AUTOENABLE' $dest`" ]; then AUTOENABLE=`grep '^#AUTOENABLE' $dest | awk '{print $2}' | /usr/xpg4/bin/tr -s '[:upper:]' '[:lower:]'` fi - if [ "$daemon" = "yes" -a "$AUTOENABLE" != "no" -a "$AUTOENABLE" != "false" ]; then - load_smf_service_state "$FMRI/$service" - if [ "$SMF_STATE" = "enabled" ]; then - echo "Clearing svc:/$FMRI/$service in case it's in the maintenance state..." - /usr/sbin/svcadm clear svc:/$FMRI/$service > /dev/null 2>&1 - echo Enabling svc:/$FMRI/$service ... - /usr/sbin/svcadm enable svc:/$FMRI/$service > /dev/null 2>&1 - fi + + load_smf_service_state "$FMRI/$service" + # enable the service if it was enabled before, OR if $daemon = yes and AUTOENABLE is set + # previous SMF state always takes precedence + # note: autoenable_daemons and autoenable_$service controls $daemon, $AUTOENABLE is set by the package itself + if [ "$SMF_STATE" = "enabled" ] || [ "$daemon" = "yes" -a "$AUTOENABLE" != "no" -a "$AUTOENABLE" != "false" ]; then + echo "Clearing svc:/$FMRI/$service in case it's in the maintenance state..." + /usr/sbin/svcadm clear svc:/$FMRI/$service > /dev/null 2>&1 + echo Enabling svc:/$FMRI/$service ... + /usr/sbin/svcadm enable svc:/$FMRI/$service > /dev/null 2>&1 fi else # Copy the service script 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 Mar 19 17:55:37 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 19 Mar 2011 16:55:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[13863] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13863 http://gar.svn.sourceforge.net/gar/?rev=13863&view=rev Author: bdwalton Date: 2011-03-19 16:55:37 +0000 (Sat, 19 Mar 2011) Log Message: ----------- php5/trunk: note the upstream bug for grep -q issue Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-19 16:16:26 UTC (rev 13862) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-19 16:55:37 UTC (rev 13863) @@ -32,6 +32,7 @@ DISTFILES += php.ini.CSW phpext pear.conf.CSW CSWphp5.postinstall PATCHFILES += 0001-Strip-usr-ucblib-references.patch +# this one is filed upstream: http://bugs.php.net/bug.php?id=54318 PATCHFILES += 0002-Correct-non-portable-use-of-grep-q-in-configure.patch PACKAGES = CSWphp5 CSWphp5-dev 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 Mar 19 18:20:23 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 19 Mar 2011 17:20:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[13864] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 13864 http://gar.svn.sourceforge.net/gar/?rev=13864&view=rev Author: bdwalton Date: 2011-03-19 17:20:23 +0000 (Sat, 19 Mar 2011) Log Message: ----------- git/trunk: add missing ; and line continuation to usr/share correction code Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2011-03-19 16:55:37 UTC (rev 13863) +++ csw/mgar/pkg/git/trunk/Makefile 2011-03-19 17:20:23 UTC (rev 13864) @@ -228,7 +228,7 @@ cp contrib/completion/* \ $(BD)/ ) @( cd $(WORKSRC)/contrib/hooks; \ - perl -pi -e 's!/usr/share/doc/git-core!/opt/csw/share/doc/git!' post-receive-email + perl -pi -e 's!/usr/share/doc/git-core!/opt/csw/share/doc/git!' post-receive-email; \ ginstall -c -d -m 0755 $(CONTHOOKS); \ ginstall -c -m 0644 post-receive-email $(CONTHOOKS) ) @$(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 Mar 19 18:25:28 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 19 Mar 2011 17:25:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[13865] csw/mgar/pkg/exim/trunk/ Message-ID: Revision: 13865 http://gar.svn.sourceforge.net/gar/?rev=13865&view=rev Author: bdwalton Date: 2011-03-19 17:25:28 +0000 (Sat, 19 Mar 2011) Log Message: ----------- exim/trunk: change externals ref to v2 Property Changed: ---------------- csw/mgar/pkg/exim/trunk/ Property changes on: csw/mgar/pkg/exim/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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 20 01:25:12 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 20 Mar 2011 00:25:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[13866] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13866 http://gar.svn.sourceforge.net/gar/?rev=13866&view=rev Author: bdwalton Date: 2011-03-20 00:25:11 +0000 (Sun, 20 Mar 2011) Log Message: ----------- php5/trunk: drop an unnecessary extra cflag and correct the iconv setup so we use the csw version properly Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-19 17:25:28 UTC (rev 13865) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-20 00:25:11 UTC (rev 13866) @@ -538,7 +538,6 @@ #include $(EXTENSION_MAKEFILES) EXTRA_CFLAGS = -I$(prefix)/include/ncursesw -EXTRA_CFLAGS += -I/opt/csw/include export CPPFLAGS EXTRA_CPPFLAGS = -I../ext/mbstring @@ -587,8 +586,7 @@ CONFIGURE_ARGS += --with-gettext=shared,$(prefix) CONFIGURE_ARGS += --with-gmp=shared,$(prefix) CONFIGURE_ARGS += --enable-hash=shared -CONFIGURE_ARGS += --with-iconv=shared -CONFIGURE_ARGS += --with-iconv-dir=$(prefix) +CONFIGURE_ARGS += --with-iconv=shared,$(prefix) CONFIGURE_ARGS += --with-imap=shared,$(prefix) CONFIGURE_ARGS += --with-kerberos=$(prefix) CONFIGURE_ARGS += --with-imap-ssl=$(prefix) @@ -647,7 +645,6 @@ CONFIGURE_ARGS += --with-libxml-dir=$(prefix) CONFIGURE_ARGS += --with-xmlrpc=shared CONFIGURE_ARGS += --with-libxml-dir=$(prefix) -CONFIGURE_ARGS += --with-iconv-dir=$(prefix) CONFIGURE_ARGS += --with-libexpat-dir=$(prefix) CONFIGURE_ARGS += --enable-xmlwriter=shared CONFIGURE_ARGS += --with-libxml-dir=$(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 Sun Mar 20 01:39:43 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 20 Mar 2011 00:39:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[13867] csw/mgar/pkg/libxml2/trunk/Makefile Message-ID: Revision: 13867 http://gar.svn.sourceforge.net/gar/?rev=13867&view=rev Author: bdwalton Date: 2011-03-20 00:39:43 +0000 (Sun, 20 Mar 2011) Log Message: ----------- libxml2/trunk: update python dep for pylibxml2 package Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2011-03-20 00:25:11 UTC (rev 13866) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2011-03-20 00:39:43 UTC (rev 13867) @@ -26,7 +26,7 @@ RUNTIME_DEP_PKGS_CSWlibxml2 = CSWiconv CSWzlib RUNTIME_DEP_PKGS_CSWlibxml2devel = CSWlibxml2 -RUNTIME_DEP_PKGS_CSWpylibxml2 = CSWpython CSWlibxml2 CSWiconv CSWzlib +RUNTIME_DEP_PKGS_CSWpylibxml2 = CSWlibpython2-6-1-0 CSWlibxml2 CSWiconv CSWzlib # We don't have 64 bit Python yet CONFIGURE_ARGS_32 = --with-python=$(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 Sun Mar 20 01:48:04 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 20 Mar 2011 00:48:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[13868] csw/mgar/pkg/libxml2/trunk/Makefile Message-ID: Revision: 13868 http://gar.svn.sourceforge.net/gar/?rev=13868&view=rev Author: bdwalton Date: 2011-03-20 00:48:04 +0000 (Sun, 20 Mar 2011) Log Message: ----------- libxml2/trunk: add renames for new standards, use obsoletes for old names Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2011-03-20 00:39:43 UTC (rev 13867) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2011-03-20 00:48:04 UTC (rev 13868) @@ -14,19 +14,24 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWlibxml2 CSWlibxml2devel CSWpylibxml2 +PACKAGES = CSWlibxml2-2 CSWlibxml2devel CSWpy-libxml2 -CATALOGNAME_CSWlibxml2 = libxml2 -CATALOGNAME_CSWlibxml2devel = libxml2_devel -CATALOGNAME_CSWpylibxml2 = py_libxml2 +OBSOLETS_CSWlibxml2-2 = CSWlibxml2 +OBSOLETES_CSWpy-libxml2 = CSWpylibxml2 +OBSOLETES_CSWlibxml2-dev = CSWlibxml2devel +CATALOGNAME_CSWlibxml2-2 = libxml2_2 +CATALOGNAME_CSWlibxml2-dev = libxml2_dev +CATALOGNAME_CSWpy-libxml2 = py_libxml2 + SPKG_DESC_CSWlibxml2 = XML Parser Library -SPKG_DESC_CSWlibxml2devel = XML Parser Library Developer Files -SPKG_DESC_CSWpylibxml2 = XML Parser Library Python Bindings +SPKG_DESC_CSWlibxml2-dev = XML Parser Library Developer Files +SPKG_DESC_CSWpy-libxml2 = XML Parser Library Python Bindings RUNTIME_DEP_PKGS_CSWlibxml2 = CSWiconv CSWzlib -RUNTIME_DEP_PKGS_CSWlibxml2devel = CSWlibxml2 -RUNTIME_DEP_PKGS_CSWpylibxml2 = CSWlibpython2-6-1-0 CSWlibxml2 CSWiconv CSWzlib +RUNTIME_DEP_PKGS_CSWlibxml2-dev = CSWlibxml2 +RUNTIME_DEP_PKGS_CSWpy-libxml2 = CSWlibpython2-6-1-0 CSWlibxml2 +RUNTIME_DEP_PKGS_CSWpy-libxml2 += CSWiconv CSWzlib # We don't have 64 bit Python yet CONFIGURE_ARGS_32 = --with-python=$(prefix) @@ -52,20 +57,20 @@ EXTRA_PAX_ARGS += -s ",^\.$(docdir)/libxml2-python-$(VERSION),.$(docdir)/pylibxml2,p" EXTRA_PAX_ARGS += -s ",^\.$(libdir)/python[^/]*,.$(libdir)/python,p" -PKGFILES_CSWlibxml2devel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibxml2devel += $(docdir)/libxml2/.* -PKGFILES_CSWlibxml2devel += $(sharedstatedir)/gtk-doc/.* -PKGFILES_CSWlibxml2devel += $(libdir)/xml2Conf.sh -PKGFILES_CSWlibxml2devel += $(call isadirs,$(libdir),xml2Conf.sh) +PKGFILES_CSWlibxml2-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWlibxml2-dev += $(docdir)/libxml2/.* +PKGFILES_CSWlibxml2-dev += $(sharedstatedir)/gtk-doc/.* +PKGFILES_CSWlibxml2-dev += $(libdir)/xml2Conf.sh +PKGFILES_CSWlibxml2-dev += $(call isadirs,$(libdir),xml2Conf.sh) -PKGFILES_CSWpylibxml2 = $(libdir)/python/.* -PKGFILES_CSWpylibxml2 += $(docdir)/pylibxml2/.* +PKGFILES_CSWpy-libxml2 = $(libdir)/python/.* +PKGFILES_CSWpy-libxml2 += $(docdir)/pylibxml2/.* sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw # override checkpkg for this -CHECKPKG_OVERRIDES_CSWlibxml2devel += surplus-dependency|CSWlibxml2 +CHECKPKG_OVERRIDES_CSWlibxml2-dev += surplus-dependency|CSWlibxml2 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 Sun Mar 20 01:49:45 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 20 Mar 2011 00:49:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[13869] csw/mgar/pkg/libxml2/trunk/Makefile Message-ID: Revision: 13869 http://gar.svn.sourceforge.net/gar/?rev=13869&view=rev Author: bdwalton Date: 2011-03-20 00:49:45 +0000 (Sun, 20 Mar 2011) Log Message: ----------- libxml2/trunk: correct a typo in an obsoletes statement, update a few other vars for the renaming Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2011-03-20 00:48:04 UTC (rev 13868) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2011-03-20 00:49:45 UTC (rev 13869) @@ -16,7 +16,7 @@ PACKAGES = CSWlibxml2-2 CSWlibxml2devel CSWpy-libxml2 -OBSOLETS_CSWlibxml2-2 = CSWlibxml2 +OBSOLETES_CSWlibxml2-2 = CSWlibxml2 OBSOLETES_CSWpy-libxml2 = CSWpylibxml2 OBSOLETES_CSWlibxml2-dev = CSWlibxml2devel @@ -24,11 +24,11 @@ CATALOGNAME_CSWlibxml2-dev = libxml2_dev CATALOGNAME_CSWpy-libxml2 = py_libxml2 -SPKG_DESC_CSWlibxml2 = XML Parser Library +SPKG_DESC_CSWlibxml2-2 = XML Parser Library SPKG_DESC_CSWlibxml2-dev = XML Parser Library Developer Files -SPKG_DESC_CSWpy-libxml2 = XML Parser Library Python Bindings +SPKG_DESC_CSWpy-libxml2 = XML Parser Library Python Bindings -RUNTIME_DEP_PKGS_CSWlibxml2 = CSWiconv CSWzlib +RUNTIME_DEP_PKGS_CSWlibxml2-2 = CSWiconv CSWzlib RUNTIME_DEP_PKGS_CSWlibxml2-dev = CSWlibxml2 RUNTIME_DEP_PKGS_CSWpy-libxml2 = CSWlibpython2-6-1-0 CSWlibxml2 RUNTIME_DEP_PKGS_CSWpy-libxml2 += CSWiconv CSWzlib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 20 01:51:36 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 20 Mar 2011 00:51:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[13870] csw/mgar/pkg/libxml2/trunk/Makefile Message-ID: Revision: 13870 http://gar.svn.sourceforge.net/gar/?rev=13870&view=rev Author: bdwalton Date: 2011-03-20 00:51:36 +0000 (Sun, 20 Mar 2011) Log Message: ----------- libxml2/trunk: missed the top level rename for the -dev package Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2011-03-20 00:49:45 UTC (rev 13869) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2011-03-20 00:51:36 UTC (rev 13870) @@ -14,7 +14,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWlibxml2-2 CSWlibxml2devel CSWpy-libxml2 +PACKAGES = CSWlibxml2-2 CSWlibxml2-dev CSWpy-libxml2 OBSOLETES_CSWlibxml2-2 = CSWlibxml2 OBSOLETES_CSWpy-libxml2 = CSWpylibxml2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 20 02:23:08 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 20 Mar 2011 01:23:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[13871] csw/mgar/pkg/libxml2/trunk/Makefile Message-ID: Revision: 13871 http://gar.svn.sourceforge.net/gar/?rev=13871&view=rev Author: bdwalton Date: 2011-03-20 01:23:08 +0000 (Sun, 20 Mar 2011) Log Message: ----------- libxml2/trunk: tweak dependencies to newer conventions Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2011-03-20 00:51:36 UTC (rev 13870) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2011-03-20 01:23:08 UTC (rev 13871) @@ -29,8 +29,8 @@ SPKG_DESC_CSWpy-libxml2 = XML Parser Library Python Bindings RUNTIME_DEP_PKGS_CSWlibxml2-2 = CSWiconv CSWzlib -RUNTIME_DEP_PKGS_CSWlibxml2-dev = CSWlibxml2 -RUNTIME_DEP_PKGS_CSWpy-libxml2 = CSWlibpython2-6-1-0 CSWlibxml2 +RUNTIME_DEP_PKGS_CSWlibxml2-dev = CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWpy-libxml2 = CSWlibpython2-6-1-0 CSWpython CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWpy-libxml2 += CSWiconv CSWzlib # We don't have 64 bit Python yet This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 20 03:08:32 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 20 Mar 2011 02:08:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[13872] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13872 http://gar.svn.sourceforge.net/gar/?rev=13872&view=rev Author: bdwalton Date: 2011-03-20 02:08:32 +0000 (Sun, 20 Mar 2011) Log Message: ----------- php5/trunk: drop some other legacy lib and cppflags Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-20 01:23:08 UTC (rev 13871) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-20 02:08:32 UTC (rev 13872) @@ -539,12 +539,8 @@ EXTRA_CFLAGS = -I$(prefix)/include/ncursesw -export CPPFLAGS -EXTRA_CPPFLAGS = -I../ext/mbstring +#LIBS += -lrt -lintl -EXTRA_LDFLAGS += -L$(libdir) -R$(libdir) -LIBS += -lrt -lintl - NOISALIST = 1 STRIP_LIBTOOL = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 20 03:26:18 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 20 Mar 2011 02:26:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[13873] csw/mgar/pkg/libxml2/trunk/Makefile Message-ID: Revision: 13873 http://gar.svn.sourceforge.net/gar/?rev=13873&view=rev Author: bdwalton Date: 2011-03-20 02:26:18 +0000 (Sun, 20 Mar 2011) Log Message: ----------- libxml2/trunk: update checkpkg overrides Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2011-03-20 02:08:32 UTC (rev 13872) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2011-03-20 02:26:18 UTC (rev 13873) @@ -66,11 +66,10 @@ PKGFILES_CSWpy-libxml2 = $(libdir)/python/.* PKGFILES_CSWpy-libxml2 += $(docdir)/pylibxml2/.* +CHECKPKG_OVERRIDES_CSWlibxml2-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/libxml2/html/xml.html + sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw -# override checkpkg for this -CHECKPKG_OVERRIDES_CSWlibxml2-dev += surplus-dependency|CSWlibxml2 - 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 Sun Mar 20 03:28:09 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 20 Mar 2011 02:28:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[13874] csw/mgar/pkg/exim/trunk/Makefile Message-ID: Revision: 13874 http://gar.svn.sourceforge.net/gar/?rev=13874&view=rev Author: bdwalton Date: 2011-03-20 02:28:08 +0000 (Sun, 20 Mar 2011) Log Message: ----------- exim/trunk: update pcre dep to match lib split in that package Modified Paths: -------------- csw/mgar/pkg/exim/trunk/Makefile Modified: csw/mgar/pkg/exim/trunk/Makefile =================================================================== --- csw/mgar/pkg/exim/trunk/Makefile 2011-03-20 02:26:18 UTC (rev 13873) +++ csw/mgar/pkg/exim/trunk/Makefile 2011-03-20 02:28:08 UTC (rev 13874) @@ -30,7 +30,7 @@ RUNTIME_DEP_PKGS_CSWexim = CSWiconv CSWoldaprt CSWosslrt CSWsasl RUNTIME_DEP_PKGS_CSWexim += CSWmysql5rt CSWlibpq CSWlibspf2 RUNTIME_DEP_PKGS_CSWexim += CSWgzip CSWgzipextras -RUNTIME_DEP_PKGS_CSWexim += CSWpcrert +RUNTIME_DEP_PKGS_CSWexim += CSWlibpcre0 # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).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 Sun Mar 20 03:45:17 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 20 Mar 2011 02:45:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[13875] csw/mgar/pkg/exim/trunk Message-ID: Revision: 13875 http://gar.svn.sourceforge.net/gar/?rev=13875&view=rev Author: bdwalton Date: 2011-03-20 02:45:17 +0000 (Sun, 20 Mar 2011) Log Message: ----------- exim/trunk: override usr/local ref in exim binary, add release notes about it Modified Paths: -------------- csw/mgar/pkg/exim/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/exim/trunk/files/CSWexim.cswreleasenotes Modified: csw/mgar/pkg/exim/trunk/Makefile =================================================================== --- csw/mgar/pkg/exim/trunk/Makefile 2011-03-20 02:28:08 UTC (rev 13874) +++ csw/mgar/pkg/exim/trunk/Makefile 2011-03-20 02:45:17 UTC (rev 13875) @@ -17,7 +17,7 @@ MASTER_SITES = ftp://ftp.exim.org/pub/exim/exim4/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 DISTFILES += CSWexim.postinstall CSWexim.postremove CSWexim.preremove -DISTFILES += CSWexim.request +DISTFILES += CSWexim.request CSWexim.cswreleasenotes # NOTE TO FUTURE MAINTAINERS: # This patch should be thoroughly reviewed for each update so as not to @@ -76,6 +76,7 @@ CHECKPKG_OVERRIDES_CSWexim += surplus-dependency|CSWgzip CHECKPKG_OVERRIDES_CSWexim += discouraged-path-in-pkgmap|/opt/csw/var/log CHECKPKG_OVERRIDES_CSWexim += discouraged-path-in-pkgmap|/opt/csw/var/log/exim +CHECKPKG_OVERRIDES_CSWexim += file-with-bad-content|/usr/local|root/opt/csw/sbin/exim PROTOTYPE_MODIFIERS = eximsuid eximlogs PROTOTYPE_PERMS_eximsuid = 4755 Added: csw/mgar/pkg/exim/trunk/files/CSWexim.cswreleasenotes =================================================================== --- csw/mgar/pkg/exim/trunk/files/CSWexim.cswreleasenotes (rev 0) +++ csw/mgar/pkg/exim/trunk/files/CSWexim.cswreleasenotes 2011-03-20 02:45:17 UTC (rev 13875) @@ -0,0 +1,4 @@ +/usr/local reference in exim binary: + This is the default path for some drweb malware detection tool. It's + overridable via configuration and I don't have a better default for it + since we don't ship it. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 20 03:55:23 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 20 Mar 2011 02:55:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[13876] csw/mgar/pkg/libxml2/trunk/Makefile Message-ID: Revision: 13876 http://gar.svn.sourceforge.net/gar/?rev=13876&view=rev Author: bdwalton Date: 2011-03-20 02:55:23 +0000 (Sun, 20 Mar 2011) Log Message: ----------- libxml2/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2011-03-20 02:45:17 UTC (rev 13875) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2011-03-20 02:55:23 UTC (rev 13876) @@ -1,5 +1,5 @@ NAME = libxml2 -VERSION = 2.7.7 +VERSION = 2.7.8 CATEGORIES = lib DESCRIPTION = XML Parser Library This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 20 03:59:12 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 20 Mar 2011 02:59:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[13877] csw/mgar/pkg/libxml2/trunk/checksums Message-ID: Revision: 13877 http://gar.svn.sourceforge.net/gar/?rev=13877&view=rev Author: bdwalton Date: 2011-03-20 02:59:12 +0000 (Sun, 20 Mar 2011) Log Message: ----------- libxml2/trunk: update checksums Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/checksums Modified: csw/mgar/pkg/libxml2/trunk/checksums =================================================================== --- csw/mgar/pkg/libxml2/trunk/checksums 2011-03-20 02:55:23 UTC (rev 13876) +++ csw/mgar/pkg/libxml2/trunk/checksums 2011-03-20 02:59:12 UTC (rev 13877) @@ -1,2 +1 @@ -0c68fe5a079c4c6f8188824941bba80d ld-symbol-handling-fixup.patch -9abc9959823ca9ff904f1fbcf21df066 libxml2-2.7.7.tar.gz +8127a65e8c3b08856093099b52599c86 libxml2-2.7.8.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sun Mar 20 13:44:13 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Sun, 20 Mar 2011 12:44:13 +0000 Subject: [csw-devel] Help with checkpkg: optimizing CatalogMixin.GetPkgByPath() Message-ID: Hey guys, Here's one more checkpkg-related mini-project. One of the performance bottlenecks in checkpkg is the GetPkgByPath function in the CatalogMixin class. It does a relatively simple task: based on the information from the database, it finds out, which package owns a certain file, given a catalog. A catalog is defined as a triplet of catalog release, architecture and OS release[1]. The slowest part seems to be the MySQL query. The miniproject would be to: 1. Extract the exact SQL query compiled by SQLObject 2. Analyze the query in the database 3. Propose a fix (an additional index, etc.) This particular bit will require some research on SQLObject internals (switching on debugging mode) and MySQL query performance analysis. Why is this optimization important? Based on profiling of checkpkg I did, this particular function is the slowest bit of the whole checkpkg run. Checking the whole catalog takes currently a lot of time - about two days if not three, I'm not sure any more. Before the file collision check was introduced, checkpkg was able to analyze the whole catalog in about an hour. Two days is way to slow if we want to have up-to-date QA information for our packages, especially if it comes to a new update breaking other packages. This optimization is vital to our QA future workflow. I will provide all guidance and help I can. Maciej [1] It will eventually change to a quadruplet of catalog release, tier, architecture and OS release. From wahwah at users.sourceforge.net Sun Mar 20 15:52:06 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 20 Mar 2011 14:52:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[13878] csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py Message-ID: Revision: 13878 http://gar.svn.sourceforge.net/gar/?rev=13878&view=rev Author: wahwah Date: 2011-03-20 14:52:05 +0000 (Sun, 20 Mar 2011) Log Message: ----------- checkpkg: Disable a non-passing unit test (2) When checkpkg is run twice against the same package, errors are accumulating. I'm not sure why. At the moment, checkpkg never runs checks more than once in one go, so it doesn't cause operational problems, but this bug ought to be eventually fixed. Disabling for now, to work on something else. Signed-off-by: Maciej Blizi?\197?\132ski Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py 2011-03-20 02:59:12 UTC (rev 13877) +++ csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py 2011-03-20 14:52:05 UTC (rev 13878) @@ -351,8 +351,11 @@ # Verifying that there are some reported error tags. self.assertTrue(list(models.CheckpkgErrorTag.select())) - def testReRunCheckpkg(self): - """Error tags should not accumulate.""" + def disabled_testReRunCheckpkg(self): + """Error tags should not accumulate. + + FIXME(maciej): Figure out what's wrong with this one: It errors out. + """ self.dbc.InitialDataImport() sqo_pkg = package_stats.PackageStats.SaveStats(neon_stats[0], True) cm = checkpkg_lib.CheckpkgManager2( 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 Mar 20 15:53:09 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 20 Mar 2011 14:53:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[13879] csw/mgar/gar/v2/lib/python/opencsw_test.py Message-ID: Revision: 13879 http://gar.svn.sourceforge.net/gar/?rev=13879&view=rev Author: wahwah Date: 2011-03-20 14:53:09 +0000 (Sun, 20 Mar 2011) Log Message: ----------- pkgdb: Disable a non-passing unit test The version comparison function can't distinguish between "1.1" and "1.1b" at the moment. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw_test.py Modified: csw/mgar/gar/v2/lib/python/opencsw_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw_test.py 2011-03-20 14:52:05 UTC (rev 13878) +++ csw/mgar/gar/v2/lib/python/opencsw_test.py 2011-03-20 14:53:09 UTC (rev 13879) @@ -260,8 +260,9 @@ def testNoRev(self): self.assertEqual(-1, opencsw.CompareVersions("1.8.1", "1.8.2")) - def testNoRevLetter(self): - self.assertEqual(-1, opencsw.CompareVersions("1.8.1", "1.8.1b")) + # def testNoRevLetter(self): + # """FIXME: This test doesn't pass.""" + # self.assertEqual(-1, opencsw.CompareVersions("1.8.1", "1.8.1b")) def testNoEqual(self): self.assertEqual(0, opencsw.CompareVersions("1.8.1", "1.8.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 Sun Mar 20 15:53:29 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 20 Mar 2011 14:53:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[13880] csw/mgar/gar/v2/lib/python/inspective_package_test. py Message-ID: Revision: 13880 http://gar.svn.sourceforge.net/gar/?rev=13880&view=rev Author: wahwah Date: 2011-03-20 14:53:29 +0000 (Sun, 20 Mar 2011) Log Message: ----------- checkpkg: Using the new magic flag in a unit test. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/inspective_package_test.py Modified: csw/mgar/gar/v2/lib/python/inspective_package_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package_test.py 2011-03-20 14:53:09 UTC (rev 13879) +++ csw/mgar/gar/v2/lib/python/inspective_package_test.py 2011-03-20 14:53:29 UTC (rev 13880) @@ -37,7 +37,7 @@ self.mox.StubOutWithMock(magic, 'open') magic.open(0).AndReturn(magic_cookie_mock) magic_cookie_mock.load() - magic_cookie_mock.setflags(magic.MAGIC_MIME) + magic_cookie_mock.setflags(magic.MIME) magic_cookie_mock.file( u'/fake/path/CSWfoo/root/foo-file').AndReturn( "application/x-executable") 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 Mar 20 15:53:48 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 20 Mar 2011 14:53:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[13881] csw/mgar/gar/v2/lib/python/checkpkg_lib.py Message-ID: Revision: 13881 http://gar.svn.sourceforge.net/gar/?rev=13881&view=rev Author: wahwah Date: 2011-03-20 14:53:48 +0000 (Sun, 20 Mar 2011) Log Message: ----------- checkpkg: Support for the overridden field The error tag table in the database has the 'overridden' field. This patch add code which sets this field to the right value. The use of that field will come in later changes. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg_lib.py Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2011-03-20 14:53:29 UTC (rev 13880) +++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2011-03-20 14:53:48 UTC (rev 13881) @@ -225,8 +225,10 @@ db_stat_objs_by_pkgname[pkg.pkginst.pkgname] = pkg logging.debug("Deleting old errors from the database.") sqo_os_rel, sqo_arch, sqo_catrel = self.GetSqlobjectTriad() + overrides_by_pkgname = {} for pkgname, db_obj in db_stat_objs_by_pkgname.iteritems(): db_obj.RemoveCheckpkgResults(sqo_os_rel, sqo_arch, sqo_catrel) + overrides_by_pkgname[pkgname] = list(db_obj.GetOverridesResult()) errors, messages, gar_lines = self.GetAllTags(self.sqo_pkgs_list) pbar = self.GetProgressBar() pbar.maxval = len(errors) + 1 @@ -239,14 +241,24 @@ if e.pkgname not in db_stat_objs_by_pkgname: logging.warning("Not saving an error for %s.", e.pkgname) continue - db_error = m.CheckpkgErrorTag(srv4_file=db_stat_objs_by_pkgname[e.pkgname], - pkgname=e.pkgname, - tag_name=e.tag_name, - tag_info=e.tag_info, - msg=e.msg, - os_rel=sqo_os_rel, - catrel=sqo_catrel, - arch=sqo_arch) + error_tag_in_db = m.CheckpkgErrorTag( + srv4_file=db_stat_objs_by_pkgname[e.pkgname], + pkgname=e.pkgname, + tag_name=e.tag_name, + tag_info=e.tag_info, + msg=e.msg, + os_rel=sqo_os_rel, + catrel=sqo_catrel, + arch=sqo_arch) + # Check whether any of the overrides apply to this tag, and + # store the result. + overridden = False + for override in overrides_by_pkgname[pkgname]: + if override.DoesApply(error_tag_in_db): + logging.debug("%s overrides %s", override, error_tag_in_db) + overridden = True + break + error_tag_in_db.overridden = overridden pbar.update(count.next()) pbar.finish() flat_error_list = reduce(operator.add, errors.values(), []) 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 Mar 20 22:15:23 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 20 Mar 2011 21:15:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[13882] csw/mgar/pkg/lang-python Message-ID: Revision: 13882 http://gar.svn.sourceforge.net/gar/?rev=13882&view=rev Author: wahwah Date: 2011-03-20 21:15:22 +0000 (Sun, 20 Mar 2011) Log Message: ----------- pygments: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/pygments/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/pygments/ csw/mgar/pkg/lang-python/pygments/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/lang-python/pygments/trunk/Makefile Deleted: csw/mgar/pkg/lang-python/pygments/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2011-02-15 08:22:56 UTC (rev 13317) +++ csw/mgar/pkg/lang-python/pygments/trunk/Makefile 2011-03-20 21:15:22 UTC (rev 13882) @@ -1,186 +0,0 @@ -# Copyright 2009 OpenCSW -# 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 -## -NAME = mypkg -VERSION = 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. -define BLURB - -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), -## $(PYPI_MIRROR) -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(NAME). 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 = $(NAME)-$(VERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\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)/$(NAME)-$(VERSION) -## -## 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 Copied: csw/mgar/pkg/lang-python/pygments/trunk/Makefile (from rev 13576, csw/mgar/pkg/template/trunk/Makefile) =================================================================== --- csw/mgar/pkg/lang-python/pygments/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/pygments/trunk/Makefile 2011-03-20 21:15:22 UTC (rev 13882) @@ -0,0 +1,16 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +NAME = Pygments +VERSION = 1.4 +CATEGORIES = python +DESCRIPTION = Syntax highlighting for Python +PACKAGES = CSWpy-pygments +ARCHALL_CSWpy-pygments = 1 +define BLURB +endef +MASTER_SITES = $(PYPI_MIRROR) +DISTFILES = $(DISTNAME).tar.gz +CONFIGURE_ARGS = $(DIRPATHS) +include gar/category.mk Modified: csw/mgar/pkg/lang-python/pygments/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2011-02-15 08:22:56 UTC (rev 13317) +++ csw/mgar/pkg/lang-python/pygments/trunk/checksums 2011-03-20 21:15:22 UTC (rev 13882) @@ -0,0 +1 @@ +d77ac8c93a7fb27545f2522abe9cc462 Pygments-1.4.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 Mar 20 22:44:48 2011 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Sun, 20 Mar 2011 21:44:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[13883] csw/mgar/pkg/cswutils/trunk/files/checkpkg Message-ID: Revision: 13883 http://gar.svn.sourceforge.net/gar/?rev=13883&view=rev Author: theferret Date: 2011-03-20 21:44:47 +0000 (Sun, 20 Mar 2011) Log Message: ----------- fix typo in checkpkg Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/files/checkpkg Modified: csw/mgar/pkg/cswutils/trunk/files/checkpkg =================================================================== --- csw/mgar/pkg/cswutils/trunk/files/checkpkg 2011-03-20 21:15:22 UTC (rev 13882) +++ csw/mgar/pkg/cswutils/trunk/files/checkpkg 2011-03-20 21:44:47 UTC (rev 13883) @@ -443,7 +443,7 @@ fi if [[ "$badstrings" != "" ]] ; then - print hunting for which speficic file have bad strings in them + print hunting for which specific file have bad strings in them p=$PWD cd $EXTRACTDIR/$pkgname for badpath in $badpaths ; do 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 Mar 20 22:54:16 2011 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Sun, 20 Mar 2011 21:54:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[13884] csw/mgar/pkg/cswutils/trunk/files/checkpkg Message-ID: Revision: 13884 http://gar.svn.sourceforge.net/gar/?rev=13884&view=rev Author: theferret Date: 2011-03-20 21:54:16 +0000 (Sun, 20 Mar 2011) Log Message: ----------- Fixed functional overlap error against gfile, in checkpkg Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/files/checkpkg Modified: csw/mgar/pkg/cswutils/trunk/files/checkpkg =================================================================== --- csw/mgar/pkg/cswutils/trunk/files/checkpkg 2011-03-20 21:44:47 UTC (rev 13883) +++ csw/mgar/pkg/cswutils/trunk/files/checkpkg 2011-03-20 21:54:16 UTC (rev 13884) @@ -19,8 +19,11 @@ PKGPREF=CSW -PATH=$PATH:/usr/sbin +#Modifing path here, both to have sysadmin type tools in path, but also +# to force use of /usr/bin/file, vs /opt/csw/gnu/file, which breaks things +PATH=/usr/bin:/usr/sbin:$PATH + # This is actually a base for tmpfiles, not the full name # Most things go into EXTRACTDIR, lower down TMPDIR=${TMPDIR:-/tmp} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 21 01:02:21 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 21 Mar 2011 00:02:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[13885] csw/mgar/pkg/git/trunk Message-ID: Revision: 13885 http://gar.svn.sourceforge.net/gar/?rev=13885&view=rev Author: bdwalton Date: 2011-03-21 00:02:21 +0000 (Mon, 21 Mar 2011) Log Message: ----------- git/trunk: patch the test suite to work around broken solaris ln Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/git/trunk/files/0006-work-around-solaris-ln-bug.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2011-03-20 21:54:16 UTC (rev 13884) +++ csw/mgar/pkg/git/trunk/Makefile 2011-03-21 00:02:21 UTC (rev 13885) @@ -10,7 +10,7 @@ # detected as the first available utf8 locale. the failure is # harmless though. -TEST_SCRIPTS = +#TEST_SCRIPTS = PACKAGES = CSWgit CSWgitk CSWgit-gui CSWgit-svn CSWgit-cvs PACKAGES += CSWgit-emacs CSWgit-doc CSWgit-completion CSWgit-dev @@ -99,6 +99,7 @@ PATCHFILES += 0003-Update-path-in-sample-hook-file.patch PATCHFILES += 0004-Use-bash-and-set-PATH-in-contributed-hook-file.patch PATCHFILES += 0005-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch +PATCHFILES += 0006-work-around-solaris-ln-bug.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files Added: csw/mgar/pkg/git/trunk/files/0006-work-around-solaris-ln-bug.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0006-work-around-solaris-ln-bug.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0006-work-around-solaris-ln-bug.patch 2011-03-21 00:02:21 UTC (rev 13885) @@ -0,0 +1,34 @@ +From afe25b62999a24a7585dcf8008eb180f585ba158 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sun, 20 Mar 2011 03:38:32 +0100 +Subject: [PATCH] work around solaris ln bug + +Signed-off-by: Ben Walton +--- + t/t8006-blame-textconv.sh | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/t/t8006-blame-textconv.sh b/t/t8006-blame-textconv.sh +index ea64cd8..83f7c99 100755 +--- a/t/t8006-blame-textconv.sh ++++ b/t/t8006-blame-textconv.sh +@@ -18,14 +18,14 @@ test_expect_success 'setup ' ' + echo "bin: test 1" >one.bin && + echo "bin: test number 2" >two.bin && + if test_have_prereq SYMLINKS; then +- ln -s one.bin symlink.bin ++ /opt/csw/gnu/ln -s one.bin symlink.bin + fi && + git add . && + GIT_AUTHOR_NAME=Number1 git commit -a -m First --date="2010-01-01 18:00:00" && + echo "bin: test 1 version 2" >one.bin && + echo "bin: test number 2 version 2" >>two.bin && + if test_have_prereq SYMLINKS; then +- ln -sf two.bin symlink.bin ++ /opt/csw/gnu/ln -sf two.bin symlink.bin + fi && + GIT_AUTHOR_NAME=Number2 git commit -a -m Second --date="2010-01-01 20:00:00" + ' +-- +1.7.3.2 + 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 Mar 21 01:02:41 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Mar 2011 00:02:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[13886] csw/mgar/pkg/lang-python Message-ID: Revision: 13886 http://gar.svn.sourceforge.net/gar/?rev=13886&view=rev Author: wahwah Date: 2011-03-21 00:02:41 +0000 (Mon, 21 Mar 2011) Log Message: ----------- sphinx: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/sphinx/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/sphinx/ csw/mgar/pkg/lang-python/sphinx/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/lang-python/sphinx/trunk/Makefile Deleted: csw/mgar/pkg/lang-python/sphinx/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2011-02-15 08:22:56 UTC (rev 13317) +++ csw/mgar/pkg/lang-python/sphinx/trunk/Makefile 2011-03-21 00:02:41 UTC (rev 13886) @@ -1,186 +0,0 @@ -# Copyright 2009 OpenCSW -# 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 -## -NAME = mypkg -VERSION = 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. -define BLURB - -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), -## $(PYPI_MIRROR) -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(NAME). 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 = $(NAME)-$(VERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\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)/$(NAME)-$(VERSION) -## -## 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 Copied: csw/mgar/pkg/lang-python/sphinx/trunk/Makefile (from rev 13576, csw/mgar/pkg/template/trunk/Makefile) =================================================================== --- csw/mgar/pkg/lang-python/sphinx/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/sphinx/trunk/Makefile 2011-03-21 00:02:41 UTC (rev 13886) @@ -0,0 +1,14 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +NAME = Sphinx +VERSION = 1.0.7 +PACKAGES = CSWpy-sphinx +CATEGORIES = python +DESCRIPTION = Helps create documentation consisting of reStructuredText sources +define BLURB +endef +DISTFILES = $(DISTNAME).tar.gz +ARCHALL_CSWpy-sphinx = 1 +include gar/category.mk Modified: csw/mgar/pkg/lang-python/sphinx/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2011-02-15 08:22:56 UTC (rev 13317) +++ csw/mgar/pkg/lang-python/sphinx/trunk/checksums 2011-03-21 00:02:41 UTC (rev 13886) @@ -0,0 +1 @@ +42c722d48e52d4888193965dd473adb5 Sphinx-1.0.7.tar.gz 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 Mar 21 01:05:30 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Mar 2011 00:05:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[13887] csw/mgar/pkg/lang-python/sphinx/trunk/Makefile Message-ID: Revision: 13887 http://gar.svn.sourceforge.net/gar/?rev=13887&view=rev Author: wahwah Date: 2011-03-21 00:05:30 +0000 (Mon, 21 Mar 2011) Log Message: ----------- sphinx: Add dependency on pygments Modified Paths: -------------- csw/mgar/pkg/lang-python/sphinx/trunk/Makefile Modified: csw/mgar/pkg/lang-python/sphinx/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/sphinx/trunk/Makefile 2011-03-21 00:02:41 UTC (rev 13886) +++ csw/mgar/pkg/lang-python/sphinx/trunk/Makefile 2011-03-21 00:05:30 UTC (rev 13887) @@ -11,4 +11,6 @@ endef DISTFILES = $(DISTNAME).tar.gz ARCHALL_CSWpy-sphinx = 1 +DEP_PKGS = CSWpy-pygments +CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpy-pygments include gar/category.mk 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 Mar 21 01:12:04 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Mar 2011 00:12:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[13888] csw/mgar/pkg/lang-python Message-ID: Revision: 13888 http://gar.svn.sourceforge.net/gar/?rev=13888&view=rev Author: wahwah Date: 2011-03-21 00:12:04 +0000 (Mon, 21 Mar 2011) Log Message: ----------- jinja2: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/jinja2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/jinja2/ csw/mgar/pkg/lang-python/jinja2/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/lang-python/jinja2/trunk/Makefile Deleted: csw/mgar/pkg/lang-python/jinja2/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2011-02-15 08:22:56 UTC (rev 13317) +++ csw/mgar/pkg/lang-python/jinja2/trunk/Makefile 2011-03-21 00:12:04 UTC (rev 13888) @@ -1,186 +0,0 @@ -# Copyright 2009 OpenCSW -# 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 -## -NAME = mypkg -VERSION = 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. -define BLURB - -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), -## $(PYPI_MIRROR) -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(NAME). 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 = $(NAME)-$(VERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\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)/$(NAME)-$(VERSION) -## -## 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 Copied: csw/mgar/pkg/lang-python/jinja2/trunk/Makefile (from rev 13576, csw/mgar/pkg/template/trunk/Makefile) =================================================================== --- csw/mgar/pkg/lang-python/jinja2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/jinja2/trunk/Makefile 2011-03-21 00:12:04 UTC (rev 13888) @@ -0,0 +1,179 @@ +# Copyright 2009 OpenCSW +# 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 +## +NAME = Jinja2 +VERSION = 2.5.5 +## +## 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 = python +## +## A one-line description of the package, which will appear in the pkginfo. +DESCRIPTION = A small but fast and easy to use stand-alone template engine +## +## A longer description of the package. This is only for descriptive purposes +## inside the Makefile and is not used elsewhere. +define BLURB +endef +## +## Upstream URL that should show up in the VENDOR field as well as on +## http://opencsw.org/packages/. +## +## Whitespace-separated list of URLs to download the source package from. +## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR), +## $(PYPI_MIRROR) +## +## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the +## Sourceforge project name differs from $(NAME). 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 = $(DISTNAME).tar.gz +PACKAGES = CSWpy-jinja2 +## +## We define upstream file regex so we can be notifed of new upstream software +## release +## UFILES_REGEX = $(NAME)-(\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 = 1 +## +## 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)/$(NAME)-$(VERSION) +## +## 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 +## +include gar/category.mk Modified: csw/mgar/pkg/lang-python/jinja2/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2011-02-15 08:22:56 UTC (rev 13317) +++ csw/mgar/pkg/lang-python/jinja2/trunk/checksums 2011-03-21 00:12:04 UTC (rev 13888) @@ -0,0 +1 @@ +83b20c1eeb31f49d8e6392efae91b7d5 Jinja2-2.5.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 21 02:53:27 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 21 Mar 2011 01:53:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[13889] csw/mgar/pkg/apache2/branches/open-bug-squash Message-ID: Revision: 13889 http://gar.svn.sourceforge.net/gar/?rev=13889&view=rev Author: bdwalton Date: 2011-03-21 01:53:27 +0000 (Mon, 21 Mar 2011) Log Message: ----------- apache2/branches/open-bug-squash: revert all renames except for -dev to keep things simpler until all issues resolved Modified Paths: -------------- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile Added Paths: ----------- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postinstall csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postremove csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.preinstall Removed Paths: ------------- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postinstall csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postremove csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.preinstall Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-21 00:12:04 UTC (rev 13888) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-21 01:53:27 UTC (rev 13889) @@ -38,8 +38,8 @@ DISTFILES += CSWapache2.killproc cswapache2 DISTFILES += CSWapache2.preinstall CSWapache2.postinstall -DISTFILES += CSWap2-worker.postinstall CSWap2-worker.postremove -DISTFILES += CSWap2-worker.preinstall +DISTFILES += CSWap2worker.postinstall CSWap2worker.postremove +DISTFILES += CSWap2worker.preinstall DISTFILES += CSWapache2-dev.cswreleasenotes @@ -55,36 +55,33 @@ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz # The PACKAGES variable tell GAR which packages to build -PACKAGES = CSWapache2 CSWapache2-dev CSWapache2-manual CSWap2-suexec -PACKAGES += CSWap2-worker +PACKAGES = CSWapache2 CSWapache2-dev CSWapache2-manual CSWap2suexec +PACKAGES += CSWap2worker # These packages are dummy versions to make dependencies nicer # as various things depend on them currently -PACKAGES += CSWap2-prefork CSWapache2rt CSWapache2c +PACKAGES += CSWap2prefork CSWapache2rt CSWapache2c -OBSOLETES_CSWap2-suexec = CSWap2suexec -OBSOLETES_CSWap2-prefork = CSWap2prefork -OBSOLETES_CSWap2-worker = CSWap2worker OBSOLETES_CSWapache2-dev = CSWapache2-devel ARCHALL_CSWapache2-manual = 1 -ARCHALL_CSWap2-prefork = 1 +ARCHALL_CSWap2prefork = 1 ARCHALL_CSWapache2rt = 1 ARCHALL_CSWapache2c = 1 CATALOGNAME_CSWapache2 = apache2 CATALOGNAME_CSWapache2-dev = apache2_dev CATALOGNAME_CSWapache2-manual = apache2_manual -CATALOGNAME_CSWap2-suexec = ap2_suexec -CATALOGNAME_CSWap2-prefork = ap2_prefork -CATALOGNAME_CSWap2-worker = ap2_worker +CATALOGNAME_CSWap2suexec = ap2_suexec +CATALOGNAME_CSWap2prefork = ap2_prefork +CATALOGNAME_CSWap2worker = ap2_worker CATALOGNAME_CSWapache2rt = apache2rt SPKG_DESC_CSWapache2 = A high performance Unix-based HTTP server. SPKG_DESC_CSWapache2-dev = The development files for Apache2. SPKG_DESC_CSWapache2-manual = The Apache2 manual files. -SPKG_DESC_CSWap2-suexec = The standard suEXEC binary for Apache2. -SPKG_DESC_CSWap2-worker = The apache worker mpm. -SPKG_DESC_CSWap2-prefork = A stub for the old prefork mpm package. +SPKG_DESC_CSWap2suexec = The standard suEXEC binary for Apache2. +SPKG_DESC_CSWap2worker = The apache worker mpm. +SPKG_DESC_CSWap2prefork = A stub for the old prefork mpm package. SPKG_DESC_CSWapache2rt = A stub for the old apache2rt package. SPKG_DESC_CSWapache2c = A stub for the old apache2c package. @@ -94,18 +91,18 @@ RUNTIME_DEP_PKGS_CSWapache2 += CSWapache2c RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2 RUNTIME_DEP_PKGS_CSWapache2-dev = CSWapache2 -RUNTIME_DEP_PKGS_CSWap2-suexec = CSWapache2 -RUNTIME_DEP_PKGS_CSWap2-prefork = CSWapache2 -RUNTIME_DEP_PKGS_CSWap2-worker = CSWapache2 CSWapr CSWexpat CSWap2-prefork -RUNTIME_DEP_PKGS_CSWap2-worker += CSWbdb48 CSWapr-util CSWiconv +RUNTIME_DEP_PKGS_CSWap2suexec = CSWapache2 +RUNTIME_DEP_PKGS_CSWap2prefork = CSWapache2 +RUNTIME_DEP_PKGS_CSWap2worker = CSWapache2 CSWapr CSWexpat CSWap2prefork +RUNTIME_DEP_PKGS_CSWap2worker += CSWbdb48 CSWapr-util CSWiconv RUNTIME_DEP_PKGS_CSWapache2rt = CSWapache2 CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWalternatives CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWosslutils CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWapache2c -CHECKPKG_OVERRIDES_CSWap2-prefork += surplus-dependency|CSWapache2 -CHECKPKG_OVERRIDES_CSWap2-worker += surplus-dependency|CSWap2-prefork -CHECKPKG_OVERRIDES_CSWap2-worker += surplus-dependency|CSWalternatives +CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2 +CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWap2prefork +CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWalternatives CHECKPKG_OVERRIDES_CSWapache2rt += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWapache2-dev += file-with-bad-content|/usr/local|root/opt/csw/apache2/include/httpd.h @@ -125,7 +122,7 @@ AP2_MODFILES = *suexec*\.so ALTERNATIVES_CSWapache2 = prefork -ALTERNATIVES_CSWap2-worker = worker +ALTERNATIVES_CSWap2worker = worker ALTERNATIVE_prefork = /opt/csw/apache2/sbin/httpd httpd /opt/csw/apache2/sbin/httpd.prefork 50 ALTERNATIVE_worker = /opt/csw/apache2/sbin/httpd httpd /opt/csw/apache2/sbin/httpd.worker 100 @@ -209,12 +206,12 @@ LIBTOOL_LADIR = $(APACHE_ROOT)/lib STRIP_DIRS = $(APACHE_ROOT)/sbin $(APACHE_ROOT)/libexec -PKGFILES_CSWap2-suexec = .*sbin/suexec .*libexec/.*suexec.* .*/man/.*suexec.* -PKGFILES_CSWap2-suexec += .*ap2mod/suexec +PKGFILES_CSWap2suexec = .*sbin/suexec .*libexec/.*suexec.* .*/man/.*suexec.* +PKGFILES_CSWap2suexec += .*ap2mod/suexec PKGFILES_CSWapache2-dev = .*include/.* .*\.(a|la) PKGFILES_CSWapache2-manual = .*share/.*manual.* .*etc/extra/httpd-manual.conf -PKGFILES_CSWap2-prefork = .*share/doc/ap2_prefork.* -PKGFILES_CSWap2-worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker +PKGFILES_CSWap2prefork = .*share/doc/ap2_prefork.* +PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker PKGFILES_CSWapache2rt = .*share/doc/apache2rt.* PKGFILES_CSWapache2c = .*share/doc/apache2c.* Deleted: csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postinstall =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postinstall 2011-03-21 00:12:04 UTC (rev 13888) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postinstall 2011-03-21 01:53:27 UTC (rev 13889) @@ -1,41 +0,0 @@ -#!/bin/sh - - # Source csw.conf, if it exists -if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then - . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf -fi -if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then - . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf -fi - -# Determine if service should be started or not -daemon=yes -if [ "$autoenable_daemons" = "no" ]; then - daemon=no -fi - -if [ "$autoenable_cswapache2" = "no" ]; then - - daemon=no -elif [ "$autoenable_cswapache2" = "yes" ]; then - daemon=yes -fi - -if [ "$daemon" = "yes" ]; then - # Determine if SMF should be used or not - smf=no - - if [ "$use_smf" = "no" ]; then - smf=no - else - if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ]; then - smf=yes - fi - fi - - if [ "$smf" = "yes" ]; then - svcadm restart cswapache2 - else - /etc/init.d/cswapache2 restart - fi -fi Deleted: csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postremove =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postremove 2011-03-21 00:12:04 UTC (rev 13888) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postremove 2011-03-21 01:53:27 UTC (rev 13889) @@ -1,30 +0,0 @@ -#!/bin/sh - -# Source csw.conf, if it exists -if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then - . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf -fi -if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then - . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf -fi - -# On removal of the worker mpm, restart apache to use the prefork (default) -# mpm...only if it's currently running though -if [ -n "`pgrep -f apache2/sbin/httpd`" ]; then - # Determine if SMF should be used or not - smf=no - - if [ "$use_smf" = "no" ]; then - smf=no - else - if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ]; then - smf=yes - fi - fi - - if [ "$smf" = "yes" ]; then - svcadm restart cswapache2 - else - /etc/init.d/cswapache2 restart - fi -fi Deleted: csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.preinstall =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.preinstall 2011-03-21 00:12:04 UTC (rev 13888) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.preinstall 2011-03-21 01:53:27 UTC (rev 13889) @@ -1,15 +0,0 @@ -#!/bin/sh - -# The old apache2 packages could potentially leave a dangling -# sbin/httpd file. As this would prevent successful delivery of the -# new packages (alternatives won't instantiate sbin/httpd as a symlink -# since it exists already), we need to kill sbin/httpd if it exists -# when CSWapache2 is installed. - -HTTPD=$PKG_INSTALL_ROOT/opt/csw/apache2/sbin/httpd - -if [ -f "$HTTPD" -a ! -L "$HTTPD" ]; then - rm -f "$HTTPD" -fi - -exit 0 Copied: csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postinstall (from rev 13557, csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postinstall) =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postinstall (rev 0) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postinstall 2011-03-21 01:53:27 UTC (rev 13889) @@ -0,0 +1,41 @@ +#!/bin/sh + + # Source csw.conf, if it exists +if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then + . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf +fi +if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then + . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf +fi + +# Determine if service should be started or not +daemon=yes +if [ "$autoenable_daemons" = "no" ]; then + daemon=no +fi + +if [ "$autoenable_cswapache2" = "no" ]; then + + daemon=no +elif [ "$autoenable_cswapache2" = "yes" ]; then + daemon=yes +fi + +if [ "$daemon" = "yes" ]; then + # Determine if SMF should be used or not + smf=no + + if [ "$use_smf" = "no" ]; then + smf=no + else + if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ]; then + smf=yes + fi + fi + + if [ "$smf" = "yes" ]; then + svcadm restart cswapache2 + else + /etc/init.d/cswapache2 restart + fi +fi Copied: csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postremove (from rev 13557, csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postremove) =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postremove (rev 0) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postremove 2011-03-21 01:53:27 UTC (rev 13889) @@ -0,0 +1,30 @@ +#!/bin/sh + +# Source csw.conf, if it exists +if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then + . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf +fi +if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then + . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf +fi + +# On removal of the worker mpm, restart apache to use the prefork (default) +# mpm...only if it's currently running though +if [ -n "`pgrep -f apache2/sbin/httpd`" ]; then + # Determine if SMF should be used or not + smf=no + + if [ "$use_smf" = "no" ]; then + smf=no + else + if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ]; then + smf=yes + fi + fi + + if [ "$smf" = "yes" ]; then + svcadm restart cswapache2 + else + /etc/init.d/cswapache2 restart + fi +fi Copied: csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.preinstall (from rev 13557, csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.preinstall) =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.preinstall (rev 0) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.preinstall 2011-03-21 01:53:27 UTC (rev 13889) @@ -0,0 +1,15 @@ +#!/bin/sh + +# The old apache2 packages could potentially leave a dangling +# sbin/httpd file. As this would prevent successful delivery of the +# new packages (alternatives won't instantiate sbin/httpd as a symlink +# since it exists already), we need to kill sbin/httpd if it exists +# when CSWapache2 is installed. + +HTTPD=$PKG_INSTALL_ROOT/opt/csw/apache2/sbin/httpd + +if [ -f "$HTTPD" -a ! -L "$HTTPD" ]; then + rm -f "$HTTPD" +fi + +exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 21 03:08:11 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 21 Mar 2011 02:08:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[13890] csw/mgar/pkg/apache2/branches/open-bug-squash/ Makefile Message-ID: Revision: 13890 http://gar.svn.sourceforge.net/gar/?rev=13890&view=rev Author: bdwalton Date: 2011-03-21 02:08:11 +0000 (Mon, 21 Mar 2011) Log Message: ----------- apache2/branches/open-bug-squash: add some fake deps on the apache2c stub package and override checkpkg about them Modified Paths: -------------- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-21 01:53:27 UTC (rev 13889) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-21 02:08:11 UTC (rev 13890) @@ -92,17 +92,19 @@ RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2 RUNTIME_DEP_PKGS_CSWapache2-dev = CSWapache2 RUNTIME_DEP_PKGS_CSWap2suexec = CSWapache2 -RUNTIME_DEP_PKGS_CSWap2prefork = CSWapache2 +RUNTIME_DEP_PKGS_CSWap2prefork = CSWapache2 CSWapache2c RUNTIME_DEP_PKGS_CSWap2worker = CSWapache2 CSWapr CSWexpat CSWap2prefork -RUNTIME_DEP_PKGS_CSWap2worker += CSWbdb48 CSWapr-util CSWiconv +RUNTIME_DEP_PKGS_CSWap2worker += CSWbdb48 CSWapr-util CSWiconv CSWapache2c RUNTIME_DEP_PKGS_CSWapache2rt = CSWapache2 CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWalternatives CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWosslutils CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWapache2c CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2 +CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2c CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWap2prefork CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWalternatives +CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWapache2c CHECKPKG_OVERRIDES_CSWapache2rt += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWapache2-dev += file-with-bad-content|/usr/local|root/opt/csw/apache2/include/httpd.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 21 03:33:12 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 21 Mar 2011 02:33:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[13891] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13891 http://gar.svn.sourceforge.net/gar/?rev=13891&view=rev Author: bdwalton Date: 2011-03-21 02:33:12 +0000 (Mon, 21 Mar 2011) Log Message: ----------- php5/trunk: supply the location of apxs for apache2 Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-21 02:08:11 UTC (rev 13890) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-21 02:33:12 UTC (rev 13891) @@ -548,6 +548,7 @@ CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --with-exec-dir=$(prefix)/php5/bin CONFIGURE_ARGS += --enable-cli +CONFIGURE_ARGS += --with-apxs2=/opt/csw/apache2/sbin/apxs CONFIGURE_ARGS += --with-mm=$(prefix) CONFIGURE_ARGS += --enable-magic-quotes CONFIGURE_ARGS += --with-pcre-regex This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 21 03:35:16 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 21 Mar 2011 02:35:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[13892] csw/mgar/pkg/apache2/branches/open-bug-squash/ Makefile Message-ID: Revision: 13892 http://gar.svn.sourceforge.net/gar/?rev=13892&view=rev Author: bdwalton Date: 2011-03-21 02:35:15 +0000 (Mon, 21 Mar 2011) Log Message: ----------- apache2/branches/open-bug-squash: override catalogname errors until things are sorted out Modified Paths: -------------- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-21 02:33:12 UTC (rev 13891) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-21 02:35:15 UTC (rev 13892) @@ -109,6 +109,12 @@ CHECKPKG_OVERRIDES_CSWapache2-dev += file-with-bad-content|/usr/local|root/opt/csw/apache2/include/httpd.h +# these will eventually go away... +CHECKPKG_OVERRIDES_CSWap2suexec += catalogname-does-not-match-pkgname|pkgname=CSWap2suexec|catalogname=ap2_suexec|expected-catalogname=ap2suexec +CHECKPKG_OVERRIDES_CSWap2worker += catalogname-does-not-match-pkgname|pkgname=CSWap2worker|catalogname=ap2_worker|expected-catalogname=ap2worker +CHECKPKG_OVERRIDES_CSWap2prefork += catalogname-does-not-match-pkgname|pkgname=CSWap2prefork|catalogname=ap2_prefork|expected-catalogname=ap2prefork + + # We need this to get bdb48/lib into the runpath EXTRA_LIB = $(prefix)/bdb48/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 Mon Mar 21 03:42:20 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 21 Mar 2011 02:42:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[13893] csw/mgar/pkg/libxslt/trunk/Makefile Message-ID: Revision: 13893 http://gar.svn.sourceforge.net/gar/?rev=13893&view=rev Author: bdwalton Date: 2011-03-21 02:42:20 +0000 (Mon, 21 Mar 2011) Log Message: ----------- libxslt/trunk: change an I dep to an OBSOLETES Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2011-03-21 02:35:15 UTC (rev 13892) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2011-03-21 02:42:20 UTC (rev 13893) @@ -14,7 +14,7 @@ PACKAGES = CSWlibxslt CSWlibxsltdevel CSWpy-libxslt -INCOMPATIBLE_PKGS_CSWpy-libxslt = CSWpylibxslt +OBSOLETES_CSWpy-libxslt = CSWpylibxslt CATALOGNAME_CSWlibxsltdevel = libxslt_devel CATALOGNAME_CSWpy-libxslt = py_libxslt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 21 03:44:32 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 21 Mar 2011 02:44:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[13894] csw/mgar/pkg/libxslt/trunk/Makefile Message-ID: Revision: 13894 http://gar.svn.sourceforge.net/gar/?rev=13894&view=rev Author: bdwalton Date: 2011-03-21 02:44:32 +0000 (Mon, 21 Mar 2011) Log Message: ----------- libxslt/trunk: update name of -dev subpackage, provide an obsoletes for old name Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2011-03-21 02:42:20 UTC (rev 13893) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2011-03-21 02:44:32 UTC (rev 13894) @@ -12,29 +12,23 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz PATCHFILES += 0001-Forcefully-disable-version-script-use.patch -PACKAGES = CSWlibxslt CSWlibxsltdevel CSWpy-libxslt +PACKAGES = CSWlibxslt CSWlibxslt-dev CSWpy-libxslt OBSOLETES_CSWpy-libxslt = CSWpylibxslt +OBSOLETES_CSWlibxslt-dev = CSWlibxsltdevel -CATALOGNAME_CSWlibxsltdevel = libxslt_devel +CATALOGNAME_CSWlibxslt-dev = libxslt_devel CATALOGNAME_CSWpy-libxslt = py_libxslt BUILD_DEP_PKGS = CSWlibxml2 CSWlibxml2devel SPKG_DESC_CSWlibxslt = XSLT engine runtime package -SPKG_DESC_CSWlibxsltdevel = XSLT engine development package +SPKG_DESC_CSWlibxslt-dev = XSLT engine development package SPKG_DESC_CSWpy-libxslt = XSLT engine python package SPKG_SOURCEURL = http://xmlsoft.org/XSLT/ TEST_TARGET = check -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = -(\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_32 = CONFIGURE_ARGS_64 = --without-python CONFIGURE_ARGS = $(DIRPATHS) $(CONFIGURE_ARGS_$(MEMORYMODEL)) @@ -45,7 +39,7 @@ PYCOMPILE = 1 RUNTIME_DEP_PKGS_CSWlibxslt = CSWgcrypt CSWgpgerr CSWiconv CSWlibxml2 CSWzlib -RUNTIME_DEP_PKGS_CSWlibxsltdevel = CSWlibxslt +RUNTIME_DEP_PKGS_CSWlibxslt-dev = CSWlibxslt RUNTIME_DEP_PKGS_CSWpy-libxslt = CSWpython RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxslt RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxml2 @@ -54,14 +48,13 @@ RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWgcrypt RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWiconv - -PKGFILES_CSWlibxsltdevel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibxsltdevel += $(docdir)/libxslt-$(VERSION)/.* -PKGFILES_CSWlibxsltdevel += $(libdir)/xsltConf.sh -PKGFILES_CSWlibxsltdevel += $(call isadirs,$(libdir),xsltConf.sh) +PKGFILES_CSWlibxslt-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWlibxslt-dev += $(docdir)/libxslt-$(VERSION)/.* +PKGFILES_CSWlibxslt-dev += $(libdir)/xsltConf.sh +PKGFILES_CSWlibxslt-dev += $(call isadirs,$(libdir),xsltConf.sh) PKGFILES_CSWpy-libxslt = $(libdir)/python.* PKGFILES_CSWpy-libxslt += $(docdir)/libxslt-python-$(VERSION)/.* -CHECKPKG_OVERRIDES_CSWlibxsltdevel += surplus-dependency|CSWlibxslt +CHECKPKG_OVERRIDES_CSWlibxslt-dev += surplus-dependency|CSWlibxslt 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 Mon Mar 21 08:24:48 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 21 Mar 2011 07:24:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[13895] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 13895 http://gar.svn.sourceforge.net/gar/?rev=13895&view=rev Author: rthurner Date: 2011-03-21 07:24:48 +0000 (Mon, 21 Mar 2011) Log Message: ----------- subversion: try to fix checkpkg caused rename problem Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-03-21 02:44:32 UTC (rev 13894) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-03-21 07:24:48 UTC (rev 13895) @@ -21,7 +21,7 @@ # ...and send the patch to the subversion dev mailing list. # http://subversion.apache.org/mailing-lists.html -NAME = subversion +NAME = svn VERSION = 1.6.16 CATEGORIES = utils 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 Mar 21 09:38:07 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Mar 2011 08:38:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[13896] csw/mgar/pkg/lang-python/sphinx/trunk/Makefile Message-ID: Revision: 13896 http://gar.svn.sourceforge.net/gar/?rev=13896&view=rev Author: wahwah Date: 2011-03-21 08:38:07 +0000 (Mon, 21 Mar 2011) Log Message: ----------- sphinx: Adding dependency on jinja2 Modified Paths: -------------- csw/mgar/pkg/lang-python/sphinx/trunk/Makefile Modified: csw/mgar/pkg/lang-python/sphinx/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/sphinx/trunk/Makefile 2011-03-21 07:24:48 UTC (rev 13895) +++ csw/mgar/pkg/lang-python/sphinx/trunk/Makefile 2011-03-21 08:38:07 UTC (rev 13896) @@ -11,6 +11,8 @@ endef DISTFILES = $(DISTNAME).tar.gz ARCHALL_CSWpy-sphinx = 1 -DEP_PKGS = CSWpy-pygments +DEP_PKGS += CSWpy-pygments +DEP_PKGS += CSWpy-jinja2 CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpy-pygments +CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpy-jinja2 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 Mon Mar 21 10:08:07 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 21 Mar 2011 09:08:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[13897] csw/mgar/pkg/rrdtool/trunk/Makefile Message-ID: Revision: 13897 http://gar.svn.sourceforge.net/gar/?rev=13897&view=rev Author: dmichelsen Date: 2011-03-21 09:08:06 +0000 (Mon, 21 Mar 2011) Log Message: ----------- rrdtool: Rename legacy catalogname rrd to rrd_stub Modified Paths: -------------- csw/mgar/pkg/rrdtool/trunk/Makefile Modified: csw/mgar/pkg/rrdtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/trunk/Makefile 2011-03-21 08:38:07 UTC (rev 13896) +++ csw/mgar/pkg/rrdtool/trunk/Makefile 2011-03-21 09:08:06 UTC (rev 13897) @@ -16,6 +16,9 @@ PATCHFILES += patch-bindings-perl-piped-Makefile.PL PATCHFILES += patch-bindings-perl-shared-Makefile.PL +# This is the stub +CATALOGNAME_CSWrrd = rrd_stub + PACKAGES += CSWrrdtool CATALOGNAME_CSWrrdtool = rrdtool SPKG_DESC_CSWrrdtool = Time-series data logging and graphing 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 Mar 21 10:18:43 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Mar 2011 09:18:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[13898] csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html Message-ID: Revision: 13898 http://gar.svn.sourceforge.net/gar/?rev=13898&view=rev Author: wahwah Date: 2011-03-21 09:18:43 +0000 (Mon, 21 Mar 2011) Log Message: ----------- pkgdb-web: Show if error tags are overridden Modified Paths: -------------- csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html Modified: csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html 2011-03-21 09:08:06 UTC (rev 13897) +++ csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html 2011-03-21 09:18:43 UTC (rev 13898) @@ -57,6 +57,7 @@

Error tags

+

Error tags in catalogs.

    $for osrel, arch, catrel, tags_in_cat in tags_and_catalogs: $if tags_in_cat: @@ -66,17 +67,36 @@ $osrel.short_name
      $for tag in tags_in_cat: -
    • $tag
      • +
    • + $if tag.overridden: + + $else: + + $tag + $if tag.overridden: + (overridden) + +
+

All error tags for this srv4 file.

    $for tag in tags:
  • - $tag + $if tag.overridden: + + $else: + + $tag.tag_name $tag.tag_info + $if tag.overridden: + [overridden] + ($tag.catrel.name $tag.arch.name $tag.os_rel.short_name) + +
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 Mar 21 10:46:03 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Mar 2011 09:46:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[13899] csw/mgar/gar/v2/lib Message-ID: Revision: 13899 http://gar.svn.sourceforge.net/gar/?rev=13899&view=rev Author: wahwah Date: 2011-03-21 09:46:03 +0000 (Mon, 21 Mar 2011) Log Message: ----------- pkgdb-web: A bugfix for error tag display The problem was that the function returning all error tags was asked for tags matching arch='all', and no such tags ever exist: even if the package is architecture-independent, checks are done always specific to an architecture architecture and are stored as such. When the package is arch='all', errors for all architectures are displayed. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/models.py csw/mgar/gar/v2/lib/web/pkgdb_web.py csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2011-03-21 09:18:43 UTC (rev 13898) +++ csw/mgar/gar/v2/lib/python/models.py 2011-03-21 09:46:03 UTC (rev 13899) @@ -166,6 +166,8 @@ return CheckpkgOverride.select(CheckpkgOverride.q.srv4_file==self) def GetErrorTagsResult(self, os_rel, arch, catrel): + assert arch.name != 'all', ("Asked for the 'all' architecture, this is not valid " + "for GetErrorTagsResult().") return CheckpkgErrorTag.select( sqlobject.AND( CheckpkgErrorTag.q.srv4_file==self, Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2011-03-21 09:18:43 UTC (rev 13898) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2011-03-21 09:46:03 UTC (rev 13899) @@ -72,17 +72,21 @@ overrides = pkg.GetOverridesResult() tags_by_cat = {} tags_and_catalogs = [] - arch = pkg.arch osrels = models.OsRelease.select() catrels = models.CatalogRelease.select() all_tags = list(models.CheckpkgErrorTag.selectBy(srv4_file=pkg)) + if pkg.arch.name == 'all': + archs = models.Architecture.select(models.Architecture.q.name!='all') + else: + archs = [arch] for catrel in catrels: - for osrel in osrels: - tags = pkg.GetErrorTagsResult(osrel, arch, catrel) - key = (osrel, arch, catrel) - tags = list(tags) - tags_by_cat[key] = tags - tags_and_catalogs.append((osrel, arch, catrel, tags)) + for arch in archs: + for osrel in osrels: + tags = pkg.GetErrorTagsResult(osrel, arch, catrel) + key = (osrel, arch, catrel) + tags = list(tags) + tags_by_cat[key] = tags + tags_and_catalogs.append((osrel, arch, catrel, tags)) return render.Srv4Detail(pkg, overrides, tags_by_cat, all_tags, tags_and_catalogs) except sqlobject.main.SQLObjectNotFound, e: Modified: csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html 2011-03-21 09:18:43 UTC (rev 13898) +++ csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html 2011-03-21 09:46:03 UTC (rev 13899) @@ -57,7 +57,7 @@

Error tags

-

Error tags in catalogs.

+

Error tags associated with catalogs.

    $for osrel, arch, catrel, tags_in_cat in tags_and_catalogs: $if tags_in_cat: @@ -72,7 +72,7 @@ $else: - $tag + $tag.tag_name $tag.tag_info $if tag.overridden: (overridden) @@ -80,25 +80,6 @@
-

All error tags for this srv4 file.

-
    -$for tag in tags: -
  • - $if tag.overridden: - - $else: - - $tag.tag_name $tag.tag_info - $if tag.overridden: - [overridden] - - ($tag.catrel.name - $tag.arch.name - $tag.os_rel.short_name) - - -
    • -
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 Mar 21 10:46:25 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Mar 2011 09:46:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[13900] csw/mgar/gar/v2/lib/python/pkgdb.py Message-ID: Revision: 13900 http://gar.svn.sourceforge.net/gar/?rev=13900&view=rev Author: wahwah Date: 2011-03-21 09:46:25 +0000 (Mon, 21 Mar 2011) Log Message: ----------- pkgdb: Display more information about error tags Modified Paths: -------------- csw/mgar/gar/v2/lib/python/pkgdb.py Modified: csw/mgar/gar/v2/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb.py 2011-03-21 09:46:03 UTC (rev 13899) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2011-03-21 09:46:25 UTC (rev 13900) @@ -414,7 +414,8 @@ srv4 = GetPkg(md5_sum) res = m.CheckpkgErrorTag.select(m.CheckpkgErrorTag.q.srv4_file==srv4) for row in res: - print row.pkgname, row.tag_name, row.tag_info + print row.pkgname, row.tag_name, row.tag_info, row.catrel.name, row.arch.name, + print row.os_rel.short_name elif (command, subcommand) == ('show', 'overrides'): for md5_sum in md5_sums: srv4 = GetPkg(md5_sum) 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 Mar 21 12:27:45 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Mar 2011 11:27:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[13901] csw/mgar/gar/v2/lib/web/pkgdb_web.py Message-ID: Revision: 13901 http://gar.svn.sourceforge.net/gar/?rev=13901&view=rev Author: wahwah Date: 2011-03-21 11:27:45 +0000 (Mon, 21 Mar 2011) Log Message: ----------- pkgdb-web: A bugfix for srv4 file details view A variable was used without defining it. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2011-03-21 09:46:25 UTC (rev 13900) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2011-03-21 11:27:45 UTC (rev 13901) @@ -78,7 +78,7 @@ if pkg.arch.name == 'all': archs = models.Architecture.select(models.Architecture.q.name!='all') else: - archs = [arch] + archs = [pkg.arch] for catrel in catrels: for arch in archs: for osrel in osrels: 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 Mar 21 13:53:02 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 21 Mar 2011 12:53:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[13902] csw/mgar/gar/v2-defaultchange/ Message-ID: Revision: 13902 http://gar.svn.sourceforge.net/gar/?rev=13902&view=rev Author: dmichelsen Date: 2011-03-21 12:53:02 +0000 (Mon, 21 Mar 2011) Log Message: ----------- mGAR v2: Make new branch defaultchange Added Paths: ----------- csw/mgar/gar/v2-defaultchange/ 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 Mar 21 14:24:57 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 21 Mar 2011 13:24:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[13903] csw/mgar/gar/v2-defaultchange Message-ID: Revision: 13903 http://gar.svn.sourceforge.net/gar/?rev=13903&view=rev Author: dmichelsen Date: 2011-03-21 13:24:56 +0000 (Mon, 21 Mar 2011) Log Message: ----------- mGAR v2 defaultchange: Changes as announced Modified Paths: -------------- csw/mgar/gar/v2-defaultchange/gar.conf.mk csw/mgar/gar/v2-defaultchange/gar.lib.mk csw/mgar/gar/v2-defaultchange/gar.mk csw/mgar/gar/v2-defaultchange/gar.pkg.mk Modified: csw/mgar/gar/v2-defaultchange/gar.conf.mk =================================================================== --- csw/mgar/gar/v2-defaultchange/gar.conf.mk 2011-03-21 12:53:02 UTC (rev 13902) +++ csw/mgar/gar/v2-defaultchange/gar.conf.mk 2011-03-21 13:24:56 UTC (rev 13903) @@ -129,9 +129,9 @@ libexecdir_install ?= $(exec_prefix)/libexec libexecdir ?= $(abspath $(libexecdir_install)/$(MM_BINDIR)) datadir ?= $(prefix)/share -sysconfdir ?= $(prefix)/etc +sysconfdir ?= /etc$(prefix) sharedstatedir ?= $(prefix)/share -localstatedir ?= $(prefix)/var +localstatedir ?= /var$(prefix) libdir_install ?= $(exec_prefix)/lib libdir ?= $(abspath $(libdir_install)/$(MM_LIBDIR)) infodir ?= $(sharedstatedir)/info Modified: csw/mgar/gar/v2-defaultchange/gar.lib.mk =================================================================== --- csw/mgar/gar/v2-defaultchange/gar.lib.mk 2011-03-21 12:53:02 UTC (rev 13902) +++ csw/mgar/gar/v2-defaultchange/gar.lib.mk 2011-03-21 13:24:56 UTC (rev 13903) @@ -807,6 +807,8 @@ DIRPATHS = $(filter-out $(addsuffix %,$(NODIRPATHS)), $(TMP_DIRPATHS)) +CONFIGURE_ARGS ?= $(DIRPATHS) $(EXTRA_CONFIGURE_ARGS) + # configure a package that has an autoconf-style configure # script. configure-%/configure: @@ -928,7 +930,7 @@ #################### TEST RULES #################### -TEST_TARGET ?= test +TEST_TARGET ?= check # Run tests on pre-built sources test-%/Makefile: Modified: csw/mgar/gar/v2-defaultchange/gar.mk =================================================================== --- csw/mgar/gar/v2-defaultchange/gar.mk 2011-03-21 12:53:02 UTC (rev 13902) +++ csw/mgar/gar/v2-defaultchange/gar.mk 2011-03-21 13:24:56 UTC (rev 13903) @@ -688,8 +688,8 @@ # - If there are builds for more than one ISA the destination differs depending on if # the binaries should be executed by isaexec. This is usually bin, sbin and libexec. # -# default: relocate to ISA subdirs if more than one ISA, use isaexec-wrapper for bin/, etc. -# NOISAEXEC = 1: ISA_DEFAULT gets installed in bin/..., all others in bin/$ISA/ +# default: ISA_DEFAULT gets installed in bin/..., all others in bin/$ISA/ +# ISAEXEC = 1: relocate to ISA subdirs if more than one ISA, use isaexec-wrapper for bin/, etc. # # Automatic merging is only possible if you have the default modulation "ISA" # Otherwise you *must* specify merge scripts for all modulations. @@ -705,14 +705,14 @@ MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= $(MERGE_SCRIPTS_isa-default) MERGE_SCRIPTS_$(MODULATION) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED)) else -ISAEXEC_DIRS ?= $(if $(NOISAEXEC),,$(bindir) $(sbindir) $(libexecdir)) +ISAEXEC_DIRS ?= $(if $(ISAEXEC),$(bindir) $(sbindir) $(libexecdir)) MERGE_DIRS_isa-default ?= $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA_DEFAULT)) -MERGE_DIRS_isa-extra ?= $(bindir) $(sbindir) $(libexecdir) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA)) +MERGE_DIRS_isa-extra ?= $(if $(ISAEXEC),$(bindir) $(sbindir) $(libexecdir)) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-extra) $(EXTRA_MERGE_DIRS_isa-$(ISA)) MERGE_DIRS_$(MODULATION_ISACOLLAPSED64) ?= $(MERGE_DIRS_$(MODULATION_ISACOLLAPSEDEXTRA)) MERGE_DIRS_$(MODULATION) ?= $(MERGE_DIRS_$(MODULATION_ISACOLLAPSED)) MERGE_SCRIPTS_isa-default ?= copy-relocate $(EXTRA_MERGE_SCRIPTS_isa-$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) -MERGE_SCRIPTS_isa-extra ?= copy-relocated-only $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS) +MERGE_SCRIPTS_isa-extra ?= copy-relocated-only copy-config-only $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS_isa-extra) $(EXTRA_MERGE_SCRIPTS) MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED64) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSEDEXTRA)) MERGE_SCRIPTS_$(MODULATION) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED)) endif Modified: csw/mgar/gar/v2-defaultchange/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-defaultchange/gar.pkg.mk 2011-03-21 12:53:02 UTC (rev 13902) +++ csw/mgar/gar/v2-defaultchange/gar.pkg.mk 2011-03-21 13:24:56 UTC (rev 13903) @@ -101,7 +101,8 @@ RUNTIME_DEP_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown)) # Sanity checks for r8335 -$(if $(NO_ISAEXEC),$(error The deprecated variable 'NO_ISAEXEC' is defined, please replace it with NOISAEXEC)) +$(if $(NO_ISAEXEC),$(error The deprecated variable 'NO_ISAEXEC' is defined, this is now the default, please remove the line)) +$(if $(NOISAEXEC),$(error The deprecated variable 'NOISAEXEC' is defined, this is now the default, please remove the line)) $(if $(PREREQUISITE_PKGS),$(error The deprecated variable 'PREREQUISITE_PKGS' is defined, please replace it with BUILD_DEP_PKGS)) $(foreach P,$(SPKG_SPECS),$(if $(PREREQUISITE_PKGS_$P),$(error The deprecated variable 'PREREQUISITE_PKGS_$P' is defined, please replace it with BUILD_DEP_PKGS_$P))) $(if $(REQUIRED_PKGS),$(error The deprecated variable 'REQUIRED_PKGS' is defined, please replace it with RUNTIME_DEP_PKGS)) @@ -866,7 +867,7 @@ # modulations and does not fill global/. ENABLE_CHECK ?= 1 -# The files in ISAEXEC get relocated and will be replaced by the isaexec-wrapper. +# The files in ISAEXEC_FILES get relocated and will be replaced by the isaexec-wrapper. # The trick is to delay the calculcation of the variable values until that time # when PKGROOT has already been populated. ISAEXEC_EXCLUDE_FILES ?= $(bindir)/%-config $(bindir)/%/%-config 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 Mar 21 16:53:43 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Mar 2011 15:53:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[13904] csw/mgar/pkg/lang-python/pydocutils/trunk Message-ID: Revision: 13904 http://gar.svn.sourceforge.net/gar/?rev=13904&view=rev Author: wahwah Date: 2011-03-21 15:53:43 +0000 (Mon, 21 Mar 2011) Log Message: ----------- pkg/lang-python/pydocutils/trunk: Version upgrade to 0.7 Modified Paths: -------------- csw/mgar/pkg/lang-python/pydocutils/trunk/Makefile csw/mgar/pkg/lang-python/pydocutils/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/lang-python/pydocutils/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pydocutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pydocutils/trunk/Makefile 2011-03-21 13:24:56 UTC (rev 13903) +++ csw/mgar/pkg/lang-python/pydocutils/trunk/Makefile 2011-03-21 15:53:43 UTC (rev 13904) @@ -1,43 +1,29 @@ -NAME = docutils -VERSION = 0.5 -CATEGORIES = lang +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ -DESCRIPTION = Documentation Utiltiies for Python +NAME = docutils +VERSION = 0.7 +CATEGORIES = python +DESCRIPTION = Plaintext documentation processing system +SPKG_DESC_CSWpy-docutils = $(DESCRIPTION) define BLURB - Documentation Utilities for Python + Documentation utilities for Python endef - +PACKAGES += CSWpy-docutils +TEST_SCRIPTS = +SPKG_SOURCEURL = http://docutils.sourceforge.net/ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.gz - -ARCHALL_CSWpydocutils = 1 -PACKAGES = CSWpydocutils -RUNTIME_DEP_PKGS_CSWpydocutils = CSWpython +INCOMPATIBLE_PKGS_CSWpy-docutils = CSWzope +OBSOLETES_CSWpy-docutils = CSWpydocutils CATALOGNAME_CSWpydocutils = pydocutils -SPKG_DESC = Documentation Utiltiies for Python - -EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc -PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' -SPKG_CLASSES = none cswpycompile -RUNTIME_DEP_PKGS += CSWcswclassutils - - -# We define upstream file regex so we can be notifed of -# new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = $(WORKSRC)/setup.py -TEST_SCRIPTS = -INSTALL_SCRIPTS = $(WORKSRC)/setup.py - -INSTALL_ARGS += --root=$(DESTDIR) - +ARCHALL_CSWpy-docutils = 1 +CHECKPKG_OVERRIDES_CSWpydocutils += surplus-dependency|CSWpython include gar/category.mk post-install: - install -d $(DESTDIR)$(docdir) - cp -R $(WORKSRC)/docs $(DESTDIR)$(docdir)/pydocutils - cp -R $(WORKSRC)/extras $(DESTDIR)$(docdir)/pydocutils - $(DONADA) - + ginstall -d $(DESTDIR)$(docdir) + gcp -Rv $(WORKSRC)/docs $(DESTDIR)$(docdir)/pydocutils + gcp -Rv $(WORKSRC)/extras $(DESTDIR)$(docdir)/pydocutils + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/lang-python/pydocutils/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/lang-python/pydocutils/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pydocutils/trunk/checksums 2011-03-21 13:24:56 UTC (rev 13903) +++ csw/mgar/pkg/lang-python/pydocutils/trunk/checksums 2011-03-21 15:53:43 UTC (rev 13904) @@ -1 +1 @@ -dd72dac92fc8e3eb0f48c3effeef80f6 download/docutils-0.5.tar.gz +9aec716baf15d06b5aa57cf8d5591c15 docutils-0.7.tar.gz 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 Mar 21 16:55:32 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Mar 2011 15:55:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[13905] csw/mgar/pkg/lang-python Message-ID: Revision: 13905 http://gar.svn.sourceforge.net/gar/?rev=13905&view=rev Author: wahwah Date: 2011-03-21 15:55:32 +0000 (Mon, 21 Mar 2011) Log Message: ----------- docutils: Renaming build description base directory Added Paths: ----------- csw/mgar/pkg/lang-python/docutils/ Removed Paths: ------------- csw/mgar/pkg/lang-python/pydocutils/ 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 Mar 21 17:55:53 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Mar 2011 16:55:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[13906] csw/mgar/pkg/lang-python/sphinx/trunk/Makefile Message-ID: Revision: 13906 http://gar.svn.sourceforge.net/gar/?rev=13906&view=rev Author: wahwah Date: 2011-03-21 16:55:53 +0000 (Mon, 21 Mar 2011) Log Message: ----------- pkg/lang-python/sphinx/trunk: Added the dependency on docutils Modified Paths: -------------- csw/mgar/pkg/lang-python/sphinx/trunk/Makefile Modified: csw/mgar/pkg/lang-python/sphinx/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/sphinx/trunk/Makefile 2011-03-21 15:55:32 UTC (rev 13905) +++ csw/mgar/pkg/lang-python/sphinx/trunk/Makefile 2011-03-21 16:55:53 UTC (rev 13906) @@ -11,8 +11,10 @@ endef DISTFILES = $(DISTNAME).tar.gz ARCHALL_CSWpy-sphinx = 1 +DEP_PKGS += CSWpy-docutils +DEP_PKGS += CSWpy-jinja2 DEP_PKGS += CSWpy-pygments -DEP_PKGS += CSWpy-jinja2 +CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpy-docutils +CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpy-jinja2 CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpy-pygments -CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpy-jinja2 include gar/category.mk 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 Mar 21 18:31:20 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Mar 2011 17:31:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[13907] csw/mgar/pkg/libffi/trunk/files/0005-libffi. pc-should-point-at-opt-csw-include.patch Message-ID: Revision: 13907 http://gar.svn.sourceforge.net/gar/?rev=13907&view=rev Author: wahwah Date: 2011-03-21 17:31:20 +0000 (Mon, 21 Mar 2011) Log Message: ----------- pkg/libffi/trunk: Correcting the include directory to /opt/csw/include Modified Paths: -------------- csw/mgar/pkg/libffi/trunk/files/0005-libffi.pc-should-point-at-opt-csw-include.patch Modified: csw/mgar/pkg/libffi/trunk/files/0005-libffi.pc-should-point-at-opt-csw-include.patch =================================================================== --- csw/mgar/pkg/libffi/trunk/files/0005-libffi.pc-should-point-at-opt-csw-include.patch 2011-03-21 16:55:53 UTC (rev 13906) +++ csw/mgar/pkg/libffi/trunk/files/0005-libffi.pc-should-point-at-opt-csw-include.patch 2011-03-21 17:31:20 UTC (rev 13907) @@ -16,7 +16,7 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=${libdir}/@PACKAGE_NAME at -@PACKAGE_VERSION@/include -+includedir=${libdir}/include ++includedir=${prefix}/include Name: @PACKAGE_NAME@ Description: Library supporting Foreign Function Interfaces This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Mon Mar 21 19:56:34 2011 From: dam at opencsw.org (Dagobert Michelsen) Date: Mon, 21 Mar 2011 19:56:34 +0100 Subject: [csw-devel] Fwd: Problem with GIT patching when WORKSRC != WORKDIR/DISTNAME In-Reply-To: <1300504378-sup-975@pinkfloyd.chass.utoronto.ca> References: <1300504378-sup-975@pinkfloyd.chass.utoronto.ca> Message-ID: Hi Ben, Am 19.03.2011 um 04:18 schrieb Ben Walton: > The attached patch fixes your issue and should be, I think compatible > with existing build recipes. I'm putting the patch out for review > before committing it though in case anyone spots something that may > break a recipe they've worked on. > > For reference, Dago's recipe set both WORKSRC > ($(WORKDIR)/$(NAME)-$(VERSION)/build_unix) and PATCHDIR > ($(WORKSRC)/..). The GARPATCH command is defined to use -d$(PATCHDIR) > and the git patch code was doing cd $(WORKSRC) prior to git init, git > apply, etc. In the case of the 'old style' patches, this results in > trying to apply the patch with a working directory one level above > where git created it's .git directory. The patch applies fine, but > the subsequent git commit fails. > > PATCHDIR is likely a good choice for use in the git commands anyway > and in normal recipes, it defaults to WORKSRC. > > Anyone see issues with the attached patch? Looks pretty good, but I would like to add one remark: the PATCHDIR should default to the same as WORKSRC: WORKSRC ?= $(WORKDIR)/$(DISTNAME) PATCHDIR ?= $(WORKDIR)/$(DISTNAME) instead of PATCHDIR ?= $(WORKSRC) That way WORKSRC can safely be modified without disturbing PATCHDIR and still depending on DISTNAME. IMHO the patch can be applied. Best regards -- Dago From bdwalton at users.sourceforge.net Mon Mar 21 20:14:42 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 21 Mar 2011 19:14:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[13908] csw/mgar/gar/v2 Message-ID: Revision: 13908 http://gar.svn.sourceforge.net/gar/?rev=13908&view=rev Author: bdwalton Date: 2011-03-21 19:14:42 +0000 (Mon, 21 Mar 2011) Log Message: ----------- change git patching to use PATCHDIR instead of WORKSRC. defafult PATCHDIR to WORKDIR/DISTNAME instead of WORKSRC to make it independent of changes to WORKSRC by default Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2011-03-21 17:31:20 UTC (rev 13907) +++ csw/mgar/gar/v2/gar.lib.mk 2011-03-21 19:14:42 UTC (rev 13908) @@ -713,7 +713,7 @@ #################### PATCH RULES #################### -PATCHDIR ?= $(WORKSRC) +PATCHDIR ?= $(WORKDIR)/$(DISTNAME) PATCHDIRLEVEL ?= 1 PATCHDIRFUZZ ?= 2 GARPATCH = gpatch -d$(PATCHDIR) -p$(PATCHDIRLEVEL) -F$(PATCHDIRFUZZ) @@ -724,7 +724,7 @@ @echo " ==> Applying patch $(DOWNLOADDIR)/$*" @xz -dc $(DOWNLOADDIR)/$* | $(GARPATCH) @( if [ -z "$(NOGITPATCH)" ]; then \ - cd $(WORKSRC); git add -A; \ + cd $(PATCHDIR); git add -A; \ git commit -am "old xz-style patch: $*"; \ fi ) @$(MAKECOOKIE) @@ -734,7 +734,7 @@ @echo " ==> Applying patch $(DOWNLOADDIR)/$*" @bzip2 -dc $(DOWNLOADDIR)/$* | $(GARPATCH) @( if [ -z "$(NOGITPATCH)" ]; then \ - cd $(WORKSRC); git add -A; \ + cd $(PATCHDIR); git add -A; \ git commit -am "old bz-style patch: $*"; \ fi ) @$(MAKECOOKIE) @@ -744,7 +744,7 @@ @echo " ==> Applying patch $(DOWNLOADDIR)/$*" @gzip -dc $(DOWNLOADDIR)/$* | $(GARPATCH) @( if [ -z "$(NOGITPATCH)" ]; then \ - cd $(WORKSRC); git add -A; \ + cd $(PATCHDIR); git add -A; \ git commit -am "old gz-style patch: $*"; \ fi ) @$(MAKECOOKIE) @@ -754,7 +754,7 @@ @echo " ==> Applying patch $(DOWNLOADDIR)/$*" @( if ggrep -q 'diff --git' $(abspath $(DOWNLOADDIR)/$*); then \ if [ -z "$(NOGITPATCH)" ]; then \ - cd $(WORKSRC);\ + cd $(PATCHDIR);\ git am --ignore-space-change --ignore-whitespace $(abspath $(DOWNLOADDIR)/$*); \ else \ $(GARPATCH) < $(DOWNLOADDIR)/$*; \ @@ -763,7 +763,7 @@ echo Adding old-style patch...; \ $(GARPATCH) < $(DOWNLOADDIR)/$*; \ if [ -z "$(NOGITPATCH)" ]; then \ - cd $(WORKSRC); \ + cd $(PATCHDIR); \ git add -A; \ git commit -am "old style patch: $*"; \ fi; \ Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2011-03-21 17:31:20 UTC (rev 13907) +++ csw/mgar/gar/v2/gar.mk 2011-03-21 19:14:42 UTC (rev 13908) @@ -428,9 +428,9 @@ @$(MAKECOOKIE) post-extract-gitsnap: $(EXTRACT_TARGETS) - @( if [ -d "$(WORKSRC)" ]; then \ + @( if [ -d "$(PATCHDIR)" ]; then \ echo ' ==> Snapshotting extracted source tree with git'; \ - cd $(WORKSRC); git init; git add .; \ + cd $(PATCHDIR); git init; git add .; \ git commit -m "Upstream $(VERSION)"; \ git tag -am "Upstream $(VERSION)" upstream-$(VERSION); \ git checkout -b csw; \ @@ -474,9 +474,9 @@ post-patch-gitsnap: $(PATCH_TARGETS) - @( if [ -d "$(WORKSRC)/.git" ]; then \ + @( if [ -d "$(PATCHDIR)/.git" ]; then \ echo "Tagging top of current csw patch stack..."; \ - cd $(WORKSRC); \ + cd $(PATCHDIR); \ git tag -am "CSW $(VERSION)" csw-$(VERSION); \ fi ) @$(MAKECOOKIE) @@ -490,9 +490,9 @@ # Allow generation of patches from modified work source. makepatch-modulated: $(FILEDIR) - @( if [ -d "$(WORKSRC)/.git" ]; then \ + @( if [ -d "$(PATCHDIR)/.git" ]; then \ echo " ==> Makepatch: Looking for changes in modulation $(MODULATION)"; \ - cd $(WORKSRC); \ + cd $(PATCHDIR); \ git add -u; \ git diff --cached --quiet; \ if test $$? -eq 0; then \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Mon Mar 21 20:15:51 2011 From: bwalton at opencsw.org (Ben Walton) Date: Mon, 21 Mar 2011 15:15:51 -0400 Subject: [csw-devel] Fwd: Problem with GIT patching when WORKSRC != WORKDIR/DISTNAME In-Reply-To: References: <1300504378-sup-975@pinkfloyd.chass.utoronto.ca> Message-ID: <1300734821-sup-1996@pinkfloyd.chass.utoronto.ca> Excerpts from Dagobert Michelsen's message of Mon Mar 21 14:56:34 -0400 2011: > WORKSRC ?= $(WORKDIR)/$(DISTNAME) > PATCHDIR ?= $(WORKDIR)/$(DISTNAME) Yes, making them independent is wise. > IMHO the patch can be applied. Done. Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bdwalton at users.sourceforge.net Tue Mar 22 00:49:20 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 21 Mar 2011 23:49:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[13909] csw/mgar/pkg/libxslt/trunk/Makefile Message-ID: Revision: 13909 http://gar.svn.sourceforge.net/gar/?rev=13909&view=rev Author: bdwalton Date: 2011-03-21 23:49:20 +0000 (Mon, 21 Mar 2011) Log Message: ----------- libxslt/trunk: correct catalog name for dev package Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2011-03-21 19:14:42 UTC (rev 13908) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2011-03-21 23:49:20 UTC (rev 13909) @@ -17,7 +17,7 @@ OBSOLETES_CSWpy-libxslt = CSWpylibxslt OBSOLETES_CSWlibxslt-dev = CSWlibxsltdevel -CATALOGNAME_CSWlibxslt-dev = libxslt_devel +CATALOGNAME_CSWlibxslt-dev = libxslt_dev CATALOGNAME_CSWpy-libxslt = py_libxslt BUILD_DEP_PKGS = CSWlibxml2 CSWlibxml2devel 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 Mar 22 02:32:45 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 22 Mar 2011 01:32:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[13910] csw/mgar/pkg/libxslt/trunk/Makefile Message-ID: Revision: 13910 http://gar.svn.sourceforge.net/gar/?rev=13910&view=rev Author: bdwalton Date: 2011-03-22 01:32:45 +0000 (Tue, 22 Mar 2011) Log Message: ----------- libxslt/trunk: correct a usr/share DTD reference in some tutorial material Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2011-03-21 23:49:20 UTC (rev 13909) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2011-03-22 01:32:45 UTC (rev 13910) @@ -58,3 +58,9 @@ CHECKPKG_OVERRIDES_CSWlibxslt-dev += surplus-dependency|CSWlibxslt include gar/category.mk + +post-merge: + @echo Correcting DTD reference in tutorial materials. + @( cd $(PKGROOT)$(docdir)/$(NAME)-$(VERSION)/html/tutorial2/; \ + perl -pi -e 's!/usr/share!/opt/csw/share!' libxslt_pipes.xml) + @$(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 Tue Mar 22 02:40:26 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 22 Mar 2011 01:40:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[13911] csw/mgar/pkg/libxslt/trunk/Makefile Message-ID: Revision: 13911 http://gar.svn.sourceforge.net/gar/?rev=13911&view=rev Author: bdwalton Date: 2011-03-22 01:40:25 +0000 (Tue, 22 Mar 2011) Log Message: ----------- libxslt/trunk: split out the libraries Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2011-03-22 01:32:45 UTC (rev 13910) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2011-03-22 01:40:25 UTC (rev 13911) @@ -14,6 +14,19 @@ PACKAGES = CSWlibxslt CSWlibxslt-dev CSWpy-libxslt +PACKAGES += CSWlibexslt0 +CATALOGNAME_CSWlibexslt0 = libexslt0 +PKGFILES_CSWlibexslt0 += $(call baseisadirs,$(libdir),libexslt\.so\.0\.8\.15) +PKGFILES_CSWlibexslt0 += $(call baseisadirs,$(libdir),libexslt\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibexslt0 += XSLT engine runtime package, libexslt.so.0 + +PACKAGES += CSWlibxslt1 +CATALOGNAME_CSWlibxslt1 = libxslt1 +PKGFILES_CSWlibxslt1 += $(call baseisadirs,$(libdir),libxslt\.so\.1\.1\.26) +PKGFILES_CSWlibxslt1 += $(call baseisadirs,$(libdir),libxslt\.so\.1(\.\d+)*) +SPKG_DESC_CSWlibxslt1 += XSLT engine runtime package, libxslt.so.1 +RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibxslt1 + OBSOLETES_CSWpy-libxslt = CSWpylibxslt OBSOLETES_CSWlibxslt-dev = CSWlibxsltdevel 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 Mar 22 02:49:33 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 22 Mar 2011 01:49:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[13912] csw/mgar/pkg/libxslt/trunk/Makefile Message-ID: Revision: 13912 http://gar.svn.sourceforge.net/gar/?rev=13912&view=rev Author: bdwalton Date: 2011-03-22 01:49:33 +0000 (Tue, 22 Mar 2011) Log Message: ----------- libxslt/trunk: update deps to match split out libs Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2011-03-22 01:40:25 UTC (rev 13911) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2011-03-22 01:49:33 UTC (rev 13912) @@ -19,12 +19,22 @@ PKGFILES_CSWlibexslt0 += $(call baseisadirs,$(libdir),libexslt\.so\.0\.8\.15) PKGFILES_CSWlibexslt0 += $(call baseisadirs,$(libdir),libexslt\.so\.0(\.\d+)*) SPKG_DESC_CSWlibexslt0 += XSLT engine runtime package, libexslt.so.0 +RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWiconv +RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWgpgerr +RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWgcrypt PACKAGES += CSWlibxslt1 CATALOGNAME_CSWlibxslt1 = libxslt1 PKGFILES_CSWlibxslt1 += $(call baseisadirs,$(libdir),libxslt\.so\.1\.1\.26) PKGFILES_CSWlibxslt1 += $(call baseisadirs,$(libdir),libxslt\.so\.1(\.\d+)*) SPKG_DESC_CSWlibxslt1 += XSLT engine runtime package, libxslt.so.1 +RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWiconv +RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWzlib + RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibxslt1 OBSOLETES_CSWpy-libxslt = CSWpylibxslt @@ -52,9 +62,14 @@ PYCOMPILE = 1 RUNTIME_DEP_PKGS_CSWlibxslt = CSWgcrypt CSWgpgerr CSWiconv CSWlibxml2 CSWzlib +RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibexslt0 RUNTIME_DEP_PKGS_CSWlibxslt-dev = CSWlibxslt +RUNTIME_DEP_PKGS_CSWlibxslt-dev += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSWlibxslt-dev += CSWlibexslt0 RUNTIME_DEP_PKGS_CSWpy-libxslt = CSWpython -RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxslt +RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibexslt0 RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxml2 RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWzlib RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWgpgerr @@ -68,8 +83,6 @@ PKGFILES_CSWpy-libxslt = $(libdir)/python.* PKGFILES_CSWpy-libxslt += $(docdir)/libxslt-python-$(VERSION)/.* -CHECKPKG_OVERRIDES_CSWlibxslt-dev += surplus-dependency|CSWlibxslt - include gar/category.mk post-merge: 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 Mar 22 02:54:08 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 22 Mar 2011 01:54:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[13913] csw/mgar/pkg/libxslt/trunk/Makefile Message-ID: Revision: 13913 http://gar.svn.sourceforge.net/gar/?rev=13913&view=rev Author: bdwalton Date: 2011-03-22 01:54:08 +0000 (Tue, 22 Mar 2011) Log Message: ----------- libxslt/trunk: re-organize recipe to group package items together Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2011-03-22 01:49:33 UTC (rev 13912) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2011-03-22 01:54:08 UTC (rev 13913) @@ -12,8 +12,41 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz PATCHFILES += 0001-Forcefully-disable-version-script-use.patch -PACKAGES = CSWlibxslt CSWlibxslt-dev CSWpy-libxslt +BUILD_DEP_PKGS = CSWlibxml2 CSWlibxml2devel +PACKAGES = CSWlibxslt +SPKG_DESC_CSWlibxslt = XSLT engine runtime package +CATALOGNAME_CSWlibxslt = libxslt +RUNTIME_DEP_PKGS_CSWlibxslt += CSWgcrypt CSWgpgerr CSWiconv CSWlibxml2 CSWzlib +RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibxslt1 CSWlibexslt0 CSWlibxslt1 + +PACKAGES += CSWlibxslt-dev +CATALOGNAME_CSWlibxslt-dev = libxslt_dev +SPKG_DESC_CSWlibxslt-dev = XSLT engine development package +OBSOLETES_CSWlibxslt-dev = CSWlibxsltdevel +RUNTIME_DEP_PKGS_CSWlibxslt-dev = CSWlibxslt +RUNTIME_DEP_PKGS_CSWlibxslt-dev += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSWlibxslt-dev += CSWlibexslt0 +PKGFILES_CSWlibxslt-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWlibxslt-dev += $(docdir)/libxslt-$(VERSION)/.* +PKGFILES_CSWlibxslt-dev += $(libdir)/xsltConf.sh +PKGFILES_CSWlibxslt-dev += $(call isadirs,$(libdir),xsltConf.sh) + +PACKAGES += CSWpy-libxslt +CATALOGNAME_CSWpy-libxslt = py_libxslt +SPKG_DESC_CSWpy-libxslt = XSLT engine python package +OBSOLETES_CSWpy-libxslt = CSWpylibxslt +RUNTIME_DEP_PKGS_CSWpy-libxslt = CSWpython +RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibexslt0 +RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWzlib +RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWgpgerr +RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWgcrypt +RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWiconv +PKGFILES_CSWpy-libxslt = $(libdir)/python.* +PKGFILES_CSWpy-libxslt += $(docdir)/libxslt-python-$(VERSION)/.* + PACKAGES += CSWlibexslt0 CATALOGNAME_CSWlibexslt0 = libexslt0 PKGFILES_CSWlibexslt0 += $(call baseisadirs,$(libdir),libexslt\.so\.0\.8\.15) @@ -35,20 +68,6 @@ RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWiconv RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWzlib -RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibxslt1 - -OBSOLETES_CSWpy-libxslt = CSWpylibxslt -OBSOLETES_CSWlibxslt-dev = CSWlibxsltdevel - -CATALOGNAME_CSWlibxslt-dev = libxslt_dev -CATALOGNAME_CSWpy-libxslt = py_libxslt - -BUILD_DEP_PKGS = CSWlibxml2 CSWlibxml2devel - -SPKG_DESC_CSWlibxslt = XSLT engine runtime package -SPKG_DESC_CSWlibxslt-dev = XSLT engine development package -SPKG_DESC_CSWpy-libxslt = XSLT engine python package - SPKG_SOURCEURL = http://xmlsoft.org/XSLT/ TEST_TARGET = check @@ -61,28 +80,6 @@ STRIP_LIBTOOL = 1 PYCOMPILE = 1 -RUNTIME_DEP_PKGS_CSWlibxslt = CSWgcrypt CSWgpgerr CSWiconv CSWlibxml2 CSWzlib -RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibxslt1 -RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibexslt0 -RUNTIME_DEP_PKGS_CSWlibxslt-dev = CSWlibxslt -RUNTIME_DEP_PKGS_CSWlibxslt-dev += CSWlibxslt1 -RUNTIME_DEP_PKGS_CSWlibxslt-dev += CSWlibexslt0 -RUNTIME_DEP_PKGS_CSWpy-libxslt = CSWpython -RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxslt1 -RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibexslt0 -RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxml2 -RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWzlib -RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWgpgerr -RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWgcrypt -RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWiconv - -PKGFILES_CSWlibxslt-dev = $(PKGFILES_DEVEL) -PKGFILES_CSWlibxslt-dev += $(docdir)/libxslt-$(VERSION)/.* -PKGFILES_CSWlibxslt-dev += $(libdir)/xsltConf.sh -PKGFILES_CSWlibxslt-dev += $(call isadirs,$(libdir),xsltConf.sh) -PKGFILES_CSWpy-libxslt = $(libdir)/python.* -PKGFILES_CSWpy-libxslt += $(docdir)/libxslt-python-$(VERSION)/.* - include gar/category.mk post-merge: 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 Mar 22 03:17:50 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 22 Mar 2011 02:17:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[13914] csw/mgar/pkg/gardev/trunk/Makefile Message-ID: Revision: 13914 http://gar.svn.sourceforge.net/gar/?rev=13914&view=rev Author: bdwalton Date: 2011-03-22 02:17:49 +0000 (Tue, 22 Mar 2011) Log Message: ----------- gardev/trunk: do the devel to dev rename Modified Paths: -------------- csw/mgar/pkg/gardev/trunk/Makefile Modified: csw/mgar/pkg/gardev/trunk/Makefile =================================================================== --- csw/mgar/pkg/gardev/trunk/Makefile 2011-03-22 01:54:08 UTC (rev 13913) +++ csw/mgar/pkg/gardev/trunk/Makefile 2011-03-22 02:17:49 UTC (rev 13914) @@ -11,18 +11,19 @@ endef ARCHALL = 1 -PACKAGES = CSWgardevel -CATALOGNAME_CSWgardevel = gar_devel +PACKAGES = CSWgar-dev +CATALOGNAME_CSWgar-dev = gar_dev +OBSOLETES_CSWgar-dev = CSWgardevel # git and netcat are required if a GAR repo is tracking a git repo instead # of upstream tarballs. svn is required for commiting gar recipes -RUNTIME_DEP_PKGS_CSWgardevel = CSWgmake CSWgtar CSWggrep CSWdiffutils -RUNTIME_DEP_PKGS_CSWgardevel += CSWwget CSWfindutils CSWgsed CSWcoreutils -RUNTIME_DEP_PKGS_CSWgardevel += CSWgawk CSWbzip2 CSWlftp CSWgit CSWnetcat -RUNTIME_DEP_PKGS_CSWgardevel += CSWsvn CSWpython CSWpy-cheetah -RUNTIME_DEP_PKGS_CSWgardevel += CSWxz CSWgfile CSWpy-hachoir-core -RUNTIME_DEP_PKGS_CSWgardevel += CSWpy-hachoir-parser CSWpy-libmagic -RUNTIME_DEP_PKGS_CSWgardevel += CSWpy-progressbar CSWpy-sqlobject CSWpy-yaml +RUNTIME_DEP_PKGS_CSWgar-dev = CSWgmake CSWgtar CSWggrep CSWdiffutils +RUNTIME_DEP_PKGS_CSWgar-dev += CSWwget CSWfindutils CSWgsed CSWcoreutils +RUNTIME_DEP_PKGS_CSWgar-dev += CSWgawk CSWbzip2 CSWlftp CSWgit CSWnetcat +RUNTIME_DEP_PKGS_CSWgar-dev += CSWsvn CSWpython CSWpy-cheetah +RUNTIME_DEP_PKGS_CSWgar-dev += CSWxz CSWgfile CSWpy-hachoir-core +RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-hachoir-parser CSWpy-libmagic +RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-progressbar CSWpy-sqlobject CSWpy-yaml MASTER_SITES = @@ -31,31 +32,31 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom -CHECKPKG_OVERRIDES_CSWgardevel += archall-devel-package -CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWlftp -CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWgmake -CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWgsed -CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWggrep -CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWpython -CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWgtar -CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWwget -CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWfindutils -CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWpy-cheetah -CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWbzip2 -CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWsvn -CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWcoreutils -CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWgit -CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWgawk -CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWdiffutils -CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWnetcat -CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWxz -CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWgfile -CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWpy-hachoir-core -CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWpy-hachoir-parser -CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWpy-libmagic -CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWpy-progressbar -CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWpy-sqlobject -CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWpy-yaml +CHECKPKG_OVERRIDES_CSWgar-dev += archall-devel-package +CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWlftp +CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWgmake +CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWgsed +CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWggrep +CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWgtar +CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWwget +CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWfindutils +CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWpy-cheetah +CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWbzip2 +CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWsvn +CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWcoreutils +CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWgit +CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWgawk +CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWdiffutils +CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWnetcat +CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWxz +CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWgfile +CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWpy-hachoir-core +CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWpy-hachoir-parser +CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWpy-libmagic +CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWpy-progressbar +CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWpy-sqlobject +CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWpy-yaml 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 Mar 22 03:19:03 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 22 Mar 2011 02:19:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[13915] csw/mgar/pkg/gardev/trunk/Makefile Message-ID: Revision: 13915 http://gar.svn.sourceforge.net/gar/?rev=13915&view=rev Author: bdwalton Date: 2011-03-22 02:19:03 +0000 (Tue, 22 Mar 2011) Log Message: ----------- gardev/trunk: explicitly set package description Modified Paths: -------------- csw/mgar/pkg/gardev/trunk/Makefile Modified: csw/mgar/pkg/gardev/trunk/Makefile =================================================================== --- csw/mgar/pkg/gardev/trunk/Makefile 2011-03-22 02:17:49 UTC (rev 13914) +++ csw/mgar/pkg/gardev/trunk/Makefile 2011-03-22 02:19:03 UTC (rev 13915) @@ -13,6 +13,7 @@ ARCHALL = 1 PACKAGES = CSWgar-dev CATALOGNAME_CSWgar-dev = gar_dev +SPKG_DESC_CSWgar-dev = $(DESCRIPTION) OBSOLETES_CSWgar-dev = CSWgardevel # git and netcat are required if a GAR repo is tracking a git repo instead 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 Mar 22 03:24:32 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 22 Mar 2011 02:24:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[13916] csw/mgar/pkg/gardev/trunk/Makefile Message-ID: Revision: 13916 http://gar.svn.sourceforge.net/gar/?rev=13916&view=rev Author: bdwalton Date: 2011-03-22 02:24:32 +0000 (Tue, 22 Mar 2011) Log Message: ----------- gardev/trunk: update package for devel to dev transition Modified Paths: -------------- csw/mgar/pkg/gardev/trunk/Makefile Modified: csw/mgar/pkg/gardev/trunk/Makefile =================================================================== --- csw/mgar/pkg/gardev/trunk/Makefile 2011-03-22 02:19:03 UTC (rev 13915) +++ csw/mgar/pkg/gardev/trunk/Makefile 2011-03-22 02:24:32 UTC (rev 13916) @@ -59,11 +59,15 @@ CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWpy-sqlobject CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWpy-yaml +CHECKPKG_OVERRIDES_CSWgardevel += unidentified-dependency|CSWgar-dev + include gar/category.mk -install-custom: DOCDIR=$(DESTDIR)/$(docdir)/$(NAME) +install-custom: DOCDIR=$(DESTDIR)/$(docdir)/gar_dev +install-custom: OBS_DOCDIR=$(DESTDIR)/$(docdir)/gardevel install-custom: $(WORKSRC) - @(gmkdir -p $(DOCDIR); \ + @(gmkdir -p $(DOCDIR) $(OBS_DOCDIR); \ cp $(FILEDIR)/README.csw $(DOCDIR); \ - echo 'This is a dummy package, covered by a dummy license.' >> $(DOCDIR)/license) + echo 'This is a dummy package, covered by a dummy license.' >> $(DOCDIR)/license; \ + echo 'This is a dummy package, covered by a dummy license.' >> $(OBS_DOCDIR)/license) @$(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 Tue Mar 22 09:58:17 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Mar 2011 08:58:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[13917] csw/mgar/pkg/par Message-ID: Revision: 13917 http://gar.svn.sourceforge.net/gar/?rev=13917&view=rev Author: dmichelsen Date: 2011-03-22 08:58:16 +0000 (Tue, 22 Mar 2011) Log Message: ----------- par: Move legacy to tags Added Paths: ----------- csw/mgar/pkg/par/tags/legacy/ Removed Paths: ------------- csw/mgar/pkg/par/trunk/legacy/ 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 Mar 22 10:44:24 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Mar 2011 09:44:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[13918] csw/mgar/gar/v2/lib/web/example-apache.conf Message-ID: Revision: 13918 http://gar.svn.sourceforge.net/gar/?rev=13918&view=rev Author: wahwah Date: 2011-03-22 09:44:24 +0000 (Tue, 22 Mar 2011) Log Message: ----------- pkgdb-web: Example apache configuration Added Paths: ----------- csw/mgar/gar/v2/lib/web/example-apache.conf Added: csw/mgar/gar/v2/lib/web/example-apache.conf =================================================================== --- csw/mgar/gar/v2/lib/web/example-apache.conf (rev 0) +++ csw/mgar/gar/v2/lib/web/example-apache.conf 2011-03-22 09:44:24 UTC (rev 13918) @@ -0,0 +1,56 @@ +# vim:set ft=apache: +# +# $Id$ +# +# This file is an example apache configuration used to run the application. + + + Order allow,deny + Allow from all + + + SetHandler python-program + PythonPath "sys.path + ['/path/to/gar/v2/lib/web', '/path/to/gar/v2']" + PythonHandler modpython_gateway::handler + PythonOption wsgi.application pkgdb_web::main + PythonOption SCRIPT_NAME /pkgdb + PythonDebug on + + + # In this example, /path/to/documentroot is the document root setting for + # that virtual host. + + Order allow,deny + Allow from all + + + Alias /pkgdb-static /path/to/gar/v2/lib/web/static + + Order allow,deny + Allow from all + Options +Indexes + + + # I don't know why the Deny/Allow rules need to be duplicated, but I haven't + # been able to run the thing with just one set of permissions. + + Order deny,allow + Deny from all + # Allowing access only from chosen hosts. + # Allow from 192.168.1.0/24 + + + + Order deny,allow + Deny from all + # Allowing access only from chosen hosts. + # Allow from 192.168.1.0/24 + + SetHandler python-program + PythonPath "sys.path + ['/path/to/gar/v2/lib/web', '/path/to/gar/v2']" + PythonHandler modpython_gateway::handler + PythonOption wsgi.application releases_web::main + PythonOption SCRIPT_NAME /releases + PythonDebug on + + 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 Mar 22 10:46:17 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Mar 2011 09:46:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[13919] csw/mgar/gar/v2/lib/web Message-ID: Revision: 13919 http://gar.svn.sourceforge.net/gar/?rev=13919&view=rev Author: wahwah Date: 2011-03-22 09:46:16 +0000 (Tue, 22 Mar 2011) Log Message: ----------- pkgdb: Adding common CSS stylesheet Modified Paths: -------------- csw/mgar/gar/v2/lib/web/templates/CatalogDetail.html csw/mgar/gar/v2/lib/web/templates/CatalogList.html csw/mgar/gar/v2/lib/web/templates/Catalogname.html csw/mgar/gar/v2/lib/web/templates/CatalognameList.html csw/mgar/gar/v2/lib/web/templates/ErrorTagDetail.html csw/mgar/gar/v2/lib/web/templates/ErrorTagList.html csw/mgar/gar/v2/lib/web/templates/MaintainerCheckpkgReport.html csw/mgar/gar/v2/lib/web/templates/MaintainerDetail.html csw/mgar/gar/v2/lib/web/templates/MaintainerList.html csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html csw/mgar/gar/v2/lib/web/templates/Srv4DetailFiles.html csw/mgar/gar/v2/lib/web/templates/Srv4List.html csw/mgar/gar/v2/lib/web/templates/index.html Added Paths: ----------- csw/mgar/gar/v2/lib/web/static/ csw/mgar/gar/v2/lib/web/static/pkgdb.css Added: csw/mgar/gar/v2/lib/web/static/pkgdb.css =================================================================== --- csw/mgar/gar/v2/lib/web/static/pkgdb.css (rev 0) +++ csw/mgar/gar/v2/lib/web/static/pkgdb.css 2011-03-22 09:46:16 UTC (rev 13919) @@ -0,0 +1,22 @@ +body { + font-family: sans-serif; + font-size: 13px; +} +.annotation { + font-size: 80%; +} +.overridden { + color: gray; +} +.overridden a { + color: gray; +} +ul.catalogname-list { + list-style: none; + margin: 0; + padding: 0; +} +ul.catalogname-list > li { + margin: 0.2em; + padding: 0; +} Modified: csw/mgar/gar/v2/lib/web/templates/CatalogDetail.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/CatalogDetail.html 2011-03-22 09:44:24 UTC (rev 13918) +++ csw/mgar/gar/v2/lib/web/templates/CatalogDetail.html 2011-03-22 09:46:16 UTC (rev 13919) @@ -4,6 +4,7 @@ Recently built and checked packages +

$cat_name

Modified: csw/mgar/gar/v2/lib/web/templates/CatalogList.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/CatalogList.html 2011-03-22 09:44:24 UTC (rev 13918) +++ csw/mgar/gar/v2/lib/web/templates/CatalogList.html 2011-03-22 09:46:16 UTC (rev 13919) @@ -4,6 +4,7 @@ Recently built and checked packages +
    Modified: csw/mgar/gar/v2/lib/web/templates/Catalogname.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/Catalogname.html 2011-03-22 09:44:24 UTC (rev 13918) +++ csw/mgar/gar/v2/lib/web/templates/Catalogname.html 2011-03-22 09:46:16 UTC (rev 13919) @@ -4,6 +4,7 @@ $catalogname + Modified: csw/mgar/gar/v2/lib/web/templates/CatalognameList.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/CatalognameList.html 2011-03-22 09:44:24 UTC (rev 13918) +++ csw/mgar/gar/v2/lib/web/templates/CatalognameList.html 2011-03-22 09:46:16 UTC (rev 13919) @@ -4,17 +4,7 @@ Catalognames - +
      Modified: csw/mgar/gar/v2/lib/web/templates/ErrorTagDetail.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/ErrorTagDetail.html 2011-03-22 09:44:24 UTC (rev 13918) +++ csw/mgar/gar/v2/lib/web/templates/ErrorTagDetail.html 2011-03-22 09:46:16 UTC (rev 13919) @@ -4,6 +4,7 @@ $tag_name +

      $tag_name

      Modified: csw/mgar/gar/v2/lib/web/templates/ErrorTagList.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/ErrorTagList.html 2011-03-22 09:44:24 UTC (rev 13918) +++ csw/mgar/gar/v2/lib/web/templates/ErrorTagList.html 2011-03-22 09:46:16 UTC (rev 13919) @@ -4,6 +4,7 @@ Checkpkg error tags +
        Modified: csw/mgar/gar/v2/lib/web/templates/MaintainerCheckpkgReport.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/MaintainerCheckpkgReport.html 2011-03-22 09:44:24 UTC (rev 13918) +++ csw/mgar/gar/v2/lib/web/templates/MaintainerCheckpkgReport.html 2011-03-22 09:46:16 UTC (rev 13919) @@ -4,6 +4,7 @@ $maintainer +

        $maintainer

        Modified: csw/mgar/gar/v2/lib/web/templates/MaintainerDetail.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/MaintainerDetail.html 2011-03-22 09:44:24 UTC (rev 13918) +++ csw/mgar/gar/v2/lib/web/templates/MaintainerDetail.html 2011-03-22 09:46:16 UTC (rev 13919) @@ -4,6 +4,7 @@ $maintainer +

        $maintainer

        Modified: csw/mgar/gar/v2/lib/web/templates/MaintainerList.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/MaintainerList.html 2011-03-22 09:44:24 UTC (rev 13918) +++ csw/mgar/gar/v2/lib/web/templates/MaintainerList.html 2011-03-22 09:46:16 UTC (rev 13919) @@ -4,6 +4,7 @@ OpenCSW Maintainers +
          Modified: csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html 2011-03-22 09:44:24 UTC (rev 13918) +++ csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html 2011-03-22 09:46:16 UTC (rev 13919) @@ -4,6 +4,7 @@ $pkg.basename + Modified: csw/mgar/gar/v2/lib/web/templates/Srv4DetailFiles.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/Srv4DetailFiles.html 2011-03-22 09:44:24 UTC (rev 13918) +++ csw/mgar/gar/v2/lib/web/templates/Srv4DetailFiles.html 2011-03-22 09:46:16 UTC (rev 13919) @@ -5,6 +5,7 @@ files of $srv4.basename + Modified: csw/mgar/gar/v2/lib/web/templates/Srv4List.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/Srv4List.html 2011-03-22 09:44:24 UTC (rev 13918) +++ csw/mgar/gar/v2/lib/web/templates/Srv4List.html 2011-03-22 09:46:16 UTC (rev 13919) @@ -4,6 +4,7 @@ Recently built and checked packages + Modified: csw/mgar/gar/v2/lib/web/templates/index.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/index.html 2011-03-22 09:44:24 UTC (rev 13918) +++ csw/mgar/gar/v2/lib/web/templates/index.html 2011-03-22 09:46:16 UTC (rev 13919) @@ -3,6 +3,7 @@ checkpkg database experimental web app +

          checkpkg database experimental web app

          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 Mar 22 10:46:58 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Mar 2011 09:46:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[13920] csw/mgar/gar/v2/lib/web/templates Message-ID: Revision: 13920 http://gar.svn.sourceforge.net/gar/?rev=13920&view=rev Author: wahwah Date: 2011-03-22 09:46:58 +0000 (Tue, 22 Mar 2011) Log Message: ----------- pkgdb-web: Adjusting tags Modified Paths: -------------- csw/mgar/gar/v2/lib/web/templates/CatalogDetail.html csw/mgar/gar/v2/lib/web/templates/CatalogList.html csw/mgar/gar/v2/lib/web/templates/MaintainerCheckpkgReport.html Modified: csw/mgar/gar/v2/lib/web/templates/CatalogDetail.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/CatalogDetail.html 2011-03-22 09:46:16 UTC (rev 13919) +++ csw/mgar/gar/v2/lib/web/templates/CatalogDetail.html 2011-03-22 09:46:58 UTC (rev 13920) @@ -2,7 +2,7 @@ <html> <head> <title> - Recently built and checked packages + $cat_name Modified: csw/mgar/gar/v2/lib/web/templates/CatalogList.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/CatalogList.html 2011-03-22 09:46:16 UTC (rev 13919) +++ csw/mgar/gar/v2/lib/web/templates/CatalogList.html 2011-03-22 09:46:58 UTC (rev 13920) @@ -2,7 +2,7 @@ - Recently built and checked packages + List of OpenCSW catalogs Modified: csw/mgar/gar/v2/lib/web/templates/MaintainerCheckpkgReport.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/MaintainerCheckpkgReport.html 2011-03-22 09:46:16 UTC (rev 13919) +++ csw/mgar/gar/v2/lib/web/templates/MaintainerCheckpkgReport.html 2011-03-22 09:46:58 UTC (rev 13920) @@ -2,6 +2,7 @@ + checkpkg report for $maintainer 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 Mar 22 10:47:40 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Mar 2011 09:47:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[13921] csw/mgar/gar/v2/lib/web Message-ID: Revision: 13921 http://gar.svn.sourceforge.net/gar/?rev=13921&view=rev Author: wahwah Date: 2011-03-22 09:47:39 +0000 (Tue, 22 Mar 2011) Log Message: ----------- pkgdb-web: Better checkpkg report On the maintainer checkpkg report (e.g. [1]), group error tags by catalog, which improves readability. [1] http://buildfarm.opencsw.org/pkgdb/maintainers/29/checkpkg/ Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py csw/mgar/gar/v2/lib/web/templates/MaintainerCheckpkgReport.html csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2011-03-22 09:46:58 UTC (rev 13920) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2011-03-22 09:47:39 UTC (rev 13921) @@ -194,8 +194,13 @@ tags_by_md5 = {} pkgs = list(pkgs) for pkg in pkgs: - tags = list(models.CheckpkgErrorTag.selectBy(srv4_file=pkg)) - tags_by_md5.setdefault(pkg.md5_sum, tags) + tags = list(models.CheckpkgErrorTag.selectBy(srv4_file=pkg).orderBy( + ('tag_name', 'tag_info'))) + tags_by_cat_id = {} + for tag in tags: + key = (tag.catrel.name, tag.arch.name, tag.os_rel.short_name) + tags_by_cat_id.setdefault(key, []).append(tag) + tags_by_md5.setdefault(pkg.md5_sum, tags_by_cat_id) return render.MaintainerCheckpkgReport(maintainer, pkgs, tags_by_md5) Modified: csw/mgar/gar/v2/lib/web/templates/MaintainerCheckpkgReport.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/MaintainerCheckpkgReport.html 2011-03-22 09:46:58 UTC (rev 13920) +++ csw/mgar/gar/v2/lib/web/templates/MaintainerCheckpkgReport.html 2011-03-22 09:47:39 UTC (rev 13921) @@ -19,9 +19,22 @@ $if tags_by_md5[pkg.md5_sum]:
            - $for tag in tags_by_md5[pkg.md5_sum]: + $for catrel, arch, osrel in tags_by_md5[pkg.md5_sum]:
          • - $tag + $catrel $arch $osrel +
              + $for tag in tags_by_md5[pkg.md5_sum][(catrel, arch, osrel)]: +
            • + $if tag.overridden: + + $else: + + $tag.tag_name $tag.tag_info + $if tag.overridden: + [overridden] + +
              • +
          Modified: csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html 2011-03-22 09:46:58 UTC (rev 13920) +++ csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html 2011-03-22 09:47:39 UTC (rev 13921) @@ -75,7 +75,7 @@ $tag.tag_name $tag.tag_info $if tag.overridden: - (overridden) + [overridden] 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 Mar 22 10:55:57 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Mar 2011 09:55:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[13922] csw/mgar/pkg/par/trunk Message-ID: Revision: 13922 http://gar.svn.sourceforge.net/gar/?rev=13922&view=rev Author: dmichelsen Date: 2011-03-22 09:55:57 +0000 (Tue, 22 Mar 2011) Log Message: ----------- par: Update Makefile that it works Modified Paths: -------------- csw/mgar/pkg/par/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/par/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/par/trunk/files/CSWpackage.gspec Modified: csw/mgar/pkg/par/trunk/Makefile =================================================================== --- csw/mgar/pkg/par/trunk/Makefile 2011-03-22 09:47:39 UTC (rev 13921) +++ csw/mgar/pkg/par/trunk/Makefile 2011-03-22 09:55:57 UTC (rev 13922) @@ -1,23 +1,29 @@ NAME = package -VERSION = 1.0 -CATEGORIES = category +VERSION = 1.52 +CATEGORIES = utils DESCRIPTION = Brief description define BLURB Long description endef -MASTER_SITES = -DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += $(call admfiles,CSWpackage,) +MASTER_SITES = http://www.nicemice.net/par/ +DISTNAME = Par152 +DISTFILES += $(DISTNAME).tar.gz +DISTFILES += $(DISTNAME)-autoconf.tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz +LICENSE = par.doc -# 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) +INSTALL_SCRIPTS = custom + include gar/category.mk + +install-custom: + mkdir -p $(DESTDIR)$(bindir) + ginstall $(WORKSRC)/par $(DESTDIR)$(bindir)/par + mkdir -p $(DESTDIR)$(mandir)/man1 + ginstall $(WORKSRC)/par.1 $(DESTDIR)$(mandir)/man1/par.1 + mkdir -p $(DESTDIR)$(docdir)/par + ginstall $(WORKSRC)/par.doc $(DESTDIR)$(docdir)/par/par.txt Added: csw/mgar/pkg/par/trunk/checksums =================================================================== --- csw/mgar/pkg/par/trunk/checksums (rev 0) +++ csw/mgar/pkg/par/trunk/checksums 2011-03-22 09:55:57 UTC (rev 13922) @@ -0,0 +1,2 @@ +83e4d23a943ab07c44dd995b73195c70 Par152-autoconf.tar.gz +4ccacd824171ba2c2f14fb8aba78b9bf Par152.tar.gz Deleted: csw/mgar/pkg/par/trunk/files/CSWpackage.gspec =================================================================== --- csw/mgar/pkg/par/trunk/files/CSWpackage.gspec 2011-03-22 09:47:39 UTC (rev 13921) +++ csw/mgar/pkg/par/trunk/files/CSWpackage.gspec 2011-03-22 09:55:57 UTC (rev 13922) @@ -1,4 +0,0 @@ -%var bitname package -%var pkgname CSWpackage -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE 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 Mar 22 11:08:51 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Mar 2011 10:08:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[13923] csw/mgar/pkg/par/trunk/Makefile Message-ID: Revision: 13923 http://gar.svn.sourceforge.net/gar/?rev=13923&view=rev Author: dmichelsen Date: 2011-03-22 10:08:51 +0000 (Tue, 22 Mar 2011) Log Message: ----------- par: Adjust text Modified Paths: -------------- csw/mgar/pkg/par/trunk/Makefile Modified: csw/mgar/pkg/par/trunk/Makefile =================================================================== --- csw/mgar/pkg/par/trunk/Makefile 2011-03-22 09:55:57 UTC (rev 13922) +++ csw/mgar/pkg/par/trunk/Makefile 2011-03-22 10:08:51 UTC (rev 13923) @@ -1,10 +1,10 @@ -NAME = package +NAME = par VERSION = 1.52 CATEGORIES = utils -DESCRIPTION = Brief description +DESCRIPTION = Paragraph reformatter similar to fmt define BLURB - Long description + par is a paragraph reformatter, vaguely similar to fmt, but better. endef MASTER_SITES = http://www.nicemice.net/par/ 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 Mar 22 11:46:43 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Mar 2011 10:46:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[13924] csw/mgar/pkg/lang-python/docutils/trunk/Makefile Message-ID: Revision: 13924 http://gar.svn.sourceforge.net/gar/?rev=13924&view=rev Author: wahwah Date: 2011-03-22 10:46:43 +0000 (Tue, 22 Mar 2011) Log Message: ----------- pkg/lang-python/docutils/trunk: force installation of roman.py Modified Paths: -------------- csw/mgar/pkg/lang-python/docutils/trunk/Makefile Modified: csw/mgar/pkg/lang-python/docutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/docutils/trunk/Makefile 2011-03-22 10:08:51 UTC (rev 13923) +++ csw/mgar/pkg/lang-python/docutils/trunk/Makefile 2011-03-22 10:46:43 UTC (rev 13924) @@ -20,9 +20,13 @@ CATALOGNAME_CSWpydocutils = pydocutils ARCHALL_CSWpy-docutils = 1 CHECKPKG_OVERRIDES_CSWpydocutils += surplus-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWpy-docutils += file-with-bad-content|/usr/share|root/opt/csw/share/doc/pydocutils/dev/distributing.txt include gar/category.mk -post-install: +post-install-modulated: + ginstall -m 644 \ + $(WORKSRC)/extras/roman.py \ + $(DESTDIR)$(libdir)/python/site-packages ginstall -d $(DESTDIR)$(docdir) gcp -Rv $(WORKSRC)/docs $(DESTDIR)$(docdir)/pydocutils gcp -Rv $(WORKSRC)/extras $(DESTDIR)$(docdir)/pydocutils 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 Mar 22 14:01:35 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 22 Mar 2011 13:01:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[13925] csw/mgar/pkg/GeoIP/trunk/Makefile Message-ID: Revision: 13925 http://gar.svn.sourceforge.net/gar/?rev=13925&view=rev Author: bonivart Date: 2011-03-22 13:01:35 +0000 (Tue, 22 Mar 2011) Log Message: ----------- GeoIP/trunk: Rename dev package Modified Paths: -------------- csw/mgar/pkg/GeoIP/trunk/Makefile Modified: csw/mgar/pkg/GeoIP/trunk/Makefile =================================================================== --- csw/mgar/pkg/GeoIP/trunk/Makefile 2011-03-22 10:46:43 UTC (rev 13924) +++ csw/mgar/pkg/GeoIP/trunk/Makefile 2011-03-22 13:01:35 UTC (rev 13925) @@ -9,15 +9,16 @@ MASTER_SITES = http://geolite.maxmind.com/download/geoip/api/c/ DISTFILES = $(NAME)-$(VERSION).tar.gz +VENDOR_URL = http://www.maxmind.com/app/api -PACKAGES += CSWgeoip -CATALOGNAME_CSWgeoip = geoip -SPKG_DESC_CSWgeoip = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWgeoip = CSWgeolitedb CSWzlib CSWgcc3corert +PACKAGES += CSWgeoip +CATALOGNAME_CSWgeoip = geoip +SPKG_DESC_CSWgeoip = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWgeoip = CSWgeolitedb CSWzlib CSWgcc4corert -PACKAGES += CSWgeoip-dev -CATALOGNAME_CSWgeoip-dev = geoip_dev -SPKG_DESC_CSWgeoip-dev = GeoIP C API development support +PACKAGES += CSWgeoip-dev +CATALOGNAME_CSWgeoip-dev = geoip_dev +SPKG_DESC_CSWgeoip-dev = GeoIP C API development support RUNTIME_DEP_PKGS_CSWgeoip-dev = CSWgeoip GARCOMPILER = GCC4 @@ -33,4 +34,15 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw +CHECKPKG_OVERRIDES_CSWgeoip += non-uniform-lib-versions-in-package|sonames=libGeoIP.so.1,libGeoIPUpdate.so.0 +CHECKPKG_OVERRIDES_CSWgeoip += surplus-dependency|CSWgeolitedb +CHECKPKG_OVERRIDES_CSWgeoip-dev += discouraged-path-in-pkgmap|/opt/csw/lib/libGeoIP.a +CHECKPKG_OVERRIDES_CSWgeoip-dev += discouraged-path-in-pkgmap|/opt/csw/lib/libGeoIPUpdate.a +# Dev package renamed, remove next time +CHECKPKG_OVERRIDES_CSWgeoip-dev += file-collision|/opt/csw/include/GeoIPCity.h|CSWgeoip-dev|CSWgeoipdevel +CHECKPKG_OVERRIDES_CSWgeoip-dev += file-collision|/opt/csw/include/GeoIP.h|CSWgeoip-dev|CSWgeoipdevel +CHECKPKG_OVERRIDES_CSWgeoip-dev += file-collision|/opt/csw/lib/libGeoIPUpdate.a|CSWgeoip-dev|CSWgeoipdevel +CHECKPKG_OVERRIDES_CSWgeoip-dev += file-collision|/opt/csw/include/GeoIPUpdate.h|CSWgeoip-dev|CSWgeoipdevel +CHECKPKG_OVERRIDES_CSWgeoip-dev += file-collision|/opt/csw/lib/libGeoIP.a|CSWgeoip-dev|CSWgeoipdevel + 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 Mar 23 02:01:58 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 23 Mar 2011 01:01:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[13926] csw/mgar/pkg/libxslt/trunk/Makefile Message-ID: Revision: 13926 http://gar.svn.sourceforge.net/gar/?rev=13926&view=rev Author: bdwalton Date: 2011-03-23 01:01:58 +0000 (Wed, 23 Mar 2011) Log Message: ----------- libxslt/trunk: drop a duplicated dep Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2011-03-22 13:01:35 UTC (rev 13925) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2011-03-23 01:01:58 UTC (rev 13926) @@ -18,7 +18,7 @@ SPKG_DESC_CSWlibxslt = XSLT engine runtime package CATALOGNAME_CSWlibxslt = libxslt RUNTIME_DEP_PKGS_CSWlibxslt += CSWgcrypt CSWgpgerr CSWiconv CSWlibxml2 CSWzlib -RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibxslt1 CSWlibexslt0 CSWlibxslt1 +RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibxslt1 CSWlibexslt0 PACKAGES += CSWlibxslt-dev CATALOGNAME_CSWlibxslt-dev = libxslt_dev 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 Mar 23 02:15:53 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 23 Mar 2011 01:15:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[13927] csw/mgar/pkg/gardev/trunk/Makefile Message-ID: Revision: 13927 http://gar.svn.sourceforge.net/gar/?rev=13927&view=rev Author: bdwalton Date: 2011-03-23 01:15:53 +0000 (Wed, 23 Mar 2011) Log Message: ----------- gardev/trunk: change NAME to reflect new standard for catalog name Modified Paths: -------------- csw/mgar/pkg/gardev/trunk/Makefile Modified: csw/mgar/pkg/gardev/trunk/Makefile =================================================================== --- csw/mgar/pkg/gardev/trunk/Makefile 2011-03-23 01:01:58 UTC (rev 13926) +++ csw/mgar/pkg/gardev/trunk/Makefile 2011-03-23 01:15:53 UTC (rev 13927) @@ -1,4 +1,4 @@ -NAME = gar_devel +NAME = gar_dev VERSION = 1.0 CATEGORIES = devel 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 Mar 23 02:31:55 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 23 Mar 2011 01:31:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[13928] csw/mgar/pkg/gardev/trunk/Makefile Message-ID: Revision: 13928 http://gar.svn.sourceforge.net/gar/?rev=13928&view=rev Author: bdwalton Date: 2011-03-23 01:31:54 +0000 (Wed, 23 Mar 2011) Log Message: ----------- gardev/trunk: explicitly set catalogname, drop a checkpkg override. Modified Paths: -------------- csw/mgar/pkg/gardev/trunk/Makefile Modified: csw/mgar/pkg/gardev/trunk/Makefile =================================================================== --- csw/mgar/pkg/gardev/trunk/Makefile 2011-03-23 01:15:53 UTC (rev 13927) +++ csw/mgar/pkg/gardev/trunk/Makefile 2011-03-23 01:31:54 UTC (rev 13928) @@ -16,6 +16,9 @@ SPKG_DESC_CSWgar-dev = $(DESCRIPTION) OBSOLETES_CSWgar-dev = CSWgardevel +# not sure why this is required...getting odd results in this one. +CATALOGNAME_CSWgardevel = gardevel + # git and netcat are required if a GAR repo is tracking a git repo instead # of upstream tarballs. svn is required for commiting gar recipes RUNTIME_DEP_PKGS_CSWgar-dev = CSWgmake CSWgtar CSWggrep CSWdiffutils @@ -59,8 +62,6 @@ CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWpy-sqlobject CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWpy-yaml -CHECKPKG_OVERRIDES_CSWgardevel += unidentified-dependency|CSWgar-dev - include gar/category.mk install-custom: DOCDIR=$(DESTDIR)/$(docdir)/gar_dev 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 Mar 23 10:01:23 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 23 Mar 2011 09:01:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[13929] csw/mgar/gar/v2 Message-ID: Revision: 13929 http://gar.svn.sourceforge.net/gar/?rev=13929&view=rev Author: wahwah Date: 2011-03-23 09:01:22 +0000 (Wed, 23 Mar 2011) Log Message: ----------- docs: Moving upload application docs Moving the upload application docs to a subdirectory. Added Paths: ----------- csw/mgar/gar/v2/doc/ csw/mgar/gar/v2/doc/upload-application/ csw/mgar/gar/v2/doc/upload-application/opencsw-upload-process-application.html csw/mgar/gar/v2/doc/upload-application/style.css csw/mgar/gar/v2/doc/upload-application/upload-process.svg Removed Paths: ------------- csw/mgar/gar/v2/upload-application/opencsw-upload-process-application.html csw/mgar/gar/v2/upload-application/style.css csw/mgar/gar/v2/upload-application/upload-process.svg Copied: csw/mgar/gar/v2/doc/upload-application/opencsw-upload-process-application.html (from rev 13921, csw/mgar/gar/v2/upload-application/opencsw-upload-process-application.html) =================================================================== --- csw/mgar/gar/v2/doc/upload-application/opencsw-upload-process-application.html (rev 0) +++ csw/mgar/gar/v2/doc/upload-application/opencsw-upload-process-application.html 2011-03-23 09:01:22 UTC (rev 13929) @@ -0,0 +1,148 @@ + + + + + + OpenCSW Catalog Release Upload + + +TODO +
            +
          • Document the security aspects
            • +
          +

          OpenCSW Upload Application

          +

          This application is used to upload packages to be distributed by +OpenCSW. The application is supposed to be used by both humans doing +uploads manually and by tools. HTML is used as the main hypermedia to +communicate interactions.

          +

          +An informal summary of the process:

          +
            +
          • A new upload is created. The upload is a long-lived resource so +it will get its own URI.
            +
            • +
          • A set of files with metadata is attached to the upload.
            • +
          • If wanted the maintainer can run the checkpkg tool to find any +issues with the packages to be uploaded.
            • +
          • The upload is frozen and sent to the release manager for approval.
            • +
          +Image showing the flow between the pages and the forms used on the interactions
          +

          General Constraints

          +It is expected that any user agent:
          +
            +
          • Includes any hidden elements in a form. Only inputs that the user +agent is expected to fill out are documented.
            +
            • +
          • Uses the method specified in a form.
            +
            • +
          +

          Pages

          +

          Catalog Release Summary

          +A document listing all packages and the architecture/release +combination they support. Should include a "Create Upload" form. It should be +possible to use content negotiation get the data as an Atom feed.
          +

          Upload Summary

          +

          A document that shows the current state of the upload. It should +include the "Add File", "checkpkg report", "delete upload", "submit upload" forms.

          +

          There must be a span +element with the id upload-state. +Currently available upload states:

          +
            +
          • unsubmitted
            • +
          • submitted
            • +
          +

          The user agent should not use the value for anything in particular +but instead look at the available forms when presenting options to the +user. The field is there as information for humans.
          +

          +

          Checkpkg Report

          +

          An informal report showing any errors/warnings detected from the +checkpkg tool.
          +

          +

          TODO: The format of the checkpkg report +might be formalized in its own media type later on but right now that +doesn't exist.

          +

          +

          TODO: It would be nice to be able +to select the format of this report. For tools it would be useful with +a plain text version that they can show to the user directly. As it is +now there's no need for any links from this page so the media doesn't +need a way to represent links.

          +

          Forms

          +

          "Create Upload" +Form
          +

          +Name: create-upload
          +

          Inputs

          +
          +
          maintainer-id
          +
          The OpenCSW id of the person that created the upload.
          +
          +

          "Add File" Form

          +Name: add-file
          +

          Inputs

          +
          +
          file-name
          +
          The name of the physical file.
          +
          md5
          +
          The MD5 checksum of the file.
          +
          signature
          +
          The PGP signature of the file. It is expected that the maintainer +uses the PGP key that's associated with the maintainer.
          +
          +

          "checkpkg +Report" Form

          +

          "Submit Upload" Form

          +Once this form is submitted the upload will be frozen and will be +available for publishing if it passes the release manager.
          +

          "Delete Upload" Form

          +Submit this form to remove the upload.
          +

          Definitions of words +and phrases

          +
          +
          Package
          +
          +

          A System V package. Solaris use this package format as its +native package format. Some packages contain architecture and/or +Solaris release specific binaries while others can be installed across +all architectures and Solaris releases.
          +

          +

          A package file is usually named "pkg" if it is to be used by the +native Solaris tools, or "pkg.gz" when it's distributed and handled by +the OpenCSW tools.
          +

          +
          +
          Catalog
          +
          A catalog is a index of all packages available for a specific +architecture and Solaris release.
          +
          +
          Catalog Release
          +
          A catalog release is a set of catalogs which covers all +architectures and Solaris releases that the specific catalog release +support.
          +
          Maintainer
          +
          A person that create packages and performs uploads to the +repository
          +
          Release Manager
          +
          A person that checks/inspects the released packages and publishes +them.
          +
          checkpkg
          +
          A tool created by OpenCSW that automates the process of checking +if a package is compliant with the current OpenCSW policies. Used by +both maintainers and release managers.
          +
          Upload
          +
          An upload consists of a set of pkg files with meta data that a +maintainer want to publish.
          +
          +
          +
          +
          + + Copied: csw/mgar/gar/v2/doc/upload-application/style.css (from rev 13921, csw/mgar/gar/v2/upload-application/style.css) =================================================================== --- csw/mgar/gar/v2/doc/upload-application/style.css (rev 0) +++ csw/mgar/gar/v2/doc/upload-application/style.css 2011-03-23 09:01:22 UTC (rev 13929) @@ -0,0 +1,7 @@ +dt.input_name { + font-family: courier, fixed, monospace; +} + +span.form_name { + font-family: courier, fixed, monospace; +} Copied: csw/mgar/gar/v2/doc/upload-application/upload-process.svg (from rev 13921, csw/mgar/gar/v2/upload-application/upload-process.svg) =================================================================== --- csw/mgar/gar/v2/doc/upload-application/upload-process.svg (rev 0) +++ csw/mgar/gar/v2/doc/upload-application/upload-process.svg 2011-03-23 09:01:22 UTC (rev 13929) @@ -0,0 +1,313 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + Catalog Releases + Upload #123 summary + + name="create-upload" + + name="add-file" + checkpkg report + + + name="submit-upload" + + name="delete-upload" + name="checkpkg-report" + + Deleted: csw/mgar/gar/v2/upload-application/opencsw-upload-process-application.html =================================================================== --- csw/mgar/gar/v2/upload-application/opencsw-upload-process-application.html 2011-03-23 01:31:54 UTC (rev 13928) +++ csw/mgar/gar/v2/upload-application/opencsw-upload-process-application.html 2011-03-23 09:01:22 UTC (rev 13929) @@ -1,148 +0,0 @@ - - - - - - OpenCSW Catalog Release Upload - - -TODO -
            -
          • Document the security aspects
            • -
          -

          OpenCSW Upload Application

          -

          This application is used to upload packages to be distributed by -OpenCSW. The application is supposed to be used by both humans doing -uploads manually and by tools. HTML is used as the main hypermedia to -communicate interactions.

          -

          -An informal summary of the process:

          -
            -
          • A new upload is created. The upload is a long-lived resource so -it will get its own URI.
            -
            • -
          • A set of files with metadata is attached to the upload.
            • -
          • If wanted the maintainer can run the checkpkg tool to find any -issues with the packages to be uploaded.
            • -
          • The upload is frozen and sent to the release manager for approval.
            • -
          -Image showing the flow between the pages and the forms used on the interactions
          -

          General Constraints

          -It is expected that any user agent:
          -
            -
          • Includes any hidden elements in a form. Only inputs that the user -agent is expected to fill out are documented.
            -
            • -
          • Uses the method specified in a form.
            -
            • -
          -

          Pages

          -

          Catalog Release Summary

          -A document listing all packages and the architecture/release -combination they support. Should include a "Create Upload" form. It should be -possible to use content negotiation get the data as an Atom feed.
          -

          Upload Summary

          -

          A document that shows the current state of the upload. It should -include the "Add File", "checkpkg report", "delete upload", "submit upload" forms.

          -

          There must be a span -element with the id upload-state. -Currently available upload states:

          -
            -
          • unsubmitted
            • -
          • submitted
            • -
          -

          The user agent should not use the value for anything in particular -but instead look at the available forms when presenting options to the -user. The field is there as information for humans.
          -

          -

          Checkpkg Report

          -

          An informal report showing any errors/warnings detected from the -checkpkg tool.
          -

          -

          TODO: The format of the checkpkg report -might be formalized in its own media type later on but right now that -doesn't exist.

          -

          -

          TODO: It would be nice to be able -to select the format of this report. For tools it would be useful with -a plain text version that they can show to the user directly. As it is -now there's no need for any links from this page so the media doesn't -need a way to represent links.

          -

          Forms

          -

          "Create Upload" -Form
          -

          -Name: create-upload
          -

          Inputs

          -
          -
          maintainer-id
          -
          The OpenCSW id of the person that created the upload.
          -
          -

          "Add File" Form

          -Name: add-file
          -

          Inputs

          -
          -
          file-name
          -
          The name of the physical file.
          -
          md5
          -
          The MD5 checksum of the file.
          -
          signature
          -
          The PGP signature of the file. It is expected that the maintainer -uses the PGP key that's associated with the maintainer.
          -
          -

          "checkpkg -Report" Form

          -

          "Submit Upload" Form

          -Once this form is submitted the upload will be frozen and will be -available for publishing if it passes the release manager.
          -

          "Delete Upload" Form

          -Submit this form to remove the upload.
          -

          Definitions of words -and phrases

          -
          -
          Package
          -
          -

          A System V package. Solaris use this package format as its -native package format. Some packages contain architecture and/or -Solaris release specific binaries while others can be installed across -all architectures and Solaris releases.
          -

          -

          A package file is usually named "pkg" if it is to be used by the -native Solaris tools, or "pkg.gz" when it's distributed and handled by -the OpenCSW tools.
          -

          -
          -
          Catalog
          -
          A catalog is a index of all packages available for a specific -architecture and Solaris release.
          -
          -
          Catalog Release
          -
          A catalog release is a set of catalogs which covers all -architectures and Solaris releases that the specific catalog release -support.
          -
          Maintainer
          -
          A person that create packages and performs uploads to the -repository
          -
          Release Manager
          -
          A person that checks/inspects the released packages and publishes -them.
          -
          checkpkg
          -
          A tool created by OpenCSW that automates the process of checking -if a package is compliant with the current OpenCSW policies. Used by -both maintainers and release managers.
          -
          Upload
          -
          An upload consists of a set of pkg files with meta data that a -maintainer want to publish.
          -
          -
          -
          -
          - - Deleted: csw/mgar/gar/v2/upload-application/style.css =================================================================== --- csw/mgar/gar/v2/upload-application/style.css 2011-03-23 01:31:54 UTC (rev 13928) +++ csw/mgar/gar/v2/upload-application/style.css 2011-03-23 09:01:22 UTC (rev 13929) @@ -1,7 +0,0 @@ -dt.input_name { - font-family: courier, fixed, monospace; -} - -span.form_name { - font-family: courier, fixed, monospace; -} Deleted: csw/mgar/gar/v2/upload-application/upload-process.svg =================================================================== --- csw/mgar/gar/v2/upload-application/upload-process.svg 2011-03-23 01:31:54 UTC (rev 13928) +++ csw/mgar/gar/v2/upload-application/upload-process.svg 2011-03-23 09:01:22 UTC (rev 13929) @@ -1,313 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - Catalog Releases - Upload #123 summary - - name="create-upload" - - name="add-file" - checkpkg report - - - name="submit-upload" - - name="delete-upload" - name="checkpkg-report" - - 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 Mar 23 10:02:22 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 23 Mar 2011 09:02:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[13930] csw/mgar/gar/v2/doc Message-ID: Revision: 13930 http://gar.svn.sourceforge.net/gar/?rev=13930&view=rev Author: wahwah Date: 2011-03-23 09:02:21 +0000 (Wed, 23 Mar 2011) Log Message: ----------- docs: Diagram with connections. Signed-off-by: Maciej Blizinski Added Paths: ----------- csw/mgar/gar/v2/doc/Makefile csw/mgar/gar/v2/doc/connections.dot Added: csw/mgar/gar/v2/doc/Makefile =================================================================== --- csw/mgar/gar/v2/doc/Makefile (rev 0) +++ csw/mgar/gar/v2/doc/Makefile 2011-03-23 09:02:21 UTC (rev 13930) @@ -0,0 +1,6 @@ +all: diagrams + +diagrams: connections.png + +%.png: %.dot + dot -Tpng -o $@ $< Added: csw/mgar/gar/v2/doc/connections.dot =================================================================== --- csw/mgar/gar/v2/doc/connections.dot (rev 0) +++ csw/mgar/gar/v2/doc/connections.dot 2011-03-23 09:02:21 UTC (rev 13930) @@ -0,0 +1,53 @@ +// This diagram shows connections between different components on the +// buildfarm. + +digraph connections { + subgraph cluster0 { + catalog_generator [label="catalog generator"]; + catalog_notifier [label="catalog notifier"]; + catalog_notifier -> mirror [label="HTTP (catalog file)"]; + mirror [label="master mirror\nhttp://mirror.opencsw.org/opencsw-future/"]; + catalog_generator -> web_app [label="HTTP / REST"]; + catalog_generator -> mirror [label="writes files"]; + { + rank = same; + web_app [label="pkgdb public web app\nhttp://buildfarm.opencsw.org/pkgdb/rest/"]; + releases_web_app [label="pkgdb releases internal web app\nhttp://buildfarm.opencsw.org/releases/"]; + } + pickled_files [label="pickles"]; + catalog_notifier -> pickled_files; + label = "web zone"; + } + + subgraph cluster1 { + database [label="'checkpkg' database"]; + label = "mysql zone"; + } + + subgraph cluster2 { + checkpkg_ini [label="/etc/opt/csw/checkpkg.ini",shape=rectangle]; + csw_upload_pkg [label="csw-upload-pkg"]; + pkgdb [label="pkgdb cli utility"]; + checkpkg; + maintainer [shape=circle]; + maintainer -> csw_upload_pkg; + maintainer -> pkgdb; + maintainer -> checkpkg; + label = "unstable{9,10}{s,x}"; + } + mail_server [label="mail server"]; + mail_server -> maintainer; + cron [shape=circle]; + cron -> catalog_generator; + cron -> catalog_notifier; + + catalog_notifier -> mail_server [label="SMTP"]; + checkpkg -> checkpkg_ini; + pkgdb -> checkpkg_ini; + web_app -> database [label="mysql"]; + releases_web_app -> database [label="mysql"]; + checkpkg -> database [label="mysql"]; + pkgdb -> database [label="mysql"]; + csw_upload_pkg -> releases_web_app [label="HTTP / REST"]; + csw_upload_pkg -> web_app [label="HTTP / REST"]; +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Wed Mar 23 14:12:35 2011 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Wed, 23 Mar 2011 13:12:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[13931] csw/mgar/pkg/tomcat6/trunk/Makefile Message-ID: Revision: 13931 http://gar.svn.sourceforge.net/gar/?rev=13931&view=rev Author: idogan23 Date: 2011-03-23 13:12:34 +0000 (Wed, 23 Mar 2011) Log Message: ----------- tomcat6: remove unneeded file Modified Paths: -------------- csw/mgar/pkg/tomcat6/trunk/Makefile Modified: csw/mgar/pkg/tomcat6/trunk/Makefile =================================================================== --- csw/mgar/pkg/tomcat6/trunk/Makefile 2011-03-23 09:02:21 UTC (rev 13930) +++ csw/mgar/pkg/tomcat6/trunk/Makefile 2011-03-23 13:12:34 UTC (rev 13931) @@ -92,6 +92,7 @@ ( mv $(DESTDIR)/opt/csw/share/$(NAME)/logs $(DESTDIR)/var/opt/csw/$(NAME) ) ( mv $(DESTDIR)/opt/csw/share/$(NAME)/work $(DESTDIR)/var/opt/csw/$(NAME) ) ( mv $(DESTDIR)/opt/csw/share/$(NAME)/temp $(DESTDIR)/var/opt/csw/$(NAME) ) + ( rm $(DESTDIR)/var/opt/csw/tomcat6/temp/safeToDelete.tmp ) ( ln -s /etc/opt/csw/$(NAME)/conf $(DESTDIR)/opt/csw/share/$(NAME)/conf ) ( ln -s /var/opt/csw/$(NAME)/logs $(DESTDIR)/opt/csw/share/$(NAME)/logs ) ( ln -s /var/opt/csw/$(NAME)/work $(DESTDIR)/opt/csw/share/$(NAME)/work ) 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 Mar 23 17:25:33 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 23 Mar 2011 16:25:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[13932] csw/mgar/pkg/cpan/NetAddr-IP/trunk Message-ID: Revision: 13932 http://gar.svn.sourceforge.net/gar/?rev=13932&view=rev Author: bonivart Date: 2011-03-23 16:25:33 +0000 (Wed, 23 Mar 2011) Log Message: ----------- cpan/NetAddr-IP/trunk: Updated. Renamed and obsoleted Modified Paths: -------------- csw/mgar/pkg/cpan/NetAddr-IP/trunk/Makefile csw/mgar/pkg/cpan/NetAddr-IP/trunk/checksums Modified: csw/mgar/pkg/cpan/NetAddr-IP/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/NetAddr-IP/trunk/Makefile 2011-03-23 13:12:34 UTC (rev 13931) +++ csw/mgar/pkg/cpan/NetAddr-IP/trunk/Makefile 2011-03-23 16:25:33 UTC (rev 13932) @@ -1,5 +1,5 @@ NAME = NetAddr-IP -VERSION = 4.028 +VERSION = 4.040 CATEGORIES = cpan AUTHOR = MIKER @@ -10,7 +10,13 @@ DISTFILES = COPYING -PACKAGES = CSWpmnetaddrip -CATALOGNAME = pm_netaddrip +PACKAGES = CSWpm-netaddr-ip +CATALOGNAME = pm_netaddr_ip +SPKG_DESC_CSWpm-netaddr-ip = $(DESCRIPTION) +OBSOLETES_CSWpm-netaddr-ip = CSWpmnetaddrip +CATALOGNAME_CSWpmnetaddrip = pm_netaddrip +# One IPv6 related test fails, make sure to check all others +SKIPTEST=1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/NetAddr-IP/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/NetAddr-IP/trunk/checksums 2011-03-23 13:12:34 UTC (rev 13931) +++ csw/mgar/pkg/cpan/NetAddr-IP/trunk/checksums 2011-03-23 16:25:33 UTC (rev 13932) @@ -1,2 +1 @@ -12b4da4f58fd06d52dcba60b39927d8d COPYING -fc1e79db336d0acbe99dff559080c5d1 NetAddr-IP-4.028.tar.gz +0b2a4f7bd659aeeebe56527c479bb492 NetAddr-IP-4.040.tar.gz 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 Mar 24 01:25:26 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 24 Mar 2011 00:25:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[13933] csw/mgar/pkg/gnulinks/trunk/Makefile Message-ID: Revision: 13933 http://gar.svn.sourceforge.net/gar/?rev=13933&view=rev Author: bdwalton Date: 2011-03-24 00:25:26 +0000 (Thu, 24 Mar 2011) Log Message: ----------- gnulinks/trunk: add CSWfindutils to list of packages to link until updated findutiles is released Modified Paths: -------------- csw/mgar/pkg/gnulinks/trunk/Makefile Modified: csw/mgar/pkg/gnulinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnulinks/trunk/Makefile 2011-03-23 16:25:33 UTC (rev 13932) +++ csw/mgar/pkg/gnulinks/trunk/Makefile 2011-03-24 00:25:26 UTC (rev 13933) @@ -4,7 +4,7 @@ VENDOR_URL = http://opencsw.org -GLINKPKGS = CSWbinutils CSWggetopt CSWgwhois +GLINKPKGS = CSWbinutils CSWggetopt CSWgwhois CSWfindutils 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 Thu Mar 24 16:56:19 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 24 Mar 2011 15:56:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[13934] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 13934 http://gar.svn.sourceforge.net/gar/?rev=13934&view=rev Author: bdwalton Date: 2011-03-24 15:56:19 +0000 (Thu, 24 Mar 2011) Log Message: ----------- ruby19/trunk: drop the suncc/gcc4 switch. seems to only build with gcc4 for now Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2011-03-24 00:25:26 UTC (rev 13933) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2011-03-24 15:56:19 UTC (rev 13934) @@ -95,17 +95,16 @@ EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib -ifdef USEGCC GARCOMPILER = GCC4 -RUNTIME_DEP_PKGS_CSWruby19 += CSWgcc4corert -RUNTIME_DEP_PKGS_CSWruby19-dev += CSWgcc4core -# This is for rbconfig.rb: without this, modules built may not get a -# proper setting. -EXTRA_LDFLAGS = -R $(abspath /opt/csw/gcc4/lib/$(MM_LIBDIR)) -else -GARCOMPILER = SOS12 -SOS12_LD_FLAGS = -endif +# RUNTIME_DEP_PKGS_CSWruby19 += CSWgcc4corert +# RUNTIME_DEP_PKGS_CSWruby19-dev += CSWgcc4core +# # This is for rbconfig.rb: without this, modules built may not get a +# # proper setting. +# EXTRA_LDFLAGS = -R $(abspath /opt/csw/gcc4/lib/$(MM_LIBDIR)) +# else +# GARCOMPILER = SOS12 +# SOS12_LD_FLAGS = +# endif 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 Thu Mar 24 16:58:10 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 24 Mar 2011 15:58:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[13935] csw/mgar/pkg/ruby19/trunk Message-ID: Revision: 13935 http://gar.svn.sourceforge.net/gar/?rev=13935&view=rev Author: bdwalton Date: 2011-03-24 15:58:09 +0000 (Thu, 24 Mar 2011) Log Message: ----------- ruby19/trunk: correct two failing tests that assume LOG_PERROR (non-posix) is defined; need to send these upstream Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ruby19/trunk/files/0001-Use-LOG_PID-instead-of-LOG_PERROR-in-Syslog.open-tes.patch csw/mgar/pkg/ruby19/trunk/files/0002-Skip-syslog-tests-that-rely-on-LOG_PERROR-unless-it-.patch Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2011-03-24 15:56:19 UTC (rev 13934) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2011-03-24 15:58:09 UTC (rev 13935) @@ -78,6 +78,9 @@ MASTER_SITES = ftp://ftp.ruby-lang.org/pub/ruby/1.9/ DISTFILES = $(DISTNAME).tar.gz +PATCHFILES += 0001-Use-LOG_PID-instead-of-LOG_PERROR-in-Syslog.open-tes.patch +PATCHFILES += 0002-Skip-syslog-tests-that-rely-on-LOG_PERROR-unless-it-.patch + # We define upstream file regex so we can be notifed of new upstream # software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz Added: csw/mgar/pkg/ruby19/trunk/files/0001-Use-LOG_PID-instead-of-LOG_PERROR-in-Syslog.open-tes.patch =================================================================== --- csw/mgar/pkg/ruby19/trunk/files/0001-Use-LOG_PID-instead-of-LOG_PERROR-in-Syslog.open-tes.patch (rev 0) +++ csw/mgar/pkg/ruby19/trunk/files/0001-Use-LOG_PID-instead-of-LOG_PERROR-in-Syslog.open-tes.patch 2011-03-24 15:58:09 UTC (rev 13935) @@ -0,0 +1,36 @@ +From 9da1996267eed65897a74d9bdb39e4401b156e7d Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Thu, 24 Mar 2011 15:50:11 +0100 +Subject: [PATCH 1/2] Use LOG_PID instead of LOG_PERROR in Syslog.open test + +LOG_PERROR isn't a POSIX option for syslog, so it fails on platforms +that don't define it. Solaris 9 and 10 are examples of this. + +Use LOG_PID instead. + +Signed-off-by: Ben Walton +--- + test/test_syslog.rb | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/test/test_syslog.rb b/test/test_syslog.rb +index c508412..265b0d7 100644 +--- a/test/test_syslog.rb ++++ b/test/test_syslog.rb +@@ -43,10 +43,11 @@ class TestSyslog < Test::Unit::TestCase + Syslog.close + + # given parameters +- Syslog.open("foo", Syslog::LOG_NDELAY | Syslog::LOG_PERROR, Syslog::LOG_DAEMON) ++ options = Syslog::LOG_NDELAY | Syslog::LOG_PID ++ Syslog.open("foo", options, Syslog::LOG_DAEMON) + + assert_equal('foo', Syslog.ident) +- assert_equal(Syslog::LOG_NDELAY | Syslog::LOG_PERROR, Syslog.options) ++ assert_equal(options, Syslog.options) + assert_equal(Syslog::LOG_DAEMON, Syslog.facility) + + Syslog.close +-- +1.7.3.2 + Added: csw/mgar/pkg/ruby19/trunk/files/0002-Skip-syslog-tests-that-rely-on-LOG_PERROR-unless-it-.patch =================================================================== --- csw/mgar/pkg/ruby19/trunk/files/0002-Skip-syslog-tests-that-rely-on-LOG_PERROR-unless-it-.patch (rev 0) +++ csw/mgar/pkg/ruby19/trunk/files/0002-Skip-syslog-tests-that-rely-on-LOG_PERROR-unless-it-.patch 2011-03-24 15:58:09 UTC (rev 13935) @@ -0,0 +1,36 @@ +From 776853e108fef618f562297b404e9750f1beddb4 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Thu, 24 Mar 2011 16:43:41 +0100 +Subject: [PATCH 2/2] Skip syslog tests that rely on LOG_PERROR unless it's defined + +Instead of checking looking at the platform to determine if the tests +relying on LOG_PERROR should be run, look for the definition of the +constant as this will be robust against all platforms as long as the +underlying syslog.c code sets it up correctly. + +This specifically addresses failures on Solaris 9. + +Signed-off-by: Ben Walton +--- + test/test_syslog.rb | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/test/test_syslog.rb b/test/test_syslog.rb +index 265b0d7..97b9254 100644 +--- a/test/test_syslog.rb ++++ b/test/test_syslog.rb +@@ -135,8 +135,9 @@ class TestSyslog < Test::Unit::TestCase + stderr[1].close + Process.waitpid(pid) + +- # LOG_PERROR is not yet implemented on Cygwin. +- return if RUBY_PLATFORM =~ /cygwin/ ++ # LOG_PERROR is not implemented on Cygwin or Solaris. Only test ++ # these on systems that define it. ++ return unless Syslog.const_defined?(:LOG_PERROR) + + 2.times { + assert_equal("syslog_test: test1 - hello, world!\n", stderr[0].gets) +-- +1.7.3.2 + 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 Mar 24 20:40:12 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 24 Mar 2011 19:40:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[13936] csw/mgar/pkg/phpmode/trunk/Makefile Message-ID: Revision: 13936 http://gar.svn.sourceforge.net/gar/?rev=13936&view=rev Author: bdwalton Date: 2011-03-24 19:40:12 +0000 (Thu, 24 Mar 2011) Log Message: ----------- phpmode/trunk: renaming for consistency with upstream Modified Paths: -------------- csw/mgar/pkg/phpmode/trunk/Makefile Modified: csw/mgar/pkg/phpmode/trunk/Makefile =================================================================== --- csw/mgar/pkg/phpmode/trunk/Makefile 2011-03-24 15:58:09 UTC (rev 13935) +++ csw/mgar/pkg/phpmode/trunk/Makefile 2011-03-24 19:40:12 UTC (rev 13936) @@ -13,28 +13,16 @@ BUILD_DEP_PKGS = CSWemacs -PACKAGES = CSWphpmode +PACKAGES = CSWphp-mode -CATALOGNAME_CSWphpmode = php_mode +SPKG_DESC_CSWphp-mode = $(DESCRIPTION) +CATALOGNAME_CSWphp-mode = php_mode +RUNTIME_DEP_PKGS_CSWphp-mode = CSWemacscommon CSWemacssitestart +CHECKPKG_OVERRIDES_CSWphp-mode += surplus-dependency|CSWemacssitestart +OBSOLETES_CSWphp-mode = CSWphpmode -RUNTIME_DEP_PKGS_CSWphpmode = CSWemacscommon CSWemacssitestart - -CHECKPKG_OVERRIDES_CSWphpmode += surplus-dependency|CSWemacssitestart - ARCHALL = 1 -SPKG_DESC_CSWphpmode = An Emacs mode for editting PHP code - -# We define upstream file regex so we can be notifed of new upstream -# software release -UFILES_REGEX = $(NAME)-(\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_SCRIPTS = BUILD_ARGS = php-mode.info INSTALL_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 Thu Mar 24 21:13:11 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 24 Mar 2011 20:13:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[13937] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 13937 http://gar.svn.sourceforge.net/gar/?rev=13937&view=rev Author: dmichelsen Date: 2011-03-24 20:13:10 +0000 (Thu, 24 Mar 2011) Log Message: ----------- mGAR v2: Selectively unroll call to 'catalog' in generation of stub package catalog name Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-03-24 19:40:12 UTC (rev 13936) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-03-24 20:13:10 UTC (rev 13937) @@ -63,7 +63,8 @@ CATALOG_RELEASE ?= $(shell hostname | gsed -e 's/[0-9].*$$//') define obsoleted_pkg -CATALOGNAME_$(1) ?= $(call catalogname,$(1)) +# function 'catalogname' must not be used due to recursive calls to CATALOGNAME_* +CATALOGNAME_$(1) ?= $(subst -,_,$(patsubst CSW%,%,$(1)))_stub # The length of the description has been limited to 100 characters, # the string is cut (no longer on word boundaries). SPKG_DESC_$(1) ?= $(shell echo Transitional package. Content moved to $(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETES_$P)),$P)) | perl -npe 's/(.{100}).+/substr($$1,96) . " ..."/e') 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 Mar 24 23:11:45 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 24 Mar 2011 22:11:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[13938] csw/mgar/pkg/gardev/trunk/Makefile Message-ID: Revision: 13938 http://gar.svn.sourceforge.net/gar/?rev=13938&view=rev Author: bdwalton Date: 2011-03-24 22:11:44 +0000 (Thu, 24 Mar 2011) Log Message: ----------- gardev/trunk: drop incorrect catalogname setting, update docdir for abnormal license file handling Modified Paths: -------------- csw/mgar/pkg/gardev/trunk/Makefile Modified: csw/mgar/pkg/gardev/trunk/Makefile =================================================================== --- csw/mgar/pkg/gardev/trunk/Makefile 2011-03-24 20:13:10 UTC (rev 13937) +++ csw/mgar/pkg/gardev/trunk/Makefile 2011-03-24 22:11:44 UTC (rev 13938) @@ -16,9 +16,6 @@ SPKG_DESC_CSWgar-dev = $(DESCRIPTION) OBSOLETES_CSWgar-dev = CSWgardevel -# not sure why this is required...getting odd results in this one. -CATALOGNAME_CSWgardevel = gardevel - # git and netcat are required if a GAR repo is tracking a git repo instead # of upstream tarballs. svn is required for commiting gar recipes RUNTIME_DEP_PKGS_CSWgar-dev = CSWgmake CSWgtar CSWggrep CSWdiffutils @@ -65,7 +62,7 @@ include gar/category.mk install-custom: DOCDIR=$(DESTDIR)/$(docdir)/gar_dev -install-custom: OBS_DOCDIR=$(DESTDIR)/$(docdir)/gardevel +install-custom: OBS_DOCDIR=$(DESTDIR)/$(docdir)/gardevel_stub install-custom: $(WORKSRC) @(gmkdir -p $(DOCDIR) $(OBS_DOCDIR); \ cp $(FILEDIR)/README.csw $(DOCDIR); \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Mar 25 02:33:32 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 25 Mar 2011 01:33:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[13939] csw/mgar/pkg/phpmode/trunk Message-ID: Revision: 13939 http://gar.svn.sourceforge.net/gar/?rev=13939&view=rev Author: bdwalton Date: 2011-03-25 01:33:32 +0000 (Fri, 25 Mar 2011) Log Message: ----------- phpmode/trunk: patch a usr/share reference Modified Paths: -------------- csw/mgar/pkg/phpmode/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/phpmode/trunk/files/0001-Patch-out-usr-share-refs-in-the-texi-file.patch Modified: csw/mgar/pkg/phpmode/trunk/Makefile =================================================================== --- csw/mgar/pkg/phpmode/trunk/Makefile 2011-03-24 22:11:44 UTC (rev 13938) +++ csw/mgar/pkg/phpmode/trunk/Makefile 2011-03-25 01:33:32 UTC (rev 13939) @@ -10,6 +10,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += php-mode.el +PATCHFILES += 0001-Patch-out-usr-share-refs-in-the-texi-file.patch BUILD_DEP_PKGS = CSWemacs Added: csw/mgar/pkg/phpmode/trunk/files/0001-Patch-out-usr-share-refs-in-the-texi-file.patch =================================================================== --- csw/mgar/pkg/phpmode/trunk/files/0001-Patch-out-usr-share-refs-in-the-texi-file.patch (rev 0) +++ csw/mgar/pkg/phpmode/trunk/files/0001-Patch-out-usr-share-refs-in-the-texi-file.patch 2011-03-25 01:33:32 UTC (rev 13939) @@ -0,0 +1,32 @@ +From e9c8780d26d35d277467469c4daee0166a1f2b59 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Fri, 25 Mar 2011 02:31:29 +0100 +Subject: [PATCH] Patch out /usr/share refs in the texi file. + +No good replacement, so s/usr\/share/path\/to/. + +Signed-off-by: Ben Walton +--- + php-mode.texi | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/php-mode.texi b/php-mode.texi +index 639af93..89d3510 100644 +--- a/php-mode.texi ++++ b/php-mode.texi +@@ -851,10 +851,10 @@ setting its value in your Emacs initialization file + To create a file that can be set for + @code{php-completion-file}, create with the following shell + commands with the HTML version of the PHP manual installed +-at @file{/usr/share/doc/php-manual/en/html}. ++at @file{/path/to/doc/php-manual/en/html}. + + @example +-$ cd /usr/share/doc/php-manual/en/html ++$ cd /path/to/doc/php-manual/en/html + $ ls -1 function*.html \ + | sed -e 's/^function\.\([-a-zA-Z_0-9]*\)\.html/\1/' \ + | tr - _ \ +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Mar 25 02:47:41 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 25 Mar 2011 01:47:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[13940] csw/mgar/pkg/ruby19/trunk Message-ID: Revision: 13940 http://gar.svn.sourceforge.net/gar/?rev=13940&view=rev Author: bdwalton Date: 2011-03-25 01:47:41 +0000 (Fri, 25 Mar 2011) Log Message: ----------- ruby19/trunk: patch another test: http is not in /etc/services, so use echo Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ruby19/trunk/files/0003-Use-echo-port-instead-of-http-for-gem-server-test.patch Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2011-03-25 01:33:32 UTC (rev 13939) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2011-03-25 01:47:41 UTC (rev 13940) @@ -80,6 +80,7 @@ PATCHFILES += 0001-Use-LOG_PID-instead-of-LOG_PERROR-in-Syslog.open-tes.patch PATCHFILES += 0002-Skip-syslog-tests-that-rely-on-LOG_PERROR-unless-it-.patch +PATCHFILES += 0003-Use-echo-port-instead-of-http-for-gem-server-test.patch # We define upstream file regex so we can be notifed of new upstream # software release Added: csw/mgar/pkg/ruby19/trunk/files/0003-Use-echo-port-instead-of-http-for-gem-server-test.patch =================================================================== --- csw/mgar/pkg/ruby19/trunk/files/0003-Use-echo-port-instead-of-http-for-gem-server-test.patch (rev 0) +++ csw/mgar/pkg/ruby19/trunk/files/0003-Use-echo-port-instead-of-http-for-gem-server-test.patch 2011-03-25 01:47:41 UTC (rev 13940) @@ -0,0 +1,33 @@ +From f83d10012cb3f37a5e4b249ce3fb865a785bab87 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Fri, 25 Mar 2011 02:43:56 +0100 +Subject: [PATCH] Use echo port instead of http for gem server test + +Solaris doesn't include http in /etc/services by default which causes +test_handle_options_port(TestGemCommandsServerCommand) in the rubygems +test suite to fail. Use echo instead as just about every platform +should have that. + +Signed-off-by: Ben Walton +--- + test/rubygems/test_gem_commands_server_command.rb | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/rubygems/test_gem_commands_server_command.rb b/test/rubygems/test_gem_commands_server_command.rb +index 780e542..c872378 100644 +--- a/test/rubygems/test_gem_commands_server_command.rb ++++ b/test/rubygems/test_gem_commands_server_command.rb +@@ -37,8 +37,8 @@ class TestGemCommandsServerCommand < RubyGemTestCase + @cmd.send :handle_options, %w[-p 65535] + assert_equal 65535, @cmd.options[:port] + +- @cmd.send :handle_options, %w[-p http] +- assert_equal 80, @cmd.options[:port] ++ @cmd.send :handle_options, %w[-p echo] ++ assert_equal 7, @cmd.options[:port] + + e = assert_raises OptionParser::InvalidArgument do + @cmd.send :handle_options, %w[-p nonexistent] +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 25 09:51:36 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 25 Mar 2011 08:51:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[13941] csw/mgar/pkg/libao2/trunk/Makefile Message-ID: Revision: 13941 http://gar.svn.sourceforge.net/gar/?rev=13941&view=rev Author: dmichelsen Date: 2011-03-25 08:51:35 +0000 (Fri, 25 Mar 2011) Log Message: ----------- libao2: Update dependency to new esound lib Modified Paths: -------------- csw/mgar/pkg/libao2/trunk/Makefile Modified: csw/mgar/pkg/libao2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libao2/trunk/Makefile 2011-03-25 01:47:41 UTC (rev 13940) +++ csw/mgar/pkg/libao2/trunk/Makefile 2011-03-25 08:51:35 UTC (rev 13941) @@ -20,7 +20,7 @@ PKGFILES_CSWlibao2 += $(call pkgfiles_lib,libao.so.2) # These are private libraries PKGFILES_CSWlibao2 += $(call baseisadirs,$(libdir),ao/.*) -RUNTIME_DEP_PKGS_CSWlibao2 += CSWesound +RUNTIME_DEP_PKGS_CSWlibao2 += CSWlibesd0 BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 25 10:31:37 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 25 Mar 2011 09:31:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[13942] csw/mgar/pkg/cpan/makemake Message-ID: Revision: 13942 http://gar.svn.sourceforge.net/gar/?rev=13942&view=rev Author: dmichelsen Date: 2011-03-25 09:31:36 +0000 (Fri, 25 Mar 2011) Log Message: ----------- mGAR cpan makemake: Initial commit for automatic Makefile generation, pretty much unfinished yet Added Paths: ----------- csw/mgar/pkg/cpan/makemake Added: csw/mgar/pkg/cpan/makemake =================================================================== --- csw/mgar/pkg/cpan/makemake (rev 0) +++ csw/mgar/pkg/cpan/makemake 2011-03-25 09:31:36 UTC (rev 13942) @@ -0,0 +1,274 @@ +#!/opt/csw/bin/perl + +use strict; +use warnings; + +use CPAN; +use YAML qw(LoadFile); +use File::Path; +use File::Temp qw(:POSIX); +use Module::Version 'get_version'; +use version 0.77; # get latest bug-fixes and API +use Data::Dumper; + +# These three routines are used to capture the output of sub processes and +# perl routines (such as CPAN::Module::get) into a log file. If the command +# completes successfuly, the log file is thrown away. If the command fails, +# the log file is printed along with an error message by calling fail. + +our ($verbose, $logfile, $pgm); +sub logoutput { + if( ! $verbose ) { + $logfile = tmpnam(); + open( OLDOUT, '>&STDOUT' ); + open( OLDERR, '>&STDERR' ); + open( STDOUT, "> $logfile" ); + open( STDERR, "> $logfile" ); + } +} + +sub endlog { + if( ! $verbose ) { + # Reference fh to silence warning + select( OLDERR ); select( OLDOUT ); + + # Restore output. + select( STDOUT); + close( STDOUT ); + open( STDOUT, ">&OLDOUT" ); + close( STDERR ); + open( STDERR, ">&OLDERR" ); + + rmtree( $logfile ); + } +} + +sub fail { + close( STDOUT ); + open( STDOUT, ">&OLDOUT" ); + close( STDERR ); + open( STDERR, ">&OLDERR" ); + open( LOG, "< $logfile" ) or + die "$pgm: Error, @_ - can't open log\n"; + print STDERR foreach ; + close( LOG ); + rmtree( $logfile ); + die "\n$pgm: Error, @_\n"; +} + +sub guess_name_from_module { + my $modname = shift @_; + my $mod = (CPAN::Shell->expand("Module", $modname))[0]; + if( !$mod ) { + print STDERR "ERROR: Can not find module $modname/n"; + return; + } + my $filename = $mod->distribution->base_id; + my ($name, $fileversion) = ($filename =~ /^(\D+)-(\d+(?:\.\d+)*)/); + my $dirname = $name; + my $pkgname = lc( $name ); + $pkgname = "CSWpm-" . $pkgname; + return ($pkgname, $dirname); +} + +sub path2pkg { + my @pathes = @_; + + return () if( @pathes == 0 ); + + my %pkgs; + open P, "/home/dam/mgar/gar/v2/bin/pkgdb show filename " . join( " ", @pathes ) . " |" or die "Cannot open gar/bin/pkgdb"; + while(

          ) { + my $path = shift @pathes; + $pkgs{$path} = [ split( /\s+/, $_ ) ]; + } + close P; + + return %pkgs; +} + +sub mod2pkg { + my $modname = shift @_; + my @result; + my $path = `/opt/csw/bin/perl -S /opt/csw/bin/pmpath $modname 2>&1`; + chomp $path; + if( $path =~ /Can't locate/ ) { + print STDERR "$modname is missing\n"; + return; + } + + my %pkgs = path2pkg( $path ); + return (map { @{$pkgs{$_} or ["undef $_"]} } keys %pkgs); +} + +sub dep_pkgs { + my $req = shift @_; + my @result; + foreach my $modname (keys %$req) { + my $version = version->parse( $req->{$modname} ); + if( $modname eq "perl" ) { + if( version->parse($^V) < $version ) { + die "requires perl version $version"; + } + next; + } + if( $version > version->parse( get_version($modname) ) ) { + print STDERR "Version of $modname is too old. Required is $version, installed is ", + (get_version($modname) or "nothing"), "\n"; + } + + my @pkgs = mod2pkg( $modname ); + if( @pkgs > 1 ) { + print STDERR "ERROR: More than one package for module '$modname' found: @pkgs\n"; + } + my $pkg = shift @pkgs; + if( $pkg ) { + print STDERR "Packages for module '$modname': $pkg\n"; + next if( $pkg eq 'CSWperl' ); + } else { + print STDERR "MISSING package for '$modname'\n"; + # Guess name of missing module + my $dirname; + ($pkg, $dirname) = guess_name_from_module( $modname ); + if( $pkg ) { + if( ! -d $dirname ) { + print STDERR "MISSING $pkg directory '$dirname', to build please invoke makemake $modname\n"; + } else { + print STDERR "MISSING $pkg Please build and install module in $dirname\n"; + } + } + } + push @result, $pkg if( $pkg ); + } + + return @result; +} + + + +my $modname = shift @ARGV; + +logoutput(); +my $mod = (CPAN::Shell->expand("Module", $modname))[0]; +endlog(); + +die "can not locate CPAN module $modname" unless( $mod ); + +# We need this so dependencies can be retreived +#logoutput(); +#close( STDIN ); +#$mod->distribution->make; +#endlog(); +# print "Make done\n"; + + +my $filename = $mod->cpan_file; +my $author = (split(/\//, $filename))[2]; +my $author1 = substr($author,0,1); +my $author2 = substr($author,0,2); +print STDERR "WARNING: Strange username, CPAN lists " . $mod->userid . " but module is stored for $author\n" if( $author ne $mod->userid ); + +my ($notstandard, $fileonly) = ($filename =~ m,^${author1}/${author2}/${author}/(.*/)?([^/]+)$,); + +# That is the version of the module which may be different than the one from the file +# my $version = $mod->cpan_version; +my ($name, $fileversion) = ($fileonly =~ /^(\D+)-(\d+(?:\.\d+)*)/); + +#print "filename: $filename\n"; +#print "notstandard: $notstandard\n"; +#print "fileonly: $fileonly\n"; +#print "name: $name\n"; +#print "fileversion: $fileversion\n"; +#print "author: $author\n"; + +my $cswpkg = lc( $modname ); +$cswpkg =~ s/::/-/g; +$cswpkg = "CSWpm-" . $cswpkg; + +my $cswcatalog = lc( $modname ); +$cswcatalog =~ s/::/_/g; +$cswcatalog = "pm_" . $cswcatalog; + + +# print "DSLIP: ", Dumper( $mod->dslip_status() ); +my $dslip = $mod->dslip_status; +my $archall = (!defined $dslip->{L} ? 2 : + $dslip->{L} eq 'p' ? 1 : + 0); + +logoutput(); +$mod->distribution->get; +endlog(); +#$mod->distribution->make; +my $distdir = $mod->distribution->dir; + +my (@build_dep_pkgs, @runtime_dep_pkgs); + +my $description; +if( -f "$distdir/META.yml" ) { + my $meta = LoadFile( "$distdir/META.yml" ); + $description = $meta->{abstract} if( exists $meta->{abstract} ); + my $req = $meta->{requires}; + my $recommends = $meta->{recommends}; + my $build_requires = $meta->{build_requires}; + + @build_dep_pkgs = dep_pkgs( $build_requires ); + @runtime_dep_pkgs = dep_pkgs( $req ); +} + +$description ||= $mod->description; +$description ||= $mod->manpage_headline; +$description ||= $mod->distribution->as_glimpse; +$description ||= ""; +$description = ucfirst( $description ); +chomp( $description ); + +print "NAME = $name\n"; +print "VERSION = $fileversion\n"; +print "CATEGORIES = cpan\n"; +print "AUTHOR = $author\n"; +print "\n"; +print "DESCRIPTION = $description\n"; +print "define BLURB\n"; +print "endef\n"; +print "\n"; + +my $upstreaminfo = 0; +if( $notstandard ) { + print "MASTER_SITES = \$(addsuffix ${notstandard},\$(CPAN_MIRRORS))\n"; + $upstreaminfo = 1; +} +if( $fileonly ne "${name}-${fileversion}.tar.gz" ) { + print "MODDIST = $fileonly\n"; + $upstreaminfo = 1; +} +print "\n" if( $upstreaminfo ); + +if( @build_dep_pkgs ) { + foreach my $p (@build_dep_pkgs) { + print "BUILD_DEP_PKGS += $p\n"; + } + print "\n"; +} + +print "CATALOG_RELEASE = unstable\n"; +print "\n"; + +print "PACKAGES += $cswpkg\n"; +print "CATALOGNAME_$cswpkg = $cswcatalog\n"; + +# Do we have the package in the catalog and has it the same name? +# dam at login [login]:/home/dam > curl -s http://buildfarm.opencsw.org/pkgdb/rest/catalogs/current/sparc/SunOS5.9/pkgnames/CSWvim/ +# {"maintainer_full_name": "Dagobert Michelsen", "version_string": "7.3.055,REV=2010.11.25", "basename": "vim-7.3.055,REV=2010.11.25-SunOS5.9-sparc-CSW.pkg.gz", "maintainer_email": "dam at opencsw.org", "mtime": "2010-11-27 05:31:11", "file_basename": "vim-7.3.055,REV=2010.11.25-SunOS5.9-sparc-CSW.pkg.gz", "arch": "sparc", "osrel": "SunOS5.9", "size": 1026296, "md5_sum": "96bda1535071daa08372ceee7787b17b", "pkgname": "CSWvim", "rev": "2010.11.25", "filename_arch": "sparc", "version": "7.3.055,REV=2010.11.25", "cadam at login [login]:/home/dam > +# Or does it need to be obsoleted? + +print "# There was no information if this is pure Perl or not. Please remove if necessary.\n" if( $archall == 2 ); +print "ARCHALL_$cswpkg = 1\n" if( $archall ); + +foreach my $p (@runtime_dep_pkgs) { + print "RUNTIME_DEP_PKGS_$cswpkg += $p\n"; +} + +print "\n"; + +print "include gar/category.mk\n"; Property changes on: csw/mgar/pkg/cpan/makemake ___________________________________________________________________ Added: svn:executable + * 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 Mar 25 11:09:55 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 25 Mar 2011 10:09:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[13943] csw/mgar/pkg/libao/trunk/Makefile Message-ID: Revision: 13943 http://gar.svn.sourceforge.net/gar/?rev=13943&view=rev Author: dmichelsen Date: 2011-03-25 10:09:54 +0000 (Fri, 25 Mar 2011) Log Message: ----------- libao: Relocate config file and update dependencies Modified Paths: -------------- csw/mgar/pkg/libao/trunk/Makefile Modified: csw/mgar/pkg/libao/trunk/Makefile =================================================================== --- csw/mgar/pkg/libao/trunk/Makefile 2011-03-25 09:31:36 UTC (rev 13942) +++ csw/mgar/pkg/libao/trunk/Makefile 2011-03-25 10:09:54 UTC (rev 13943) @@ -23,7 +23,10 @@ PKGFILES_CSWlibao4 += $(call pkgfiles_lib,libao.so.4) # These are private libraries PKGFILES_CSWlibao4 += $(call baseisadirs,$(libdir),ao/.*) -RUNTIME_DEP_PKGS_CSWlibao4 += CSWesound +PKGFILES_CSWlibao4 += $(sysconfdir)/.* +PKGFILES_CSWlibao4 += $(mandir)/.* +RUNTIME_DEP_PKGS_CSWlibao4 += CSWlibaudiofile0 +RUNTIME_DEP_PKGS_CSWlibao4 += CSWlibesd0 OBSOLETES_CSWlibao4 = CSWlibao PACKAGES += CSWlibao-dev @@ -32,9 +35,24 @@ # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWlibao-dev = CSWlibao4 +# Default is /etc/libao.conf +LIBAO_CONF = $(sysconfdir)/libao.conf +EXTRA_CPPFLAGS = -DAO_SYSTEM_CONFIG=\\\"$(LIBAO_CONF)\\\" + +PRESERVECONF = $(LIBAO_CONF) + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check include gar/category.mk + +post-install-modulated: + perl -pi -e 's,/etc/libao.conf,$(LIBAO_CONF),;' \ + $(DESTDIR)$(mandir)/man5/libao.conf.5 \ + $(DESTDIR)$(docdir)/$(DISTNAME)/config.html + mkdir -p $(DESTDIR)$(dir $(LIBAO_CONF)) + echo "default_driver=sun" > $(DESTDIR)$(LIBAO_CONF).CSW + @$(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 Fri Mar 25 16:26:33 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 25 Mar 2011 15:26:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[13944] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 13944 http://gar.svn.sourceforge.net/gar/?rev=13944&view=rev Author: bdwalton Date: 2011-03-25 15:26:32 +0000 (Fri, 25 Mar 2011) Log Message: ----------- git/trunk: disable test suite until next version bump Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2011-03-25 10:09:54 UTC (rev 13943) +++ csw/mgar/pkg/git/trunk/Makefile 2011-03-25 15:26:32 UTC (rev 13944) @@ -9,9 +9,8 @@ # 1.7.2.1 and 1.7.3 have a failure on current9s when fr.UFT-8 is # detected as the first available utf8 locale. the failure is # harmless though. +TEST_SCRIPTS = -#TEST_SCRIPTS = - PACKAGES = CSWgit CSWgitk CSWgit-gui CSWgit-svn CSWgit-cvs PACKAGES += CSWgit-emacs CSWgit-doc CSWgit-completion CSWgit-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phil at opencsw.org Fri Mar 25 22:34:33 2011 From: phil at opencsw.org (Philip Brown) Date: Fri, 25 Mar 2011 14:34:33 -0700 Subject: [csw-devel] proposed patch: replace OBSOLETES_ with OBSOLETEDBY_ Message-ID: I've been discussing the "OBSOLETES_" gar usage with Ben. I pointed out that the grammar is opposite to what actually happens. He suggested I submit a patch. So here it is. I've actually split it into two, for perhaps easier viewing. First file is the back end. Second file is the software directories. Basically, replaces "OBSOLETES_xxx" with "OBSOLETEDBY_xxx". This makes things more english parsable. In English, if "Package CSWfoo is the new version, that obsoletes CSWbar", then you want to "make a stub package CSWbar, that is obsoleted by CSWfoo". That is more easily understood, when the gar recipies read similar to OBSOLETEDBY_CSWfoo = CSWbar rather than what is currently there, which is backwards to english usage. http://buildfarm.opencsw.org/experimental/phil/obsoletes.gar.diff http://buildfarm.opencsw.org/experimental/phil/obsoletes.pkg.diff From bwalton at opencsw.org Sat Mar 26 13:41:39 2011 From: bwalton at opencsw.org (Ben Walton) Date: Sat, 26 Mar 2011 08:41:39 -0400 Subject: [csw-devel] proposed patch: replace OBSOLETES_ with OBSOLETEDBY_ In-Reply-To: References: Message-ID: <1301143208-sup-9247@pinkfloyd.chass.utoronto.ca> Excerpts from Philip Brown's message of Fri Mar 25 17:34:33 -0400 2011: > Basically, replaces "OBSOLETES_xxx" with "OBSOLETEDBY_xxx". This > makes things more english parsable. Looks ok to me, but I just skimmed it. It's a straight s/OBSOLETES_/OBSOLETEDBY_/g? If this is being changed, how about OBSOLETED_BY_? If Dago is ok with it, it's fine for commit. Don't forget to update the docs after the change and let maintainers@ know too. Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From phil at opencsw.org Sat Mar 26 18:28:56 2011 From: phil at opencsw.org (Philip Brown) Date: Sat, 26 Mar 2011 10:28:56 -0700 Subject: [csw-devel] proposed patch: replace OBSOLETES_ with OBSOLETEDBY_ Message-ID: On Sat, Mar 26, 2011 at 5:41 AM, Ben Walton wrote: > Excerpts from Philip Brown's message of Fri Mar 25 17:34:33 -0400 2011: > >> Basically, replaces "OBSOLETES_xxx" with "OBSOLETEDBY_xxx". This >> makes things more english parsable. > > Looks ok to me, but I just skimmed it. ?It's a straight > s/OBSOLETES_/OBSOLETEDBY_/g? ?If this is being changed, how about > OBSOLETED_BY_? Makes no difference to me. I dont know what the existing gar standard is; whether there is a standard of ONEWORD_CSWxxxx = yyy or MULTI_WORD_CSWxxx = yyyy Lemme know. From bwalton at opencsw.org Sat Mar 26 23:07:29 2011 From: bwalton at opencsw.org (Ben Walton) Date: Sat, 26 Mar 2011 18:07:29 -0400 Subject: [csw-devel] proposed patch: replace OBSOLETES_ with OBSOLETEDBY_ In-Reply-To: References: Message-ID: <1301177206-sup-498@pinkfloyd.chass.utoronto.ca> Excerpts from Philip Brown's message of Sat Mar 26 13:28:56 -0400 2011: > MULTI_WORD_CSWxxx = yyyy Generally it's multi-word. RUNTIME_DEP_PKGS_CSWfoo, SPKG_DESC_... Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bwalton at opencsw.org Sun Mar 27 03:05:26 2011 From: bwalton at opencsw.org (Ben Walton) Date: Sat, 26 Mar 2011 21:05:26 -0400 Subject: [csw-devel] [PATCH] checkpkg: allow collection of obsoletion info Message-ID: <1301187635-sup-2509@pinkfloyd.chass.utoronto.ca> Hi Maciej, This patch adds a method to the DirectoryFormatPackage class that allows gathering of the obsoletion info it it exists in the package. It's fairly simple and templated on the GetDependencies method. Once this info is gathered from the package though, we can do things like verify the existence of the items listed, ensure the package delivers nothing except a license file, has a catalog name ending in _stub if the list of packages obsoleting the current package isn't empty, etc. Sound ok to you? Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 -------------- next part -------------- A non-text attachment was scrubbed... Name: collect_obsoletion_info.patch Type: application/octet-stream Size: 806 bytes Desc: not available URL: From bwalton at opencsw.org Sun Mar 27 03:16:43 2011 From: bwalton at opencsw.org (Ben Walton) Date: Sat, 26 Mar 2011 21:16:43 -0400 Subject: [csw-devel] [PATCH] checkpkg: allow collection of obsoletion info In-Reply-To: <1301187635-sup-2509@pinkfloyd.chass.utoronto.ca> References: <1301187635-sup-2509@pinkfloyd.chass.utoronto.ca> Message-ID: <1301188420-sup-3494@pinkfloyd.chass.utoronto.ca> Excerpts from Ben Walton's message of Sat Mar 26 21:05:26 -0400 2011: > Sound ok to you? With the correction of s/if no os.path/if not os.path/. Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From maciej at opencsw.org Sun Mar 27 10:18:42 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Sun, 27 Mar 2011 09:18:42 +0100 Subject: [csw-devel] [PATCH] checkpkg: allow collection of obsoletion info In-Reply-To: <1301188420-sup-3494@pinkfloyd.chass.utoronto.ca> References: <1301187635-sup-2509@pinkfloyd.chass.utoronto.ca> <1301188420-sup-3494@pinkfloyd.chass.utoronto.ca> Message-ID: > + def GetObsoletedBy(self): Add a docstring here. """Collects obsoleteness information. Documentation: http://... Returns: a tuple (bool, list) of (syntax_ok, obsoleted_by) If the package has not been obsoleted, or the package predates the implementation of this mechanism, the list is empty. """ > + obsoleted_by = [] > + obsoleted_by_path = os.path.join(self.directory, "install", "obsoleted") > + if no os.path.exists(obsoleted_by_path): > + return obsoleted_by > + fd = open(obsoleted_by_path, "r") I've recently learned a Python idiom for opening files: with open(obsoleted_by_path, "r") as fd: indented block using fd fd is unavailable outside that block > + for line in fd: > + fields = re.split(c.WS_RE, line) I expect that some packages might contain a file with bad syntax, e.g. 3 fields or 1 field. > + pkgname = fields[0] > + catalogname = fields[1] This line would throw an exception (i.e. checkpkg process would abort) if there was only one field. To make it more resilient: obsoleted_by = [] obsoleted_syntax_ok = True fields = re.split(c.WS_RE, line.strip()) if 2 != len(fields): obsoleted_syntax_ok = False continue pkgname, catalogname = fields return obsoleted_syntax_ok, obsoleted_by Or even better: return { "syntax": obsoleted_syntax_ok, "by": obsoleted_by, } > + obsoleted_by.append((pkgname, catalogname)) > + fd.close() If you have the 'with' block of code, fd is closed automatically when you leave the 'with' block. > + return obsoleted_by Next steps should be: - add a dict item around lib/python/package_stats.py line 500 (you could add a tuple, or transform it into a dictionary, or use whatever form that you think will be convenient to use later on; I like dictionaries because they tend to be self-descriptive) - since you're changing the data format, increment PACKAGE_STATS_VERSION in package_stats.py (line 25) - use the new data structure in a check Maciej From maciej at opencsw.org Sun Mar 27 10:54:04 2011 From: maciej at opencsw.org (maciej at opencsw.org) Date: Sun, 27 Mar 2011 09:54:04 +0100 Subject: [csw-devel] [PATCH] checkpkg: allow collection of obsoletion info In-Reply-To: <1301187635-sup-2509@pinkfloyd.chass.utoronto.ca> References: <1301187635-sup-2509@pinkfloyd.chass.utoronto.ca> Message-ID: <1301216046-13427-1-git-send-email-maciej@opencsw.org> Hi Ben, Here's a patchset that adds support for i-deps to checkpkg. It only adds it to the pickled data structure, it doesn't add them to the database schema -- it'll be done in the future. I think this patchset might help you with adding support for obsoleted packages. Maciej gar/v2/lib/python/package.py | 33 ++++++++++++++++++++++----------- gar/v2/lib/python/package_stats.py | 6 ++++-- 2 files changed, 26 insertions(+), 13 deletions(-) [PATCH 1/2] checkpkg: Change GetDependencies to 'with' [PATCH 2/2] checkpkg: Store i_depends information From maciej at opencsw.org Sun Mar 27 10:54:05 2011 From: maciej at opencsw.org (maciej at opencsw.org) Date: Sun, 27 Mar 2011 09:54:05 +0100 Subject: [csw-devel] [PATCH 1/2] checkpkg: Change GetDependencies to 'with' In-Reply-To: <1301187635-sup-2509@pinkfloyd.chass.utoronto.ca> References: <1301187635-sup-2509@pinkfloyd.chass.utoronto.ca> Message-ID: <1301216046-13427-2-git-send-email-maciej@opencsw.org> From: Maciej Blizi?ski --- gar/v2/lib/python/package.py | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/gar/v2/lib/python/package.py b/gar/v2/lib/python/package.py index 21b8b1a..1d06467 100644 --- a/gar/v2/lib/python/package.py +++ b/gar/v2/lib/python/package.py @@ -346,16 +346,15 @@ class DirectoryFormatPackage(shell.ShellMixin, object): depend_file_path = os.path.join(self.directory, "install", "depend") if not os.path.exists(depend_file_path): return depends - fd = open(os.path.join(self.directory, "install", "depend"), "r") - # It needs to be a list because there might be duplicates and it's - # necessary to carry that information. - for line in fd: - fields = re.split(c.WS_RE, line) - if fields[0] == "P": - pkgname = fields[1] - pkg_desc = " ".join(fields[1:]) - depends.append((pkgname, pkg_desc)) - fd.close() + with open(depend_file_path, "r") as fd: + # It needs to be a list because there might be duplicates and it's + # necessary to carry that information. + for line in fd: + fields = re.split(c.WS_RE, line) + if fields[0] == "P": + pkgname = fields[1] + pkg_desc = " ".join(fields[1:]) + depends.append((pkgname, pkg_desc)) return depends def CheckPkgpathExists(self): -- 1.7.1 From maciej at opencsw.org Sun Mar 27 10:54:06 2011 From: maciej at opencsw.org (maciej at opencsw.org) Date: Sun, 27 Mar 2011 09:54:06 +0100 Subject: [csw-devel] [PATCH 2/2] checkpkg: Store i_depends information In-Reply-To: <1301187635-sup-2509@pinkfloyd.chass.utoronto.ca> References: <1301187635-sup-2509@pinkfloyd.chass.utoronto.ca> Message-ID: <1301216046-13427-3-git-send-email-maciej@opencsw.org> From: Maciej Blizi?ski --- gar/v2/lib/python/package.py | 18 +++++++++++++++--- gar/v2/lib/python/package_stats.py | 6 ++++-- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/gar/v2/lib/python/package.py b/gar/v2/lib/python/package.py index 1d06467..76ea892 100644 --- a/gar/v2/lib/python/package.py +++ b/gar/v2/lib/python/package.py @@ -342,20 +342,32 @@ class DirectoryFormatPackage(shell.ShellMixin, object): self.SetPkginfoEntry("NAME", pkginfo_name) def GetDependencies(self): + """Gets dependencies information. + + Returns: + A tuple of (list, list) of depends and i_depends. + """ + # The collection of dependencies needs to be a list (as opposed to + # a set) because there might be duplicates and it's necessary to + # carry that information. depends = [] + i_depends = [] depend_file_path = os.path.join(self.directory, "install", "depend") if not os.path.exists(depend_file_path): return depends with open(depend_file_path, "r") as fd: - # It needs to be a list because there might be duplicates and it's - # necessary to carry that information. for line in fd: fields = re.split(c.WS_RE, line) + if 2 < len(fields): + logging.warning("Bad depends line: %s", repr(line)) if fields[0] == "P": pkgname = fields[1] pkg_desc = " ".join(fields[1:]) depends.append((pkgname, pkg_desc)) - return depends + if fields[0] == "I": + pkgname = fields[1] + i_depends.append(pkgname) + return depends, i_depends def CheckPkgpathExists(self): if not os.path.isdir(self.directory): diff --git a/gar/v2/lib/python/package_stats.py b/gar/v2/lib/python/package_stats.py index d03ee01..65566d5 100644 --- a/gar/v2/lib/python/package_stats.py +++ b/gar/v2/lib/python/package_stats.py @@ -22,7 +22,7 @@ import sharedlib_utils from sqlobject import sqlbuilder -PACKAGE_STATS_VERSION = 10L +PACKAGE_STATS_VERSION = 11L BAD_CONTENT_REGEXES = ( # Slightly obfuscating these by using the default concatenation of # strings. @@ -187,10 +187,12 @@ class PackageStatsMixin(object): # there are packages with 'i386' in the pkgname and 'all' as the # architecture. arch = basic_stats["parsed_basename"]["arch"] + depends, i_depends = dir_pkg.GetDependencies() pkg_stats = { "binaries": dir_pkg.ListBinaries(), "binaries_dump_info": self.GetBinaryDumpInfo(), - "depends": dir_pkg.GetDependencies(), + "depends": depends, + "i_depends": i_depends, "isalist": sharedlib_utils.GetIsalist(arch), "overrides": override_dicts, "pkgchk": self.GetPkgchkData(), -- 1.7.1 From bdwalton at users.sourceforge.net Sun Mar 27 14:21:16 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 27 Mar 2011 12:21:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[13945] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 13945 http://gar.svn.sourceforge.net/gar/?rev=13945&view=rev Author: bdwalton Date: 2011-03-27 12:21:16 +0000 (Sun, 27 Mar 2011) Log Message: ----------- git/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2011-03-25 15:26:32 UTC (rev 13944) +++ csw/mgar/pkg/git/trunk/Makefile 2011-03-27 12:21:16 UTC (rev 13945) @@ -1,5 +1,5 @@ NAME = git -VERSION = 1.7.4.1 +VERSION = 1.7.4.2 #PATCHLEVEL = rc1 CATEGORIES = devel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Sun Mar 27 15:19:15 2011 From: bwalton at opencsw.org (Ben Walton) Date: Sun, 27 Mar 2011 09:19:15 -0400 Subject: [csw-devel] [PATCH] checkpkg: allow collection of obsoletion info In-Reply-To: References: <1301187635-sup-2509@pinkfloyd.chass.utoronto.ca> <1301188420-sup-3494@pinkfloyd.chass.utoronto.ca> Message-ID: <1301229373-sup-3435@pinkfloyd.chass.utoronto.ca> Excerpts from Maciej Blizi?ski's message of Sun Mar 27 04:18:42 -0400 2011: > I've recently learned a Python idiom for opening files: > > with open(obsoleted_by_path, "r") as fd: > indented block > using fd Ah! Very ruby-esque, I like it. The same thing in Ruby would be: File.open("/path/to/file", "r") do |file| file.each_line do |line| ... end end (I'm one of the folks that likes the 'end' block markers as I find they improve readability.) > fd is unavailable outside that block Exactly the way it works in ruby too. This is much nicer for many of the typical file processing tasks that are common in code. > I expect that some packages might contain a file with bad syntax, e.g. > 3 fields or 1 field. Yes, a good point. I'm only using the first two fields, but there is a package description for the package that obsoletes the package too. Not sure it's much use in the tests though. We could forseeably change the description of a package in the future while not releasing the updated _stub packages for example. Thus, of the line with format: CSWfoo foo - The foo package is great We only care about the first two white space separated fields. > if 2 != len(fields): I prefer len(fields) != 2. Is there a reason you prefer the ordering above? If it's the more common ordering throughout the code, I'll use it for consistency. > Or even better: > return { > "syntax": obsoleted_syntax_ok, > "by": obsoleted_by, > } I like this better too. > Next steps should be: > > - add a dict item around lib/python/package_stats.py line 500 (you > could add a tuple, or transform it into a dictionary, or use > whatever form that you think will be convenient to use later on; I > like dictionaries because they tend to be self-descriptive) I was looking at this last night but couldn't make the new info be displayed in the output of checkpkg_inspect_stats.py -p... > - since you're changing the data format, increment > PACKAGE_STATS_VERSION in package_stats.py (line 25) Ok, didn't catch that last night. > - use the new data structure in a check I think the first thing I'll do is ensure _stub when obsoleted by syntax is ok and the list isn't empty. There are many other checks that can focus on this new data. A list that isn't empty but fails the syntax check would be one such test. Updated patch attached. Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 -------------- next part -------------- A non-text attachment was scrubbed... Name: collect_obsoletion_info.patch Type: application/octet-stream Size: 1467 bytes Desc: not available URL: From bwalton at opencsw.org Sun Mar 27 15:21:43 2011 From: bwalton at opencsw.org (Ben Walton) Date: Sun, 27 Mar 2011 09:21:43 -0400 Subject: [csw-devel] [PATCH] checkpkg: allow collection of obsoletion info In-Reply-To: <1301229373-sup-3435@pinkfloyd.chass.utoronto.ca> References: <1301187635-sup-2509@pinkfloyd.chass.utoronto.ca> <1301188420-sup-3494@pinkfloyd.chass.utoronto.ca> <1301229373-sup-3435@pinkfloyd.chass.utoronto.ca> Message-ID: <1301232054-sup-7152@pinkfloyd.chass.utoronto.ca> Excerpts from Ben Walton's message of Sun Mar 27 09:19:15 -0400 2011: > We only care about the first two white space separated fields. > > > if 2 != len(fields): Hmm. This needs to be a <= comparison since there will actually by many fields when split by whitespace. Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From maciej at opencsw.org Sun Mar 27 15:59:50 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Sun, 27 Mar 2011 14:59:50 +0100 Subject: [csw-devel] [PATCH] checkpkg: allow collection of obsoletion info In-Reply-To: <1301229373-sup-3435@pinkfloyd.chass.utoronto.ca> References: <1301187635-sup-2509@pinkfloyd.chass.utoronto.ca> <1301188420-sup-3494@pinkfloyd.chass.utoronto.ca> <1301229373-sup-3435@pinkfloyd.chass.utoronto.ca> Message-ID: 2011/3/27 Ben Walton : > Excerpts from Maciej Blizi?ski's message of Sun Mar 27 04:18:42 -0400 2011: > >> I've recently learned a Python idiom for opening files: >> >> with open(obsoleted_by_path, "r") as fd: >> ? indented block >> ? using fd > > Ah! ?Very ruby-esque, I like it. ?The same thing in Ruby would be: > > File.open("/path/to/file", "r") do |file| > ?file.each_line do |line| > ? ?... > ?end > end > > (I'm one of the folks that likes the 'end' block markers as I find > they improve readability.) Nothing prevents you from using them in Python: end = None # define a name for i in range(4): for j in range(4): print i, j end end >> fd is unavailable outside that block > > Exactly the way it works in ruby too. ?This is much nicer for many of > the typical file processing tasks that are common in code. > >> I expect that some packages might contain a file with bad syntax, e.g. >> 3 fields or 1 field. > > Yes, a good point. ?I'm only using the first two fields, but there is > a package description for the package that obsoletes the package too. > Not sure it's much use in the tests though. ?We could forseeably > change the description of a package in the future while not releasing > the updated _stub packages for example. ?Thus, of the line with > format: > > CSWfoo foo - The foo package is great > > We only care about the first two white space separated fields. Agreed. >> ? if 2 != len(fields): > > I prefer len(fields) != 2. ?Is there a reason you prefer the ordering > above? ?If it's the more common ordering throughout the code, I'll use > it for consistency. If it was C, I would argue that 2 != len(fields) is better. In Python, use what you feel is more readable. Since we allow >2 fields: if len(fields) < 2: (...) >> Or even better: >> return { >> ? "syntax": obsoleted_syntax_ok, >> ? "by": obsoleted_by, >> } > > I like this better too. > >> Next steps should be: >> >> - add a dict item around lib/python/package_stats.py line 500 (you >> could add a tuple, or transform it into a dictionary, or use >> whatever form that you think will be convenient to use later on; I >> like dictionaries because they tend to be self-descriptive) > > I was looking at this last night but couldn't make the new info be > displayed in the output of checkpkg_inspect_stats.py -p... > >> - since you're changing the data format, increment >> PACKAGE_STATS_VERSION in package_stats.py (line 25) > > Ok, didn't catch that last night. > >> - use the new data structure in a check > > I think the first thing I'll do is ensure _stub when obsoleted by > syntax is ok and the list isn't empty. ?There are many other checks > that can focus on this new data. ?A list that isn't empty but fails > the syntax check would be one such test. You could also check package description: if it's a _stub, it needs to declare that in the description; if it declares that in the description, it needs to be a _stub. > Updated patch attached. I wouldn't mind inline patches, it would let me skip downloading, and allow commenting inline. Maciej From bwalton at opencsw.org Sun Mar 27 16:08:19 2011 From: bwalton at opencsw.org (Ben Walton) Date: Sun, 27 Mar 2011 10:08:19 -0400 Subject: [csw-devel] [PATCH] checkpkg: allow collection of obsoletion info In-Reply-To: References: <1301187635-sup-2509@pinkfloyd.chass.utoronto.ca> <1301188420-sup-3494@pinkfloyd.chass.utoronto.ca> <1301229373-sup-3435@pinkfloyd.chass.utoronto.ca> Message-ID: <1301234771-sup-2854@pinkfloyd.chass.utoronto.ca> Excerpts from Maciej Blizi?ski's message of Sun Mar 27 09:59:50 -0400 2011: > Nothing prevents you from using them in Python: > > end = None # define a name > > for i in range(4): > for j in range(4): > print i, j > end > end Cool! > You could also check package description: if it's a _stub, it needs to > declare that in the description; if it declares that in the > description, it needs to be a _stub. This would be cool too. Matching on Transition package ... > I wouldn't mind inline patches, it would let me skip downloading, > and allow commenting inline. Yes, good point. Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bwalton at opencsw.org Sun Mar 27 16:15:46 2011 From: bwalton at opencsw.org (Ben Walton) Date: Sun, 27 Mar 2011 10:15:46 -0400 Subject: [csw-devel] [PATCH] checkpkg: allow collection of obsoletion info In-Reply-To: References: <1301187635-sup-2509@pinkfloyd.chass.utoronto.ca> <1301188420-sup-3494@pinkfloyd.chass.utoronto.ca> <1301229373-sup-3435@pinkfloyd.chass.utoronto.ca> Message-ID: <1301235181-sup-7203@pinkfloyd.chass.utoronto.ca> Excerpts from Maciej Blizi?ski's message of Sun Mar 27 09:59:50 -0400 2011: Ok, here's the version I think is ready for commit... Thanks -Ben Index: package.py =================================================================== --- package.py (revision 13944) +++ package.py (working copy) @@ -358,6 +358,38 @@ fd.close() return depends + def GetObsoletedBy(self): + """Collects obsolescence information from the package if it exists + + Documentation: + http://wiki.opencsw.org/obsoleting-packages + + Returns: + a tuple (bool, list) of (syntax_ok, obsoleted_by) + + If the package has not been obsoleted or the package predates the + implementation of this mechanism, the list is empty. If the + package provides obsolescence information but the format of the + information is invalid, syntax_ok will be False and the list will + be empty. + """ + + obsoleted_syntax_ok = True + obsoleted_by = [] + obsoleted_by_path = os.path.join(self.directory, "install", "obsolete") + if not os.path.exists(obsoleted_by_path): + return obsoleted_by + + with open(obsoleted_by_path, "r") as fd: + for line in fd: + fields = re.split(c.WS_RE, line) + if len(fields) < 2: + obsoleted_syntax_ok = False + continue + pkgname, catalogname = fields[0:2] + obsoleted_by.append((pkgname, catalogname)) + return { "syntax_ok": obsoleted_syntax_ok, "by": obsoleted_by } + def CheckPkgpathExists(self): if not os.path.isdir(self.directory): raise PackageError("%s does not exist or is not a directory" -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From maciej at opencsw.org Sun Mar 27 16:22:26 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Sun, 27 Mar 2011 15:22:26 +0100 Subject: [csw-devel] [PATCH] checkpkg: allow collection of obsoletion info In-Reply-To: <1301235181-sup-7203@pinkfloyd.chass.utoronto.ca> References: <1301187635-sup-2509@pinkfloyd.chass.utoronto.ca> <1301188420-sup-3494@pinkfloyd.chass.utoronto.ca> <1301229373-sup-3435@pinkfloyd.chass.utoronto.ca> <1301235181-sup-7203@pinkfloyd.chass.utoronto.ca> Message-ID: 2011/3/27 Ben Walton : > Excerpts from Maciej Blizi?ski's message of Sun Mar 27 09:59:50 -0400 2011: > > Ok, here's the version I think is ready for commit... > > Thanks > -Ben > > Index: package.py > =================================================================== > --- package.py ?(revision 13944) > +++ package.py ?(working copy) > @@ -358,6 +358,38 @@ > ? ? fd.close() > ? ? return depends > > + ?def GetObsoletedBy(self): > + ? ?"""Collects obsolescence information from the package if it > exists > + > + ? ?Documentation: > + ? ?http://wiki.opencsw.org/obsoleting-packages > + > + ? ?Returns: > + ? ? ?a tuple (bool, list) of (syntax_ok, obsoleted_by) This bit needs updating. > + ? ?If the package has not been obsoleted or the package predates the > + ? ?implementation of this mechanism, the list is empty. ?If the > + ? ?package provides obsolescence information but the format of the > + ? ?information is invalid, syntax_ok will be False and the list will > + ? ?be empty. > + ? ?""" > + > + ? ?obsoleted_syntax_ok = True > + ? ?obsoleted_by = [] > + ? ?obsoleted_by_path = os.path.join(self.directory, "install", > "obsolete") > + ? ?if not os.path.exists(obsoleted_by_path): > + ? ? ?return obsoleted_by > + > + ? ?with open(obsoleted_by_path, "r") as fd: > + ? ? ?for line in fd: > + ? ? ? ?fields = re.split(c.WS_RE, line) > + ? ? ? ?if len(fields) < 2: > + ? ? ? ? ?obsoleted_syntax_ok = False > + ? ? ? ? ?continue > + ? ? ? ?pkgname, catalogname = fields[0:2] > + ? ? ? ?obsoleted_by.append((pkgname, catalogname)) > + ? ?return { "syntax_ok": obsoleted_syntax_ok, "by": obsoleted_by } > + > ? def CheckPkgpathExists(self): > ? ? if not os.path.isdir(self.directory): > ? ? ? raise PackageError("%s does not exist or is not a directory" Looks good! Incrementing of the data structure version doesn't need to be done in this change, if it only adds this function. It will need to be in the change in the code creating pkg_stats in package_stats.py. Maciej From bwalton at opencsw.org Sun Mar 27 16:49:26 2011 From: bwalton at opencsw.org (Ben Walton) Date: Sun, 27 Mar 2011 10:49:26 -0400 Subject: [csw-devel] [PATCH] checkpkg: allow collection of obsoletion info In-Reply-To: References: <1301187635-sup-2509@pinkfloyd.chass.utoronto.ca> <1301188420-sup-3494@pinkfloyd.chass.utoronto.ca> <1301229373-sup-3435@pinkfloyd.chass.utoronto.ca> <1301235181-sup-7203@pinkfloyd.chass.utoronto.ca> Message-ID: <1301237013-sup-5143@pinkfloyd.chass.utoronto.ca> Excerpts from Maciej Blizi?ski's message of Sun Mar 27 10:22:26 -0400 2011: > > + ?def GetObsoletedBy(self): > > + ? ?"""Collects obsolescence information from the package if it > > exists > > + > > + ? ?Documentation: > > + ? ?http://wiki.opencsw.org/obsoleting-packages > > + > > + ? ?Returns: > > + ? ? ?a tuple (bool, list) of (syntax_ok, obsoleted_by) > > This bit needs updating. Ah yes. Good catch. Index: package.py =================================================================== --- package.py (revision 13944) +++ package.py (working copy) @@ -358,6 +358,39 @@ fd.close() return depends + def GetObsoletedBy(self): + """Collects obsolescence information from the package if it exists + + Documentation: + http://wiki.opencsw.org/obsoleting-packages + + Returns: + a dict { syntax_ok: bool, obsoleted_by: [[pkg,cat], [pkg2,cat2], ...] } ^^ I'm not sure if I'm describing the data structure in the proper python way here. Should the [] be ()? + + If the package has not been obsoleted or the package predates the + implementation of this mechanism, the list is empty. If the + package provides obsolescence information but the format of the + information is invalid, syntax_ok will be False and the list will + be empty. + """ + + obsoleted_syntax_ok = True + obsoleted_by = [] + obsoleted_by_path = os.path.join(self.directory, "install", "obsolete") + if not os.path.exists(obsoleted_by_path): + return obsoleted_by + + with open(obsoleted_by_path, "r") as fd: + for line in fd: + fields = re.split(c.WS_RE, line) + if len(fields) < 2: + obsoleted_syntax_ok = False + logging.warning("Bad line in obsolete file: %s", repr(line)) + continue + pkgname, catalogname = fields[0:2] + obsoleted_by.append((pkgname, catalogname)) + return { "syntax_ok": obsoleted_syntax_ok, "obsoleted_by": obsoleted_by } + > Incrementing of the data structure version doesn't need to be done > in this change, if it only adds this function. It will need to be > in the change in the code creating pkg_stats in package_stats.py. Right. And I'll do my best to keeps the commits atomic in the 'git way' where each change is as self contained as possible, newer building on older. Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bdwalton at users.sourceforge.net Sun Mar 27 17:42:18 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 27 Mar 2011 15:42:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[13946] csw/mgar/pkg/git/trunk Message-ID: Revision: 13946 http://gar.svn.sourceforge.net/gar/?rev=13946&view=rev Author: bdwalton Date: 2011-03-27 15:42:18 +0000 (Sun, 27 Mar 2011) Log Message: ----------- git/trunk: patch incorporated upstream now Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/git/trunk/files/0006-work-around-solaris-ln-bug.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2011-03-27 12:21:16 UTC (rev 13945) +++ csw/mgar/pkg/git/trunk/Makefile 2011-03-27 15:42:18 UTC (rev 13946) @@ -98,7 +98,6 @@ PATCHFILES += 0003-Update-path-in-sample-hook-file.patch PATCHFILES += 0004-Use-bash-and-set-PATH-in-contributed-hook-file.patch PATCHFILES += 0005-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch -PATCHFILES += 0006-work-around-solaris-ln-bug.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files Deleted: csw/mgar/pkg/git/trunk/files/0006-work-around-solaris-ln-bug.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0006-work-around-solaris-ln-bug.patch 2011-03-27 12:21:16 UTC (rev 13945) +++ csw/mgar/pkg/git/trunk/files/0006-work-around-solaris-ln-bug.patch 2011-03-27 15:42:18 UTC (rev 13946) @@ -1,34 +0,0 @@ -From afe25b62999a24a7585dcf8008eb180f585ba158 Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Sun, 20 Mar 2011 03:38:32 +0100 -Subject: [PATCH] work around solaris ln bug - -Signed-off-by: Ben Walton ---- - t/t8006-blame-textconv.sh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/t/t8006-blame-textconv.sh b/t/t8006-blame-textconv.sh -index ea64cd8..83f7c99 100755 ---- a/t/t8006-blame-textconv.sh -+++ b/t/t8006-blame-textconv.sh -@@ -18,14 +18,14 @@ test_expect_success 'setup ' ' - echo "bin: test 1" >one.bin && - echo "bin: test number 2" >two.bin && - if test_have_prereq SYMLINKS; then -- ln -s one.bin symlink.bin -+ /opt/csw/gnu/ln -s one.bin symlink.bin - fi && - git add . && - GIT_AUTHOR_NAME=Number1 git commit -a -m First --date="2010-01-01 18:00:00" && - echo "bin: test 1 version 2" >one.bin && - echo "bin: test number 2 version 2" >>two.bin && - if test_have_prereq SYMLINKS; then -- ln -sf two.bin symlink.bin -+ /opt/csw/gnu/ln -sf two.bin symlink.bin - fi && - GIT_AUTHOR_NAME=Number2 git commit -a -m Second --date="2010-01-01 20:00:00" - ' --- -1.7.3.2 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 27 18:52:04 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 27 Mar 2011 16:52:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[13947] csw/mgar/gar/v2/lib/python/package.py Message-ID: Revision: 13947 http://gar.svn.sourceforge.net/gar/?rev=13947&view=rev Author: bdwalton Date: 2011-03-27 16:52:03 +0000 (Sun, 27 Mar 2011) Log Message: ----------- checkpkg/package.py: add GetObsoletedBy to class DirectoryFormatPackage Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package.py Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2011-03-27 15:42:18 UTC (rev 13946) +++ csw/mgar/gar/v2/lib/python/package.py 2011-03-27 16:52:03 UTC (rev 13947) @@ -358,6 +358,42 @@ fd.close() return depends + def GetObsoletedBy(self): + """Collects obsolescence information from the package if it exists + + Documentation: + http://wiki.opencsw.org/obsoleting-packages + + Returns: + A dictionary of "syntax_ok" and "obsoleted_by" where obsoleted_by + is a list of (pkgname, catalogname) tuples and syntax_ok is a + boolean. + + If the package has not been obsoleted or the package predates the + implementation of this mechanism, obsoleted_by is an empty list. + If the package provides obsolescence information but the format of + the information is invalid, syntax_ok will be False and the list + may be empty. It will always contain the valid entries. + """ + + obsoleted_syntax_ok = True + obsoleted_by = [] + obsoleted_by_path = os.path.join(self.directory, "install", "obsolete") + + if not os.path.exists(obsoleted_by_path): + return obsoleted_by + + with open(obsoleted_by_path, "r") as fd: + for line in fd: + fields = re.split(c.WS_RE, line) + if len(fields) < 2: + obsoleted_syntax_ok = False + logging.warning("Bad line in obsolete file: %s", repr(line)) + continue + pkgname, catalogname = fields[0:2] + obsoleted_by.append((pkgname, catalogname)) + return { "syntax_ok": obsoleted_syntax_ok, "obsoleted_by": obsoleted_by } + def CheckPkgpathExists(self): if not os.path.isdir(self.directory): raise PackageError("%s does not exist or is not a directory" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 27 18:59:26 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 27 Mar 2011 16:59:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[13948] csw/mgar/pkg Message-ID: Revision: 13948 http://gar.svn.sourceforge.net/gar/?rev=13948&view=rev Author: bdwalton Date: 2011-03-27 16:59:26 +0000 (Sun, 27 Mar 2011) Log Message: ----------- add GAR stub for proj (required for grass) Added Paths: ----------- csw/mgar/pkg/proj/ csw/mgar/pkg/proj/Makefile csw/mgar/pkg/proj/branches/ csw/mgar/pkg/proj/tags/ csw/mgar/pkg/proj/trunk/ csw/mgar/pkg/proj/trunk/Makefile csw/mgar/pkg/proj/trunk/checksums csw/mgar/pkg/proj/trunk/files/ Copied: csw/mgar/pkg/proj/Makefile (from rev 13937, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/proj/Makefile (rev 0) +++ csw/mgar/pkg/proj/Makefile 2011-03-27 16:59:26 UTC (rev 13948) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/proj/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/proj/trunk/Makefile =================================================================== --- csw/mgar/pkg/proj/trunk/Makefile (rev 0) +++ csw/mgar/pkg/proj/trunk/Makefile 2011-03-27 16:59:26 UTC (rev 13948) @@ -0,0 +1,16 @@ +# $Id$ +NAME = proj +VERSION = 4.7.0 +CATEGORIES = lib + +DESCRIPTION = Cartographic Projections Library +define BLURB +The PROJ.4 Cartographic Projections library was originally written by Gerald Evenden then of the USGS. +endef + +MASTER_SITES = http://download.osgeo.org/$(NAME)/ +DISTFILES = $(DISTNAME).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Property changes on: csw/mgar/pkg/proj/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/proj/trunk/checksums =================================================================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 27 19:00:22 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 27 Mar 2011 17:00:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[13949] csw/mgar/pkg/proj/trunk/checksums Message-ID: Revision: 13949 http://gar.svn.sourceforge.net/gar/?rev=13949&view=rev Author: bdwalton Date: 2011-03-27 17:00:21 +0000 (Sun, 27 Mar 2011) Log Message: ----------- proj/trunk: add checksums Modified Paths: -------------- csw/mgar/pkg/proj/trunk/checksums Modified: csw/mgar/pkg/proj/trunk/checksums =================================================================== --- csw/mgar/pkg/proj/trunk/checksums 2011-03-27 16:59:26 UTC (rev 13948) +++ csw/mgar/pkg/proj/trunk/checksums 2011-03-27 17:00:21 UTC (rev 13949) @@ -0,0 +1 @@ +927d34623b52e0209ba2bfcca18fe8cd proj-4.7.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 27 21:19:15 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 27 Mar 2011 19:19:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[13950] csw/mgar/gar/v2/lib/python/package.py Message-ID: Revision: 13950 http://gar.svn.sourceforge.net/gar/?rev=13950&view=rev Author: bdwalton Date: 2011-03-27 19:19:15 +0000 (Sun, 27 Mar 2011) Log Message: ----------- checkpkg/package.py: for packages with no obsolete file, return a valid dict instead of an empty list Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package.py Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2011-03-27 17:00:21 UTC (rev 13949) +++ csw/mgar/gar/v2/lib/python/package.py 2011-03-27 19:19:15 UTC (rev 13950) @@ -381,7 +381,7 @@ obsoleted_by_path = os.path.join(self.directory, "install", "obsolete") if not os.path.exists(obsoleted_by_path): - return obsoleted_by + return { "syntax_ok": True, "obsoleted_by": obsoleted_by } with open(obsoleted_by_path, "r") as fd: for line in fd: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 27 21:27:45 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 27 Mar 2011 19:27:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[13951] csw/mgar/pkg/proj/trunk/Makefile Message-ID: Revision: 13951 http://gar.svn.sourceforge.net/gar/?rev=13951&view=rev Author: bdwalton Date: 2011-03-27 19:27:44 +0000 (Sun, 27 Mar 2011) Log Message: ----------- proj/trunk: set TEST_TARGET until I can figure out how to have mgar use v2-defaultchange Modified Paths: -------------- csw/mgar/pkg/proj/trunk/Makefile Modified: csw/mgar/pkg/proj/trunk/Makefile =================================================================== --- csw/mgar/pkg/proj/trunk/Makefile 2011-03-27 19:19:15 UTC (rev 13950) +++ csw/mgar/pkg/proj/trunk/Makefile 2011-03-27 19:27:44 UTC (rev 13951) @@ -3,6 +3,8 @@ VERSION = 4.7.0 CATEGORIES = lib +TEST_TARGET=check + DESCRIPTION = Cartographic Projections Library define BLURB The PROJ.4 Cartographic Projections library was originally written by Gerald Evenden then of the USGS. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 27 21:52:20 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 27 Mar 2011 19:52:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[13952] csw/mgar/gar/v2/lib/python/package.py Message-ID: Revision: 13952 http://gar.svn.sourceforge.net/gar/?rev=13952&view=rev Author: bdwalton Date: 2011-03-27 19:52:20 +0000 (Sun, 27 Mar 2011) Log Message: ----------- checkpkg/package.py: add third item to obsoletion dict in GetObsoletedBy to indicate presence of i obsolete so we can differntiate syntax_ok/[] which would be the value when no file is present Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package.py Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2011-03-27 19:27:44 UTC (rev 13951) +++ csw/mgar/gar/v2/lib/python/package.py 2011-03-27 19:52:20 UTC (rev 13952) @@ -365,12 +365,16 @@ http://wiki.opencsw.org/obsoleting-packages Returns: - A dictionary of "syntax_ok" and "obsoleted_by" where obsoleted_by - is a list of (pkgname, catalogname) tuples and syntax_ok is a - boolean. + A dictionary of "has_obsolete_info", "syntax_ok" and + "obsoleted_by" where obsoleted_by is a list of (pkgname, + catalogname) tuples and has_obsolete_info and syntax_ok are + booleans. + If the package has not been obsoleted or the package predates the - implementation of this mechanism, obsoleted_by is an empty list. + implementation of this mechanism, obsoleted_by is an empty list + and has_obsolete_info will be False. + If the package provides obsolescence information but the format of the information is invalid, syntax_ok will be False and the list may be empty. It will always contain the valid entries. @@ -381,7 +385,9 @@ obsoleted_by_path = os.path.join(self.directory, "install", "obsolete") if not os.path.exists(obsoleted_by_path): - return { "syntax_ok": True, "obsoleted_by": obsoleted_by } + return { "syntax_ok": True, + "obsoleted_by": obsoleted_by, + "has_obsolete_info": False } with open(obsoleted_by_path, "r") as fd: for line in fd: @@ -392,7 +398,9 @@ continue pkgname, catalogname = fields[0:2] obsoleted_by.append((pkgname, catalogname)) - return { "syntax_ok": obsoleted_syntax_ok, "obsoleted_by": obsoleted_by } + return { "syntax_ok": obsoleted_syntax_ok, + "obsoleted_by": obsoleted_by, + "has_obsolete_info": True } def CheckPkgpathExists(self): if not os.path.isdir(self.directory): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 27 21:53:55 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 27 Mar 2011 19:53:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[13953] csw/mgar/pkg/proj/trunk Message-ID: Revision: 13953 http://gar.svn.sourceforge.net/gar/?rev=13953&view=rev Author: bdwalton Date: 2011-03-27 19:53:55 +0000 (Sun, 27 Mar 2011) Log Message: ----------- proj/trunk: import the old library files and install them with the post-install hook Modified Paths: -------------- csw/mgar/pkg/proj/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/proj/trunk/files/libproj.so.0.4.2.i386 csw/mgar/pkg/proj/trunk/files/libproj.so.0.4.2.sparc Modified: csw/mgar/pkg/proj/trunk/Makefile =================================================================== --- csw/mgar/pkg/proj/trunk/Makefile 2011-03-27 19:52:20 UTC (rev 13952) +++ csw/mgar/pkg/proj/trunk/Makefile 2011-03-27 19:53:55 UTC (rev 13953) @@ -16,3 +16,8 @@ CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk + +post-install-modulated: + @(cp $(FILEDIR)/libproj.so.0.4.2.$(GARCH) \ + $(DESTDIR)$(libdir)/libproj.so.0.4.2 ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/proj/trunk/files/libproj.so.0.4.2.i386 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/proj/trunk/files/libproj.so.0.4.2.i386 ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/proj/trunk/files/libproj.so.0.4.2.sparc =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/proj/trunk/files/libproj.so.0.4.2.sparc ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 27 22:03:05 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 27 Mar 2011 20:03:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[13954] csw/mgar/pkg/proj/trunk/Makefile Message-ID: Revision: 13954 http://gar.svn.sourceforge.net/gar/?rev=13954&view=rev Author: bdwalton Date: 2011-03-27 20:03:04 +0000 (Sun, 27 Mar 2011) Log Message: ----------- proj/trunk: got the GARTYPE switching to work Modified Paths: -------------- csw/mgar/pkg/proj/trunk/Makefile Modified: csw/mgar/pkg/proj/trunk/Makefile =================================================================== --- csw/mgar/pkg/proj/trunk/Makefile 2011-03-27 19:53:55 UTC (rev 13953) +++ csw/mgar/pkg/proj/trunk/Makefile 2011-03-27 20:03:04 UTC (rev 13954) @@ -3,7 +3,7 @@ VERSION = 4.7.0 CATEGORIES = lib -TEST_TARGET=check +GARTYPE = v2-defaultchange DESCRIPTION = Cartographic Projections Library define BLURB This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sun Mar 27 22:05:42 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Sun, 27 Mar 2011 21:05:42 +0100 Subject: [csw-devel] SF.net SVN: gar:[13947] csw/mgar/gar/v2/lib/python/package.py In-Reply-To: References: Message-ID: Yey! This is a very nicely written bit of code. From maciej at opencsw.org Sun Mar 27 22:07:01 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Sun, 27 Mar 2011 21:07:01 +0100 Subject: [csw-devel] SF.net SVN: gar:[13950] csw/mgar/gar/v2/lib/python/package.py In-Reply-To: References: Message-ID: 2011/3/27 : > Revision: 13950 > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=13950&view=rev > Author: ? bdwalton > Date: ? ? 2011-03-27 19:19:15 +0000 (Sun, 27 Mar 2011) > > Log Message: > ----------- > checkpkg/package.py: for packages with no obsolete file, return a valid dict instead of an empty list > > Modified Paths: > -------------- > ? ?csw/mgar/gar/v2/lib/python/package.py > > Modified: csw/mgar/gar/v2/lib/python/package.py > =================================================================== > --- csw/mgar/gar/v2/lib/python/package.py ? ? ? 2011-03-27 17:00:21 UTC (rev 13949) > +++ csw/mgar/gar/v2/lib/python/package.py ? ? ? 2011-03-27 19:19:15 UTC (rev 13950) > @@ -381,7 +381,7 @@ > ? ? obsoleted_by_path = os.path.join(self.directory, "install", "obsolete") > > ? ? if not os.path.exists(obsoleted_by_path): > - ? ? ?return obsoleted_by > + ? ? ?return { "syntax_ok": True, "obsoleted_by": obsoleted_by } I didn't catch that bit, sorry. From maciej at opencsw.org Sun Mar 27 22:09:06 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Sun, 27 Mar 2011 21:09:06 +0100 Subject: [csw-devel] SF.net SVN: gar:[13952] csw/mgar/gar/v2/lib/python/package.py In-Reply-To: References: Message-ID: 2011/3/27 : > ? ? if not os.path.exists(obsoleted_by_path): > - ? ? ?return { "syntax_ok": True, "obsoleted_by": obsoleted_by } > + ? ? ?return { "syntax_ok": True, > + ? ? ? ? ? ? ? "obsoleted_by": obsoleted_by, > + ? ? ? ? ? ? ? "has_obsolete_info": False } The return statement could be de-duplicated in the following manner: initialize variables if file exists: open file, populate variables return variables From bdwalton at users.sourceforge.net Sun Mar 27 22:17:31 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 27 Mar 2011 20:17:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[13955] csw/mgar/gar/v2/lib/python/package.py Message-ID: Revision: 13955 http://gar.svn.sourceforge.net/gar/?rev=13955&view=rev Author: bdwalton Date: 2011-03-27 20:17:31 +0000 (Sun, 27 Mar 2011) Log Message: ----------- checkpkg/package.py: deduplicate return info from GetObsoletedBy Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package.py Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2011-03-27 20:03:04 UTC (rev 13954) +++ csw/mgar/gar/v2/lib/python/package.py 2011-03-27 20:17:31 UTC (rev 13955) @@ -380,27 +380,26 @@ may be empty. It will always contain the valid entries. """ + has_obsolete_info = False obsoleted_syntax_ok = True obsoleted_by = [] obsoleted_by_path = os.path.join(self.directory, "install", "obsolete") - if not os.path.exists(obsoleted_by_path): - return { "syntax_ok": True, - "obsoleted_by": obsoleted_by, - "has_obsolete_info": False } + if os.path.exists(obsoleted_by_path): + has_obsolete_info = True + with open(obsoleted_by_path, "r") as fd: + for line in fd: + fields = re.split(c.WS_RE, line) + if len(fields) < 2: + obsoleted_syntax_ok = False + logging.warning("Bad line in obsolete file: %s", repr(line)) + continue + pkgname, catalogname = fields[0:2] + obsoleted_by.append((pkgname, catalogname)) - with open(obsoleted_by_path, "r") as fd: - for line in fd: - fields = re.split(c.WS_RE, line) - if len(fields) < 2: - obsoleted_syntax_ok = False - logging.warning("Bad line in obsolete file: %s", repr(line)) - continue - pkgname, catalogname = fields[0:2] - obsoleted_by.append((pkgname, catalogname)) return { "syntax_ok": obsoleted_syntax_ok, "obsoleted_by": obsoleted_by, - "has_obsolete_info": True } + "has_obsolete_info": has_obsolete_info } def CheckPkgpathExists(self): if not os.path.isdir(self.directory): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Sun Mar 27 22:18:35 2011 From: bwalton at opencsw.org (Ben Walton) Date: Sun, 27 Mar 2011 16:18:35 -0400 Subject: [csw-devel] SF.net SVN: gar:[13952] csw/mgar/gar/v2/lib/python/package.py In-Reply-To: References: Message-ID: <1301257077-sup-2955@pinkfloyd.chass.utoronto.ca> Excerpts from Maciej Blizi?ski's message of Sun Mar 27 16:09:06 -0400 2011: > The return statement could be de-duplicated in the following manner: Yes, I agree. Still getting my feet under me so I'm not spotting silly things like that. Change committed. Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bdwalton at users.sourceforge.net Sun Mar 27 23:53:00 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 27 Mar 2011 21:53:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[13956] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13956 http://gar.svn.sourceforge.net/gar/?rev=13956&view=rev Author: bdwalton Date: 2011-03-27 21:52:59 +0000 (Sun, 27 Mar 2011) Log Message: ----------- php5/trunk: import httpd.conf for apache1 and apache2...cannot figure out how to make it install the apache module files without having these files in the proper locations Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-27 20:17:31 UTC (rev 13955) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-27 21:52:59 UTC (rev 13956) @@ -24,7 +24,7 @@ VENDOR_URL = http://www.php.net/ MASTER_SITES = http://us.php.net/distributions/ INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -STRIP_DIRS := $(shell $(call _get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)/*/ +#STRIP_DIRS := $(shell $(call _get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)/*/ LICENSE = LICENSE @@ -548,7 +548,6 @@ CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --with-exec-dir=$(prefix)/php5/bin CONFIGURE_ARGS += --enable-cli -CONFIGURE_ARGS += --with-apxs2=/opt/csw/apache2/sbin/apxs CONFIGURE_ARGS += --with-mm=$(prefix) CONFIGURE_ARGS += --enable-magic-quotes CONFIGURE_ARGS += --with-pcre-regex @@ -721,3 +720,14 @@ include files/scripts.mk include gar/category.mk + +# this allows apxs to install the module. stupid, but i couldn't make +# the darn thing _not_ do try to add the httpd.conf lines, even with +# patching... +pre-install-modulated: APSYSCONF=/opt/csw/apache/conf +pre-install-modulated: AP2SYSCONF=/opt/csw/apache2/etc +pre-install-modulated: + @(mkdir -p $(DESTDIR)$(AP2SYSCONF) $(DESTDIR)$(APSYSCONF); \ + cp $(AP2SYSCONF)/httpd.conf $(DESTDIR)$(AP2SYSCONF); \ + cp $(APSYSCONF)/httpd.conf $(DESTDIR)$(APSYSCONF) ) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Mon Mar 28 00:36:52 2011 From: bwalton at opencsw.org (Ben Walton) Date: Sun, 27 Mar 2011 18:36:52 -0400 Subject: [csw-devel] [PATCH] pull obsolet info into the package stats datastructure Message-ID: <1301265396-sup-5030@pinkfloyd.chass.utoronto.ca> Hi Maciej, Any objections to the following? Thanks -Ben Hi Maciej, Any objections to the following? Index: package_stats.py =================================================================== --- package_stats.py (revision 13944) +++ package_stats.py (working copy) @@ -22,7 +22,7 @@ from sqlobject import sqlbuilder -PACKAGE_STATS_VERSION = 10L +PACKAGE_STATS_VERSION = 11L BAD_CONTENT_REGEXES = ( # Slightly obfuscating these by using the default concatenation of # strings. @@ -191,6 +191,7 @@ "binaries": dir_pkg.ListBinaries(), "binaries_dump_info": self.GetBinaryDumpInfo(), "depends": dir_pkg.GetDependencies(), + "obsolete_info": dir_pkg.GetObsoletedBy(), "isalist": sharedlib_utils.GetIsalist(arch), "overrides": override_dicts, "pkgchk": self.GetPkgchkData(), -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bdwalton at users.sourceforge.net Mon Mar 28 00:38:31 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 27 Mar 2011 22:38:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[13957] csw/mgar/pkg/proj/trunk Message-ID: Revision: 13957 http://gar.svn.sourceforge.net/gar/?rev=13957&view=rev Author: bdwalton Date: 2011-03-27 22:38:31 +0000 (Sun, 27 Mar 2011) Log Message: ----------- proj/trunk: pull down some additional files to enable extra functionality (a requirement for grass) Modified Paths: -------------- csw/mgar/pkg/proj/trunk/Makefile csw/mgar/pkg/proj/trunk/checksums Modified: csw/mgar/pkg/proj/trunk/Makefile =================================================================== --- csw/mgar/pkg/proj/trunk/Makefile 2011-03-27 21:52:59 UTC (rev 13956) +++ csw/mgar/pkg/proj/trunk/Makefile 2011-03-27 22:38:31 UTC (rev 13957) @@ -12,6 +12,7 @@ MASTER_SITES = http://download.osgeo.org/$(NAME)/ DISTFILES = $(DISTNAME).tar.gz +DISTFILES += $(NAME)-datumgrid-1.5.zip CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/proj/trunk/checksums =================================================================== --- csw/mgar/pkg/proj/trunk/checksums 2011-03-27 21:52:59 UTC (rev 13956) +++ csw/mgar/pkg/proj/trunk/checksums 2011-03-27 22:38:31 UTC (rev 13957) @@ -1 +1,2 @@ 927d34623b52e0209ba2bfcca18fe8cd proj-4.7.0.tar.gz +f5bf28a2a9c6afe9a3f670f0c0adb783 proj-datumgrid-1.5.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 28 00:40:09 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 27 Mar 2011 22:40:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[13958] csw/mgar/pkg/proj/trunk/Makefile Message-ID: Revision: 13958 http://gar.svn.sourceforge.net/gar/?rev=13958&view=rev Author: bdwalton Date: 2011-03-27 22:40:08 +0000 (Sun, 27 Mar 2011) Log Message: ----------- proj/trunk: soname did not change, so do not include old version Modified Paths: -------------- csw/mgar/pkg/proj/trunk/Makefile Modified: csw/mgar/pkg/proj/trunk/Makefile =================================================================== --- csw/mgar/pkg/proj/trunk/Makefile 2011-03-27 22:38:31 UTC (rev 13957) +++ csw/mgar/pkg/proj/trunk/Makefile 2011-03-27 22:40:08 UTC (rev 13958) @@ -17,8 +17,3 @@ CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk - -post-install-modulated: - @(cp $(FILEDIR)/libproj.so.0.4.2.$(GARCH) \ - $(DESTDIR)$(libdir)/libproj.so.0.4.2 ) - @$(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 Mon Mar 28 00:55:01 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 27 Mar 2011 22:55:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[13959] csw/mgar/pkg/proj/trunk/Makefile Message-ID: Revision: 13959 http://gar.svn.sourceforge.net/gar/?rev=13959&view=rev Author: bdwalton Date: 2011-03-27 22:55:01 +0000 (Sun, 27 Mar 2011) Log Message: ----------- proj/trunk: add package splits Modified Paths: -------------- csw/mgar/pkg/proj/trunk/Makefile Modified: csw/mgar/pkg/proj/trunk/Makefile =================================================================== --- csw/mgar/pkg/proj/trunk/Makefile 2011-03-27 22:40:08 UTC (rev 13958) +++ csw/mgar/pkg/proj/trunk/Makefile 2011-03-27 22:55:01 UTC (rev 13959) @@ -16,4 +16,21 @@ CONFIGURE_ARGS = $(DIRPATHS) +PACKAGES = CSWproj CSWproj-dev CSWlibproj0 + +CATALOGNAME_CSWproj = $(NAME) +SPKG_DESC_CSWproj = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWproj += CSWlibproj0 +PKGFILES_CSWproj = $(bindir).* $(datadir)$(NAME).* $(mandir)/man1.* + +CATALOGNAME_CSWlibproj0 = libproj0 +SPKG_DESC_CSWlibproj0 += Cartographic Projections Library, libproj.so.0 +PKGFILES_CSWlibproj0 += $(call baseisadirs,$(libdir),libproj\.so\.0\.6\.6) +PKGFILES_CSWlibproj0 += $(call baseisadirs,$(libdir),libproj\.so\.0(\.\d+)*) + +CATALOGNAME_CSWproj-dev = proj_dev +SPKG_DESC_CSWproj-dev = The development files for proj +RUNTIME_DEP_PKGS_CSWproj-dev += CSWlibproj0 +PKGFILES_CSWproj-dev = $(PKGFILES_DEVEL) + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 28 01:00:05 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 27 Mar 2011 23:00:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[13960] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13960 http://gar.svn.sourceforge.net/gar/?rev=13960&view=rev Author: bdwalton Date: 2011-03-27 23:00:05 +0000 (Sun, 27 Mar 2011) Log Message: ----------- php5/trunk: kill the httpd.conf files when install step is done Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-27 22:55:01 UTC (rev 13959) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-27 23:00:05 UTC (rev 13960) @@ -731,3 +731,9 @@ cp $(AP2SYSCONF)/httpd.conf $(DESTDIR)$(AP2SYSCONF); \ cp $(APSYSCONF)/httpd.conf $(DESTDIR)$(APSYSCONF) ) @$(MAKECOOKIE) + +pre-install-modulated: APSYSCONF=/opt/csw/apache/conf/httpd.conf +pre-install-modulated: AP2SYSCONF=/opt/csw/apache2/etc/httpd.conf +post-install-modulated: + @( rm $(DESTDIR)$(APSYSCONF) $(DESTDIR)$(AP2SYSCONF) ) + @$(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 Mon Mar 28 01:03:09 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 27 Mar 2011 23:03:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[13961] csw/mgar/pkg/proj/trunk/Makefile Message-ID: Revision: 13961 http://gar.svn.sourceforge.net/gar/?rev=13961&view=rev Author: bdwalton Date: 2011-03-27 23:03:09 +0000 (Sun, 27 Mar 2011) Log Message: ----------- proj/trunk: split out a -data package for shared data files Modified Paths: -------------- csw/mgar/pkg/proj/trunk/Makefile Modified: csw/mgar/pkg/proj/trunk/Makefile =================================================================== --- csw/mgar/pkg/proj/trunk/Makefile 2011-03-27 23:00:05 UTC (rev 13960) +++ csw/mgar/pkg/proj/trunk/Makefile 2011-03-27 23:03:09 UTC (rev 13961) @@ -16,21 +16,28 @@ CONFIGURE_ARGS = $(DIRPATHS) -PACKAGES = CSWproj CSWproj-dev CSWlibproj0 +PACKAGES = CSWproj CSWproj-dev CSWlibproj0 CSWproj-data CATALOGNAME_CSWproj = $(NAME) SPKG_DESC_CSWproj = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWproj += CSWlibproj0 -PKGFILES_CSWproj = $(bindir).* $(datadir)$(NAME).* $(mandir)/man1.* +PKGFILES_CSWproj = $(bindir).* $(mandir)/man1.* CATALOGNAME_CSWlibproj0 = libproj0 SPKG_DESC_CSWlibproj0 += Cartographic Projections Library, libproj.so.0 PKGFILES_CSWlibproj0 += $(call baseisadirs,$(libdir),libproj\.so\.0\.6\.6) PKGFILES_CSWlibproj0 += $(call baseisadirs,$(libdir),libproj\.so\.0(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibproj0 = CSWproj-data +CHECKPKG_OVERRIDES_CSWlibproj0 += surplus-dependency|CSWproj-data CATALOGNAME_CSWproj-dev = proj_dev SPKG_DESC_CSWproj-dev = The development files for proj RUNTIME_DEP_PKGS_CSWproj-dev += CSWlibproj0 PKGFILES_CSWproj-dev = $(PKGFILES_DEVEL) +CATALOGNAME_CSWproj-data = proj_data +ARCHALL_CSWproj-data = 1 +SPKG_DESC_CSWproj-data = Data files used by $(NAME) +PKGFILES_CSWproj-data = /opt/csw/share/$(NAME)/.* + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Mon Mar 28 01:13:04 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Mon, 28 Mar 2011 00:13:04 +0100 Subject: [csw-devel] [PATCH] pull obsolet info into the package stats datastructure In-Reply-To: <1301265396-sup-5030@pinkfloyd.chass.utoronto.ca> References: <1301265396-sup-5030@pinkfloyd.chass.utoronto.ca> Message-ID: 2011/3/27 Ben Walton : > -PACKAGE_STATS_VERSION = 10L > +PACKAGE_STATS_VERSION = 11L > ?BAD_CONTENT_REGEXES = ( > ? ? # Slightly obfuscating these by using the default concatenation > ? ? of > ? ? # strings. > @@ -191,6 +191,7 @@ > ? ? ? ? "binaries": dir_pkg.ListBinaries(), > ? ? ? ? "binaries_dump_info": self.GetBinaryDumpInfo(), > ? ? ? ? "depends": dir_pkg.GetDependencies(), > + ? ? ? ?"obsolete_info": dir_pkg.GetObsoletedBy(), > ? ? ? ? "isalist": sharedlib_utils.GetIsalist(arch), > ? ? ? ? "overrides": override_dicts, > ? ? ? ? "pkgchk": self.GetPkgchkData(), The "obsolete_info" bit looks like if the information in question were obsolete. How about "obsoleteness_info"? From bwalton at opencsw.org Mon Mar 28 01:16:39 2011 From: bwalton at opencsw.org (Ben Walton) Date: Sun, 27 Mar 2011 19:16:39 -0400 Subject: [csw-devel] [PATCH] pull obsolet info into the package stats datastructure In-Reply-To: References: <1301265396-sup-5030@pinkfloyd.chass.utoronto.ca> Message-ID: <1301267780-sup-3743@pinkfloyd.chass.utoronto.ca> Excerpts from Maciej Blizi?ski's message of Sun Mar 27 19:13:04 -0400 2011: > The "obsolete_info" bit looks like if the information in question were > obsolete. How about "obsoleteness_info"? Sounds good. Will push. Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bdwalton at users.sourceforge.net Mon Mar 28 01:21:08 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 27 Mar 2011 23:21:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[13962] csw/mgar/gar/v2/lib/python/package_stats.py Message-ID: Revision: 13962 http://gar.svn.sourceforge.net/gar/?rev=13962&view=rev Author: bdwalton Date: 2011-03-27 23:21:07 +0000 (Sun, 27 Mar 2011) Log Message: ----------- checkpkg/package_stats.py: use the newly available GetObsoletedBy() method from DirectoryFormatPackage to extend the information available in the pkg_stats dict with a new dict named obsoletness_info Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_stats.py Modified: csw/mgar/gar/v2/lib/python/package_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats.py 2011-03-27 23:03:09 UTC (rev 13961) +++ csw/mgar/gar/v2/lib/python/package_stats.py 2011-03-27 23:21:07 UTC (rev 13962) @@ -22,7 +22,7 @@ from sqlobject import sqlbuilder -PACKAGE_STATS_VERSION = 10L +PACKAGE_STATS_VERSION = 11L BAD_CONTENT_REGEXES = ( # Slightly obfuscating these by using the default concatenation of # strings. @@ -191,6 +191,7 @@ "binaries": dir_pkg.ListBinaries(), "binaries_dump_info": self.GetBinaryDumpInfo(), "depends": dir_pkg.GetDependencies(), + "obsoleteness_info": dir_pkg.GetObsoletedBy(), "isalist": sharedlib_utils.GetIsalist(arch), "overrides": override_dicts, "pkgchk": self.GetPkgchkData(), 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 Mar 28 01:40:40 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 27 Mar 2011 23:40:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[13963] csw/mgar/pkg/wgetpaste/trunk Message-ID: Revision: 13963 http://gar.svn.sourceforge.net/gar/?rev=13963&view=rev Author: wahwah Date: 2011-03-27 23:40:40 +0000 (Sun, 27 Mar 2011) Log Message: ----------- pkg/wgetpaste/trunk: Update to 2.18, fixing #4316 Modified Paths: -------------- csw/mgar/pkg/wgetpaste/trunk/Makefile csw/mgar/pkg/wgetpaste/trunk/checksums csw/mgar/pkg/wgetpaste/trunk/files/0001-Using-gwhoami-instead-of-whoami.patch csw/mgar/pkg/wgetpaste/trunk/files/0002-CSW-bash.patch Added Paths: ----------- csw/mgar/pkg/wgetpaste/trunk/files/0003-using-gmktemp.patch csw/mgar/pkg/wgetpaste/trunk/files/0004-OpenCSW-specific-config-directory.patch Property Changed: ---------------- csw/mgar/pkg/wgetpaste/trunk/Makefile Modified: csw/mgar/pkg/wgetpaste/trunk/Makefile =================================================================== --- csw/mgar/pkg/wgetpaste/trunk/Makefile 2011-03-27 23:21:07 UTC (rev 13962) +++ csw/mgar/pkg/wgetpaste/trunk/Makefile 2011-03-27 23:40:40 UTC (rev 13963) @@ -1,5 +1,7 @@ +# $Id$ + NAME = wgetpaste -VERSION = 2.16 +VERSION = 2.18 CATEGORIES = utils DESCRIPTION = A command-line utility for text pasting websites. @@ -13,14 +15,14 @@ DISTFILES += wgetpaste.conf DISTFILES += COPYING -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 - -RUNTIME_DEP_PKGS = CSWbash +RUNTIME_DEP_PKGS += CSWbash RUNTIME_DEP_PKGS += CSWcoreutils RUNTIME_DEP_PKGS += CSWwget -PATCHFILES = 0001-Using-gwhoami-instead-of-whoami.patch +PATCHFILES += 0001-Using-gwhoami-instead-of-whoami.patch PATCHFILES += 0002-CSW-bash.patch +PATCHFILES += 0003-using-gmktemp.patch +PATCHFILES += 0004-OpenCSW-specific-config-directory.patch ARCHALL = 1 @@ -37,9 +39,6 @@ CHECKPKG_OVERRIDES_CSWwgetpaste += surplus-dependency|CSWcoreutils CHECKPKG_OVERRIDES_CSWwgetpaste += surplus-dependency|CSWwget -# CSWcoreutils haven't been released yet. -CHECKPKG_OVERRIDES_CSWwgetpaste += unidentified-dependency|CSWcoreutils - include gar/category.mk install-wgetpaste: Property changes on: csw/mgar/pkg/wgetpaste/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/wgetpaste/trunk/checksums =================================================================== --- csw/mgar/pkg/wgetpaste/trunk/checksums 2011-03-27 23:21:07 UTC (rev 13962) +++ csw/mgar/pkg/wgetpaste/trunk/checksums 2011-03-27 23:40:40 UTC (rev 13963) @@ -1,5 +1 @@ -ca8e4122a420d95c0cd96d731b5b9777 0001-Using-gwhoami-instead-of-whoami.patch -4ce4101e5be2ea7af5b5ea18be7f8693 0002-CSW-bash.patch -117ac37c24d02f3576903d24bca24421 COPYING -f270d87c5ea9939b2818d38f43b51936 wgetpaste-2.16.tar.bz2 -67425820c0281729a7f63e3e3339c49f wgetpaste.conf +0085d679445af9e6f695d036abee106d wgetpaste-2.18.tar.bz2 Modified: csw/mgar/pkg/wgetpaste/trunk/files/0001-Using-gwhoami-instead-of-whoami.patch =================================================================== --- csw/mgar/pkg/wgetpaste/trunk/files/0001-Using-gwhoami-instead-of-whoami.patch 2011-03-27 23:21:07 UTC (rev 13962) +++ csw/mgar/pkg/wgetpaste/trunk/files/0001-Using-gwhoami-instead-of-whoami.patch 2011-03-27 23:40:40 UTC (rev 13963) @@ -1,37 +1,5 @@ --- wgetpaste-2.16/wgetpaste.orig 2010-01-05 14:42:30.127801164 +0100 +++ wgetpaste-2.16/wgetpaste 2010-01-05 14:43:42.007282206 +0100 -@@ -114,7 +114,7 @@ - noxclip() { - cat <&2 - Could not find xclip on your system. In order to use --x$1 you must either --emerge x11-misc/xclip or define x_$1() globally in /etc/wgetpaste.conf or -+emerge x11-misc/xclip or define x_$1() globally in /etc/opt/csw/wgetpaste.conf/g or - per user in ~/.wgetpaste.conf to use another program (such as e.g. xcut or - klipper) to $2 your clipboard. - -@@ -303,11 +303,11 @@ - --debug be *very* verbose (implies -v) - - -h, --help show this help -- -g, --ignore-configs ignore /etc/wgetpaste.conf, ~/.wgetpaste.conf etc. -+ -g, --ignore-configs ignore /etc/opt/csw/wgetpaste.conf/g, ~/.wgetpaste.conf etc. - --version show version information - - Defaults (DEFAULT_{NICK,SERVICE,LANGUAGE,EXPIRATION}[_\${SERVICE}]) can be overridden --globally in /etc/wgetpaste.conf or /etc/wgetpaste.d/*.conf or per user in any of -+globally in /etc/opt/csw/wgetpaste.conf/g or /etc/wgetpaste.d/*.conf or per user in any of - ~/.wgetpaste.conf or ~/.wgetpaste.d/*.conf. - EOF - } -@@ -586,7 +586,7 @@ - if [[ ! $IGNORECONFIGS ]]; then - # compatibility code - local f deprecated= -- for f in {/etc/,~/.}wgetpaste{.d/*.bash,}; do -+ for f in {/etc/,/etc/opt/csw/,~/.}wgetpaste{.d/*.bash,}; do - if [[ -f $f ]]; then - if [[ -z $deprecated ]]; then - echo "The config files for wgetpaste have changed to *.conf.$N" >&2 @@ -607,7 +607,7 @@ } load_configs Modified: csw/mgar/pkg/wgetpaste/trunk/files/0002-CSW-bash.patch =================================================================== --- csw/mgar/pkg/wgetpaste/trunk/files/0002-CSW-bash.patch 2011-03-27 23:21:07 UTC (rev 13962) +++ csw/mgar/pkg/wgetpaste/trunk/files/0002-CSW-bash.patch 2011-03-27 23:40:40 UTC (rev 13963) @@ -8,7 +8,7 @@ 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/wgetpaste b/wgetpaste -index 9b40432..f536fbc 100755 +index bfaad61..9fc913e 100755 --- a/wgetpaste +++ b/wgetpaste @@ -1,4 +1,4 @@ @@ -16,7 +16,4 @@ +#!/opt/csw/bin/bash # A Script that automates pasting to a number of pastebin services # relying only on bash, sed, coreutils (mktemp/sort/tr/wc/whoami/tee) and wget - # Copyright (c) 2007 Bo ?rsted Andresen --- -1.6.3.2 - + # Copyright (c) 2007-2009 Bo ?rsted Andresen Added: csw/mgar/pkg/wgetpaste/trunk/files/0003-using-gmktemp.patch =================================================================== --- csw/mgar/pkg/wgetpaste/trunk/files/0003-using-gmktemp.patch (rev 0) +++ csw/mgar/pkg/wgetpaste/trunk/files/0003-using-gmktemp.patch 2011-03-27 23:40:40 UTC (rev 13963) @@ -0,0 +1,35 @@ +From 2cec712ea2e09737008bef1ea49adeafd3f874bf Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Mon, 28 Mar 2011 01:26:52 +0200 +Subject: [PATCH] using gmktemp + +In attempt to fix https://www.opencsw.org/mantis/view.php?id=4316 +--- + wgetpaste | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/wgetpaste b/wgetpaste +index 6a17c8e..06a755a 100755 +--- a/wgetpaste ++++ b/wgetpaste +@@ -679,7 +679,7 @@ fi + + # create tmpfile for use with tee + if [[ $TEE ]]; then +- TMPF=$(mktemp /tmp/wgetpaste.XXXXXX) ++ TMPF=$(/opt/csw/bin/gmktemp /tmp/wgetpaste.XXXXXX) + [[ -f $TMPF ]] || die "Could not create a temporary file for use with tee." + fi + +@@ -775,7 +775,7 @@ if [[ $SERVICE == tinyurl ]]; then + else + # create temp file (wget is much more reliable reading + # large input via --post-file rather than --post-data) +- [[ -f $TMPF ]] || TMPF=$(mktemp /tmp/wgetpaste.XXXXXX) ++ [[ -f $TMPF ]] || TMPF=$(/opt/csw/bin/gmktemp /tmp/wgetpaste.XXXXXX) + if [[ -f $TMPF ]]; then + postdata > "$TMPF" || die "Failed to write to temporary file: \"$TMPF\"." + WGETARGS="--post-file=$TMPF" +-- +1.7.4.1 + Added: csw/mgar/pkg/wgetpaste/trunk/files/0004-OpenCSW-specific-config-directory.patch =================================================================== --- csw/mgar/pkg/wgetpaste/trunk/files/0004-OpenCSW-specific-config-directory.patch (rev 0) +++ csw/mgar/pkg/wgetpaste/trunk/files/0004-OpenCSW-specific-config-directory.patch 2011-03-27 23:40:40 UTC (rev 13963) @@ -0,0 +1,57 @@ +From d3484ffa165d4ba530268c4208b6cab51f35c993 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Mon, 28 Mar 2011 01:37:07 +0200 +Subject: [PATCH] OpenCSW-specific config directory + +--- + wgetpaste | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/wgetpaste b/wgetpaste +index 3eb47fc..d2a3629 100755 +--- a/wgetpaste ++++ b/wgetpaste +@@ -114,7 +114,7 @@ notreadable() { + noxclip() { + cat <&2 + Could not find xclip on your system. In order to use --x$1 you must either +-emerge x11-misc/xclip or define x_$1() globally in /etc/wgetpaste.conf or ++emerge x11-misc/xclip or define x_$1() globally in /etc/opt/csw/wgetpaste.conf or + per user in ~/.wgetpaste.conf to use another program (such as e.g. xcut or + klipper) to $2 your clipboard. + +@@ -303,11 +303,11 @@ Options: + --debug be *very* verbose (implies -v) + + -h, --help show this help +- -g, --ignore-configs ignore /etc/wgetpaste.conf, ~/.wgetpaste.conf etc. ++ -g, --ignore-configs ignore /etc/opt/csw/wgetpaste.conf, ~/.wgetpaste.conf etc. + --version show version information + + Defaults (DEFAULT_{NICK,LANGUAGE,EXPIRATION}[_\${SERVICE}] and DEFAULT_SERVICE) +-can be overridden globally in /etc/wgetpaste.conf or /etc/wgetpaste.d/*.conf or ++can be overridden globally in /etc/opt/csw/wgetpaste.conf or /etc/opt/csw/wgetpaste.d/*.conf or + per user in any of ~/.wgetpaste.conf or ~/.wgetpaste.d/*.conf. + EOF + } +@@ -586,7 +586,7 @@ load_configs() { + if [[ ! $IGNORECONFIGS ]]; then + # compatibility code + local f deprecated= +- for f in {/etc/,~/.}wgetpaste{.d/*.bash,}; do ++ for f in {/etc/opt/csw/,~/.}wgetpaste{.d/*.bash,}; do + if [[ -f $f ]]; then + if [[ -z $deprecated ]]; then + echo "The config files for wgetpaste have changed to *.conf.$N" >&2 +@@ -598,7 +598,7 @@ load_configs() { + done + [[ -n $deprecated ]] && echo >&2 + # new locations override old ones in case they collide +- for f in {/etc/,~/.}wgetpaste{.d/*,}.conf; do ++ for f in {/etc/opt/csw/,~/.}wgetpaste{.d/*,}.conf; do + if [[ -f $f ]]; then + source "$f" || die "Failed to source $f" + fi +-- +1.7.4.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 28 01:55:18 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 27 Mar 2011 23:55:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[13964] csw/mgar/pkg/proj/trunk/Makefile Message-ID: Revision: 13964 http://gar.svn.sourceforge.net/gar/?rev=13964&view=rev Author: bdwalton Date: 2011-03-27 23:55:17 +0000 (Sun, 27 Mar 2011) Log Message: ----------- proj/trunk: add custom extract target for the datumgrid add-on. this should enable extra functionality if detected by configure Modified Paths: -------------- csw/mgar/pkg/proj/trunk/Makefile Modified: csw/mgar/pkg/proj/trunk/Makefile =================================================================== --- csw/mgar/pkg/proj/trunk/Makefile 2011-03-27 23:40:40 UTC (rev 13963) +++ csw/mgar/pkg/proj/trunk/Makefile 2011-03-27 23:55:17 UTC (rev 13964) @@ -41,3 +41,7 @@ PKGFILES_CSWproj-data = /opt/csw/share/$(NAME)/.* include gar/category.mk + +zip-extract-proj-datumgrid-1.5.zip: + @(unzip -d $(WORKSRC)/nad $(DOWNLOADDIR)/proj-datumgrid-1.5.zip) + @$(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 Mon Mar 28 02:44:26 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Mar 2011 00:44:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[13965] csw/mgar/pkg/hachoir-parser/trunk Message-ID: Revision: 13965 http://gar.svn.sourceforge.net/gar/?rev=13965&view=rev Author: wahwah Date: 2011-03-28 00:44:25 +0000 (Mon, 28 Mar 2011) Log Message: ----------- pkg/hachoir-parser/trunk: version bump to 1.3.4 Modified Paths: -------------- csw/mgar/pkg/hachoir-parser/trunk/Makefile csw/mgar/pkg/hachoir-parser/trunk/checksums Modified: csw/mgar/pkg/hachoir-parser/trunk/Makefile =================================================================== --- csw/mgar/pkg/hachoir-parser/trunk/Makefile 2011-03-27 23:55:17 UTC (rev 13964) +++ csw/mgar/pkg/hachoir-parser/trunk/Makefile 2011-03-28 00:44:25 UTC (rev 13965) @@ -3,7 +3,7 @@ # $Id$ NAME = hachoir-parser -VERSION = 1.3.3 +VERSION = 1.3.4 CATEGORIES = python DESCRIPTION = Allows to view and edit a binary stream field by field (core) define BLURB @@ -15,7 +15,6 @@ SPKG_SOURCEURL = http://bitbucket.org/haypo/hachoir/wiki/Home MASTER_SITES = http://cheeseshop.python.org/packages/source/h/$(NAME)/ DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz CATALOGNAME = py_hachoir_parser PACKAGES = CSWpy-hachoir-parser INCOMPATIBLE_PKGS = CSWhachoir-parser Modified: csw/mgar/pkg/hachoir-parser/trunk/checksums =================================================================== --- csw/mgar/pkg/hachoir-parser/trunk/checksums 2011-03-27 23:55:17 UTC (rev 13964) +++ csw/mgar/pkg/hachoir-parser/trunk/checksums 2011-03-28 00:44:25 UTC (rev 13965) @@ -1 +1 @@ -378df2d18ceb9d1f8a83345fdd78deab hachoir-parser-1.3.3.tar.gz +e578b779c4b30d94ca4e775747877755 hachoir-parser-1.3.4.tar.gz 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 Mar 28 03:06:25 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Mar 2011 01:06:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[13966] csw/mgar/gar/v2/lib/web/example-lighttpd.conf Message-ID: Revision: 13966 http://gar.svn.sourceforge.net/gar/?rev=13966&view=rev Author: wahwah Date: 2011-03-28 01:06:25 +0000 (Mon, 28 Mar 2011) Log Message: ----------- pkgdb-web: Example lighttpd configuration Close, but not working as expected yet. Added Paths: ----------- csw/mgar/gar/v2/lib/web/example-lighttpd.conf Added: csw/mgar/gar/v2/lib/web/example-lighttpd.conf =================================================================== --- csw/mgar/gar/v2/lib/web/example-lighttpd.conf (rev 0) +++ csw/mgar/gar/v2/lib/web/example-lighttpd.conf 2011-03-28 01:06:25 UTC (rev 13966) @@ -0,0 +1,39 @@ +# This is a section showing an example lighttpd configuration. There's +# a problem with the "^/pkgdb/(.*)$" => "/pkgdb_web.py/$1" -- the $1 +# parameter seems to match too much. +# +# http://stackoverflow.com/questions/4533109/lighttpd-mod-rewrite-and-web-py-unexpected-behavior + +server.document-root = ".../gar/v2/lib/web/static" + +url.rewrite-once = ( + "^/favicon.ico$" => "/favicon.ico", + "^/pkgdb-static/(.*)$" => "/$1", + "^/pkgdb/(.*)$" => "/pkgdb_web.py/$1", + "^/releases/(.*)$" => "/releases_web.py/$1" +) + +## PythonPath "sys.path + ['.../gar/v2/lib/web', '.../gar/v2']" +fastcgi.server = ( +"/pkgdb_web.py" => +(( + "socket" => "/tmp/fastcgi-pkgdb.socket", + "bin-path" => ".../gar/v2/lib/web/pkgdb_web.py", + "max-procs" => 1, + "bin-environment" => ( + "REAL_SCRIPT_NAME" => "" + ), + "check-local" => "disable" +)), +"/releases_web.py" => +(( + "socket" => "/tmp/fastcgi-releases.socket", + "bin-path" => ".../gar/v2/lib/web/releases_web.py", + "max-procs" => 1, + "bin-environment" => ( + "REAL_SCRIPT_NAME" => "" + ), + "check-local" => "disable" +)), +) + 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 Mar 28 03:08:16 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Mar 2011 01:08:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[13967] csw/mgar/gar/v2/lib/python Message-ID: Revision: 13967 http://gar.svn.sourceforge.net/gar/?rev=13967&view=rev Author: wahwah Date: 2011-03-28 01:08:16 +0000 (Mon, 28 Mar 2011) Log Message: ----------- csw-upload-pkg: Add --rest-url This way, it's possible to work outside the OpenCSW buildfarm, using different URLs for REST access. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py csw/mgar/gar/v2/lib/python/rest.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-03-28 01:06:25 UTC (rev 13966) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-03-28 01:08:16 UTC (rev 13967) @@ -20,7 +20,8 @@ import struct_util -BASE_URL = "http://buildfarm.opencsw.org/releases/" +BASE_URL = "http://buildfarm.opencsw.org" +RELEASES_APP = "/releases" DEFAULT_CATREL = "unstable" USAGE = """%prog [ options ] [ [ ... ] ] @@ -61,12 +62,14 @@ class Srv4Uploader(object): - def __init__(self, filenames, os_release=None, debug=False): + def __init__(self, filenames, rest_url, os_release=None, debug=False): + super(Srv4Uploader, self).__init__() self.filenames = filenames self.md5_by_filename = {} self.debug = debug - self._rest_client = rest.RestClient() self.os_release = os_release + self.rest_url = rest_url + self._rest_client = rest.RestClient(self.rest_url) def Upload(self): for filename in self.filenames: @@ -106,8 +109,8 @@ parsed_basename = opencsw.ParsePackageFileName(basename) # TODO: Move this bit to a separate class (RestClient) url = ( - "%scatalogs/unstable/%s/%s/%s/" - % (BASE_URL, arch, osrel, md5_sum)) + "%s%s/catalogs/unstable/%s/%s/%s/" + % (self.rest_url, RELEASES_APP, arch, osrel, md5_sum)) logging.debug("DELETE @ URL: %s %s", type(url), url) c = pycurl.Curl() d = StringIO() @@ -257,8 +260,8 @@ parsed_basename = opencsw.ParsePackageFileName(basename) logging.debug("parsed_basename: %s", parsed_basename) url = ( - "%scatalogs/unstable/%s/%s/%s/" - % (BASE_URL, arch, osrel, md5_sum)) + "%s%s/catalogs/unstable/%s/%s/%s/" + % (self.rest_url, RELEASES_APP, arch, osrel, md5_sum)) logging.debug("URL: %s %s", type(url), url) c = pycurl.Curl() d = StringIO() @@ -299,7 +302,7 @@ def _GetSrv4FileMetadata(self, md5_sum): logging.debug("_GetSrv4FileMetadata(%s)", repr(md5_sum)) - url = BASE_URL + "srv4/" + md5_sum + "/" + url = self.rest_url + RELEASES_APP + "/srv4/" + md5_sum + "/" c = pycurl.Curl() d = StringIO() h = StringIO() @@ -330,7 +333,7 @@ c = pycurl.Curl() d = StringIO() h = StringIO() - url = BASE_URL + "srv4/" + url = self.rest_url + RELEASES_APP + "/srv4/" c.setopt(pycurl.URL, url) c.setopt(pycurl.POST, 1) post_data = [ @@ -370,6 +373,10 @@ parser.add_option("--os-release", dest="os_release", help="If specified, only uploads to the specified OS release.") + parser.add_option("--rest-url", + dest="rest_url", + default=BASE_URL, + help="Base URL for REST, e.g. %s" % BASE_URL) options, args = parser.parse_args() if options.debug: logging.basicConfig(level=logging.DEBUG) @@ -383,6 +390,7 @@ if os_release: os_release = struct_util.OsReleaseToLong(os_release) uploader = Srv4Uploader(args, + options.rest_url, os_release=os_release, debug=options.debug) if options.remove: Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py 2011-03-28 01:06:25 UTC (rev 13966) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py 2011-03-28 01:08:16 UTC (rev 13967) @@ -58,7 +58,7 @@ def test_MatchSrv4ToCatalogsSame(self): rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient().AndReturn(rest_client_mock) + rest.RestClient(None).AndReturn(rest_client_mock) rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(GDB_STRUCT_9) rest_client_mock.Srv4ByCatalogAndCatalogname( @@ -66,7 +66,7 @@ rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.11', 'gdb').AndReturn(GDB_STRUCT_9) self.mox.ReplayAll() - su = csw_upload_pkg.Srv4Uploader(None) + su = csw_upload_pkg.Srv4Uploader(None, None) result = su._MatchSrv4ToCatalogs( "gdb-7.2,REV=2011.01.21-SunOS5.9-sparc-CSW.pkg.gz", "unstable", "sparc", "SunOS5.9", @@ -81,7 +81,7 @@ def test_MatchSrv4ToCatalogsDifferent(self): rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient().AndReturn(rest_client_mock) + rest.RestClient(None).AndReturn(rest_client_mock) rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(GDB_STRUCT_9) rest_client_mock.Srv4ByCatalogAndCatalogname( @@ -89,7 +89,7 @@ rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.11', 'gdb').AndReturn(GDB_STRUCT_10) self.mox.ReplayAll() - su = csw_upload_pkg.Srv4Uploader(None) + su = csw_upload_pkg.Srv4Uploader(None, None) result = su._MatchSrv4ToCatalogs( "gdb-7.2,REV=2011.01.21-SunOS5.9-sparc-CSW.pkg.gz", "unstable", "sparc", "SunOS5.9", @@ -104,13 +104,13 @@ # uploading a 5.10 package. rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient().AndReturn(rest_client_mock) + rest.RestClient(None).AndReturn(rest_client_mock) rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.10', 'gdb').AndReturn(GDB_STRUCT_9) rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.11', 'gdb').AndReturn(GDB_STRUCT_9) self.mox.ReplayAll() - su = csw_upload_pkg.Srv4Uploader(None) + su = csw_upload_pkg.Srv4Uploader(None, None) result = su._MatchSrv4ToCatalogs( "gdb-7.2,REV=2011.01.21-SunOS5.10-sparc-CSW.pkg.gz", "unstable", "sparc", "SunOS5.10", @@ -124,7 +124,7 @@ def test_MatchSrv4ToCatalogsSameSpecificOsrel(self): rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient().AndReturn(rest_client_mock) + rest.RestClient(None).AndReturn(rest_client_mock) rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(GDB_STRUCT_9) rest_client_mock.Srv4ByCatalogAndCatalogname( @@ -132,7 +132,7 @@ rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.11', 'gdb').AndReturn(GDB_STRUCT_9) self.mox.ReplayAll() - su = csw_upload_pkg.Srv4Uploader(None, os_release="SunOS5.10") + su = csw_upload_pkg.Srv4Uploader(None, None, os_release="SunOS5.10") result = su._MatchSrv4ToCatalogs( "gdb-7.2,REV=2011.01.21-SunOS5.9-sparc-CSW.pkg.gz", "unstable", "sparc", "SunOS5.9", @@ -145,7 +145,7 @@ def test_MatchSrv4ToCatalogsAbsentFromAll(self): rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient().AndReturn(rest_client_mock) + rest.RestClient(None).AndReturn(rest_client_mock) rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(None) rest_client_mock.Srv4ByCatalogAndCatalogname( @@ -153,7 +153,7 @@ rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.11', 'gdb').AndReturn(None) self.mox.ReplayAll() - su = csw_upload_pkg.Srv4Uploader(None) + su = csw_upload_pkg.Srv4Uploader(None, None) result = su._MatchSrv4ToCatalogs( "gdb-7.2,REV=2011.01.21-SunOS5.9-sparc-CSW.pkg.gz", "unstable", "sparc", "SunOS5.9", @@ -168,7 +168,7 @@ def test_MatchSrv4ToCatalogsSameSpecificOsrelAlreadyPresent(self): rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient().AndReturn(rest_client_mock) + rest.RestClient(None).AndReturn(rest_client_mock) rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(GDB_STRUCT_9) rest_client_mock.Srv4ByCatalogAndCatalogname( @@ -176,7 +176,7 @@ rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.11', 'gdb').AndReturn(GDB_STRUCT_10) self.mox.ReplayAll() - su = csw_upload_pkg.Srv4Uploader(None, os_release="SunOS5.10") + su = csw_upload_pkg.Srv4Uploader(None, None, os_release="SunOS5.10") result = su._MatchSrv4ToCatalogs( "gdb-7.2,REV=2011.01.21-SunOS5.9-sparc-CSW.pkg.gz", "unstable", "sparc", "SunOS5.9", @@ -189,7 +189,7 @@ def test_MatchSrv4ToCatalogsNotPresent(self): rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient().AndReturn(rest_client_mock) + rest.RestClient(None).AndReturn(rest_client_mock) rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(GDB_STRUCT_9) rest_client_mock.Srv4ByCatalogAndCatalogname( @@ -197,7 +197,7 @@ rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.11', 'gdb').AndReturn(None) self.mox.ReplayAll() - su = csw_upload_pkg.Srv4Uploader(None, os_release="SunOS5.10") + su = csw_upload_pkg.Srv4Uploader(None, None, os_release="SunOS5.10") result = su._MatchSrv4ToCatalogs( "gdb-7.2,REV=2011.01.21-SunOS5.9-sparc-CSW.pkg.gz", "unstable", "sparc", "SunOS5.9", @@ -210,7 +210,7 @@ def test_MatchSrv4ToCatalogsFirstNotPresent(self): rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient().AndReturn(rest_client_mock) + rest.RestClient(None).AndReturn(rest_client_mock) rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(None) rest_client_mock.Srv4ByCatalogAndCatalogname( @@ -218,7 +218,7 @@ rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.11', 'gdb').AndReturn(GDB_STRUCT_10) self.mox.ReplayAll() - su = csw_upload_pkg.Srv4Uploader(None) + su = csw_upload_pkg.Srv4Uploader(None, None) result = su._MatchSrv4ToCatalogs( "gdb-7.2,REV=2011.01.21-SunOS5.9-sparc-CSW.pkg.gz", "unstable", "sparc", "SunOS5.9", @@ -275,7 +275,7 @@ } rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient().AndReturn(rest_client_mock) + rest.RestClient(None).AndReturn(rest_client_mock) for i, os_n in enumerate(in_catalog, 3 - len(in_catalog)): pkg_struct = pkg_struct_map[os_n] rest_client_mock.Srv4ByCatalogAndCatalogname( @@ -284,7 +284,7 @@ u'SunOS5.%s' % (i + 9), 'gdb').AndReturn(pkg_struct) self.mox.ReplayAll() os_release_to_specify = "SunOS5.%s" % osrel_spec if osrel_spec else None - su = csw_upload_pkg.Srv4Uploader(None, os_release=os_release_to_specify) + su = csw_upload_pkg.Srv4Uploader(None, None, os_release=os_release_to_specify) result = su._MatchSrv4ToCatalogs( self.BASENAME, "unstable", "sparc", "SunOS5.%s" % pkg_osrel, Modified: csw/mgar/gar/v2/lib/python/rest.py =================================================================== --- csw/mgar/gar/v2/lib/python/rest.py 2011-03-28 01:06:25 UTC (rev 13966) +++ csw/mgar/gar/v2/lib/python/rest.py 2011-03-28 01:08:16 UTC (rev 13967) @@ -4,7 +4,7 @@ import urllib2 import json -BASE_URL = "http://buildfarm.opencsw.org/pkgdb/rest" +DEFAULT_URL = "http://buildfarm.opencsw.org" class Error(Exception): @@ -17,8 +17,13 @@ class RestClient(object): + PKGDB_APP = "/pkgdb/rest" + + def __init__(self, rest_url=DEFAULT_URL): + self.rest_url = rest_url + def GetPkgByMd5(self, md5_sum): - url = BASE_URL + "/srv4/%s/" % md5_sum + url = self.rest_url + self.PKGDB_APP + "/srv4/%s/" % md5_sum logging.debug("GetPkgByMd5(): GET %s", url) try: data = urllib2.urlopen(url).read() @@ -38,7 +43,7 @@ def GetCatalog(self, catrel, arch, osrel): if not catrel: raise ArgumentError("Missing catalog release.") - url = BASE_URL + "/catalogs/%s/%s/%s/" % (catrel, arch, osrel) + url = self.rest_url + self.PKGDB_APP + "/catalogs/%s/%s/%s/" % (catrel, arch, osrel) logging.debug("GetCatalog(): GET %s", url) try: data = urllib2.urlopen(url).read() @@ -49,7 +54,7 @@ def Srv4ByCatalogAndCatalogname(self, catrel, arch, osrel, catalogname): """Returns a srv4 data structure or None if not found.""" - url = BASE_URL + ( + url = self.rest_url + self.PKGDB_APP + ( "/catalogs/%s/%s/%s/catalognames/%s/" % (catrel, arch, osrel, catalogname)) logging.debug("Srv4ByCatalogAndCatalogname(): GET %s", url) 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 Mar 28 03:08:49 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Mar 2011 01:08:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[13968] csw/mgar/gar/v2/lib/python/README Message-ID: Revision: 13968 http://gar.svn.sourceforge.net/gar/?rev=13968&view=rev Author: wahwah Date: 2011-03-28 01:08:49 +0000 (Mon, 28 Mar 2011) Log Message: ----------- checkpkg: Solaris package dependencies for dev It's not complete, but it's a start. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/README Modified: csw/mgar/gar/v2/lib/python/README =================================================================== --- csw/mgar/gar/v2/lib/python/README 2011-03-28 01:08:16 UTC (rev 13967) +++ csw/mgar/gar/v2/lib/python/README 2011-03-28 01:08:49 UTC (rev 13968) @@ -75,6 +75,24 @@ python-sqlobject \ python-yaml +Solaris package dependencies. + +CSWpy-unittest2 +CSWpy-curl +CSWpy-libmagic +CSWpy-sqlobject +CSWpy-cheetah +CSWpy-mox +CSWpy-mysql +CSWpy-progressbar + +For pkgdb-web + +CSWapache2 +CSWap2modpython +modpython_gateway (together with pkgdb_web.py in the same dir) + + ===Checkpkg database=== Additional database indexes: 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 Mar 28 03:09:24 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Mar 2011 01:09:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[13969] csw/mgar/gar/v2/lib/python Message-ID: Revision: 13969 http://gar.svn.sourceforge.net/gar/?rev=13969&view=rev Author: wahwah Date: 2011-03-28 01:09:24 +0000 (Mon, 28 Mar 2011) Log Message: ----------- checkpkg: Fix a bug doubled errors when re-running It's funny that I once spent about two hours looking for that bug, and gave up. This time I simply saw it, there, in the code. The problem was that the Run() method of the CheckManager2 class was unconditionally calling a function with was registering checking functions. On the second run of checkpkg, all checks were registered twice, on the third run -- three times, and so on. The fix is to keep the state, and only register checks once. This patch re-enables the unit test and fixes the bug. Signed-off-by: Maciej Blizinski Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg_lib.py csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2011-03-28 01:08:49 UTC (rev 13968) +++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2011-03-28 01:09:24 UTC (rev 13969) @@ -492,6 +492,11 @@ Its purpose is to reduce the amount of boilerplate code and allow for easier unit test writing. """ + + def __init__(self, *args, **kwargs): + super(CheckpkgManager2, self).__init__(*args, **kwargs) + self.checks_registered = False + def _RegisterIndividualCheck(self, function): self.individual_checks.append(function) @@ -501,6 +506,9 @@ def _AutoregisterChecks(self): """Autodetects all defined checks.""" logging.debug("CheckpkgManager2._AutoregisterChecks()") + if self.checks_registered: + logging.debug("Checks already registered.") + return checkpkg_module = package_checks members = dir(checkpkg_module) for member_name in members: @@ -513,6 +521,7 @@ elif member_name.startswith("SetCheck"): logging.debug("Registering set check %s", repr(member_name)) self._RegisterSetCheck(member) + self.checks_registered = True def _ReportDependencies(self, checkpkg_interface, needed_files, needed_pkgs, messenger, declared_deps_by_pkgname): Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py 2011-03-28 01:08:49 UTC (rev 13968) +++ csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py 2011-03-28 01:09:24 UTC (rev 13969) @@ -351,7 +351,7 @@ # Verifying that there are some reported error tags. self.assertTrue(list(models.CheckpkgErrorTag.select())) - def disabled_testReRunCheckpkg(self): + def testReRunCheckpkg(self): """Error tags should not accumulate. FIXME(maciej): Figure out what's wrong with this one: It errors out. 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 Mar 28 03:10:06 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Mar 2011 01:10:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[13970] csw/mgar/gar/v2 Message-ID: Revision: 13970 http://gar.svn.sourceforge.net/gar/?rev=13970&view=rev Author: wahwah Date: 2011-03-28 01:10:06 +0000 (Mon, 28 Mar 2011) Log Message: ----------- csw-upload-pkg: checkpkg integration Before sending packages, csw-upload-pkg calls checkpkg (fork + exec) to check packages against catalogs they are about to be inserted into. It's a very rudimentary checkpkg integration. It relies on operation on client side, which is not the optimal place for checks. However, it's better than no checks. Signed-off-by: Maciej Blizinski Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py csw/mgar/gar/v2/tests/run_tests.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-03-28 01:09:24 UTC (rev 13969) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-03-28 01:10:06 UTC (rev 13970) @@ -18,6 +18,7 @@ import socket import rest import struct_util +import subprocess BASE_URL = "http://buildfarm.opencsw.org" @@ -72,14 +73,88 @@ self._rest_client = rest.RestClient(self.rest_url) def Upload(self): + do_upload = True + planned_modifications = [] + metadata_by_md5 = {} for filename in self.filenames: - parsed_basename = opencsw.ParsePackageFileName( - os.path.basename(filename)) - if parsed_basename["vendortag"] != "CSW": - raise PackageCheckError( - "Package vendor tag is %s instead of CSW." - % parsed_basename["vendortag"]) - self._UploadFile(filename) + md5_sum = self._GetFileMd5sum(filename) + file_in_allpkgs, file_metadata = self._GetSrv4FileMetadata(md5_sum) + if file_in_allpkgs: + logging.debug("File %s already uploaded.", filename) + else: + if do_upload: + logging.debug("Uploading %s.", filename) + self._PostFile(filename) + # Querying the database again, this time the data should be + # there + file_in_allpkgs, file_metadata = self._GetSrv4FileMetadata(md5_sum) + logging.debug("file_metadata %s", repr(file_metadata)) + if not file_metadata: + logging.error( + "File metadata was not found in the database. " + "This happens when the package you're trying to upload was never " + "unpacked and imported into the database. " + "To fix the problem, run checkpkg against your package and try " + "importing again.") + raise DataError("file_metadata is empty: %s" % repr(file_metadata)) + osrel = file_metadata['osrel'] + arch = file_metadata['arch'] + metadata_by_md5[md5_sum] = file_metadata + catalogs = self._MatchSrv4ToCatalogs( + filename, DEFAULT_CATREL, arch, osrel, md5_sum) + for unused_catrel, cat_arch, cat_osrel in catalogs: + planned_modifications.append( + (filename, md5_sum, + arch, osrel, cat_arch, cat_osrel)) + # The plan: + # - Create groups of files to be inserted into each of the catalogs + # - Invoke checkpkg to check every target catalog + checkpkg_sets = self._CheckpkgSets(planned_modifications) + bin_dir = os.path.dirname(__file__) + checkpkg_executable = os.path.join(bin_dir, "checkpkg") + checks_failed_for_catalogs = [] + args_by_cat = {} + for arch, osrel in checkpkg_sets: + if "5.11" in osrel: + logging.debug("Skipping Solaris 11 checks") + continue + print ("Checking packages against catalog %s %s %s" + % (DEFAULT_CATREL, arch, osrel)) + md5_sums = [] + basenames = [] + for filename, md5_sum in checkpkg_sets[(arch, osrel)]: + md5_sums.append(md5_sum) + basenames.append(os.path.basename(filename)) + # Not using the checkpkg Python API. The reason is that checkpkg + # requires the process calling its API to have an established + # MySQL connection, while csw-upload-pkg does not, and it's better + # if it stays that way. + args_by_cat[(arch, osrel)] = [ + checkpkg_executable, + "--catalog-release", DEFAULT_CATREL, + "--os-release", osrel, + "--architecture", arch, + ] + md5_sums + ret = subprocess.call(args_by_cat[(arch, osrel)] + ["--quiet"]) + if ret: + checks_failed_for_catalogs.append( + (arch, osrel, basenames) + ) + if checks_failed_for_catalogs: + print "Checks failed for catalogs:" + for arch, osrel, basenames in checks_failed_for_catalogs: + print " - %s %s" % (arch, osrel) + for basename in basenames: + print " %s" % basename + print "To see errors, run:" + print " ", " ".join(args_by_cat[(arch, osrel)]) + print ("Packages have not been submitted to the %s catalog." + % DEFAULT_CATREL) + else: + print "All checks successful. Proceeding." + for arch, osrel in checkpkg_sets: + for filename, md5_sum in checkpkg_sets[(arch, osrel)]: + self._InsertIntoCatalog(filename, arch, osrel, file_metadata) def Remove(self): for filename in self.filenames: @@ -213,7 +288,7 @@ catalogs.append(cat_key) else: logging.info( - "Not inserting %s %s package into %s containing a %s package", + "Not matching %s %s package with %s containing a %s package", catalogname, srv4_osrel, osrel, srv4_in_catalog["osrel"]) logging.debug( @@ -221,31 +296,6 @@ catrel, arch, osrel, catalogname) return tuple(catalogs) - def _UploadFile(self, filename): - md5_sum = self._GetFileMd5sum(filename) - file_in_allpkgs, file_metadata = self._GetSrv4FileMetadata(md5_sum) - if file_in_allpkgs: - logging.debug("File %s already uploaded.", filename) - else: - logging.debug("Uploading %s.", filename) - self._PostFile(filename) - file_in_allpkgs, file_metadata = self._GetSrv4FileMetadata(md5_sum) - logging.debug("file_metadata %s", repr(file_metadata)) - if not file_metadata: - logging.error( - "File metadata was not found in the database. " - "This happens when the package you're trying to upload was never " - "unpacked and imported into the database. " - "To fix the problem, run checkpkg against your package and try " - "importing again.") - raise DataError("file_metadata is empty: %s" % repr(file_metadata)) - osrel = file_metadata['osrel'] - arch = file_metadata['arch'] - catalogs = self._MatchSrv4ToCatalogs( - filename, DEFAULT_CATREL, arch, osrel, md5_sum) - for unused_catrel, cat_arch, cat_osrel in catalogs: - self._InsertIntoCatalog(filename, cat_arch, cat_osrel, file_metadata) - def _InsertIntoCatalog(self, filename, arch, osrel, file_metadata): logging.debug( "_InsertIntoCatalog(%s, %s, %s)", @@ -360,7 +410,27 @@ if http_code >= 400 and http_code <= 499: raise RestCommunicationError("%s - HTTP code: %s" % (url, http_code)) + def _CheckpkgSets(self, planned_modifications): + """Groups packages according to catalogs. + + Used to determine groups of packages to check together, against + a specific catalog. + Args: + A list of tuples + + Returns: + A dictionary of tuples, indexed by (arch, osrel) tuples. + """ + by_catalog = {} + for fields in planned_modifications: + filename, md5_sum, pkg_arch, pkg_osrel, cat_arch, cat_osrel = fields + key = cat_arch, cat_osrel + by_catalog.setdefault(key, []) + by_catalog[key].append((filename, md5_sum)) + return by_catalog + + if __name__ == '__main__': parser = optparse.OptionParser(USAGE) parser.add_option("-d", "--debug", Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py 2011-03-28 01:09:24 UTC (rev 13969) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py 2011-03-28 01:10:06 UTC (rev 13970) @@ -51,6 +51,26 @@ "size": 7617270, "version_string": "7.2,REV=2011.01.21", } +TEST_PLANNED_MODIFICATIONS_1 = [ + ('foo.pkg', + '58f564d11d6419592dcca3915bfabc55', + u'all', + u'SunOS5.9', + 'sparc', + u'SunOS5.9'), + ('foo.pkg', + '58f564d11d6419592dcca3915bfabc55', + u'all', + u'SunOS5.9', + 'sparc', + u'SunOS5.10'), + ('bar.pkg', + '84b409eb7c2faf87e22ee0423e55b888', + u'sparc', + u'SunOS5.9', + u'sparc', + u'SunOS5.9'), +] class Srv4UploaderUnitTest(mox.MoxTestBase): @@ -297,6 +317,16 @@ self.mox.ResetAll() self.mox.UnsetStubs() + def test_CheckpkgSets(self): + su = csw_upload_pkg.Srv4Uploader(None, None) + expected = { + ('sparc', u'SunOS5.10'): + [('foo.pkg', '58f564d11d6419592dcca3915bfabc55')], + ('sparc', u'SunOS5.9'): + [('foo.pkg', '58f564d11d6419592dcca3915bfabc55'), + ('bar.pkg', '84b409eb7c2faf87e22ee0423e55b888')]} + self.assertEqual(expected, su._CheckpkgSets(TEST_PLANNED_MODIFICATIONS_1)) + if __name__ == '__main__': unittest.main() Modified: csw/mgar/gar/v2/tests/run_tests.py =================================================================== --- csw/mgar/gar/v2/tests/run_tests.py 2011-03-28 01:09:24 UTC (rev 13969) +++ csw/mgar/gar/v2/tests/run_tests.py 2011-03-28 01:10:06 UTC (rev 13970) @@ -11,10 +11,11 @@ # To add more test files, create .py file and add a corresponding line # here: +from catalog_notifier_test import * from catalog_test import * -from catalog_notifier_test import * from checkpkg_lib_test import * from checkpkg_test import * +from csw_upload_pkg_test import * from dependency_checks_test import * from inspective_package_test import * from ldd_emul_test import * 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 Mar 28 06:42:46 2011 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Mon, 28 Mar 2011 04:42:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[13971] csw/mgar/gar/v2 Message-ID: Revision: 13971 http://gar.svn.sourceforge.net/gar/?rev=13971&view=rev Author: theferret Date: 2011-03-28 04:42:46 +0000 (Mon, 28 Mar 2011) Log Message: ----------- backend gar: changed OBSOLETES_ to OBSOLETED_BY_ Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk csw/mgar/gar/v2-defaultchange/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-03-28 01:10:06 UTC (rev 13970) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-03-28 04:42:46 UTC (rev 13971) @@ -41,7 +41,7 @@ SRCPACKAGE_BASE = $(firstword $(PACKAGES)) SRCPACKAGE ?= $(SRCPACKAGE_BASE)-src OBSOLETING_PKGS ?= $(sort $(PACKAGES) $(FOREIGN_PACKAGES)) -OBSOLETED_PKGS ?= $(sort $(foreach P,$(OBSOLETING_PKGS),$(OBSOLETES_$P))) +OBSOLETED_PKGS ?= $(sort $(foreach P,$(OBSOLETING_PKGS),$(OBSOLETED_BY_$P))) SPKG_SPECS ?= $(sort $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES) $(OBSOLETED_PKGS) $(if $(NOSOURCEPACKAGE),,$(SRCPACKAGE))) endif @@ -67,15 +67,15 @@ CATALOGNAME_$(1) ?= $(subst -,_,$(patsubst CSW%,%,$(1)))_stub # The length of the description has been limited to 100 characters, # the string is cut (no longer on word boundaries). -SPKG_DESC_$(1) ?= $(shell echo Transitional package. Content moved to $(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETES_$P)),$P)) | perl -npe 's/(.{100}).+/substr($$1,96) . " ..."/e') -RUNTIME_DEP_PKGS_$(1) = $(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETES_$P)),$P)) +SPKG_DESC_$(1) ?= $(shell echo Transitional package. Content moved to $(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETED_BY_$P)),$P)) | perl -npe 's/(.{100}).+/substr($$1,96) . " ..."/e') +RUNTIME_DEP_PKGS_$(1) = $(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETED_BY_$P)),$P)) PKGFILES_$(1) = NOFILES ARCHALL_$(1) = 1 # For legacy packages we know that the dependency is correct because we deliberately set it # A legacy dependency from another package may not have been released # The catalog name may not match for legacy packages # The overridden package may be a devel package, as it is empty it is ok to be archall -$(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETES_$P)), +$(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETED_BY_$P)), CHECKPKG_OVERRIDES_$(1) += surplus-dependency|$P $(if $(filter $P,$(FOREIGN_PACKAGES)),CHECKPKG_OVERRIDES_$(1) += unidentified-dependency|$P) )) @@ -716,7 +716,7 @@ $(_DBG)rm -f $(COOKIEDIR)/merge-README.CSW $(foreach SPEC,$(_PKG_SPECS),$(PKGROOT)$(docdir)/$(call catalogname,$(SPEC))/README.CSW) merge-obsolete: $(WORKDIR_GLOBAL) - $(_DBG)$(foreach P,$(OBSOLETED_PKGS),$(foreach Q,$(OBSOLETING_PKGS),$(if $(filter $P,$(OBSOLETES_$Q)), \ + $(_DBG)$(foreach P,$(OBSOLETED_PKGS),$(foreach Q,$(OBSOLETING_PKGS),$(if $(filter $P,$(OBSOLETED_BY_$Q)), \ ($(if $(SPKG_DESC_$Q), \ echo "$Q $(call catalogname,$Q) - $(SPKG_DESC_$Q)";, \ echo "$(shell (/usr/bin/pkginfo $Q || echo "$Q - ") | $(GAWK) '{ $$1 = "P"; print }')"; \ Modified: csw/mgar/gar/v2-defaultchange/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-defaultchange/gar.pkg.mk 2011-03-28 01:10:06 UTC (rev 13970) +++ csw/mgar/gar/v2-defaultchange/gar.pkg.mk 2011-03-28 04:42:46 UTC (rev 13971) @@ -41,7 +41,7 @@ SRCPACKAGE_BASE = $(firstword $(PACKAGES)) SRCPACKAGE ?= $(SRCPACKAGE_BASE)-src OBSOLETING_PKGS ?= $(sort $(PACKAGES) $(FOREIGN_PACKAGES)) -OBSOLETED_PKGS ?= $(sort $(foreach P,$(OBSOLETING_PKGS),$(OBSOLETES_$P))) +OBSOLETED_PKGS ?= $(sort $(foreach P,$(OBSOLETING_PKGS),$(OBSOLETED_BY_$P))) SPKG_SPECS ?= $(sort $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES) $(OBSOLETED_PKGS) $(if $(NOSOURCEPACKAGE),,$(SRCPACKAGE))) endif @@ -66,15 +66,15 @@ CATALOGNAME_$(1) ?= $(call catalogname,$(1)) # The length of the description has been limited to 100 characters, # the string is cut (no longer on word boundaries). -SPKG_DESC_$(1) ?= $(shell echo Transitional package. Content moved to $(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETES_$P)),$P)) | perl -npe 's/(.{100}).+/substr($$1,96) . " ..."/e') -RUNTIME_DEP_PKGS_$(1) = $(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETES_$P)),$P)) +SPKG_DESC_$(1) ?= $(shell echo Transitional package. Content moved to $(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETED_BY_$P)),$P)) | perl -npe 's/(.{100}).+/substr($$1,96) . " ..."/e') +RUNTIME_DEP_PKGS_$(1) = $(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETED_BY_$P)),$P)) PKGFILES_$(1) = NOFILES ARCHALL_$(1) = 1 # For legacy packages we know that the dependency is correct because we deliberately set it # A legacy dependency from another package may not have been released # The catalog name may not match for legacy packages # The overridden package may be a devel package, as it is empty it is ok to be archall -$(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETES_$P)), +$(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETED_BY_$P)), CHECKPKG_OVERRIDES_$(1) += surplus-dependency|$P $(if $(filter $P,$(FOREIGN_PACKAGES)),CHECKPKG_OVERRIDES_$(1) += unidentified-dependency|$P) )) @@ -716,7 +716,7 @@ $(_DBG)rm -f $(COOKIEDIR)/merge-README.CSW $(foreach SPEC,$(_PKG_SPECS),$(PKGROOT)$(docdir)/$(call catalogname,$(SPEC))/README.CSW) merge-obsolete: $(WORKDIR_GLOBAL) - $(_DBG)$(foreach P,$(OBSOLETED_PKGS),$(foreach Q,$(OBSOLETING_PKGS),$(if $(filter $P,$(OBSOLETES_$Q)), \ + $(_DBG)$(foreach P,$(OBSOLETED_PKGS),$(foreach Q,$(OBSOLETING_PKGS),$(if $(filter $P,$(OBSOLETED_BY_$Q)), \ ($(if $(SPKG_DESC_$Q), \ echo "$Q $(call catalogname,$Q) - $(SPKG_DESC_$Q)";, \ echo "$(shell (/usr/bin/pkginfo $Q || echo "$Q - ") | $(GAWK) '{ $$1 = "P"; print }')"; \ 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 Mar 28 06:47:09 2011 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Mon, 28 Mar 2011 04:47:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[13972] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 13972 http://gar.svn.sourceforge.net/gar/?rev=13972&view=rev Author: theferret Date: 2011-03-28 04:47:09 +0000 (Mon, 28 Mar 2011) Log Message: ----------- continuing front-end commit to match backend rename, OBSOLETES_ to OBSOLETED_BY_ Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2011-03-28 04:42:46 UTC (rev 13971) +++ csw/mgar/pkg/git/trunk/Makefile 2011-03-28 04:47:09 UTC (rev 13972) @@ -14,13 +14,13 @@ PACKAGES = CSWgit CSWgitk CSWgit-gui CSWgit-svn CSWgit-cvs PACKAGES += CSWgit-emacs CSWgit-doc CSWgit-completion CSWgit-dev -OBSOLETES_CSWgit-gui = CSWgitgui -OBSOLETES_CSWgit-svn = CSWgitsvn -OBSOLETES_CSWgit-emacs = CSWgitemacs -OBSOLETES_CSWgit-doc = CSWgitdoc -OBSOLETES_CSWgit-completion = CSWgitcompletion -OBSOLETES_CSWgit-dev = CSWgitdevel -OBSOLETES_CSWgit-cvs = CSWgitcvs +OBSOLETED_BY_CSWgit-gui = CSWgitgui +OBSOLETED_BY_CSWgit-svn = CSWgitsvn +OBSOLETED_BY_CSWgit-emacs = CSWgitemacs +OBSOLETED_BY_CSWgit-doc = CSWgitdoc +OBSOLETED_BY_CSWgit-completion = CSWgitcompletion +OBSOLETED_BY_CSWgit-dev = CSWgitdevel +OBSOLETED_BY_CSWgit-cvs = CSWgitcvs CATALOGNAME_CSWgit = git CATALOGNAME_CSWgit-cvs = git_cvs 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 Mar 28 06:55:30 2011 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Mon, 28 Mar 2011 04:55:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[13973] csw/mgar/pkg Message-ID: Revision: 13973 http://gar.svn.sourceforge.net/gar/?rev=13973&view=rev Author: theferret Date: 2011-03-28 04:55:29 +0000 (Mon, 28 Mar 2011) Log Message: ----------- stragglers from OBSOLETES_ rename Modified Paths: -------------- csw/mgar/pkg/libao/trunk/Makefile csw/mgar/pkg/libiconv/trunk/Makefile csw/mgar/pkg/libidn/trunk/Makefile csw/mgar/pkg/libogg/trunk/Makefile csw/mgar/pkg/libtool/branches/libtool24/Makefile csw/mgar/pkg/libxml2/trunk/Makefile csw/mgar/pkg/lzo/trunk/Makefile csw/mgar/pkg/php5/trunk/Makefile csw/mgar/pkg/readline/trunk/Makefile csw/mgar/pkg/rrdtool/trunk/Makefile Modified: csw/mgar/pkg/libao/trunk/Makefile =================================================================== --- csw/mgar/pkg/libao/trunk/Makefile 2011-03-28 04:47:09 UTC (rev 13972) +++ csw/mgar/pkg/libao/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) @@ -15,7 +15,7 @@ VENDOR_URL = http://www.xiph.org/ao/ FOREIGN_PACKAGES += CSWlibao2 -OBSOLETES_CSWlibao2 = CSWlibao +OBSOLETED_BY_CSWlibao2 = CSWlibao PACKAGES += CSWlibao4 CATALOGNAME_CSWlibao4 = libao4 @@ -27,7 +27,7 @@ PKGFILES_CSWlibao4 += $(mandir)/.* RUNTIME_DEP_PKGS_CSWlibao4 += CSWlibaudiofile0 RUNTIME_DEP_PKGS_CSWlibao4 += CSWlibesd0 -OBSOLETES_CSWlibao4 = CSWlibao +OBSOLETED_BY_CSWlibao4 = CSWlibao PACKAGES += CSWlibao-dev CATALOGNAME_CSWlibao-dev = libao_dev Modified: csw/mgar/pkg/libiconv/trunk/Makefile =================================================================== --- csw/mgar/pkg/libiconv/trunk/Makefile 2011-03-28 04:47:09 UTC (rev 13972) +++ csw/mgar/pkg/libiconv/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) @@ -26,7 +26,7 @@ CATALOGNAME_CSWlibiconv2 = libiconv2 SPKG_DESC_CSWlibiconv2 = GNU iconv library, libiconv.so.2 PKGFILES_CSWlibiconv2 += $(call pkgfiles_lib,libiconv.so.2) -OBSOLETES_CSWlibiconv2 += CSWiconv +OBSOLETED_BY_CSWlibiconv2 += CSWiconv PACKAGES += CSWlibcharset1 CATALOGNAME_CSWlibcharset1 = libcharset1 @@ -35,7 +35,7 @@ # Now *this* time it is ok, iconv is the only package that is allowed to ship this! CHECKPKG_OVERRIDES_CSWlibcharset1 += disallowed-path|opt/csw/lib/charset.alias PKGFILES_CSWlibcharset1 += $(call baseisadirs,$(libdir),charset\.alias) -OBSOLETES_CSWlibcharset1 += CSWiconv +OBSOLETED_BY_CSWlibcharset1 += CSWiconv PACKAGES += CSWlibiconv-dev CATALOGNAME_CSWlibiconv-dev = libiconv_dev @@ -60,7 +60,7 @@ CHECKPKG_OVERRIDES_CSWlibiconv-utils += shared-lib-pkgname-mismatch|sonames=libiconv.so.0|pkgname=CSWlibiconv-utils|expected=CSWlibiconv0 RUNTIME_DEP_PKGS_CSWlibiconv-utils += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibiconv-utils += CSWlibintl8 -OBSOLETES_CSWlibiconv-utils += CSWiconv +OBSOLETED_BY_CSWlibiconv-utils += CSWiconv NOISAEXEC = 1 BUILD64 = 1 Modified: csw/mgar/pkg/libidn/trunk/Makefile =================================================================== --- csw/mgar/pkg/libidn/trunk/Makefile 2011-03-28 04:47:09 UTC (rev 13972) +++ csw/mgar/pkg/libidn/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) @@ -39,7 +39,7 @@ RUNTIME_DEP_PKGS_CSWlibidn-utils += CSWlibidn11 RUNTIME_DEP_PKGS_CSWlibidn-utils += CSWggettextrt RUNTIME_DEP_PKGS_CSWlibidn-utils += CSWiconv -OBSOLETES_CSWlibidn-utils = CSWlibidn +OBSOLETED_BY_CSWlibidn-utils = CSWlibidn BUILD64 = 1 NOISAEXEC = 1 Modified: csw/mgar/pkg/libogg/trunk/Makefile =================================================================== --- csw/mgar/pkg/libogg/trunk/Makefile 2011-03-28 04:47:09 UTC (rev 13972) +++ csw/mgar/pkg/libogg/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) @@ -18,7 +18,7 @@ CATALOGNAME_CSWlibogg0 = libogg0 SPKG_DESC_CSWlibogg0 = Ogg bitstream format support library providing libogg.so.0 PKGFILES_CSWlibogg0 = $(call baseisadirs,$(libdir),libogg\.so\.0(\.\d+)*) -OBSOLETES_CSWlibogg0 = CSWlibogg +OBSOLETED_BY_CSWlibogg0 = CSWlibogg PACKAGES += CSWlibogg-dev CATALOGNAME_CSWlibogg-dev = libogg_dev Modified: csw/mgar/pkg/libtool/branches/libtool24/Makefile =================================================================== --- csw/mgar/pkg/libtool/branches/libtool24/Makefile 2011-03-28 04:47:09 UTC (rev 13972) +++ csw/mgar/pkg/libtool/branches/libtool24/Makefile 2011-03-28 04:55:29 UTC (rev 13973) @@ -48,13 +48,13 @@ # This is built from pkgs/libltdl3 FOREIGN_PACKAGES += CSWlibltdl3 -OBSOLETES_CSWlibltdl3 += CSWlibtoolrt +OBSOLETED_BY_CSWlibltdl3 += CSWlibtoolrt PACKAGES += CSWlibltdl7 CATALOGNAME_CSWlibltdl7 = libltdl7 SPKG_DESC_CSWlibltdl7 = Libtool libltdl.so.7 from libtool 2.x PKGFILES_CSWlibltdl7 += $(PKGFILES_RT) -OBSOLETES_CSWlibltdl7 += CSWlibtoolrt +OBSOLETED_BY_CSWlibltdl7 += CSWlibtoolrt # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2011-03-28 04:47:09 UTC (rev 13972) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) @@ -16,9 +16,9 @@ PACKAGES = CSWlibxml2-2 CSWlibxml2-dev CSWpy-libxml2 -OBSOLETES_CSWlibxml2-2 = CSWlibxml2 -OBSOLETES_CSWpy-libxml2 = CSWpylibxml2 -OBSOLETES_CSWlibxml2-dev = CSWlibxml2devel +OBSOLETED_BY_CSWlibxml2-2 = CSWlibxml2 +OBSOLETED_BY_CSWpy-libxml2 = CSWpylibxml2 +OBSOLETED_BY_CSWlibxml2-dev = CSWlibxml2devel CATALOGNAME_CSWlibxml2-2 = libxml2_2 CATALOGNAME_CSWlibxml2-dev = libxml2_dev Modified: csw/mgar/pkg/lzo/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzo/trunk/Makefile 2011-03-28 04:47:09 UTC (rev 13972) +++ csw/mgar/pkg/lzo/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) @@ -18,13 +18,13 @@ SPKG_DESC_CSWliblzo-dev = Development files for liblzo2.so.2 RUNTIME_DEP_PKGS_CSWliblzo-dev = CSWliblzo2-2 # PKGFILES is catchall -OBSOLETES_CSWliblzo-dev = CSWlzo +OBSOLETED_BY_CSWliblzo-dev = CSWlzo PACKAGES += CSWliblzo2-2 CATALOGNAME_CSWliblzo2-2 = liblzo2_2 SPKG_DESC_CSWliblzo2-2 = Library for LZO compression providing liblzo2.so.2 PKGFILES_CSWliblzo2-2 = $(call baseisadirs,$(libdir),liblzo2\.so\.2(\.\d+)*) -OBSOLETES_CSWliblzo2-2 = CSWlzo +OBSOLETED_BY_CSWliblzo2-2 = CSWlzo VENDOR_URL = http://www.oberhumer.com/opensource/lzo/ Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-28 04:47:09 UTC (rev 13972) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) @@ -97,7 +97,7 @@ CATALOGNAME_CSWmod-php5 = mod_php5 SPKG_DESC_CSWmod-php5 = The apache 1.3.x php5 module RUNTIME_DEP_PKGS_CSWmod-php5 = CSWphp5 CSWapache CSWlibxml2 CSWiconv -OBSOLETES_CSWmod-php5 = CSWmodphp5 +OBSOLETED_BY_CSWmod-php5 = CSWmodphp5 CATALOGNAME_CSWphp5 = php5 SPKG_DESC_CSWphp5 = A High-Level Scripting Language @@ -106,100 +106,100 @@ CATALOGNAME_CSWphp5-dev = php5_dev SPKG_DESC_CSWphp5-dev = Development files for php5 RUNTIME_DEP_PKGS_CSWphp5-dev = CSWphp5 -OBSOLETES_CSWphp5-dev = CSWphp5devel +OBSOLETED_BY_CSWphp5-dev = CSWphp5devel CATALOGNAME_CSWap2-modphp5 = ap2_modphp5 SPKG_DESC_CSWap2-modphp5 = The apache 2.2.x php5 module RUNTIME_DEP_PKGS_CSWap2-modphp5 = CSWphp5 CSWapache2 CSWlibxml2 CSWiconv RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib -OBSOLETES_CSWap2-modphp5 = CSWap2modphp5 +OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 CATALOGNAME_CSWphp5-bcmath = php5_bcmath SPKG_DESC_CSWphp5-bcmath = The bcmath extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-bcmath = CSWphp5 -OBSOLETES_CSWphp5-bcmath = CSWphp5bcmath +OBSOLETED_BY_CSWphp5-bcmath = CSWphp5bcmath CATALOGNAME_CSWphp5-bz2 = php5_bz2 SPKG_DESC_CSWphp5-bz2 = The bz2 extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-bz2 = CSWphp5 CSWbzip2 -OBSOLETES_CSWphp5-bz2 = CSWphp5bz2 +OBSOLETED_BY_CSWphp5-bz2 = CSWphp5bz2 CATALOGNAME_CSWphp5-calendar = php5_calendar SPKG_DESC_CSWphp5-calendar = The calendar extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-calendar = CSWphp5 -OBSOLETES_CSWphp5-calendar = CSWphp5calendar +OBSOLETED_BY_CSWphp5-calendar = CSWphp5calendar CATALOGNAME_CSWphp5-ctype = php5_ctype SPKG_DESC_CSWphp5-ctype = The ctype extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-ctype = CSWphp5 -OBSOLETES_CSWphp5-ctype = CSWphp5ctype +OBSOLETED_BY_CSWphp5-ctype = CSWphp5ctype CATALOGNAME_CSWphp5-curl = php5_curl SPKG_DESC_CSWphp5-curl = The curl extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-curl = CSWphp5 CSWcurlrt CSWlibidn11 RUNTIME_DEP_PKGS_CSWphp5-curl += CSWoldaprt CSWosslrt CSWzlib CSWlibcares -OBSOLETES_CSWphp5-curl = CSWphp5curl +OBSOLETED_BY_CSWphp5-curl = CSWphp5curl CATALOGNAME_CSWphp5-dba = php5_dba SPKG_DESC_CSWphp5-dba = The dba extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-dba = CSWphp5 CSWlibgdbm3 CSWbdb42 -OBSOLETES_CSWphp5-dba = CSWphp5dba +OBSOLETED_BY_CSWphp5-dba = CSWphp5dba CATALOGNAME_CSWphp5-dbase = php5_dbase SPKG_DESC_CSWphp5-dbase = The dbase extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-dbase = CSWphp5 -OBSOLETES_CSWphp5-dbase = CSWphp5dbase +OBSOLETED_BY_CSWphp5-dbase = CSWphp5dbase CATALOGNAME_CSWphp5-dom = php5_dom SPKG_DESC_CSWphp5-dom = The dom extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-dom = CSWphp5 CSWiconv CSWlibxml2 CSWzlib -OBSOLETES_CSWphp5-dom = CSWphp5dom +OBSOLETED_BY_CSWphp5-dom = CSWphp5dom CATALOGNAME_CSWphp5-exif = php5_exif SPKG_DESC_CSWphp5-exif = The exif extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-exif = CSWphp5 -OBSOLETES_CSWphp5-exif = CSWphp5exif +OBSOLETED_BY_CSWphp5-exif = CSWphp5exif CATALOGNAME_CSWphp5-ftp = php5_ftp SPKG_DESC_CSWphp5-ftp = The ftp extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-ftp = CSWphp5 CSWosslrt -OBSOLETES_CSWphp5-ftp = CSWphp5ftp +OBSOLETED_BY_CSWphp5-ftp = CSWphp5ftp CATALOGNAME_CSWphp5-gd = php5_gd SPKG_DESC_CSWphp5-gd = The gd extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-gd = CSWphp5 CSWftype2 CSWlibgd2 CSWjpeg RUNTIME_DEP_PKGS_CSWphp5-gd += CSWpng CSWt1lib CSWxpm CSWzlib -OBSOLETES_CSWphp5-gd = CSWphp5gd +OBSOLETED_BY_CSWphp5-gd = CSWphp5gd CATALOGNAME_CSWphp5-gettext = php5_gettext SPKG_DESC_CSWphp5-gettext = The gettext extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-gettext = CSWphp5 CSWlibintl8 -OBSOLETES_CSWphp5-gettext = CSWphp5gettext +OBSOLETED_BY_CSWphp5-gettext = CSWphp5gettext CATALOGNAME_CSWphp5-gmp = php5_gmp SPKG_DESC_CSWphp5-gmp = The gmp extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-gmp = CSWphp5 CSWlibgmp -OBSOLETES_CSWphp5-gmp = CSWphp5gmp +OBSOLETED_BY_CSWphp5-gmp = CSWphp5gmp CATALOGNAME_CSWphp5-hash = php5_hash SPKG_DESC_CSWphp5-hash = The hash extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-hash = CSWphp5 -OBSOLETES_CSWphp5-hash = CSWphp5hash +OBSOLETED_BY_CSWphp5-hash = CSWphp5hash CATALOGNAME_CSWphp5-iconv = php5_iconv SPKG_DESC_CSWphp5-iconv = The iconv extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-iconv = CSWphp5 -OBSOLETES_CSWphp5-iconv = CSWphp5iconv +OBSOLETED_BY_CSWphp5-iconv = CSWphp5iconv CATALOGNAME_CSWphp5-imap = php5_imap SPKG_DESC_CSWphp5-imap = The imap extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-imap = CSWphp5 CSWimaprt CSWkrb5lib CSWosslrt -OBSOLETES_CSWphp5-imap = CSWphp5imap +OBSOLETED_BY_CSWphp5-imap = CSWphp5imap CATALOGNAME_CSWphp5-json = php5_json SPKG_DESC_CSWphp5-json = The json extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-json = CSWphp5 -OBSOLETES_CSWphp5-json = CSWphp5json +OBSOLETED_BY_CSWphp5-json = CSWphp5json CATALOGNAME_CSWphp5-ldap = php5_ldap SPKG_DESC_CSWphp5-ldap = The ldap extension for PHP5 @@ -208,178 +208,178 @@ CATALOGNAME_CSWphp5-mbstring = php5_mbstring SPKG_DESC_CSWphp5-mbstring = The mbstring extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-mbstring = CSWphp5 -OBSOLETES_CSWphp5-mbstring = CSWphp5mbstring +OBSOLETED_BY_CSWphp5-mbstring = CSWphp5mbstring CATALOGNAME_CSWphp5-mcrypt = php5_mcrypt SPKG_DESC_CSWphp5-mcrypt = The mcrypt extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-mcrypt = CSWphp5 CSWlibmcrypt CSWlibltdl7 -OBSOLETES_CSWphp5-mcrypt = CSWphp5mcrypt +OBSOLETED_BY_CSWphp5-mcrypt = CSWphp5mcrypt CATALOGNAME_CSWphp5-mssql = php5_mssql SPKG_DESC_CSWphp5-mssql = The mssql extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-mssql = CSWphp5 CSWfreetds -OBSOLETES_CSWphp5-mssql = CSWphp5mssql +OBSOLETED_BY_CSWphp5-mssql = CSWphp5mssql CATALOGNAME_CSWphp5-mysql = php5_mysql SPKG_DESC_CSWphp5-mysql = The mysql extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-mysql = CSWphp5 CSWmysql5rt -OBSOLETES_CSWphp5-mysql = CSWphp5mysql +OBSOLETED_BY_CSWphp5-mysql = CSWphp5mysql CATALOGNAME_CSWphp5-mysqli = php5_mysqli SPKG_DESC_CSWphp5-mysqli = The mysqli extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-mysqli = CSWphp5 CSWmysql5rt CSWzlib -OBSOLETES_CSWphp5-mysqli = CSWphp5mysqli +OBSOLETED_BY_CSWphp5-mysqli = CSWphp5mysqli CATALOGNAME_CSWphp5-ncurses = php5_ncurses SPKG_DESC_CSWphp5-ncurses = The ncurses extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-ncurses = CSWphp5 CSWncurses -OBSOLETES_CSWphp5-ncurses = CSWphp5ncurses +OBSOLETED_BY_CSWphp5-ncurses = CSWphp5ncurses CATALOGNAME_CSWphp5-odbc = php5_odbc SPKG_DESC_CSWphp5-odbc = The odbc extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-odbc = CSWphp5 CSWunixodbc -OBSOLETES_CSWPhp5-odbc = CSWphp5odbc +OBSOLETED_BY_CSWPhp5-odbc = CSWphp5odbc CATALOGNAME_CSWphp5-openssl = php5_openssl SPKG_DESC_CSWphp5-openssl = The openssl extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-openssl = CSWphp5 CSWosslrt CSWkrb5lib -OBSOLETES_CSWphp5-openssl = CSWphp5openssl +OBSOLETED_BY_CSWphp5-openssl = CSWphp5openssl CATALOGNAME_CSWphp5-pcntl = php5_pcntl SPKG_DESC_CSWphp5-pcntl = The pcntl extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-pcntl = CSWphp5 -OBSOLETES_CSWphp5-pcntl = CSWphp5pcntl +OBSOLETED_BY_CSWphp5-pcntl = CSWphp5pcntl CATALOGNAME_CSWphp5-pdo = php5_pdo SPKG_DESC_CSWphp5-pdo = A database access abstraction module for PHP applications RUNTIME_DEP_PKGS_CSWphp5-pdo = CSWphp5 -OBSOLETES_CSWphp5-pdo = CSWphp5pdo +OBSOLETED_BY_CSWphp5-pdo = CSWphp5pdo CATALOGNAME_CSWphp5-pdomysql = php5_pdomysql SPKG_DESC_CSWphp5-pdomysql = A MySQL specific database access abstraction module for PHP applications (pdo version) RUNTIME_DEP_PKGS_CSWphp5-pdomysql = CSWphp5 CSWmysql5rt CSWzlib CSWphp5-pdo -OBSOLETES_CSWphp5-pdomysql = CSWphp5pdomysql +OBSOLETED_BY_CSWphp5-pdomysql = CSWphp5pdomysql CATALOGNAME_CSWphp5-pdoodbc = php5_pdoodbc SPKG_DESC_CSWphp5-pdoodbc = An ODBC specific database access abstraction module for PHP applications RUNTIME_DEP_PKGS_CSWphp5-pdoodbc = CSWphp5 CSWunixodbc CSWphp5-pdo -OBSOLETES_CSWphp5-pdoodbc = CSWphp5pdoodbc +OBSOLETED_BY_CSWphp5-pdoodbc = CSWphp5pdoodbc CATALOGNAME_CSWphp5-pdopgsql = php5_pdopgsql SPKG_DESC_CSWphp5-pdopgsql = A PgSQL specific database access abstraction module for PHP applications (pdo version) RUNTIME_DEP_PKGS_CSWphp5-pdopgsql = CSWphp5 CSWlibpq CSWphp5-pdo -OBSOLETES_CSWphp5-pdopgsql = CSWphp5pdopgsql +OBSOLETED_BY_CSWphp5-pdopgsql = CSWphp5pdopgsql CATALOGNAME_CSWphp5-pdosqlite = php5_pdosqlite SPKG_DESC_CSWphp5-pdosqlite = A Sqlite specific database access abstraction module for PHP applications (pdo version) RUNTIME_DEP_PKGS_CSWphp5-pdosqlite = CSWphp5 CSWphp5-pdo CSWsqlite3rt -OBSOLETES_CSWphp5-pdosqlite = CSWphp5pdosqlite +OBSOLETED_BY_CSWphp5-pdosqlite = CSWphp5pdosqlite CATALOGNAME_CSWphp5-pgsql = php5_pgsql SPKG_DESC_CSWphp5-pgsql = The pgsql extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-pgsql = CSWphp5 CSWlibpq -OBSOLETES_CSWphp5-pgsql = CSWphp5pgsql +OBSOLETED_BY_CSWphp5-pgsql = CSWphp5pgsql CATALOGNAME_CSWphp5-posix = php5_posix SPKG_DESC_CSWphp5-posix = The posix extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-posix = CSWphp5 -OBSOLETES_CSWphp5-posix = CSWphp5posix +OBSOLETED_BY_CSWphp5-posix = CSWphp5posix CATALOGNAME_CSWphp5-pspell = php5_pspell SPKG_DESC_CSWphp5-pspell = The pspell extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-pspell = CSWphp5 CSWaspell -OBSOLETES_CSWphp5-pspell = CSWphp5pspell +OBSOLETED_BY_CSWphp5-pspell = CSWphp5pspell CATALOGNAME_CSWphp5-readline = php5_readline SPKG_DESC_CSWphp5-readline = The readline extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-readline = CSWphp5 CSWreadline CSWncurses -OBSOLETES_CSWphp5-readline = CSWphp5readline +OBSOLETED_BY_CSWphp5-readline = CSWphp5readline CATALOGNAME_CSWphp5-session = php5_session SPKG_DESC_CSWphp5-session = The session extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-session = CSWphp5 CSWlibmm -OBSOLETES_CSWphp5-session = CSWphp5session +OBSOLETED_BY_CSWphp5-session = CSWphp5session CATALOGNAME_CSWphp5-shmop = php5_shmop SPKG_DESC_CSWphp5-shmop = The shmop extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-shmop = CSWphp5 -OBSOLETES_CSWphp5-shmop = CSWphp5shmop +OBSOLETED_BY_CSWphp5-shmop = CSWphp5shmop CATALOGNAME_CSWphp5-snmp = php5_snmp SPKG_DESC_CSWphp5-snmp = The snmp extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-snmp = CSWphp5 CSWnetsnmp -OBSOLETES_CSWphp5-snmp = CSWphp5snmp +OBSOLETED_BY_CSWphp5-snmp = CSWphp5snmp CATALOGNAME_CSWphp5-soap = php5_soap SPKG_DESC_CSWphp5-soap = The soap extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-soap = CSWphp5 CSWiconv CSWlibxml2 CSWzlib -OBSOLETES_CSWphp5-soap = CSWphp5soap +OBSOLETED_BY_CSWphp5-soap = CSWphp5soap CATALOGNAME_CSWphp5-sockets = php5_sockets SPKG_DESC_CSWphp5-sockets = The sockets extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-sockets = CSWphp5 -OBSOLETES_CSWphp5-sockets = CSWphp5sockets +OBSOLETED_BY_CSWphp5-sockets = CSWphp5sockets CATALOGNAME_CSWphp5-sqlite = php5_sqlite SPKG_DESC_CSWphp5-sqlite = The sqlite extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-sqlite = CSWphp5 CSWsqlite -OBSOLETES_CSWphp5-sqlite = CSWphp5sqlite +OBSOLETED_BY_CSWphp5-sqlite = CSWphp5sqlite CATALOGNAME_CSWphp5-sysvmsg = php5_sysvmsg SPKG_DESC_CSWphp5-sysvmsg = The sysvmsg extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-sysvmsg = CSWphp5 -OBSOLETES_CSWphp5-sysvmsg = CSWphp5sysvmsg +OBSOLETED_BY_CSWphp5-sysvmsg = CSWphp5sysvmsg CATALOGNAME_CSWphp5-sysvsem = php5_sysvsem SPKG_DESC_CSWphp5-sysvsem = The sysvsem extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-sysvsem = CSWphp5 -OBSOLETES_CSWphp5-sysvsem = CSWphp5sysvsem +OBSOLETED_BY_CSWphp5-sysvsem = CSWphp5sysvsem CATALOGNAME_CSWphp5-sysvshm = php5_sysvshm SPKG_DESC_CSWphp5-sysvshm = The sysvshm extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-sysvshm = CSWphp5 -OBSOLETES_CSWphp5-sysvshm = CSWphp5sysvshm +OBSOLETED_BY_CSWphp5-sysvshm = CSWphp5sysvshm CATALOGNAME_CSWphp5-tidy = php5_tidy SPKG_DESC_CSWphp5-tidy = The tidy extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-tidy = CSWphp5 CSWhtmltidy -OBSOLETES_CSWphp5-tidy = CSWphp5tidy +OBSOLETED_BY_CSWphp5-tidy = CSWphp5tidy CATALOGNAME_CSWphp5-tokenizer = php5_tokenizer SPKG_DESC_CSWphp5-tokenizer = The tokenizer extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-tokenizer = CSWphp5 -OBSOLETES_CSWphp5-tokenizer = CSWphp5tokenizer +OBSOLETED_BY_CSWphp5-tokenizer = CSWphp5tokenizer CATALOGNAME_CSWphp5-wddx = php5_wddx SPKG_DESC_CSWphp5-wddx = The wddx extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-wddx = CSWphp5 -OBSOLETES_CSWphp5-wddx = CSWphp5wddx +OBSOLETED_BY_CSWphp5-wddx = CSWphp5wddx CATALOGNAME_CSWphp5-xmlreader = php5_xmlreader SPKG_DESC_CSWphp5-xmlreader = The xmlreader extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-xmlreader = CSWphp5 CSWiconv CSWlibxml2 CSWzlib -OBSOLETES_CSWphp5-xmlreader = CSWphp5xmlreader +OBSOLETED_BY_CSWphp5-xmlreader = CSWphp5xmlreader CATALOGNAME_CSWphp5-xmlrpc = php5_xmlrpc SPKG_DESC_CSWphp5-xmlrpc = The xmlrpc extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-xmlrpc = CSWphp5 CSWiconv CSWexpat -OBSOLETES_CSWphp5-xmlrpc = CSWphp5xmlrpc +OBSOLETED_BY_CSWphp5-xmlrpc = CSWphp5xmlrpc CATALOGNAME_CSWphp5-xmlwriter = php5_xmlwriter SPKG_DESC_CSWphp5-xmlwriter = The xmlwriter extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-xmlwriter = CSWphp5 CSWiconv CSWlibxml2 CSWzlib -OBSOLETES_CSWphp5-xmlwriter = CSWphp5xmlwriter +OBSOLETED_BY_CSWphp5-xmlwriter = CSWphp5xmlwriter CATALOGNAME_CSWphp5-xsl = php5_xsl SPKG_DESC_CSWphp5-xsl = The xsl extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-xsl = CSWphp5 CSWiconv CSWlibxml2 RUNTIME_DEP_PKGS_CSWphp5-xsl += CSWlibxslt CSWzlib -OBSOLETES_CSWphp5-xsl = CSWphp5xsl +OBSOLETED_BY_CSWphp5-xsl = CSWphp5xsl CATALOGNAME_CSWphp5-zip = php5_zip SPKG_DESC_CSWphp5-zip = The zip extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-zip = CSWphp5 CSWzlib -OBSOLETES_CSWphp5-zip = CSWphp5zip +OBSOLETED_BY_CSWphp5-zip = CSWphp5zip PKGFILES_CSWphp5-dev = $(bindir)/php-config PKGFILES_CSWphp5-dev += $(bindir)/phpize Modified: csw/mgar/pkg/readline/trunk/Makefile =================================================================== --- csw/mgar/pkg/readline/trunk/Makefile 2011-03-28 04:47:09 UTC (rev 13972) +++ csw/mgar/pkg/readline/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) @@ -20,15 +20,15 @@ # From pkg/readline43 FOREIGN_PACKAGES += CSWlibhistory4 -OBSOLETES_CSWlibhistory4 = CSWreadline +OBSOLETED_BY_CSWlibhistory4 = CSWreadline FOREIGN_PACKAGES += CSWlibreadline4 -OBSOLETES_CSWlibreadline4 = CSWreadline +OBSOLETED_BY_CSWlibreadline4 = CSWreadline # From pkg/readline52 FOREIGN_PACKAGES += CSWlibhistory5 -OBSOLETES_CSWlibhistory5 = CSWreadline +OBSOLETED_BY_CSWlibhistory5 = CSWreadline FOREIGN_PACKAGES += CSWlibreadline5 -OBSOLETES_CSWlibreadline5 = CSWreadline +OBSOLETED_BY_CSWlibreadline5 = CSWreadline PACKAGES += CSWlibhistory6 CATALOGNAME_CSWlibhistory6 = libhistory6 @@ -37,14 +37,14 @@ # This dependency is not really necessary, just because we unconditionally add # "-lncurses" to LDFLAGS as this does not happen automatically. RUNTIME_DEP_PKGS_CSWlibhistory6 += CSWncurses -OBSOLETES_CSWlibhistory6 = CSWreadline +OBSOLETED_BY_CSWlibhistory6 = CSWreadline PACKAGES += CSWlibreadline6 CATALOGNAME_CSWlibreadline6 = libreadline6 SPKG_DESC_CSWlibreadline6 = GNU readline library, libreadline.so.6 PKGFILES_CSWlibreadline6 = $(call pkgfiles_lib,libreadline.so.6) RUNTIME_DEP_PKGS_CSWlibreadline6 += CSWncurses -OBSOLETES_CSWlibreadline6 = CSWreadline +OBSOLETED_BY_CSWlibreadline6 = CSWreadline PACKAGES += CSWlibreadline-dev CATALOGNAME_CSWlibreadline-dev = libreadline_dev Modified: csw/mgar/pkg/rrdtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/trunk/Makefile 2011-03-28 04:47:09 UTC (rev 13972) +++ csw/mgar/pkg/rrdtool/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) @@ -31,7 +31,7 @@ RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibdbi1 RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd4 RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd-th4 -OBSOLETES_CSWrrdtool = CSWrrd +OBSOLETED_BY_CSWrrdtool = CSWrrd PACKAGES += CSWrrdtool-dev CATALOGNAME_CSWrrdtool-dev = rrdtool_dev @@ -73,7 +73,7 @@ PKGFILES_CSWpm-rrdtool += .*\.3perl RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWperl RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWlibrrd4 -OBSOLETES_CSWpm-rrdtool = CSWrrd +OBSOLETED_BY_CSWpm-rrdtool = CSWrrd PACKAGES += CSWpy-rrdtool CATALOGNAME_CSWpy-rrdtool = py_rrdtool @@ -82,7 +82,7 @@ RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibrrd4 RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibintl8 -OBSOLETES_CSWpy-rrdtool = CSWrrd +OBSOLETED_BY_CSWpy-rrdtool = CSWrrd PACKAGES += CSWrb-rrdtool CATALOGNAME_CSWrb-rrdtool = rb_rrdtool @@ -90,7 +90,7 @@ PKGFILES_CSWrb-rrdtool = $(libdir)/ruby/.* RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibruby1 RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibrrd4 -OBSOLETES_CSWrb-rrdtool = CSWrrd +OBSOLETED_BY_CSWrb-rrdtool = CSWrrd # This is crappy and needs fixing, unfortunately inside extconf.rb which is hard. CHECKPKG_OVERRIDES_CSWrb-rrdtool += bad-rpath-entry 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 Mar 28 07:01:12 2011 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Mon, 28 Mar 2011 05:01:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[13974] csw/mgar/pkg Message-ID: Revision: 13974 http://gar.svn.sourceforge.net/gar/?rev=13974&view=rev Author: theferret Date: 2011-03-28 05:01:11 +0000 (Mon, 28 Mar 2011) Log Message: ----------- retry: committing front-end side, of OBSOLETES_ rename to OBSOLETED_BY_ Modified Paths: -------------- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile csw/mgar/pkg/audiofile/trunk/Makefile csw/mgar/pkg/cpan/Algorithm-CheckDigits/trunk/Makefile csw/mgar/pkg/cpan/App-CLI/trunk/Makefile csw/mgar/pkg/cpan/Archive-Extract/trunk/Makefile csw/mgar/pkg/cpan/Authen-SASL/trunk/Makefile csw/mgar/pkg/cpan/CGI-Application/trunk/Makefile csw/mgar/pkg/cpan/CGI-Session/trunk/Makefile csw/mgar/pkg/cpan/Cache-Memcached/trunk/Makefile csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/Makefile csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/Makefile csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile csw/mgar/pkg/cpan/Config-IniFiles/trunk/Makefile csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile csw/mgar/pkg/cpan/DBI/trunk/Makefile csw/mgar/pkg/cpan/Devel-StackTrace/trunk/Makefile csw/mgar/pkg/cpan/File-Fetch/trunk/Makefile csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile csw/mgar/pkg/cpan/HTML-Tagset/trunk/Makefile csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile csw/mgar/pkg/cpan/IO-Socket-INET6/trunk/Makefile csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/Makefile csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile csw/mgar/pkg/cpan/JSON/trunk/Makefile csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile csw/mgar/pkg/cpan/MIME-Base64/trunk/Makefile csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile csw/mgar/pkg/cpan/Module-Signature/trunk/Makefile csw/mgar/pkg/cpan/Net-CIDR/trunk/Makefile csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/Makefile csw/mgar/pkg/cpan/NetAddr-IP/trunk/Makefile csw/mgar/pkg/cpan/Params-Check/trunk/Makefile csw/mgar/pkg/cpan/Pod-POM/trunk/Makefile csw/mgar/pkg/cpan/Pod-Simple/trunk/Makefile csw/mgar/pkg/cpan/Schedule-At/trunk/Makefile csw/mgar/pkg/cpan/Term-UI/trunk/Makefile csw/mgar/pkg/cpan/Test-Deep/trunk/Makefile csw/mgar/pkg/cpan/Test-NoWarnings/trunk/Makefile csw/mgar/pkg/cpan/Text-vFile-asData/trunk/Makefile csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile csw/mgar/pkg/cpan/perl-ldap/trunk/Makefile csw/mgar/pkg/cups/trunk/Makefile csw/mgar/pkg/gardev/trunk/Makefile csw/mgar/pkg/id3lib/trunk/Makefile csw/mgar/pkg/lang-python/docutils/trunk/Makefile csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile csw/mgar/pkg/lang-python/python/trunk/Makefile csw/mgar/pkg/libdbi/trunk/Makefile csw/mgar/pkg/libmad/trunk/Makefile csw/mgar/pkg/libvorbis/trunk/Makefile csw/mgar/pkg/libxslt/trunk/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile csw/mgar/pkg/phpmode/trunk/Makefile csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile csw/mgar/pkg/ruby18/trunk/Makefile csw/mgar/pkg/sox/trunk/Makefile Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -61,7 +61,7 @@ # as various things depend on them currently PACKAGES += CSWap2prefork CSWapache2rt CSWapache2c -OBSOLETES_CSWapache2-dev = CSWapache2-devel +OBSOLETED_BY_CSWapache2-dev = CSWapache2-devel ARCHALL_CSWapache2-manual = 1 ARCHALL_CSWap2prefork = 1 Modified: csw/mgar/pkg/audiofile/trunk/Makefile =================================================================== --- csw/mgar/pkg/audiofile/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/audiofile/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -22,14 +22,14 @@ CATALOGNAME_CSWlibaudiofile0 = libaudiofile0 SPKG_DESC_CSWlibaudiofile0 = Silican Graphics audio file library, libaudiofile.so.0 PKGFILES_CSWlibaudiofile0 = $(call pkgfiles_lib,libaudiofile.so.0) -OBSOLETES_CSWlibaudiofile0 = CSWaudiofile +OBSOLETED_BY_CSWlibaudiofile0 = CSWaudiofile PACKAGES += CSWlibaudiofile-utils CATALOGNAME_CSWlibaudiofile-utils = libaudiofile_utils SPKG_DESC_CSWlibaudiofile-utils = Utility programs from Silicon Graphics audio file library PKGFILES_CSWlibaudiofile-utils = $(call baseisadirs,$(bindir),sf.*) RUNTIME_DEP_PKGS_CSWlibaudiofile-utils += CSWlibaudiofile0 -OBSOLETES_CSWlibaudiofile-utils = CSWaudiofile +OBSOLETED_BY_CSWlibaudiofile-utils = CSWaudiofile PACKAGES += CSWlibaudiofile-dev CATALOGNAME_CSWlibaudiofile-dev = libaudiofile_dev Modified: csw/mgar/pkg/cpan/Algorithm-CheckDigits/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Algorithm-CheckDigits/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/Algorithm-CheckDigits/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -14,7 +14,7 @@ CATALOGNAME_CSWpm-algorithm-checkdigits = pm_algorithm_checkdigits SPKG_DESC_CSWpm-algorithm-checkdigits = $(DESCRIPTION) ARCHALL_CSWpm-algorithm-checkdigits = 1 -OBSOLETES_CSWpm-algorithm-checkdigits = CSWpmalgorithmchkdig +OBSOLETED_BY_CSWpm-algorithm-checkdigits = CSWpmalgorithmchkdig CATALOGNAME_CSWpmalgorithmchkdig = pm_algorithmchkdig include gar/category.mk Modified: csw/mgar/pkg/cpan/App-CLI/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/App-CLI/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/App-CLI/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -16,7 +16,7 @@ CATALOGNAME = pm_app_cli SPKG_DESC_CSWpm-app-cli = $(DESCRIPTION) ARCHALL = 1 -OBSOLETES_CSWpm-app-cli = CSWpmappcli +OBSOLETED_BY_CSWpm-app-cli = CSWpmappcli CATALOGNAME_CSWpmappcli = pm_appcli RUNTIME_DEP_PKGS = CSWpmlclemktxtsimple CSWpmpodsimple Modified: csw/mgar/pkg/cpan/Archive-Extract/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Archive-Extract/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/Archive-Extract/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -18,7 +18,7 @@ CATALOGNAME = pm_archive_extract SPKG_DESC_CSWpm-archive-extract = $(DESCRIPTION) ARCHALL = 1 -OBSOLETES_CSWpm-archive-extract = CSWpmarchiveextract +OBSOLETED_BY_CSWpm-archive-extract = CSWpmarchiveextract CATALOGNAME_CSWpmarchiveextract = pm_archiveextract RUNTIME_DEP_PKGS += CSWpmipccmd CSWpmlclemktxtsimple CSWpmmodloadcond CSWpmprmscheck Modified: csw/mgar/pkg/cpan/Authen-SASL/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Authen-SASL/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/Authen-SASL/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -15,7 +15,7 @@ PACKAGES = CSWpm-authen-sasl CATALOGNAME = pm_authen_sasl SPKG_DESC_CSWpm-authen-sasl = $(DESCRIPTION) -OBSOLETES_CSWpm-authen-sasl = CSWpmauthensasl +OBSOLETED_BY_CSWpm-authen-sasl = CSWpmauthensasl CATALOGNAME_CSWpmauthensasl = pm_authensasl RUNTIME_DEP_PKGS = CSWpmgssapi CSWpmdigesthmac Modified: csw/mgar/pkg/cpan/CGI-Application/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/CGI-Application/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/CGI-Application/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -16,7 +16,7 @@ PACKAGES = CSWpm-cgi-application CATALOGNAME_CSWpm-cgi-application = pm_cgi_application SPKG_DESC_CSWpm-cgi-application = $(DESCRIPTION) -OBSOLETES_CSWpm-cgi-application = CSWpmcgiapp +OBSOLETED_BY_CSWpm-cgi-application = CSWpmcgiapp CATALOGNAME_CSWpmcgiapp = pm_cgiapp ARCHALL = 1 Modified: csw/mgar/pkg/cpan/CGI-Session/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/CGI-Session/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/CGI-Session/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -18,7 +18,7 @@ CATALOGNAME = pm_cgi_session SPKG_DESC_CSWpm-cgi-session = $(DESCRIPTION) ARCHALL = 1 -OBSOLETES_CSWpm-cgi-session = CSWpmcgisession +OBSOLETED_BY_CSWpm-cgi-session = CSWpmcgisession CATALOGNAME_CSWpmcgisession = pm_cgisession include gar/category.mk Modified: csw/mgar/pkg/cpan/Cache-Memcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Cache-Memcached/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/Cache-Memcached/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -14,7 +14,7 @@ PACKAGES = CSWpm-cache-memcached CATALOGNAME_CSWpm-cache-memcached = pm_cache_memcached SPKG_DESC_CSWpm-cache-memcached = $(DESCRIPTION) -OBSOLETES_CSWpm-cache-memcached = CSWpmcachememcached +OBSOLETED_BY_CSWpm-cache-memcached = CSWpmcachememcached CATALOGNAME_CSWpmcachememcached = pm_cachememcached ARCHALL = 1 Modified: csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -13,7 +13,7 @@ PACKAGES = CSWpm-class-accessor-chained CATALOGNAME = pm_class_accessor_chained SPKG_DESC_CSWpm-class-accessor-chained = $(DESCRIPTION) -OBSOLETES_CSWpm-class-accessor-chained = CSWpmclsaccessorchnd +OBSOLETED_BY_CSWpm-class-accessor-chained = CSWpmclsaccessorchnd CATALOGNAME_CSWpmclsaccessorchnd = pm_clsaccessorchnd ARCHALL = 1 Modified: csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -14,7 +14,7 @@ PACKAGES = CSWpm-compress-raw-bzip2 CATALOGNAME = pm_compress_raw_bzip2 SPKG_DESC_CSWpm-compress-raw-bzip2 = $(DESCRIPTION) -OBSOLETES_CSWpm-compress-raw-bzip2 = CSWpmcompressrawbz2 +OBSOLETED_BY_CSWpm-compress-raw-bzip2 = CSWpmcompressrawbz2 CATALOGNAME_CSWpmcompressrawbz2 = pm_compressrawbz2 EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* .*\/man\/man1.* Modified: csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -14,7 +14,7 @@ PACKAGES = CSWpm-compress-raw-zlib CATALOGNAME = pm_compress_raw_zlib SPKG_DESC_CSWpm-compress-raw-zlib = $(DESCRIPTION) -OBSOLETES_CSWpm-compress-raw-zlib = CSWpmcompressrawzlib +OBSOLETED_BY_CSWpm-compress-raw-zlib = CSWpmcompressrawzlib CATALOGNAME_CSWpmcompressrawzlib = pm_compressrawzlib EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* .*\/man\/man1.* Modified: csw/mgar/pkg/cpan/Config-IniFiles/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Config-IniFiles/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/Config-IniFiles/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -16,7 +16,7 @@ PACKAGES = CSWpm-config-inifiles CATALOGNAME_CSWpm-config-inifiles = pm_config_inifiles SPKG_DESC_CSWpm-config-inifiles = $(DESCRIPTION) -OBSOLETES_CSWpm-config-inifiles = CSWpmcfginifls +OBSOLETED_BY_CSWpm-config-inifiles = CSWpmcfginifls CATALOGNAME_CSWpmcfginifls = pm_configinifiles ARCHALL = 1 Modified: csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -14,7 +14,7 @@ PACKAGES = CSWpm-dbd-sqlite CATALOGNAME = pm_dbd_sqlite SPKG_DESC_CSWpm-dbd-sqlite = $(DESCRIPTION) -OBSOLETES_CSWpm-dbd-sqlite = CSWpmdbdsqlite +OBSOLETED_BY_CSWpm-dbd-sqlite = CSWpmdbdsqlite CATALOGNAME_CSWpmdbdsqlite = pm_dbdsqlite RUNTIME_DEP_PKGS = CSWpmdbi Modified: csw/mgar/pkg/cpan/DBI/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBI/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/DBI/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -17,7 +17,7 @@ PACKAGES = CSWpm-dbi CATALOGNAME = pm_dbi SPKG_DESC_CSWpm-dbi = $(DESCRIPTION) -OBSOLETES_CSWpm-dbi = CSWpmdbi +OBSOLETED_BY_CSWpm-dbi = CSWpmdbi CATALOGNAME_CSWpmdbi = pm_dbi_stub CHECKPKG_OVERRIDES_CSWpm-dbi += file-with-bad-content|/usr/local|root/opt/csw/lib/perl/csw/DBD/File.pm Modified: csw/mgar/pkg/cpan/Devel-StackTrace/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Devel-StackTrace/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/Devel-StackTrace/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -13,7 +13,7 @@ CATALOGNAME_CSWpm-devel-stacktrace = pm_devel_stacktrace SPKG_DESC_CSWpm-devel-stacktrace = $(DESCRIPTION) ARCHALL_CSWpm-devel-stacktrace = 1 -OBSOLETES_CSWpm-devel-stacktrace = CSWpmdevstacktrace +OBSOLETED_BY_CSWpm-devel-stacktrace = CSWpmdevstacktrace CATALOGNAME_CSWpmdevstacktrace = pm_devstacktrace include gar/category.mk Modified: csw/mgar/pkg/cpan/File-Fetch/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/File-Fetch/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/File-Fetch/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -15,7 +15,7 @@ PACKAGES = CSWpm-file-fetch CATALOGNAME = pm_file_fetch SPKG_DESC_CSWpm-file-fetch = $(DESCRIPTION) -OBSOLETES_CSWpm-file-fetch = CSWpmfilefetch +OBSOLETED_BY_CSWpm-file-fetch = CSWpmfilefetch CATALOGNAME_CSWpmfilefetch = pm_filefetch ARCHALL = 1 Modified: csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -13,7 +13,7 @@ PACKAGES = CSWpm-gssapi CATALOGNAME = pm_gssapi SPKG_DESC_CSWpm-gssapi = $(DESCRIPTION) -OBSOLETES_CSWpm-gssapi = CSWpmgssapi +OBSOLETED_BY_CSWpm-gssapi = CSWpmgssapi CATALOGNAME_CSWpmgssapi = pm_gssapi_stub RUNTIME_DEP_PKGS = CSWkrb5lib Modified: csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -17,7 +17,7 @@ CATALOGNAME = pm_geo_ip_pureperl SPKG_DESC_CSWpm-geo-ip-pureperl = $(DESCRIPTION) ARCHALL = 1 -OBSOLETES_CSWpm-geo-ip-pureperl = CSWpmgeoippureperl +OBSOLETED_BY_CSWpm-geo-ip-pureperl = CSWpmgeoippureperl CATALOGNAME_CSWpmgeoippureperl = pm_geoippureperl UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -16,7 +16,7 @@ PACKAGES = CSWpm-html-parser CATALOGNAME = pm_html_parser SPKG_DESC_CSWpm-html-parser = $(DESCRIPTION) -OBSOLETES_CSWpm-html-parser = CSWpmhtmlparser +OBSOLETED_BY_CSWpm-html-parser = CSWpmhtmlparser CATALOGNAME_CSWpmhtmlparser = pm_htmlparser RUNTIME_DEP_PKGS = CSWpm-html-tagset Modified: csw/mgar/pkg/cpan/HTML-Tagset/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/HTML-Tagset/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/HTML-Tagset/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -14,7 +14,7 @@ PACKAGES = CSWpm-html-tagset CATALOGNAME = pm_html_tagset SPKG_DESC_CSWpm-html-tagset = $(DESCRIPTION) -OBSOLETES_CSWpm-html-tagset = CSWpmhtmltagset +OBSOLETED_BY_CSWpm-html-tagset = CSWpmhtmltagset CATALOGNAME_CSWpmhtmltagset = pm_htmltagset # CONFIGURE_ARGS = -n Modified: csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -25,7 +25,7 @@ PACKAGES = CSWpm-io-compress CATALOGNAME = pm_io_compress SPKG_DESC_CSWpm-io-compress = $(DESCRIPTION) -OBSOLETES_CSWpm-io-compress = CSWpmiocompress +OBSOLETED_BY_CSWpm-io-compress = CSWpmiocompress CATALOGNAME_CSWpmiocompress = pm_iocompress ARCHALL = 1 Modified: csw/mgar/pkg/cpan/IO-Socket-INET6/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IO-Socket-INET6/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/IO-Socket-INET6/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -14,7 +14,7 @@ CATALOGNAME = pm_io_socket_inet6 ARCHALL = 1 SPKG_DESC_CSWpm-io-socket-inet6 = $(DESCRIPTION) -OBSOLETES_CSWpm-io-socket-inet6 = CSWpmiosocketinet6 +OBSOLETED_BY_CSWpm-io-socket-inet6 = CSWpmiosocketinet6 CATALOGNAME_CSWpmiosocketinet6 = pm_iosocketinet6 include gar/category.mk Modified: csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -18,7 +18,7 @@ PACKAGES = CSWpm-io-socket-ssl CATALOGNAME = pm_io_socket_ssl SPKG_DESC_CSWpm-io-socket-ssl = $(DESCRIPTION) -OBSOLETES_CSWpm-io-socket-ssl = CSWpmiosocketssl +OBSOLETED_BY_CSWpm-io-socket-ssl = CSWpmiosocketssl CATALOGNAME_CSWpmiosocketssl = pm_iosocketssl ARCHALL = 1 Modified: csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -15,7 +15,7 @@ CATALOGNAME = pm_ipc_cmd SPKG_DESC_CSWpm-ipc-cmd = $(DESCRIPTION) ARCHALL = 1 -OBSOLETES_CSWpm-ipc-cmd = CSWpmipccmd +OBSOLETED_BY_CSWpm-ipc-cmd = CSWpmipccmd CATALOGNAME_CSWpmipccmd = pm_ipccmd RUNTIME_DEP_PKGS = CSWpmlclemktxtsimple CSWpmmodloadcond CSWpmprmscheck Modified: csw/mgar/pkg/cpan/JSON/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/JSON/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/JSON/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -14,7 +14,7 @@ CATALOGNAME = pm_json SPKG_DESC_CSWpm-json = $(DESCRIPTION) ARCHALL = 1 -OBSOLETES_CSWpm-json = CSWpmjson +OBSOLETED_BY_CSWpm-json = CSWpmjson CATALOGNAME_CSWpmjson = pm_json_stub include gar/category.mk Modified: csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -15,7 +15,7 @@ CATALOGNAME = pm_log_message_simple SPKG_DESC_CSWpm-log-message-simple = $(DESCRIPTION) ARCHALL = 1 -OBSOLETES_CSWpm-log-message-simple = CSWpmlogmsgsimple +OBSOLETED_BY_CSWpm-log-message-simple = CSWpmlogmsgsimple CATALOGNAME_CSWpmlogmsgsimple = pm_logmsgsimple EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* .*\/man\/man1.* Modified: csw/mgar/pkg/cpan/MIME-Base64/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/MIME-Base64/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/MIME-Base64/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -13,7 +13,7 @@ PACKAGES = CSWpm-mime-base64 CATALOGNAME = pm_mime_base64 SPKG_DESC_CSWpm-mime-base64 = $(DESCRIPTION) -OBSOLETES_CSWpm-mime-base64 = CSWpmmimebase64 +OBSOLETED_BY_CSWpm-mime-base64 = CSWpmmimebase64 CATALOGNAME_CSWpmmimebase64 = pm_mimebase64 EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod .*\/man\/.* Modified: csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -15,7 +15,7 @@ CATALOGNAME = pm_module_load_conditional SPKG_DESC_CSWpm-module-load-conditional = $(DESCRIPTION) ARCHALL = 1 -OBSOLETES_CSWpm-module-load-conditional = CSWpmmodloadcond +OBSOLETED_BY_CSWpm-module-load-conditional = CSWpmmodloadcond CATALOGNAME_CSWpmmodloadcond = pm_modloadcond RUNTIME_DEP_PKGS = CSWpmprmscheck CSWpmmodload CSWpmlclemktxtsimple Modified: csw/mgar/pkg/cpan/Module-Signature/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Signature/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/Module-Signature/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -15,7 +15,7 @@ CATALOGNAME = pm_module_signature SPKG_DESC_CSWpm-module-signature = $(DESCRIPTION) ARCHALL = 1 -OBSOLETES_CSWpm-module-signature = CSWpmmodulesign +OBSOLETED_BY_CSWpm-module-signature = CSWpmmodulesign CATALOGNAME_CSWpmmodulesign = pm_modulesign RUNTIME_DEP_PKGS += CSWgnupg Modified: csw/mgar/pkg/cpan/Net-CIDR/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-CIDR/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/Net-CIDR/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -16,7 +16,7 @@ PACKAGES = CSWpm-net-cidr CATALOGNAME = pm_net_cidr SPKG_DESC_CSWpm-net-cidr = $(DESCRIPTION) -OBSOLETES_CSWpm-net-cidr = CSWpmnetcidr +OBSOLETED_BY_CSWpm-net-cidr = CSWpmnetcidr CATALOGNAME_CSWpmnetcidr = pm_netcidr ARCHALL = 1 Modified: csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -11,7 +11,7 @@ PACKAGES = CSWpm-net-idn-encode CATALOGNAME = pm_net_idn_encode SPKG_DESC_CSWpm-net-idn-encode = $(DESCRIPTION) -OBSOLETES_CSWpm-net-idn-encode = CSWpmnetidnencode +OBSOLETED_BY_CSWpm-net-idn-encode = CSWpmnetidnencode CATALOGNAME_CSWpmnetidnencode = pm_netidnencode ARCHALL = 1 Modified: csw/mgar/pkg/cpan/NetAddr-IP/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/NetAddr-IP/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/NetAddr-IP/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -13,7 +13,7 @@ PACKAGES = CSWpm-netaddr-ip CATALOGNAME = pm_netaddr_ip SPKG_DESC_CSWpm-netaddr-ip = $(DESCRIPTION) -OBSOLETES_CSWpm-netaddr-ip = CSWpmnetaddrip +OBSOLETED_BY_CSWpm-netaddr-ip = CSWpmnetaddrip CATALOGNAME_CSWpmnetaddrip = pm_netaddrip # One IPv6 related test fails, make sure to check all others Modified: csw/mgar/pkg/cpan/Params-Check/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Params-Check/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/Params-Check/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -15,7 +15,7 @@ PACKAGES = CSWpm-params-check CATALOGNAME = pm_params_check SPKG_DESC_CSWpm-params-check = $(DESCRIPTION) -OBSOLETES_CSWpm-params-check = CSWpmprmscheck +OBSOLETED_BY_CSWpm-params-check = CSWpmprmscheck CATALOGNAME_CSWpmprmscheck = pm_prmscheck ARCHALL = 1 Modified: csw/mgar/pkg/cpan/Pod-POM/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Pod-POM/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/Pod-POM/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -20,7 +20,7 @@ PACKAGES = CSWpm-pod-pom CATALOGNAME_CSWpm-pod-pom = pm_pod_pom SPKG_DESC_CSWpm-pod-pom = $(DESCRIPTION) -OBSOLETES_CSWpm-pod-pom = CSWpmpodpom +OBSOLETED_BY_CSWpm-pod-pom = CSWpmpodpom CATALOGNAME_CSWpmpodpom = pm_podpom ARCHALL = 1 Modified: csw/mgar/pkg/cpan/Pod-Simple/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Pod-Simple/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/Pod-Simple/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -16,7 +16,7 @@ PACKAGES = CSWpm-pod-simple CATALOGNAME = pm_pod_simple SPKG_DESC_CSWpm-pod-simple = $(DESCRIPTION) -OBSOLETES_CSWpm-pod-simple = CSWpmpodsimple +OBSOLETED_BY_CSWpm-pod-simple = CSWpmpodsimple CATALOGNAME_CSWpmpodsimple = pm_podsimple ARCHALL = 1 Modified: csw/mgar/pkg/cpan/Schedule-At/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Schedule-At/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/Schedule-At/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -13,7 +13,7 @@ PACKAGES = CSWpm-schedule-at CATALOGNAME = pm_schedule_at SPKG_DESC_CSWpm-schedule-at = $(DESCRIPTION) -OBSOLETES_CSWpm-schedule-at = CSWpmscheduleat +OBSOLETED_BY_CSWpm-schedule-at = CSWpmscheduleat CATALOGNAME_CSWpmscheduleat = pm_scheduleat ARCHALL = 1 Modified: csw/mgar/pkg/cpan/Term-UI/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Term-UI/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/Term-UI/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -15,7 +15,7 @@ PACKAGES = CSWpm-term-ui CATALOGNAME = pm_term_ui SPKG_DESC_CSWpm-term-ui = $(DESCRIPTION) -OBSOLETES_CSWpm-term-ui = CSWpmtermui +OBSOLETED_BY_CSWpm-term-ui = CSWpmtermui CATALOGNAME_CSWpmtermui = pm_termui ARCHALL = 1 Modified: csw/mgar/pkg/cpan/Test-Deep/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-Deep/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/Test-Deep/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -13,7 +13,7 @@ PACKAGES = CSWpm-test-deep CATALOGNAME = pm_test_deep SPKG_DESC_CSWpm-test-deep = $(DESCRIPTION) -OBSOLETES_CSWpm-test-deep = CSWpmtestdeep +OBSOLETED_BY_CSWpm-test-deep = CSWpmtestdeep CATALOGNAME_CSWpmtestdeep = pm_testdeep ARCHALL = 1 Modified: csw/mgar/pkg/cpan/Test-NoWarnings/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-NoWarnings/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/Test-NoWarnings/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -11,7 +11,7 @@ PACKAGES = CSWpm-test-nowarnings CATALOGNAME = pm_test_nowarnings SPKG_DESC_CSWpm-test-nowarnings = $(DESCRIPTION) -OBSOLETES_CSWpm-test-nowarnings = CSWpmtestnowarnings +OBSOLETED_BY_CSWpm-test-nowarnings = CSWpmtestnowarnings CATALOGNAME_CSWpmtestnowarnings = pm_testnowarnings ARCHALL = 1 Modified: csw/mgar/pkg/cpan/Text-vFile-asData/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-vFile-asData/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/Text-vFile-asData/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -13,7 +13,7 @@ PACKAGES = CSWpm-text-vfile-asdata CATALOGNAME = pm_text_vfile_asdata SPKG_DESC_CSWpm-text-vfile-asdata = $(DESCRIPTION) -OBSOLETES_CSWpm-text-vfile-asdata = CSWpmtextvfileasdata +OBSOLETED_BY_CSWpm-text-vfile-asdata = CSWpmtextvfileasdata CATALOGNAME_CSWpmtextvfileasdata = pm_textvfileasdata ARCHALL = 1 Modified: csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -13,7 +13,7 @@ PACKAGES = CSWpm-www-curl CATALOGNAME = pm_www_curl SPKG_DESC_CSWpm-www-curl = $(DESCRIPTION) -OBSOLETES_CSWpm-www-curl = CSWpmwwwcurl +OBSOLETED_BY_CSWpm-www-curl = CSWpmwwwcurl CATALOGNAME_CSWpmwwwcurl = pm_wwwcurl RUNTIME_DEP_PKGS += CSWcurlrt Modified: csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -17,7 +17,7 @@ CATALOGNAME = pm_libwww_perl SPKG_DESC_CSWpm-libwww-perl = $(DESCRIPTION) ARCHALL = 1 -OBSOLETES_CSWpm-libwww-perl = CSWpmlibwww +OBSOLETED_BY_CSWpm-libwww-perl = CSWpmlibwww CATALOGNAME_CSWpmlibwww = pm_libwww RUNTIME_DEP_PKGS = CSWpmhtmltagset CSWpmuri CSWpmhtmlparser CSWpmiocompress CSWpmhtmlfmt CSWpmmimebase64 Modified: csw/mgar/pkg/cpan/perl-ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/perl-ldap/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cpan/perl-ldap/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -17,7 +17,7 @@ CATALOGNAME = pm_ldap SPKG_DESC_CSWpm-ldap = $(DESCRIPTION) ARCHALL = 1 -OBSOLETES_CSWpm-ldap = CSWpmldap +OBSOLETED_BY_CSWpm-ldap = CSWpmldap CATALOGNAME_CSWpmldap = pm_ldap_stub # Harmless /usr/local references Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/cups/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -194,8 +194,8 @@ RUNTIME_DEP_PKGS_CSWcups-dev += CSWlibcupsimage2 RUNTIME_DEP_PKGS_CSWcups-dev += CSWlibcupscgi1 -OBSOLETES_CSWcups-dev += CSWcups-devel -OBSOLETES_CSWcups-dev += CSWcupsdev +OBSOLETED_BY_CSWcups-dev += CSWcups-devel +OBSOLETED_BY_CSWcups-dev += CSWcupsdev # Former devel package PACKAGES += CSWcupsdev Modified: csw/mgar/pkg/gardev/trunk/Makefile =================================================================== --- csw/mgar/pkg/gardev/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/gardev/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -14,7 +14,7 @@ PACKAGES = CSWgar-dev CATALOGNAME_CSWgar-dev = gar_dev SPKG_DESC_CSWgar-dev = $(DESCRIPTION) -OBSOLETES_CSWgar-dev = CSWgardevel +OBSOLETED_BY_CSWgar-dev = CSWgardevel # git and netcat are required if a GAR repo is tracking a git repo instead # of upstream tarballs. svn is required for commiting gar recipes Modified: csw/mgar/pkg/id3lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/id3lib/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/id3lib/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -34,7 +34,7 @@ RUNTIME_DEP_PKGS_CSWlibid3-utils += CSWlibid3-3-8-3 RUNTIME_DEP_PKGS_CSWlibid3-utils += CSWiconv RUNTIME_DEP_PKGS_CSWlibid3-utils += CSWzlib -OBSOLETES_CSWlibid3-utils = CSWid3lib +OBSOLETED_BY_CSWlibid3-utils = CSWid3lib EXTRA_LDFLAGS = -norunpath Modified: csw/mgar/pkg/lang-python/docutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/docutils/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/lang-python/docutils/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -16,7 +16,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.gz INCOMPATIBLE_PKGS_CSWpy-docutils = CSWzope -OBSOLETES_CSWpy-docutils = CSWpydocutils +OBSOLETED_BY_CSWpy-docutils = CSWpydocutils CATALOGNAME_CSWpydocutils = pydocutils ARCHALL_CSWpy-docutils = 1 CHECKPKG_OVERRIDES_CSWpydocutils += surplus-dependency|CSWpython Modified: csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -20,7 +20,7 @@ SPKG_DESC_CSWpy-mysql = MySQL Support for Python -OBSOLETES_CSWpy-mysql = CSWpymysql +OBSOLETED_BY_CSWpy-mysql = CSWpymysql CATALOGNAME_CSWpymysql = pymysql mysql_prefix = $(prefix)/mysql5 Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/lang-python/python/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -95,7 +95,7 @@ PACKAGES += CSWlibpython$(DVER)-1-0 INCOMPATIBLE_PKGS_CSWpython$(CVER) = CSWpydistutils -OBSOLETES_CSWpython$(CVER)-dev = CSWpython$(CVER)-devel +OBSOLETED_BY_CSWpython$(CVER)-dev = CSWpython$(CVER)-devel PKGFILES_CSWidle$(CVER) = $(libdir)/.*/idlelib/.* PKGFILES_CSWidle$(CVER) += $(bindir)/idle Modified: csw/mgar/pkg/libdbi/trunk/Makefile =================================================================== --- csw/mgar/pkg/libdbi/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/libdbi/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -25,7 +25,7 @@ CATALOGNAME_CSWlibdbi-dev = libdbi_dev SPKG_DESC_CSWlibdbi-dev = Development files for libdbi.so.1 RUNTIME_DEP_PKGS_CSWlibdbi-dev = CSWlibdbi1 -OBSOLETES_CSWlibdbi-dev = CSWlibdbi-devel +OBSOLETED_BY_CSWlibdbi-dev = CSWlibdbi-devel BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/libmad/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmad/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/libmad/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -23,7 +23,7 @@ CATALOGNAME_CSWlibmad0 = libmad0 SPKG_DESC_CSWlibmad0 = MPEG audio decoder library, libmad.so.0 PKGFILES_CSWlibmad0 += $(call pkgfiles_lib,libmad.so.0) -OBSOLETES_CSWlibmad0 = CSWlibmad +OBSOLETED_BY_CSWlibmad0 = CSWlibmad PACKAGES += CSWlibmad-dev CATALOGNAME_CSWlibmad-dev = libmad_dev Modified: csw/mgar/pkg/libvorbis/trunk/Makefile =================================================================== --- csw/mgar/pkg/libvorbis/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/libvorbis/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -22,7 +22,7 @@ PKGFILES_CSWlibvorbis0 += $(call baseisadirs,$(libdir),libvorbis\.so\.0(\.\d+)*) RUNTIME_DEP_PKGS_CSWlibvorbis0 += CSWlibogg0 RUNTIME_DEP_PKGS_CSWlibvorbis0 += CSWsunmath -OBSOLETES_CSWlibvorbis0 = CSWvorbis +OBSOLETED_BY_CSWlibvorbis0 = CSWvorbis PACKAGES += CSWlibvorbisenc2 CATALOGNAME_CSWlibvorbisenc2 = libvorbisenc2 @@ -31,7 +31,7 @@ RUNTIME_DEP_PKGS_CSWlibvorbisenc2 += CSWlibogg0 RUNTIME_DEP_PKGS_CSWlibvorbisenc2 += CSWlibvorbis0 RUNTIME_DEP_PKGS_CSWlibvorbisenc2 += CSWsunmath -OBSOLETES_CSWlibvorbisenc2 = CSWvorbis +OBSOLETED_BY_CSWlibvorbisenc2 = CSWvorbis PACKAGES += CSWlibvorbisfile3 CATALOGNAME_CSWlibvorbisfile3 = libvorbisfile3 @@ -40,7 +40,7 @@ RUNTIME_DEP_PKGS_CSWlibvorbisfile3 += CSWlibogg0 RUNTIME_DEP_PKGS_CSWlibvorbisfile3 += CSWlibvorbis0 RUNTIME_DEP_PKGS_CSWlibvorbisfile3 += CSWsunmath -OBSOLETES_CSWlibvorbisfile3 = CSWvorbis +OBSOLETED_BY_CSWlibvorbisfile3 = CSWvorbis PACKAGES += CSWlibvorbis-dev CATALOGNAME_CSWlibvorbis-dev = libvorbis_dev Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -23,7 +23,7 @@ PACKAGES += CSWlibxslt-dev CATALOGNAME_CSWlibxslt-dev = libxslt_dev SPKG_DESC_CSWlibxslt-dev = XSLT engine development package -OBSOLETES_CSWlibxslt-dev = CSWlibxsltdevel +OBSOLETED_BY_CSWlibxslt-dev = CSWlibxsltdevel RUNTIME_DEP_PKGS_CSWlibxslt-dev = CSWlibxslt RUNTIME_DEP_PKGS_CSWlibxslt-dev += CSWlibxslt1 RUNTIME_DEP_PKGS_CSWlibxslt-dev += CSWlibexslt0 @@ -35,7 +35,7 @@ PACKAGES += CSWpy-libxslt CATALOGNAME_CSWpy-libxslt = py_libxslt SPKG_DESC_CSWpy-libxslt = XSLT engine python package -OBSOLETES_CSWpy-libxslt = CSWpylibxslt +OBSOLETED_BY_CSWpy-libxslt = CSWpylibxslt RUNTIME_DEP_PKGS_CSWpy-libxslt = CSWpython RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxslt1 RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibexslt0 Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -53,13 +53,13 @@ PKGFILES_CSWlibmysqlclient15 += $(call baseisadirs,$(libdir),libmysqlclient\.so\.15(\.\d+)*) SPKG_DESC_CSWlibmysqlclient15 += MySQL $(BASE_VERSION) client library, libmysqlclient.so.15 RUNTIME_DEP_PKGS_CSWlibmysqlclient15 += CSWzlib -OBSOLETES_CSWlibmysqlclient15 += CSWmysql5rt +OBSOLETED_BY_CSWlibmysqlclient15 += CSWmysql5rt PACKAGES += CSWlibmysqlclient-r15 PKGFILES_CSWlibmysqlclient-r15 += $(call baseisadirs,$(libdir),libmysqlclient_r\.so\.15(\.\d+)*) SPKG_DESC_CSWlibmysqlclient-r15 += MySQL $(BASE_VERSION) client library, libmysqlclient_r.so.15 RUNTIME_DEP_PKGS_CSWlibmysqlclient-r15 += CSWzlib -OBSOLETES_CSWlibmysqlclient-r15 += CSWmysql5rt +OBSOLETED_BY_CSWlibmysqlclient-r15 += CSWmysql5rt PACKAGES += CSW$(NAME)client SPKG_DESC_CSW$(NAME)client = MySQL $(BASE_VERSION) client binaries Modified: csw/mgar/pkg/phpmode/trunk/Makefile =================================================================== --- csw/mgar/pkg/phpmode/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/phpmode/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -20,7 +20,7 @@ CATALOGNAME_CSWphp-mode = php_mode RUNTIME_DEP_PKGS_CSWphp-mode = CSWemacscommon CSWemacssitestart CHECKPKG_OVERRIDES_CSWphp-mode += surplus-dependency|CSWemacssitestart -OBSOLETES_CSWphp-mode = CSWphpmode +OBSOLETED_BY_CSWphp-mode = CSWphpmode ARCHALL = 1 Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -207,7 +207,7 @@ SPKG_DESC_CSWlibpq5 += PostgreSQL C client library (built from $(BASE_VERSION).x sources), libpq.so.5 RUNTIME_DEP_PKGS_CSWlibpq5 += CSWosslrt RUNTIME_DEP_PKGS_CSWlibpq5 += CSWkrb5lib -OBSOLETES_CSWlibpq5 += CSWlibpq +OBSOLETED_BY_CSWlibpq5 += CSWlibpq PACKAGES += CSWlibecpg6 CATALOGNAME_CSWlibecpg6 = libecpg6 @@ -215,7 +215,7 @@ SPKG_DESC_CSWlibecpg6 += Embedded PostgreSQL for C library (built from $(BASE_VERSION).x sources), libecpg.so.6 RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpgtypes3 RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpq5 -OBSOLETES_CSWlibecpg6 += CSWlibpq +OBSOLETED_BY_CSWlibecpg6 += CSWlibpq PACKAGES += CSWlibecpg-compat3 CATALOGNAME_CSWlibecpg-compat3 = libecpg_compat3 @@ -224,14 +224,14 @@ RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibecpg6 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpgtypes3 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpq5 -OBSOLETES_CSWlibecpg-compat3 = CSWlibpq +OBSOLETED_BY_CSWlibecpg-compat3 = CSWlibpq PACKAGES += CSWlibpgtypes3 CATALOGNAME_CSWlibpgtypes3 = libpgtypes3 PKGFILES_CSWlibpgtypes3 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.3\.0) PKGFILES_CSWlibpgtypes3 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.3(\.\d+)*) SPKG_DESC_CSWlibpgtypes3 += Used by programs built with ecpg (Embedded PostgreSQL for C, from $(BASE_VERSION).x sources), libpgtypes.so.3 -OBSOLETES_CSWlibpgtypes3 = CSWlibpq +OBSOLETED_BY_CSWlibpgtypes3 = CSWlibpq PACKAGES += CSWlibpq-dev CATALOGNAME_CSWlibpq-dev = libpq_dev @@ -266,26 +266,26 @@ PKGFILES_CSWlibpq3 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.3(\.\d+)*) SPKG_DESC_CSWlibpq3 += PostgreSQL C client library, libpq.so.3 RUNTIME_DEP_PKGS_CSWlibpq3 += CSWosslrt -OBSOLETES_CSWlibpq3 = CSWlibpq +OBSOLETED_BY_CSWlibpq3 = CSWlibpq PACKAGES += CSWlibpq4 CATALOGNAME_CSWlibpq4 = libpq4 PKGFILES_CSWlibpq4 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.4(\.\d+)*) SPKG_DESC_CSWlibpq4 += PostgreSQL C client library, libpq.so.4 RUNTIME_DEP_PKGS_CSWlibpq4 += CSWosslrt -OBSOLETES_CSWlibpq4 = CSWlibpq +OBSOLETED_BY_CSWlibpq4 = CSWlibpq PACKAGES += CSWlibpgtypes1 CATALOGNAME_CSWlibpgtypes1 = libpgtypes1 PKGFILES_CSWlibpgtypes1 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.1(\.\d+)*) SPKG_DESC_CSWlibpgtypes1 += Used by programs built with ecpg (Embedded PostgreSQL for C), libpgtypes.so.1 -OBSOLETES_CSWlibpgtypes1 = CSWlibpq +OBSOLETED_BY_CSWlibpgtypes1 = CSWlibpq PACKAGES += CSWlibpgtypes2 CATALOGNAME_CSWlibpgtypes2 = libpgtypes2 PKGFILES_CSWlibpgtypes2 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.2(\.\d+)*) SPKG_DESC_CSWlibpgtypes2 += Used by programs built with ecpg (Embedded PostgreSQL for C), libpgtypes.so.2 -OBSOLETES_CSWlibpgtypes2 = CSWlibpq +OBSOLETED_BY_CSWlibpgtypes2 = CSWlibpq PACKAGES += CSWlibecpg4 CATALOGNAME_CSWlibecpg4 = libecpg4 @@ -294,7 +294,7 @@ RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWlibpgtypes1 RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWosslrt RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWlibpq3 -OBSOLETES_CSWlibecpg4 += CSWlibpq +OBSOLETED_BY_CSWlibecpg4 += CSWlibpq PACKAGES += CSWlibecpg5 CATALOGNAME_CSWlibecpg5 = libecpg5 @@ -302,7 +302,7 @@ SPKG_DESC_CSWlibecpg5 += Embedded PostgreSQL for C library, libecpg.so.5 RUNTIME_DEP_PKGS_CSWlibecpg5 += CSWlibpgtypes2 RUNTIME_DEP_PKGS_CSWlibecpg5 += CSWlibpq5 -OBSOLETES_CSWlibecpg5 += CSWlibpq +OBSOLETED_BY_CSWlibecpg5 += CSWlibpq PACKAGES += CSWlibecpg-compat2 CATALOGNAME_CSWlibecpg-compat2 = libecpg_compat2 @@ -311,7 +311,7 @@ RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibpgtypes2 RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibecpg5 RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibpq5 -OBSOLETES_CSWlibecpg-compat2 = CSWlibpq +OBSOLETED_BY_CSWlibecpg-compat2 = CSWlibpq # This occurrence is okay. Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -18,12 +18,12 @@ MERGE_SCRIPTS_isa-default-compiler-sun = copy-all MERGE_SCRIPTS_isa-default-compiler-gcc4 = copy-custom -OBSOLETES_CSWruby18 = CSWruby -OBSOLETES_CSWruby18-doc = CSWrubydoc -OBSOLETES_CSWruby18-tk = CSWrubytk -OBSOLETES_CSWruby18-dev = CSWrubydev -OBSOLETES_CSWruby18-mode = CSWrubymode -OBSOLETES_CSWruby18-mode-el = CSWrubymodeel +OBSOLETED_BY_CSWruby18 = CSWruby +OBSOLETED_BY_CSWruby18-doc = CSWrubydoc +OBSOLETED_BY_CSWruby18-tk = CSWrubytk +OBSOLETED_BY_CSWruby18-dev = CSWrubydev +OBSOLETED_BY_CSWruby18-mode = CSWrubymode +OBSOLETED_BY_CSWruby18-mode-el = CSWrubymodeel ALTERNATIVES_CSWruby18 = ruby rbconfig18 ALTERNATIVE_ruby = $(bindir)/ruby ruby $(bindir)/ruby18 10 $(bindir)/irb irb $(bindir)/irb18 $(bindir)/erb erb $(bindir)/erb18 $(bindir)/rdoc rdoc $(bindir)/rdoc18 $(bindir)/ri ri $(bindir)/ri18 $(bindir)/testrb testrb $(bindir)/testrb18 $(mandir)/man1/ruby.1 ruby.1 $(mandir)/man1/ruby18.1 Modified: csw/mgar/pkg/sox/trunk/Makefile =================================================================== --- csw/mgar/pkg/sox/trunk/Makefile 2011-03-28 04:55:29 UTC (rev 13973) +++ csw/mgar/pkg/sox/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) @@ -61,7 +61,7 @@ PKGFILES_CSWlibsox-dev += $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWlibsox-dev = CSWlibsox1 -OBSOLETES_CSWlibsox-dev = CSWlibsoxdevel +OBSOLETED_BY_CSWlibsox-dev = CSWlibsoxdevel CATALOGNAME_CSWlibsoxdevel = libsox_devel BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWsox) 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 Mar 28 10:47:14 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Mar 2011 08:47:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[13975] csw/mgar/gar/v2/lib/python/package.py Message-ID: Revision: 13975 http://gar.svn.sourceforge.net/gar/?rev=13975&view=rev Author: wahwah Date: 2011-03-28 08:47:14 +0000 (Mon, 28 Mar 2011) Log Message: ----------- checkpkg: Change GetDependencies to 'with' Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package.py Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2011-03-28 05:01:11 UTC (rev 13974) +++ csw/mgar/gar/v2/lib/python/package.py 2011-03-28 08:47:14 UTC (rev 13975) @@ -346,16 +346,15 @@ depend_file_path = os.path.join(self.directory, "install", "depend") if not os.path.exists(depend_file_path): return depends - fd = open(os.path.join(self.directory, "install", "depend"), "r") - # It needs to be a list because there might be duplicates and it's - # necessary to carry that information. - for line in fd: - fields = re.split(c.WS_RE, line) - if fields[0] == "P": - pkgname = fields[1] - pkg_desc = " ".join(fields[1:]) - depends.append((pkgname, pkg_desc)) - fd.close() + with open(depend_file_path, "r") as fd: + # It needs to be a list because there might be duplicates and it's + # necessary to carry that information. + for line in fd: + fields = re.split(c.WS_RE, line) + if fields[0] == "P": + pkgname = fields[1] + pkg_desc = " ".join(fields[1:]) + depends.append((pkgname, pkg_desc)) return depends def GetObsoletedBy(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 Mon Mar 28 10:47:49 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Mar 2011 08:47:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[13976] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Message-ID: Revision: 13976 http://gar.svn.sourceforge.net/gar/?rev=13976&view=rev Author: wahwah Date: 2011-03-28 08:47:49 +0000 (Mon, 28 Mar 2011) Log Message: ----------- checkpkg: Random cleanup Removed an extra line Improved an on-screen message Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-03-28 08:47:14 UTC (rev 13975) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-03-28 08:47:49 UTC (rev 13976) @@ -374,7 +374,7 @@ if successful: metadata = json.loads(d.getvalue()) else: - logging.info("Data for %s not found" % repr(md5_sum)) + logging.info("Metadata for %s were not found in the database" % repr(md5_sum)) return successful, metadata def _PostFile(self, filename): 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 Mar 28 10:48:23 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Mar 2011 08:48:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[13977] csw/mgar/gar/v2/lib/python Message-ID: Revision: 13977 http://gar.svn.sourceforge.net/gar/?rev=13977&view=rev Author: wahwah Date: 2011-03-28 08:48:23 +0000 (Mon, 28 Mar 2011) Log Message: ----------- checkpkg: Using unittest2 in two files Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py 2011-03-28 08:47:49 UTC (rev 13976) +++ csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py 2011-03-28 08:48:23 UTC (rev 13977) @@ -1,5 +1,6 @@ #!/usr/bin/env python2.6 +import unittest2 as unittest import checkpkg_lib import copy import cPickle @@ -13,7 +14,6 @@ import sqlobject import tag import test_base -import unittest from testdata import stubs from testdata.neon_stats import pkgstats as neon_stats Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py 2011-03-28 08:47:49 UTC (rev 13976) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py 2011-03-28 08:48:23 UTC (rev 13977) @@ -1,6 +1,6 @@ #!/usr/bin/env python2.6 -import unittest +import unittest2 as unittest import csw_upload_pkg import mox import rest 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 Mar 28 10:49:06 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Mar 2011 08:49:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[13978] csw/mgar/gar/v2/lib/python Message-ID: Revision: 13978 http://gar.svn.sourceforge.net/gar/?rev=13978&view=rev Author: wahwah Date: 2011-03-28 08:49:06 +0000 (Mon, 28 Mar 2011) Log Message: ----------- checkpkg: Random cleanup and comments. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg2.py csw/mgar/gar/v2/lib/python/checkpkg_lib.py csw/mgar/gar/v2/lib/python/overrides.py csw/mgar/gar/v2/lib/python/overrides_test.py csw/mgar/gar/v2/lib/python/system_pkgmap.py Property Changed: ---------------- csw/mgar/gar/v2/lib/python/overrides_test.py Modified: csw/mgar/gar/v2/lib/python/checkpkg2.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg2.py 2011-03-28 08:48:23 UTC (rev 13977) +++ csw/mgar/gar/v2/lib/python/checkpkg2.py 2011-03-28 08:49:06 UTC (rev 13978) @@ -150,7 +150,6 @@ args = (sqo_osrel, sqo_arch, sqo_catrel) tag_lists = [list(pkg.GetErrorTagsResult(*args)) for pkg in sqo_pkgs] error_tags = reduce(operator.add, tag_lists) - # TODO: Set the 'overriden' tag for specific error tags (tags_after_overrides, unapplied_overrides) = overrides.ApplyOverrides(error_tags, override_list) tags_for_all_osrels.extend(tags_after_overrides) Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2011-03-28 08:48:23 UTC (rev 13977) +++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2011-03-28 08:49:06 UTC (rev 13978) @@ -216,7 +216,7 @@ def Run(self): """Runs all the checks - Returns a tuple of an exit code and a report. + Returns a tuple of (exit code, report). """ self._ResetState() assert self.sqo_pkgs_list, "The list of packages must not be empty." @@ -412,6 +412,7 @@ self.needed_pkgs.append(NeededPackage(pkgname, needed_pkg, reason)) def ReportErrorForPkgname(self, pkgname, tag_name, tag_info=None, msg=None): + # TODO: Make this bit use the CheckpkgErrorTag class from models.py checkpkg_tag = tag.CheckpkgTag(pkgname, tag_name, tag_info, msg=msg) self.AddError(checkpkg_tag) Modified: csw/mgar/gar/v2/lib/python/overrides.py =================================================================== --- csw/mgar/gar/v2/lib/python/overrides.py 2011-03-28 08:48:23 UTC (rev 13977) +++ csw/mgar/gar/v2/lib/python/overrides.py 2011-03-28 08:49:06 UTC (rev 13978) @@ -1,6 +1,12 @@ # $Id$ # coding=utf-8 +"""Code related to overrides. + +The override class is now in the models.py file, because it's one of the +SQLObject classes, with objects persisted in the database. +""" + import copy import re import configuration as c Property changes on: csw/mgar/gar/v2/lib/python/overrides_test.py ___________________________________________________________________ Added: svn:executable + * Modified: csw/mgar/gar/v2/lib/python/system_pkgmap.py =================================================================== --- csw/mgar/gar/v2/lib/python/system_pkgmap.py 2011-03-28 08:48:23 UTC (rev 13977) +++ csw/mgar/gar/v2/lib/python/system_pkgmap.py 2011-03-28 08:49:06 UTC (rev 13978) @@ -230,6 +230,7 @@ args = ["uname"] if uname_option: args.append(uname_option) + # TODO: Don't fork during unit tests uname_proc = subprocess.Popen(args, stdout=subprocess.PIPE) stdout, stderr = uname_proc.communicate() 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 Mar 28 10:49:39 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Mar 2011 08:49:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[13979] csw/mgar/gar/v2/lib/checkpkg.d/README Message-ID: Revision: 13979 http://gar.svn.sourceforge.net/gar/?rev=13979&view=rev Author: wahwah Date: 2011-03-28 08:49:39 +0000 (Mon, 28 Mar 2011) Log Message: ----------- checkpkg: Removing an obsolete directory Removed Paths: ------------- csw/mgar/gar/v2/lib/checkpkg.d/README Deleted: csw/mgar/gar/v2/lib/checkpkg.d/README =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/README 2011-03-28 08:49:06 UTC (rev 13978) +++ csw/mgar/gar/v2/lib/checkpkg.d/README 2011-03-28 08:49:39 UTC (rev 13979) @@ -1,13 +0,0 @@ -$Id$ - -This directory contains modular checks. Each check is an executable file, -written in any language, accepting specific command line options and returning -the result by writing to a text file. - -To see the required flags, issue: - -./checkpkg-you-can-write-your-own.py -h - -Each test's file name must begin with "checkpkg-". - -See http://wiki.opencsw.org/checkpkg for more information. 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 Mar 28 10:50:09 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Mar 2011 08:50:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[13980] csw/mgar/gar/v2/doc/connections.dot Message-ID: Revision: 13980 http://gar.svn.sourceforge.net/gar/?rev=13980&view=rev Author: wahwah Date: 2011-03-28 08:50:08 +0000 (Mon, 28 Mar 2011) Log Message: ----------- doc/connections: Removed mailserver->user connect The mail server does not connect to the user. Modified Paths: -------------- csw/mgar/gar/v2/doc/connections.dot Modified: csw/mgar/gar/v2/doc/connections.dot =================================================================== --- csw/mgar/gar/v2/doc/connections.dot 2011-03-28 08:49:39 UTC (rev 13979) +++ csw/mgar/gar/v2/doc/connections.dot 2011-03-28 08:50:08 UTC (rev 13980) @@ -36,7 +36,6 @@ label = "unstable{9,10}{s,x}"; } mail_server [label="mail server"]; - mail_server -> maintainer; cron [shape=circle]; cron -> catalog_generator; cron -> catalog_notifier; 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 Mar 28 10:50:43 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Mar 2011 08:50:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[13981] csw/mgar/gar/v2/doc/connections.dot Message-ID: Revision: 13981 http://gar.svn.sourceforge.net/gar/?rev=13981&view=rev Author: wahwah Date: 2011-03-28 08:50:43 +0000 (Mon, 28 Mar 2011) Log Message: ----------- doc/connections: csw-upload-pkg calls checkpkg Modified Paths: -------------- csw/mgar/gar/v2/doc/connections.dot Modified: csw/mgar/gar/v2/doc/connections.dot =================================================================== --- csw/mgar/gar/v2/doc/connections.dot 2011-03-28 08:50:08 UTC (rev 13980) +++ csw/mgar/gar/v2/doc/connections.dot 2011-03-28 08:50:43 UTC (rev 13981) @@ -49,4 +49,5 @@ pkgdb -> database [label="mysql"]; csw_upload_pkg -> releases_web_app [label="HTTP / REST"]; csw_upload_pkg -> web_app [label="HTTP / REST"]; + csw_upload_pkg -> checkpkg [label="shell"]; } 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 Mar 28 10:51:20 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Mar 2011 08:51:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[13982] csw/mgar/gar/v2/lib/python Message-ID: Revision: 13982 http://gar.svn.sourceforge.net/gar/?rev=13982&view=rev Author: wahwah Date: 2011-03-28 08:51:20 +0000 (Mon, 28 Mar 2011) Log Message: ----------- checkpkg: Store i_depends information Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package.py csw/mgar/gar/v2/lib/python/package_stats.py csw/mgar/gar/v2/lib/python/package_stats_test.py Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2011-03-28 08:50:43 UTC (rev 13981) +++ csw/mgar/gar/v2/lib/python/package.py 2011-03-28 08:51:20 UTC (rev 13982) @@ -342,20 +342,32 @@ self.SetPkginfoEntry("NAME", pkginfo_name) def GetDependencies(self): + """Gets dependencies information. + + Returns: + A tuple of (list, list) of depends and i_depends. + """ + # The collection of dependencies needs to be a list (as opposed to + # a set) because there might be duplicates and it's necessary to + # carry that information. depends = [] + i_depends = [] depend_file_path = os.path.join(self.directory, "install", "depend") if not os.path.exists(depend_file_path): return depends with open(depend_file_path, "r") as fd: - # It needs to be a list because there might be duplicates and it's - # necessary to carry that information. for line in fd: fields = re.split(c.WS_RE, line) + if len(fields) < 2: + logging.warning("Bad depends line: %s", repr(line)) if fields[0] == "P": pkgname = fields[1] pkg_desc = " ".join(fields[1:]) depends.append((pkgname, pkg_desc)) - return depends + if fields[0] == "I": + pkgname = fields[1] + i_depends.append(pkgname) + return depends, i_depends def GetObsoletedBy(self): """Collects obsolescence information from the package if it exists Modified: csw/mgar/gar/v2/lib/python/package_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats.py 2011-03-28 08:50:43 UTC (rev 13981) +++ csw/mgar/gar/v2/lib/python/package_stats.py 2011-03-28 08:51:20 UTC (rev 13982) @@ -22,7 +22,7 @@ from sqlobject import sqlbuilder -PACKAGE_STATS_VERSION = 11L +PACKAGE_STATS_VERSION = 12L BAD_CONTENT_REGEXES = ( # Slightly obfuscating these by using the default concatenation of # strings. @@ -187,10 +187,12 @@ # there are packages with 'i386' in the pkgname and 'all' as the # architecture. arch = basic_stats["parsed_basename"]["arch"] + depends, i_depends = dir_pkg.GetDependencies() pkg_stats = { "binaries": dir_pkg.ListBinaries(), "binaries_dump_info": self.GetBinaryDumpInfo(), - "depends": dir_pkg.GetDependencies(), + "depends": depends, + "i_depends": i_depends, "obsoleteness_info": dir_pkg.GetObsoletedBy(), "isalist": sharedlib_utils.GetIsalist(arch), "overrides": override_dicts, Modified: csw/mgar/gar/v2/lib/python/package_stats_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats_test.py 2011-03-28 08:50:43 UTC (rev 13981) +++ csw/mgar/gar/v2/lib/python/package_stats_test.py 2011-03-28 08:51:20 UTC (rev 13982) @@ -48,7 +48,7 @@ mock_srv4.GetSize().AndReturn(42) mock_dirpkg.ListBinaries().AndReturn([]) mock_dirpkg.GetBinaryDumpInfo().AndReturn([]) - mock_dirpkg.GetDependencies().AndReturn([]) + mock_dirpkg.GetDependencies().AndReturn(([], [])) mock_srv4.GetPkgchkOutput().AndReturn((0, "", "")) mock_dirpkg.GetParsedPkginfo().AndReturn({ "ARCH": "sparc", 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 Mar 28 11:41:04 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 28 Mar 2011 09:41:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[13983] csw/mgar/pkg/parallel/trunk Message-ID: Revision: 13983 http://gar.svn.sourceforge.net/gar/?rev=13983&view=rev Author: dmichelsen Date: 2011-03-28 09:41:04 +0000 (Mon, 28 Mar 2011) Log Message: ----------- parallel: Update to 20110322 Modified Paths: -------------- csw/mgar/pkg/parallel/trunk/Makefile csw/mgar/pkg/parallel/trunk/checksums Modified: csw/mgar/pkg/parallel/trunk/Makefile =================================================================== --- csw/mgar/pkg/parallel/trunk/Makefile 2011-03-28 08:51:20 UTC (rev 13982) +++ csw/mgar/pkg/parallel/trunk/Makefile 2011-03-28 09:41:04 UTC (rev 13983) @@ -1,6 +1,6 @@ # $Id$ NAME = parallel -VERSION = 20110205 +VERSION = 20110322 CATEGORIES = utils DESCRIPTION = Shell tool for executing jobs in parallel Modified: csw/mgar/pkg/parallel/trunk/checksums =================================================================== --- csw/mgar/pkg/parallel/trunk/checksums 2011-03-28 08:51:20 UTC (rev 13982) +++ csw/mgar/pkg/parallel/trunk/checksums 2011-03-28 09:41:04 UTC (rev 13983) @@ -1 +1 @@ -4a8484fd4e11fd2fee63ee763f22786c parallel-20110205.tar.bz2 +2e8eafdc2fa21d99bfc22aac01e245ef parallel-20110322.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 Mon Mar 28 11:54:38 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Mar 2011 09:54:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[13984] csw/mgar/gar/v2/doc/connections.dot Message-ID: Revision: 13984 http://gar.svn.sourceforge.net/gar/?rev=13984&view=rev Author: wahwah Date: 2011-03-28 09:54:38 +0000 (Mon, 28 Mar 2011) Log Message: ----------- doc/connections: Separating out master mirror Similar data can be accessible via /home/mirror and http://mirror.opencsw.org, but they are not the same. Modified Paths: -------------- csw/mgar/gar/v2/doc/connections.dot Modified: csw/mgar/gar/v2/doc/connections.dot =================================================================== --- csw/mgar/gar/v2/doc/connections.dot 2011-03-28 09:41:04 UTC (rev 13983) +++ csw/mgar/gar/v2/doc/connections.dot 2011-03-28 09:54:38 UTC (rev 13984) @@ -6,13 +6,15 @@ catalog_generator [label="catalog generator"]; catalog_notifier [label="catalog notifier"]; catalog_notifier -> mirror [label="HTTP (catalog file)"]; - mirror [label="master mirror\nhttp://mirror.opencsw.org/opencsw-future/"]; catalog_generator -> web_app [label="HTTP / REST"]; - catalog_generator -> mirror [label="writes files"]; - { - rank = same; + catalog_generator -> mirror_dir [label="writes files"]; + sync_mirror -> mirror_dir [label="reads files"]; + sync_mirror [label="sync-mirror"]; + mirror_dir [label="/home/mirror/opencsw-future"]; + subgraph cluster01 { web_app [label="pkgdb public web app\nhttp://buildfarm.opencsw.org/pkgdb/rest/"]; releases_web_app [label="pkgdb releases internal web app\nhttp://buildfarm.opencsw.org/releases/"]; + label = "apache"; } pickled_files [label="pickles"]; catalog_notifier -> pickled_files; @@ -28,15 +30,23 @@ checkpkg_ini [label="/etc/opt/csw/checkpkg.ini",shape=rectangle]; csw_upload_pkg [label="csw-upload-pkg"]; pkgdb [label="pkgdb cli utility"]; + mgar [label="mgar"]; checkpkg; - maintainer [shape=circle]; - maintainer -> csw_upload_pkg; - maintainer -> pkgdb; - maintainer -> checkpkg; label = "unstable{9,10}{s,x}"; } + subgraph cluster3 { + mirror [label="master mirror\nhttp://mirror.opencsw.org/opencsw-future/"]; + sync_mirror -> mirror [label="writes files (rsync)"]; + label = "master mirror"; + } + maintainer [shape=circle]; + maintainer -> csw_upload_pkg; + maintainer -> pkgdb; + maintainer -> mgar; + mgar -> checkpkg [label="shell"]; mail_server [label="mail server"]; cron [shape=circle]; + cron -> sync_mirror; cron -> catalog_generator; cron -> catalog_notifier; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 28 12:19:20 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 28 Mar 2011 10:19:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[13985] csw/mgar/pkg/proj/trunk/Makefile Message-ID: Revision: 13985 http://gar.svn.sourceforge.net/gar/?rev=13985&view=rev Author: bdwalton Date: 2011-03-28 10:19:20 +0000 (Mon, 28 Mar 2011) Log Message: ----------- proj/trunk: enable 64-bit build Modified Paths: -------------- csw/mgar/pkg/proj/trunk/Makefile Modified: csw/mgar/pkg/proj/trunk/Makefile =================================================================== --- csw/mgar/pkg/proj/trunk/Makefile 2011-03-28 09:54:38 UTC (rev 13984) +++ csw/mgar/pkg/proj/trunk/Makefile 2011-03-28 10:19:20 UTC (rev 13985) @@ -14,6 +14,8 @@ DISTFILES = $(DISTNAME).tar.gz DISTFILES += $(NAME)-datumgrid-1.5.zip +BUILD64 = 1 + CONFIGURE_ARGS = $(DIRPATHS) PACKAGES = CSWproj CSWproj-dev CSWlibproj0 CSWproj-data 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 Mar 28 12:40:28 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 28 Mar 2011 10:40:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[13986] csw/mgar/pkg Message-ID: Revision: 13986 http://gar.svn.sourceforge.net/gar/?rev=13986&view=rev Author: dmichelsen Date: 2011-03-28 10:40:28 +0000 (Mon, 28 Mar 2011) Log Message: ----------- ascii: Initial commit Added Paths: ----------- csw/mgar/pkg/ascii/ csw/mgar/pkg/ascii/Makefile csw/mgar/pkg/ascii/branches/ csw/mgar/pkg/ascii/tags/ csw/mgar/pkg/ascii/trunk/ csw/mgar/pkg/ascii/trunk/Makefile csw/mgar/pkg/ascii/trunk/checksums csw/mgar/pkg/ascii/trunk/files/ csw/mgar/pkg/ascii/trunk/files/0001-Do-not-use-stdbool.h.patch csw/mgar/pkg/ascii/trunk/files/0002-Honour-CFLAGS.patch Copied: csw/mgar/pkg/ascii/Makefile (from rev 13982, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/ascii/Makefile (rev 0) +++ csw/mgar/pkg/ascii/Makefile 2011-03-28 10:40:28 UTC (rev 13986) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/ascii/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/ascii/trunk/Makefile =================================================================== --- csw/mgar/pkg/ascii/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ascii/trunk/Makefile 2011-03-28 10:40:28 UTC (rev 13986) @@ -0,0 +1,31 @@ +# $Id$ +NAME = ascii +VERSION = 3.11 +CATEGORIES = utils + +DESCRIPTION = Provides easy conversion between various byte representations and ASCII +define BLURB +endef + +MASTER_SITES = http://www.catb.org/~esr/ascii/ +DISTFILES = $(DISTNAME).tar.gz + +PATCHFILES += 0001-Do-not-use-stdbool.h.patch +PATCHFILES += 0002-Honour-CFLAGS.patch + +# No funky configure +CONFIGURE_SCRIPTS = + +# No test script +TEST_SCRIPTS = + +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKSRC)/ascii $(DESTDIR)$(bindir)/ascii + ginstall -d $(DESTDIR)$(mandir)/man1 + ginstall $(WORKSRC)/ascii.1 $(DESTDIR)$(mandir)/man1/ascii.1 + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/ascii/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/ascii/trunk/checksums =================================================================== --- csw/mgar/pkg/ascii/trunk/checksums (rev 0) +++ csw/mgar/pkg/ascii/trunk/checksums 2011-03-28 10:40:28 UTC (rev 13986) @@ -0,0 +1 @@ +ba8a9392f8aa8c6b7a52923fba870579 ascii-3.11.tar.gz Added: csw/mgar/pkg/ascii/trunk/files/0001-Do-not-use-stdbool.h.patch =================================================================== --- csw/mgar/pkg/ascii/trunk/files/0001-Do-not-use-stdbool.h.patch (rev 0) +++ csw/mgar/pkg/ascii/trunk/files/0001-Do-not-use-stdbool.h.patch 2011-03-28 10:40:28 UTC (rev 13986) @@ -0,0 +1,28 @@ +From 7c9db391d6cb487169575e9627f2dcc1d8789593 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 28 Mar 2011 11:48:10 +0200 +Subject: [PATCH] Do not use stdbool.h + +--- + ascii.c | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +diff --git a/ascii.c b/ascii.c +index 40b4301..08623df 100644 +--- a/ascii.c ++++ b/ascii.c +@@ -18,7 +18,10 @@ + #include + #include + #include +-#include ++/* include */ ++#define bool int ++#define false 0 ++#define true 1 + + typedef char *string; + +-- +1.7.3.2 + Added: csw/mgar/pkg/ascii/trunk/files/0002-Honour-CFLAGS.patch =================================================================== --- csw/mgar/pkg/ascii/trunk/files/0002-Honour-CFLAGS.patch (rev 0) +++ csw/mgar/pkg/ascii/trunk/files/0002-Honour-CFLAGS.patch 2011-03-28 10:40:28 UTC (rev 13986) @@ -0,0 +1,31 @@ +From d0988c3028b8b99bf73e8a85adecbba142b983df Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 28 Mar 2011 12:36:19 +0200 +Subject: [PATCH] Honour CFLAGS + +--- + Makefile | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 062a31e..1f7e344 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,12 +2,12 @@ + + VERS=$(shell sed splashscreen.h -e 's/\\/\\\\/g' -e 's/"/\\"/g' -e 's/.*/P("&");/' +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Mon Mar 28 16:53:36 2011 From: bwalton at opencsw.org (Ben Walton) Date: Mon, 28 Mar 2011 10:53:36 -0400 Subject: [csw-devel] SF.net SVN: gar:[13982] csw/mgar/gar/v2/lib/python In-Reply-To: References: Message-ID: <1301323964-sup-9126@pinkfloyd.chass.utoronto.ca> Excerpts from wahwah's message of Mon Mar 28 04:51:20 -0400 2011: Hi Maciej, > -PACKAGE_STATS_VERSION = 11L > +PACKAGE_STATS_VERSION = 12L What changes to the data structure require a version number bump? Only things that add a new top level item to the dict? What about if an existing item adds a new key? Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bdwalton at users.sourceforge.net Mon Mar 28 18:01:14 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 28 Mar 2011 16:01:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[13987] csw/mgar/pkg Message-ID: Revision: 13987 http://gar.svn.sourceforge.net/gar/?rev=13987&view=rev Author: bdwalton Date: 2011-03-28 16:01:14 +0000 (Mon, 28 Mar 2011) Log Message: ----------- geos: new package (or, new-to-gar, anyway) Added Paths: ----------- csw/mgar/pkg/geos/ csw/mgar/pkg/geos/Makefile csw/mgar/pkg/geos/branches/ csw/mgar/pkg/geos/tags/ csw/mgar/pkg/geos/trunk/ csw/mgar/pkg/geos/trunk/Makefile csw/mgar/pkg/geos/trunk/checksums csw/mgar/pkg/geos/trunk/files/ Copied: csw/mgar/pkg/geos/Makefile (from rev 13986, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/geos/Makefile (rev 0) +++ csw/mgar/pkg/geos/Makefile 2011-03-28 16:01:14 UTC (rev 13987) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/geos/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/geos/trunk/Makefile =================================================================== --- csw/mgar/pkg/geos/trunk/Makefile (rev 0) +++ csw/mgar/pkg/geos/trunk/Makefile 2011-03-28 16:01:14 UTC (rev 13987) @@ -0,0 +1,16 @@ +# $Id$ +NAME = geos +VERSION = 3.2.2 +CATEGORIES = libs + +DESCRIPTION = Geometry Engine, Open Source +define BLURB +GEOS (Geometry Engine - Open Source) is a C++ port of the Java Topology Suite (JTS). As such, it aims to contain the complete functionality of JTS in C++. This includes all the OpenGIS Simple Features for SQL spatial predicate functions and spatial operators, as well as specific JTS enhanced topology functions. +endef + +MASTER_SITES = http://download.osgeo.org/$(NAME)/ +DISTFILES = $(DISTNAME).tar.gz + +GARTYPE = v2-defaultchange + +include gar/category.mk Property changes on: csw/mgar/pkg/geos/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/geos/trunk/checksums =================================================================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 28 18:06:11 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 28 Mar 2011 16:06:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[13988] csw/mgar/pkg/geos/trunk Message-ID: Revision: 13988 http://gar.svn.sourceforge.net/gar/?rev=13988&view=rev Author: bdwalton Date: 2011-03-28 16:06:11 +0000 (Mon, 28 Mar 2011) Log Message: ----------- geos/trunk: correct category and DISTFILES (gz -> bz2); update checksums Modified Paths: -------------- csw/mgar/pkg/geos/trunk/Makefile csw/mgar/pkg/geos/trunk/checksums Modified: csw/mgar/pkg/geos/trunk/Makefile =================================================================== --- csw/mgar/pkg/geos/trunk/Makefile 2011-03-28 16:01:14 UTC (rev 13987) +++ csw/mgar/pkg/geos/trunk/Makefile 2011-03-28 16:06:11 UTC (rev 13988) @@ -1,7 +1,7 @@ # $Id$ NAME = geos VERSION = 3.2.2 -CATEGORIES = libs +CATEGORIES = lib DESCRIPTION = Geometry Engine, Open Source define BLURB @@ -9,7 +9,7 @@ endef MASTER_SITES = http://download.osgeo.org/$(NAME)/ -DISTFILES = $(DISTNAME).tar.gz +DISTFILES = $(DISTNAME).tar.bz2 GARTYPE = v2-defaultchange Modified: csw/mgar/pkg/geos/trunk/checksums =================================================================== --- csw/mgar/pkg/geos/trunk/checksums 2011-03-28 16:01:14 UTC (rev 13987) +++ csw/mgar/pkg/geos/trunk/checksums 2011-03-28 16:06:11 UTC (rev 13988) @@ -0,0 +1 @@ +c5d264acac22fe7720f85dadc1fc17c6 geos-3.2.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Mar 28 18:21:26 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 28 Mar 2011 16:21:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[13989] csw/mgar/pkg/perl/trunk/Makefile Message-ID: Revision: 13989 http://gar.svn.sourceforge.net/gar/?rev=13989&view=rev Author: dmichelsen Date: 2011-03-28 16:21:26 +0000 (Mon, 28 Mar 2011) Log Message: ----------- perl: Add CSWperl.cswperlincpath Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2011-03-28 16:06:11 UTC (rev 13988) +++ csw/mgar/pkg/perl/trunk/Makefile 2011-03-28 16:21:26 UTC (rev 13989) @@ -129,6 +129,10 @@ # Do not exclude static libs as at least DynaLoader.a is needed for XS compilation MERGE_EXCLUDE_STATICLIBS = +# This is for the communication with checkpkg. These pathes are searched for modules +# when resolving dependencies. +PROTOTYPE_FILTER_CSWperl = ( cat; echo "i cswperlincpath=CSWperl.cswperlincpath") + # Splitting of a separate libperl.so requires more work and careful planning. # Override for now. CHECKPKG_OVERRIDES_CSWperl += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libperl.so @@ -188,6 +192,10 @@ " Config.pm Config_heavy.pl ) @$(MAKECOOKIE) +POST_TARGETS += CSWperl.cswperlincpath +CSWperl.cswperlincpath: + LD_LIBRARY_PATH=$(WORKSRC) $(WORKSRC)/perl -I./lib -e 'print "$$_\n" foreach(@INC)' >$(WORKDIR_GLOBAL)/CSWperl.cswperlincpath + # Invoke post-install targets post-install-modulated: $(POST_TARGETS) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Mon Mar 28 18:46:51 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Mon, 28 Mar 2011 17:46:51 +0100 Subject: [csw-devel] SF.net SVN: gar:[13982] csw/mgar/gar/v2/lib/python In-Reply-To: <1301323964-sup-9126@pinkfloyd.chass.utoronto.ca> References: <1301323964-sup-9126@pinkfloyd.chass.utoronto.ca> Message-ID: 2011/3/28 Ben Walton : > Excerpts from wahwah's message of Mon Mar 28 04:51:20 -0400 2011: > > Hi Maciej, > >> -PACKAGE_STATS_VERSION = 11L >> +PACKAGE_STATS_VERSION = 12L > > What changes to the data structure require a version number bump? > Only things that add a new top level item to the dict? ?What about if > an existing item adds a new key? The effect of that setting is that checkpkg notices that the data in the database are outdated and it unpacks packages again to have them in the latest format. So, if you want checkpkg to do that, you should bump the value. Also, if you're breaking backward compatibility. From bwalton at opencsw.org Mon Mar 28 18:50:34 2011 From: bwalton at opencsw.org (Ben Walton) Date: Mon, 28 Mar 2011 12:50:34 -0400 Subject: [csw-devel] SF.net SVN: gar:[13982] csw/mgar/gar/v2/lib/python In-Reply-To: References: <1301323964-sup-9126@pinkfloyd.chass.utoronto.ca> Message-ID: <1301330977-sup-6102@pinkfloyd.chass.utoronto.ca> Excerpts from Maciej Blizi?ski's message of Mon Mar 28 12:46:51 -0400 2011: > The effect of that setting is that checkpkg notices that the data in > the database are outdated and it unpacks packages again to have them > in the latest format. So, if you want checkpkg to do that, you should > bump the value. In the case of adding a new feature, it's only required to get the db updated then. > Also, if you're breaking backward compatibility. Ok, so dropping or renaming an existing key in the dict or any sub-key, etc... Cool. Thanks! -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From dmichelsen at users.sourceforge.net Mon Mar 28 22:36:27 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 28 Mar 2011 20:36:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[13990] csw/mgar/pkg/perl/branches/perl-5.10.1-64bit/ Makefile Message-ID: Revision: 13990 http://gar.svn.sourceforge.net/gar/?rev=13990&view=rev Author: dmichelsen Date: 2011-03-28 20:36:27 +0000 (Mon, 28 Mar 2011) Log Message: ----------- perl 64 bit: Fix dependency and use NOISAEXEC Modified Paths: -------------- csw/mgar/pkg/perl/branches/perl-5.10.1-64bit/Makefile Modified: csw/mgar/pkg/perl/branches/perl-5.10.1-64bit/Makefile =================================================================== --- csw/mgar/pkg/perl/branches/perl-5.10.1-64bit/Makefile 2011-03-28 16:21:26 UTC (rev 13989) +++ csw/mgar/pkg/perl/branches/perl-5.10.1-64bit/Makefile 2011-03-28 20:36:27 UTC (rev 13990) @@ -20,7 +20,7 @@ PACKAGES += CSWperl SPKG_DESC_CSWperl = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWperl += CSWbdb48 -RUNTIME_DEP_PKGS_CSWperl += CSWgdbm +RUNTIME_DEP_PKGS_CSWperl += CSWlibgdbm3 PACKAGES += CSWperldoc SPKG_DESC_CSWperldoc = Perl documentation @@ -51,6 +51,7 @@ DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) BUILD64 = 1 +NOISAEXEC = 1 # Custom configure CONFIGURE_SCRIPTS = perl 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 Mar 29 02:28:38 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 29 Mar 2011 00:28:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[13991] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13991 http://gar.svn.sourceforge.net/gar/?rev=13991&view=rev Author: bdwalton Date: 2011-03-29 00:28:37 +0000 (Tue, 29 Mar 2011) Log Message: ----------- php5/trunk: seemingly need to keep httpd.conf around until the bitter end, prune after merge... Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-28 20:36:27 UTC (rev 13990) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-29 00:28:37 UTC (rev 13991) @@ -732,8 +732,8 @@ cp $(APSYSCONF)/httpd.conf $(DESTDIR)$(APSYSCONF) ) @$(MAKECOOKIE) -pre-install-modulated: APSYSCONF=/opt/csw/apache/conf/httpd.conf -pre-install-modulated: AP2SYSCONF=/opt/csw/apache2/etc/httpd.conf -post-install-modulated: - @( rm $(DESTDIR)$(APSYSCONF) $(DESTDIR)$(AP2SYSCONF) ) - @$(MAKECOOKIE) +# post-install-modulated: APSYSCONF=/opt/csw/apache/conf/httpd.conf +# post-install-modulated: AP2SYSCONF=/opt/csw/apache2/etc/httpd.conf +# post-install-modulated: +# @( rm $(DESTDIR)$(APSYSCONF) $(DESTDIR)$(AP2SYSCONF) ) +# @$(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 Tue Mar 29 02:29:54 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 29 Mar 2011 00:29:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[13992] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13992 http://gar.svn.sourceforge.net/gar/?rev=13992&view=rev Author: bdwalton Date: 2011-03-29 00:29:54 +0000 (Tue, 29 Mar 2011) Log Message: ----------- php5/trunk: the dbase modules was moved to PECL according to NEWS Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-29 00:28:37 UTC (rev 13991) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-29 00:29:54 UTC (rev 13992) @@ -43,7 +43,6 @@ PACKAGES += CSWphp5-ctype PACKAGES += CSWphp5-curl PACKAGES += CSWphp5-dba -PACKAGES += CSWphp5-dbase PACKAGES += CSWphp5-dom PACKAGES += CSWphp5-exif PACKAGES += CSWphp5-ftp @@ -101,7 +100,7 @@ CATALOGNAME_CSWphp5 = php5 SPKG_DESC_CSWphp5 = A High-Level Scripting Language -INCOMPATIBLE_PKGS_CSWphp5 = CSWphp5mimemagic CSWphp5mhash +INCOMPATIBLE_PKGS_CSWphp5 = CSWphp5mimemagic CSWphp5mhash CSWphp5dbase CATALOGNAME_CSWphp5-dev = php5_dev SPKG_DESC_CSWphp5-dev = Development files for php5 @@ -145,11 +144,6 @@ RUNTIME_DEP_PKGS_CSWphp5-dba = CSWphp5 CSWlibgdbm3 CSWbdb42 OBSOLETED_BY_CSWphp5-dba = CSWphp5dba -CATALOGNAME_CSWphp5-dbase = php5_dbase -SPKG_DESC_CSWphp5-dbase = The dbase extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-dbase = CSWphp5 -OBSOLETED_BY_CSWphp5-dbase = CSWphp5dbase - CATALOGNAME_CSWphp5-dom = php5_dom SPKG_DESC_CSWphp5-dom = The dom extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-dom = CSWphp5 CSWiconv CSWlibxml2 CSWzlib 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 Mar 29 02:31:35 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 29 Mar 2011 00:31:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[13993] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13993 http://gar.svn.sourceforge.net/gar/?rev=13993&view=rev Author: bdwalton Date: 2011-03-29 00:31:34 +0000 (Tue, 29 Mar 2011) Log Message: ----------- php5/trunk: ncurses moved to PECL too Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-29 00:29:54 UTC (rev 13992) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-29 00:31:34 UTC (rev 13993) @@ -59,7 +59,6 @@ PACKAGES += CSWphp5-mssql PACKAGES += CSWphp5-mysql PACKAGES += CSWphp5-mysqli -PACKAGES += CSWphp5-ncurses PACKAGES += CSWphp5-odbc PACKAGES += CSWphp5-openssl PACKAGES += CSWphp5-pcntl @@ -101,6 +100,7 @@ CATALOGNAME_CSWphp5 = php5 SPKG_DESC_CSWphp5 = A High-Level Scripting Language INCOMPATIBLE_PKGS_CSWphp5 = CSWphp5mimemagic CSWphp5mhash CSWphp5dbase +INCOMPATIBLE_PKGS_CSWphp5 += CSWphp5ncurses CATALOGNAME_CSWphp5-dev = php5_dev SPKG_DESC_CSWphp5-dev = Development files for php5 @@ -224,11 +224,6 @@ RUNTIME_DEP_PKGS_CSWphp5-mysqli = CSWphp5 CSWmysql5rt CSWzlib OBSOLETED_BY_CSWphp5-mysqli = CSWphp5mysqli -CATALOGNAME_CSWphp5-ncurses = php5_ncurses -SPKG_DESC_CSWphp5-ncurses = The ncurses extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-ncurses = CSWphp5 CSWncurses -OBSOLETED_BY_CSWphp5-ncurses = CSWphp5ncurses - CATALOGNAME_CSWphp5-odbc = php5_odbc SPKG_DESC_CSWphp5-odbc = The odbc extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-odbc = CSWphp5 CSWunixodbc 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 Mar 29 02:41:36 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 29 Mar 2011 00:41:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[13994] csw/mgar/pkg/ruby18/trunk/files/cswrbconfig Message-ID: Revision: 13994 http://gar.svn.sourceforge.net/gar/?rev=13994&view=rev Author: bdwalton Date: 2011-03-29 00:41:35 +0000 (Tue, 29 Mar 2011) Log Message: ----------- ruby18/trunk/files: forgot to modify path to rbconfig.rb (obsolete now, but just in case) Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/files/cswrbconfig Modified: csw/mgar/pkg/ruby18/trunk/files/cswrbconfig =================================================================== --- csw/mgar/pkg/ruby18/trunk/files/cswrbconfig 2011-03-29 00:31:34 UTC (rev 13993) +++ csw/mgar/pkg/ruby18/trunk/files/cswrbconfig 2011-03-29 00:41:35 UTC (rev 13994) @@ -1,7 +1,7 @@ #!/opt/csw/bin/ruby -w ARCH = %x{uname -p}.chomp -CONFD = "/opt/csw/lib/ruby/1.8/#{ARCH}-solaris2.8" +CONFD = "/opt/csw/lib/ruby/1.8/#{ARCH}-solaris2.9" RBC = File.join(CONFD, "rbconfig.rb") CUR_RBC = File.readlink(RBC).gsub(/.*\./, '') 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 Mar 29 02:43:52 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 29 Mar 2011 00:43:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[13995] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13995 http://gar.svn.sourceforge.net/gar/?rev=13995&view=rev Author: bdwalton Date: 2011-03-29 00:43:52 +0000 (Tue, 29 Mar 2011) Log Message: ----------- php5/trunk: add some dependencies to the primary php5 package Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-29 00:41:35 UTC (rev 13994) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-29 00:43:52 UTC (rev 13995) @@ -99,6 +99,7 @@ CATALOGNAME_CSWphp5 = php5 SPKG_DESC_CSWphp5 = A High-Level Scripting Language +RUNTIME_DEP_PKGS_CSWphp5 += CSWlibxml2 CSWiconv CSWexpat CSWzlib INCOMPATIBLE_PKGS_CSWphp5 = CSWphp5mimemagic CSWphp5mhash CSWphp5dbase INCOMPATIBLE_PKGS_CSWphp5 += CSWphp5ncurses 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 Mar 29 02:45:57 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 29 Mar 2011 00:45:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[13996] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 13996 http://gar.svn.sourceforge.net/gar/?rev=13996&view=rev Author: bdwalton Date: 2011-03-29 00:45:57 +0000 (Tue, 29 Mar 2011) Log Message: ----------- php5/trunk: add some deps for the apache 1.3 module package Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-29 00:43:52 UTC (rev 13995) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-29 00:45:57 UTC (rev 13996) @@ -95,6 +95,7 @@ CATALOGNAME_CSWmod-php5 = mod_php5 SPKG_DESC_CSWmod-php5 = The apache 1.3.x php5 module RUNTIME_DEP_PKGS_CSWmod-php5 = CSWphp5 CSWapache CSWlibxml2 CSWiconv +RUNTIME_DEP_PKGS_CSWmod-php5 += CSWexpat CSWzlib OBSOLETED_BY_CSWmod-php5 = CSWmodphp5 CATALOGNAME_CSWphp5 = php5 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 Mar 29 03:03:53 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 29 Mar 2011 01:03:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[13997] csw/mgar/pkg/geos/trunk/Makefile Message-ID: Revision: 13997 http://gar.svn.sourceforge.net/gar/?rev=13997&view=rev Author: bdwalton Date: 2011-03-29 01:03:53 +0000 (Tue, 29 Mar 2011) Log Message: ----------- geos/trunk: use gcc to build, add package splits (first cut) Modified Paths: -------------- csw/mgar/pkg/geos/trunk/Makefile Modified: csw/mgar/pkg/geos/trunk/Makefile =================================================================== --- csw/mgar/pkg/geos/trunk/Makefile 2011-03-29 00:45:57 UTC (rev 13996) +++ csw/mgar/pkg/geos/trunk/Makefile 2011-03-29 01:03:53 UTC (rev 13997) @@ -13,4 +13,31 @@ GARTYPE = v2-defaultchange +GARCOMPILER = GNU + +PACKAGES += CSWgeos +PACKAGES += CSWlibgeos3-2-2 +PACKAGES += CSWlibgeos-c1 +PACKAGES += CSWgeos-dev + +CATALOGNAME_CSWgeos = geos +SPKG_DESC_CSWgeos = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWgeos += CSWlibgeos3-2-2 +RUNTIME_DEP_PKGS_CSWgeos += CSWlibgeos-c1 + +CATALOGNAME_CSWlibgeos3-2-2 = libgeos3_2_2 +SPKG_DESC_CSWlibgeos3-2-2 += $(DESCRIPTION), libgeos-3.2.2.so +PKGFILES_CSWlibgeos3-2-2 += $(call baseisadirs,$(libdir),libgeos-3\.2\.2\.so) +PKGFILES_CSWlibgeos3-2-2 += $(call baseisadirs,$(libdir),libgeos-3\.2\.2\.so(\.\d+)*) + +CATALOGNAME_CSWlibgeos-c1 = libgeos_c1 +SPKG_DESC_CSWlibgeos-c1 += Geometry Engine, Open Source, libgeos_c.so.1 +PKGFILES_CSWlibgeos-c1 += $(call baseisadirs,$(libdir),libgeos_c\.so\.1\.6\.2) +PKGFILES_CSWlibgeos-c1 += $(call baseisadirs,$(libdir),libgeos_c\.so\.1(\.\d+)*) + +CATALOGNAME_CSWgeos-dev = geos_dev +SPKG_DESC_CSWgeos-dev = $(DESCRIPTION), development files +PKGFILES_CSWgeos-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWgeos-dev = CSWlibgeos3-2-2 CSWlibgeos-c1 + 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 Mar 29 03:09:48 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 29 Mar 2011 01:09:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[13998] csw/mgar/pkg/geos/trunk/Makefile Message-ID: Revision: 13998 http://gar.svn.sourceforge.net/gar/?rev=13998&view=rev Author: bdwalton Date: 2011-03-29 01:09:48 +0000 (Tue, 29 Mar 2011) Log Message: ----------- geos/trunk: add deps for the library packages Modified Paths: -------------- csw/mgar/pkg/geos/trunk/Makefile Modified: csw/mgar/pkg/geos/trunk/Makefile =================================================================== --- csw/mgar/pkg/geos/trunk/Makefile 2011-03-29 01:03:53 UTC (rev 13997) +++ csw/mgar/pkg/geos/trunk/Makefile 2011-03-29 01:09:48 UTC (rev 13998) @@ -29,11 +29,16 @@ SPKG_DESC_CSWlibgeos3-2-2 += $(DESCRIPTION), libgeos-3.2.2.so PKGFILES_CSWlibgeos3-2-2 += $(call baseisadirs,$(libdir),libgeos-3\.2\.2\.so) PKGFILES_CSWlibgeos3-2-2 += $(call baseisadirs,$(libdir),libgeos-3\.2\.2\.so(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibgeos3-2-2 += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWlibgeos3-2-2 += CSWgcc4corert CATALOGNAME_CSWlibgeos-c1 = libgeos_c1 SPKG_DESC_CSWlibgeos-c1 += Geometry Engine, Open Source, libgeos_c.so.1 PKGFILES_CSWlibgeos-c1 += $(call baseisadirs,$(libdir),libgeos_c\.so\.1\.6\.2) PKGFILES_CSWlibgeos-c1 += $(call baseisadirs,$(libdir),libgeos_c\.so\.1(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWlibgeos3-2-2 +RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWgcc4corert CATALOGNAME_CSWgeos-dev = geos_dev SPKG_DESC_CSWgeos-dev = $(DESCRIPTION), development files 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 Mar 29 04:12:22 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 29 Mar 2011 02:12:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[13999] csw/mgar/pkg/geos/trunk/Makefile Message-ID: Revision: 13999 http://gar.svn.sourceforge.net/gar/?rev=13999&view=rev Author: bdwalton Date: 2011-03-29 02:12:21 +0000 (Tue, 29 Mar 2011) Log Message: ----------- geos/trunk: make the dev package splits more explicit to work around poor library file naming Modified Paths: -------------- csw/mgar/pkg/geos/trunk/Makefile Modified: csw/mgar/pkg/geos/trunk/Makefile =================================================================== --- csw/mgar/pkg/geos/trunk/Makefile 2011-03-29 01:09:48 UTC (rev 13998) +++ csw/mgar/pkg/geos/trunk/Makefile 2011-03-29 02:12:21 UTC (rev 13999) @@ -42,7 +42,15 @@ CATALOGNAME_CSWgeos-dev = geos_dev SPKG_DESC_CSWgeos-dev = $(DESCRIPTION), development files -PKGFILES_CSWgeos-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWgeos-dev += $(PKGFILES_DEVEL_CONFIG) +PKGFILES_CSWgeos-dev += $(PKGFILES_DEVEL_STATICLIB) +PKGFILES_CSWgeos-dev += $(PKGFILES_DEVEL_LIBTOOL) +PKGFILES_CSWgeos-dev += $(PKGFILES_DEVEL_INCLUDEDIR) +PKGFILES_CSWgeos-dev += $(PKGFILES_DEVEL_PKGCONFIG) +PKGFILES_CSWgeos-dev += $(PKGFILES_DEVEL_ACLOCAL) +PKGFILES_CSWgeos-dev += $(PKGFILES_DEVEL_CONFIG_MANPAGE) +PKGFILES_CSWgeos-dev += $(PKGFILES_DEVEL_MAN3_MANPAGE) +PKGFILES_CSWgeos-dev += .*libgeos.so .*libgeos_c.so RUNTIME_DEP_PKGS_CSWgeos-dev = CSWlibgeos3-2-2 CSWlibgeos-c1 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 Mar 29 04:37:39 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 29 Mar 2011 02:37:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[14000] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14000 http://gar.svn.sourceforge.net/gar/?rev=14000&view=rev Author: bdwalton Date: 2011-03-29 02:37:39 +0000 (Tue, 29 Mar 2011) Log Message: ----------- php5/trunk: drop a corrected checkpkg override Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-29 02:12:21 UTC (rev 13999) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-29 02:37:39 UTC (rev 14000) @@ -684,7 +684,6 @@ CHECKPKG_OVERRIDES_CSWphp5-pspell += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-wddx += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-gmp += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-gmp += soname-not-found|libgmp.so.3|is|needed|by|opt/csw/php5/lib/php/extensions/no-debug-non-zts-20090626/gmp.so CHECKPKG_OVERRIDES_CSWphp5-gmp += surplus-dependency|CSWlibgmp CHECKPKG_OVERRIDES_CSWphp5-mssql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pcntl += surplus-dependency|CSWphp5 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 Mar 29 04:38:29 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 29 Mar 2011 02:38:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[14001] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14001 http://gar.svn.sourceforge.net/gar/?rev=14001&view=rev Author: bdwalton Date: 2011-03-29 02:38:28 +0000 (Tue, 29 Mar 2011) Log Message: ----------- php5/trunk: Make the iconv module depend on CSWiconv Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-03-29 02:37:39 UTC (rev 14000) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-29 02:38:28 UTC (rev 14001) @@ -184,7 +184,7 @@ CATALOGNAME_CSWphp5-iconv = php5_iconv SPKG_DESC_CSWphp5-iconv = The iconv extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-iconv = CSWphp5 +RUNTIME_DEP_PKGS_CSWphp5-iconv = CSWphp5 CSWiconv OBSOLETED_BY_CSWphp5-iconv = CSWphp5iconv CATALOGNAME_CSWphp5-imap = php5_imap 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 Mar 29 04:51:52 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 29 Mar 2011 02:51:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[14002] csw/mgar/pkg/geos/trunk/Makefile Message-ID: Revision: 14002 http://gar.svn.sourceforge.net/gar/?rev=14002&view=rev Author: bdwalton Date: 2011-03-29 02:51:52 +0000 (Tue, 29 Mar 2011) Log Message: ----------- geos/trunk: drop manual definition of CSWgeos and replace it with OBSOLETED_BY declarations Modified Paths: -------------- csw/mgar/pkg/geos/trunk/Makefile Modified: csw/mgar/pkg/geos/trunk/Makefile =================================================================== --- csw/mgar/pkg/geos/trunk/Makefile 2011-03-29 02:38:28 UTC (rev 14001) +++ csw/mgar/pkg/geos/trunk/Makefile 2011-03-29 02:51:52 UTC (rev 14002) @@ -15,22 +15,17 @@ GARCOMPILER = GNU -PACKAGES += CSWgeos -PACKAGES += CSWlibgeos3-2-2 +PACKAGES = CSWlibgeos3-2-2 PACKAGES += CSWlibgeos-c1 PACKAGES += CSWgeos-dev -CATALOGNAME_CSWgeos = geos -SPKG_DESC_CSWgeos = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWgeos += CSWlibgeos3-2-2 -RUNTIME_DEP_PKGS_CSWgeos += CSWlibgeos-c1 - CATALOGNAME_CSWlibgeos3-2-2 = libgeos3_2_2 SPKG_DESC_CSWlibgeos3-2-2 += $(DESCRIPTION), libgeos-3.2.2.so PKGFILES_CSWlibgeos3-2-2 += $(call baseisadirs,$(libdir),libgeos-3\.2\.2\.so) PKGFILES_CSWlibgeos3-2-2 += $(call baseisadirs,$(libdir),libgeos-3\.2\.2\.so(\.\d+)*) RUNTIME_DEP_PKGS_CSWlibgeos3-2-2 += CSWgcc4g++rt RUNTIME_DEP_PKGS_CSWlibgeos3-2-2 += CSWgcc4corert +OBSOLETED_BY_CSWlibgeos3-2-2 = CSWgeos CATALOGNAME_CSWlibgeos-c1 = libgeos_c1 SPKG_DESC_CSWlibgeos-c1 += Geometry Engine, Open Source, libgeos_c.so.1 @@ -39,6 +34,7 @@ RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWlibgeos3-2-2 RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWgcc4g++rt RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWgcc4corert +OBSOLETED_BY_CSWlibgeos-c1 = CSWgeos CATALOGNAME_CSWgeos-dev = geos_dev SPKG_DESC_CSWgeos-dev = $(DESCRIPTION), development files @@ -52,5 +48,6 @@ PKGFILES_CSWgeos-dev += $(PKGFILES_DEVEL_MAN3_MANPAGE) PKGFILES_CSWgeos-dev += .*libgeos.so .*libgeos_c.so RUNTIME_DEP_PKGS_CSWgeos-dev = CSWlibgeos3-2-2 CSWlibgeos-c1 +OBSOLETED_BY_CSWlibgeos-dev = CSWgeos 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 Mar 29 04:58:39 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 29 Mar 2011 02:58:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[14003] csw/mgar/pkg/geos/trunk/Makefile Message-ID: Revision: 14003 http://gar.svn.sourceforge.net/gar/?rev=14003&view=rev Author: bdwalton Date: 2011-03-29 02:58:39 +0000 (Tue, 29 Mar 2011) Log Message: ----------- geos/trunk: override checkpkg as this library is poorly named, but matches the debian version so we will accept it for now Modified Paths: -------------- csw/mgar/pkg/geos/trunk/Makefile Modified: csw/mgar/pkg/geos/trunk/Makefile =================================================================== --- csw/mgar/pkg/geos/trunk/Makefile 2011-03-29 02:51:52 UTC (rev 14002) +++ csw/mgar/pkg/geos/trunk/Makefile 2011-03-29 02:58:39 UTC (rev 14003) @@ -26,6 +26,7 @@ RUNTIME_DEP_PKGS_CSWlibgeos3-2-2 += CSWgcc4g++rt RUNTIME_DEP_PKGS_CSWlibgeos3-2-2 += CSWgcc4corert OBSOLETED_BY_CSWlibgeos3-2-2 = CSWgeos +CHECKPKG_OVERRIDES_CSWlibgeos3-2-2 += soname-equals-filename|file=/opt/csw/lib/libgeos-3.2.2.so CATALOGNAME_CSWlibgeos-c1 = libgeos_c1 SPKG_DESC_CSWlibgeos-c1 += Geometry Engine, Open Source, libgeos_c.so.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 Mar 29 09:43:17 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 29 Mar 2011 07:43:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[14004] csw/mgar/pkg/pbzip2/trunk Message-ID: Revision: 14004 http://gar.svn.sourceforge.net/gar/?rev=14004&view=rev Author: dmichelsen Date: 2011-03-29 07:43:17 +0000 (Tue, 29 Mar 2011) Log Message: ----------- pbzip2: Update to 1.1.3 and cleanup Makefile 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 2011-03-29 02:58:39 UTC (rev 14003) +++ csw/mgar/pkg/pbzip2/trunk/Makefile 2011-03-29 07:43:17 UTC (rev 14004) @@ -1,5 +1,5 @@ NAME = pbzip2 -VERSION = 1.1.1 +VERSION = 1.1.3 CATEGORIES = utils DESCRIPTION = Parallel BZIP2 Data Compression Software @@ -13,23 +13,17 @@ MASTER_SITES = http://compression.ca/pbzip2/ DISTFILES = $(NAME)-$(VERSION).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES += CSWpbzip2 +CATALOGNAME_CSWpbzip2 = pbzip2 +SPKG_DESC_CSWpbzip2 = Parallel BZIP2 Data Compression Software +RUNTIME_DEP_PKGS_CSWpbzip2 += CSWbzip2 -# 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 = - -# we require -RUNTIME_DEP_PKGS = CSWbzip2 - -# since there is no configure script, this is intentionally left empty +# Since there is no configure script, this is intentionally left empty CONFIGURE_SCRIPTS = -# no build tests -SKIPTEST = 1 +# There is no testsuite +TEST_SCRIPTS = -# custom install INSTALL_SCRIPTS = custom # After some testing. Using a special ISA modulation does *not* speed @@ -38,7 +32,7 @@ include gar/category.mk pre-build-modulated: - @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 + 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 2011-03-29 02:58:39 UTC (rev 14003) +++ csw/mgar/pkg/pbzip2/trunk/checksums 2011-03-29 07:43:17 UTC (rev 14004) @@ -1 +1 @@ -b354422759da7113da366aad1876ed5d pbzip2-1.1.1.tar.gz +beb27a8055723f5f84364182d137ed1a pbzip2-1.1.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 Tue Mar 29 09:52:08 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 29 Mar 2011 07:52:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[14005] csw/mgar/pkg/pca/trunk Message-ID: Revision: 14005 http://gar.svn.sourceforge.net/gar/?rev=14005&view=rev Author: dmichelsen Date: 2011-03-29 07:52:08 +0000 (Tue, 29 Mar 2011) Log Message: ----------- pca: Update to 20110329-01 Modified Paths: -------------- csw/mgar/pkg/pca/trunk/Makefile csw/mgar/pkg/pca/trunk/checksums Modified: csw/mgar/pkg/pca/trunk/Makefile =================================================================== --- csw/mgar/pkg/pca/trunk/Makefile 2011-03-29 07:43:17 UTC (rev 14004) +++ csw/mgar/pkg/pca/trunk/Makefile 2011-03-29 07:52:08 UTC (rev 14005) @@ -1,5 +1,5 @@ NAME = pca -VERSION = 20101221-01 +VERSION = 20110329-01 CATEGORIES = utils DESCRIPTION = Patch Check Advanced @@ -21,12 +21,11 @@ PATCHFILES = 0001-prefer-opencsw-perl.diff PATCHFILES += 0002-Add-etc-opt-csw-as-config-location.patch -#PATCHDIRLEVEL = 0 - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d{8}-\d{2}) WORKSRC = $(WORKDIR) +PATCHDIR = $(WORKDIR) CONFIGURE_SCRIPTS = BUILD_SCRIPTS = @@ -40,6 +39,10 @@ ARCHALL = 1 +# Search path for wget, get all we can +CHECKPKG_OVERRIDES_CSWpca += file-with-bad-content|/usr/local|root/opt/csw/bin/pca +CHECKPKG_OVERRIDES_CSWpca += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/pca.8 + include gar/category.mk post-extract-modulated: Modified: csw/mgar/pkg/pca/trunk/checksums =================================================================== --- csw/mgar/pkg/pca/trunk/checksums 2011-03-29 07:43:17 UTC (rev 14004) +++ csw/mgar/pkg/pca/trunk/checksums 2011-03-29 07:52:08 UTC (rev 14005) @@ -1 +1 @@ -efcbedc362454c053201ab8bf7f1572f pca-20101221-01 +bd964b26b3de794dc6742bac7c8ab0c6 pca-20110329-01 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 Mar 29 10:27:33 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 29 Mar 2011 08:27:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[14006] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Message-ID: Revision: 14006 http://gar.svn.sourceforge.net/gar/?rev=14006&view=rev Author: wahwah Date: 2011-03-29 08:27:33 +0000 (Tue, 29 Mar 2011) Log Message: ----------- csw-upload-pkg: Warn if checkpkg not available If the checkpkg executable is not found, display a helpful error message. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-03-29 07:52:08 UTC (rev 14005) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-03-29 08:27:33 UTC (rev 14006) @@ -112,6 +112,10 @@ checkpkg_sets = self._CheckpkgSets(planned_modifications) bin_dir = os.path.dirname(__file__) checkpkg_executable = os.path.join(bin_dir, "checkpkg") + assert os.path.exists(checkpkg_executable), ( + "Could not find %s. Make sure that the checkpkg executable is " + "available \n" + "from the same directory as csw-upload-pkg." % checkpkg_executable) checks_failed_for_catalogs = [] args_by_cat = {} for arch, osrel in checkpkg_sets: 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 Mar 29 10:29:08 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 29 Mar 2011 08:29:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[14007] csw/mgar/gar/v2/lib/python/package.py Message-ID: Revision: 14007 http://gar.svn.sourceforge.net/gar/?rev=14007&view=rev Author: wahwah Date: 2011-03-29 08:29:08 +0000 (Tue, 29 Mar 2011) Log Message: ----------- checkpkg: Fixed a bug in GetDependencies It's better to have one return statement - at least it always returns a tuple. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package.py Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2011-03-29 08:27:33 UTC (rev 14006) +++ csw/mgar/gar/v2/lib/python/package.py 2011-03-29 08:29:08 UTC (rev 14007) @@ -353,20 +353,19 @@ depends = [] i_depends = [] depend_file_path = os.path.join(self.directory, "install", "depend") - if not os.path.exists(depend_file_path): - return depends - with open(depend_file_path, "r") as fd: - for line in fd: - fields = re.split(c.WS_RE, line) - if len(fields) < 2: - logging.warning("Bad depends line: %s", repr(line)) - if fields[0] == "P": - pkgname = fields[1] - pkg_desc = " ".join(fields[1:]) - depends.append((pkgname, pkg_desc)) - if fields[0] == "I": - pkgname = fields[1] - i_depends.append(pkgname) + if os.path.exists(depend_file_path): + with open(depend_file_path, "r") as fd: + for line in fd: + fields = re.split(c.WS_RE, line) + if len(fields) < 2: + logging.warning("Bad depends line: %s", repr(line)) + if fields[0] == "P": + pkgname = fields[1] + pkg_desc = " ".join(fields[1:]) + depends.append((pkgname, pkg_desc)) + if fields[0] == "I": + pkgname = fields[1] + i_depends.append(pkgname) return depends, i_depends def GetObsoletedBy(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 Tue Mar 29 10:29:51 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 29 Mar 2011 08:29:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[14008] csw/mgar/gar/v2/lib/python Message-ID: Revision: 14008 http://gar.svn.sourceforge.net/gar/?rev=14008&view=rev Author: wahwah Date: 2011-03-29 08:29:51 +0000 (Tue, 29 Mar 2011) Log Message: ----------- csw-upload-pkg: Import package if necessary This change makes it easier to add packages not built with GAR: If a package is has not been previously imported to the database, pkgdb is automatically invoked to import the metadata. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py csw/mgar/gar/v2/lib/python/rest.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-03-29 08:29:08 UTC (rev 14007) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-03-29 08:29:51 UTC (rev 14008) @@ -61,6 +61,10 @@ """Unexpected data found.""" +class WorkflowError(Error): + """Unexpected state of workflow, e.g. expected element not found.""" + + class Srv4Uploader(object): def __init__(self, filenames, rest_url, os_release=None, debug=False): @@ -72,11 +76,37 @@ self.rest_url = rest_url self._rest_client = rest.RestClient(self.rest_url) + def _ImportMetadata(self, filename): + md5_sum = self._GetFileMd5sum(filename) + metadata = self._rest_client.GetPkgByMd5(md5_sum) + if metadata: + # Metadata are already in the database. + return + logging.warning("%s (%s) is not known to the database.", filename, md5_sum) + bin_dir = os.path.dirname(__file__) + pkgdb_executable = os.path.join(bin_dir, "pkgdb") + assert os.path.exists(pkgdb_executable), ( + "Could not find %s. Make sure that the pkgdb executable is " + "available \n" + "from the same directory as csw-upload-pkg." % pkgdb_executable) + args = [pkgdb_executable, "importpkg", filename] + ret = subprocess.call(args) + if ret: + raise OSError("An error occurred when running %s." % args) + # Verify that the import succeeded + metadata = self._rest_client.GetPkgByMd5(md5_sum) + if not metadata: + raise WorkflowError( + "Metadata of %s could not be imported into the database." + % filename) + + def Upload(self): do_upload = True planned_modifications = [] metadata_by_md5 = {} for filename in self.filenames: + self._ImportMetadata(filename) md5_sum = self._GetFileMd5sum(filename) file_in_allpkgs, file_metadata = self._GetSrv4FileMetadata(md5_sum) if file_in_allpkgs: Modified: csw/mgar/gar/v2/lib/python/rest.py =================================================================== --- csw/mgar/gar/v2/lib/python/rest.py 2011-03-29 08:29:08 UTC (rev 14007) +++ csw/mgar/gar/v2/lib/python/rest.py 2011-03-29 08:29:51 UTC (rev 14008) @@ -30,12 +30,18 @@ return json.loads(data) except urllib2.HTTPError, e: logging.warning("%s -- %s", url, e) - return { - "maintainer_email": "Unknown", - } + if e.code == 404: + # Code 404 is fine, it means that the package with given md5 does not + # exist. + return None + else: + # Other HTTP errors are should be thrown. + raise def GetMaintainerByMd5(self, md5_sum): pkg = self.GetPkgByMd5(md5_sum) + if not pkg: + pkg = {"maintainer_email": "Unknown"} return { "maintainer_email": pkg["maintainer_email"], } 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 Mar 29 13:04:00 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 29 Mar 2011 11:04:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[14009] csw/mgar/pkg/perl/branches/perl-5.10.1-64bit/ Makefile Message-ID: Revision: 14009 http://gar.svn.sourceforge.net/gar/?rev=14009&view=rev Author: dmichelsen Date: 2011-03-29 11:04:00 +0000 (Tue, 29 Mar 2011) Log Message: ----------- perl 64 bit: Add comments about possible problems and disable test for now Modified Paths: -------------- csw/mgar/pkg/perl/branches/perl-5.10.1-64bit/Makefile Modified: csw/mgar/pkg/perl/branches/perl-5.10.1-64bit/Makefile =================================================================== --- csw/mgar/pkg/perl/branches/perl-5.10.1-64bit/Makefile 2011-03-29 08:29:51 UTC (rev 14008) +++ csw/mgar/pkg/perl/branches/perl-5.10.1-64bit/Makefile 2011-03-29 11:04:00 UTC (rev 14009) @@ -45,7 +45,7 @@ # Core module updates # Not used at the moment, leave one as example #MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ -#CORE_UPDATES += PathTools-3.30 +#CORE_UPDATES += PathTools-3.30z #CORE_OBSOLETE += Cwd.pm File/Spec* auto/Cwd DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) @@ -65,6 +65,22 @@ PERL_LIBS-64 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc PERL_LIBS = $(PERL_LIBS-$(MEMORYMODEL)) +# TBD: 64 bit pathes +# ld='/opt/SUNWspro/bin/cc', ldflags ='-m64 -xarch=sparc -L/opt/csw/bdb48/lib/64 -L/opt/csw/lib/64 -L/usr/lib -L/usr/ccs/lib -L/lib -xarch=v9' + +# /usr/lib -> /usr/lib/64 +# /usr/ccs/lib -> /usr/ccs/lib/sparcv9 +# /lib -> /lib/64 + +# libpth=/usr/lib /usr/ccs/lib /lib /opt/csw/lib/64 +# libs=-lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc +# perllibs=-lsocket -lnsl -ldb-4.8 -ldl -lm -lpthread -lc +# libc=/usr/lib/sparcv9/libc.so, so=so, useshrplib=true, libperl=libperl.so.5.10.1 +# gnulibc_version='' +# Dynamic Linking: +# dlsrc=dl_dlopen.xs, dlext=so, d_dlsymun=undef, ccdlflags='-R /opt/csw/lib/64' +# cccdlflags='-KPIC', lddlflags='-G -xarch=v9 -L/opt/csw/bdb48/lib/64 -L/opt/csw/lib/64 -L/usr/lib -L/usr/ccs/lib -L/lib' + # Configuration flags CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION) CONFIGURE_ARGS += -Dcc=$(CC) @@ -125,7 +141,7 @@ EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) # Tests take a long time -# SKIPTEST ?= 1 +SKIPTEST ?= 1 # Make sure we don't include the path to the newly built perl as the # library is not in place yet. 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 Mar 29 17:41:28 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 29 Mar 2011 15:41:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[14010] csw/mgar/pkg Message-ID: Revision: 14010 http://gar.svn.sourceforge.net/gar/?rev=14010&view=rev Author: bdwalton Date: 2011-03-29 15:41:27 +0000 (Tue, 29 Mar 2011) Log Message: ----------- gdal: add new package (another grass requirement); this will update the existing legacy package Added Paths: ----------- csw/mgar/pkg/gdal/ csw/mgar/pkg/gdal/Makefile csw/mgar/pkg/gdal/branches/ csw/mgar/pkg/gdal/tags/ csw/mgar/pkg/gdal/trunk/ csw/mgar/pkg/gdal/trunk/Makefile csw/mgar/pkg/gdal/trunk/checksums csw/mgar/pkg/gdal/trunk/files/ Copied: csw/mgar/pkg/gdal/Makefile (from rev 13986, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gdal/Makefile (rev 0) +++ csw/mgar/pkg/gdal/Makefile 2011-03-29 15:41:27 UTC (rev 14010) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/gdal/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/gdal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdal/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gdal/trunk/Makefile 2011-03-29 15:41:27 UTC (rev 14010) @@ -0,0 +1,16 @@ +# $Id$ +NAME = gdal +VERSION = 1.8.0 +CATEGORIES = lib + +DESCRIPTION = Geospatial Data Abstraction Library +define BLURB +GDAL is a translator library for raster geospatial data formats that is released under an X/MIT style Open Source license by the Open Source Geospatial Foundation. As a library, it presents a single abstract data model to the calling application for all supported formats. It also comes with a variety of useful commandline utilities for data translation and processing. +endef + +GARTYPE = v2-defaultchange + +MASTER_SITES = http://download.osgeo.org/$(NAME)/ +DISTFILES = $(DISTNAME).tar.gz + +include gar/category.mk Property changes on: csw/mgar/pkg/gdal/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/gdal/trunk/checksums =================================================================== --- csw/mgar/pkg/gdal/trunk/checksums (rev 0) +++ csw/mgar/pkg/gdal/trunk/checksums 2011-03-29 15:41:27 UTC (rev 14010) @@ -0,0 +1 @@ +c762cdab0f7e51a677ba49278a8a263d gdal-1.8.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 Tue Mar 29 20:57:35 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 29 Mar 2011 18:57:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[14011] csw/mgar/pkg/ascii/trunk/Makefile Message-ID: Revision: 14011 http://gar.svn.sourceforge.net/gar/?rev=14011&view=rev Author: dmichelsen Date: 2011-03-29 18:57:35 +0000 (Tue, 29 Mar 2011) Log Message: ----------- ascii: Change description Modified Paths: -------------- csw/mgar/pkg/ascii/trunk/Makefile Modified: csw/mgar/pkg/ascii/trunk/Makefile =================================================================== --- csw/mgar/pkg/ascii/trunk/Makefile 2011-03-29 15:41:27 UTC (rev 14010) +++ csw/mgar/pkg/ascii/trunk/Makefile 2011-03-29 18:57:35 UTC (rev 14011) @@ -3,7 +3,7 @@ VERSION = 3.11 CATEGORIES = utils -DESCRIPTION = Provides easy conversion between various byte representations and ASCII +DESCRIPTION = Interactive ASCII name and synonym chart define BLURB endef This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Tue Mar 29 21:54:22 2011 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 29 Mar 2011 19:54:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[14012] csw/mgar/pkg/bluefish/trunk Message-ID: Revision: 14012 http://gar.svn.sourceforge.net/gar/?rev=14012&view=rev Author: jake_goerzen Date: 2011-03-29 19:54:22 +0000 (Tue, 29 Mar 2011) Log Message: ----------- bluefish: commit version 2.0.3 Added Paths: ----------- csw/mgar/pkg/bluefish/trunk/Makefile csw/mgar/pkg/bluefish/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/bluefish/trunk/ Property changes on: csw/mgar/pkg/bluefish/trunk ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/bluefish/trunk/Makefile =================================================================== --- csw/mgar/pkg/bluefish/trunk/Makefile (rev 0) +++ csw/mgar/pkg/bluefish/trunk/Makefile 2011-03-29 19:54:22 UTC (rev 14012) @@ -0,0 +1,48 @@ +NAME = bluefish +VERSION = 2.0.3 +CATEGORIES = apps + +DESCRIPTION = Advanced Gtk+ HTML editor +define BLURB +Bluefish is a GTK+ HTML editor for the experienced web designer. Its features include nice wizards for startup, tables and frames; a fully featured image insert dialog; thumbnail creation and automatically linking of the thumbnail with the original image; and configurable HTML syntax highlighting. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(NAME)-$(VERSION).tar.gz + +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +TEST_SCRIPTS = + +CONFIGURE_ARGS += $(DIRPATHS) + +RUNTIME_DEP_PKGS_CSWbluefish += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWbluefish += CSWenchant +RUNTIME_DEP_PKGS_CSWbluefish += CSWftype2 +RUNTIME_DEP_PKGS_CSWbluefish += CSWlibcairo +RUNTIME_DEP_PKGS_CSWbluefish += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWbluefish += CSWgtk2 +RUNTIME_DEP_PKGS_CSWbluefish += CSWlibatk +RUNTIME_DEP_PKGS_CSWbluefish += CSWpango +RUNTIME_DEP_PKGS_CSWbluefish += CSWfconfig +RUNTIME_DEP_PKGS_CSWbluefish += CSWglib2 + +CHECKPKG_OVERRIDES_CSWbluefish += file-collision|/opt/csw/share/mime/treemagic|CSWbluefish|CSWsharedmimeinfo +CHECKPKG_OVERRIDES_CSWbluefish += file-collision|/opt/csw/share/mime/globs|CSWbluefish|CSWsharedmimeinfo +CHECKPKG_OVERRIDES_CSWbluefish += file-collision|/opt/csw/share/mime/generic-icons|CSWbluefish|CSWsharedmimeinfo +CHECKPKG_OVERRIDES_CSWbluefish += file-collision|/opt/csw/share/mime/aliases|CSWbluefish|CSWsharedmimeinfo +CHECKPKG_OVERRIDES_CSWbluefish += file-collision|/opt/csw/share/mime/subclasses|CSWbluefish|CSWsharedmimeinfo +CHECKPKG_OVERRIDES_CSWbluefish += file-collision|/opt/csw/share/mime/magic|CSWbluefish|CSWsharedmimeinfo +CHECKPKG_OVERRIDES_CSWbluefish += file-collision|/opt/csw/share/mime/globs2|CSWbluefish|CSWsharedmimeinfo +CHECKPKG_OVERRIDES_CSWbluefish += file-collision|/opt/csw/share/applications/mimeinfo.cache|CSWbluefish|CSWcontrolcenter +CHECKPKG_OVERRIDES_CSWbluefish += file-collision|/opt/csw/share/mime/mime.cache|CSWbluefish|CSWsharedmimeinfo +CHECKPKG_OVERRIDES_CSWbluefish += file-collision|/opt/csw/share/mime/types|CSWbluefish|CSWsharedmimeinfo +CHECKPKG_OVERRIDES_CSWbluefish += file-collision|/opt/csw/share/mime/XMLnamespaces|CSWbluefish|CSWsharedmimeinfo +CHECKPKG_OVERRIDES_CSWbluefish += file-collision|/opt/csw/share/mime/icons|CSWbluefish|CSWsharedmimeinfo + +CHECKPKG_OVERRIDES_CSWbluefish += file-with-bad-content|/usr/local|root/opt/csw/share/bluefish/bflang/all-php.bfinc + +include gar/category.mk + +# ./configure needs this to find ggettext +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/bluefish/trunk/checksums =================================================================== --- csw/mgar/pkg/bluefish/trunk/checksums (rev 0) +++ csw/mgar/pkg/bluefish/trunk/checksums 2011-03-29 19:54:22 UTC (rev 14012) @@ -0,0 +1 @@ +eda52b12ecd0c2bfd549eba9c2516365 bluefish-2.0.3.tar.gz 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 Mar 30 04:55:50 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 30 Mar 2011 02:55:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[14013] csw/mgar/pkg/gdal/trunk/Makefile Message-ID: Revision: 14013 http://gar.svn.sourceforge.net/gar/?rev=14013&view=rev Author: bdwalton Date: 2011-03-30 02:55:50 +0000 (Wed, 30 Mar 2011) Log Message: ----------- gdal/trunk: set a few initial config options Modified Paths: -------------- csw/mgar/pkg/gdal/trunk/Makefile Modified: csw/mgar/pkg/gdal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdal/trunk/Makefile 2011-03-29 19:54:22 UTC (rev 14012) +++ csw/mgar/pkg/gdal/trunk/Makefile 2011-03-30 02:55:50 UTC (rev 14013) @@ -13,4 +13,10 @@ MASTER_SITES = http://download.osgeo.org/$(NAME)/ DISTFILES = $(DISTNAME).tar.gz +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-libz=$(prefix) +CONFIGURE_ARGS += --with-png=$(prefix) +CONFIGURE_ARGS += --with-libtiff=$(prefix) +CONFIGURE_ARGS += --with-jpeg=$(prefix) + 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 Mar 30 05:20:37 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 30 Mar 2011 03:20:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[14014] csw/mgar/pkg/gdal/trunk/Makefile Message-ID: Revision: 14014 http://gar.svn.sourceforge.net/gar/?rev=14014&view=rev Author: bdwalton Date: 2011-03-30 03:20:37 +0000 (Wed, 30 Mar 2011) Log Message: ----------- gdal/trunk: enable more options Modified Paths: -------------- csw/mgar/pkg/gdal/trunk/Makefile Modified: csw/mgar/pkg/gdal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdal/trunk/Makefile 2011-03-30 02:55:50 UTC (rev 14013) +++ csw/mgar/pkg/gdal/trunk/Makefile 2011-03-30 03:20:37 UTC (rev 14014) @@ -18,5 +18,10 @@ CONFIGURE_ARGS += --with-png=$(prefix) CONFIGURE_ARGS += --with-libtiff=$(prefix) CONFIGURE_ARGS += --with-jpeg=$(prefix) +CONFIGURE_ARGS += --with-expat=$(prefix) +CONFIGURE_ARGS += --with-mysql=/opt/csw/mysql5/bin/mysql_config +# not working yet. +#CONFIGURE_ARGS += --with-pg=/opt/csw/postgresql/bin/pg_config +CONFIGURE_ARGS += --with-sqlite3=$(prefix) include gar/category.mk 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 Mar 30 09:55:31 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 30 Mar 2011 07:55:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[14015] csw/mgar/gar/v2/lib/python Message-ID: Revision: 14015 http://gar.svn.sourceforge.net/gar/?rev=14015&view=rev Author: wahwah Date: 2011-03-30 07:55:31 +0000 (Wed, 30 Mar 2011) Log Message: ----------- submitpkg: Throw an error on UNCOMMITTED Examine the file set to be submitted and verify that the vendor tag is correct ("CSW"). If not, throw an error. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py Modified: csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py =================================================================== --- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2011-03-30 03:20:37 UTC (rev 14014) +++ csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2011-03-30 07:55:31 UTC (rev 14015) @@ -104,15 +104,31 @@ class FileSetChecker(object): + def _CheckUncommitted(self, files_with_metadata): + tags = [] + expected_vendor_tag = "CSW" + for filename, parsed_filename in files_with_metadata: + if parsed_filename["vendortag"] != expected_vendor_tag: + tags.append(tag.CheckpkgTag( + None, + "bad-vendor-tag", + "%s expected=%s actual=%s" + % (parsed_filename["catalogname"], + expected_vendor_tag, + parsed_filename["vendortag"]))) + return tags + def CheckFiles(self, file_list): """Checks a set of files. Returns error tags.""" catalognames_by_arch = { "i386": set(), "sparc": set(), } + files_with_metadata = [] for file_path in file_list: pkg_path, basename = os.path.split(file_path) parsed = opencsw.ParsePackageFileName(basename) + files_with_metadata.append((basename, parsed)) if parsed["arch"] == "all": for arch in ("i386", "sparc"): catalognames_by_arch[arch].add(parsed["catalogname"]) @@ -125,6 +141,7 @@ tags.append(tag.CheckpkgTag(None, "sparc-arch-missing", catalogname)) for catalogname in sparc.difference(i386): tags.append(tag.CheckpkgTag(None, "i386-arch-missing", catalogname)) + tags.extend(self._CheckUncommitted(files_with_metadata)) return tags Modified: csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py 2011-03-30 03:20:37 UTC (rev 14014) +++ csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py 2011-03-30 07:55:31 UTC (rev 14015) @@ -22,5 +22,18 @@ expected = [tag.CheckpkgTag(None, 'i386-arch-missing', 'libnspr4')] self.assertEqual(expected, fc.CheckFiles(SAMPLE_FILES)) + def testUncommitted(self): + fc = stn.FileSetChecker() + expected = [ + tag.CheckpkgTag(None, 'bad-vendor-tag', 'nspr_devel expected=CSW actual=UNCOMMITTED'), + tag.CheckpkgTag(None, 'bad-vendor-tag', 'nspr_devel expected=CSW actual=UNCOMMITTED'), + ] + files = ['/home/experimental/maciej/' + 'nspr_devel-4.8.6,REV=2010.10.16-SunOS5.9-sparc-UNCOMMITTED.pkg.gz', + '/home/experimental/maciej/' + 'nspr_devel-4.8.6,REV=2010.10.16-SunOS5.9-i386-UNCOMMITTED.pkg.gz'] + self.assertEqual(expected, fc.CheckFiles(files)) + + 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 Wed Mar 30 14:50:16 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 30 Mar 2011 12:50:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[14016] csw/mgar/pkg/pca/trunk Message-ID: Revision: 14016 http://gar.svn.sourceforge.net/gar/?rev=14016&view=rev Author: dmichelsen Date: 2011-03-30 12:50:16 +0000 (Wed, 30 Mar 2011) Log Message: ----------- pca: Add chkmin from contrib/ Modified Paths: -------------- csw/mgar/pkg/pca/trunk/Makefile csw/mgar/pkg/pca/trunk/checksums Modified: csw/mgar/pkg/pca/trunk/Makefile =================================================================== --- csw/mgar/pkg/pca/trunk/Makefile 2011-03-30 07:55:31 UTC (rev 14015) +++ csw/mgar/pkg/pca/trunk/Makefile 2011-03-30 12:50:16 UTC (rev 14016) @@ -13,8 +13,10 @@ It works on all versions of Solaris, both SPARC and x86. endef -MASTER_SITES = http://www.par.univie.ac.at/solaris/pca/download/ +MASTER_SITES += http://www.par.univie.ac.at/solaris/pca/download/ +MASTER_SITES += http://www.par.univie.ac.at/solaris/pca/contrib/ DISTFILES = $(NAME)-$(VERSION) +DISTFILES += chkmin DISTFILES += COPYING DISTFILES += pca.conf @@ -52,6 +54,7 @@ install-custom: ginstall -d $(DESTDIR)$(bindir) ginstall $(WORKSRC)/pca $(DESTDIR)$(bindir)/pca + ginstall $(WORKSRC)/chkmin $(DESTDIR)$(bindir)/chkmin ginstall -d $(DESTDIR)/etc/opt/csw ginstall $(WORKSRC)/pca.conf $(DESTDIR)/etc/opt/csw ginstall -d $(DESTDIR)$(mandir)/man8 Modified: csw/mgar/pkg/pca/trunk/checksums =================================================================== --- csw/mgar/pkg/pca/trunk/checksums 2011-03-30 07:55:31 UTC (rev 14015) +++ csw/mgar/pkg/pca/trunk/checksums 2011-03-30 12:50:16 UTC (rev 14016) @@ -1 +1,2 @@ +f0a009f889da56e5a0de7f322dbfa0a8 chkmin bd964b26b3de794dc6742bac7c8ab0c6 pca-20110329-01 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 Mar 30 15:42:37 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 30 Mar 2011 13:42:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[14017] csw/mgar/pkg Message-ID: Revision: 14017 http://gar.svn.sourceforge.net/gar/?rev=14017&view=rev Author: dmichelsen Date: 2011-03-30 13:42:37 +0000 (Wed, 30 Mar 2011) Log Message: ----------- libflac7: Initial commit Modified Paths: -------------- csw/mgar/pkg/libflac7/trunk/Makefile csw/mgar/pkg/libflac7/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libflac7/ csw/mgar/pkg/libflac7/trunk/files/libtool-64bit.patch csw/mgar/pkg/libflac7/trunk/files/strip-nasm-1.1.2.patch Removed Paths: ------------- csw/mgar/pkg/libflac7/trunk/bin/ csw/mgar/pkg/libflac7/trunk/files/strip-nasm-1.0.4.patch Modified: csw/mgar/pkg/libflac7/trunk/Makefile =================================================================== --- csw/mgar/pkg/libflac4/trunk/Makefile 2011-03-30 03:20:37 UTC (rev 14014) +++ csw/mgar/pkg/libflac7/trunk/Makefile 2011-03-30 13:42:37 UTC (rev 14017) @@ -1,5 +1,5 @@ NAME = libflac -VERSION = 1.0.4 +VERSION = 1.1.2 CATEGORIES = lib DESCRIPTION = Free lossless audio codec @@ -18,18 +18,20 @@ DISTNAME = $(SF_PROJ)-$(VERSION) DISTFILES = $(DISTNAME).tar.gz -PATCHFILES = strip-nasm-1.0.4.patch +PATCHFILES += libtool-64bit.patch +PATCHFILES += strip-nasm-1.1.2.patch + BUILD_DEP_PKGS += CSWbash -PACKAGES += CSWlibflac4 -CATALOGNAME_CSWlibflac4 = libflac4 -SPKG_DESC_CSWlibflac4 = Free lossless audio codec library, libflac.so.4 -PKGFILES_CSWlibflac4 = $(call baseisadirs,$(libdir),libFLAC\.so\.4(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibflac4 += CSWiconv +PACKAGES += CSWlibflac7 +CATALOGNAME_CSWlibflac7 = libflac7 +SPKG_DESC_CSWlibflac7 = Free lossless audio codec library, libflac.so.7 +PKGFILES_CSWlibflac7 = $(call pkgfiles_lib,libFLAC.so.7) +RUNTIME_DEP_PKGS_CSWlibflac7 += CSWiconv # Override conflicts with CSWflac as the new CSWflac is built from the latest libflac -CHECKPKG_OVERRIDES_CSWlibflac4 += file-collision|/opt/csw/lib/libFLAC.so.4.0.1|CSWflac|CSWlibflac4 -CHECKPKG_OVERRIDES_CSWlibflac4 += file-collision|/opt/csw/lib/libFLAC.so.4|CSWflac|CSWlibflac4 +CHECKPKG_OVERRIDES_CSWlibflac7 += file-collision|/opt/csw/lib/libFLAC.so.7.0.0|CSWflac|CSWlibflac7 +CHECKPKG_OVERRIDES_CSWlibflac7 += file-collision|/opt/csw/lib/libFLAC.so.7|CSWflac|CSWlibflac7 VENDOR_URL = http://flac.sourceforge.net/ @@ -38,9 +40,10 @@ EXTRA_LINKER_FLAGS = -liconv -lm # Must be defined and empty or -I$(includedir) is added too early -# EXTRA_INC = ../../include -CPPFLAGS = -EXTRA_CFLAGS = $(INCLUDE_FLAGS) -D__inline= +EXTRA_INC = ../../include +#CPPFLAGS = +#EXTRA_CFLAGS = $(INCLUDE_FLAGS) -D__inline= +EXTRA_CFLAGS = -D__inline= CONFIGURE_ARGS = $(DIRPATHS) @@ -56,5 +59,5 @@ include gar/category.mk post-patch-modulated: - perl -pi -e "s/-O3 //g" $(WORKSRC)/configure + perl -pi -e "s/-O2 //g" $(WORKSRC)/configure $(MAKECOOKIE) Modified: csw/mgar/pkg/libflac7/trunk/checksums =================================================================== --- csw/mgar/pkg/libflac4/trunk/checksums 2011-03-30 03:20:37 UTC (rev 14014) +++ csw/mgar/pkg/libflac7/trunk/checksums 2011-03-30 13:42:37 UTC (rev 14017) @@ -1 +1 @@ -b1523e6ad8ef85d1df5b18f20a8cfad6 flac-1.0.4.tar.gz +2bfc127cdda02834d0491ab531a20960 flac-1.1.2.tar.gz Copied: csw/mgar/pkg/libflac7/trunk/files/libtool-64bit.patch (from rev 14014, csw/mgar/pkg/flac/trunk/files/libtool-64bit.patch) =================================================================== --- csw/mgar/pkg/libflac7/trunk/files/libtool-64bit.patch (rev 0) +++ csw/mgar/pkg/libflac7/trunk/files/libtool-64bit.patch 2011-03-30 13:42:37 UTC (rev 14017) @@ -0,0 +1,13 @@ +diff -Naur flac-1.1.4.orig/ltmain.sh flac-1.1.4.patched/ltmain.sh +--- flac-1.1.4.orig/ltmain.sh 2005-04-26 20:23:39.000000000 +0200 ++++ flac-1.1.4.patched/ltmain.sh 2009-04-09 13:59:57.521039544 +0200 +@@ -1545,9 +1545,7 @@ + esac + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" +- if test "$with_gcc" = "yes" ; then + compiler_flags="$compiler_flags $arg" +- fi + continue + ;; + Deleted: csw/mgar/pkg/libflac7/trunk/files/strip-nasm-1.0.4.patch =================================================================== --- csw/mgar/pkg/libflac4/trunk/files/strip-nasm-1.0.4.patch 2011-03-30 03:20:37 UTC (rev 14014) +++ csw/mgar/pkg/libflac7/trunk/files/strip-nasm-1.0.4.patch 2011-03-30 13:42:37 UTC (rev 14017) @@ -1,32 +0,0 @@ -diff -Naur flac-1.0.4.orig/src/libFLAC/ia32/Makefile.in flac-1.0.4.patched/src/libFLAC/ia32/Makefile.in ---- flac-1.0.4.orig/src/libFLAC/ia32/Makefile.in 2002-09-25 06:53:37.000000000 +0200 -+++ flac-1.0.4.patched/src/libFLAC/ia32/Makefile.in 2009-08-03 11:12:29.197650544 +0200 -@@ -134,7 +134,7 @@ - - SUFFIXES = .nasm .lo - --STRIP_FPIC = sh $(top_srcdir)/strip_fPIC.sh -+STRIP_FPIC = /opt/csw/bin/bash $(top_srcdir)/strip_fPIC.sh - - noinst_LTLIBRARIES = libFLAC-asm.la - libFLAC_asm_la_SOURCES = \ -diff -Naur flac-1.0.4.orig/strip_fPIC.sh flac-1.0.4.patched/strip_fPIC.sh ---- flac-1.0.4.orig/strip_fPIC.sh 2002-08-26 21:21:52.000000000 +0200 -+++ flac-1.0.4.patched/strip_fPIC.sh 2009-08-03 11:12:00.031237509 +0200 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/opt/csw/bin/bash - # - # libtool assumes that the compiler can handle the -fPIC flag - # This isn't always true (for example, nasm can't handle it) -@@ -6,8 +6,10 @@ - while [ $1 ]; do - if [ "$1" != "-fPIC" ]; then - if [ "$1" != "-DPIC" ]; then -+ if [ "$1" != "-KPIC" ]; then - command="$command $1" - fi -+ fi - fi - shift - done Copied: csw/mgar/pkg/libflac7/trunk/files/strip-nasm-1.1.2.patch (from rev 14014, csw/mgar/pkg/flac/trunk/files/strip-nasm-1.1.2.patch) =================================================================== --- csw/mgar/pkg/libflac7/trunk/files/strip-nasm-1.1.2.patch (rev 0) +++ csw/mgar/pkg/libflac7/trunk/files/strip-nasm-1.1.2.patch 2011-03-30 13:42:37 UTC (rev 14017) @@ -0,0 +1,34 @@ +diff -Naur flac-1.1.2.orig/src/libFLAC/ia32/Makefile.in flac-1.1.2.patched/src/libFLAC/ia32/Makefile.in +--- flac-1.1.2.orig/src/libFLAC/ia32/Makefile.in 2005-02-05 03:23:38.000000000 +0100 ++++ flac-1.1.2.patched/src/libFLAC/ia32/Makefile.in 2009-08-04 09:37:40.159783125 +0200 +@@ -253,7 +253,7 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + SUFFIXES = .nasm .lo +-STRIP_NON_ASM = sh $(top_srcdir)/strip_non_asm_libtool_args.sh ++STRIP_NON_ASM = /opt/csw/bin/bash $(top_srcdir)/strip_non_asm_libtool_args.sh + noinst_LTLIBRARIES = libFLAC-asm.la + libFLAC_asm_la_SOURCES = \ + cpu_asm.nasm \ +diff -Naur flac-1.1.2.orig/strip_non_asm_libtool_args.sh flac-1.1.2.patched/strip_non_asm_libtool_args.sh +--- flac-1.1.2.orig/strip_non_asm_libtool_args.sh 2004-07-29 08:52:52.000000000 +0200 ++++ flac-1.1.2.patched/strip_non_asm_libtool_args.sh 2009-08-04 09:38:06.129792997 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/opt/csw/bin/bash + # + # libtool assumes that the compiler can handle the -fPIC flag. + # This isn't always true (for example, nasm can't handle it). +@@ -8,10 +8,12 @@ + while [ $1 ]; do + if [ "$1" != "-fPIC" ]; then + if [ "$1" != "-DPIC" ]; then ++ if [ "$1" != "-KPIC" ]; then + if [ "$1" != "-fno-common" ]; then + command="$command $1" + fi + fi ++ fi + fi + shift + 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 Mar 30 15:43:17 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 30 Mar 2011 13:43:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[14018] csw/mgar/pkg/libflac4/trunk/bin/ Message-ID: Revision: 14018 http://gar.svn.sourceforge.net/gar/?rev=14018&view=rev Author: dmichelsen Date: 2011-03-30 13:43:17 +0000 (Wed, 30 Mar 2011) Log Message: ----------- libflac4: Remove unused compiler wrapper Removed Paths: ------------- csw/mgar/pkg/libflac4/trunk/bin/ 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 Mar 30 18:34:58 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 30 Mar 2011 16:34:58 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[365] gar-wrapper/mgar Message-ID: Revision: 365 http://opencsw.svn.sourceforge.net/opencsw/?rev=365&view=rev Author: skayser Date: 2011-03-30 16:34:58 +0000 (Wed, 30 Mar 2011) Log Message: ----------- mgar: correct software name for subversion pkg: subversion, not svn Modified Paths: -------------- gar-wrapper/mgar Modified: gar-wrapper/mgar =================================================================== --- gar-wrapper/mgar 2011-03-16 00:49:49 UTC (rev 364) +++ gar-wrapper/mgar 2011-03-30 16:34:58 UTC (rev 365) @@ -64,7 +64,7 @@ PKG_REPO=https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/ REQ_TOOLS="gfind ggrep gmake gxargs mknmz namazu svn" -REQ_PKGS="findutils ggrep gmake namazu svn" +REQ_PKGS="findutils ggrep gmake namazu subversion" function assert_required_tools { local tool dir 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 Mar 30 19:19:37 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 30 Mar 2011 17:19:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[14019] csw/mgar/pkg/gdal/trunk Message-ID: Revision: 14019 http://gar.svn.sourceforge.net/gar/?rev=14019&view=rev Author: bdwalton Date: 2011-03-30 17:19:36 +0000 (Wed, 30 Mar 2011) Log Message: ----------- gdal/trunk: force use of bash so libtool works Modified Paths: -------------- csw/mgar/pkg/gdal/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gdal/trunk/files/0001-Force-the-use-of-CSWbash.patch Modified: csw/mgar/pkg/gdal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdal/trunk/Makefile 2011-03-30 13:43:17 UTC (rev 14018) +++ csw/mgar/pkg/gdal/trunk/Makefile 2011-03-30 17:19:36 UTC (rev 14019) @@ -12,6 +12,7 @@ MASTER_SITES = http://download.osgeo.org/$(NAME)/ DISTFILES = $(DISTNAME).tar.gz +PATCHFILES += 0001-Force-the-use-of-CSWbash.patch CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libz=$(prefix) Added: csw/mgar/pkg/gdal/trunk/files/0001-Force-the-use-of-CSWbash.patch =================================================================== --- csw/mgar/pkg/gdal/trunk/files/0001-Force-the-use-of-CSWbash.patch (rev 0) +++ csw/mgar/pkg/gdal/trunk/files/0001-Force-the-use-of-CSWbash.patch 2011-03-30 17:19:36 UTC (rev 14019) @@ -0,0 +1,29 @@ +From 25241ade123f17a5e4a381c0057004d28ba7035e Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Wed, 30 Mar 2011 18:00:00 +0200 +Subject: [PATCH] Force the use of CSWbash + +This is required to make libtool execute properly since it has +bashisms. + +Signed-off-by: Ben Walton +--- + GDALmake.opt.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/GDALmake.opt.in b/GDALmake.opt.in +index bdeba13..4595a2f 100644 +--- a/GDALmake.opt.in ++++ b/GDALmake.opt.in +@@ -8,7 +8,7 @@ top_builddir = $(GDAL_ROOT) + # Solaris users: the LIBTOOL line is expanded to $(SHELL) $(top_builddir)/libtool + # but the libtool script uses bashism, so you may need to uncomment the following + # line : +-#SHELL=/usr/bin/bash ++SHELL=/opt/csw/bin/bash + + HAVE_LIBTOOL = @HAVE_LIBTOOL@ + LIBTOOL = @LIBTOOL@ +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Wed Mar 30 20:22:25 2011 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 30 Mar 2011 18:22:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[14020] csw/mgar/pkg/bluefish/trunk/Makefile Message-ID: Revision: 14020 http://gar.svn.sourceforge.net/gar/?rev=14020&view=rev Author: jake_goerzen Date: 2011-03-30 18:22:24 +0000 (Wed, 30 Mar 2011) Log Message: ----------- bluefish: remove overrides and exclude file-collision dirs Modified Paths: -------------- csw/mgar/pkg/bluefish/trunk/Makefile Modified: csw/mgar/pkg/bluefish/trunk/Makefile =================================================================== --- csw/mgar/pkg/bluefish/trunk/Makefile 2011-03-30 17:19:36 UTC (rev 14019) +++ csw/mgar/pkg/bluefish/trunk/Makefile 2011-03-30 18:22:24 UTC (rev 14020) @@ -27,22 +27,24 @@ RUNTIME_DEP_PKGS_CSWbluefish += CSWfconfig RUNTIME_DEP_PKGS_CSWbluefish += CSWglib2 -CHECKPKG_OVERRIDES_CSWbluefish += file-collision|/opt/csw/share/mime/treemagic|CSWbluefish|CSWsharedmimeinfo -CHECKPKG_OVERRIDES_CSWbluefish += file-collision|/opt/csw/share/mime/globs|CSWbluefish|CSWsharedmimeinfo -CHECKPKG_OVERRIDES_CSWbluefish += file-collision|/opt/csw/share/mime/generic-icons|CSWbluefish|CSWsharedmimeinfo -CHECKPKG_OVERRIDES_CSWbluefish += file-collision|/opt/csw/share/mime/aliases|CSWbluefish|CSWsharedmimeinfo -CHECKPKG_OVERRIDES_CSWbluefish += file-collision|/opt/csw/share/mime/subclasses|CSWbluefish|CSWsharedmimeinfo -CHECKPKG_OVERRIDES_CSWbluefish += file-collision|/opt/csw/share/mime/magic|CSWbluefish|CSWsharedmimeinfo -CHECKPKG_OVERRIDES_CSWbluefish += file-collision|/opt/csw/share/mime/globs2|CSWbluefish|CSWsharedmimeinfo -CHECKPKG_OVERRIDES_CSWbluefish += file-collision|/opt/csw/share/applications/mimeinfo.cache|CSWbluefish|CSWcontrolcenter -CHECKPKG_OVERRIDES_CSWbluefish += file-collision|/opt/csw/share/mime/mime.cache|CSWbluefish|CSWsharedmimeinfo -CHECKPKG_OVERRIDES_CSWbluefish += file-collision|/opt/csw/share/mime/types|CSWbluefish|CSWsharedmimeinfo -CHECKPKG_OVERRIDES_CSWbluefish += file-collision|/opt/csw/share/mime/XMLnamespaces|CSWbluefish|CSWsharedmimeinfo -CHECKPKG_OVERRIDES_CSWbluefish += file-collision|/opt/csw/share/mime/icons|CSWbluefish|CSWsharedmimeinfo +EXTRA_MERGE_EXCLUDE_FILES = .*treemagic.* +EXTRA_MERGE_EXCLUDE_FILES += .*globs.* +EXTRA_MERGE_EXCLUDE_FILES += .*generic-icons.* +EXTRA_MERGE_EXCLUDE_FILES += .*aliases.* +EXTRA_MERGE_EXCLUDE_FILES += .*subclasses.* +EXTRA_MERGE_EXCLUDE_FILES += .*magic.* +EXTRA_MERGE_EXCLUDE_FILES += .*globs2.* +EXTRA_MERGE_EXCLUDE_FILES += .*mimeinfo.cache.* +EXTRA_MERGE_EXCLUDE_FILES += .*mime.cache.* +EXTRA_MERGE_EXCLUDE_FILES += .*types.* +EXTRA_MERGE_EXCLUDE_FILES += .*XMLnamespaces.* +EXTRA_MERGE_EXCLUDE_FILES += .*icons.* -CHECKPKG_OVERRIDES_CSWbluefish += file-with-bad-content|/usr/local|root/opt/csw/share/bluefish/bflang/all-php.bfinc - include gar/category.mk # ./configure needs this to find ggettext PATH := /opt/csw/gnu:$(PATH) + +# search/replace /usr/local with /opt/csw +post-install-modulated: + perl -pi -e 's|/usr/local|$(prefix)|' $(DESTDIR)/opt/csw/share/bluefish/bflang/all-php.bfinc 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 Mar 30 20:40:36 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 30 Mar 2011 18:40:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[14021] csw/mgar/pkg/gdal/trunk/Makefile Message-ID: Revision: 14021 http://gar.svn.sourceforge.net/gar/?rev=14021&view=rev Author: bdwalton Date: 2011-03-30 18:40:36 +0000 (Wed, 30 Mar 2011) Log Message: ----------- gdal/trunk: build with gcc (for now...does not compile with sun cc) Modified Paths: -------------- csw/mgar/pkg/gdal/trunk/Makefile Modified: csw/mgar/pkg/gdal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdal/trunk/Makefile 2011-03-30 18:22:24 UTC (rev 14020) +++ csw/mgar/pkg/gdal/trunk/Makefile 2011-03-30 18:40:36 UTC (rev 14021) @@ -14,6 +14,8 @@ DISTFILES = $(DISTNAME).tar.gz PATCHFILES += 0001-Force-the-use-of-CSWbash.patch +GARCOMPILER = GNU + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libz=$(prefix) CONFIGURE_ARGS += --with-png=$(prefix) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Wed Mar 30 22:11:22 2011 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 30 Mar 2011 20:11:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[14022] csw/mgar/pkg/bluefish/trunk/ Message-ID: Revision: 14022 http://gar.svn.sourceforge.net/gar/?rev=14022&view=rev Author: jake_goerzen Date: 2011-03-30 20:11:22 +0000 (Wed, 30 Mar 2011) Log Message: ----------- bluefish: forgot to propset svn:ignore Property Changed: ---------------- csw/mgar/pkg/bluefish/trunk/ Property changes on: csw/mgar/pkg/bluefish/trunk ___________________________________________________________________ Added: svn:ignore + work cookies downloads 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 Mar 31 00:33:33 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 30 Mar 2011 22:33:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[14023] csw/mgar/gar/v2 Message-ID: Revision: 14023 http://gar.svn.sourceforge.net/gar/?rev=14023&view=rev Author: bdwalton Date: 2011-03-30 22:33:33 +0000 (Wed, 30 Mar 2011) Log Message: ----------- .buildsys/v2: merge branch v2-defaultchange after discussion with dago Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.lib.mk csw/mgar/gar/v2/gar.mk csw/mgar/gar/v2/gar.pkg.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-bwalton:9784-10011 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737 /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-fortran:10883-12516 /csw/mgar/gar/v2-git/v2-relocate:7617 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-noexternals:11592-11745 /csw/mgar/gar/v2-relocate:5028-11738 /csw/mgar/gar/v2-skayser:6087-6132 /csw/mgar/gar/v2-sqlite:10434-10449 /csw/mgar/gar/v2-uwatch2:12141-13270 + /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-override-relocation:10585-10737 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-defaultchange:13903-14022 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-fortran:10883-12516 /csw/mgar/gar/v2-git/v2-relocate:7617 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-noexternals:11592-11745 /csw/mgar/gar/v2-relocate:5028-11738 /csw/mgar/gar/v2-skayser:6087-6132 /csw/mgar/gar/v2-sqlite:10434-10449 /csw/mgar/gar/v2-uwatch2:12141-13270 Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2011-03-30 20:11:22 UTC (rev 14022) +++ csw/mgar/gar/v2/gar.conf.mk 2011-03-30 22:33:33 UTC (rev 14023) @@ -129,9 +129,9 @@ libexecdir_install ?= $(exec_prefix)/libexec libexecdir ?= $(abspath $(libexecdir_install)/$(MM_BINDIR)) datadir ?= $(prefix)/share -sysconfdir ?= $(prefix)/etc +sysconfdir ?= /etc$(prefix) sharedstatedir ?= $(prefix)/share -localstatedir ?= $(prefix)/var +localstatedir ?= /var$(prefix) libdir_install ?= $(exec_prefix)/lib libdir ?= $(abspath $(libdir_install)/$(MM_LIBDIR)) infodir ?= $(sharedstatedir)/info Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2011-03-30 20:11:22 UTC (rev 14022) +++ csw/mgar/gar/v2/gar.lib.mk 2011-03-30 22:33:33 UTC (rev 14023) @@ -807,6 +807,8 @@ DIRPATHS = $(filter-out $(addsuffix %,$(NODIRPATHS)), $(TMP_DIRPATHS)) +CONFIGURE_ARGS ?= $(DIRPATHS) $(EXTRA_CONFIGURE_ARGS) + # configure a package that has an autoconf-style configure # script. configure-%/configure: @@ -928,7 +930,7 @@ #################### TEST RULES #################### -TEST_TARGET ?= test +TEST_TARGET ?= check # Run tests on pre-built sources test-%/Makefile: Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2011-03-30 20:11:22 UTC (rev 14022) +++ csw/mgar/gar/v2/gar.mk 2011-03-30 22:33:33 UTC (rev 14023) @@ -688,8 +688,8 @@ # - If there are builds for more than one ISA the destination differs depending on if # the binaries should be executed by isaexec. This is usually bin, sbin and libexec. # -# default: relocate to ISA subdirs if more than one ISA, use isaexec-wrapper for bin/, etc. -# NOISAEXEC = 1: ISA_DEFAULT gets installed in bin/..., all others in bin/$ISA/ +# default: ISA_DEFAULT gets installed in bin/..., all others in bin/$ISA/ +# ISAEXEC = 1: relocate to ISA subdirs if more than one ISA, use isaexec-wrapper for bin/, etc. # # Automatic merging is only possible if you have the default modulation "ISA" # Otherwise you *must* specify merge scripts for all modulations. @@ -705,14 +705,14 @@ MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= $(MERGE_SCRIPTS_isa-default) MERGE_SCRIPTS_$(MODULATION) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED)) else -ISAEXEC_DIRS ?= $(if $(NOISAEXEC),,$(bindir) $(sbindir) $(libexecdir)) +ISAEXEC_DIRS ?= $(if $(ISAEXEC),$(bindir) $(sbindir) $(libexecdir)) MERGE_DIRS_isa-default ?= $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA_DEFAULT)) -MERGE_DIRS_isa-extra ?= $(bindir) $(sbindir) $(libexecdir) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA)) +MERGE_DIRS_isa-extra ?= $(if $(ISAEXEC),$(bindir) $(sbindir) $(libexecdir)) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-extra) $(EXTRA_MERGE_DIRS_isa-$(ISA)) MERGE_DIRS_$(MODULATION_ISACOLLAPSED64) ?= $(MERGE_DIRS_$(MODULATION_ISACOLLAPSEDEXTRA)) MERGE_DIRS_$(MODULATION) ?= $(MERGE_DIRS_$(MODULATION_ISACOLLAPSED)) MERGE_SCRIPTS_isa-default ?= copy-relocate $(EXTRA_MERGE_SCRIPTS_isa-$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) -MERGE_SCRIPTS_isa-extra ?= copy-relocated-only $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS) +MERGE_SCRIPTS_isa-extra ?= copy-relocated-only copy-config-only $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS_isa-extra) $(EXTRA_MERGE_SCRIPTS) MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED64) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSEDEXTRA)) MERGE_SCRIPTS_$(MODULATION) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED)) endif Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-03-30 20:11:22 UTC (rev 14022) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-03-30 22:33:33 UTC (rev 14023) @@ -102,7 +102,8 @@ RUNTIME_DEP_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown)) # Sanity checks for r8335 -$(if $(NO_ISAEXEC),$(error The deprecated variable 'NO_ISAEXEC' is defined, please replace it with NOISAEXEC)) +$(if $(NO_ISAEXEC),$(error The deprecated variable 'NO_ISAEXEC' is defined, this is now the default, please remove the line)) +$(if $(NOISAEXEC),$(error The deprecated variable 'NOISAEXEC' is defined, this is now the default, please remove the line)) $(if $(PREREQUISITE_PKGS),$(error The deprecated variable 'PREREQUISITE_PKGS' is defined, please replace it with BUILD_DEP_PKGS)) $(foreach P,$(SPKG_SPECS),$(if $(PREREQUISITE_PKGS_$P),$(error The deprecated variable 'PREREQUISITE_PKGS_$P' is defined, please replace it with BUILD_DEP_PKGS_$P))) $(if $(REQUIRED_PKGS),$(error The deprecated variable 'REQUIRED_PKGS' is defined, please replace it with RUNTIME_DEP_PKGS)) @@ -867,7 +868,7 @@ # modulations and does not fill global/. ENABLE_CHECK ?= 1 -# The files in ISAEXEC get relocated and will be replaced by the isaexec-wrapper. +# The files in ISAEXEC_FILES get relocated and will be replaced by the isaexec-wrapper. # The trick is to delay the calculcation of the variable values until that time # when PKGROOT has already been populated. ISAEXEC_EXCLUDE_FILES ?= $(bindir)/%-config $(bindir)/%/%-config 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-bwalton/pkglib/csw/depend:9784-10011 /csw/mgar/gar/v2-checkpkg/pkglib/csw/depend:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation/pkglib/csw/depend:10585-10737 /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-fortran/pkglib/csw/depend:10883-12516 /csw/mgar/gar/v2-noexternals/pkglib/csw/depend:11592-11745 /csw/mgar/gar/v2-relocate/pkglib/csw/depend:5028-11738 /csw/mgar/gar/v2-skayser/pkglib/csw/depend:6087-6132 /csw/mgar/gar/v2-sqlite/pkglib/csw/depend:10434-10449 /csw/mgar/gar/v2-uwatch2/pkglib/csw/depend:12141-13270 + /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-override-relocation/pkglib/csw/depend:10585-10737 /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-defaultchange/pkglib/csw/depend:13903-14022 /csw/mgar/gar/v2-dirpackage/pkglib/csw/depend:8125-8180 /csw/mgar/gar/v2-fortran/pkglib/csw/depend:10883-12516 /csw/mgar/gar/v2-noexternals/pkglib/csw/depend:11592-11745 /csw/mgar/gar/v2-relocate/pkglib/csw/depend:5028-11738 /csw/mgar/gar/v2-skayser/pkglib/csw/depend:6087-6132 /csw/mgar/gar/v2-sqlite/pkglib/csw/depend:10434-10449 /csw/mgar/gar/v2-uwatch2/pkglib/csw/depend:12141-13270 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 Mar 31 01:49:59 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 30 Mar 2011 23:49:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[14024] csw/mgar/pkg/geos/trunk/Makefile Message-ID: Revision: 14024 http://gar.svn.sourceforge.net/gar/?rev=14024&view=rev Author: bdwalton Date: 2011-03-30 23:49:59 +0000 (Wed, 30 Mar 2011) Log Message: ----------- geos/trunk: reset GARTYPE now that the merge has taken place Modified Paths: -------------- csw/mgar/pkg/geos/trunk/Makefile Modified: csw/mgar/pkg/geos/trunk/Makefile =================================================================== --- csw/mgar/pkg/geos/trunk/Makefile 2011-03-30 22:33:33 UTC (rev 14023) +++ csw/mgar/pkg/geos/trunk/Makefile 2011-03-30 23:49:59 UTC (rev 14024) @@ -11,7 +11,7 @@ MASTER_SITES = http://download.osgeo.org/$(NAME)/ DISTFILES = $(DISTNAME).tar.bz2 -GARTYPE = v2-defaultchange +GARTYPE = v2 GARCOMPILER = 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 Thu Mar 31 01:50:45 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 30 Mar 2011 23:50:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[14025] csw/mgar/pkg/gdal/trunk/Makefile Message-ID: Revision: 14025 http://gar.svn.sourceforge.net/gar/?rev=14025&view=rev Author: bdwalton Date: 2011-03-30 23:50:45 +0000 (Wed, 30 Mar 2011) Log Message: ----------- gdal/trunk: disable tests (no suite?), set license file, reset GARTYPE Modified Paths: -------------- csw/mgar/pkg/gdal/trunk/Makefile Modified: csw/mgar/pkg/gdal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdal/trunk/Makefile 2011-03-30 23:49:59 UTC (rev 14024) +++ csw/mgar/pkg/gdal/trunk/Makefile 2011-03-30 23:50:45 UTC (rev 14025) @@ -8,7 +8,7 @@ GDAL is a translator library for raster geospatial data formats that is released under an X/MIT style Open Source license by the Open Source Geospatial Foundation. As a library, it presents a single abstract data model to the calling application for all supported formats. It also comes with a variety of useful commandline utilities for data translation and processing. endef -GARTYPE = v2-defaultchange +GARTYPE = v2 MASTER_SITES = http://download.osgeo.org/$(NAME)/ DISTFILES = $(DISTNAME).tar.gz @@ -27,4 +27,9 @@ #CONFIGURE_ARGS += --with-pg=/opt/csw/postgresql/bin/pg_config CONFIGURE_ARGS += --with-sqlite3=$(prefix) +# doesn't have tests? +TEST_TARGET = + +LICENSE = LICENSE.TXT + include gar/category.mk 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 Mar 31 09:05:25 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 31 Mar 2011 07:05:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[14026] csw/mgar/pkg/lang-python Message-ID: Revision: 14026 http://gar.svn.sourceforge.net/gar/?rev=14026&view=rev Author: wahwah Date: 2011-03-31 07:05:25 +0000 (Thu, 31 Mar 2011) Log Message: ----------- bridge: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/bridge/trunk/Makefile csw/mgar/pkg/lang-python/bridge/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/bridge/ Modified: csw/mgar/pkg/lang-python/bridge/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2011-03-28 05:01:11 UTC (rev 13974) +++ csw/mgar/pkg/lang-python/bridge/trunk/Makefile 2011-03-31 07:05:25 UTC (rev 14026) @@ -2,186 +2,15 @@ # 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 -## -NAME = mypkg -VERSION = 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. +NAME = bridge +VERSION = 0.4.0 +CATEGORIES = python +DESCRIPTION = General purpose XML library for CPython and IronPython define BLURB - 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), -## $(PYPI_MIRROR) -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(NAME). 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 = $(NAME)-$(VERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software -## release -## UFILES_REGEX = $(NAME)-(\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)/$(NAME)-$(VERSION) -## -## 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 +SPKG_SOURCEURL = http://pypi.python.org/pypi/bridge +# SPKG_SOURCEURL = http://trac.defuze.org/wiki/bridge +DISTFILES = $(NAME)-$(VERSION).tar.gz +MASTER_SITES = http://www.defuze.org/oss/bridge/ +ARCHALL_CSWpy-bridge = 1 +include gar/category.mk Modified: csw/mgar/pkg/lang-python/bridge/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2011-03-28 05:01:11 UTC (rev 13974) +++ csw/mgar/pkg/lang-python/bridge/trunk/checksums 2011-03-31 07:05:25 UTC (rev 14026) @@ -0,0 +1 @@ +4df7ff0f0035ea184e98e1dcaecc2434 bridge-0.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 Thu Mar 31 12:09:52 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 31 Mar 2011 10:09:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[14027] csw/mgar/pkg/c-ares/trunk Message-ID: Revision: 14027 http://gar.svn.sourceforge.net/gar/?rev=14027&view=rev Author: dmichelsen Date: 2011-03-31 10:09:51 +0000 (Thu, 31 Mar 2011) Log Message: ----------- c-ares: Update to 1.7.4 and new package names Modified Paths: -------------- csw/mgar/pkg/c-ares/trunk/Makefile csw/mgar/pkg/c-ares/trunk/checksums Modified: csw/mgar/pkg/c-ares/trunk/Makefile =================================================================== --- csw/mgar/pkg/c-ares/trunk/Makefile 2011-03-31 07:05:25 UTC (rev 14026) +++ csw/mgar/pkg/c-ares/trunk/Makefile 2011-03-31 10:09:51 UTC (rev 14027) @@ -1,8 +1,8 @@ NAME = c-ares -VERSION = 1.7.0 +VERSION = 1.7.4 CATEGORIES = lib -DESCRIPTION = c-ares library to perform DNS requests and name resolves asynchronously +DESCRIPTION = C-ares library to perform DNS requests and name resolves asynchronously define BLURB endef @@ -13,14 +13,19 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWlibcares CSWlibcaresdevel +PACKAGES += CSWlibcares2 +CATALOGNAME_CSWlibcares2 = libcares2 +SPKG_DESC_CSWlibcares2 = C-ares library to perform DNS requests and name resolves asynchronously +PKGFILES_CSWlibcares2 = $(call pkgfiles_lib,libcares.so.2) +OBSOLETED_BY_CSWlibcares2 = CSWlibcares -CATALOGNAME_CSWlibcares = libcares -CATALOGNAME_CSWlibcaresdevel = libcares_devel +PACKAGES += CSWlibcares-dev +CATALOGNAME_CSWlibcares-dev = libcares_dev +SPKG_DESC_CSWlibcares-dev = Development files for libcares.so.2 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibcares-dev += CSWlibcares2 +OBSOLETED_BY_CSWlibcares-dev = CSWlibcaresdevel -SPKG_DESC_CSWlibcares = $(DESCRIPTION) -SPKG_DESC_CSWlibcaresdevel = c-ares library developer files - RUNTIME_DEP_PKGS_CSWlibcaresdevel = CSWlibcares LICENSE = README.cares @@ -28,14 +33,10 @@ BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) -TEST_TARGET = check - EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/ares_build.h$$,.$(includedir)/ares_build-32.h,p" EXTRA_PAX_ARGS_64 = -s ",^\.$(includedir)/ares_build.h$$,.$(includedir)/ares_build-64.h,p" EXTRA_PAX_ARGS = $(EXTRA_PAX_ARGS_$(MEMORYMODEL)) -PKGFILES_CSWlibcaresdevel = $(PKGFILES_DEVEL) - include gar/category.mk post-merge: Modified: csw/mgar/pkg/c-ares/trunk/checksums =================================================================== --- csw/mgar/pkg/c-ares/trunk/checksums 2011-03-31 07:05:25 UTC (rev 14026) +++ csw/mgar/pkg/c-ares/trunk/checksums 2011-03-31 10:09:51 UTC (rev 14027) @@ -1,2 +1 @@ -86e9bb345124ecaa520a68c4c482a122 ares_build.h -15ab7852306b554b0b1145f41005a3bb c-ares-1.7.0.tar.gz +dd71e8f07d9f3c837e12a5416d1b7f73 c-ares-1.7.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 Thu Mar 31 15:04:53 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 31 Mar 2011 13:04:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[14028] csw/mgar/pkg/doxygen/trunk Message-ID: Revision: 14028 http://gar.svn.sourceforge.net/gar/?rev=14028&view=rev Author: dmichelsen Date: 2011-03-31 13:04:52 +0000 (Thu, 31 Mar 2011) Log Message: ----------- doxygen: Update to 1.7.4 and rework Modified Paths: -------------- csw/mgar/pkg/doxygen/trunk/Makefile csw/mgar/pkg/doxygen/trunk/checksums Modified: csw/mgar/pkg/doxygen/trunk/Makefile =================================================================== --- csw/mgar/pkg/doxygen/trunk/Makefile 2011-03-31 10:09:51 UTC (rev 14027) +++ csw/mgar/pkg/doxygen/trunk/Makefile 2011-03-31 13:04:52 UTC (rev 14028) @@ -1,5 +1,5 @@ NAME = doxygen -VERSION = 1.7.3 +VERSION = 1.7.4 CATEGORIES = utils DESCRIPTION = A documentation system for programming languages @@ -9,27 +9,33 @@ endef MASTER_SITES = http://ftp.stack.nl/pub/users/dimitri/ -DISTFILES = $(NAME)-$(VERSION).src.tar.gz +DISTFILES = $(DISTNAME).src.tar.gz -PACKAGES = CSWdoxygen CSWdoxygendoc - +PACKAGES += CSWdoxygen CATALOGNAME_CSWdoxygen = doxygen -CATALOGNAME_CSWdoxygendoc = doxygen_doc - SPKG_DESC_CSWdoxygen = A documentation system for programming languages -SPKG_DESC_CSWdoxygendoc = Documentation for doxygen +PACKAGES += CSWdoxygen-doc +CATALOGNAME_CSWdoxygen-doc = doxygen_doc +SPKG_DESC_CSWdoxygen-doc = Documentation for doxygen +PKGFILES_CSWdoxygen-doc = $(PKGFILES_DOC) +ARCHALL_CSWdoxygen-doc = 1 +# There are some Python examples in there, but pulling in Python unconditionally +# for these tiny examples seems overkill. +CHECKPKG_OVERRIDES_CSWdoxygen-doc = missing-dependency|CSWpython +OBSOLETED_BY_CSWdoxygen-doc = CSWdoxygendoc +# These are pure examples +CHECKPKG_OVERRIDES_CSWdoxygen-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/doxygen/html/config.html +CHECKPKG_OVERRIDES_CSWdoxygen-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/doxygen/html/install.html + LICENSE = LICENSE -SPKG_SOURCEURL = http://www.stack.nl/~dimitri/doxygen/ +VENDOR_URL = http://www.stack.nl/~dimitri/doxygen/ -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).src.tar.gz -UPSTREAM_MASTER_SITES = $(SPKG_SOURCEURL) - BUILD_DEP_PKGS = CSWgraphviz EXTRA_CXXFLAGS = -features=tmplrefstatic +EXTRA_LINKER_FLAGS = -norunpath CONFIGURE_ARGS = --prefix $(prefix) CONFIGURE_ARGS += --release @@ -37,28 +43,25 @@ CONFIGURE_ARGS += --dot /opt/csw/bin/dot CONFIGURE_ARGS += --platform solaris-cc +# There is no testsuite TEST_SCRIPTS = INSTALL_ARGS = install_docs EXTRA_PAX_ARGS += -s ',^\.$(prefix)/man,.$(mandir),' -ARCHALL_CSWdoxygendoc = 1 -PKGFILES_CSWdoxygendoc = $(PKGFILES_DOC) +# These are from 'dot', pretty ugly, don't package at least for now +EXTRA_MERGE_EXCLUDE_FILES = .*/core -# There are some Python examples in there, but pulling in Python unconditionally -# for these tiny examples seems overkill. -CHECKPKG_OVERRIDES_CSWdoxygendoc = missing-dependency|CSWpython - # Use CSW Perl instead of #!/usr/local/bin/perl in # /opt/csw/share/doc/doxygen/examples/Makefile # some time... include gar/category.mk -# For 'dot' -PATH := $(PATH):/opt/csw/graphviz2/bin - post-extract-modulated: - perl -pi -e ' s,(TMAKE_CFLAGS_RELEASE\s*=\s*)(.*),\1$(CFLAGS),; s,(TMAKE_CXXFLAGS_RELEASE\s*=\s*)(.*),\1$(CXXFLAGS),; s,(TMAKE_LFLAGS_RELEASE\s*=)(.*),\1$(LDFLAGS),; ' $(WORKSRC)/tmake/lib/solaris-cc/tmake.conf + perl -pi -e 's,(TMAKE_CFLAGS_RELEASE\s*=\s*)(.*),\1$(CFLAGS),;' \ + -e 's,(TMAKE_CXXFLAGS_RELEASE\s*=\s*)(.*),\1$(CXXFLAGS),;' \ + -e 's,(TMAKE_LFLAGS_RELEASE\s*=)(.*),\1$(LDFLAGS),;' \ + $(WORKSRC)/tmake/lib/solaris-cc/tmake.conf @$(MAKECOOKIE) Modified: csw/mgar/pkg/doxygen/trunk/checksums =================================================================== --- csw/mgar/pkg/doxygen/trunk/checksums 2011-03-31 10:09:51 UTC (rev 14027) +++ csw/mgar/pkg/doxygen/trunk/checksums 2011-03-31 13:04:52 UTC (rev 14028) @@ -1 +1 @@ -6cc5ad566dbec5cf843dc600b1162808 doxygen-1.7.3.src.tar.gz +ff908759ff7cd9464424b04ae6c68e48 doxygen-1.7.4.src.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 Mar 31 15:47:38 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 31 Mar 2011 13:47:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[14029] csw/mgar/pkg/plzip/trunk Message-ID: Revision: 14029 http://gar.svn.sourceforge.net/gar/?rev=14029&view=rev Author: dmichelsen Date: 2011-03-31 13:47:38 +0000 (Thu, 31 Mar 2011) Log Message: ----------- plzip: Version bump to 0.7, minor cleanup 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 2011-03-31 13:04:52 UTC (rev 14028) +++ csw/mgar/pkg/plzip/trunk/Makefile 2011-03-31 13:47:38 UTC (rev 14029) @@ -1,5 +1,5 @@ NAME = plzip -VERSION = 0.6 +VERSION = 0.7 CATEGORIES = utils DESCRIPTION = A lossless data compressor based on the LZMA algorithm @@ -12,19 +12,18 @@ planned to be implemented soon. endef -MASTER_SITES = http://download.savannah.gnu.org/releases/lzip/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +GNU_PROJ = lzip +MASTER_SITES = $(GNU_NMIRROR) +DISTFILES = $(DISTNAME).tar.gz PATCHFILES = 0001-Add-prototype-for-kill-2.patch PATCHFILES += 0002-Use-ucb-echo.patch -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - DEP_PKGS = CSWlzlib VENDOR_URL = http://www.nongnu.org/lzip/lzlib.html EXTRA_CXXFLAGS = -xcode=pic32 +EXTRA_LINKER_FLAGS = -norunpath NOISALIST = 1 NODIRPATHS = --includedir @@ -34,8 +33,6 @@ CONFIGURE_ARGS += CXXFLAGS="$(CXXFLAGS)" CONFIGURE_ARGS += LDFLAGS="$(LDFLAGS)" -TEST_TARGET = check - INSTALL_OVERRIDE_VARS = INSTALL INSTALL_OVERRIDE_VAR_INSTALL = /opt/csw/bin/ginstall Modified: csw/mgar/pkg/plzip/trunk/checksums =================================================================== --- csw/mgar/pkg/plzip/trunk/checksums 2011-03-31 13:04:52 UTC (rev 14028) +++ csw/mgar/pkg/plzip/trunk/checksums 2011-03-31 13:47:38 UTC (rev 14029) @@ -1,3 +1 @@ -179318ac88ff9ddda040640582f9b404 0001-Add-prototype-for-kill-2.patch -690e11a488625fbb1f99e0ea411e28d4 0002-Use-ucb-echo.patch -f452029b1e8232cbe837f4437613e1ed plzip-0.6.tar.gz +8c9bf624ceeb7ff26122137937737c81 plzip-0.7.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 Mar 31 16:10:44 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 31 Mar 2011 14:10:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[14030] csw/mgar/pkg/zutils/trunk Message-ID: Revision: 14030 http://gar.svn.sourceforge.net/gar/?rev=14030&view=rev Author: dmichelsen Date: 2011-03-31 14:10:44 +0000 (Thu, 31 Mar 2011) Log Message: ----------- zutils: Update to 0.9 and general cleanup Modified Paths: -------------- csw/mgar/pkg/zutils/trunk/Makefile csw/mgar/pkg/zutils/trunk/checksums csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch Removed Paths: ------------- csw/mgar/pkg/zutils/trunk/files/0004-Fix-ambinguity-to-str.insert.patch Modified: csw/mgar/pkg/zutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/zutils/trunk/Makefile 2011-03-31 13:47:38 UTC (rev 14029) +++ csw/mgar/pkg/zutils/trunk/Makefile 2011-03-31 14:10:44 UTC (rev 14030) @@ -1,5 +1,5 @@ NAME = zutils -VERSION = 0.8 +VERSION = 0.9 CATEGORIES = utils DESCRIPTION = Utilities to deal with compressed and non-compressed files @@ -12,24 +12,24 @@ planned to be implemented soon. endef + MASTER_SITES = http://download.savannah.gnu.org/releases/zutils/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(DISTNAME).tar.gz PATCHFILES = 0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch PATCHFILES += 0002-Use-correct-path-on-testsuite.patch PATCHFILES += 0003-Use-Zutils-instead-of-zutils.patch -PATCHFILES += 0004-Fix-ambinguity-to-str.insert.patch -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +BUILD_DEP_PKGS += CSWhelp2man +BUILD_DEP_PKGS += CSWlzip -BUILD_DEP_PKGS = CSWhelp2man CSWlzip - # The lzip binary is used from the scripts which is not detected by checkpkg RUNTIME_DEP_PKGS = CSWlzip CHECKPKG_OVERRIDES_CSWzutils += surplus-dependency|CSWlzip VENDOR_URL = http://www.nongnu.org/zutils/zutils.html +EXTRA_LINKER_FLAGS = -norunpath + NODIRPATHS = --includedir CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += CXX="$(CXX)" @@ -44,18 +44,6 @@ EXTRA_PAX_ARGS = -s ",/z,/Z,p" -# These are false positives as lower case 'z' is in CSWgzipextras. -CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/bin/Zcmp|CSWgzipextras|CSWzutils -CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/share/man/man1/Zcat.1|CSWgzipextras|CSWzutils -CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/bin/Zcat|CSWgzipextras|CSWzutils -CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/share/man/man1/Zcmp.1|CSWgzipextras|CSWzutils -CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/bin/Zgrep|CSWgzipextras|CSWzutils -CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/bin/Zegrep|CSWgzipextras|CSWzutils -CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/bin/Zdiff|CSWgzipextras|CSWzutils -CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/share/man/man1/Zdiff.1|CSWgzipextras|CSWzutils -CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/bin/Zfgrep|CSWgzipextras|CSWzutils -CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/share/man/man1/Zgrep.1|CSWgzipextras|CSWzutils - include gar/category.mk post-extract-modulated: Modified: csw/mgar/pkg/zutils/trunk/checksums =================================================================== --- csw/mgar/pkg/zutils/trunk/checksums 2011-03-31 13:47:38 UTC (rev 14029) +++ csw/mgar/pkg/zutils/trunk/checksums 2011-03-31 14:10:44 UTC (rev 14030) @@ -1 +1 @@ -e7607d23b62ef3c4c74baed04a79ec6d zutils-0.8.tar.gz +487eb9549793be6ed7c2de324d4f12df zutils-0.9.tar.gz Modified: csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch =================================================================== --- csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch 2011-03-31 13:47:38 UTC (rev 14029) +++ csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch 2011-03-31 14:10:44 UTC (rev 14030) @@ -1,17 +1,17 @@ -From 58974984d2356dbe92326769535f7ca7eb6c6588 Mon Sep 17 00:00:00 2001 +From 112d2b1f1b25a4d1451465d9c546c5dc7797d1b5 Mon Sep 17 00:00:00 2001 From: Dagobert Michelsen -Date: Fri, 19 Nov 2010 14:30:36 +0100 +Date: Thu, 31 Mar 2011 16:00:44 +0200 Subject: [PATCH] Use inttypes.h instead of stdint.h and add signal.h --- main.cc | 3 ++- - zcmp.cc | 2 +- + zcmp.cc | 3 ++- zdiff.cc | 3 ++- zutils.cc | 2 +- - 4 files changed, 6 insertions(+), 4 deletions(-) + 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/main.cc b/main.cc -index bc7c5fb..fc598df 100644 +index 5059ce3..5ac5587 100644 --- a/main.cc +++ b/main.cc @@ -28,7 +28,8 @@ @@ -25,20 +25,21 @@ #include #if defined(__MSVCRT__) || defined(__OS2__) diff --git a/zcmp.cc b/zcmp.cc -index caa7852..32275b6 100644 +index b00d40b..7e41ea5 100644 --- a/zcmp.cc +++ b/zcmp.cc -@@ -27,7 +27,7 @@ +@@ -27,7 +27,8 @@ #include #include #include -#include +#include ++#include #include #include #if defined(__MSVCRT__) || defined(__OS2__) diff --git a/zdiff.cc b/zdiff.cc -index d01f492..138a75b 100644 +index 28425a3..d57a0b0 100644 --- a/zdiff.cc +++ b/zdiff.cc @@ -27,7 +27,8 @@ @@ -52,7 +53,7 @@ #include #if defined(__MSVCRT__) || defined(__OS2__) diff --git a/zutils.cc b/zutils.cc -index 5451534..367e933 100644 +index 1324f89..559a977 100644 --- a/zutils.cc +++ b/zutils.cc @@ -22,7 +22,7 @@ @@ -65,5 +66,5 @@ #include -- -1.7.3 +1.7.3.2 Deleted: csw/mgar/pkg/zutils/trunk/files/0004-Fix-ambinguity-to-str.insert.patch =================================================================== --- csw/mgar/pkg/zutils/trunk/files/0004-Fix-ambinguity-to-str.insert.patch 2011-03-31 13:47:38 UTC (rev 14029) +++ csw/mgar/pkg/zutils/trunk/files/0004-Fix-ambinguity-to-str.insert.patch 2011-03-31 14:10:44 UTC (rev 14030) @@ -1,25 +0,0 @@ -From f0b61c050f2b244a33a7c19b8c2164d95725470d Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Fri, 19 Nov 2010 14:28:47 +0100 -Subject: [PATCH 4/4] Fix ambinguity to str.insert - ---- - zcat.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/zcat.cc b/zcat.cc -index f813bbe..34a37f3 100644 ---- a/zcat.cc -+++ b/zcat.cc -@@ -45,7 +45,7 @@ public: - str[i] = '0'; - } - if( first_digit_pos > 0 ) str[--first_digit_pos] = '1'; -- else str.insert( 0, 1, '1' ); -+ else str.insert( (unsigned) 0, 1, '1' ); - } - - int sprint( uint8_t * const buf ) --- -1.7.3 - 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 Mar 31 17:17:15 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 31 Mar 2011 15:17:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[14031] csw/mgar/pkg/cpan Message-ID: Revision: 14031 http://gar.svn.sourceforge.net/gar/?rev=14031&view=rev Author: bonivart Date: 2011-03-31 15:17:15 +0000 (Thu, 31 Mar 2011) Log Message: ----------- cpan/Perl-OSType: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Perl-OSType/ csw/mgar/pkg/cpan/Perl-OSType/branches/ csw/mgar/pkg/cpan/Perl-OSType/tags/ csw/mgar/pkg/cpan/Perl-OSType/trunk/ csw/mgar/pkg/cpan/Perl-OSType/trunk/Makefile csw/mgar/pkg/cpan/Perl-OSType/trunk/checksums csw/mgar/pkg/cpan/Perl-OSType/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Perl-OSType/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/cpan/Perl-OSType/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Perl-OSType/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Perl-OSType/trunk/Makefile 2011-03-31 15:17:15 UTC (rev 14031) @@ -0,0 +1,19 @@ +NAME = Perl-OSType +VERSION = 1.002 +CATEGORIES = cpan +AUTHOR = DAGOLDEN + +DESCRIPTION = Map Perl operating system names to generic types +define BLURB + Map Perl operating system names to generic types +endef + +LICENSE = LICENSE + +PACKAGES = CSWpm-perl-ostype +CATALOGNAME = pm_perl_ostype +ARCHALL = 1 + +TEST_TARGET = test + +include gar/category.mk Added: csw/mgar/pkg/cpan/Perl-OSType/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Perl-OSType/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Perl-OSType/trunk/checksums 2011-03-31 15:17:15 UTC (rev 14031) @@ -0,0 +1 @@ +73be06de32cd51cf5e6de37b5725e0ac Perl-OSType-1.002.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 Mar 31 17:30:35 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 31 Mar 2011 15:30:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[14032] csw/mgar/gar/v2/categories/cpan/category.mk Message-ID: Revision: 14032 http://gar.svn.sourceforge.net/gar/?rev=14032&view=rev Author: bonivart Date: 2011-03-31 15:30:35 +0000 (Thu, 31 Mar 2011) Log Message: ----------- cpan/category.mk: set test target to test for cpan Modified Paths: -------------- csw/mgar/gar/v2/categories/cpan/category.mk Modified: csw/mgar/gar/v2/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v2/categories/cpan/category.mk 2011-03-31 15:17:15 UTC (rev 14031) +++ csw/mgar/gar/v2/categories/cpan/category.mk 2011-03-31 15:30:35 UTC (rev 14032) @@ -10,6 +10,9 @@ # Tests are enabled by default, unless overridden at the test level ENABLE_TEST ?= 1 +# Test target is test by default (in CPAN category) +TEST_TARGET ?= test + # Every CPAN module depends on Perl #DEPENDS += lang/perl 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 Mar 31 17:53:34 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 31 Mar 2011 15:53:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[14033] csw/mgar/pkg/cpan/version/trunk Message-ID: Revision: 14033 http://gar.svn.sourceforge.net/gar/?rev=14033&view=rev Author: bonivart Date: 2011-03-31 15:53:33 +0000 (Thu, 31 Mar 2011) Log Message: ----------- cpan/version/trunk: Update to 0.88. Rename and obsolete Modified Paths: -------------- csw/mgar/pkg/cpan/version/trunk/Makefile csw/mgar/pkg/cpan/version/trunk/checksums Modified: csw/mgar/pkg/cpan/version/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/version/trunk/Makefile 2011-03-31 15:30:35 UTC (rev 14032) +++ csw/mgar/pkg/cpan/version/trunk/Makefile 2011-03-31 15:53:33 UTC (rev 14033) @@ -1,5 +1,5 @@ NAME = version -VERSION = 0.82 +VERSION = 0.88 CATEGORIES = cpan AUTHOR = JPEACOCK @@ -12,8 +12,11 @@ DISTFILES += COPYING -PACKAGES = CSWpmversion +PACKAGES = CSWpm-version CATALOGNAME = pm_version +SPKG_DESC_CSWpm-version = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-version = CSWpmversion +CATALOGNAME_CSWpmversion = pm_version_stub EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* .*\/man\/man1.* Modified: csw/mgar/pkg/cpan/version/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/version/trunk/checksums 2011-03-31 15:30:35 UTC (rev 14032) +++ csw/mgar/pkg/cpan/version/trunk/checksums 2011-03-31 15:53:33 UTC (rev 14033) @@ -1 +1 @@ -c073f079557297003d805b535711c5d1 version-0.82.tar.gz +5f27f21c625fa2f89f4130e277594635 version-0.88.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.